audio popout changes, slider inset icons added

Reviewed-on: #117

.clang-format

@@ -0,0 +1,58 @@
+---
+BasedOnStyle: LLVM
+AccessModifierOffset: 0
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: Align
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+ColumnLimit: 80
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+FixNamespaceComments: true
+IndentCaseLabels: false
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: false
+Language: Cpp
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+PenaltyBreakAssignment: 10
+PenaltyBreakBeforeFirstCallParameter: 100
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments: false
+SortIncludes: false
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++20
+TabWidth: 4
+UseTab: Always

.clang-tidy

@@ -0,0 +1,31 @@
+---
+Checks: >
+    -*,
+    bugprone-*,
+    clang-analyzer-*,
+    modernize-*,
+    -modernize-use-trailing-return-type,
+    performance-*,
+    readability-braces-around-statements,
+    readability-else-after-return,
+    readability-identifier-naming,
+    readability-redundant-*,
+    readability-simplify-*,
+CheckOptions:
+    readability-identifier-naming.ClassCase: CamelCase
+    readability-identifier-naming.EnumCase: CamelCase
+    readability-identifier-naming.FunctionCase: camelBack
+    readability-identifier-naming.MemberCase: camelBack
+    readability-identifier-naming.MemberPrefix: m_
+    readability-identifier-naming.MethodCase: camelBack
+    readability-identifier-naming.NamespaceCase: CamelCase
+    readability-identifier-naming.ParameterCase: camelBack
+    readability-identifier-naming.PrivateMemberPrefix: m_
+    readability-identifier-naming.StaticConstantCase: UPPER_CASE
+    readability-identifier-naming.StaticConstantPrefix: k
+    readability-identifier-naming.VariableCase: camelBack
+WarningsAsErrors: "*"
+HeaderFilterRegex: ".*"
+FormatStyle: file
+
+...

CMakeLists.txt

@@ -25,6 +25,7 @@ add_compile_options(
 
 if("plugin" IN_LIST ENABLE_MODULES)
 	add_subdirectory(Plugins)
+
 endif()
 
 if("shell" IN_LIST ENABLE_MODULES)

Components/Anim.qml

@@ -2,7 +2,62 @@ import QtQuick
 import qs.Config
 
 NumberAnimation {
-	duration: Appearance.anim.durations.normal
-	easing.bezierCurve: Appearance.anim.curves.standard
-	easing.type: Easing.BezierSpline
+	enum Type {
+		StandardSmall = 0,
+		Standard,
+		StandardLarge,
+		StandardExtraLarge,
+		EmphasizedSmall,
+		Emphasized,
+		EmphasizedLarge,
+		EmphasizedExtraLarge,
+		FastSpatial,
+		DefaultSpatial,
+		SlowSpatial,
+		FastEffects,
+		DefaultEffects,
+		SlowEffects
+	}
+
+	property int type: Anim.DefaultSpatial
+
+	duration: {
+		if (type < Anim.StandardSmall || type > Anim.SlowEffects)
+			return Appearance.anim.durations.normal;
+
+		if (type === Anim.FastSpatial)
+			return Appearance.anim.durations.expressiveFastSpatial;
+		if (type === Anim.DefaultSpatial)
+			return Appearance.anim.durations.expressiveDefaultSpatial;
+		if (type === Anim.SlowSpatial)
+			return Appearance.anim.durations.large;
+		if (type === Anim.FastEffects)
+			return Appearance.anim.durations.expressiveFastEffects;
+		if (type === Anim.DefaultEffects)
+			return Appearance.anim.durations.expressiveEffects;
+		if (type === Anim.SlowEffects)
+			return Appearance.anim.durations.expressiveSlowEffects;
+
+		const types = ["small", "normal", "large", "extraLarge"];
+		const idx = type % 4; // 0-7 are the 4 standard types
+		return Appearance.anim.durations[types[idx]];
+	}
+	easing.bezierCurve: {
+		if (type === Anim.FastSpatial)
+			return Appearance.anim.curves.expressiveFastSpatial;
+		if (type === Anim.DefaultSpatial)
+			return Appearance.anim.curves.expressiveDefaultSpatial;
+		if (type === Anim.SlowSpatial)
+			return Appearance.anim.curves.expressiveSlowSpatial;
+		if (type === Anim.FastEffects)
+			return Appearance.anim.curves.expressiveFastEffects;
+		if (type === Anim.DefaultEffects)
+			return Appearance.anim.curves.expressiveDefaultEffects;
+		if (type === Anim.SlowEffects)
+			return Appearance.anim.curves.expressiveSlowEffects;
+
+		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
+			return Appearance.anim.curves.emphasized;
+		return Appearance.anim.curves.standard;
+	}
 }

Components/CollapsibleSection.qml

@@ -59,15 +59,15 @@ ColumnLayout {
 		}
 
 		StateLayer {
-			function onClicked(): void {
-				root.toggleRequested();
-				root.expanded = !root.expanded;
-			}
-
 			anchors.fill: parent
 			color: DynamicColors.palette.m3onSurface
 			radius: Appearance.rounding.normal
 			showHoverBackground: false
+
+			onClicked: {
+				root.toggleRequested();
+				root.expanded = !root.expanded;
+			}
 		}
 	}
 

Components/CustomButton.qml

@@ -23,10 +23,10 @@ Button {
 	}
 
 	StateLayer {
-		function onClicked(): void {
+		radius: control.radius
+
+		onClicked: {
 			control.clicked();
 		}
-
-		radius: control.radius
 	}
 }

Components/CustomListView.qml

@@ -3,11 +3,29 @@ import QtQuick
 ListView {
 	id: root
 
+	property bool doneFakeFlick
+
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {
+		onRunningChanged: {
+			if (!running && !root.doneFakeFlick) {
+				root.doneFakeFlick = true;
+				root.flick(1, 1);
+				root.flick(-1, -1);
+				Qt.callLater(() => root.cancelFlick());
+			}
+		}
+
 		Anim {
 			properties: "x,y"
 		}
 	}
+
+	Timer {
+		interval: 10
+		running: root.doneFakeFlick
+
+		onTriggered: root.doneFakeFlick = false
+	}
 }

Components/CustomRadioButton.qml

