revert toaster enum

cmake build hotfix
disable incompatible-type for qmllint in clock
2026-06-05 19:45:43 +02:00 · 2026-06-05 12:31:37 +02:00 · 2026-06-04 23:22:28 +02:00 · 2026-06-04 22:57:45 +02:00 · 2026-06-04 22:38:17 +02:00 · 2026-06-04 19:01:02 +02:00
67 changed files with 1552 additions and 933 deletions
@@ -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
@@ -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
+
+...
@@ -38,15 +38,18 @@ jobs:
                    rustfmt \
                    rust-clippy

-            - name: Format check
+            - id: format-check
+              name: Format check
              continue-on-error: true
              run: |
                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    status=0
                    for manifest in $(find . -name "Cargo.toml"); do
                      cargo fmt --manifest-path "$manifest" --check && \
                        echo "$manifest: formatting OK" || \
-                        echo "$manifest: needs formatting"
+                        { echo "$manifest: needs formatting"; status=1; }
                    done
+                    exit $status
                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
                    echo "Rust files found but no Cargo.toml"
                    exit 1
@@ -54,7 +57,8 @@ jobs:
                    echo "No Rust project found"
                  fi

-            - name: Clippy
+            - id: clippy
+              name: Clippy
              run: |
                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
                    status=0
@@ -70,3 +74,12 @@ jobs:
                  else
                    echo "No Rust project found"
                  fi
+
+            - name: Check results
+              if: always()
+              run: |
+                  if [ "${{ steps.format-check.outcome }}" = "failure" ] || [ "${{ steps.clippy.outcome }}" = "failure" ]; then
+                    echo "One or more checks failed"
+                    exit 1
+                  fi
+                  echo "All checks passed"
@@ -25,6 +25,7 @@ add_compile_options(

 if("plugin" IN_LIST ENABLE_MODULES)
 	add_subdirectory(Plugins)
+
 endif()

 if("shell" IN_LIST ENABLE_MODULES)
@@ -10,31 +10,35 @@ Slider {
 	background: Item {
 		CustomRect {
 			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 6
 			anchors.left: parent.left
 			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 6
 			bottomRightRadius: root.implicitHeight / 6
 			color: root.color
-			implicitWidth: root.handle.x - root.implicitHeight / 2
-			radius: Appearance.rounding.full
+			implicitWidth: root.handle.x - root.implicitHeight / 6
+			radius: root.implicitHeight / 6
 			topRightRadius: root.implicitHeight / 6
 		}

 		CustomRect {
 			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 6
 			anchors.right: parent.right
 			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 6
 			bottomLeftRadius: root.implicitHeight / 6
-			color: DynamicColors.tPalette.m3surfaceContainer
-			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2
-			radius: Appearance.rounding.full
+			color: DynamicColors.tPalette.m3surfaceContainerHighest
+			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 6
+			radius: root.implicitHeight / 6
 			topLeftRadius: root.implicitHeight / 6
 		}
 	}
 	handle: CustomRect {
 		anchors.verticalCenter: parent.verticalCenter
 		color: root.color
-		implicitHeight: 15
-		implicitWidth: 5
+		implicitHeight: root.implicitHeight
+		implicitWidth: root.implicitHeight / 4.5
 		radius: Appearance.rounding.full
 		x: root.visualPosition * root.availableWidth - implicitWidth / 2

@@ -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
@@ -113,13 +114,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
@@ -147,7 +148,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"
 		}
 	}
@@ -35,14 +35,10 @@ Row {
 	}

 	function openDropdown(): void {
-		if (root.disabled)
-			return;
 		SettingsDropdowns.open(menu, root);
 	}

 	function toggleDropdown(): void {
-		if (root.disabled)
-			return;
 		SettingsDropdowns.toggle(menu, root);
 	}

@@ -55,7 +51,7 @@ Row {

 	CustomRect {
 		bottomRightRadius: Appearance.rounding.small / 2
-		color: root.disabled ? root.disabledColor : root.color
+		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandBtn.implicitHeight
 		implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -69,7 +65,7 @@ Row {
 			}

 			color: root.textColor
-			disabled: root.disabled
+			disabled: !root.enabled
 			rect.bottomRightRadius: parent.bottomRightRadius
 			rect.topRightRadius: parent.topRightRadius
 		}
@@ -86,7 +82,7 @@ Row {

 				Layout.alignment: Qt.AlignVCenter
 				animate: true
-				color: root.disabled ? root.disabledTextColor : root.textColor
+				color: !root.enabled ? root.disabledTextColor : root.textColor
 				fill: 1
 				text: root.active?.activeIcon ?? root.fallbackIcon
 			}
@@ -98,7 +94,7 @@ Row {
 				Layout.preferredWidth: implicitWidth
 				animate: true
 				clip: true
-				color: root.disabled ? root.disabledTextColor : root.textColor
+				color: !root.enabled ? root.disabledTextColor : root.textColor
 				text: root.active?.activeText ?? root.fallbackText

 				Behavior on Layout.preferredWidth {
@@ -116,7 +112,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.enabled ? root.disabledColor : root.color
 		implicitHeight: expandIcon.implicitHeight + root.verticalPadding * 2
 		implicitWidth: implicitHeight
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -135,7 +131,7 @@ Row {
 			}

 			color: root.textColor
-			disabled: root.disabled
+			disabled: !root.enabled
 			rect.bottomLeftRadius: parent.bottomLeftRadius
 			rect.topLeftRadius: parent.topLeftRadius
 		}
@@ -145,7 +141,7 @@ Row {

 			anchors.centerIn: parent
 			anchors.horizontalCenterOffset: root.expanded ? 0 : -Math.floor(root.verticalPadding / 4)
-			color: root.disabled ? root.disabledTextColor : root.textColor
+			color: !root.enabled ? root.disabledTextColor : root.textColor
 			rotation: root.expanded ? 180 : 0
 			text: "expand_more"

@@ -12,7 +12,7 @@ Switch {
 	implicitWidth: implicitIndicatorWidth

 	indicator: CustomRect {
-		color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
+		color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
 		implicitHeight: 13 + 7 * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Appearance.rounding.full
@@ -21,7 +21,7 @@ Switch {
 			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight

 			anchors.verticalCenter: parent.verticalCenter
-			color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
+			color: root.checked && root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
 			implicitHeight: parent.implicitHeight - 10
 			implicitWidth: nonAnimWidth
 			radius: Appearance.rounding.full
@@ -38,7 +38,7 @@ Switch {

 			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

@@ -114,7 +114,7 @@ Switch {
 					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 {
@@ -300,11 +300,10 @@ Singleton {
 		return {
 			enable_pp: screenshot.enable_pp,
 			mode: screenshot.mode,
-			corner_radius: screenshot.corner_radius,
-			drop_shadow: screenshot.drop_shadow,
-			rounded_corners: screenshot.rounded_corners,
-			shadow_blur_radius: screenshot.shadow_blur_radius,
-			shadow_blur_passes: screenshot.shadow_blur_passes,
+			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
@@ -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 {
@@ -1,13 +1,12 @@
 import Quickshell.Io

 JsonObject {
-	property real corner_radius: 12.0
-	property bool drop_shadow: true
 	property bool enable_pp: true
 	property string mode: "manual"
-	property bool rounded_corners: false
-	property int shadow_blur_passes: 1
-	property real shadow_blur_radius: 22.0
+	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
@@ -1,47 +0,0 @@
-import Quickshell
-import Quickshell.Services.UPower
-import QtQuick
-import ZShell
-import qs.Config
-import qs.Components.Toast
-
-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)
-
-	Connections {
-		function onOnBatteryChanged(): void {
-			if (UPower.onBattery) {
-				if (Config.utilities.toasts.chargingChanged)
-					Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is discharging"), "power_off");
-			} else {
-				if (Config.utilities.toasts.chargingChanged)
-					Toaster.toast(qsTr("Charger plugged in"), qsTr("Battery is charging"), "power");
-				for (const level of root.popupThresholds)
-					level.warned = false;
-			}
-		}
-
-		target: UPower
-	}
-
-	Connections {
-		function onPercentageChanged(): void {
-			if (!UPower.onBattery)
-				return;
-
-			const p = UPower.displayDevice.percentage * 100;
-			for (const perc of root.popupThresholds) {
-				if (p <= perc.perc && !perc.warned) {
-					perc.warned = true;
-					console.log(perc.warned + "\n" + [...Config.general.battery.popupThresholds][0].warned);
-					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);
-				}
-			}
-		}
-
-		target: UPower.displayDevice
-	}
-}
@@ -0,0 +1,70 @@
+import Quickshell
+import Quickshell.Services.UPower
+import QtQuick
+import ZShell
+import qs.Config
+import qs.Components.Toast
+import qs.Helpers
+
+Scope {
+	id: root
+
+	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) {
+			if (p < perc.perc)
+				return perc;
+		}
+
+		return null;
+	}
+
+	Connections {
+		function onOnBatteryChanged(): void {
+			if (!Battery.ready)
+				return;
+
+			if (Battery.onBattery) {
+				if (Config.utilities.toasts.chargingChanged)
+					Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is discharging"), "power_off");
+				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);
+			} else {
+				if (Config.utilities.toasts.chargingChanged)
+					Toaster.toast(qsTr("Charger plugged in"), qsTr("Battery is charging"), "power");
+			}
+		}
+
+		target: Battery
+	}
+
+	Connections {
+		function onCurrentPercChanged(): void {
+			if (!Battery.onBattery)
+				return;
+
+			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);
+				}
+			}
+		}
+
+		function onReadyChanged(): void {
+			if (!Battery.ready)
+				return;
+
+			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: Battery
+	}
+}
@@ -2,20 +2,21 @@ import Quickshell
 import QtQuick
 import qs.Components
 import qs.Config
+import qs.Helpers
 import qs.Modules as BarPopouts

-CustomMouseArea {
+Item {
 	id: root

 	required property Item bar
 	property bool dashboardShortcutActive
-	property point dragStart
 	required property Drawing drawing
 	required property DrawingInput input
 	property bool osdShortcutActive
 	required property Panels panels
 	required property BarPopouts.Wrapper popouts
 	required property ShellScreen screen
+	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
 	required property PersistentProperties visibilities

@@ -52,78 +53,123 @@ CustomMouseArea {
 	}

 	anchors.fill: parent
-	cursorShape: (pressed && dragStart.y < bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
-	hoverEnabled: true
-	propagateComposedEvents: false

-	onContainsMouseChanged: {
-		if (!containsMouse) {
-			if (!osdShortcutActive) {
-				visibilities.osd = false;
+	DragHandler {
+		id: singleHandler
+
+		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
+		dragThreshold: 0
+		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfDifferentType | 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) {
+					root.visibilities.settings = true;
+					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) {
+					root.visibilities.dock = true;
+					root.singleGestureTriggered = true;
+				}
+
+			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) {
+				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
+				root.singleGestureTriggered = true;
+			}
+		}
+	}
+
+	HoverHandler {
+		id: hoverHandler
+
+		onHoveredChanged: {
+			if (!hovered) {
+				if (!root.osdShortcutActive) {
+					root.visibilities.osd = false;
 					root.panels.osd.hovered = false;
 				}

-			if (!popouts.currentName.startsWith("traymenu")) {
-				popouts.hasCurrent = false;
+				if (!root.popouts.currentName.startsWith("traymenu")) {
+					root.popouts.hasCurrent = false;
 				}

 				if (Config.barConfig.autoHide)
-				bar.isHovered = false;
+					root.bar.isHovered = false;
 			}
 		}
-	onPositionChanged: event => {
-		const x = event.x;
-		const y = event.y;
-		const dragX = x - dragStart.x;
-		const dragY = y - dragStart.y;
+		onPointChanged: {
+			const x = point.position.x;
+			const y = point.position.y;

 			if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
 				root.input.z = 2;
 				root.panels.drawing.expanded = false;
 			}

-		if (!visibilities.bar && Config.barConfig.autoHide && y < bar.implicitHeight)
-			bar.isHovered = true;
+			if (!root.visibilities.bar && Config.barConfig.autoHide && y < root.bar.implicitHeight)
+				root.bar.isHovered = true;

-		if (pressed && dragStart.y < bar.implicitHeight) {
-			if (dragY > 20)
-				visibilities.settings = true;
-			else if (dragY < -20)
-				visibilities.settings = false;
-		}
-
-		if (Config.dock.hoverToReveal && pressed && dragStart.y > root.screen.height - root.bar.implicitHeight)
-			if (dragY < -10)
-				visibilities.dock = true;
-
-		if (panels.sidebar.width === 0) {
-			const showOsd = inRightPanel(panels.osdWrapper, x, y);
+			if (root.panels.sidebar.width === 0) {
+				const showOsd = root.inRightPanel(root.panels.osdWrapper, x, y);

 				if (showOsd) {
-				osdShortcutActive = false;
+					root.osdShortcutActive = false;
 					root.panels.osd.hovered = true;
 				}
 			} else {
-			const outOfSidebar = x < width - panels.sidebar.width;
-			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
+				const outOfSidebar = x < root.width - root.panels.sidebar.width;
+				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);

-			if (!osdShortcutActive) {
-				visibilities.osd = showOsd;
+				if (!root.osdShortcutActive) {
+					root.visibilities.osd = showOsd;
 					root.panels.osd.hovered = showOsd;
 				} else if (showOsd) {
-				osdShortcutActive = false;
+					root.osdShortcutActive = false;
 					root.panels.osd.hovered = true;
 				}
 			}

-		if (Config.dock.enable && !Config.dock.hoverToReveal && !visibilities.dock && !visibilities.launcher && inBottomPanel(panels.dock, x, y))
-			visibilities.dock = true;
+			if (Config.dock.enable && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
+				root.visibilities.dock = true;

-		if (y < root.bar.implicitHeight) {
+			if (y < root.bar.implicitHeight)
 				root.bar.checkPopout(x);
 		}
 	}
-	onPressed: event => dragStart = Qt.point(event.x, event.y)

 	Connections {
 		function onDashboardChanged() {
@@ -164,7 +210,6 @@ CustomMouseArea {

 			if (root.visibilities.launcher) {
 				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
-					console.log("true");
 					root.visibilities.dashboard = false;
 				}

@@ -341,6 +341,7 @@ Variants {
 				anchors.fill: parent
 				bar: bar
 				drawing: drawingLoader.item
+				enabled: true
 				input: inputLoader.item
 				panels: panels
 				popouts: panels.popouts
@@ -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
+}
@@ -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
 	}
 }
@@ -26,6 +26,7 @@ MouseArea {
 			return (bc.pinned - ac.pinned) || ((bc.fullscreen !== 0) - (ac.fullscreen !== 0)) || (bc.floating - ac.floating);
 		});
 	}
+	readonly property int cornerRadius: Hypr.options.decoration.rounding
 	property real ex: screen.width
 	property real ey: screen.height
 	required property LazyLoader loader
@@ -38,6 +39,7 @@ MouseArea {
 	required property ShellScreen screen
 	property real sh: Math.abs(sy - ey)
 	readonly property color shadowColor: Hypr.options.decoration.shadow.color
+	readonly property bool shadowEnabled: Hypr.options.decoration.shadow.enabled
 	readonly property var shadowOffset: Hypr.options.decoration.shadow.offset
 	readonly property int shadowRange: Hypr.options.decoration.shadow.range
 	readonly property int shadowRenderPower: Hypr.options.decoration.shadow.render_power
@@ -71,7 +73,14 @@ MouseArea {

 	function save(): void {
 		const tmpfile = Qt.resolvedUrl(`/tmp/zshell-picker-${Quickshell.processId}-${Date.now()}.png`);
-		const cmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--scale", root.scaleRatio, "--shadow-blur-radius", root.shadowRange, "--image"] : ["swappy", "-f"];
+		const rounding = root.cornerRadius > 0;
+		const shadow_blur = root.shadowRange / root.shadowRenderPower;
+		const r = Math.floor(root.shadowColor.r * 256);
+		const g = Math.floor(root.shadowColor.g * 256);
+		const b = Math.floor(root.shadowColor.b * 256);
+		const a = Math.floor(root.shadowColor.a * 256);
+		const args = Config.screenshot.mode === "auto" ? ["--rounding", `${rounding}`, "--radius", root.cornerRadius, "--shadow", root.shadowEnabled, "--shadow-blur", `${shadow_blur}`, "--shadow-color", `${r},${g},${b},${a}`, "--shadow-offset-x", root.shadowOffset[0], "--shadow-offset-y", root.shadowOffset[1]] : [];
+		const cmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--scale", root.scaleRatio, ...args, "--image"] : ["swappy", "-f"];
 		ZShellIo.saveItem(screencopy, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => Quickshell.execDetached([...cmd, path]));
 		closeAnim.start();
 	}
@@ -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 "))
-	// 	}
-	// }
-}
@@ -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 {
@@ -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

@@ -69,7 +69,7 @@ SettingsPage {

 		CustomSplitButtonRow {
 			active: Config.general.color.mode === "light" ? menuItems[0] : menuItems[1]
-			buttonAlias.disabled: !Config.general.color.schemeGeneration
+			enabled: Config.general.color.schemeGeneration
 			label: qsTr("Scheme mode")

 			menuItems: [
@@ -103,7 +103,7 @@ SettingsPage {
 			id: schemeType

 			active: root.schemeTypeItem(menuItems, Config.colors.schemeType)
-			buttonAlias.disabled: !Config.general.color.schemeGeneration
+			enabled: Config.general.color.schemeGeneration
 			label: qsTr("Scheme type")
 			z: 2

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

 SettingsPage {
@@ -20,7 +20,8 @@ SettingsPage {
 		}

 		CustomSplitButtonRow {
-			// active: true
+			active: Config.screenshot.mode === "manual" ? menuItems[0] : menuItems[1]
+			enabled: Config.screenshot.enable_pp
 			label: qsTr("Effects mode")

 			menuItems: [
@@ -46,12 +47,25 @@ SettingsPage {
 			shouldBeActive: Config.screenshot.mode === "manual"
 		}

+		SettingSwitch {
+			enabled: Config.screenshot.enable_pp
+			name: "Enable rounded corners"
+			object: Config.screenshot
+			setting: "rounding"
+			shouldBeActive: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.rounding
+		}
+
 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
 			name: "Corner radius"
 			object: Config.screenshot
-			setting: "corner_radius"
-			shouldBeActive: Config.screenshot.mode === "manual"
+			setting: "radius"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.rounding
 			step: 1
 		}

@@ -60,83 +74,76 @@ SettingsPage {
 		}

 		SettingSwitch {
-			name: "Enable drop shadow"
+			enabled: Config.screenshot.enable_pp
+			name: "Enable shadow"
 			object: Config.screenshot
-			setting: "drop_shadow"
+			setting: "shadow"
 			shouldBeActive: Config.screenshot.mode === "manual"
 		}

 		Separator {
-			shouldBeActive: Config.screenshot.mode === "manual"
-		}
-
-		SettingSwitch {
-			name: "Enable rounded corners"
-			object: Config.screenshot
-			setting: "rounded_corners"
-			shouldBeActive: Config.screenshot.mode === "manual"
-		}
-
-		Separator {
-			shouldBeActive: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 		}

 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
-			name: "Shadow blur radius"
+			name: "Shadow blur amount"
 			object: Config.screenshot
-			setting: "shadow_blur_radius"
-			shouldBeActive: Config.screenshot.mode === "manual"
+			setting: "shadow_blur"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 			step: 1
 		}

 		Separator {
-			shouldBeActive: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 		}

-		SettingSwitch {
-			name: "Shadow color broken atm"
-			object: Config.Screenshot
-			setting: "shadow_color"
-			shouldBeActive: Config.screenshot.mode === "manual"
-		}
+		// SettingSwitch {
+		// 	name: "Shadow color broken atm"
+		// 	object: Config.Screenshot
+		// 	setting: "shadow_color"
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// }
+		//
+		// Separator {
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// }

-		Separator {
-			shouldBeActive: Config.screenshot.mode === "manual"
-		}
-
-		SettingSpinBox {
-			min: 1
-			name: "Shadow passes"
-			object: Config.screenshot
-			setting: "shadow_blur_passes"
-			shouldBeActive: Config.screenshot.mode === "manual"
-			step: 1
-		}
-
-		Separator {
-			shouldBeActive: Config.screenshot.mode === "manual"
-		}
+		// SettingSpinBox {
+		// 	min: 1
+		// 	name: "Shadow passes"
+		// 	object: Config.screenshot
+		// 	setting: "shadow_blur_passes"
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// 	step: 1
+		// }
+		//
+		// Separator {
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// }

 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
 			name: "Shadow offset X"
 			object: Config.screenshot
 			setting: "shadow_offset_x"
-			shouldBeActive: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 			step: 1
 		}

 		Separator {
-			shouldBeActive: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 		}

 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
 			name: "Shadow offset Y"
 			object: Config.screenshot
 			setting: "shadow_offset_y"
-			shouldBeActive: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 			step: 1
 		}
 	}
@@ -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,8 +141,9 @@ Item {
 						id: zoomSlider

 						Layout.fillWidth: true
-						Layout.preferredHeight: 10
+						Layout.preferredHeight: 30
 						from: 1.0
+						implicitHeight: 30
 						to: 5.0
 						value: cropRectLoader.item ? cropRectLoader.item.zoom : 1.0

@@ -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;
@@ -52,25 +52,25 @@ Item {

 		CustomRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding

-			RowLayout {
-				id: outputVolume
+			Item {
+				id: sinkIcon

+				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 15
+				anchors.leftMargin: Appearance.padding.normal
+				anchors.top: parent.top
+				implicitWidth: childrenRect.width

 				CustomRect {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
-					Layout.preferredWidth: 40
+					anchors.centerIn: parent
 					color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+					implicitHeight: 40
+					implicitWidth: 40
 					radius: Appearance.rounding.full

 					MaterialIcon {
@@ -92,11 +92,20 @@ Item {
 						}
 					}
 				}
+			}

 			ColumnLayout {
-					Layout.fillWidth: true
+				anchors.bottom: parent.bottom
+				anchors.bottomMargin: Appearance.padding.smallest
+				anchors.left: sinkIcon.right
+				anchors.leftMargin: Appearance.spacing.normal
+				anchors.right: parent.right
+				anchors.rightMargin: Appearance.padding.large
+				anchors.top: parent.top
+				anchors.topMargin: Appearance.padding.smaller

 				RowLayout {
+					Layout.fillHeight: true
 					Layout.fillWidth: true

 					CustomText {
@@ -114,14 +123,14 @@ Item {

 				CustomMouseArea {
 					Layout.bottomMargin: 5
+					Layout.fillHeight: true
 					Layout.fillWidth: true
-						Layout.preferredHeight: 10

 					CustomSlider {
 						anchors.left: parent.left
 						anchors.right: parent.right
 						color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-							implicitHeight: 10
+						implicitHeight: parent.height
 						value: Audio.volume

 						Behavior on value {
@@ -134,11 +143,10 @@ Item {
 				}
 			}
 		}
-		}

 		CustomClippingRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
@@ -165,20 +173,20 @@ Item {
 				}
 			}

-			RowLayout {
-				id: inputVolume
+			Item {
+				id: sourceIcon

+				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 15
+				anchors.leftMargin: Appearance.padding.normal
+				anchors.top: parent.top
+				implicitWidth: childrenRect.width

 				CustomRect {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
-					Layout.preferredWidth: 40
+					anchors.centerIn: parent
 					color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+					implicitHeight: 40
+					implicitWidth: 40
 					radius: Appearance.rounding.full

 					MaterialIcon {
@@ -200,9 +208,17 @@ Item {
 						}
 					}
 				}
+			}

 			ColumnLayout {
-					Layout.fillWidth: true
+				anchors.bottom: parent.bottom
+				anchors.bottomMargin: Appearance.padding.smallest
+				anchors.left: sourceIcon.right
+				anchors.leftMargin: Appearance.spacing.normal
+				anchors.right: parent.right
+				anchors.rightMargin: Appearance.padding.large
+				anchors.top: parent.top
+				anchors.topMargin: Appearance.padding.smaller

 				RowLayout {
 					Layout.fillHeight: true
@@ -223,14 +239,14 @@ Item {

 				CustomMouseArea {
 					Layout.bottomMargin: 5
+					Layout.fillHeight: true
 					Layout.fillWidth: true
-						implicitHeight: 10

 					CustomSlider {
 						anchors.left: parent.left
 						anchors.right: parent.right
 						color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-							implicitHeight: 10
+						implicitHeight: parent.height
 						value: Audio.sourceVolume

 						Behavior on value {
@@ -243,7 +259,6 @@ Item {
 				}
 			}
 		}
-		}

 		Rectangle {
 			Layout.fillWidth: true
@@ -265,7 +280,7 @@ Item {
 				required property var modelData

 				Layout.fillWidth: true
-				Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+				Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
 				Layout.topMargin: root.topMargin
 				color: DynamicColors.tPalette.m3surfaceContainer
 				radius: root.rounding
@@ -292,18 +307,20 @@ Item {
 					}
 				}

-				RowLayout {
-					id: layoutVolume
+				Item {
+					id: appBoxIcon

-					anchors.fill: parent
-					anchors.margins: Appearance.spacing.smaller
-					spacing: 15
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.leftMargin: Appearance.padding.normal
+					anchors.top: parent.top
+					implicitWidth: childrenRect.width

 					CustomRect {
-						Layout.alignment: Qt.AlignVCenter
-						Layout.preferredHeight: 40
-						Layout.preferredWidth: 40
+						anchors.centerIn: parent
 						color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+						implicitHeight: 40
+						implicitWidth: 40
 						radius: Appearance.rounding.full

 						MaterialIcon {
@@ -325,10 +342,7 @@ Item {
 							}
 						}
 					}
-
-					ColumnLayout {
-						Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-						Layout.fillHeight: true
+				}

 				TextMetrics {
 					id: metrics
@@ -338,13 +352,22 @@ Item {
 					text: Audio.getStreamName(appBox.modelData)
 				}

+				ColumnLayout {
+					anchors.bottom: parent.bottom
+					anchors.bottomMargin: Appearance.padding.smallest
+					anchors.left: appBoxIcon.right
+					anchors.leftMargin: Appearance.spacing.normal
+					anchors.right: parent.right
+					anchors.rightMargin: Appearance.padding.large
+					anchors.top: parent.top
+					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,23 +375,21 @@ Item {

 						CustomText {
 							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-								Layout.fillHeight: true
 							font.bold: true
 							text: qsTr("%1").arg(appBox.modelData.audio.muted ? qsTr("Muted") : `${Math.round(appBox.modelData.audio.volume * 100)}%`)
 						}
 					}

 					CustomMouseArea {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+						Layout.bottomMargin: 5
 						Layout.fillHeight: true
 						Layout.fillWidth: true
-							implicitHeight: 10

 						CustomSlider {
 							anchors.left: parent.left
 							anchors.right: parent.right
 							color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-								implicitHeight: 10
+							implicitHeight: parent.height
 							value: appBox.modelData.audio.volume

 							onMoved: {
@@ -381,4 +402,3 @@ Item {
 		}
 	}
 }
-}
@@ -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`;
+			}
 		}
 	}
 }
@@ -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;
 }

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

@@ -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;
@@ -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);
+		}
 	}
 }
@@ -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;
 }

@@ -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;
@@ -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;
@@ -50,6 +50,7 @@ qml_module(ZShell
        Qt::Quick
        Qt::Concurrent
        Qt::Sql
+		Qt::DBus
 		PkgConfig::Qalculate
 )

@@ -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
@@ -58,4 +58,4 @@ qreal m_sweepAngle = 1.5 * M_PI;
 qreal m_lineWidth = 10.0;
 };

-} // namespace ZShell::internal
+} // namespace ZShell::Internal
@@ -19,7 +19,8 @@ class CachingImageManager : public QObject {
 public:
 explicit CachingImageManager(QObject* parent = nullptr)
 	: QObject(parent)
-        , m_item(nullptr) {}
+	, m_item(nullptr) {
+}

 [[nodiscard]] QQuickItem* item() const;
 void setItem(QQuickItem* item);
@@ -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
@@ -4,7 +4,7 @@
 #include <qqmlintegration.h>
 #include <qvector.h>

-namespace caelestia::internal {
+namespace ZShell::internal {

 class CircularBuffer : public QObject {
 Q_OBJECT
@@ -41,4 +41,4 @@ int m_count = 0;
 int m_capacity = 0;
 };

-} // namespace caelestia::internal
+} // namespace ZShell::internal
@@ -1,5 +1,6 @@
 #pragma once

+#include <cstdint>
 #include <qeasingcurve.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
@@ -0,0 +1,86 @@
+#include "lidwatcher.hpp"
+
+#include <QtDBus/qdbusconnection.h>
+#include <QtDBus/qdbuserror.h>
+#include <QtDBus/qdbusinterface.h>
+#include <QtDBus/qdbusreply.h>
+#include <qloggingcategory.h>
+
+Q_LOGGING_CATEGORY(lcLidWatcher, "ZShell.internal.logindmanager", QtInfoMsg)
+
+namespace ZShell::internal {
+
+LidWatcher::LidWatcher(QObject* parent) : QObject(parent) {
+	auto bus = QDBusConnection::systemBus();
+	if (!bus.isConnected()) {
+		qCWarning(lcLidWatcher)
+		        << "Failed to connect to system bus:" << bus.lastError().message();
+		return;
+	}
+
+	bool ok = bus.connect("org.freedesktop.login1",
+	                      "/org/freedesktop/login1",
+	                      "org.freedesktop.login1.Manager",
+	                      "PrepareForSleep",
+	                      this,
+	                      SLOT(handlePrepareForSleep(bool)));
+
+	if (!ok) {
+		qCWarning(lcLidWatcher)
+		        << "Failed to connect to PrepareForSleep signal:"
+		        << bus.lastError().message();
+	}
+
+	QDBusInterface login1("org.freedesktop.login1",
+	                      "/org/freedesktop/login1",
+	                      "org.freedesktop.login1.Manager",
+	                      bus);
+	const QDBusReply<QDBusObjectPath> reply = login1.call("GetSession", "auto");
+	if (!reply.isValid()) {
+		qCWarning(lcLidWatcher) << "Failed to get session path";
+		return;
+	}
+	const auto sessionPath = reply.value().path();
+
+	ok = bus.connect("org.freedesktop.login1",
+	                 sessionPath,
+	                 "org.freedesktop.login1.Session",
+	                 "Lock",
+	                 this,
+	                 SLOT(handleLockRequested()));
+
+	if (!ok) {
+		qCWarning(lcLidWatcher)
+		        << "Failed to connect to Lock signal:" << bus.lastError().message();
+	}
+
+	ok = bus.connect("org.freedesktop.login1",
+	                 sessionPath,
+	                 "org.freedesktop.login1.Session",
+	                 "Unlock",
+	                 this,
+	                 SLOT(handleUnlockRequested()));
+
+	if (!ok) {
+		qCWarning(lcLidWatcher) << "Failed to connect to Unlock signal:"
+		                        << bus.lastError().message();
+	}
+}
+
+void LidWatcher::handlePrepareForSleep(bool sleep) {
+	if (sleep) {
+		emit aboutToSleep();
+	} else {
+		emit resumed();
+	}
+}
+
+void LidWatcher::handleLockRequested() {
+	emit lockRequested();
+}
+
+void LidWatcher::handleUnlockRequested() {
+	emit unlockRequested();
+}
+
+} // namespace ZShell::internal
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <qobject.h>
+#include <qqmlintegration.h>
+
+namespace ZShell::internal {
+
+class LidWatcher : public QObject {
+Q_OBJECT
+QML_ELEMENT
+
+public:
+explicit LidWatcher(QObject* parent = nullptr);
+
+signals:
+void aboutToSleep();
+void resumed();
+void lockRequested();
+void unlockRequested();
+
+private slots:
+void handlePrepareForSleep(bool sleep);
+void handleLockRequested();
+void handleUnlockRequested();
+};
+
+} // namespace ZShell::internal
@@ -4,7 +4,7 @@
 #include <qpainterpath.h>
 #include <qpen.h>

-namespace caelestia::internal {
+namespace ZShell::internal {

 SparklineItem::SparklineItem(QQuickItem* parent)
 	: QQuickPaintedItem(parent) {
@@ -212,4 +212,4 @@ void SparklineItem::setLineWidth(qreal width) {
 	update();
 }

-} // namespace caelestia::internal
+} // namespace ZShell::internal
@@ -7,7 +7,7 @@

 #include "circularbuffer.hpp"

-namespace caelestia::internal {
+namespace ZShell::internal {

 class SparklineItem : public QQuickPaintedItem {
 Q_OBJECT
@@ -87,4 +87,4 @@ int m_historyLength = 30;
 qreal m_lineWidth = 2.0;
 };

-} // namespace caelestia::internal
+} // namespace ZShell::internal
@@ -1,5 +1,6 @@
 #pragma once

+#include <cstdint>
 #include <qabstractitemmodel.h>
 #include <qdir.h>
 #include <qfilesystemwatcher.h>
@@ -85,9 +86,9 @@ public:

 explicit FileSystemModel(QObject* parent = nullptr);

-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
+[[nodiscard]] int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+[[nodiscard]] QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+[[nodiscard]] QHash<int, QByteArray> roleNames() const override;

 [[nodiscard]] QString path() const;
 void setPath(const QString& path);
@@ -9,6 +9,7 @@ qml_module(ZShell-services
        cavaprovider.hpp cavaprovider.cpp
 		desktopmodel.hpp desktopmodel.cpp
 		desktopstatemanager.hpp desktopstatemanager.cpp
+		hyprsunsetmanager.hpp hyprsunsetmanager.cpp
    LIBRARIES
 		Qt6::Core
 		Qt6::Qml
@@ -59,7 +59,7 @@ quint32 readChunk(double* out, quint32 count = 0);

 private:
 explicit AudioCollector(QObject* parent = nullptr);
-~AudioCollector();
+~AudioCollector() override;

 std::jthread m_thread;
 std::vector<float> m_buffer1;
@@ -11,11 +11,10 @@ Q_OBJECT

 public:
 explicit AudioProcessor(QObject* parent = nullptr);
-~AudioProcessor();
+~AudioProcessor() override;

 void init();

-public slots:
 void start();
 void stop();

@@ -31,7 +30,7 @@ Q_OBJECT

 public:
 explicit AudioProvider(QObject* parent = nullptr);
-~AudioProvider();
+~AudioProvider() override;

 protected:
 AudioProcessor* m_processor;
@@ -11,7 +11,7 @@ Q_OBJECT

 public:
 explicit BeatProcessor(QObject* parent = nullptr);
-~BeatProcessor();
+~BeatProcessor() override;

 signals:
 void beat(smpl_t bpm);
@@ -11,7 +11,7 @@ Q_OBJECT

 public:
 explicit CavaProcessor(QObject* parent = nullptr);
-~CavaProcessor();
+~CavaProcessor() override;

 void setBars(int bars);

@@ -4,6 +4,7 @@
 #include <QList>
 #include <QString>
 #include <QQmlEngine>
+#include <cstdint>

 namespace ZShell::services {

@@ -30,9 +31,9 @@ enum DesktopRoles {

 explicit DesktopModel(QObject *parent = nullptr);

-int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-QHash<int, QByteArray> roleNames() const override;
+[[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+[[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+[[nodiscard]] QHash<int, QByteArray> roleNames() const override;

 Q_INVOKABLE void loadDirectory(const QString &path);
 Q_INVOKABLE void moveIcon(int index, int newX, int newY);
@@ -43,4 +44,4 @@ QList<DesktopItem> m_items;
 void saveCurrentLayout();
 };

-} // namespace ZShell::services
+} // namespace ZShell::Services
@@ -18,7 +18,7 @@ Q_INVOKABLE void saveLayout(const QVariantMap& layout);
 Q_INVOKABLE QVariantMap getLayout();

 private:
-QString getConfigFilePath() const;
+[[nodiscard]] QString getConfigFilePath() const;
 };

 } // namespace ZShell::services
@@ -0,0 +1,147 @@
+#include "hyprsunsetmanager.hpp"
+#include <qlogging.h>
+#include <qobject.h>
+#include <qprocess.h>
+#include <qtimer.h>
+
+namespace ZShell::services {
+
+HyprsunsetManager::HyprsunsetManager(QObject* parent) : QObject(parent) {
+	connect(&m_timer, &QTimer::timeout, this, &HyprsunsetManager::apply);
+	connect(&m_manualTimer, &QTimer::timeout, this, [this] {
+			m_manualToggle = false;
+			emit manualToggleChanged();
+			apply();
+		});
+	connect(&m_startCooldown, &QTimer::timeout, this, [this] {
+			m_startAllowed = true;
+			apply();
+		});
+
+	m_startCooldown.start(2000);
+	m_manualTimer.setSingleShot(true);
+	m_timer.start(60000);
+
+	m_process.setStandardInputFile(QProcess::nullDevice());
+	m_process.setStandardOutputFile(QProcess::nullDevice());
+}
+
+int HyprsunsetManager::startTime() const {
+	return m_startTime;
+}
+
+int HyprsunsetManager::endTime() const {
+	return m_endTime;
+}
+
+bool HyprsunsetManager::manualToggle() const {
+	return m_manualToggle;
+}
+
+bool HyprsunsetManager::enabled() const {
+	return m_enabled;
+}
+
+bool HyprsunsetManager::activeAuto() const {
+	return m_activeAuto;
+}
+
+int HyprsunsetManager::temp() const {
+	return m_temp;
+}
+
+void HyprsunsetManager::setActiveAuto(bool activeAuto) {
+	if (activeAuto == m_activeAuto)
+		return;
+
+	m_activeAuto = activeAuto;
+	emit activeAutoChanged();
+}
+
+void HyprsunsetManager::setManualToggle(bool toggle) {
+	if (toggle == m_manualToggle)
+		return;
+
+	m_manualToggle = toggle;
+	emit manualToggleChanged();
+
+	m_manualTimer.start(60 * 60 * 1000);
+}
+
+void HyprsunsetManager::setEndTime(const int& time) {
+	if (time == m_endTime)
+		return;
+
+	m_endTime = time;
+	emit endTimeChanged();
+	apply();
+}
+
+void HyprsunsetManager::setStartTime(const int& time) {
+	if (time == m_startTime)
+		return;
+
+	m_startTime = time;
+	emit startTimeChanged();
+	apply();
+}
+
+void HyprsunsetManager::setTemp(const int& temp) {
+	if (temp == m_temp)
+		return;
+
+	m_temp = temp;
+	emit tempChanged();
+	apply();
+}
+
+void HyprsunsetManager::toggle() {
+	if (m_enabled) {
+		end();
+	} else {
+		start();
+	}
+}
+
+void HyprsunsetManager::start() {
+	if (m_enabled && m_initialized)
+		return;
+
+	m_initialized = true;
+	m_enabled = true;
+
+	emit enabledChanged();
+
+	m_process.setProgram("hyprctl");
+	m_process.setArguments({"hyprsunset", "temperature", QString::number(m_temp)});
+	m_process.startDetached();
+}
+
+void HyprsunsetManager::end() {
+	if (!m_enabled && m_initialized)
+		return;
+
+	m_initialized = true;
+	m_enabled = false;
+
+	emit enabledChanged();
+
+	m_process.setProgram("hyprctl");
+	m_process.setArguments({"hyprsunset", "identity"});
+	m_process.startDetached();
+}
+
+void HyprsunsetManager::apply() {
+	if (m_manualToggle || !m_activeAuto || !m_startAllowed)
+		return;
+
+	const auto current = QTime::currentTime().hour();
+
+	if (current >= m_startTime || current < m_endTime) {
+		start();
+	} else {
+		end();
+	}
+}
+
+};
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <QObject>
+#include <QTime>
+#include <QProcess>
+#include <QTimer>
+#include <qqmlintegration.h>
+#include <qtmetamacros.h>
+
+namespace ZShell::services {
+
+class HyprsunsetManager : public QObject {
+Q_OBJECT
+QML_ELEMENT
+Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged)
+Q_PROPERTY(int startTime READ startTime WRITE setStartTime NOTIFY startTimeChanged)
+Q_PROPERTY(int endTime READ endTime WRITE setEndTime NOTIFY endTimeChanged)
+Q_PROPERTY(int temp READ temp WRITE setTemp NOTIFY tempChanged)
+Q_PROPERTY(bool activeAuto READ activeAuto WRITE setActiveAuto NOTIFY activeAutoChanged)
+Q_PROPERTY(bool manualToggle READ manualToggle WRITE setManualToggle NOTIFY manualToggleChanged)
+
+public:
+explicit HyprsunsetManager(QObject* parent = nullptr);
+
+[[nodiscard]] int startTime() const;
+[[nodiscard]] int endTime() const;
+[[nodiscard]] bool enabled() const;
+[[nodiscard]] int temp() const;
+[[nodiscard]] bool activeAuto() const;
+[[nodiscard]] bool manualToggle() const;
+
+Q_INVOKABLE void toggle();
+Q_INVOKABLE void apply();
+
+void setStartTime(const int& time);
+void setEndTime(const int& time);
+void setTemp(const int& temp);
+void setActiveAuto(bool activeAuto);
+void setManualToggle(bool toggle);
+
+signals:
+void enabledChanged();
+void startTimeChanged();
+void activeAutoChanged();
+void endTimeChanged();
+void tempChanged();
+void manualToggleChanged();
+
+private:
+int m_startTime;
+int m_endTime;
+bool m_enabled = false;
+bool m_manualToggle = false;
+bool m_activeAuto;
+bool m_startAllowed = false;
+bool m_initialized = false;
+QTimer m_startCooldown;
+int m_temp;
+QProcess m_process;
+QTimer m_timer;
+QTimer m_manualTimer;
+void start();
+void end();
+};
+
+};
@@ -13,7 +13,7 @@ QML_SINGLETON
 public:
 explicit Qalculator(QObject* parent = nullptr);

-Q_INVOKABLE QString eval(const QString& expr, bool printExpr = true) const;
+Q_INVOKABLE [[nodiscard]] QString eval(const QString& expr, bool printExpr = true) const;
 };

 } // namespace ZShell
@@ -29,9 +29,9 @@ Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValu
 Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved, QJSValue onFailed);
 // clang-format on

-Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
-Q_INVOKABLE bool deleteFile(const QUrl& path) const;
-Q_INVOKABLE QString toLocalFile(const QUrl& url) const;
+Q_INVOKABLE [[nodiscard]] bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
+Q_INVOKABLE [[nodiscard]] bool deleteFile(const QUrl& path) const;
+Q_INVOKABLE [[nodiscard]] QString toLocalFile(const QUrl& url) const;

 private:
 bool loadSourceImage(const QUrl& source, QImage& image) const;
@@ -1,9 +1,11 @@
 from __future__ import annotations
+import os
 import sys
 from pathlib import Path

 import typer
 from typer._completion_shared import install, _get_shell_name
+from typer._completion_classes import completion_init
 from zshell.subcommands import shell, scheme, screenshot, wallpaper, record

 app = typer.Typer(name="zshell-cli", add_completion=False)
@@ -30,23 +32,26 @@ def _completion_installed() -> bool:
 def _install_completion() -> None:
    if _completion_installed():
        print("zshell-cli: Shell completion already installed.")
-        raise typer.Exit()
+        sys.exit(0)
    shell = _get_shell_name()
    if shell is None:
        print("zshell-cli: Unable to detect shell type.", file=sys.stderr)
-        raise typer.Exit(code=1)
+        sys.exit(1)
    try:
        _, path = install(prog_name="zshell-cli")
        print(f"zshell-cli: Shell completion installed ({shell}: {path})")
        print("zshell-cli: Restart your shell or source the file to enable tab-completion.")
-    except Exception:
-        pass
+    except Exception as e:
+        print(f"zshell-cli: Failed to install shell completion: {e}", file=sys.stderr)
+        raise typer.Exit(code=1)


 def main() -> None:
    if "--install-autocomplete" in sys.argv:
        _install_completion()
        return
+    if "_ZSHELL_CLI_COMPLETE" in os.environ:
+        completion_init()
    if sys.stdout.isatty() and not _completion_installed():
        print("zshell-cli: Tip: run with --install-autocomplete for tab completion.", file=sys.stderr)
    app()
@@ -1011,7 +1011,7 @@ export const settingsIndex = [
        keywords: ["corner", "radius"],
    },
    {
-        name: "Enable drop shadow",
+        name: "Enable shadow",
        category: "screenshot",
        categoryName: "Screenshot",
        section: "Screenshot",
@@ -1025,19 +1025,19 @@ export const settingsIndex = [
        keywords: ["rounded", "corners"],
    },
    {
-        name: "Shadow blur radius",
+        name: "Shadow blur amount",
        category: "screenshot",
        categoryName: "Screenshot",
        section: "Screenshot",
        keywords: ["blur", "shadow", "radius"],
    },
-    {
-        name: "Shadow color",
-        category: "screenshot",
-        categoryName: "Screenshot",
-        section: "Screenshot",
-        keywords: ["color", "shadow"],
-    },
+    // {
+    //     name: "Shadow color",
+    //     category: "screenshot",
+    //     categoryName: "Screenshot",
+    //     section: "Screenshot",
+    //     keywords: ["color", "shadow"],
+    // },
    {
        name: "Shadow offset X",
        category: "screenshot",
@@ -48,7 +48,7 @@ ShellRoot {
 	LazyLoader {
 		activeAsync: root.laptop

-		component: Battery {
+		component: BatteryService {
 		}
 	}
 }
@@ -0,0 +1,2 @@
+edition = "2024"
+style_edition = "2024"
@@ -10,12 +10,10 @@ pub struct Config {

 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct EffectsConfig {
-    pub mode: String,
-    pub corner_radius: f32,
-    pub drop_shadow: bool,
-    pub rounded_corners: bool,
-    pub shadow_blur_radius: f32,
-    pub shadow_blur_passes: u32,
+    pub radius: f32,
+    pub shadow: bool,
+    pub rounding: bool,
+    pub shadow_blur: f32,
    pub shadow_color: [u8; 4],
    pub shadow_offset_x: f32,
    pub shadow_offset_y: f32,
@@ -5,18 +5,17 @@ use tiny_skia::{
 };

 pub fn apply_effects(img: RgbaImage, cfg: &EffectsConfig) -> RgbaImage {
-    let img = if cfg.rounded_corners {
-        apply_rounded_corners(img, cfg.corner_radius)
+    let img = if cfg.rounding {
+        apply_rounding(img, cfg.radius)
    } else {
        img
    };
-    if cfg.drop_shadow {
-        apply_drop_shadow(
+    if cfg.shadow {
+        apply_shadow(
            img,
-            cfg.shadow_blur_radius,
+            cfg.shadow_blur,
            cfg.shadow_offset_x,
            cfg.shadow_offset_y,
-            cfg.shadow_blur_passes,
            cfg.shadow_color,
        )
    } else {
@@ -24,7 +23,7 @@ pub fn apply_effects(img: RgbaImage, cfg: &EffectsConfig) -> RgbaImage {
    }
 }

-pub fn apply_rounded_corners(img: RgbaImage, radius: f32) -> RgbaImage {
+pub fn apply_rounding(img: RgbaImage, radius: f32) -> RgbaImage {
    let (w, h) = img.dimensions();
    let mut mask = Pixmap::new(w, h).expect("mask pixmap");
    let path = rounded_rect_path(0.0, 0.0, w as f32, h as f32, radius);
@@ -48,20 +47,16 @@ pub fn apply_rounded_corners(img: RgbaImage, radius: f32) -> RgbaImage {
    pixmap_to_rgba_image(pixmap)
 }

-pub fn apply_drop_shadow(
+pub fn apply_shadow(
    img: RgbaImage,
-    blur_radius: f32,
+    blur: f32,
    offset_x: f32,
    offset_y: f32,
-    blur_passes: u32,
    shadow_color: [u8; 4],
 ) -> RgbaImage {
    let (iw, ih) = img.dimensions();
-    let br = blur_radius.ceil() as u32;
-    let bp = blur_passes;
-    // Original idea
-    // let spread = br * bp;
-    // Claude is hallucinating but let's try it **Worked btw**
+    let br = blur.ceil() as u32;
+    let bp = 1;
    let spread = (br as f32 * (bp as f32).sqrt() * 2.0).ceil() as u32;

    let extra_left = spread + (-offset_x).max(0.0).ceil() as u32;
@@ -92,11 +87,8 @@ pub fn apply_drop_shadow(

    tint_pixmap_as_shadow(&mut shadow_pixmap, shadow_color);

-    // Shadow
    let shadow_img = pixmap_to_rgba_image(shadow_pixmap);
-    // Shadow blur
    let blurred = box_blur_rgba(&shadow_img, br, bp);
-    // Shadow pos
    let blurred_pixmap = rgba_image_to_pixmap(&blurred);

    let mut canvas = Pixmap::new(canvas_w, canvas_h).expect("canvas pixmap");
@@ -1,20 +1,18 @@
 mod config;
 mod effects;

-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use std::io::Write as _;
 use std::process::{Command, Stdio};

 #[derive(Default)]
 struct CliOverrides {
-    rounded_corners: Option<bool>,
-    corner_radius: Option<f32>,
-    drop_shadow: Option<bool>,
-    shadow_blur_radius: Option<f32>,
-    shadow_blur_passes: Option<u32>,
+    rounding: Option<bool>,
+    radius: Option<f32>,
+    shadow: Option<bool>,
+    shadow_blur: Option<f32>,
    shadow_offset_x: Option<f32>,
    shadow_offset_y: Option<f32>,
-    // Accepted as four comma-separated u8 values, e.g. `255,0,0,200`
    shadow_color: Option<[u8; 4]>,
 }

@@ -50,7 +48,25 @@ fn parse_shadow_color(s: &str) -> Result<[u8; 4]> {
    Ok([r, g, b, a])
 }

-fn main() -> Result<()> {
+fn extract_image_path() -> Option<String> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
+    args.windows(2)
+        .find(|w| w[0] == "--image")
+        .map(|w| w[1].clone())
+}
+
+fn main() {
+    // Fundamental issue when supplying args it won't give output unless --image is used.
+    // Will have to be fixed in a later patch upcoming week
+    if let Some(path) = extract_image_path()
+        && let Err(e) = run()
+    {
+        eprintln!("Error: {}", e);
+        push_image(&path).ok();
+    }
+}
+
+fn run() -> Result<()> {
    let args: Vec<String> = std::env::args().skip(1).collect();

    let mut image_path: Option<String> = None;
@@ -61,130 +77,97 @@ fn main() -> Result<()> {
    while i < args.len() {
        match args[i].as_str() {
            "--image" => {
-                i += 1;
-                image_path = Some(
-                    args.get(i)
-                        .cloned()
-                        .context("Expected a path after --image")?,
-                );
+                image_path = Some(next_arg(&args, &mut i, "--image")?);
            }
-            "--rounded-corners" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected true/false after --rounded-corners")?;
-                overrides.rounded_corners = Some(parse_bool(val)?);
+            "--rounding" => {
+                let val = next_arg(&args, &mut i, "--rounding")?;
+                overrides.rounding = Some(parse_bool(&val)?);
            }
-            "--corner-radius" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected a number after --corner-radius")?;
-                overrides.corner_radius = Some(
+            "--radius" => {
+                let val = next_arg(&args, &mut i, "--radius")?;
+                overrides.radius = Some(val.parse::<f32>().context("--radius must be a number")?);
+            }
+            "--shadow" => {
+                let val = next_arg(&args, &mut i, "--shadow")?;
+                overrides.shadow = Some(parse_bool(&val)?);
+            }
+            "--shadow-blur" => {
+                let val = next_arg(&args, &mut i, "--shadow-blur")?;
+                overrides.shadow_blur = Some(
                    val.parse::<f32>()
-                        .context("--corner-radius must be a number")?,
-                );
-            }
-            "--drop-shadow" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected true/false after --drop-shadow")?;
-                overrides.drop_shadow = Some(parse_bool(val)?);
-            }
-            "--shadow-blur-radius" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected a number after --shadow-blur-radius")?;
-                overrides.shadow_blur_radius = Some(
-                    val.parse::<f32>()
-                        .context("--shadow-blur-radius must be a number")?,
+                        .context("--shadow-blur must be a number")?,
                );
            }
            "--shadow-offset-x" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected a number after --shadow-offset-x")?;
+                let val = next_arg(&args, &mut i, "--shadow-offset-x")?;
                overrides.shadow_offset_x = Some(
                    val.parse::<f32>()
                        .context("--shadow-offset-x must be a number")?,
                );
            }
            "--shadow-offset-y" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected a number after --shadow-offset-y")?;
+                let val = next_arg(&args, &mut i, "--shadow-offset-y")?;
                overrides.shadow_offset_y = Some(
                    val.parse::<f32>()
                        .context("--shadow-offset-y must be a number")?,
                );
            }
-            "--shadow-blur-passes" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected a number after --shadow-blur-passes")?;
-                overrides.shadow_blur_passes = Some(
-                    val.parse::<u32>()
-                        .context("--shadow-blur-passes must be a number")?,
-                );
-            }
            "--shadow-color" => {
-                i += 1;
-                let val = args
-                    .get(i)
-                    .context("Expected r,g,b,a after --shadow-color")?;
-                overrides.shadow_color = Some(parse_shadow_color(val)?);
+                let val = next_arg(&args, &mut i, "--shadow-color")?;
+                overrides.shadow_color = Some(parse_shadow_color(&val)?);
            }
            "--scale" => {
-                i += 1;
-                let val = args.get(i).context("Expected a number after --scale")?;
+                let val = next_arg(&args, &mut i, "--scale")?;
                scale = Some(val.parse::<f32>().context("--scale must be a number")?);
            }
-            unknown => bail!("Unknown argument: {unknown}"),
+            unknown => {
+                let unknown_args = unknown.to_string();
+                println!("Warning: Unknown argument '{}'", unknown);
+                next_arg(&args, &mut i, &unknown_args)?;
            }
+        }
+
        i += 1;
    }

    let image_path = image_path.context("Missing --image <path>")?;

-    let config = config::Config::load().context("Failed to load config")?;
+    let cli_args_provided = overrides.rounding.is_some()
+        || overrides.radius.is_some()
+        || overrides.shadow.is_some()
+        || overrides.shadow_blur.is_some()
+        || overrides.shadow_offset_x.is_some()
+        || overrides.shadow_offset_y.is_some()
+        || overrides.shadow_color.is_some();
+    let mut effects = if cli_args_provided {
+        let rounding = overrides.rounding.context("Missing --rounding")?;
+        let radius = overrides.radius.context("Missing --radius")?;
+        let shadow = overrides.shadow.context("Missing --shadow")?;
+        let shadow_blur = overrides.shadow_blur.context("Missing --shadow-blur")?;
+        let shadow_offset_x = overrides
+            .shadow_offset_x
+            .context("Missing --shadow-offset-x")?;
+        let shadow_offset_y = overrides
+            .shadow_offset_y
+            .context("Missing --shadow-offset-y")?;
+        let shadow_color = overrides.shadow_color.context("Missing --shadow-color")?;
+        config::EffectsConfig {
+            rounding,
+            radius,
+            shadow,
+            shadow_blur,
+            shadow_offset_x,
+            shadow_offset_y,
+            shadow_color,
+        }
+    } else {
+        let config = config::Config::load()?;
+        config.screenshot
+    };

-    let mut effects = config.screenshot;
-    if effects.mode == "auto" {
-        if let Some(v) = overrides.rounded_corners {
-            effects.rounded_corners = v;
-        }
-        if let Some(v) = overrides.corner_radius {
-            effects.corner_radius = v;
-        }
-        if let Some(v) = overrides.drop_shadow {
-            effects.drop_shadow = v;
-        }
-        if let Some(v) = overrides.shadow_blur_radius {
-            effects.shadow_blur_radius = v;
-        }
-        if let Some(v) = overrides.shadow_offset_x {
-            effects.shadow_offset_x = v;
-        }
-        if let Some(v) = overrides.shadow_offset_y {
-            effects.shadow_offset_y = v;
-        }
-        if let Some(v) = overrides.shadow_blur_passes {
-            effects.shadow_blur_passes = v;
-        }
-        if let Some(v) = overrides.shadow_color {
-            effects.shadow_color = v;
-        }
-    }
-
-    // if scale is set do
    if let Some(scale) = scale.filter(|&s| s != 1.0) {
-        effects.corner_radius *= scale;
-        effects.shadow_blur_radius *= scale;
+        effects.radius *= scale;
+        effects.shadow_blur *= scale;
        effects.shadow_offset_x *= scale;
        effects.shadow_offset_y *= scale;
    }
@@ -196,6 +179,49 @@ fn main() -> Result<()> {
    Ok(())
 }

+fn next_arg(args: &[String], i: &mut usize, flag: &str) -> Result<String> {
+    *i += 1;
+
+    let val = args
+        .get(*i)
+        .context(format!("Expected value after {}", flag))?;
+
+    if val.starts_with('-') {
+        bail!("Expected value after {}, found flag {}", flag, val);
+    }
+
+    Ok(val.clone())
+}
+
+fn push_image(path: &str) -> Result<()> {
+    let img = image::open(path)
+        .with_context(|| format!("Failed to open image '{path}'"))?
+        .into_rgba8();
+
+    let mut png_bytes: Vec<u8> = Vec::new();
+    image::DynamicImage::ImageRgba8(img)
+        .write_to(
+            &mut std::io::Cursor::new(&mut png_bytes),
+            image::ImageFormat::Png,
+        )
+        .context("Failed to encode processed image as PNG")?;
+
+    let mut child = Command::new("swappy")
+        .args(["-f", "-"])
+        .stdin(Stdio::piped())
+        .spawn()
+        .context("Failed to spawn swappy. Is it installed and in PATH?")?;
+
+    // Writes the PNG bytes to swappy's stdin and then closes
+    if let Some(mut stdin) = child.stdin.take() {
+        stdin
+            .write_all(&png_bytes)
+            .context("Failed to write image data to swappy")?;
+    }
+
+    Ok(())
+}
+
 fn process_image(path: &str, effects: &config::EffectsConfig) -> Result<()> {
    let img = image::open(path)
        .with_context(|| format!("Failed to open image '{path}'"))?