@@ -33,13 +33,13 @@ RadioButton {
 		}
 
 		StateLayer {
-			function onClicked(): void {
-				root.click();
-			}
-
 			anchors.margins: -7
 			color: root.checked ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3primary
 			z: -1
+
+			onClicked: {
+				root.click();
+			}
 		}
 
 		CustomRect {

Components/CustomScrollBar.qml

@@ -1,6 +1,6 @@
-import qs.Config
 import QtQuick
 import QtQuick.Templates
+import qs.Config
 
 ScrollBar {
 	id: root
@@ -12,7 +12,7 @@ ScrollBar {
 	property real nonAnimPosition
 	property bool shouldBeActive
 
-	implicitWidth: 8
+	implicitWidth: mouse.containsMouse ? Appearance.padding.extraSmall * 2 : Appearance.padding.extraSmall
 
 	contentItem: CustomRect {
 		anchors.left: parent.left
@@ -33,6 +33,7 @@ ScrollBar {
 
 		Behavior on opacity {
 			Anim {
+				type: Anim.DefaultEffects
 			}
 		}
 
@@ -40,9 +41,16 @@ ScrollBar {
 			id: mouse
 
 			acceptedButtons: Qt.NoButton
-			anchors.fill: parent
+			anchors.bottom: parent.bottom
+			anchors.right: parent.right
+			anchors.top: parent.top
 			cursorShape: Qt.PointingHandCursor
 			hoverEnabled: true
+			implicitWidth: Appearance.padding.extraSmall * 2
+		}
+	}
+	Behavior on implicitWidth {
+		Anim {
 		}
 	}
 	Behavior on position {
@@ -86,23 +94,19 @@ ScrollBar {
 	// Sync nonAnimPosition with flickable when not animating
 	Connections {
 		function onContentYChanged() {
-			if (!animating && !fullMouse.pressed) {
-				_updatingFromFlickable = true;
-				const contentHeight = flickable.contentHeight;
-				const height = flickable.height;
+			if (!root.animating && !fullMouse.pressed) {
+				root._updatingFromFlickable = true;
+				const contentHeight = root.flickable.contentHeight;
+				const height = root.flickable.height;
 				if (contentHeight > height) {
-					nonAnimPosition = Math.max(0, Math.min(1, flickable.contentY / (contentHeight - height)));
+					root.nonAnimPosition = Math.max(0, Math.min(1, root.flickable.contentY / (contentHeight - height)));
 				} else {
-					nonAnimPosition = 0;
+					root.nonAnimPosition = 0;
 				}
-				_updatingFromFlickable = false;
+				root._updatingFromFlickable = false;
 			}
 		}
 
-		target: flickable
-	}
-
-	Connections {
 		function onMovingChanged(): void {
 			if (root.flickable.moving)
 				root.shouldBeActive = true;

Components/CustomSlider.qml

@@ -1,47 +1,199 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Templates
+import ZShell.Components
+import ZShell
+import qs.Components
 import qs.Config
 
 Slider {
 	id: root
 
-	property color color: DynamicColors.palette.m3primary
+	property bool animateWave
+	property color bgColor: enabled ? DynamicColors.palette.m3secondaryContainer : Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color fgColor: enabled ? DynamicColors.palette.m3primary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	property real filledWidth
+	property alias inset: inset
+	property color insetColor: enabled ? (inset.attached ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onPrimary) : DynamicColors.palette.m3onSurface
+	property string insetIcon: ""
+	property real pos: visualPosition
+	property int radius: Appearance.rounding.small
+	property int waveDuration: 1000
+	property real waveFrequency: 6
+	property bool wavy
 
-	background: Item {
-		CustomRect {
-			anchors.bottom: parent.bottom
-			anchors.left: parent.left
-			anchors.top: parent.top
-			bottomRightRadius: root.implicitHeight / 6
-			color: root.color
-			implicitWidth: root.handle.x - root.implicitHeight / 2
-			radius: Appearance.rounding.full
-			topRightRadius: root.implicitHeight / 6
-		}
+	signal interaction(v: real)
+
+	implicitHeight: 12
+	implicitWidth: 200
+
+	contentItem: Item {
+		anchors.fill: parent
 
 		CustomRect {
-			anchors.bottom: parent.bottom
+			id: remaining
+
+			anchors.left: handle.right
+			anchors.leftMargin: Appearance.spacing.extraSmall
 			anchors.right: parent.right
-			anchors.top: parent.top
-			bottomLeftRadius: root.implicitHeight / 6
-			color: DynamicColors.tPalette.m3surfaceContainer
-			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2
-			radius: Appearance.rounding.full
-			topLeftRadius: root.implicitHeight / 6
-		}
-	}
-	handle: CustomRect {
 			anchors.verticalCenter: parent.verticalCenter
-		color: root.color
-		implicitHeight: 15
-		implicitWidth: 5
+			bottomLeftRadius: Appearance.rounding.extraSmall / 2
+			color: root.bgColor
+			implicitHeight: parent.height * (parent.height <= 12 ? opacity : Math.min(opacity * 2, 1))
+			opacity: Math.min(width, 12) / 12
+			radius: root.radius
+			topLeftRadius: Appearance.rounding.extraSmall / 2
+		}
+
+		CustomRect {
+			anchors.right: parent.right
+			anchors.rightMargin: 4 * remaining.opacity
+			anchors.verticalCenter: parent.verticalCenter
+			color: root.fgColor
+			implicitHeight: 4 * remaining.opacity
+			implicitWidth: implicitHeight
+			opacity: remaining.opacity
 			radius: Appearance.rounding.full
-		x: root.visualPosition * root.availableWidth - implicitWidth / 2
+		}
+
+		CustomRect {
+			id: handle
+
+			anchors.left: filled.right
+			anchors.leftMargin: Appearance.spacing.extraSmall
+			anchors.verticalCenter: parent.verticalCenter
+			color: root.fgColor
+			implicitHeight: {
+				const t = ZUtils.clamp((parent.height - 12) / 16, 0, 1);
+				const lerp = (a, b) => a + (b - a) * t;
+				return parent.height * (mouse.pressed ? lerp(3.5, 1.5) : lerp(3, 1.2));
+			}
+			implicitWidth: 4
+			radius: Appearance.rounding.full
+
+			Behavior on implicitHeight {
+				Anim {
+					type: Anim.FastSpatial
+				}
+			}
+		}
+
+		Loader {
+			id: filled
+
+			anchors.left: parent.left
+			anchors.verticalCenter: parent.verticalCenter
+			asynchronous: true
+			sourceComponent: root.wavy ? waveComp : lineComp
+		}
+
+		MaterialIcon {
+			id: inset
+
+			readonly property bool attached: root.pos < 0.1
+			property real dockT: attached ? 1 : 0
+
+			anchors.bottom: parent.bottom
+			anchors.top: parent.top
+			color: root.insetColor
+			font.pixelSize: Appearance.font.size.smaller * 2
+			text: root.insetIcon
+			verticalAlignment: Text.AlignVCenter
+			visible: !root.wavy && root.insetIcon !== ""
+			x: Appearance.spacing.extraSmall + dockT * (handle.x + Appearance.spacing.small)
+
+			Behavior on dockT {
+				Anim {
+				}
+			}
+		}
+
+		Component {
+			id: lineComp
+
+			CustomRect {
+				bottomRightRadius: Appearance.rounding.extraSmall / 2
+				color: root.fgColor
+				implicitHeight: root.height
+				implicitWidth: root.filledWidth
+				radius: root.radius
+				topRightRadius: Appearance.rounding.extraSmall / 2
+			}
+		}
+
+		Component {
+			id: waveComp
+
+			WavyLine {
+				color: root.fgColor
+				frequency: root.waveFrequency
+				fullLength: root.width - handle.implicitWidth - handle.anchors.leftMargin
+				implicitHeight: lineWidth * amplitudeMultiplier * 2 + lineWidth
+				implicitWidth: root.filledWidth
+				lineWidth: root.height * 0.7
+				startX: x
+
+				Behavior on color {
+					CAnim {
+					}
+				}
+				Anim on waveProgress {
+					duration: root.waveDuration
+					easing.type: Easing.Linear
+					from: 0
+					loops: Animation.Infinite
+					paused: !root.animateWave
+					running: true
+					to: 1
+				}
+			}
+		}
+	}
+	Behavior on filledWidth {
+		id: widthBehavior
+
+		Anim {
+		}
+	}
+
+	Component.onCompleted: filledWidth = Qt.binding(() => (width - handle.implicitWidth - handle.anchors.leftMargin) * pos)
+
+	Binding {
+		id: posBinding
+
+		property: "pos"
+		target: root
+		value: ZUtils.clamp(mouse.pressStartPos + mouse.dragMovement, 0, 1)
+		when: mouse.pressed
+	}
 
 	MouseArea {
-			acceptedButtons: Qt.NoButton
-			anchors.fill: parent
-			cursorShape: Qt.PointingHandCursor
+		id: mouse
+
+		property real dragMovement
+		property real pressStartPos
+		property real pressStartX
+
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+		implicitHeight: handle.implicitHeight
+		preventStealing: true
+
+		onPositionChanged: e => {
+			dragMovement = (e.x - pressStartX) / width;
+			root.interaction(posBinding.value);
+		}
+		onPressed: e => {
+			widthBehavior.enabled = false;
+			pressStartX = e.x;
+			pressStartPos = root.visualPosition;
+		}
+		onReleased: e => {
+			root.interaction(posBinding.value);
+			widthBehavior.enabled = true;
+			dragMovement = 0;
 		}
 	}
 }

Components/CustomSpinBox.qml

@@ -94,7 +94,9 @@ RowLayout {
 		StateLayer {
 			id: upState
 
-			function onClicked(): void {
+			color: DynamicColors.palette.m3onPrimary
+
+			onClicked: {
 				let newValue = Math.min(root.max, root.value + root.step);
 				// Round to avoid floating point precision errors
 				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
@@ -103,9 +105,6 @@ RowLayout {
 				root.displayText = newValue.toString();
 				root.valueModified(newValue);
 			}
-
-			color: DynamicColors.palette.m3onPrimary
-
 			onPressAndHold: timer.start()
 			onReleased: timer.stop()
 		}
@@ -128,7 +127,9 @@ RowLayout {
 		StateLayer {
 			id: downState
 
-			function onClicked(): void {
+			color: DynamicColors.palette.m3onPrimary
+
+			onClicked: {
 				let newValue = Math.max(root.min, root.value - root.step);
 				// Round to avoid floating point precision errors
 				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
@@ -137,9 +138,6 @@ RowLayout {
 				root.displayText = newValue.toString();
 				root.valueModified(newValue);
 			}
-
-			color: DynamicColors.palette.m3onPrimary
-
 			onPressAndHold: timer.start()
 			onReleased: timer.stop()
 		}

Components/CustomSplitButton.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
 import qs.Config
-import qs.Helpers
 
 Row {
 	id: root
@@ -12,62 +11,46 @@ Row {
 	}
 
 	property alias active: menu.active
-	property color color: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
+	property color colour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
 	property bool disabled
-	property color disabledColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
-	property color disabledTextColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	property color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color disabledTextColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	readonly property alias expandBtn: expandBtn
 	property alias expanded: menu.expanded
 	property string fallbackIcon
 	property string fallbackText
-	property real horizontalPadding: Appearance.padding.normal
-	property alias iconLabel: iconLabel
-	property alias label: label
-	property alias menu: menu
+	property real horizontalPadding: Appearance.padding.larger
+	readonly property alias iconLabel: iconLabel
+	readonly property alias label: label
+	readonly property alias menu: menu
 	property alias menuItems: menu.items
 	property bool menuOnTop
-	property alias stateLayer: stateLayer
-	property color textColor: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+	property real minLeftWidth
+	readonly property alias stateLayer: stateLayer
+	property color textColour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+	readonly property alias textRow: textRow
 	property int type: CustomSplitButton.Filled
-	property real verticalPadding: Appearance.padding.smaller
+	property real verticalPadding: Appearance.padding.small
 
-	function closeDropdown(): void {
-		SettingsDropdowns.close(menu);
-	}
-
-	function openDropdown(): void {
-		SettingsDropdowns.open(menu, root);
-	}
-
-	function toggleDropdown(): void {
-		SettingsDropdowns.toggle(menu, root);
-	}
-
-	spacing: Math.floor(Appearance.spacing.small / 2)
-
-	onExpandedChanged: {
-		if (!expanded)
-			SettingsDropdowns.forget(menu);
-	}
+	spacing: Math.floor(Appearance.spacing.extraSmall)
 
 	CustomRect {
 		bottomRightRadius: Appearance.rounding.small / 2
-		color: !root.enabled ? root.disabledColor : root.color
+		color: root.disabled ? root.disabledColour : root.colour
 		implicitHeight: expandBtn.implicitHeight
-		implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2
+		implicitWidth: Math.max(root.minLeftWidth, textRow.implicitWidth + root.horizontalPadding * 2)
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
 		topRightRadius: Appearance.rounding.small / 2
 
 		StateLayer {
 			id: stateLayer
 
-			function onClicked(): void {
-				root.active?.clicked();
-			}
+			bottomRightRadius: parent.bottomRightRadius
+			color: root.textColour
+			disabled: root.disabled
+			topRightRadius: parent.topRightRadius
 
-			color: root.textColor
-			disabled: !root.enabled
-			rect.bottomRightRadius: parent.bottomRightRadius
-			rect.topRightRadius: parent.topRightRadius
+			onClicked: root.active?.clicked()
 		}
 
 		RowLayout {
@@ -82,7 +65,7 @@ Row {
 
 				Layout.alignment: Qt.AlignVCenter
 				animate: true
-				color: !root.enabled ? root.disabledTextColor : root.textColor
+				color: root.disabled ? root.disabledTextColour : root.textColour
 				fill: 1
 				text: root.active?.activeIcon ?? root.fallbackIcon
 			}
@@ -94,12 +77,12 @@ Row {
 				Layout.preferredWidth: implicitWidth
 				animate: true
 				clip: true
-				color: !root.enabled ? root.disabledTextColor : root.textColor
+				color: root.disabled ? root.disabledTextColour : root.textColour
 				text: root.active?.activeText ?? root.fallbackText
 
 				Behavior on Layout.preferredWidth {
 					Anim {
-						easing.bezierCurve: Appearance.anim.curves.emphasized
+						type: Anim.Emphasized
 					}
 				}
 			}
@@ -112,7 +95,7 @@ Row {
 		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) : Appearance.rounding.small / 2
 
 		bottomLeftRadius: rad
-		color: !root.enabled ? root.disabledColor : root.color
+		color: root.disabled ? root.disabledColour : root.colour
 		implicitHeight: expandIcon.implicitHeight + root.verticalPadding * 2
 		implicitWidth: implicitHeight
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -126,14 +109,12 @@ Row {
 		StateLayer {
 			id: expandStateLayer
 
-			function onClicked(): void {
-				root.toggleDropdown();
-			}
-
-			color: root.textColor
-			disabled: !root.enabled
+			color: root.textColour
+			disabled: root.disabled
 			rect.bottomLeftRadius: parent.bottomLeftRadius
 			rect.topLeftRadius: parent.topLeftRadius
+
+			onClicked: root.expanded = !root.expanded
 		}
 
 		MaterialIcon {
@@ -141,7 +122,7 @@ Row {
 
 			anchors.centerIn: parent
 			anchors.horizontalCenterOffset: root.expanded ? 0 : -Math.floor(root.verticalPadding / 4)
-			color: !root.enabled ? root.disabledTextColor : root.textColor
+			color: root.disabled ? root.disabledTextColour : root.textColour
 			rotation: root.expanded ? 180 : 0
 			text: "expand_more"
 
@@ -154,24 +135,14 @@ Row {
 				}
 			}
 		}
+	}
 
 	Menu {
 		id: menu
 
-			anchors.bottomMargin: Appearance.spacing.small
-			anchors.right: parent.right
-			anchors.top: parent.bottom
-			anchors.topMargin: Appearance.spacing.small
-
-			states: State {
-				when: root.menuOnTop
-
-				AnchorChanges {
-					anchors.bottom: expandBtn.top
-					anchors.top: undefined
-					target: menu
-				}
-			}
-		}
+		attachSideY: root.menuOnTop ? Menu.Top : Menu.Bottom
+		attachTo: expandBtn
+		marginY: Appearance.spacing.small * (root.menuOnTop ? -1 : 1)
+		thisSideY: root.menuOnTop ? Menu.Bottom : Menu.Top
 	}
 }

Components/CustomSplitButtonRow.qml

@@ -9,7 +9,6 @@ Item {
 
 	property alias active: splitButton.active
 	property alias buttonAlias: splitButton
-	property bool enabled: true
 	property alias expanded: splitButton.expanded
 	property int expandedZ: 100
 	required property string label
@@ -25,7 +24,7 @@ Item {
 	implicitHeight: row.implicitHeight + Appearance.padding.smaller * 2
 	opacity: shouldBeActive ? 1 : 0
 	scale: shouldBeActive ? 1 : 0.8
-	z: root.expanded ? expandedZ : -1
+	z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
 
 	Behavior on opacity {
 		Anim {
@@ -50,7 +49,6 @@ Item {
 			color: root.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSurfaceVariant
 			font.pointSize: Appearance.font.size.larger
 			text: root.label
-			z: root.expanded ? root.expandedZ : -1
 		}
 
 		CustomSplitButton {
@@ -58,14 +56,16 @@ Item {
 
 			enabled: root.enabled
 			type: CustomSplitButton.Filled
-			z: root.expanded ? root.expandedZ : -1
+			z: 2
 
 			menu.onItemSelected: item => {
 				root.selected(item);
-				splitButton.closeDropdown();
+			// splitButton.closeDropdown();
 			}
 			stateLayer.onClicked: {
-				splitButton.toggleDropdown();
+				// splitButton.toggleDropdown();
+				splitButton.expanded = !splitButton.expanded;
+				console.log(root.z);
 			}
 		}
 	}

Components/CustomSwitch.qml

@@ -1,6 +1,6 @@
 import QtQuick
-import QtQuick.Templates
 import QtQuick.Shapes
+import QtQuick.Templates
 import qs.Config
 
 Switch {
@@ -13,26 +13,28 @@ Switch {
 
 	indicator: CustomRect {
 		color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
-		implicitHeight: 13 + 7 * 2
+		implicitHeight: Appearance.font.size.medium + Appearance.padding.normal * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Appearance.rounding.full
 
 		CustomRect {
-			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
+			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.2 : implicitHeight
 
 			anchors.verticalCenter: parent.verticalCenter
 			color: root.checked && root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
-			implicitHeight: parent.implicitHeight - 10
+			implicitHeight: parent.implicitHeight - Appearance.padding.extraSmall
 			implicitWidth: nonAnimWidth
 			radius: Appearance.rounding.full
-			x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2
+			x: root.checked ? parent.implicitWidth - nonAnimWidth - Appearance.padding.extraSmall / 2 : Appearance.padding.extraSmall / 2
 
 			Behavior on implicitWidth {
 				Anim {
+					type: Anim.FastSpatial
 				}
 			}
 			Behavior on x {
 				Anim {
+					type: Anim.FastSpatial
 				}
 			}
 
@@ -44,6 +46,7 @@ Switch {
 
 				Behavior on opacity {
 					Anim {
+						type: Anim.DefaultEffects
 					}
 				}
 			}
@@ -63,14 +66,14 @@ Switch {
 				}
 				property point end2: {
 					if (root.pressed)
-						return Qt.point(width, height / 2);
+						return Qt.point(width * 0.8, height / 2);
 					if (root.checked)
 						return Qt.point(width * 0.85, height * 0.2);
 					return Qt.point(width * 0.85, height * 0.15);
 				}
 				property point start1: {
 					if (root.pressed)
-						return Qt.point(width * 0.1, height / 2);
+						return Qt.point(width * 0.2, height / 2);
 					if (root.checked)
 						return Qt.point(width * 0.15, height / 2);
 					return Qt.point(width * 0.15, height * 0.15);
@@ -88,7 +91,7 @@ Switch {
 
 				anchors.centerIn: parent
 				asynchronous: true
-				height: parent.implicitHeight - Appearance.padding.small * 2
+				height: parent.implicitHeight - Appearance.padding.larger
 				preferredRendererType: Shape.CurveRenderer
 				width: height
 
@@ -110,7 +113,7 @@ Switch {
 				}
 
 				ShapePath {
-					capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+					capStyle: ShapePath.RoundCap
 					fillColor: "transparent"
 					startX: icon.start1.x
 					startY: icon.start1.y
@@ -148,8 +151,7 @@ Switch {
 	}
 
 	component PropAnim: PropertyAnimation {
-		duration: MaterialEasing.expressiveEffectsTime
-		easing.bezierCurve: MaterialEasing.expressiveEffects
-		easing.type: Easing.BezierSpline
+		duration: Appearance.anim.durations.expressiveFastSpatial
+		easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
 	}
 }

Components/Elevation.qml

@@ -1,6 +1,6 @@
-import qs.Config
 import QtQuick
 import QtQuick.Effects
+import qs.Config
 
 RectangularShadow {
 	property real dp: [0, 1, 3, 6, 8, 12][level]
@@ -13,6 +13,7 @@ RectangularShadow {
 
 	Behavior on dp {
 		Anim {
+			type: Anim.SlowEffects
 		}
 	}
 }

Components/IconButton.qml

@@ -54,14 +54,14 @@ CustomRect {
 	StateLayer {
 		id: stateLayer
 
-		function onClicked(): void {
+		color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
+		disabled: root.disabled
+
+		onClicked: {
 			if (root.toggle)
 				root.internalChecked = !root.internalChecked;
 			root.clicked();
 		}
-
-		color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
-		disabled: root.disabled
 	}
 
 	MaterialIcon {

Components/Menu.qml

@@ -2,49 +2,107 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 import qs.Config
+import qs.Drawers
 
-Elevation {
+MouseArea {
 	id: root
 
+	enum Side {
+		Top,
+		Bottom,
+		Left,
+		Right
+	}
+
 	property MenuItem active: items[0] ?? null
+	property int attachSideX: Menu.Right
+	property int attachSideY: Menu.Bottom
+	required property Item attachTo
 	property bool expanded
 	property list<MenuItem> items
+	property real marginX
+	property real marginY
+	property int thisSideX: Menu.Right
+	property int thisSideY: Menu.Top
 
 	signal itemSelected(item: MenuItem)
 
-	implicitHeight: root.expanded ? column.implicitHeight + Appearance.padding.small * 2 : 0
-	implicitWidth: Math.max(200, column.implicitWidth)
-	level: 2
-	opacity: root.expanded ? 1 : 0
-	radius: Appearance.rounding.normal
+	anchors.fill: parent
+	enabled: expanded
+	layer.enabled: opacity < 1
+	opacity: expanded ? 1 : 0
+	parent: {
+		const win = QsWindow.window;
+		const contentWin = win as Windows;
+		return contentWin ? contentWin.interactionWrapper : (win as QsWindow).contentItem;
+	}
 
-	Behavior on implicitHeight {
-		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		}
-	}
 	Behavior on opacity {
 		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			type: Anim.DefaultEffects
 		}
 	}
 
-	CustomClippingRect {
+	onClicked: expanded = false
+
+	TransformWatcher {
+		id: watcher
+
+		a: root.parent
+		b: root.attachTo
+	}
+
+	Elevation {
+		id: menu
+
+		implicitHeight: column.implicitHeight + column.anchors.margins * 2
+		implicitWidth: Math.max(200, column.implicitWidth + column.anchors.margins * 2)
+		level: 2
+		radius: Appearance.rounding.medium
+		x: {
+			watcher.transform;
+			const item = root.attachTo;
+			let off = root.attachSideX === Menu.Left ? 0 : item.width;
+			if (root.thisSideX === Menu.Right)
+				off -= width;
+			return item.mapToItem(root.parent, off, 0).x + root.marginX;
+		}
+		y: {
+			watcher.transform;
+			const item = root.attachTo;
+			let off = root.attachSideY === Menu.Top ? 0 : item.height;
+			if (root.thisSideY === Menu.Bottom)
+				off -= height;
+			return item.mapToItem(root.parent, 0, off).y + root.marginY;
+		}
+
+		transform: Scale {
+			origin.y: root.thisSideY === Menu.Bottom ? menu.height : 0
+			yScale: root.expanded ? 1 : 0.1
+
+			Behavior on yScale {
+				Anim {
+				}
+			}
+		}
+
+		CustomRect {
 			anchors.fill: parent
-		color: DynamicColors.palette.m3surfaceContainer
+			color: DynamicColors.palette.m3surfaceContainerLow
 			radius: parent.radius
 
 			ColumnLayout {
 				id: column
 
-			anchors.left: parent.left
-			anchors.right: parent.right
-			anchors.verticalCenter: parent.verticalCenter
-			spacing: 5
+				anchors.fill: parent
+				anchors.margins: Appearance.padding.extraSmall
+				spacing: Appearance.spacing.extraSmall
 
 				Repeater {
+					id: repeater
+
 					model: root.items
 
 					CustomRect {
@@ -55,25 +113,25 @@ Elevation {
 						required property MenuItem modelData
 
 						Layout.fillWidth: true
-					implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.normal * 2
-					implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.normal * 2
+						color: Qt.alpha(DynamicColors.palette.m3tertiaryContainer, active ? 1 : 0)
+						implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.larger * 2
+						implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.larger * 2
+						radius: Appearance.rounding.small
 
-					CustomRect {
-						anchors.fill: parent
-						anchors.leftMargin: Appearance.padding.small
-						anchors.rightMargin: Appearance.padding.small
-						color: Qt.alpha(DynamicColors.palette.m3secondaryContainer, active ? 1 : 0)
-						radius: Appearance.rounding.normal - Appearance.padding.small
-
-						StateLayer {
-							function onClicked(): void {
-								root.itemSelected(item.modelData);
-								root.active = item.modelData;
-								root.expanded = false;
+						Behavior on radius {
+							Anim {
+							}
 						}
 
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+						StateLayer {
+							color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
 							disabled: !root.expanded
+
+							onClicked: {
+								root.itemSelected(item.modelData);
+								root.active = item.modelData;
+								item.modelData.clicked();
+								root.expanded = false;
 							}
 						}
 
@@ -81,29 +139,30 @@ Elevation {
 							id: menuOptionRow
 
 							anchors.fill: parent
-						anchors.margins: Appearance.padding.normal
+							anchors.margins: Appearance.padding.larger
 							spacing: Appearance.spacing.small
 
 							MaterialIcon {
 								Layout.alignment: Qt.AlignVCenter
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurfaceVariant
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
 								text: item.modelData.icon
 							}
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter
 								Layout.fillWidth: true
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
 								text: item.modelData.text
 							}
 
 							Loader {
 								Layout.alignment: Qt.AlignVCenter
 								active: item.modelData.trailingIcon.length > 0
+								asynchronous: true
 								visible: active
 
 								sourceComponent: MaterialIcon {
-								color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+									color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
 									text: item.modelData.trailingIcon
 								}
 							}
@@ -112,4 +171,5 @@ Elevation {
 				}
 			}
 		}
+	}
 }

Components/StateLayer.qml

@@ -1,15 +1,53 @@
-import qs.Config
 import QtQuick
+import QtQuick.Shapes
+import ZShell
+import ZShell.Components
+import qs.Helpers
+import qs.Config
 
 MouseArea {
 	id: root
 
-	property color color: DynamicColors.palette.m3onSurface
+	property alias bottomLeftRadius: base.bottomLeftRadius
+	property alias bottomRightRadius: base.bottomRightRadius
+	property real circleRadius
+	property alias color: base.color
 	property bool disabled
-	property real radius: parent?.radius ?? 0
-	property alias rect: hoverLayer
+	readonly property real endRadius: {
+		const d1 = distSq(0, 0);
+		const d2 = distSq(width, 0);
+		const d3 = distSq(0, height);
+		const d4 = distSq(width, height);
+		return (Math.sqrt(Math.max(d1, d2, d3, d4)) + (shapeMorph ? 24 : 0)) * 1.3;
+	}
+	property real endRadiusAtPress
+	property bool manualPressOverride
+	property real pressX: width / 2
+	property real pressY: height / 2
+	property alias radius: base.radius
+	readonly property alias rect: base
+	property bool shapeMorph
+	property bool showHoverBackground: true
+	property real stateOpacity: containsMouse ? 0.08 : 0
+	property alias topLeftRadius: base.topLeftRadius
+	property alias topRightRadius: base.topRightRadius
 
-	function onClicked(): void {
+	function clamp(r: real): real {
+		return Math.max(0, Math.min(r, width / 2, height / 2));
+	}
+
+	function distSq(x: real, y: real): real {
+		return (pressX - x) ** 2 + (pressY - y) ** 2;
+	}
+
+	function press(x: real, y: real): void {
+		pressX = x;
+		pressY = y;
+		fadeAnim.complete();
+		circleRadius = 0;
+		circle.opacity = 0.1;
+		rippleAnim.restart();
+		endRadiusAtPress = endRadius;
 	}
 
 	anchors.fill: parent
@@ -17,79 +55,146 @@ MouseArea {
 	enabled: !disabled
 	hoverEnabled: true
 
-	onClicked: event => !disabled && onClicked(event)
-	onPressed: event => {
-		if (disabled)
-			return;
-
-		rippleAnim.x = event.x;
-		rippleAnim.y = event.y;
-
-		const dist = (ox, oy) => ox * ox + oy * oy;
-		rippleAnim.radius = Math.sqrt(Math.max(dist(event.x, event.y), dist(event.x, height - event.y), dist(width - event.x, event.y), dist(width - event.x, height - event.y)));
-
-		rippleAnim.restart();
+	Behavior on stateOpacity {
+		Anim {
+			type: Anim.DefaultEffects
+		}
 	}
 
-	SequentialAnimation {
+	onCircleRadiusChanged: {
+		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
+			fadeAnim.start();
+	}
+	onClicked: event => !disabled && onClicked(event)
+	onManualPressOverrideChanged: {
+		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
+			fadeAnim.start();
+	}
+	onPressed: e => press(e.x, e.y)
+	onPressedChanged: {
+		if (!(pressed || manualPressOverride) && !rippleAnim.running && circle.opacity > 0)
+			fadeAnim.start();
+	}
+
+	Anim {
 		id: rippleAnim
 
-		property real radius
-		property real x
-		property real y
-
-		PropertyAction {
-			property: "x"
-			target: ripple
-			value: rippleAnim.x
-		}
-
-		PropertyAction {
-			property: "y"
-			target: ripple
-			value: rippleAnim.y
-		}
-
-		PropertyAction {
-			property: "opacity"
-			target: ripple
-			value: 0.08
+		alwaysRunToEnd: true
+		duration: Appearance.anim.durations.expressiveSlowEffects * 2
+		easing.bezierCurve: Appearance.anim.curves.standard
+		property: "circleRadius"
+		target: root
+		to: root.endRadius
 	}
 
 	Anim {
-			easing.bezierCurve: MaterialEasing.standardDecel
-			from: 0
-			properties: "implicitWidth,implicitHeight"
-			target: ripple
-			to: rippleAnim.radius * 2
-		}
+		id: fadeAnim
 
-		Anim {
 		property: "opacity"
-			target: ripple
+		target: circle
 		to: 0
+		type: Anim.SlowEffects
 	}
-	}
-
-	CustomClippingRect {
-		id: hoverLayer
-
-		anchors.fill: parent
-		border.pixelAligned: false
-		color: Qt.alpha(root.color, root.disabled ? 0 : root.pressed ? 0.1 : root.containsMouse ? 0.08 : 0)
-		radius: root.radius
 
 	CustomRect {
-			id: ripple
+		id: base
 
-			border.pixelAligned: false
-			color: root.color
+		anchors.fill: parent
+		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
+		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
+		color: DynamicColors.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
+		topLeftRadius: root.parent?.topLeftRadius ?? radius ?? 0
+		topRightRadius: root.parent?.topRightRadius ?? radius ?? 0
+		// qmllint enable missing-property
+	}
+
+	Shape {
+		id: circle
+
+		anchors.fill: parent
 		opacity: 0
-			radius: Appearance.rounding.full
+		preferredRendererType: Shape.CurveRenderer
 
-			transform: Translate {
-				x: -ripple.width / 2
-				y: -ripple.height / 2
+		ShapePath {
+			fillColor: base.color
+			startX: root.clamp(base.topLeftRadius)
+			startY: 0
+			strokeColor: "transparent"
+			strokeWidth: 0
+
+			fillGradient: RadialGradient {
+				centerRadius: root.circleRadius
+				centerX: root.pressX
+				centerY: root.pressY
+				focalX: centerX
+				focalY: centerY
+
+				GradientStop {
+					color: Qt.alpha(base.color, 1)
+					position: 0
+				}
+
+				GradientStop {
+					color: Qt.alpha(base.color, 1)
+					position: ZUtils.clamp(1 - 0.2 * root.endRadius / root.circleRadius, 0.01, 0.99)
+				}
+
+				GradientStop {
+					color: Qt.alpha(base.color, ZUtils.clamp((root.circleRadius / root.endRadius - 0.9) / 0.1, 0, 1))
+					position: 1
+				}
+			}
+
+			PathLine {
+				x: root.width - root.clamp(base.topRightRadius)
+				y: 0
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.topRightRadius)
+				radiusY: root.clamp(base.topRightRadius)
+				relativeX: root.clamp(base.topRightRadius)
+				relativeY: root.clamp(base.topRightRadius)
+			}
+
+			PathLine {
+				x: root.width
+				y: root.height - root.clamp(base.bottomRightRadius)
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.bottomRightRadius)
+				radiusY: root.clamp(base.bottomRightRadius)
+				relativeX: -root.clamp(base.bottomRightRadius)
+				relativeY: root.clamp(base.bottomRightRadius)
+			}
+
+			PathLine {
+				x: root.clamp(base.bottomLeftRadius)
+				y: root.height
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.bottomLeftRadius)
+				radiusY: root.clamp(base.bottomLeftRadius)
+				relativeX: -root.clamp(base.bottomLeftRadius)
+				relativeY: -root.clamp(base.bottomLeftRadius)
+			}
+
+			PathLine {
+				x: 0
+				y: root.clamp(base.topLeftRadius)
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.topLeftRadius)
+				radiusY: root.clamp(base.topLeftRadius)
+				x: root.clamp(base.topLeftRadius)
+				y: 0
 			}
 		}
 	}

Config/Appearance.qml

@@ -7,8 +7,6 @@ Singleton {
 	readonly property AppearanceConf.Deform deform: Config.appearance.deform
 	readonly property AppearanceConf.FontStuff font: Config.appearance.font
 	readonly property AppearanceConf.Padding padding: Config.appearance.padding
-	// Literally just here to shorten accessing stuff :woe:
-	// Also kinda so I can keep accessing it with `Appearance.xxx` instead of `Conf.appearance.xxx`
 	readonly property AppearanceConf.Rounding rounding: Config.appearance.rounding
 	readonly property AppearanceConf.Spacing spacing: Config.appearance.spacing
 	readonly property AppearanceConf.Transparency transparency: Config.appearance.transparency

Config/AppearanceConf.qml

@@ -28,9 +28,13 @@ JsonObject {
 		property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
 		property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
 		property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+		property list<real> expressiveDefaultEffects: [0.34, 0.8, 0.34, 1, 1, 1]
 		property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
 		property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+		property list<real> expressiveFastEffects: [0.31, 0.94, 0.34, 1, 1, 1]
 		property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
+		property list<real> expressiveSlowEffects: [0.34, 0.88, 0.34, 1, 1, 1]
+		property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
 		property list<real> standard: [0.2, 0, 0, 1, 1, 1]
 		property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
 		property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
@@ -38,7 +42,9 @@ JsonObject {
 	component AnimDurations: JsonObject {
 		property int expressiveDefaultSpatial: 500 * scale
 		property int expressiveEffects: 200 * scale
+		property int expressiveFastEffects: 150 * scale
 		property int expressiveFastSpatial: 350 * scale
+		property int expressiveSlowEffects: 300 * scale
 		property int extraLarge: 1000 * scale
 		property int large: 600 * scale
 		property int normal: 400 * scale
@@ -57,7 +63,8 @@ JsonObject {
 	component FontSize: JsonObject {
 		property int extraLarge: 28 * scale
 		property int large: 18 * scale
-		property int larger: 15 * scale
+		property int larger: 16 * scale
+		property int medium: 14 * scale
 		property int normal: 13 * scale
 		property real scale: 1
 		property int small: 11 * scale
@@ -70,23 +77,28 @@ JsonObject {
 		}
 	}
 	component Padding: JsonObject {
-		property int large: 15 * scale
-		property int larger: 13 * scale
-		property int normal: 9 * scale
+		property int extraLargeIncreased: 32 * scale
+		property int extraSmall: 4 * scale
+		property int large: 16 * scale
+		property int larger: 12 * scale
+		property int normal: 8 * scale
 		property real scale: 1
 		property int small: 5 * scale
 		property int smaller: 7 * scale
 		property int smallest: 2 * scale
 	}
 	component Rounding: JsonObject {
+		property int extraSmall: 4 * scale
 		property int full: 1000 * scale
 		property int large: 24 * scale
+		property int medium: 16 * scale
 		property int normal: 18 * scale
 		property real scale: 1
 		property int small: 12 * scale
 		property int smallest: 8 * scale
 	}
 	component Spacing: JsonObject {
+		property int extraSmall: 4 * scale
 		property int large: 20 * scale
 		property int larger: 16 * scale
 		property int normal: 12 * scale

Config/DynamicColors.qml

@@ -115,6 +115,10 @@ Singleton {
 		Config.save();
 	}
 
+	function swapRG(c: color): color {
+		return Qt.rgba(c.g, c.r, c.b, c.a);
+	}
+
 	Component.onCompleted: debounceTimer.triggered()
 
 	Connections {

Daemons/BatteryService.qml

@@ -4,17 +4,16 @@ import QtQuick
 import ZShell
 import qs.Config
 import qs.Components.Toast
+import qs.Helpers
 
 Scope {
 	id: root
 
-	readonly property real currentPerc: UPower.displayDevice.percentage
 	readonly property list<var> popupThresholds: [...Config.general.battery.popupThresholds].sort((a, b) => b.perc - a.perc)
 
 	function nearestThresholdAbove(p: real): var {
 		const thresholds = [...root.popupThresholds];
 		for (const perc of thresholds) {
-			console.log(perc.message);
 			if (p < perc.perc)
 				return perc;
 		}
@@ -24,13 +23,13 @@ Scope {
 
 	Connections {
 		function onOnBatteryChanged(): void {
-			if (!UPower.displayDevice.ready)
+			if (!Battery.ready)
 				return;
 
-			if (UPower.onBattery) {
+			if (Battery.onBattery) {
 				if (Config.utilities.toasts.chargingChanged)
 					Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is discharging"), "power_off");
-				const p = root.currentPerc * 100;
+				const p = Battery.currentPerc * 100;
 				const perc = root.nearestThresholdAbove(p);
 				if (perc)
 					Toaster.toast(perc.title ?? qsTr("Battery warning"), perc.message ?? qsTr("Battery is low"), perc.icon ?? "battery_android_alert", perc.critical ? Toast.Error : Toast.Warning);
@@ -40,15 +39,15 @@ Scope {
 			}
 		}
 
-		target: UPower
+		target: Battery
 	}
 
 	Connections {
-		function onPercentageChanged(): void {
-			if (!UPower.onBattery)
+		function onCurrentPercChanged(): void {
+			if (!Battery.onBattery)
 				return;
 
-			const p = root.currentPerc * 100;
+			const p = Battery.currentPerc * 100;
 			for (const perc of root.popupThresholds) {
 				if (p == perc.perc) {
 					Toaster.toast(perc.title ?? qsTr("Battery warning"), perc.message ?? qsTr("Battery perc is low"), perc.icon ?? "battery_android_alert", perc.critical ? Toast.Error : Toast.Warning);
@@ -57,15 +56,15 @@ Scope {
 		}
 
 		function onReadyChanged(): void {
-			if (!UPower.displayDevice.ready)
+			if (!Battery.ready)
 				return;
 
-			const p = root.currentPerc * 100;
+			const p = Battery.currentPerc * 100;
 			const perc = root.nearestThresholdAbove(p);
 			if (perc)
 				Toaster.toast(perc.title ?? qsTr("Battery warning"), perc.message ?? qsTr("Battery is low"), perc.icon ?? "battery_android_alert", perc.critical ? Toast.Error : Toast.Warning);
 		}
 
-		target: UPower.displayDevice
+		target: Battery
 	}
 }

Drawers/Drawers.qml

@@ -0,0 +1,25 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+
+Variants {
+	model: Quickshell.screens
+
+	Scope {
+		id: scope
+
+		required property ShellScreen modelData
+
+		Exclusions {
+			bar: content.bar
+			screen: scope.modelData
+		}
+
+		Windows {
+			id: content
+
+			screen: scope.modelData
+		}
+	}
+}

Drawers/Interactions.qml

@@ -16,6 +16,7 @@ Item {
 	required property Panels panels
 	required property BarPopouts.Wrapper popouts
 	required property ShellScreen screen
+	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
 	required property PersistentProperties visibilities
 
@@ -54,57 +55,61 @@ Item {
 	anchors.fill: parent
 
 	DragHandler {
-		id: multiHandler
-
-		dragThreshold: 0
-		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything
-		maximumPointCount: 2
-		minimumPointCount: 2
-		target: null
-
-		onCentroidChanged: {
-			const x = centroid.position.x;
-			const y = centroid.position.y;
-			const dragX = x - centroid.pressPosition.x;
-			const dragY = y - centroid.pressPosition.y;
-
-			if (centroid.pressPosition.x > root.screen.width - Config.barConfig.border && dragX < -20)
-				root.visibilities.sidebar = true;
-		}
-	}
-
-	DragHandler {
-		id: pressHandler
+		id: singleHandler
 
 		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
 		dragThreshold: 0
-		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything
+		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfSameType | PointerHandler.ApprovesTakeOverByAnything
 		maximumPointCount: 1
 		minimumPointCount: 1
 		target: null
 
+		onActiveChanged: {
+			if (!active)
+				root.singleGestureTriggered = false;
+		}
 		onCentroidChanged: {
 			const x = centroid.position.x;
 			const y = centroid.position.y;
 			const dragX = x - centroid.pressPosition.x;
 			const dragY = y - centroid.pressPosition.y;
 
+			if (centroid.pressPosition.y >= root.screen.height - Config.barConfig.border && dragY < -200)
+				root.visibilities.launcher = true;
+
+			if (root.singleGestureTriggered)
+				return;
+
 			if (centroid.pressPosition.y < root.bar.implicitHeight) {
-				if (dragY > 20)
+				if (dragY > 20) {
 					root.visibilities.settings = true;
-				else if (dragY < -20)
+					root.singleGestureTriggered = true;
+				} else if (dragY < -20) {
 					root.visibilities.settings = false;
+					root.singleGestureTriggered = true;
+				}
 			}
 
 			if (!Config.dock.hoverToReveal && centroid.pressPosition.y > root.screen.height - root.bar.implicitHeight)
-				if (dragY < -10)
+				if (dragY < -10) {
 					root.visibilities.dock = true;
+					root.singleGestureTriggered = true;
+				}
 
-			if (centroid.pressPosition.x >= root.screen.width - Config.barConfig.border && dragX < -20)
+			if (centroid.pressPosition.x > root.screen.width - Config.barConfig.border && centroid.pressPosition.y < (root.screen.height / 2) && dragX < -20) {
+				root.visibilities.sidebar = true;
+				root.singleGestureTriggered = true;
+			}
+
+			if (centroid.pressPosition.x >= root.screen.width - Config.barConfig.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 (centroid.pressPosition.x <= Config.barConfig.border && dragX > 20)
+			if (centroid.pressPosition.x <= Config.barConfig.border && dragX > 20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
+				root.singleGestureTriggered = true;
+			}
 		}
 	}
 

Drawers/Windows.qml

@@ -9,29 +9,17 @@ import Quickshell.Hyprland
 import ZShell.Blobs
 import qs.Daemons
 import qs.Components
-import qs.Modules
 import qs.Modules.Bar
 import qs.Config
 import qs.Helpers
 import qs.Drawers
 
-Variants {
-	model: Quickshell.screens
-
-	Scope {
-		id: scope
-
-		required property var modelData
-
-		Exclusions {
-			bar: bar
-			screen: scope.modelData
-		}
-
-		CustomWindow {
-			id: win
+CustomWindow {
+	id: root
 
+	readonly property alias bar: bar
 	readonly property bool hasFullscreen: Hypr.monitorFor(screen)?.activeWorkspace?.toplevels.values.some(t => t.lastIpcObject.fullscreen === 2)
+	readonly property alias interactionWrapper: interactions
 	property var root: Quickshell.shellDir
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
@@ -40,7 +28,6 @@ Variants {
 	contentItem.focus: true
 	mask: visibilities.isDrawing ? null : region
 	name: "Bar"
-			screen: scope.modelData
 
 	contentItem.Keys.onEscapePressed: {
 		if (Config.barConfig.autoHide)
@@ -62,10 +49,10 @@ Variants {
 	Region {
 		id: region
 
-				height: win.height - bar.implicitHeight - Config.barConfig.border
+		height: root.height - bar.implicitHeight - Config.barConfig.border
 		intersection: Intersection.Xor
 		regions: popoutRegions.instances
-				width: win.width - Config.barConfig.border * 2
+		width: root.width - Config.barConfig.border * 2
 		x: Config.barConfig.border
 		y: bar.implicitHeight
 	}
@@ -97,7 +84,7 @@ Variants {
 		id: focusGrab
 
 		active: visibilities.dock || visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu"))
-				windows: [win]
+		windows: [root]
 
 		onCleared: {
 			visibilities.launcher = false;
@@ -125,7 +112,7 @@ Variants {
 		property bool settings
 		property bool sidebar
 
-				Component.onCompleted: Visibilities.load(scope.modelData, this)
+		Component.onCompleted: Visibilities.load(root.screen, this)
 	}
 
 	IpcHandler {
@@ -310,7 +297,6 @@ Variants {
 
 		active: visibilities.isDrawing
 		anchors.fill: parent
-				z: 2
 
 		sourceComponent: Drawing {
 			id: drawing
@@ -336,7 +322,7 @@ Variants {
 	}
 
 	Interactions {
-				id: mouseArea
+		id: interactions
 
 		anchors.fill: parent
 		bar: bar
@@ -345,16 +331,15 @@ Variants {
 		input: inputLoader.item
 		panels: panels
 		popouts: panels.popouts
-				screen: scope.modelData
+		screen: root.screen
 		visibilities: visibilities
-				z: 1
 
 		Panels {
 			id: panels
 
 			bar: bar
 			drawingItem: drawingLoader.item
-					screen: scope.modelData
+			screen: root.screen
 			visibilities: visibilities
 
 			dashboard.transform: Matrix4x4 {
@@ -396,12 +381,10 @@ Variants {
 			anchors.right: parent.right
 			popouts: panels.popouts
 			popoutsWrapper: panels.popoutsWrapper
-					screen: scope.modelData
+			screen: root.screen
 			visibilities: visibilities
 		}
 	}
-		}
-	}
 
 	component PanelBg: BlobRect {
 		property real deformAmount: 0.15

Greeter/Center.qml

@@ -118,12 +118,12 @@ ColumnLayout {
 		}
 
 		StateLayer {
-			function onClicked(): void {
-				parent.forceActiveFocus();
-			}
-
 			cursorShape: Qt.IBeamCursor
 			hoverEnabled: false
+
+			onClicked: {
+				parent.forceActiveFocus();
+			}
 		}
 
 		RowLayout {
@@ -179,11 +179,11 @@ ColumnLayout {
 				radius: Appearance.rounding.full
 
 				StateLayer {
-					function onClicked(): void {
+					color: root.greeter.buffer && !root.greeter.launching ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+
+					onClicked: {
 						root.greeter.submit();
 					}
-
-					color: root.greeter.buffer && !root.greeter.launching ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
 				}
 
 				MaterialIcon {

Greeter/Components/Anim.qml

@@ -2,7 +2,62 @@ import QtQuick
 import qs.Config
 
 NumberAnimation {
-	duration: MaterialEasing.standardTime
-	easing.bezierCurve: MaterialEasing.standard
-	easing.type: Easing.BezierSpline
+	enum Type {
+		StandardSmall = 0,
+		Standard,
+		StandardLarge,
+		StandardExtraLarge,
+		EmphasizedSmall,
+		Emphasized,
+		EmphasizedLarge,
+		EmphasizedExtraLarge,
+		FastSpatial,
+		DefaultSpatial,
+		SlowSpatial,
+		FastEffects,
+		DefaultEffects,
+		SlowEffects
+	}
+
+	property int type: Anim.DefaultSpatial
+
+	duration: {
+		if (type < Anim.StandardSmall || type > Anim.SlowEffects)
+			return Appearance.anim.durations.normal;
+
+		if (type === Anim.FastSpatial)
+			return Appearance.anim.durations.expressiveFastSpatial;
+		if (type === Anim.DefaultSpatial)
+			return Appearance.anim.durations.expressiveDefaultSpatial;
+		if (type === Anim.SlowSpatial)
+			return Appearance.anim.durations.large;
+		if (type === Anim.FastEffects)
+			return Appearance.anim.durations.expressiveFastEffects;
+		if (type === Anim.DefaultEffects)
+			return Appearance.anim.durations.expressiveEffects;
+		if (type === Anim.SlowEffects)
+			return Appearance.anim.durations.expressiveSlowEffects;
+
+		const types = ["small", "normal", "large", "extraLarge"];
+		const idx = type % 4; // 0-7 are the 4 standard types
+		return Appearance.anim.durations[types[idx]];
+	}
+	easing.bezierCurve: {
+		if (type === Anim.FastSpatial)
+			return Appearance.anim.curves.expressiveFastSpatial;
+		if (type === Anim.DefaultSpatial)
+			return Appearance.anim.curves.expressiveDefaultSpatial;
+		if (type === Anim.SlowSpatial)
+			return Appearance.anim.curves.expressiveSlowSpatial;
+		if (type === Anim.FastEffects)
+			return Appearance.anim.curves.expressiveFastEffects;
+		if (type === Anim.DefaultEffects)
+			return Appearance.anim.curves.expressiveDefaultEffects;
+		if (type === Anim.SlowEffects)
+			return Appearance.anim.curves.expressiveSlowEffects;
+
+		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
+			return Appearance.anim.curves.emphasized;
+		return Appearance.anim.curves.standard;
+	}
 }

Greeter/Components/CollapsibleSection.qml

@@ -59,15 +59,15 @@ ColumnLayout {
 		}
 
 		StateLayer {
-			function onClicked(): void {
-				root.toggleRequested();
-				root.expanded = !root.expanded;
-			}
-
 			anchors.fill: parent
 			color: DynamicColors.palette.m3onSurface
 			radius: Appearance.rounding.normal
 			showHoverBackground: false
+
+			onClicked: {
+				root.toggleRequested();
+				root.expanded = !root.expanded;
+			}
 		}
 	}
 

Greeter/Components/CustomButton.qml

@@ -23,10 +23,10 @@ Button {
 	}
 
 	StateLayer {
-		function onClicked(): void {
+		radius: control.radius
+
+		onClicked: {
 			control.clicked();
 		}
-
-		radius: control.radius
 	}
 }

Greeter/Components/CustomRadioButton.qml

@@ -33,13 +33,13 @@ RadioButton {
 		}
 
 		StateLayer {
-			function onClicked(): void {
-				root.click();
-			}
-
 			anchors.margins: -7
 			color: root.checked ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3primary
 			z: -1
+
+			onClicked: {
+				root.click();
+			}
 		}
 
 		CustomRect {

Greeter/Components/CustomSlider.qml

@@ -1,45 +1,174 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Templates
+import ZShell.Components
+import ZShell
+import qs.Components
 import qs.Config
 
 Slider {
 	id: root
 
-	background: Item {
+	property bool animateWave
+	property color bgColor: enabled ? DynamicColors.palette.m3secondaryContainer : Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color fgColor: enabled ? DynamicColors.palette.m3primary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	property real filledWidth
+	property real pos: visualPosition
+	property int waveDuration: 1000
+	property real waveFrequency: 6
+	property bool wavy
+
+	signal interaction(v: real)
+
+	implicitHeight: 12
+	implicitWidth: 200
+
+	contentItem: Item {
+		anchors.fill: parent
+
 		CustomRect {
-			anchors.bottom: parent.bottom
-			anchors.left: parent.left
-			anchors.top: parent.top
-			bottomRightRadius: root.implicitHeight / 6
-			color: DynamicColors.palette.m3primary
-			implicitWidth: root.handle.x - root.implicitHeight / 2
-			radius: Appearance.rounding.full
-			topRightRadius: root.implicitHeight / 6
+			id: remaining
+
+			anchors.left: handle.right
+			anchors.leftMargin: Appearance.spacing.extraSmall
+			anchors.right: parent.right
+			anchors.verticalCenter: parent.verticalCenter
+			bottomLeftRadius: Appearance.rounding.extraSmall / 2
+			color: root.bgColor
+			implicitHeight: parent.height * (parent.height <= 12 ? opacity : Math.min(opacity * 2, 1))
+			opacity: Math.min(width, 12) / 12
+			radius: Appearance.rounding.small
+			topLeftRadius: Appearance.rounding.extraSmall / 2
 		}
 
 		CustomRect {
-			anchors.bottom: parent.bottom
 			anchors.right: parent.right
-			anchors.top: parent.top
-			bottomLeftRadius: root.implicitHeight / 6
-			color: DynamicColors.tPalette.m3surfaceContainer
-			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2
-			radius: Appearance.rounding.full
-			topLeftRadius: root.implicitHeight / 6
-		}
-	}
-	handle: CustomRect {
+			anchors.rightMargin: 4 * remaining.opacity
 			anchors.verticalCenter: parent.verticalCenter
-		color: DynamicColors.palette.m3primary
-		implicitHeight: 15
-		implicitWidth: 5
+			color: root.fgColor
+			implicitHeight: 4 * remaining.opacity
+			implicitWidth: implicitHeight
+			opacity: remaining.opacity
 			radius: Appearance.rounding.full
-		x: root.visualPosition * root.availableWidth - implicitWidth / 2
+		}
+
+		CustomRect {
+			id: handle
+
+			anchors.left: filled.right
+			anchors.leftMargin: Appearance.spacing.extraSmall
+			anchors.verticalCenter: parent.verticalCenter
+			color: root.fgColor
+			implicitHeight: {
+				const mult = parent.height <= 12 ? 3 : 1.2;
+				const pressMult = parent.height <= 12 ? 4 : 1.5;
+				return parent.height * (mouse.pressed ? pressMult : mult);
+			}
+			implicitWidth: 4
+			radius: Appearance.rounding.full
+
+			Behavior on implicitHeight {
+				Anim {
+					type: Anim.FastSpatial
+				}
+			}
+		}
+
+		Loader {
+			id: filled
+
+			anchors.left: parent.left
+			anchors.verticalCenter: parent.verticalCenter
+			asynchronous: true
+			sourceComponent: root.wavy ? waveComp : lineComp
+		}
+
+		Component {
+			id: lineComp
+
+			CustomRect {
+				bottomRightRadius: Appearance.rounding.extraSmall / 2
+				color: root.fgColor
+				implicitHeight: root.height
+				implicitWidth: root.filledWidth
+				radius: Appearance.rounding.small
+				topRightRadius: Appearance.rounding.extraSmall / 2
+			}
+		}
+
+		Component {
+			id: waveComp
+
+			WavyLine {
+				color: root.fgColor
+				frequency: root.waveFrequency
+				fullLength: root.width - handle.implicitWidth - handle.anchors.leftMargin
+				implicitHeight: lineWidth * amplitudeMultiplier * 2 + lineWidth
+				implicitWidth: root.filledWidth
+				lineWidth: root.height * 0.7
+				startX: x
+
+				Behavior on color {
+					CAnim {
+					}
+				}
+				Anim on waveProgress {
+					duration: root.waveDuration
+					easing.type: Easing.Linear
+					from: 0
+					loops: Animation.Infinite
+					paused: !root.animateWave
+					running: true
+					to: 1
+				}
+			}
+		}
+	}
+	Behavior on filledWidth {
+		id: widthBehavior
+
+		Anim {
+		}
+	}
+
+	Component.onCompleted: filledWidth = Qt.binding(() => (width - handle.implicitWidth - handle.anchors.leftMargin) * pos)
+
+	Binding {
+		id: posBinding
+
+		property: "pos"
+		target: root
+		value: ZUtils.clamp(mouse.pressStartPos + mouse.dragMovement, 0, 1)
+		when: mouse.pressed
+	}
 
 	MouseArea {
-			acceptedButtons: Qt.NoButton
-			anchors.fill: parent
-			cursorShape: Qt.PointingHandCursor
+		id: mouse
+
+		property real dragMovement
+		property real pressStartPos
+		property real pressStartX
+
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+		implicitHeight: handle.implicitHeight
+		preventStealing: true
+
+		onPositionChanged: e => {
+			dragMovement = (e.x - pressStartX) / width;
+			root.interaction(posBinding.value);
+		}
+		onPressed: e => {
+			widthBehavior.enabled = false;
+			pressStartX = e.x;
+			pressStartPos = root.visualPosition;
+		}
+		onReleased: e => {
+			root.interaction(posBinding.value);
+			widthBehavior.enabled = true;
+			dragMovement = 0;
 		}
 	}
 }

Greeter/Components/CustomSpinBox.qml

@@ -28,6 +28,7 @@ RowLayout {
 	CustomTextField {
 		id: textField
 
+		color: root.enabled ? DynamicColors.palette.m3onSurface : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
 		implicitHeight: upButton.implicitHeight
 		inputMethodHints: Qt.ImhFormattedNumbersOnly
 		leftPadding: Appearance.padding.normal
@@ -36,7 +37,7 @@ RowLayout {
 		text: root.isEditing ? text : root.displayText
 
 		background: CustomRect {
-			color: DynamicColors.tPalette.m3surfaceContainerHigh
+			color: root.enabled ? DynamicColors.tPalette.m3surfaceContainerHigh : DynamicColors.tPalette.m3surfaceContainerLow
 			implicitWidth: 100
 			radius: Appearance.rounding.full
 		}
@@ -85,7 +86,7 @@ RowLayout {
 	CustomRect {
 		id: upButton
 
-		color: DynamicColors.palette.m3primary
+		color: root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 1)
 		implicitHeight: upIcon.implicitHeight + Appearance.padding.small * 2
 		implicitWidth: implicitHeight
 		radius: Appearance.rounding.full
@@ -93,7 +94,9 @@ RowLayout {
 		StateLayer {
 			id: upState
 
-			function onClicked(): void {
+			color: DynamicColors.palette.m3onPrimary
+
+			onClicked: {
 				let newValue = Math.min(root.max, root.value + root.step);
 				// Round to avoid floating point precision errors
 				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
@@ -102,9 +105,6 @@ RowLayout {
 				root.displayText = newValue.toString();
 				root.valueModified(newValue);
 			}
-
-			color: DynamicColors.palette.m3onPrimary
-
 			onPressAndHold: timer.start()
 			onReleased: timer.stop()
 		}
@@ -113,13 +113,13 @@ RowLayout {
 			id: upIcon
 
 			anchors.centerIn: parent
-			color: DynamicColors.palette.m3onPrimary
+			color: root.enabled ? DynamicColors.palette.m3onPrimary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
 			text: "keyboard_arrow_up"
 		}
 	}
 
 	CustomRect {
-		color: DynamicColors.palette.m3primary
+		color: root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 1)
 		implicitHeight: downIcon.implicitHeight + Appearance.padding.small * 2
 		implicitWidth: implicitHeight
 		radius: Appearance.rounding.full
@@ -127,7 +127,9 @@ RowLayout {
 		StateLayer {
 			id: downState
 
-			function onClicked(): void {
+			color: DynamicColors.palette.m3onPrimary
+
+			onClicked: {
 				let newValue = Math.max(root.min, root.value - root.step);
 				// Round to avoid floating point precision errors
 				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
@@ -136,9 +138,6 @@ RowLayout {
 				root.displayText = newValue.toString();
 				root.valueModified(newValue);
 			}
-
-			color: DynamicColors.palette.m3onPrimary
-
 			onPressAndHold: timer.start()
 			onReleased: timer.stop()
 		}
@@ -147,7 +146,7 @@ RowLayout {
 			id: downIcon
 
 			anchors.centerIn: parent
-			color: DynamicColors.palette.m3onPrimary
+			color: root.enabled ? DynamicColors.palette.m3onPrimary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
 			text: "keyboard_arrow_down"
 		}
 	}

Greeter/Components/CustomSplitButton.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
 import qs.Config
-import qs.Helpers
 
 Row {
 	id: root
@@ -12,66 +11,46 @@ Row {
 	}
 
 	property alias active: menu.active
-	property color color: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
+	property color colour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
 	property bool disabled
-	property color disabledColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
-	property color disabledTextColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	property color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color disabledTextColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	readonly property alias expandBtn: expandBtn
 	property alias expanded: menu.expanded
 	property string fallbackIcon
 	property string fallbackText
-	property real horizontalPadding: Appearance.padding.normal
-	property alias iconLabel: iconLabel
-	property alias label: label
-	property alias menu: menu
+	property real horizontalPadding: Appearance.padding.larger
+	readonly property alias iconLabel: iconLabel
+	readonly property alias label: label
+	readonly property alias menu: menu
 	property alias menuItems: menu.items
 	property bool menuOnTop
-	property alias stateLayer: stateLayer
-	property color textColor: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+	property real minLeftWidth
+	readonly property alias stateLayer: stateLayer
+	property color textColour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+	readonly property alias textRow: textRow
 	property int type: CustomSplitButton.Filled
-	property real verticalPadding: Appearance.padding.smaller
+	property real verticalPadding: Appearance.padding.small
 
-	function closeDropdown(): void {
-		SettingsDropdowns.close(menu);
-	}
-
-	function openDropdown(): void {
-		if (root.disabled)
-			return;
-		SettingsDropdowns.open(menu, root);
-	}
-
-	function toggleDropdown(): void {
-		if (root.disabled)
-			return;
-		SettingsDropdowns.toggle(menu, root);
-	}
-
-	spacing: Math.floor(Appearance.spacing.small / 2)
-
-	onExpandedChanged: {
-		if (!expanded)
-			SettingsDropdowns.forget(menu);
-	}
+	spacing: Math.floor(Appearance.spacing.extraSmall)
 
 	CustomRect {
 		bottomRightRadius: Appearance.rounding.small / 2
-		color: root.disabled ? root.disabledColor : root.color
+		color: root.disabled ? root.disabledColour : root.colour
 		implicitHeight: expandBtn.implicitHeight
-		implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2
+		implicitWidth: Math.max(root.minLeftWidth, textRow.implicitWidth + root.horizontalPadding * 2)
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
 		topRightRadius: Appearance.rounding.small / 2
 
 		StateLayer {
 			id: stateLayer
 
-			function onClicked(): void {
-				root.active?.clicked();
-			}
-
-			color: root.textColor
+			bottomRightRadius: parent.bottomRightRadius
+			color: root.textColour
 			disabled: root.disabled
-			rect.bottomRightRadius: parent.bottomRightRadius
-			rect.topRightRadius: parent.topRightRadius
+			topRightRadius: parent.topRightRadius
+
+			onClicked: root.active?.clicked()
 		}
 
 		RowLayout {
@@ -86,7 +65,7 @@ Row {
 
 				Layout.alignment: Qt.AlignVCenter
 				animate: true
-				color: root.disabled ? root.disabledTextColor : root.textColor
+				color: root.disabled ? root.disabledTextColour : root.textColour
 				fill: 1
 				text: root.active?.activeIcon ?? root.fallbackIcon
 			}
@@ -98,12 +77,12 @@ Row {
 				Layout.preferredWidth: implicitWidth
 				animate: true
 				clip: true
-				color: root.disabled ? root.disabledTextColor : root.textColor
+				color: root.disabled ? root.disabledTextColour : root.textColour
 				text: root.active?.activeText ?? root.fallbackText
 
 				Behavior on Layout.preferredWidth {
 					Anim {
-						easing.bezierCurve: Appearance.anim.curves.emphasized
+						type: Anim.Emphasized
 					}
 				}
 			}
@@ -116,7 +95,7 @@ Row {
 		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) : Appearance.rounding.small / 2
 
 		bottomLeftRadius: rad
-		color: root.disabled ? root.disabledColor : root.color
+		color: root.disabled ? root.disabledColour : root.colour
 		implicitHeight: expandIcon.implicitHeight + root.verticalPadding * 2
 		implicitWidth: implicitHeight
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -130,14 +109,12 @@ Row {
 		StateLayer {
 			id: expandStateLayer
 
-			function onClicked(): void {
-				root.toggleDropdown();
-			}
-
-			color: root.textColor
+			color: root.textColour
 			disabled: root.disabled
 			rect.bottomLeftRadius: parent.bottomLeftRadius
 			rect.topLeftRadius: parent.topLeftRadius
+
+			onClicked: root.expanded = !root.expanded
 		}
 
 		MaterialIcon {
@@ -145,7 +122,7 @@ Row {
 
 			anchors.centerIn: parent
 			anchors.horizontalCenterOffset: root.expanded ? 0 : -Math.floor(root.verticalPadding / 4)
-			color: root.disabled ? root.disabledTextColor : root.textColor
+			color: root.disabled ? root.disabledTextColour : root.textColour
 			rotation: root.expanded ? 180 : 0
 			text: "expand_more"
 
@@ -158,24 +135,14 @@ Row {
 				}
 			}
 		}
+	}
 
 	Menu {
 		id: menu
 
-			anchors.bottomMargin: Appearance.spacing.small
-			anchors.right: parent.right
-			anchors.top: parent.bottom
-			anchors.topMargin: Appearance.spacing.small
-
-			states: State {
-				when: root.menuOnTop
-
-				AnchorChanges {
-					anchors.bottom: expandBtn.top
-					anchors.top: undefined
-					target: menu
-				}
-			}
-		}
+		attachSideY: root.menuOnTop ? Menu.Top : Menu.Bottom
+		attachTo: expandBtn
+		marginY: Appearance.spacing.small * (root.menuOnTop ? -1 : 1)
+		thisSideY: root.menuOnTop ? Menu.Bottom : Menu.Top
 	}
 }

Greeter/Components/CustomSplitButtonRow.qml

@@ -8,19 +8,32 @@ Item {
 	id: root
 
 	property alias active: splitButton.active
-	property bool enabled: true
+	property alias buttonAlias: splitButton
 	property alias expanded: splitButton.expanded
 	property int expandedZ: 100
 	required property string label
 	property alias menuItems: splitButton.menuItems
+	property bool shouldBeActive: true
 	property alias type: splitButton.type
 
 	signal selected(item: MenuItem)
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
 	clip: false
-	z: root.expanded ? expandedZ : -1
+	implicitHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
 
 	RowLayout {
 		id: row
@@ -36,7 +49,6 @@ Item {
 			color: root.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSurfaceVariant
 			font.pointSize: Appearance.font.size.larger
 			text: root.label
-			z: root.expanded ? root.expandedZ : -1
 		}
 
 		CustomSplitButton {
@@ -44,14 +56,16 @@ Item {
 
 			enabled: root.enabled
 			type: CustomSplitButton.Filled
-			z: root.expanded ? root.expandedZ : -1
+			z: 2
 
 			menu.onItemSelected: item => {
 				root.selected(item);
-				splitButton.closeDropdown();
+			// splitButton.closeDropdown();
 			}
 			stateLayer.onClicked: {
-				splitButton.toggleDropdown();
+				// splitButton.toggleDropdown();
+				splitButton.expanded = !splitButton.expanded;
+				console.log(root.z);
 			}
 		}
 	}

Greeter/Components/CustomSwitch.qml

@@ -1,6 +1,6 @@
 import QtQuick
-import QtQuick.Templates
 import QtQuick.Shapes
+import QtQuick.Templates
 import qs.Config
 
 Switch {
@@ -12,38 +12,41 @@ Switch {
 	implicitWidth: implicitIndicatorWidth
 
 	indicator: CustomRect {
-		color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
-		implicitHeight: 13 + 7 * 2
+		color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
+		implicitHeight: Appearance.font.size.medium + Appearance.padding.normal * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Appearance.rounding.full
 
 		CustomRect {
-			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
+			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.2 : implicitHeight
 
 			anchors.verticalCenter: parent.verticalCenter
-			color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
-			implicitHeight: parent.implicitHeight - 10
+			color: root.checked && root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
+			implicitHeight: parent.implicitHeight - Appearance.padding.extraSmall
 			implicitWidth: nonAnimWidth
 			radius: Appearance.rounding.full
-			x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2
+			x: root.checked ? parent.implicitWidth - nonAnimWidth - Appearance.padding.extraSmall / 2 : Appearance.padding.extraSmall / 2
 
 			Behavior on implicitWidth {
 				Anim {
+					type: Anim.FastSpatial
 				}
 			}
 			Behavior on x {
 				Anim {
+					type: Anim.FastSpatial
 				}
 			}
 
 			CustomRect {
 				anchors.fill: parent
-				color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
+				color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
 				opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0
 				radius: parent.radius
 
 				Behavior on opacity {
 					Anim {
+						type: Anim.DefaultEffects
 					}
 				}
 			}
@@ -63,14 +66,14 @@ Switch {
 				}
 				property point end2: {
 					if (root.pressed)
-						return Qt.point(width, height / 2);
+						return Qt.point(width * 0.8, height / 2);
 					if (root.checked)
 						return Qt.point(width * 0.85, height * 0.2);
 					return Qt.point(width * 0.85, height * 0.15);
 				}
 				property point start1: {
 					if (root.pressed)
-						return Qt.point(width * 0.1, height / 2);
+						return Qt.point(width * 0.2, height / 2);
 					if (root.checked)
 						return Qt.point(width * 0.15, height / 2);
 					return Qt.point(width * 0.15, height * 0.15);
@@ -88,7 +91,7 @@ Switch {
 
 				anchors.centerIn: parent
 				asynchronous: true
-				height: parent.implicitHeight - Appearance.padding.small * 2
+				height: parent.implicitHeight - Appearance.padding.larger
 				preferredRendererType: Shape.CurveRenderer
 				width: height
 
@@ -110,11 +113,11 @@ Switch {
 				}
 
 				ShapePath {
-					capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+					capStyle: ShapePath.RoundCap
 					fillColor: "transparent"
 					startX: icon.start1.x
 					startY: icon.start1.y
-					strokeColor: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
+					strokeColor: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
 					strokeWidth: Appearance.font.size.larger * 0.15
 
 					Behavior on strokeColor {
@@ -148,8 +151,7 @@ Switch {
 	}
 
 	component PropAnim: PropertyAnimation {
-		duration: MaterialEasing.expressiveEffectsTime
-		easing.bezierCurve: MaterialEasing.expressiveEffects
-		easing.type: Easing.BezierSpline
+		duration: Appearance.anim.durations.expressiveFastSpatial
+		easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
 	}
 }

Greeter/Components/CustomText.qml

@@ -15,6 +15,7 @@ Text {
 	color: DynamicColors.palette.m3onSurface
 	font.family: Appearance.font.family.sans
 	font.pointSize: Appearance.font.size.normal
+	linkColor: DynamicColors.palette.m3onPrimaryFixedVariant
 	renderType: Text.NativeRendering
 	textFormat: Text.PlainText
 

Greeter/Components/Elevation.qml

@@ -1,6 +1,6 @@
-import qs.Config
 import QtQuick
 import QtQuick.Effects
+import qs.Config
 
 RectangularShadow {
 	property real dp: [0, 1, 3, 6, 8, 12][level]
@@ -13,6 +13,7 @@ RectangularShadow {
 
 	Behavior on dp {
 		Anim {
+			type: Anim.SlowEffects
 		}
 	}
 }

Greeter/Components/HoverIconButton.qml

@@ -0,0 +1,33 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Config
+
+IconButton {
+	id: root
+
+	required property bool shouldBeVisible
+
+	opacity: 0
+	scale: 0
+	visible: root.scale > 0
+
+	Behavior on opacity {
+		Anim {
+			duration: Appearance.anim.durations.small
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+
+	onShouldBeVisibleChanged: {
+		if (root.shouldBeVisible) {
+			root.opacity = 1;
+			root.scale = 1;
+		} else {
+			root.opacity = 0;
+			root.scale = 0;
+		}
+	}
+}

Greeter/Components/IconButton.qml

@@ -41,12 +41,11 @@ CustomRect {
 	color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
 	implicitHeight: label.implicitHeight + padding * 2
 	implicitWidth: implicitHeight
-	radius: internalChecked ? 6 : implicitHeight / 2 * Math.min(1, 1)
+	radius: internalChecked ? 6 : (implicitHeight / 2 * Math.min(1, 1)) * Appearance.rounding.scale
 
 	Behavior on radius {
 		Anim {
 			id: radiusAnim
-
 		}
 	}
 
@@ -55,14 +54,14 @@ CustomRect {
 	StateLayer {
 		id: stateLayer
 
-		function onClicked(): void {
+		color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
+		disabled: root.disabled
+
+		onClicked: {
 			if (root.toggle)
 				root.internalChecked = !root.internalChecked;
 			root.clicked();
 		}
-
-		color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
-		disabled: root.disabled
 	}
 
 	MaterialIcon {

Greeter/Components/MarqueeText.qml

@@ -102,6 +102,7 @@ Item {
 				animate: root.animate
 				animateProp: "opacity"
 				color: root.color
+				font.pointSize: elideText.font.pointSize
 				text: elideText.text
 			}
 
@@ -111,6 +112,7 @@ Item {
 				animate: root.animate
 				animateProp: "opacity"
 				color: root.color
+				font.pointSize: elideText.font.pointSize
 				text: t1.text
 				x: t1.width + root.gap
 			}

Greeter/Components/Menu.qml

@@ -2,49 +2,107 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 import qs.Config
+import qs.Drawers
 
-Elevation {
+MouseArea {
 	id: root
 
+	enum Side {
+		Top,
+		Bottom,
+		Left,
+		Right
+	}
+
 	property MenuItem active: items[0] ?? null
+	property int attachSideX: Menu.Right
+	property int attachSideY: Menu.Bottom
+	required property Item attachTo
 	property bool expanded
 	property list<MenuItem> items
+	property real marginX
+	property real marginY
+	property int thisSideX: Menu.Right
+	property int thisSideY: Menu.Top
 
 	signal itemSelected(item: MenuItem)
 
-	implicitHeight: root.expanded ? column.implicitHeight + Appearance.padding.small * 2 : 0
-	implicitWidth: Math.max(200, column.implicitWidth)
-	level: 2
-	opacity: root.expanded ? 1 : 0
-	radius: Appearance.rounding.normal
+	anchors.fill: parent
+	enabled: expanded
+	layer.enabled: opacity < 1
+	opacity: expanded ? 1 : 0
+	parent: {
+		const win = QsWindow.window;
+		const contentWin = win as Windows;
+		return contentWin ? contentWin.interactionWrapper : (win as QsWindow).contentItem;
+	}
 
-	Behavior on implicitHeight {
-		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		}
-	}
 	Behavior on opacity {
 		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			type: Anim.DefaultEffects
 		}
 	}
 
-	CustomClippingRect {
+	onClicked: expanded = false
+
+	TransformWatcher {
+		id: watcher
+
+		a: root.parent
+		b: root.attachTo
+	}
+
+	Elevation {
+		id: menu
+
+		implicitHeight: column.implicitHeight + column.anchors.margins * 2
+		implicitWidth: Math.max(200, column.implicitWidth + column.anchors.margins * 2)
+		level: 2
+		radius: Appearance.rounding.medium
+		x: {
+			watcher.transform;
+			const item = root.attachTo;
+			let off = root.attachSideX === Menu.Left ? 0 : item.width;
+			if (root.thisSideX === Menu.Right)
+				off -= width;
+			return item.mapToItem(root.parent, off, 0).x + root.marginX;
+		}
+		y: {
+			watcher.transform;
+			const item = root.attachTo;
+			let off = root.attachSideY === Menu.Top ? 0 : item.height;
+			if (root.thisSideY === Menu.Bottom)
+				off -= height;
+			return item.mapToItem(root.parent, 0, off).y + root.marginY;
+		}
+
+		transform: Scale {
+			origin.y: root.thisSideY === Menu.Bottom ? menu.height : 0
+			yScale: root.expanded ? 1 : 0.1
+
+			Behavior on yScale {
+				Anim {
+				}
+			}
+		}
+
+		CustomRect {
 			anchors.fill: parent
-		color: DynamicColors.palette.m3surfaceContainer
+			color: DynamicColors.palette.m3surfaceContainerLow
 			radius: parent.radius
 
 			ColumnLayout {
 				id: column
 
-			anchors.left: parent.left
-			anchors.right: parent.right
-			anchors.verticalCenter: parent.verticalCenter
-			spacing: 5
+				anchors.fill: parent
+				anchors.margins: Appearance.padding.extraSmall
+				spacing: Appearance.spacing.extraSmall
 
 				Repeater {
+					id: repeater
+
 					model: root.items
 
 					CustomRect {
@@ -55,25 +113,25 @@ Elevation {
 						required property MenuItem modelData
 
 						Layout.fillWidth: true
-					implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.normal * 2
-					implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.normal * 2
+						color: Qt.alpha(DynamicColors.palette.m3tertiaryContainer, active ? 1 : 0)
+						implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.larger * 2
+						implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.larger * 2
+						radius: Appearance.rounding.small
 
-					CustomRect {
-						anchors.fill: parent
-						anchors.leftMargin: Appearance.padding.small
-						anchors.rightMargin: Appearance.padding.small
-						color: Qt.alpha(DynamicColors.palette.m3secondaryContainer, active ? 1 : 0)
-						radius: Appearance.rounding.normal - Appearance.padding.small
-
-						StateLayer {
-							function onClicked(): void {
-								root.itemSelected(item.modelData);
-								root.active = item.modelData;
-								root.expanded = false;
+						Behavior on radius {
+							Anim {
+							}
 						}
 
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+						StateLayer {
+							color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
 							disabled: !root.expanded
+
+							onClicked: {
+								root.itemSelected(item.modelData);
+								root.active = item.modelData;
+								item.modelData.clicked();
+								root.expanded = false;
 							}
 						}
 
@@ -81,29 +139,30 @@ Elevation {
 							id: menuOptionRow
 
 							anchors.fill: parent
-						anchors.margins: Appearance.padding.normal
+							anchors.margins: Appearance.padding.larger
 							spacing: Appearance.spacing.small
 
 							MaterialIcon {
 								Layout.alignment: Qt.AlignVCenter
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurfaceVariant
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
 								text: item.modelData.icon
 							}
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter
 								Layout.fillWidth: true
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
 								text: item.modelData.text
 							}
 
 							Loader {
 								Layout.alignment: Qt.AlignVCenter
 								active: item.modelData.trailingIcon.length > 0
+								asynchronous: true
 								visible: active
 
 								sourceComponent: MaterialIcon {
-								color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+									color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
 									text: item.modelData.trailingIcon
 								}
 							}
@@ -112,4 +171,5 @@ Elevation {
 				}
 			}
 		}
+	}
 }

Greeter/Components/PathViewMenu.qml

@@ -29,6 +29,7 @@ Elevation {
 	level: root.expanded ? 2 : 0
 	radius: itemHeight / 2
 	visible: implicitHeight > 0
+	z: root.expanded ? 100 : 0
 
 	Behavior on implicitHeight {
 		Anim {
@@ -68,6 +69,7 @@ Elevation {
 		anchors.fill: parent
 		color: DynamicColors.palette.m3surfaceContainer
 		radius: parent.radius
+		z: root.z
 
 		// Main visible spinner: normal/outside text color
 		PathView {

Greeter/Components/StateLayer.qml

@@ -1,15 +1,53 @@
-import qs.Config
 import QtQuick
+import QtQuick.Shapes
+import ZShell
+import ZShell.Components
+import qs.Helpers
+import qs.Config
 
 MouseArea {
 	id: root
 
-	property color color: DynamicColors.palette.m3onSurface
+	property alias bottomLeftRadius: base.bottomLeftRadius
+	property alias bottomRightRadius: base.bottomRightRadius
+	property real circleRadius
+	property alias color: base.color
 	property bool disabled
-	property real radius: parent?.radius ?? 0
-	property alias rect: hoverLayer
+	readonly property real endRadius: {
+		const d1 = distSq(0, 0);
+		const d2 = distSq(width, 0);
+		const d3 = distSq(0, height);
+		const d4 = distSq(width, height);
+		return (Math.sqrt(Math.max(d1, d2, d3, d4)) + (shapeMorph ? 24 : 0)) * 1.3;
+	}
+	property real endRadiusAtPress
+	property bool manualPressOverride
+	property real pressX: width / 2
+	property real pressY: height / 2
+	property alias radius: base.radius
+	readonly property alias rect: base
+	property bool shapeMorph
+	property bool showHoverBackground: true
+	property real stateOpacity: containsMouse ? 0.08 : 0
+	property alias topLeftRadius: base.topLeftRadius
+	property alias topRightRadius: base.topRightRadius
 
-	function onClicked(): void {
+	function clamp(r: real): real {
+		return Math.max(0, Math.min(r, width / 2, height / 2));
+	}
+
+	function distSq(x: real, y: real): real {
+		return (pressX - x) ** 2 + (pressY - y) ** 2;
+	}
+
+	function press(x: real, y: real): void {
+		pressX = x;
+		pressY = y;
+		fadeAnim.complete();
+		circleRadius = 0;
+		circle.opacity = 0.1;
+		rippleAnim.restart();
+		endRadiusAtPress = endRadius;
 	}
 
 	anchors.fill: parent
@@ -17,79 +55,146 @@ MouseArea {
 	enabled: !disabled
 	hoverEnabled: true
 
-	onClicked: event => !disabled && onClicked(event)
-	onPressed: event => {
-		if (disabled)
-			return;
-
-		rippleAnim.x = event.x;
-		rippleAnim.y = event.y;
-
-		const dist = (ox, oy) => ox * ox + oy * oy;
-		rippleAnim.radius = Math.sqrt(Math.max(dist(event.x, event.y), dist(event.x, height - event.y), dist(width - event.x, event.y), dist(width - event.x, height - event.y)));
-
-		rippleAnim.restart();
+	Behavior on stateOpacity {
+		Anim {
+			type: Anim.DefaultEffects
+		}
 	}
 
-	SequentialAnimation {
+	onCircleRadiusChanged: {
+		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
+			fadeAnim.start();
+	}
+	onClicked: event => !disabled && onClicked(event)
+	onManualPressOverrideChanged: {
+		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
+			fadeAnim.start();
+	}
+	onPressed: e => press(e.x, e.y)
+	onPressedChanged: {
+		if (!(pressed || manualPressOverride) && !rippleAnim.running && circle.opacity > 0)
+			fadeAnim.start();
+	}
+
+	Anim {
 		id: rippleAnim
 
-		property real radius
-		property real x
-		property real y
-
-		PropertyAction {
-			property: "x"
-			target: ripple
-			value: rippleAnim.x
-		}
-
-		PropertyAction {
-			property: "y"
-			target: ripple
-			value: rippleAnim.y
-		}
-
-		PropertyAction {
-			property: "opacity"
-			target: ripple
-			value: 0.08
+		alwaysRunToEnd: true
+		duration: Appearance.anim.durations.expressiveSlowEffects * 2
+		easing.bezierCurve: Appearance.anim.curves.standard
+		property: "circleRadius"
+		target: root
+		to: root.endRadius
 	}
 
 	Anim {
-			easing.bezierCurve: MaterialEasing.standardDecel
-			from: 0
-			properties: "implicitWidth,implicitHeight"
-			target: ripple
-			to: rippleAnim.radius * 2
-		}
+		id: fadeAnim
 
-		Anim {
 		property: "opacity"
-			target: ripple
+		target: circle
 		to: 0
+		type: Anim.SlowEffects
 	}
-	}
-
-	CustomClippingRect {
-		id: hoverLayer
-
-		anchors.fill: parent
-		border.pixelAligned: false
-		color: Qt.alpha(root.color, root.disabled ? 0 : root.pressed ? 0.1 : root.containsMouse ? 0.08 : 0)
-		radius: root.radius
 
 	CustomRect {
-			id: ripple
+		id: base
 
-			border.pixelAligned: false
-			color: root.color
+		anchors.fill: parent
+		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
+		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
+		color: DynamicColors.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
+		topLeftRadius: root.parent?.topLeftRadius ?? radius ?? 0
+		topRightRadius: root.parent?.topRightRadius ?? radius ?? 0
+		// qmllint enable missing-property
+	}
+
+	Shape {
+		id: circle
+
+		anchors.fill: parent
 		opacity: 0
-			radius: Appearance.rounding.full
+		preferredRendererType: Shape.CurveRenderer
 
-			transform: Translate {
-				x: -ripple.width / 2
-				y: -ripple.height / 2
+		ShapePath {
+			fillColor: base.color
+			startX: root.clamp(base.topLeftRadius)
+			startY: 0
+			strokeColor: "transparent"
+			strokeWidth: 0
+
+			fillGradient: RadialGradient {
+				centerRadius: root.circleRadius
+				centerX: root.pressX
+				centerY: root.pressY
+				focalX: centerX
+				focalY: centerY
+
+				GradientStop {
+					color: Qt.alpha(base.color, 1)
+					position: 0
+				}
+
+				GradientStop {
+					color: Qt.alpha(base.color, 1)
+					position: ZUtils.clamp(1 - 0.2 * root.endRadius / root.circleRadius, 0.01, 0.99)
+				}
+
+				GradientStop {
+					color: Qt.alpha(base.color, ZUtils.clamp((root.circleRadius / root.endRadius - 0.9) / 0.1, 0, 1))
+					position: 1
+				}
+			}
+
+			PathLine {
+				x: root.width - root.clamp(base.topRightRadius)
+				y: 0
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.topRightRadius)
+				radiusY: root.clamp(base.topRightRadius)
+				relativeX: root.clamp(base.topRightRadius)
+				relativeY: root.clamp(base.topRightRadius)
+			}
+
+			PathLine {
+				x: root.width
+				y: root.height - root.clamp(base.bottomRightRadius)
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.bottomRightRadius)
+				radiusY: root.clamp(base.bottomRightRadius)
+				relativeX: -root.clamp(base.bottomRightRadius)
+				relativeY: root.clamp(base.bottomRightRadius)
+			}
+
+			PathLine {
+				x: root.clamp(base.bottomLeftRadius)
+				y: root.height
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.bottomLeftRadius)
+				radiusY: root.clamp(base.bottomLeftRadius)
+				relativeX: -root.clamp(base.bottomLeftRadius)
+				relativeY: -root.clamp(base.bottomLeftRadius)
+			}
+
+			PathLine {
+				x: 0
+				y: root.clamp(base.topLeftRadius)
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.topLeftRadius)
+				radiusY: root.clamp(base.topLeftRadius)
+				x: root.clamp(base.topLeftRadius)
+				y: 0
 			}
 		}
 	}

Greeter/Config/Appearance.qml

@@ -4,10 +4,9 @@ import Quickshell
 
 Singleton {
 	readonly property AppearanceConf.Anim anim: Config.appearance.anim
+	readonly property AppearanceConf.Deform deform: Config.appearance.deform
 	readonly property AppearanceConf.FontStuff font: Config.appearance.font
 	readonly property AppearanceConf.Padding padding: Config.appearance.padding
-	// Literally just here to shorten accessing stuff :woe:
-	// Also kinda so I can keep accessing it with `Appearance.xxx` instead of `Conf.appearance.xxx`
 	readonly property AppearanceConf.Rounding rounding: Config.appearance.rounding
 	readonly property AppearanceConf.Spacing spacing: Config.appearance.spacing
 	readonly property AppearanceConf.Transparency transparency: Config.appearance.transparency

Greeter/Config/AppearanceConf.qml

@@ -3,6 +3,8 @@ import Quickshell.Io
 JsonObject {
 	property Anim anim: Anim {
 	}
+	property Deform deform: Deform {
+	}
 	property FontStuff font: FontStuff {
 	}
 	property Padding padding: Padding {
@@ -26,9 +28,13 @@ JsonObject {
 		property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
 		property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
 		property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+		property list<real> expressiveDefaultEffects: [0.34, 0.8, 0.34, 1, 1, 1]
 		property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
 		property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+		property list<real> expressiveFastEffects: [0.31, 0.94, 0.34, 1, 1, 1]
 		property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
+		property list<real> expressiveSlowEffects: [0.34, 0.88, 0.34, 1, 1, 1]
+		property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
 		property list<real> standard: [0.2, 0, 0, 1, 1, 1]
 		property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
 		property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
@@ -36,13 +42,18 @@ JsonObject {
 	component AnimDurations: JsonObject {
 		property int expressiveDefaultSpatial: 500 * scale
 		property int expressiveEffects: 200 * scale
+		property int expressiveFastEffects: 150 * scale
 		property int expressiveFastSpatial: 350 * scale
+		property int expressiveSlowEffects: 300 * scale
 		property int extraLarge: 1000 * scale
 		property int large: 600 * scale
 		property int normal: 400 * scale
 		property real scale: 1
 		property int small: 200 * scale
 	}
+	component Deform: JsonObject {
+		property real scale: 1
+	}
 	component FontFamily: JsonObject {
 		property string clock: "Rubik"
 		property string material: "Material Symbols Rounded"
@@ -52,7 +63,8 @@ JsonObject {
 	component FontSize: JsonObject {
 		property int extraLarge: 28 * scale
 		property int large: 18 * scale
-		property int larger: 15 * scale
+		property int larger: 16 * scale
+		property int medium: 14 * scale
 		property int normal: 13 * scale
 		property real scale: 1
 		property int small: 11 * scale
@@ -65,28 +77,33 @@ JsonObject {
 		}
 	}
 	component Padding: JsonObject {
-		property int large: 15 * scale
+		property int extraLargeIncreased: 32 * scale
+		property int extraSmall: 4 * scale
+		property int large: 16 * scale
 		property int larger: 12 * scale
-		property int normal: 10 * scale
+		property int normal: 8 * scale
 		property real scale: 1
 		property int small: 5 * scale
 		property int smaller: 7 * scale
 		property int smallest: 2 * scale
 	}
 	component Rounding: JsonObject {
+		property int extraSmall: 4 * scale
 		property int full: 1000 * scale
-		property int large: 25 * scale
-		property int normal: 17 * scale
+		property int large: 24 * scale
+		property int medium: 16 * scale
+		property int normal: 18 * scale
 		property real scale: 1
 		property int small: 12 * scale
 		property int smallest: 8 * scale
 	}
 	component Spacing: JsonObject {
+		property int extraSmall: 4 * scale
 		property int large: 20 * scale
-		property int larger: 15 * scale
+		property int larger: 16 * scale
 		property int normal: 12 * scale
 		property real scale: 1
-		property int small: 7 * scale
+		property int small: 8 * scale
 		property int smaller: 10 * scale
 	}
 	component Transparency: JsonObject {

Greeter/Config/BackgroundConfig.qml

@@ -4,4 +4,11 @@ import qs.Config
 JsonObject {
 	property bool enabled: true
 	property int wallFadeDuration: MaterialEasing.standardTime
+	property real alignX: 0.5
+	property real alignY: 0.5
+	property real zoom: 1.0
+	property real sourceClipX: 0
+	property real sourceClipY: 0
+	property real sourceClipW: 0
+	property real sourceClipH: 0
 }

Greeter/Config/BarConfig.qml

@@ -8,10 +8,6 @@ JsonObject {
 			id: "workspaces",
 			enabled: true
 		},
-		{
-			id: "audio",
-			enabled: true
-		},
 		{
 			id: "media",
 			enabled: true
@@ -24,10 +20,6 @@ JsonObject {
 			id: "updates",
 			enabled: true
 		},
-		{
-			id: "dash",
-			enabled: true
-		},
 		{
 			id: "spacer",
 			enabled: true
@@ -41,12 +33,12 @@ JsonObject {
 			enabled: true
 		},
 		{
-			id: "tray",
+			id: "hyprsunset",
 			enabled: true
 		},
 		{
-			id: "upower",
-			enabled: false
+			id: "tray",
+			enabled: true
 		},
 		{
 			id: "network",
@@ -62,9 +54,13 @@ JsonObject {
 		},
 	]
 	property int height: 34
+	property bool hideWhenNotif: false
 	property Popouts popouts: Popouts {
 	}
 	property int rounding: 8
+	property int smoothing: 32
+	property Tray tray: Tray {
+	}
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true
@@ -75,4 +71,7 @@ JsonObject {
 		property bool tray: true
 		property bool upower: true
 	}
+	component Tray: JsonObject {
+		property int trayIconSize: 24
+	}
 }

Greeter/Config/Colors.qml

@@ -1,5 +1,13 @@
 import Quickshell.Io
 
 JsonObject {
+	property Presets presets: Presets {
+	}
 	property string schemeType: "vibrant"
+
+	component Presets: JsonObject {
+		property string accent: ""
+		property string name: ""
+		property string variant: ""
+	}
 }

Greeter/Config/Config.qml

@@ -4,8 +4,6 @@ import Quickshell
 import Quickshell.Io
 import ZShell
 import QtQuick
-import qs.Helpers
-import qs.Paths
 
 Singleton {
 	id: root
@@ -23,6 +21,7 @@ Singleton {
 	property alias osd: adapter.osd
 	property alias overview: adapter.overview
 	property bool recentlySaved: false
+	property alias screenshot: adapter.screenshot
 	property alias services: adapter.services
 	property alias sidebar: adapter.sidebar
 	property alias utilities: adapter.utilities
@@ -48,6 +47,9 @@ Singleton {
 			padding: {
 				scale: appearance.padding.scale
 			},
+			deform: {
+				scale: appearance.deform.scale
+			},
 			font: {
 				family: {
 					sans: appearance.font.family.sans,
@@ -77,16 +79,28 @@ Singleton {
 	function serializeBackground(): var {
 		return {
 			wallFadeDuration: background.wallFadeDuration,
-			enabled: background.enabled
+			enabled: background.enabled,
+			alignX: background.alignX,
+			sourceClipX: background.sourceClipX,
+			sourceClipY: background.sourceClipY,
+			sourceClipW: background.sourceClipW,
+			sourceClipH: background.sourceClipH,
+			alignY: background.alignY,
+			zoom: background.zoom
 		};
 	}
 
 	function serializeBar(): var {
 		return {
 			autoHide: barConfig.autoHide,
+			hideWhenNotif: barConfig.hideWhenNotif,
 			rounding: barConfig.rounding,
 			border: barConfig.border,
+			smoothing: barConfig.smoothing,
 			height: barConfig.height,
+			tray: {
+				trayIconSize: barConfig.tray.trayIconSize
+			},
 			popouts: {
 				tray: barConfig.popouts.tray,
 				audio: barConfig.popouts.audio,
@@ -102,7 +116,12 @@ Singleton {
 
 	function serializeColors(): var {
 		return {
-			schemeType: colors.schemeType
+			schemeType: colors.schemeType,
+			presets: {
+				name: colors.presets.name,
+				variant: colors.presets.variant,
+				accent: colors.presets.accent
+			}
 		};
 	}
 
@@ -121,7 +140,8 @@ Singleton {
 			background: serializeBackground(),
 			launcher: serializeLauncher(),
 			colors: serializeColors(),
-			dock: serializeDock()
+			dock: serializeDock(),
+			screenshot: serializeScreenshot()
 		};
 	}
 
@@ -172,11 +192,16 @@ Singleton {
 		return {
 			logo: general.logo,
 			wallpaperPath: general.wallpaperPath,
-			username: general.username,
 			desktopIcons: general.desktopIcons,
+			dateFormat: general.dateFormat,
 			color: {
 				mode: general.color.mode,
 				smart: general.color.smart,
+				scheduleDark: general.color.scheduleDark,
+				scheduleHyprsunset: general.color.scheduleHyprsunset,
+				scheduleHyprsunsetStart: general.color.scheduleHyprsunsetStart,
+				hyprsunsetTemp: general.color.hyprsunsetTemp,
+				scheduleHyprsunsetEnd: general.color.scheduleHyprsunsetEnd,
 				schemeGeneration: general.color.schemeGeneration,
 				scheduleDarkStart: general.color.scheduleDarkStart,
 				scheduleDarkEnd: general.color.scheduleDarkEnd,
@@ -190,6 +215,10 @@ Singleton {
 			},
 			idle: {
 				timeouts: general.idle.timeouts
+			},
+			battery: {
+				popupThresholds: general.battery.popupThresholds,
+				critPerc: general.battery.critPerc
 			}
 		};
 	}
@@ -198,6 +227,7 @@ Singleton {
 		return {
 			maxAppsShown: launcher.maxAppsShown,
 			maxWallpapers: launcher.maxWallpapers,
+			uwsm: launcher.uwsm,
 			actionPrefix: launcher.actionPrefix,
 			specialPrefix: launcher.specialPrefix,
 			useFuzzy: {
@@ -221,6 +251,8 @@ Singleton {
 		return {
 			recolorLogo: lock.recolorLogo,
 			enableFprint: lock.enableFprint,
+			showNotifContent: lock.showNotifContent,
+			showNotifIcon: lock.showNotifIcon,
 			maxFprintTries: lock.maxFprintTries,
 			blurAmount: lock.blurAmount,
 			sizes: {
@@ -262,9 +294,24 @@ Singleton {
 		};
 	}
 
+	function serializeScreenshot(): var {
+		return {
+			enable_pp: screenshot.enable_pp,
+			mode: screenshot.mode,
+			radius: screenshot.radius,
+			shadow: screenshot.shadow,
+			rounding: screenshot.rounding,
+			shadow_blur: screenshot.shadow_blur,
+			shadow_color: screenshot.shadow_color,
+			shadow_offset_x: screenshot.shadow_offset_x,
+			shadow_offset_y: screenshot.shadow_offset_y
+		};
+	}
+
 	function serializeServices(): var {
 		return {
 			weatherLocation: services.weatherLocation,
+			updates: services.updates,
 			useFahrenheit: services.useFahrenheit,
 			ddcutilService: services.ddcutilService,
 			useTwelveHourClock: services.useTwelveHourClock,
@@ -317,7 +364,6 @@ Singleton {
 
 	ElapsedTimer {
 		id: timer
-
 	}
 
 	Timer {
@@ -415,6 +461,8 @@ Singleton {
 			}
 			property Overview overview: Overview {
 			}
+			property Screenshot screenshot: Screenshot {
+			}
 			property Services services: Services {
 			}
 			property SidebarConfig sidebar: SidebarConfig {

Greeter/Config/DynamicColors.qml

@@ -29,9 +29,10 @@ Singleton {
 	readonly property alias wallLuminance: analyser.luminance
 
 	function alterColor(c: color, a: real, layer: int): color {
-		const luminance = getLuminance(c);
+		const initLuminance = getLuminance(c);
+		const luminance = Math.max(initLuminance, 0.001);
 
-		const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (1 - transparency.base) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5));
+		const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (0.2 + 0.3 * (1 - transparency.base)) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5));
 		const scale = (luminance + offset) / luminance;
 		const r = Math.max(0, Math.min(1, c.r * scale));
 		const g = Math.max(0, Math.min(1, c.g * scale));
@@ -84,6 +85,10 @@ Singleton {
 		Config.save();
 	}
 
+	function swapRG(c: color): color {
+		return Qt.rgba(c.g, c.r, c.b, c.a);
+	}
+
 	FileView {
 		path: "/etc/zshell-greeter/scheme.json"
 		watchChanges: true
@@ -95,69 +100,9 @@ Singleton {
 	ImageAnalyser {
 		id: analyser
 
-		source: WallpaperPath.currentWallpaperPath
+		source: WallpaperPath.lockscreenBg
 	}
 
-	component M3MaccchiatoPalette: QtObject {
-		property color m3background: "#131317"
-		property color m3error: "#ffb4ab"
-		property color m3errorContainer: "#93000a"
-		property color m3inverseOnSurface: "#303034"
-		property color m3inversePrimary: "#525b92"
-		property color m3inverseSurface: "#e4e1e7"
-		property color m3neutral_paletteKeyColor: "#77767b"
-		property color m3neutral_variant_paletteKeyColor: "#767680"
-		property color m3onBackground: "#e4e1e7"
-		property color m3onError: "#690005"
-		property color m3onErrorContainer: "#ffdad6"
-		property color m3onPrimary: "#232c60"
-		property color m3onPrimaryContainer: "#ffffff"
-		property color m3onPrimaryFixed: "#0b154b"
-		property color m3onPrimaryFixedVariant: "#3a4378"
-		property color m3onSecondary: "#2c2f44"
-		property color m3onSecondaryContainer: "#b1b3ce"
-		property color m3onSecondaryFixed: "#171a2e"
-		property color m3onSecondaryFixedVariant: "#42455c"
-		property color m3onSuccess: "#213528"
-		property color m3onSuccessContainer: "#D1E9D6"
-		property color m3onSurface: "#e4e1e7"
-		property color m3onSurfaceVariant: "#c6c5d1"
-		property color m3onTertiary: "#4c1f48"
-		property color m3onTertiaryContainer: "#000000"
-		property color m3onTertiaryFixed: "#340831"
-		property color m3onTertiaryFixedVariant: "#66365f"
-		property color m3outline: "#90909a"
-		property color m3outlineVariant: "#46464f"
-		property color m3primary: "#bac3ff"
-		property color m3primaryContainer: "#6a73ac"
-		property color m3primaryFixed: "#dee0ff"
-		property color m3primaryFixedDim: "#bac3ff"
-		property color m3primary_paletteKeyColor: "#6a73ac"
-		property color m3scrim: "#000000"
-		property color m3secondary: "#c3c5e0"
-		property color m3secondaryContainer: "#42455c"
-		property color m3secondaryFixed: "#dfe1fd"
-		property color m3secondaryFixedDim: "#c3c5e0"
-		property color m3secondary_paletteKeyColor: "#72758e"
-		property color m3shadow: "#000000"
-		property color m3success: "#B5CCBA"
-		property color m3successContainer: "#374B3E"
-		property color m3surface: "#131317"
-		property color m3surfaceBright: "#39393d"
-		property color m3surfaceContainer: "#1f1f23"
-		property color m3surfaceContainerHigh: "#2a2a2e"
-		property color m3surfaceContainerHighest: "#353438"
-		property color m3surfaceContainerLow: "#1b1b1f"
-		property color m3surfaceContainerLowest: "#0e0e12"
-		property color m3surfaceDim: "#131317"
-		property color m3surfaceTint: "#bac3ff"
-		property color m3surfaceVariant: "#46464f"
-		property color m3tertiary: "#f1b3e5"
-		property color m3tertiaryContainer: "#b77ead"
-		property color m3tertiaryFixed: "#ffd7f4"
-		property color m3tertiaryFixedDim: "#f1b3e5"
-		property color m3tertiary_paletteKeyColor: "#9b6592"
-	}
 	component M3Palette: QtObject {
 		property color m3background: "#191114"
 		property color m3error: "#ffb4ab"
@@ -279,8 +224,11 @@ Singleton {
 		readonly property color m3tertiary_paletteKeyColor: root.layer(root.palette.m3tertiary_paletteKeyColor)
 	}
 	component Transparency: QtObject {
-		readonly property real base: Appearance.transparency.base - (root.light ? 0.1 : 0)
+		readonly property real base: Math.max(0, Math.min(1, Appearance.transparency.base - (root.light ? 0.1 : 0)))
 		readonly property bool enabled: Appearance.transparency.enabled
 		readonly property real layers: Appearance.transparency.layers
+
+		onBaseChanged: debounceTimer.restart()
+		onEnabledChanged: debounceTimer.restart()
 	}
 }

Greeter/Config/General.qml

@@ -4,13 +4,15 @@ import Quickshell
 JsonObject {
 	property Apps apps: Apps {
 	}
+	property Battery battery: Battery {
+	}
 	property Color color: Color {
 	}
+	property string dateFormat: "ddd d MMM - hh:mm:ss"
 	property bool desktopIcons: false
 	property Idle idle: Idle {
 	}
 	property string logo: ""
-	property string username: ""
 	property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers"
 
 	component Apps: JsonObject {
@@ -19,11 +21,27 @@ JsonObject {
 		property list<string> playback: ["mpv"]
 		property list<string> terminal: ["kitty"]
 	}
+	component Battery: JsonObject {
+		property int critPerc: 5
+		property list<var> popupThresholds: [
+			{
+				perc: 20,
+				name: qsTr("Low battery"),
+				message: qsTr("Battery is low"),
+				icon: "battery_android_frame_2"
+			},
+		]
+	}
 	component Color: JsonObject {
+		property int hyprsunsetTemp: 5000
 		property string mode: "dark"
 		property bool neovimColors: false
+		property bool scheduleDark: false
 		property int scheduleDarkEnd: 0
 		property int scheduleDarkStart: 0
+		property bool scheduleHyprsunset: false
+		property int scheduleHyprsunsetEnd: 0
+		property int scheduleHyprsunsetStart: 0
 		property bool schemeGeneration: true
 		property bool smart: false
 	}

Greeter/Config/Launcher.qml

@@ -91,6 +91,7 @@ JsonObject {
 	property string specialPrefix: "@"
 	property UseFuzzy useFuzzy: UseFuzzy {
 	}
+	property bool uwsm: true
 
 	component Sizes: JsonObject {
 		property int itemHeight: 50

Greeter/Config/LockConf.qml

@@ -5,6 +5,8 @@ JsonObject {
 	property bool enableFprint: true
 	property int maxFprintTries: 3
 	property bool recolorLogo: false
+	property bool showNotifContent: false
+	property bool showNotifIcon: true
 	property Sizes sizes: Sizes {
 	}
 

Greeter/Config/Screenshot.qml

@@ -0,0 +1,13 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enable_pp: true
+	property string mode: "manual"
+	property real radius: 12.0
+	property bool rounding: false
+	property bool shadow: true
+	property real shadow_blur: 22.0
+	property list<int> shadow_color: [0, 0, 0, 160]
+	property real shadow_offset_x: 5.0
+	property real shadow_offset_y: 5.0
+}

Greeter/Config/Services.qml

@@ -14,6 +14,7 @@ JsonObject {
 			"to": "YT Music"
 		}
 	]
+	property bool updates: true
 	property bool useFahrenheit: false
 	property bool useTwelveHourClock: Qt.locale().timeFormat(Locale.ShortFormat).toLowerCase().includes("a")
 	property int visualizerBars: 30

Greeter/SessionDock.qml

@@ -83,7 +83,7 @@ ColumnLayout {
 				radius: Appearance.rounding.normal - Appearance.padding.smaller
 
 				StateLayer {
-					function onClicked(): void {
+					onClicked: {
 						root.greeter.sessionIndex = index;
 					}
 				}

Greeter/UserDock.qml

@@ -84,7 +84,7 @@ ColumnLayout {
 				radius: Appearance.rounding.normal - Appearance.padding.smaller
 
 				StateLayer {
-					function onClicked(): void {
+					onClicked: {
 						root.greeter.selectUser(modelData.username);
 					}
 				}

Helpers/Battery.qml

@@ -0,0 +1,32 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Services.UPower
+import qs.Config
+
+Singleton {
+	id: root
+
+	readonly property var colors: {
+		if (deviceState === UPowerDeviceState.Charging || deviceState === UPowerDeviceState.FullyCharged)
+			return {
+				fg: DynamicColors.swapRG(DynamicColors.palette.m3error),
+				bg: DynamicColors.swapRG(DynamicColors.palette.m3onError)
+			};
+		else if (currentPerc <= 0.2)
+			return {
+				fg: DynamicColors.palette.m3error,
+				bg: DynamicColors.palette.m3onError
+			};
+		else
+			return {
+				fg: DynamicColors.palette.m3onSurface,
+				bg: DynamicColors.palette.m3surface
+			};
+	}
+	readonly property real currentPerc: UPower.displayDevice.percentage
+	readonly property var deviceState: UPower.displayDevice.state
+	readonly property bool isLaptop: UPower.displayDevice.isLaptopBattery
+	readonly property bool onBattery: UPower.onBattery
+	readonly property bool ready: UPower.displayDevice.ready
+}

Helpers/Hyprsunset.qml

@@ -2,12 +2,13 @@ pragma Singleton
 
 import Quickshell
 import QtQuick
+import ZShell.Services
 import qs.Config
 
 Singleton {
 	id: root
 
-	property bool enabled
+	readonly property bool enabled: service.enabled
 	readonly property int end: Config.general.color.scheduleHyprsunsetEnd
 	property bool manualToggle: false
 	readonly property int start: Config.general.color.scheduleHyprsunsetStart
@@ -17,69 +18,20 @@ Singleton {
 		if (!Config.general.color.scheduleHyprsunset)
 			return;
 
-		var now = new Date();
-		if (now.getHours() >= root.start || now.getHours() < root.end) {
-			root.startNightLight(root.temp);
-		} else {
-			root.stopNightLight();
-		}
-	}
-
-	function startNightLight(temp: int): void {
-		Quickshell.execDetached(["hyprctl", "hyprsunset", "temperature", `${temp}`]);
-		root.enabled = true;
-	}
-
-	function stopNightLight(): void {
-		Quickshell.execDetached(["hyprctl", "hyprsunset", "identity"]);
-		root.enabled = false;
+		service.apply();
 	}
 
 	function toggleNightLight(): void {
-		if (enabled)
-			stopNightLight();
-		else
-			startNightLight(temp);
+		service.manualToggle = true;
+		service.toggle();
 	}
 
-	onManualToggleChanged: {
-		if (root.manualToggle)
-			manualTimer.start();
-	}
+	HyprsunsetManager {
+		id: service
 
-	Timer {
-		id: manualTimer
-
-		interval: 60000 * 60
-		repeat: false
-		running: false
-
-		onTriggered: {
-			root.manualToggle = false;
-		}
-	}
-
-	Timer {
-		interval: 5000
-		repeat: true
-		running: true
-		triggeredOnStart: true
-
-		onTriggered: {
-			if (!Config.general.color.scheduleHyprsunset)
-				return;
-
-			if (root.manualToggle)
-				return;
-
-			var now = new Date();
-			if (now.getHours() >= root.start || now.getHours() < root.end) {
-				if (!root.enabled)
-					root.startNightLight(root.temp);
-			} else {
-				if (root.enabled)
-					root.stopNightLight();
-			}
-		}
+		activeAuto: Config.general.color.scheduleHyprsunset
+		endTime: root.end
+		startTime: root.start
+		temp: root.temp
 	}
 }

Helpers/UPower.qml

@@ -1,26 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import Quickshell.Services.UPower
-
-Singleton {
-	id: root
-
-	readonly property real batteryPercent: UPower.displayDevice.percentage
-	readonly property list<UPowerDevice> devices: UPower.devices.values
-	readonly property UPowerDevice displayDevice: UPower.displayDevice
-	readonly property bool onBattery: UPower.onBattery
-	// property bool toastShown
-	//
-	// Connections {
-	// 	target: UPower
-	//
-	// 	function onPercentageChanged(): {
-	// 		if (root.batteryPercent >= 0.2 && toastShown)
-	// 			return;
-	//
-	// 		root.toastShown = true;
-	// 		Toaster.toast(qsTr("Battery "))
-	// 	}
-	// }
-}

Modules/Clock.qml

@@ -23,7 +23,7 @@ CustomRect {
 
 		anchors.centerIn: parent
 		color: root.visibilities.dashboard ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
-		font: Appearance.font.family.mono
+		font: Appearance.font.family.mono // qmllint disable incompatible-type
 		text: Time.dateStr
 
 		Behavior on color {

Modules/Dashboard/Dash/Calendar.qml

@@ -49,11 +49,11 @@ CustomMouseArea {
 				StateLayer {
 					id: prevMonthStateLayer
 
-					function onClicked(): void {
+					radius: Appearance.rounding.full
+
+					onClicked: {
 						root.state.currentDate = new Date(root.currYear, root.currMonth - 1, 1);
 					}
-
-					radius: Appearance.rounding.full
 				}
 
 				MaterialIcon {
@@ -73,10 +73,6 @@ CustomMouseArea {
 				implicitWidth: monthYearDisplay.implicitWidth + Appearance.padding.small * 2
 
 				StateLayer {
-					function onClicked(): void {
-						root.state.currentDate = new Date();
-					}
-
 					anchors.fill: monthYearDisplay
 					anchors.leftMargin: -Appearance.padding.normal
 					anchors.margins: -Appearance.padding.small
@@ -86,6 +82,10 @@ CustomMouseArea {
 						return root.currMonth === now.getMonth() && root.currYear === now.getFullYear();
 					}
 					radius: Appearance.rounding.full
+
+					onClicked: {
+						root.state.currentDate = new Date();
+					}
 				}
 
 				CustomText {
@@ -107,11 +107,11 @@ CustomMouseArea {
 				StateLayer {
 					id: nextMonthStateLayer
 
-					function onClicked(): void {
+					radius: Appearance.rounding.full
+
+					onClicked: {
 						root.state.currentDate = new Date(root.currYear, root.currMonth + 1, 1);
 					}
-
-					radius: Appearance.rounding.full
 				}
 
 				MaterialIcon {

Modules/Dashboard/Dash/Media.qml

@@ -295,12 +295,12 @@ Item {
 		StateLayer {
 			id: controlState
 
-			function onClicked(): void {
-				control.onClicked();
-			}
-
 			color: control.canUse ? DynamicColors.palette[`m3on${control.set_color}`] : DynamicColors.palette[`m3on${control.set_color}Container`]
 			disabled: !control.canUse
+
+			onClicked: {
+				control.onClicked();
+			}
 			// radius: Appearance.rounding.full
 		}
 

Modules/Launcher/Items/ActionItem.qml

@@ -15,11 +15,11 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		function onClicked(): void {
+		radius: Appearance.rounding.smallest
+
+		onClicked: {
 			root.modelData?.onClicked(root.list);
 		}
-
-		radius: Appearance.rounding.smallest
 	}
 
 	Item {

Modules/Launcher/Items/AppItem.qml

@@ -18,12 +18,12 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		function onClicked(): void {
+		radius: Appearance.rounding.smallest
+
+		onClicked: {
 			Apps.launch(root.modelData);
 			root.visibilities.launcher = false;
 		}
-
-		radius: Appearance.rounding.smallest
 	}
 
 	Item {

Modules/Launcher/Items/CalcItem.qml

@@ -23,11 +23,11 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		function onClicked(): void {
+		radius: Appearance.rounding.smallest
+
+		onClicked: {
 			root.onClicked();
 		}
-
-		radius: Appearance.rounding.smallest
 	}
 
 	RowLayout {
@@ -76,12 +76,12 @@ Item {
 			StateLayer {
 				id: stateLayer
 
-				function onClicked(): void {
+				color: DynamicColors.palette.m3onTertiary
+
+				onClicked: {
 					Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.terminal, "fish", "-C", `exec qalc -i '${root.math}'`]);
 					root.list.visibilities.launcher = false;
 				}
-
-				color: DynamicColors.palette.m3onTertiary
 			}
 
 			CustomText {

Modules/Launcher/Items/VariantItem.qml

@@ -14,11 +14,11 @@ Item {
 	implicitHeight: Config.launcher.sizes.itemHeight
 
 	StateLayer {
-		function onClicked(): void {
+		radius: Appearance.rounding.smallest
+
+		onClicked: {
 			root.modelData?.onClicked(root.list);
 		}
-
-		radius: Appearance.rounding.smallest
 	}
 
 	Item {

Modules/Launcher/Items/WallpaperItem.qml

@@ -33,12 +33,12 @@ Item {
 	}
 
 	StateLayer {
-		function onClicked(): void {
+		radius: Appearance.rounding.normal
+
+		onClicked: {
 			Wallpapers.setWallpaper(root.modelData.path);
 			root.visibilities.launcher = false;
 		}
-
-		radius: Appearance.rounding.normal
 	}
 
 	Elevation {

Modules/Lock/Center.qml

@@ -108,12 +108,12 @@ ColumnLayout {
 		}
 
 		StateLayer {
-			function onClicked(): void {
-				parent.forceActiveFocus();
-			}
-
 			cursorShape: Qt.IBeamCursor
 			hoverEnabled: false
+
+			onClicked: {
+				parent.forceActiveFocus();
+			}
 		}
 
 		RowLayout {
@@ -167,11 +167,11 @@ ColumnLayout {
 				radius: Appearance.rounding.full
 
 				StateLayer {
-					function onClicked(): void {
+					color: root.lock.pam.buffer ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+
+					onClicked: {
 						root.lock.pam.passwd.start();
 					}
-
-					color: root.lock.pam.buffer ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
 				}
 
 				MaterialIcon {

Modules/Lock/IdleMonitors.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import Quickshell.Wayland
+import ZShell.Internal
 import qs.Config
 import qs.Helpers
 
@@ -29,6 +30,10 @@ Scope {
 			Quickshell.execDetached(action);
 	}
 
+    LidWatcher {
+        onAboutToSleep: root.lock.lock.locked = true
+    }
+
 	Variants {
 		model: Config.general.idle.timeouts
 

Modules/Lock/Media.qml

@@ -178,11 +178,11 @@ Item {
 		StateLayer {
 			id: controlState
 
-			function onClicked(): void {
+			color: control.active ? DynamicColors.palette[`m3on${control.set_color}`] : DynamicColors.palette[`m3on${control.set_color}Container`]
+
+			onClicked: {
 				control.onClicked();
 			}
-
-			color: control.active ? DynamicColors.palette[`m3on${control.set_color}`] : DynamicColors.palette[`m3on${control.set_color}Container`]
 		}
 
 		MaterialIcon {

Modules/Lock/NotifGroup.qml

@@ -161,11 +161,11 @@ CustomRect {
 					}
 
 					StateLayer {
-						function onClicked(): void {
+						color: root.urgency === "critical" ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
+
+						onClicked: {
 							root.expanded = !root.expanded;
 						}
-
-						color: root.urgency === "critical" ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
 					}
 
 					RowLayout {

Modules/NotifBell.qml

@@ -32,8 +32,6 @@ CustomRect {
 	}
 
 	StateLayer {
-		cursorShape: Qt.PointingHandCursor
-
 		onClicked: {
 			root.visibilities.sidebar = !root.visibilities.sidebar;
 		}

Modules/Notifications/Notification.qml

@@ -307,12 +307,12 @@ CustomRect {
 				implicitWidth: expandIcon.height
 
 				StateLayer {
-					function onClicked() {
-						root.expanded = !root.expanded;
-					}
-
 					color: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
 					radius: Appearance.rounding.full
+
+					onClicked: {
+						root.expanded = !root.expanded;
+					}
 				}
 
 				MaterialIcon {
@@ -434,12 +434,12 @@ CustomRect {
 		radius: Appearance.rounding.full
 
 		StateLayer {
-			function onClicked(): void {
-				action.modelData.invoke();
-			}
-
 			color: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3onSurface
 			radius: Appearance.rounding.full
+
+			onClicked: {
+				action.modelData.invoke();
+			}
 		}
 
 		CustomText {

Modules/Notifications/Sidebar/NotifActionList.qml

@@ -78,7 +78,7 @@ Item {
 					StateLayer {
 						id: actionStateLayer
 
-						function onClicked(): void {
+						onClicked: {
 							if (action.modelData.isClose) {
 								root.notif.close();
 							} else if (action.modelData.isCopy) {

Modules/Notifications/Sidebar/NotifGroup.qml

@@ -171,11 +171,11 @@ CustomRect {
 					radius: Appearance.rounding.full
 
 					StateLayer {
-						function onClicked(): void {
+						color: root.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
+
+						onClicked: {
 							root.toggleExpand(!root.expanded);
 						}
-
-						color: root.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
 					}
 
 					RowLayout {

Modules/Settings/Categories/General.qml

@@ -1,6 +1,7 @@
 import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Controls
 import qs.Modules.Settings.Controls
 import qs.Config
 import qs.Components
@@ -62,6 +63,7 @@ SettingsPage {
 
 	SettingsSection {
 		sectionId: "Color"
+		z: 1
 
 		SettingsHeader {
 			name: "Color"
@@ -105,7 +107,6 @@ SettingsPage {
 			active: root.schemeTypeItem(menuItems, Config.colors.schemeType)
 			enabled: Config.general.color.schemeGeneration
 			label: qsTr("Scheme type")
-			z: 2
 
 			menuItems: [
 				MenuItem {
@@ -238,6 +239,162 @@ SettingsPage {
 			shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
 		}
 
+		// Item {
+		// 	id: timeInput
+		//
+		// 	readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
+		// 	property string name
+		// 	property var object
+		// 	property list<string> settings
+		// 	property bool shouldBeActive: true
+		//
+		// 	function commitChoice(choice: int, setting: string): void {
+		// 		timeInput.object[setting] = choice;
+		// 		Config.save();
+		// 	}
+		//
+		// 	function formattedValue(setting: string): string {
+		// 		const value = timeInput.object[setting];
+		//
+		// 		if (value === null || value === undefined)
+		// 			return "";
+		//
+		// 		return String(value);
+		// 	}
+		//
+		// 	function hourToAmPm(hour) {
+		// 		var h = Number(hour) % 24;
+		// 		var d = new Date(2000, 0, 1, h, 0, 0);
+		// 		return Qt.formatTime(d, "h AP");
+		// 	}
+		//
+		// 	anchors.left: parent.left
+		// 	anchors.right: parent.right
+		// 	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+		// 	opacity: shouldBeActive ? 1 : 0
+		// 	scale: shouldBeActive ? 1 : 0.8
+		// 	visible: opacity > 0
+		//
+		// 	Behavior on opacity {
+		// 		Anim {
+		// 		}
+		// 	}
+		// 	Behavior on scale {
+		// 		Anim {
+		// 		}
+		// 	}
+		// 	Behavior on y {
+		// 		Anim {
+		// 		}
+		// 	}
+		//
+		// 	Rectangle {
+		// 		anchors.fill: parent
+		// 		anchors.margins: -Appearance.padding.smaller
+		// 		color: DynamicColors.palette.m3primaryContainer
+		// 		opacity: timeInput.highlighted ? 0.5 : 0
+		// 		radius: Appearance.rounding.small
+		//
+		// 		Behavior on opacity {
+		// 			Anim {
+		// 				duration: Appearance.anim.durations.normal
+		// 			}
+		// 		}
+		// 	}
+		//
+		// 	RowLayout {
+		// 		id: row
+		//
+		// 		anchors.left: parent.left
+		// 		anchors.margins: Appearance.padding.small
+		// 		anchors.right: parent.right
+		// 		anchors.verticalCenter: parent.verticalCenter
+		//
+		// 		ColumnLayout {
+		// 			Layout.fillHeight: true
+		// 			Layout.fillWidth: true
+		//
+		// 			CustomText {
+		// 				id: text
+		//
+		// 				Layout.alignment: Qt.AlignLeft
+		// 				Layout.fillWidth: true
+		// 				font.pointSize: Appearance.font.size.larger
+		// 				text: timeInput.name
+		// 			}
+		//
+		// 			CustomText {
+		// 				Layout.alignment: Qt.AlignLeft
+		// 				color: DynamicColors.palette.m3onSurfaceVariant
+		// 				font.pointSize: Appearance.font.size.normal
+		// 				text: qsTr("Dark mode will turn on at %1, and turn off at %2.").arg(timeInput.hourToAmPm(timeInput.object[timeInput.settings[0]])).arg(timeInput.hourToAmPm(timeInput.object[timeInput.settings[1]]))
+		// 			}
+		// 		}
+		//
+		// 		ColumnLayout {
+		// 			id: optionLayout
+		//
+		// 			Layout.fillHeight: true
+		// 			Layout.preferredWidth: 100
+		//
+		// 			RowLayout {
+		// 				Layout.preferredWidth: optionLayout.width
+		//
+		// 				CustomText {
+		// 					Layout.alignment: Qt.AlignLeft | Qt.AlignHCenter
+		// 					Layout.fillWidth: true
+		// 					text: qsTr("Enabled: ")
+		// 				}
+		//
+		// 				CustomSwitch {
+		// 					id: enabledSwitch
+		//
+		// 					Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
+		// 					checked: timeInput.object[timeInput.settings[2]]
+		//
+		// 					onToggled: {
+		// 						timeInput.object[timeInput.settings[2]] = checked;
+		// 						Config.save();
+		// 					}
+		// 				}
+		// 			}
+		//
+		// 			RowLayout {
+		// 				Layout.preferredWidth: optionLayout.width
+		//
+		// 				CustomText {
+		// 					Layout.alignment: Qt.AlignLeft | Qt.AlignHCenter
+		// 					Layout.fillWidth: true
+		// 					text: qsTr("Start: ")
+		// 				}
+		//
+		// 				CustomRect {
+		// 					Layout.preferredHeight: 72
+		// 					Layout.preferredWidth: 96
+		// 					color: startHourField.focus ? DynamicColors.palette.m3primaryContainer : DynamicColors.palette.m3surfaceContainer
+		//
+		// 					CustomTextField {
+		// 						id: startHourField
+		//
+		// 						function convertHour(timeValue: int): int {
+		// 							return Math.floor(timeValue / 60);
+		// 						}
+		//
+		// 						function convertMinute(timeValue: int): int {
+		// 							return timeValue % 60;
+		// 						}
+		//
+		// 						anchors.fill: parent
+		// 						font.family: "Roboto"
+		// 						font.pixelSize: 57
+		// 						text: convertHour(Config.general.color.scheduleDarkStart)
+		// 					}
+		// 				}
+		// 			}
+		// 		}
+		// 	}
+		// }
+
 		Separator {
 		}
 
@@ -250,7 +407,6 @@ SettingsPage {
 
 	SettingsSection {
 		sectionId: "Default Apps"
-		z: -1
 
 		SettingsHeader {
 			name: "Default Apps"

Modules/Settings/Categories/Lockscreen.qml

@@ -1,5 +1,6 @@
 import qs.Modules.Settings.Categories.Lockscreen
 import qs.Modules.Settings.Controls
+import qs.Helpers
 import qs.Config
 
 SettingsPage {

Modules/Settings/Controls/SpinnerButton.qml

@@ -44,11 +44,11 @@ CustomRect {
 	}
 
 	StateLayer {
-		function onClicked(): void {
+		visible: root.enabled
+
+		onClicked: {
 			SettingsDropdowns.toggle(menu, root);
 		}
-
-		visible: root.enabled
 	}
 
 	PathViewMenu {

Modules/Settings/Controls/WallpaperCropper.qml

@@ -80,7 +80,8 @@ Item {
 				required property ShellScreen modelData
 
 				function applyCrop(): void {
-					if (!cropRectLoader.item) return;
+					if (!cropRectLoader.item)
+						return;
 					const cropRect = cropRectLoader.item;
 
 					// We need to calculate the exact percentage coordinates that map perfectly
@@ -97,7 +98,8 @@ Item {
 				}
 
 				function zoomClipRect(zoom: real): void {
-					if (!cropRectLoader.item) return;
+					if (!cropRectLoader.item)
+						return;
 					const cropRect = cropRectLoader.item;
 
 					let oldCenterX = cropRect.x + cropRect.width * 0.5;
@@ -139,13 +141,14 @@ Item {
 						id: zoomSlider
 
 						Layout.fillWidth: true
-						Layout.preferredHeight: 10
+						Layout.preferredHeight: Appearance.padding.larger * 3
 						from: 1.0
+						implicitHeight: Appearance.padding.larger * 3
 						to: 5.0
 						value: cropRectLoader.item ? cropRectLoader.item.zoom : 1.0
 
-						onMoved: {
-							delegate.zoomClipRect(value);
+						onInteraction: value => {
+							delegate.zoomClipRect(1 + (value * 4));
 							wrapper.changesMade = true;
 						}
 					}
@@ -198,6 +201,7 @@ Item {
 
 					Loader {
 						id: cropRectLoader
+
 						active: scaledImg.paintedWidth > 0 && scaledImg.status == Image.Ready
 
 						sourceComponent: Component {
@@ -272,7 +276,8 @@ Item {
 						id: mouse
 
 						function updateCrop(mouseX, mouseY) {
-							if (!cropRectLoader.item) return;
+							if (!cropRectLoader.item)
+								return;
 							const cropRect = cropRectLoader.item;
 
 							let nx = mouseX - cropRect.width * 0.5;

Modules/Settings/Controls/WallpaperGrid.qml

@@ -131,16 +131,16 @@ GridView {
 		}
 
 		StateLayer {
-			function onClicked(): void {
-				Wallpapers.setWallpaper(modelData.path);
-			}
-
 			anchors.bottomMargin: itemMargin
 			anchors.fill: parent
 			anchors.leftMargin: itemMargin
 			anchors.rightMargin: itemMargin
 			anchors.topMargin: itemMargin
 			radius: itemRadius
+
+			onClicked: {
+				Wallpapers.setWallpaper(modelData.path);
+			}
 		}
 	}
 	Behavior on opacity {

Modules/SysTray/Popouts/AudioPopup.qml

@@ -19,7 +19,7 @@ Item {
 	required property var wrapper
 
 	implicitHeight: vol.implicitHeight + Appearance.padding.small * 2
-	implicitWidth: 400 + Appearance.padding.small * 2
+	implicitWidth: 500 + Appearance.padding.small * 2
 
 	CustomRect {
 		anchors.left: parent.left
@@ -52,76 +52,52 @@ Item {
 
 		CustomRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
 
-			RowLayout {
-				id: outputVolume
-
-				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 15
-
-				CustomRect {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
-					Layout.preferredWidth: 40
-					color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-					radius: Appearance.rounding.full
-
-					MaterialIcon {
-						anchors.alignWhenCentered: false
-						anchors.centerIn: parent
-						animate: true
-						color: Audio.muted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-						font.pointSize: 22
-						text: Audio.muted ? "volume_off" : "volume_up"
-					}
-
-					StateLayer {
-						color: Audio.muted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-
-						onClicked: {
-							const audio = Audio.sink?.audio;
-							if (audio)
-								audio.muted = !audio.muted;
-						}
-					}
-				}
-
 			ColumnLayout {
-					Layout.fillWidth: true
+				anchors.bottomMargin: Appearance.padding.smaller
+				anchors.fill: parent
+				anchors.leftMargin: Appearance.padding.larger
+				anchors.rightMargin: Appearance.padding.larger
+				anchors.topMargin: Appearance.padding.smaller
 
 				RowLayout {
+					Layout.fillHeight: true
 					Layout.fillWidth: true
 
 					CustomText {
 						Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 						Layout.fillWidth: true
-							text: "Output Volume"
+						text: "Output volume"
 					}
 
 					CustomText {
 						Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+						color: Qt.alpha(DynamicColors.palette.m3onSurface, 0.7)
 						font.bold: true
 						text: qsTr("%1").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`)
 					}
 				}
 
+				RowLayout {
+					spacing: Appearance.spacing.large
+
 					CustomMouseArea {
-						Layout.bottomMargin: 5
+						Layout.bottomMargin: Appearance.padding.normal
 						Layout.fillWidth: true
-						Layout.preferredHeight: 10
+						Layout.preferredHeight: Appearance.padding.larger * 3
 
 						CustomSlider {
 							anchors.left: parent.left
 							anchors.right: parent.right
-							color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-							implicitHeight: 10
+							bgColor: Audio.muted ? Qt.alpha(DynamicColors.palette.m3errorContainer, 0.5) : DynamicColors.palette.m3secondaryContainer
+							fgColor: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+							implicitHeight: parent.height
+							insetColor: Audio.muted ? (inset.attached ? DynamicColors.palette.m3onErrorContainer : DynamicColors.palette.m3onError) : (inset.attached ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onPrimary)
+							insetIcon: Audio.muted || Audio.volume < 0.001 ? "volume_off" : "volume_up"
 							value: Audio.volume
 
 							Behavior on value {
@@ -129,7 +105,18 @@ Item {
 								}
 							}
 
-							onMoved: Audio.setVolume(value)
+							onInteraction: value => Audio.setVolume(value)
+						}
+					}
+
+					CustomSwitch {
+						Layout.bottomMargin: Appearance.padding.normal
+						checked: !Audio.muted
+
+						onToggled: {
+							const audio = Audio.sink?.audio;
+							if (audio)
+								audio.muted = !audio.muted;
 						}
 					}
 				}
@@ -138,7 +125,7 @@ Item {
 
 		CustomClippingRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
@@ -165,44 +152,12 @@ Item {
 				}
 			}
 
-			RowLayout {
-				id: inputVolume
-
-				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 15
-
-				CustomRect {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
-					Layout.preferredWidth: 40
-					color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-					radius: Appearance.rounding.full
-
-					MaterialIcon {
-						anchors.alignWhenCentered: false
-						anchors.centerIn: parent
-						animate: true
-						color: Audio.sourceMuted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-						font.pointSize: 22
-						text: Audio.sourceMuted ? "mic_off" : "mic"
-					}
-
-					StateLayer {
-						color: Audio.sourceMuted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-
-						onClicked: {
-							const audio = Audio.source?.audio;
-							if (audio)
-								audio.muted = !audio.muted;
-						}
-					}
-				}
-
 			ColumnLayout {
-					Layout.fillWidth: true
+				anchors.bottomMargin: Appearance.padding.smaller
+				anchors.fill: parent
+				anchors.leftMargin: Appearance.padding.larger
+				anchors.rightMargin: Appearance.padding.larger
+				anchors.topMargin: Appearance.padding.smaller
 
 				RowLayout {
 					Layout.fillHeight: true
@@ -211,26 +166,33 @@ Item {
 					CustomText {
 						Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 						Layout.fillWidth: true
-							text: "Input Volume"
+						text: "Input volume"
 					}
 
 					CustomText {
 						Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+						color: Qt.alpha(DynamicColors.palette.m3onSurface, 0.7)
 						font.bold: true
 						text: qsTr("%1").arg(Audio.sourceMuted ? qsTr("Muted") : `${Math.round(Audio.sourceVolume * 100)}%`)
 					}
 				}
 
+				RowLayout {
+					spacing: Appearance.spacing.large
+
 					CustomMouseArea {
-						Layout.bottomMargin: 5
+						Layout.bottomMargin: Appearance.padding.normal
 						Layout.fillWidth: true
-						implicitHeight: 10
+						Layout.preferredHeight: Appearance.padding.larger * 3
 
 						CustomSlider {
 							anchors.left: parent.left
 							anchors.right: parent.right
-							color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-							implicitHeight: 10
+							bgColor: Audio.sourceMuted ? Qt.alpha(DynamicColors.palette.m3errorContainer, 0.5) : DynamicColors.palette.m3secondaryContainer
+							fgColor: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+							implicitHeight: parent.height
+							insetColor: Audio.sourceMuted ? (inset.attached ? DynamicColors.palette.m3onErrorContainer : DynamicColors.palette.m3onError) : (inset.attached ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onPrimary)
+							insetIcon: Audio.sourceMuted || Audio.sourceVolume < 0.001 ? "mic_off" : "mic"
 							value: Audio.sourceVolume
 
 							Behavior on value {
@@ -238,7 +200,18 @@ Item {
 								}
 							}
 
-							onMoved: Audio.setSourceVolume(value)
+							onInteraction: value => Audio.setSourceVolume(value)
+						}
+					}
+
+					CustomSwitch {
+						Layout.bottomMargin: Appearance.padding.normal
+						checked: !Audio.sourceMuted
+
+						onToggled: {
+							const audio = Audio.source?.audio;
+							if (audio)
+								audio.muted = !audio.muted;
 						}
 					}
 				}
@@ -265,7 +238,7 @@ Item {
 				required property var modelData
 
 				Layout.fillWidth: true
-				Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+				Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
 				Layout.topMargin: root.topMargin
 				color: DynamicColors.tPalette.m3surfaceContainer
 				radius: root.rounding
@@ -292,44 +265,6 @@ Item {
 					}
 				}
 
-				RowLayout {
-					id: layoutVolume
-
-					anchors.fill: parent
-					anchors.margins: Appearance.spacing.smaller
-					spacing: 15
-
-					CustomRect {
-						Layout.alignment: Qt.AlignVCenter
-						Layout.preferredHeight: 40
-						Layout.preferredWidth: 40
-						color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-						radius: Appearance.rounding.full
-
-						MaterialIcon {
-							id: icon
-
-							anchors.centerIn: parent
-							animate: true
-							color: appBox.modelData.audio.muted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-							font.pointSize: 22
-							text: appBox.modelData.audio.muted ? "volume_off" : "volume_up"
-						}
-
-						StateLayer {
-							color: appBox.modelData.audio.muted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-							radius: Appearance.rounding.full
-
-							onClicked: {
-								appBox.modelData.audio.muted = !appBox.modelData.audio.muted;
-							}
-						}
-					}
-
-					ColumnLayout {
-						Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-						Layout.fillHeight: true
-
 				TextMetrics {
 					id: metrics
 
@@ -338,13 +273,19 @@ Item {
 					text: Audio.getStreamName(appBox.modelData)
 				}
 
+				ColumnLayout {
+					anchors.bottomMargin: Appearance.padding.smaller
+					anchors.fill: parent
+					anchors.leftMargin: Appearance.padding.larger
+					anchors.rightMargin: Appearance.padding.larger
+					anchors.topMargin: Appearance.padding.smaller
+
 					RowLayout {
 						Layout.fillHeight: true
 						Layout.fillWidth: true
 
 						CustomText {
 							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-								Layout.fillHeight: true
 							Layout.fillWidth: true
 							elide: Text.ElideRight
 							text: metrics.elidedText
@@ -352,29 +293,46 @@ Item {
 
 						CustomText {
 							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-								Layout.fillHeight: true
+							color: Qt.alpha(DynamicColors.palette.m3onSurface, 0.7)
 							font.bold: true
 							text: qsTr("%1").arg(appBox.modelData.audio.muted ? qsTr("Muted") : `${Math.round(appBox.modelData.audio.volume * 100)}%`)
 						}
 					}
 
+					RowLayout {
+						spacing: Appearance.spacing.large
+
 						CustomMouseArea {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.fillHeight: true
+							Layout.bottomMargin: Appearance.padding.normal
 							Layout.fillWidth: true
-							implicitHeight: 10
+							Layout.preferredHeight: Appearance.padding.larger * 3
 
 							CustomSlider {
 								anchors.left: parent.left
 								anchors.right: parent.right
-								color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-								implicitHeight: 10
+								bgColor: appBox.modelData.audio.muted ? Qt.alpha(DynamicColors.palette.m3errorContainer, 0.5) : DynamicColors.palette.m3secondaryContainer
+								fgColor: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+								implicitHeight: parent.height
+								insetColor: appBox.modelData.audio.muted ? (inset.attached ? DynamicColors.palette.m3onErrorContainer : DynamicColors.palette.m3onError) : (inset.attached ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onPrimary)
+								insetIcon: appBox.modelData.audio.muted || appBox.modelData.audio.volume < 0.001 ? "volume_off" : "volume_up"
 								value: appBox.modelData.audio.volume
 
-								onMoved: {
-									Audio.setStreamVolume(appBox.modelData, value);
+								Behavior on value {
+									Anim {
 									}
 								}
+
+								onInteraction: value => Audio.setStreamVolume(appBox.modelData, value)
+							}
+						}
+
+						CustomSwitch {
+							Layout.bottomMargin: Appearance.padding.normal
+							checked: !appBox.modelData.audio.muted
+
+							onToggled: {
+								appBox.modelData.audio.muted = !appBox.modelData.audio.muted;
+							}
 						}
 					}
 				}

Modules/SysTray/Popouts/TrayMenuPopout.qml

@@ -103,7 +103,10 @@ StackView {
 						implicitHeight: 30
 
 						StateLayer {
-							function onClicked(): void {
+							disabled: !item.modelData.enabled
+							radius: item.radius
+
+							onClicked: {
 								const entry = item.modelData;
 								if (entry.hasChildren) {
 									root.rootWidth = root.biggestWidth;
@@ -117,9 +120,6 @@ StackView {
 									root.popouts.hasCurrent = false;
 								}
 							}
-
-							disabled: !item.modelData.enabled
-							radius: item.radius
 						}
 
 						Loader {
@@ -217,13 +217,13 @@ StackView {
 						radius: Appearance.rounding.full
 
 						StateLayer {
-							function onClicked(): void {
+							color: DynamicColors.palette.m3onSecondaryContainer
+							radius: parent.radius
+
+							onClicked: {
 								root.pop();
 								root.biggestWidth = root.rootWidth;
 							}
-
-							color: DynamicColors.palette.m3onSecondaryContainer
-							radius: parent.radius
 						}
 					}
 

Modules/SysTray/Popouts/UPowerPopout.qml

@@ -153,12 +153,12 @@ Item {
 		implicitWidth: icon.implicitHeight + 5 * 2
 
 		StateLayer {
-			function onClicked(): void {
-				PowerProfiles.profile = parent.profile;
-			}
-
 			color: profiles.current === parent.icon ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
 			radius: Appearance.rounding.full
+
+			onClicked: {
+				PowerProfiles.profile = parent.profile;
+			}
 		}
 
 		MaterialIcon {

Modules/SysTray/Widgets/UPowerWidget.qml

@@ -3,33 +3,120 @@ import QtQuick
 import QtQuick.Layouts
 import qs.Components
 import qs.Config
-import qs.Helpers as Helpers
+import qs.Helpers
 
-RowLayout {
+Item {
 	id: root
 
+	implicitHeight: Battery.isLaptop ? batteryIconLoader.item.implicitHeight : upowerIconLoader.item.implicitHeight
+	implicitWidth: Battery.isLaptop ? batteryIconLoader.item.implicitWidth : upowerIconLoader.item.implicitWidth
+
+	Loader {
+		id: batteryIconLoader
+
+		active: Battery.isLaptop
+		anchors.centerIn: parent
+
+		sourceComponent: Row {
+			id: batteryIcon
+
+			property real batHeight: 16
+			property real batWidth: 30
+			property real nubHeight: 6
+			property real nubWidth: 2
+			property real radius: Appearance.rounding.smallest / 2
+
+			spacing: 1
+
+			CustomRect {
+				id: track
+
+				anchors.verticalCenter: parent.verticalCenter
+				color: Battery.colors.bg
+				height: batteryIcon.batHeight
+				radius: batteryIcon.radius
+				width: batteryIcon.batWidth
+
+				CustomText {
+					color: Battery.colors.fg
+					font.pointSize: Appearance.font.size.larger / 1.5
+					font.weight: 800
+					height: track.height
+					horizontalAlignment: Text.AlignHCenter
+					text: Math.round(Battery.currentPerc * 100)
+					verticalAlignment: Text.AlignVCenter
+					width: track.width
+				}
+
+				Item {
+					clip: true
+					width: parent.width * Battery.currentPerc
+
+					anchors {
+						bottom: parent.bottom
+						left: parent.left
+						top: parent.top
+					}
+
+					CustomRect {
+						id: fill
+
+						color: Battery.colors.fg
+						height: track.height
+						radius: track.radius
+						width: track.width
+
+						CustomText {
+							id: batteryLabel
+
+							clip: true
+							color: Battery.colors.bg
+							font.pointSize: 7.5
+							font.weight: 800
+							height: track.height
+							horizontalAlignment: Text.AlignHCenter
+							text: Math.round(Battery.currentPerc * 100)
+							verticalAlignment: Text.AlignVCenter
+							width: track.width
+						}
+					}
+				}
+			}
+
+			CustomRect {
+				id: nub
+
+				anchors.verticalCenter: parent.verticalCenter
+				bottomRightRadius: 20
+				color: Battery.currentPerc < 0.99 ? track.color : fill.color
+				height: batteryIcon.nubHeight
+				topRightRadius: 20
+				width: batteryIcon.nubWidth
+			}
+		}
+	}
+
+	Loader {
+		id: upowerIconLoader
+
+		active: !Battery.isLaptop
+		anchors.centerIn: parent
+
+		sourceComponent: RowLayout {
+			id: upowerIcon
+
 			MaterialIcon {
 				Layout.alignment: Qt.AlignVCenter
 				animate: true
-		color: !Helpers.UPower.onBattery || UPower.displayDevice.percentage > 0.2 ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3error
 				fill: 1
 				text: {
-			if (!Helpers.UPower.displayDevice.isLaptopBattery) {
 					if (PowerProfiles.profile === PowerProfile.PowerSaver)
 						return "nest_eco_leaf";
 					if (PowerProfiles.profile === PowerProfile.Performance)
 						return "bolt";
 					return "power_settings_new";
 				}
-
-			const perc = Helpers.UPower.displayDevice.percentage;
-			const charging = [UPowerDeviceState.Charging, UPowerDeviceState.FullyCharged, UPowerDeviceState.PendingCharge].includes(Helpers.UPower.displayDevice.state);
-			if (perc === 1)
-				return charging ? "battery_charging_full" : "battery_full";
-			let level = Math.floor(perc * 7);
-			if (charging && (level === 4 || level === 1))
-				level--;
-			return charging ? `battery_charging_${(level + 3) * 10}` : `battery_${level}_bar`;
+			}
 		}
 	}
 }

Plugins/ZShell/Blobs/blobgroup.hpp

@@ -18,13 +18,13 @@ public:
 explicit BlobGroup(QObject* parent = nullptr);
 ~BlobGroup() override;
 
-qreal smoothing() const {
+[[nodiscard]] qreal smoothing() const {
 	return m_smoothing;
 }
 
 void setSmoothing(qreal s);
 
-QColor color() const {
+[[nodiscard]] QColor color() const {
 	return m_color;
 }
 
@@ -36,11 +36,11 @@ void removeShape(BlobShape* shape);
 void setInvertedRect(BlobInvertedRect* rect);
 void clearInvertedRect(BlobInvertedRect* rect);
 
-const QList<BlobShape*>& shapes() const {
+[[nodiscard]] const QList<BlobShape*>& shapes() const {
 	return m_shapes;
 }
 
-BlobInvertedRect* invertedRect() const {
+[[nodiscard]] BlobInvertedRect* invertedRect() const {
 	return m_invertedRect;
 }
 

Plugins/ZShell/Blobs/blobinvertedrect.hpp

@@ -16,25 +16,25 @@ public:
 explicit BlobInvertedRect(QQuickItem* parent = nullptr);
 ~BlobInvertedRect() override;
 
-qreal borderLeft() const {
+[[nodiscard]] qreal borderLeft() const {
 	return m_borderLeft;
 }
 
 void setBorderLeft(qreal v);
 
-qreal borderRight() const {
+[[nodiscard]] qreal borderRight() const {
 	return m_borderRight;
 }
 
 void setBorderRight(qreal v);
 
-qreal borderTop() const {
+[[nodiscard]] qreal borderTop() const {
 	return m_borderTop;
 }
 
 void setBorderTop(qreal v);
 
-qreal borderBottom() const {
+[[nodiscard]] qreal borderBottom() const {
 	return m_borderBottom;
 }
 
@@ -47,7 +47,7 @@ void borderTopChanged();
 void borderBottomChanged();
 
 protected:
-bool isInvertedRect() const override {
+[[nodiscard]] bool isInvertedRect() const override {
 	return true;
 }
 

Plugins/ZShell/Blobs/blobmaterial.hpp

@@ -21,8 +21,8 @@ struct BlobRectData {
 
 class BlobMaterial : public QSGMaterial {
 public:
-QSGMaterialType* type() const override;
-QSGMaterialShader* createShader(QSGRendererInterface::RenderMode) const override;
+[[nodiscard]] QSGMaterialType* type() const override;
+[[nodiscard]] QSGMaterialShader* createShader(QSGRendererInterface::RenderMode) const override;
 int compare(const QSGMaterial* other) const override;
 
 float m_paddedX = 0;

Plugins/ZShell/Blobs/blobrect.cpp

@@ -14,15 +14,11 @@ BlobRect::~BlobRect() {
 }
 
 void BlobRect::updatePolish() {
-	BlobShape::updatePolish();
-
 	if (m_physicsActive) {
-		// Check if deformation is visually imperceptible
 		float totalDelta = std::abs(m_dm00 - 1.0f) + std::abs(m_dm01) + std::abs(m_dm11 - 1.0f);
 		float totalVel = std::abs(m_dmVel00) + std::abs(m_dmVel01) + std::abs(m_dmVel11);
 
 		if (totalDelta < 0.004f && totalVel < 0.05f) {
-			// Snap to rest, no visible deformation
 			m_dm00 = 1.0f;
 			m_dm01 = 0.0f;
 			m_dm11 = 1.0f;
@@ -31,6 +27,16 @@ void BlobRect::updatePolish() {
 			emit rawDeformMatrixChanged();
 			updateCenteredDeformMatrix();
 			m_physicsActive = false;
+
+			if (m_group) {
+				QMetaObject::invokeMethod(
+					this,
+					[this]() {
+					if (m_group)
+						m_group->markDirty();
+				},
+					Qt::QueuedConnection);
+			}
 		} else {
 			QMetaObject::invokeMethod(
 				this,
@@ -41,6 +47,8 @@ void BlobRect::updatePolish() {
 				Qt::QueuedConnection);
 		}
 	}
+
+	BlobShape::updatePolish();
 }
 
 void BlobRect::updatePhysics() {
@@ -56,7 +64,6 @@ void BlobRect::updatePhysics() {
 	const float dt = static_cast<float>(m_elapsed.restart()) / 1000.0f;
 	if (dt > 0.1f || dt < 0.001f) {
 		m_prevScenePos = scenePos;
-		// Still check atRest on skipped frames to avoid getting stuck
 		if (m_physicsActive)
 			checkAtRest(0.0f);
 		return;
@@ -74,8 +81,6 @@ void BlobRect::updatePhysics() {
 		m_physicsActive = true;
 	}
 
-	// Compute target deformation matrix from velocity
-	// R(θ) * diag(stretch, compress) * R(θ)^T
 	const float kStretchFactor = static_cast<float>(m_deformScale);
 	constexpr float kMaxStretch = 0.35f;
 
@@ -98,7 +103,6 @@ void BlobRect::updatePhysics() {
 		target11 = targetStretch * sin2 + targetCompress * cos2;
 	}
 
-	// Underdamped spring on each matrix component
 	const float kStiffness = static_cast<float>(m_stiffness);
 	const float kDamping = static_cast<float>(m_damping);
 
@@ -238,9 +242,19 @@ void BlobRect::checkAtRest(float speed) {
 		m_dmVel00 = 0.0f;
 		m_dmVel01 = 0.0f;
 		m_dmVel11 = 0.0f;
-		m_deformMatrix = QMatrix4x4(); // identity
+		m_deformMatrix = QMatrix4x4();
 		emit rawDeformMatrixChanged();
 		updateCenteredDeformMatrix();
 		m_physicsActive = false;
+
+		if (m_group) {
+			QMetaObject::invokeMethod(
+				this,
+				[this]() {
+				if (m_group)
+					m_group->markDirty();
+			},
+				Qt::QueuedConnection);
+		}
 	}
 }

Plugins/ZShell/Blobs/blobrect.hpp

@@ -24,7 +24,7 @@ public:
 explicit BlobRect(QQuickItem* parent = nullptr);
 ~BlobRect() override;
 
-qreal stiffness() const {
+[[nodiscard]] qreal stiffness() const {
 	return m_stiffness;
 }
 
@@ -35,7 +35,7 @@ void setStiffness(qreal s) {
 	}
 }
 
-qreal damping() const {
+[[nodiscard]] qreal damping() const {
 	return m_damping;
 }
 
@@ -46,7 +46,7 @@ void setDamping(qreal d) {
 	}
 }
 
-qreal deformScale() const {
+[[nodiscard]] qreal deformScale() const {
 	return m_deformScale;
 }
 
@@ -62,25 +62,25 @@ QQmlListProperty<BlobRect> exclude();
 bool isExcluded(const BlobShape* other) const override;
 void cornerRadii(float out[4]) const override;
 
-qreal topLeftRadius() const {
+[[nodiscard]] qreal topLeftRadius() const {
 	return m_topLeftRadius;
 }
 
 void setTopLeftRadius(qreal r);
 
-qreal topRightRadius() const {
+[[nodiscard]] qreal topRightRadius() const {
 	return m_topRightRadius;
 }
 
 void setTopRightRadius(qreal r);
 
-qreal bottomLeftRadius() const {
+[[nodiscard]] qreal bottomLeftRadius() const {
 	return m_bottomLeftRadius;
 }
 
 void setBottomLeftRadius(qreal r);
 
-qreal bottomRightRadius() const {
+[[nodiscard]] qreal bottomRightRadius() const {
 	return m_bottomRightRadius;
 }
 

Plugins/ZShell/Blobs/blobshape.cpp

@@ -9,7 +9,6 @@
 #include <cmath>
 
 static float deformPadding(const QMatrix4x4& dm, float hw, float hh) {
-	// Bounding box of the deformed shape: |M * corners|
 	const float dm00 = dm(0, 0), dm01 = dm(0, 1);
 	const float dm10 = dm(1, 0), dm11 = dm(1, 1);
 	const float boundX = std::abs(dm00) * hw + std::abs(dm01) * hh;
@@ -69,16 +68,17 @@ void BlobShape::geometryChange(const QRectF& newGeometry, const QRectF& oldGeome
 	QQuickItem::geometryChange(newGeometry, oldGeometry);
 	updateCenteredDeformMatrix();
 	if (m_group) {
-		// Accumulate sub-pixel drift so slow movements don't desync the shader
 		m_pendingDx += static_cast<float>(newGeometry.x() - oldGeometry.x());
 		m_pendingDy += static_cast<float>(newGeometry.y() - oldGeometry.y());
-		// Accumulate size delta across multiple frames so incremental size
-		// changes that are each below the threshold still trigger a dirty
-		// mark once their accumulated delta exceeds it.
 		m_pendingDw += static_cast<float>(newGeometry.width() - oldGeometry.width());
 		m_pendingDh += static_cast<float>(newGeometry.height() - oldGeometry.height());
-		if (std::abs(m_pendingDx) > 0.5f || std::abs(m_pendingDy) > 0.5f ||
-		    std::abs(m_pendingDw) > 0.5f || std::abs(m_pendingDh) > 0.5f) {
+
+		const float deformMag = std::abs(m_deformMatrix(0, 0) - 1.0f) + std::abs(m_deformMatrix(0, 1)) +
+		                        std::abs(m_deformMatrix(1, 0)) + std::abs(m_deformMatrix(1, 1) - 1.0f);
+		const float syncThreshold = deformMag > 0.001f ? 0.05f : 0.5f;
+
+		if (std::abs(m_pendingDx) > syncThreshold || std::abs(m_pendingDy) > syncThreshold ||
+		    std::abs(m_pendingDw) > syncThreshold || std::abs(m_pendingDh) > syncThreshold) {
 			m_pendingDx = 0;
 			m_pendingDy = 0;
 			m_pendingDw = 0;
@@ -124,7 +124,6 @@ void BlobShape::updatePolish() {
 	if (!m_group)
 		return;
 
-	// Ensure all shapes have up-to-date physics (only once per frame)
 	m_group->ensurePhysicsUpdated();
 
 	const QPointF scenePos = mapToScene(QPointF(0, 0));
@@ -149,13 +148,11 @@ void BlobShape::updatePolish() {
 		                           width() + 2.0 * static_cast<double>(totalPad), height() + 2.0 * static_cast<double>(totalPad));
 	}
 
-	// Filter nearby normal rects
 	m_cachedRects.clear();
 	m_cachedMyIndex = -2;
 	const QRectF myPadded(static_cast<double>(m_cachedPaddedX), static_cast<double>(m_cachedPaddedY),
 	                      static_cast<double>(m_cachedPaddedW), static_cast<double>(m_cachedPaddedH));
 
-	// Track shape pointers parallel to m_cachedRects for pairwise exclusion lookups
 	QVector<BlobShape*> rectShapes;
 	rectShapes.reserve(m_group->shapes().size());
 
@@ -163,7 +160,6 @@ void BlobShape::updatePolish() {
 		if (other->isInvertedRect())
 			continue;
 
-		// Skip zero-size rects
 		if (other->width() <= 0 || other->height() <= 0)
 			continue;
 
@@ -202,7 +198,6 @@ void BlobShape::updatePolish() {
 			r.offsetX = dm(0, 3);
 			r.offsetY = dm(1, 3);
 
-			// Pre-compute inverse deformation matrix
 			const float det = a * d - c * b;
 			const float invDet = std::abs(det) > 1e-6f ? 1.0f / det : 1.0f;
 			r.invDeform[0] = d * invDet;
@@ -210,12 +205,10 @@ void BlobShape::updatePolish() {
 			r.invDeform[2] = -c * invDet;
 			r.invDeform[3] = a * invDet;
 
-			// Pre-compute minimum eigenvalue (avoids per-pixel sqrt)
 			const float halfTr = 0.5f * (a + d);
 			const float halfDiff = 0.5f * (a - d);
 			r.minEig = halfTr - std::sqrt(halfDiff * halfDiff + c * c);
 
-			// Pre-compute screen-space AABB half-extents
 			r.screenHalfX = std::abs(a) * r.hw + std::abs(c) * r.hh;
 			r.screenHalfY = std::abs(b) * r.hw + std::abs(d) * r.hh;
 
@@ -227,8 +220,6 @@ void BlobShape::updatePolish() {
 	if (isInvertedRect())
 		m_cachedMyIndex = -1;
 
-	// Compute pairwise exclude masks. Bit j in entry i is set iff rect i excludes rect j
-	// or rect j excludes rect i. The shader uses this to avoid smin between excluded pairs.
 	const auto cachedCount = m_cachedRects.size();
 	for (qsizetype i = 0; i < cachedCount; ++i) {
 		int mask = 0;
@@ -243,7 +234,6 @@ void BlobShape::updatePolish() {
 		m_cachedRects[i].excludeMask = mask;
 	}
 
-	// Cache inverted rect data
 	m_cachedHasInverted = false;
 	m_cachedInvertedRadius = 0;
 	memset(m_cachedInvertedOuter, 0, sizeof(m_cachedInvertedOuter));
@@ -262,7 +252,6 @@ void BlobShape::updatePolish() {
 		const float innerHW = outerHW - static_cast<float>((inv->borderLeft() + inv->borderRight()) / 2.0);
 		const float innerHH = outerHH - static_cast<float>((inv->borderTop() + inv->borderBottom()) / 2.0);
 
-		// Check if this rect is near the border (within 2x smoothing of inner edge)
 		bool nearBorder = isInvertedRect();
 		if (!nearBorder) {
 			const float margin = pad * 2.0f;
@@ -270,7 +259,6 @@ void BlobShape::updatePolish() {
 			const float myCY = m_cachedPaddedY + m_cachedPaddedH * 0.5f;
 			const float myHW = m_cachedPaddedW * 0.5f;
 			const float myHH = m_cachedPaddedH * 0.5f;
-			// Near border if any edge of padded rect is within margin of inner edge
 			nearBorder = (myCX - myHW < innerCX - innerHW + margin) || (myCX + myHW > innerCX + innerHW - margin) ||
 			             (myCY - myHH < innerCY - innerHH + margin) || (myCY + myHH > innerCY + innerHH - margin);
 		}
@@ -291,7 +279,6 @@ void BlobShape::updatePolish() {
 		}
 	}
 
-	// Pre-compute effective per-corner radii (moves O(N²) work from GPU to CPU)
 	const float smoothFactor = pad;
 	constexpr float minR = 2.0f;
 	const auto rectCount = m_cachedRects.size();
@@ -328,7 +315,6 @@ void BlobShape::updatePolish() {
 			fTl = std::min(fTl, cpuSmoothstep(0.0f, smoothFactor, -cpuSdBox(cTlX, cTlY, icx, icy, ihw, ihh)));
 		}
 
-		// Combine base radii with fill factors into effective per-corner radii
 		ri.radius[0] = std::max(ri.radius[0] * fTr, minR);
 		ri.radius[1] = std::max(ri.radius[1] * fBr, minR);
 		ri.radius[2] = std::max(ri.radius[2] * fBl, minR);
@@ -357,7 +343,6 @@ QSGNode* BlobShape::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) {
 		node->setFlag(QSGNode::OwnsMaterial);
 	}
 
-	// Update geometry
 	auto* geometry = node->geometry();
 	auto* v = geometry->vertexDataAsTexturedPoint2D();
 
@@ -373,7 +358,6 @@ QSGNode* BlobShape::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) {
 
 	node->markDirty(QSGNode::DirtyGeometry);
 
-	// Update material
 	auto* material = static_cast<BlobMaterial*>(node->material());
 	material->m_paddedX = m_cachedPaddedX;
 	material->m_paddedY = m_cachedPaddedY;

Plugins/ZShell/Blobs/blobshape.hpp

@@ -21,23 +21,23 @@ public:
 explicit BlobShape(QQuickItem* parent = nullptr);
 ~BlobShape() override = default;
 
-BlobGroup* group() const {
+[[nodiscard]] BlobGroup* group() const {
 	return m_group;
 }
 
 void setGroup(BlobGroup* g);
 
-qreal radius() const {
+[[nodiscard]] qreal radius() const {
 	return m_radius;
 }
 
 void setRadius(qreal r);
 
-QMatrix4x4 deformMatrix() const {
+[[nodiscard]] QMatrix4x4 deformMatrix() const {
 	return m_centeredDeformMatrix;
 }
 
-QMatrix4x4 rawDeformMatrix() const {
+[[nodiscard]] QMatrix4x4 rawDeformMatrix() const {
 	return m_deformMatrix;
 }
 
@@ -53,7 +53,7 @@ void geometryChange(const QRectF& newGeometry, const QRectF& oldGeometry) overri
 void updatePolish() override;
 QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) override;
 
-virtual bool isInvertedRect() const {
+[[nodiscard]] virtual bool isInvertedRect() const {
 	return false;
 }
 
@@ -72,10 +72,9 @@ void updateCenteredDeformMatrix();
 
 BlobGroup* m_group = nullptr;
 qreal m_radius = 0;
-QMatrix4x4 m_deformMatrix;     // identity by default
+QMatrix4x4 m_deformMatrix;
 QMatrix4x4 m_centeredDeformMatrix;
 
-// Cached data from updatePolish
 float m_cachedPaddedX = 0;
 float m_cachedPaddedY = 0;
 float m_cachedPaddedW = 0;
@@ -84,10 +83,10 @@ QRectF m_localPaddedRect;
 QVector<BlobRectData> m_cachedRects;
 int m_cachedMyIndex = -2;
 float m_pendingDx = 0;
-	float m_pendingDy = 0;
-	float m_pendingDw = 0;
-	float m_pendingDh = 0;
-	bool m_cachedHasInverted = false;
+float m_pendingDy = 0;
+float m_pendingDw = 0;
+float m_pendingDh = 0;
+bool m_cachedHasInverted = false;
 float m_cachedInvertedRadius = 0;
 float m_cachedInvertedOuter[4] = {};
 float m_cachedInvertedInner[4] = {};

Plugins/ZShell/CMakeLists.txt

@@ -45,11 +45,13 @@ qml_module(ZShell
 		requests.hpp requests.cpp
 		toaster.hpp toaster.cpp
 		qalculator.hpp qalculator.cpp
+		zutils.hpp zutils.cpp
     LIBRARIES
         Qt::Gui
         Qt::Quick
         Qt::Concurrent
         Qt::Sql
+		Qt::DBus
 		PkgConfig::Qalculate
 )
 

Plugins/ZShell/Components/CMakeLists.txt

@@ -2,6 +2,7 @@ qml_module(ZShell-components
 	URI ZShell.Components
     SOURCES
         lazylistview.hpp lazylistview.cpp
+		wavyline.hpp wavyline.cpp
     LIBRARIES
         Qt::Quick
 )

Plugins/ZShell/Components/wavyline.cpp

@@ -0,0 +1,255 @@
+#include "wavyline.hpp"
+
+#include <qpainter.h>
+#include <qpainterpath.h>
+
+namespace ZShell::controls {
+
+WavyLine::WavyLine(QQuickItem* parent)
+	: QQuickPaintedItem(parent)
+	, m_lineWidth(4)
+	, m_amplitudeMultiplier(0.5)
+	, m_frequency(6)
+	, m_startX(0)
+	, m_fullLength(0)
+	, m_color(Qt::white)
+	, m_waveProgress(0)
+	, m_pathType(Linear)
+	, m_startAngle(0)
+	, m_fullAngle(360)
+	, m_radius(-1)
+	, m_value(1)
+	, m_startAngleRad(0)
+	, m_fullAngleRad(2 * M_PI) {
+	setAntialiasing(true);
+}
+
+int WavyLine::lineWidth() const {
+	return m_lineWidth;
+}
+
+void WavyLine::setLineWidth(int lineWidth) {
+	if (m_lineWidth != lineWidth) {
+		m_lineWidth = lineWidth;
+		emit lineWidthChanged();
+		update();
+	}
+}
+
+qreal WavyLine::amplitudeMultiplier() const {
+	return m_amplitudeMultiplier;
+}
+
+void WavyLine::setAmplitudeMultiplier(qreal amplitudeMultiplier) {
+	if (!qFuzzyCompare(m_amplitudeMultiplier + 1.0, amplitudeMultiplier + 1.0)) {
+		m_amplitudeMultiplier = amplitudeMultiplier;
+		emit amplitudeMultiplierChanged();
+		update();
+	}
+}
+
+int WavyLine::frequency() const {
+	return m_frequency;
+}
+
+void WavyLine::setFrequency(int frequency) {
+	if (m_frequency != frequency) {
+		m_frequency = frequency;
+		emit frequencyChanged();
+		update();
+	}
+}
+
+qreal WavyLine::startX() const {
+	return m_startX;
+}
+
+void WavyLine::setStartX(qreal startX) {
+	if (!qFuzzyCompare(m_startX + 1.0, startX + 1.0)) {
+		m_startX = startX;
+		emit startXChanged();
+		update();
+	}
+}
+
+qreal WavyLine::fullLength() const {
+	return m_fullLength;
+}
+
+void WavyLine::setFullLength(qreal fullLength) {
+	if (!qFuzzyCompare(m_fullLength + 1.0, fullLength + 1.0)) {
+		m_fullLength = fullLength;
+		emit fullLengthChanged();
+		update();
+	}
+}
+
+QColor WavyLine::color() const {
+	return m_color;
+}
+
+void WavyLine::setColor(const QColor& color) {
+	if (m_color != color) {
+		m_color = color;
+		emit colorChanged();
+		update();
+	}
+}
+
+qreal WavyLine::waveProgress() const {
+	return m_waveProgress;
+}
+
+void WavyLine::setWaveProgress(qreal progress) {
+	if (!qFuzzyCompare(m_waveProgress + 1.0, progress + 1.0)) {
+		m_waveProgress = progress;
+		emit waveProgressChanged();
+		update();
+	}
+}
+
+WavyLine::PathType WavyLine::pathType() const {
+	return m_pathType;
+}
+
+void WavyLine::setPathType(PathType pathType) {
+	if (m_pathType != pathType) {
+		m_pathType = pathType;
+		emit pathTypeChanged();
+		update();
+	}
+}
+
+qreal WavyLine::startAngle() const {
+	return m_startAngle;
+}
+
+void WavyLine::setStartAngle(qreal startAngle) {
+	if (!qFuzzyCompare(m_startAngle + 1.0, startAngle + 1.0)) {
+		m_startAngle = startAngle;
+		m_startAngleRad = startAngle * M_PI / 180.0;
+		emit startAngleChanged();
+		update();
+	}
+}
+
+qreal WavyLine::fullAngle() const {
+	return m_fullAngle;
+}
+
+void WavyLine::setFullAngle(qreal fullAngle) {
+	if (!qFuzzyCompare(m_fullAngle + 1.0, fullAngle + 1.0)) {
+		m_fullAngle = fullAngle;
+		m_fullAngleRad = fullAngle * M_PI / 180.0;
+		emit fullAngleChanged();
+		update();
+	}
+}
+
+qreal WavyLine::radius() const {
+	return m_radius;
+}
+
+void WavyLine::setRadius(qreal radius) {
+	if (!qFuzzyCompare(m_radius + 1.0, radius + 1.0)) {
+		m_radius = radius;
+		emit radiusChanged();
+		update();
+	}
+}
+
+qreal WavyLine::value() const {
+	return m_value;
+}
+
+void WavyLine::setValue(qreal value) {
+	if (!qFuzzyCompare(m_value + 1.0, value + 1.0)) {
+		m_value = value;
+		emit valueChanged();
+		update();
+	}
+}
+
+void WavyLine::paint(QPainter* painter) {
+	painter->setRenderHint(QPainter::Antialiasing);
+	painter->setPen(QPen(m_color, m_lineWidth, Qt::SolidLine, Qt::RoundCap));
+
+	if (m_pathType == Arc) {
+		paintArc(painter);
+	} else {
+		paintLinear(painter);
+	}
+}
+
+void WavyLine::paintLinear(QPainter* painter) {
+	const auto amplitude = m_lineWidth * m_amplitudeMultiplier;
+	const auto phase = m_waveProgress * 2 * M_PI;
+	const auto centerY = height() / 2;
+	const auto len = m_fullLength > 0 ? m_fullLength : 1;
+	const auto start = m_lineWidth / 2.0;
+	const auto fullEnd = width() - m_lineWidth / 2.0;
+	const auto drawEnd = start + (fullEnd - start) * m_value;
+
+	QPainterPath path;
+	bool first = true;
+
+	for (int x = m_lineWidth / 2; x <= drawEnd; ++x) {
+		const auto theta = m_frequency * 2 * M_PI * (x + m_startX) / len + phase;
+		const auto waveY = centerY + amplitude * qSin(theta);
+		if (first) {
+			path.moveTo(x, waveY);
+			first = false;
+		} else {
+			path.lineTo(x, waveY);
+		}
+	}
+
+	painter->drawPath(path);
+}
+
+void WavyLine::paintArc(QPainter* painter) {
+	if (m_fullAngleRad <= 0) {
+		return;
+	}
+
+	const auto amplitude = m_lineWidth * m_amplitudeMultiplier;
+	const auto cx = width() / 2.0;
+	const auto cy = height() / 2.0;
+	const auto radius = m_radius > 0 ? m_radius : (qMin(width(), height()) - m_lineWidth - 2 * amplitude) / 2.0;
+
+	if (radius <= 0) {
+		return;
+	}
+
+	const auto phase = m_waveProgress * 2 * M_PI;
+	const auto arcLen = radius * m_fullAngleRad;
+	const auto len = m_fullLength > 0 ? m_fullLength : arcLen;
+	const auto drawAngleRad = m_fullAngleRad * m_value;
+
+	if (drawAngleRad <= 0) {
+		return;
+	}
+
+	const auto N = qMax(64, qCeil(radius * drawAngleRad));
+	const auto dTheta = drawAngleRad / N;
+
+	QPainterPath path;
+
+	for (int i = 0; i <= N; ++i) {
+		const auto theta = m_startAngleRad + i * dTheta;
+		const auto s = i * dTheta * radius;
+		const auto phi = m_frequency * 2 * M_PI * (s + m_startX) / len + phase;
+		const auto r = radius + amplitude * qSin(phi);
+		const auto px = cx + r * qCos(theta);
+		const auto py = cy + r * qSin(theta);
+		if (i == 0) {
+			path.moveTo(px, py);
+		} else {
+			path.lineTo(px, py);
+		}
+	}
+
+	painter->drawPath(path);
+}
+
+} // namespace ZShell::controls

Plugins/ZShell/Components/wavyline.hpp

@@ -0,0 +1,107 @@
+#pragma once
+
+#include <qqmlintegration.h>
+#include <qquickpainteditem.h>
+
+namespace ZShell::controls {
+
+class WavyLine : public QQuickPaintedItem {
+Q_OBJECT
+QML_ELEMENT
+
+Q_PROPERTY(int lineWidth READ lineWidth WRITE setLineWidth NOTIFY lineWidthChanged FINAL)
+Q_PROPERTY(qreal amplitudeMultiplier READ amplitudeMultiplier WRITE setAmplitudeMultiplier NOTIFY
+           amplitudeMultiplierChanged FINAL)
+Q_PROPERTY(int frequency READ frequency WRITE setFrequency NOTIFY frequencyChanged FINAL)
+Q_PROPERTY(qreal startX READ startX WRITE setStartX NOTIFY startXChanged FINAL)
+Q_PROPERTY(qreal fullLength READ fullLength WRITE setFullLength NOTIFY fullLengthChanged FINAL)
+Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL)
+Q_PROPERTY(qreal waveProgress READ waveProgress WRITE setWaveProgress NOTIFY waveProgressChanged FINAL)
+Q_PROPERTY(PathType pathType READ pathType WRITE setPathType NOTIFY pathTypeChanged FINAL)
+Q_PROPERTY(qreal startAngle READ startAngle WRITE setStartAngle NOTIFY startAngleChanged FINAL)
+Q_PROPERTY(qreal fullAngle READ fullAngle WRITE setFullAngle NOTIFY fullAngleChanged FINAL)
+Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged FINAL)
+Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL)
+
+public:
+enum PathType {
+	Linear,
+	Arc
+};
+Q_ENUM(PathType)
+
+explicit WavyLine(QQuickItem* parent = nullptr);
+
+[[nodiscard]] int lineWidth() const;
+void setLineWidth(int lineWidth);
+
+[[nodiscard]] qreal amplitudeMultiplier() const;
+void setAmplitudeMultiplier(qreal amplitudeMultiplier);
+
+[[nodiscard]] int frequency() const;
+void setFrequency(int frequency);
+
+[[nodiscard]] qreal startX() const;
+void setStartX(qreal startX);
+
+[[nodiscard]] qreal fullLength() const;
+void setFullLength(qreal fullLength);
+
+[[nodiscard]] QColor color() const;
+void setColor(const QColor& color);
+
+[[nodiscard]] qreal waveProgress() const;
+void setWaveProgress(qreal progress);
+
+[[nodiscard]] PathType pathType() const;
+void setPathType(PathType pathType);
+
+[[nodiscard]] qreal startAngle() const;
+void setStartAngle(qreal startAngle);
+
+[[nodiscard]] qreal fullAngle() const;
+void setFullAngle(qreal fullAngle);
+
+[[nodiscard]] qreal radius() const;
+void setRadius(qreal radius);
+
+[[nodiscard]] qreal value() const;
+void setValue(qreal value);
+
+void paint(QPainter* painter) override;
+
+signals:
+void lineWidthChanged();
+void amplitudeMultiplierChanged();
+void frequencyChanged();
+void startXChanged();
+void fullLengthChanged();
+void colorChanged();
+void waveProgressChanged();
+void pathTypeChanged();
+void startAngleChanged();
+void fullAngleChanged();
+void radiusChanged();
+void valueChanged();
+
+private:
+void paintLinear(QPainter* painter);
+void paintArc(QPainter* painter);
+
+int m_lineWidth;
+qreal m_amplitudeMultiplier;
+int m_frequency;
+qreal m_startX;
+qreal m_fullLength;
+QColor m_color;
+qreal m_waveProgress;
+PathType m_pathType;
+qreal m_startAngle;
+qreal m_fullAngle;
+qreal m_radius;
+qreal m_value;
+qreal m_startAngleRad;
+qreal m_fullAngleRad;
+};
+
+} // namespace ZShell::controls

Plugins/ZShell/Internal/CMakeLists.txt

@@ -9,6 +9,7 @@ qml_module(ZShell-internal
 		sparklineitem.hpp sparklineitem.cpp
 		arcgauge.hpp arcgauge.cpp
 		wallpaperimage.hpp wallpaperimage.cpp
+		lidwatcher.hpp lidwatcher.cpp
     LIBRARIES
         Qt::Gui
         Qt::Quick

Plugins/ZShell/Internal/arcgauge.hpp

@@ -58,4 +58,4 @@ qreal m_sweepAngle = 1.5 * M_PI;
 qreal m_lineWidth = 10.0;
 };
 
-} // namespace ZShell::internal
+} // namespace ZShell::Internal

Plugins/ZShell/Internal/cachingimagemanager.hpp

@@ -7,59 +7,60 @@
 namespace ZShell::internal {
 
 class CachingImageManager : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
+Q_OBJECT
+QML_ELEMENT
 
-    Q_PROPERTY(QQuickItem* item READ item WRITE setItem NOTIFY itemChanged REQUIRED)
-    Q_PROPERTY(QUrl cacheDir READ cacheDir WRITE setCacheDir NOTIFY cacheDirChanged REQUIRED)
+Q_PROPERTY(QQuickItem* item READ item WRITE setItem NOTIFY itemChanged REQUIRED)
+Q_PROPERTY(QUrl cacheDir READ cacheDir WRITE setCacheDir NOTIFY cacheDirChanged REQUIRED)
 
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(QUrl cachePath READ cachePath NOTIFY cachePathChanged)
+Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+Q_PROPERTY(QUrl cachePath READ cachePath NOTIFY cachePathChanged)
 
 public:
-    explicit CachingImageManager(QObject* parent = nullptr)
+explicit CachingImageManager(QObject* parent = nullptr)
 	: QObject(parent)
-        , m_item(nullptr) {}
+	, m_item(nullptr) {
+}
 
-    [[nodiscard]] QQuickItem* item() const;
-    void setItem(QQuickItem* item);
+[[nodiscard]] QQuickItem* item() const;
+void setItem(QQuickItem* item);
 
-    [[nodiscard]] QUrl cacheDir() const;
-    void setCacheDir(const QUrl& cacheDir);
+[[nodiscard]] QUrl cacheDir() const;
+void setCacheDir(const QUrl& cacheDir);
 
-    [[nodiscard]] QString path() const;
-    void setPath(const QString& path);
+[[nodiscard]] QString path() const;
+void setPath(const QString& path);
 
-    [[nodiscard]] QUrl cachePath() const;
+[[nodiscard]] QUrl cachePath() const;
 
-    Q_INVOKABLE void updateSource();
-    Q_INVOKABLE void updateSource(const QString& path);
+Q_INVOKABLE void updateSource();
+Q_INVOKABLE void updateSource(const QString& path);
 
 signals:
-    void itemChanged();
-    void cacheDirChanged();
+void itemChanged();
+void cacheDirChanged();
 
-    void pathChanged();
-    void cachePathChanged();
-    void usingCacheChanged();
+void pathChanged();
+void cachePathChanged();
+void usingCacheChanged();
 
 private:
-    QString m_shaPath;
+QString m_shaPath;
 
-    QQuickItem* m_item;
-    QUrl m_cacheDir;
+QQuickItem* m_item;
+QUrl m_cacheDir;
 
-    QString m_path;
-    QUrl m_cachePath;
+QString m_path;
+QUrl m_cachePath;
 
-    QMetaObject::Connection m_widthConn;
-    QMetaObject::Connection m_heightConn;
+QMetaObject::Connection m_widthConn;
+QMetaObject::Connection m_heightConn;
 
-    [[nodiscard]] qreal effectiveScale() const;
-    [[nodiscard]] QSize effectiveSize() const;
+[[nodiscard]] qreal effectiveScale() const;
+[[nodiscard]] QSize effectiveSize() const;
 
-    void createCache(const QString& path, const QString& cache, const QString& fillMode, const QSize& size) const;
-    [[nodiscard]] static QString sha256sum(const QString& path);
+void createCache(const QString& path, const QString& cache, const QString& fillMode, const QSize& size) const;
+[[nodiscard]] static QString sha256sum(const QString& path);
 };
 
 } // namespace ZShell::internal

Plugins/ZShell/Internal/circularbuffer.cpp

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 CircularBuffer::CircularBuffer(QObject* parent)
 	: QObject(parent) {
@@ -92,4 +92,4 @@ qreal CircularBuffer::at(int index) const {
 	return m_data[actualIndex];
 }
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal