Initial commit for submenu popouts, unfinished

Reviewed-on: #90

.gitea/workflows/lint-js.yml

@@ -0,0 +1,42 @@
+name: Lint & Format (JS/TS)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git
+
+            - name: Prettier
+              continue-on-error: true
+              run: |
+                  if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
+                    npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .prettierignore
+                  else
+                    echo "No JS/TS files found"
+                  fi
+
+            - name: ESLint
+              run: |
+                  if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
+                    if [ -f package.json ]; then
+                      npm install --no-audit --no-fund
+                    fi
+                    if [ -f eslint.config.js ] || [ -f eslint.config.mjs ] || [ -f eslint.config.cjs ] || [ -f .eslintrc ] || [ -f .eslintrc.js ] || [ -f .eslintrc.cjs ] || [ -f .eslintrc.json ] || [ -f .eslintrc.yaml ] || [ -f .eslintrc.yml ]; then
+                      npx --yes eslint . && echo "ESLint passed" || echo "ESLint failed"
+                    else
+                      echo "No eslint config found"
+                    fi
+                  else
+                    echo "No JS/TS files found"
+                  fi

.gitea/workflows/lint-python.yml

@@ -0,0 +1,34 @@
+name: Lint & Format (Python)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git \
+                    python3 \
+                    py3-pip
+                  python3 -m venv .venv
+                  . .venv/bin/activate
+                  pip install --no-cache-dir ruff
+
+            - name: Format check
+              continue-on-error: true
+              run: |
+                  . .venv/bin/activate
+                  ruff format --check .
+
+            - name: Lint
+              run: |
+                  . .venv/bin/activate
+                  ruff check .

.gitea/workflows/lint-rust.yml

@@ -0,0 +1,72 @@
+name: Lint & Format (Rust)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+        env:
+            CARGO_HOME: ${{ github.workspace }}/.cargo
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Cache cargo packages
+              uses: actions/cache@v4
+              env:
+                  cache-name: cache-cargo-packages
+              with:
+                  path: |
+                      .cargo/registry
+                      .cargo/git
+                      target
+                  key: rust-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+                  restore-keys: |
+                      rust-${{ runner.os }}-build-${{ env.cache-name }}-
+                      rust-${{ runner.os }}-build-
+                      rust-
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git \
+                    cargo \
+                    rust \
+                    rustfmt \
+                    rust-clippy
+
+            - name: Format check
+              continue-on-error: true
+              run: |
+                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    for manifest in $(find . -name "Cargo.toml"); do
+                      cargo fmt --manifest-path "$manifest" --check && \
+                        echo "$manifest: formatting OK" || \
+                        echo "$manifest: needs formatting"
+                    done
+                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
+                    echo "Rust files found but no Cargo.toml"
+                    exit 1
+                  else
+                    echo "No Rust project found"
+                  fi
+
+            - name: Clippy
+              run: |
+                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    status=0
+                    for manifest in $(find . -name "Cargo.toml"); do
+                      cargo clippy --manifest-path "$manifest" --all-targets --all-features -- -D warnings && \
+                        echo "$manifest: Clippy passed" || \
+                        { echo "$manifest: Clippy failed"; status=1; }
+                    done
+                    exit $status
+                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
+                    echo "Rust files found but no Cargo.toml"
+                    exit 1
+                  else
+                    echo "No Rust project found"
+                  fi

.gitignore

@@ -1,3 +1,4 @@
+**/__pycache__/
 ./result/
 .pyre/
 .cache/
@@ -11,3 +12,4 @@ pkg/
 uv.lock
 .qtcreator/
 dist/
+**/target/

.prettierignore

@@ -0,0 +1,3 @@
+.venv/
+scripts/fzf.js
+scripts/fuzzysort.js

.prettierrc.json

@@ -0,0 +1,13 @@
+{
+    "semi": true,
+    "singleQuote": false,
+    "jsxSingleQuote": false,
+    "tabWidth": 4,
+    "printWidth": 80,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "bracketSameLine": false,
+    "arrowParens": "always",
+    "endOfLine": "lf",
+    "proseWrap": "preserve"
+}

Components/Anim.qml

@@ -2,7 +2,7 @@ import QtQuick
 import qs.Config
 
 NumberAnimation {
-	duration: MaterialEasing.standardTime
+	duration: Appearance.anim.durations.normal
-	easing.bezierCurve: MaterialEasing.standard
+	easing.bezierCurve: Appearance.anim.curves.standard
 	easing.type: Easing.BezierSpline
 }

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

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

Config/Appearance.qml

@@ -4,6 +4,7 @@ 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:

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 {
@@ -43,6 +45,9 @@ JsonObject {
 		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"
@@ -66,8 +71,8 @@ JsonObject {
 	}
 	component Padding: JsonObject {
 		property int large: 15 * scale
-		property int larger: 12 * scale
+		property int larger: 13 * scale
-		property int normal: 10 * scale
+		property int normal: 9 * scale
 		property real scale: 1
 		property int small: 5 * scale
 		property int smaller: 7 * scale
@@ -75,18 +80,18 @@ JsonObject {
 	}
 	component Rounding: JsonObject {
 		property int full: 1000 * scale
-		property int large: 25 * scale
+		property int large: 24 * scale
-		property int normal: 17 * 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 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 {

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
 }

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
@@ -48,10 +40,6 @@ JsonObject {
 			id: "tray",
 			enabled: true
 		},
-		{
-			id: "upower",
-			enabled: false
-		},
 		{
 			id: "network",
 			enabled: false
@@ -70,6 +58,7 @@ JsonObject {
 	property Popouts popouts: Popouts {
 	}
 	property int rounding: 8
+	property int smoothing: 32
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true

Config/Config.qml

@@ -23,6 +23,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 +49,9 @@ Singleton {
 			padding: {
 				scale: appearance.padding.scale
 			},
+			deform: {
+				scale: appearance.deform.scale
+			},
 			font: {
 				family: {
 					sans: appearance.font.family.sans,
@@ -77,7 +81,14 @@ 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
 		};
 	}
 
@@ -87,6 +98,7 @@ Singleton {
 			hideWhenNotif: barConfig.hideWhenNotif,
 			rounding: barConfig.rounding,
 			border: barConfig.border,
+			smoothing: barConfig.smoothing,
 			height: barConfig.height,
 			popouts: {
 				tray: barConfig.popouts.tray,
@@ -122,7 +134,8 @@ Singleton {
 			background: serializeBackground(),
 			launcher: serializeLauncher(),
 			colors: serializeColors(),
-			dock: serializeDock()
+			dock: serializeDock(),
+			screenshot: serializeScreenshot()
 		};
 	}
 
@@ -174,6 +187,7 @@ Singleton {
 			logo: general.logo,
 			wallpaperPath: general.wallpaperPath,
 			desktopIcons: general.desktopIcons,
+			dateFormat: general.dateFormat,
 			color: {
 				mode: general.color.mode,
 				smart: general.color.smart,
@@ -203,6 +217,7 @@ Singleton {
 		return {
 			maxAppsShown: launcher.maxAppsShown,
 			maxWallpapers: launcher.maxWallpapers,
+			uwsm: launcher.uwsm,
 			actionPrefix: launcher.actionPrefix,
 			specialPrefix: launcher.specialPrefix,
 			useFuzzy: {
@@ -226,6 +241,7 @@ Singleton {
 		return {
 			recolorLogo: lock.recolorLogo,
 			enableFprint: lock.enableFprint,
+			showNotifContent: lock.showNotifContent,
 			maxFprintTries: lock.maxFprintTries,
 			blurAmount: lock.blurAmount,
 			sizes: {
@@ -267,9 +283,24 @@ Singleton {
 		};
 	}
 
+	function serializeScreenshot(): var {
+		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_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,
@@ -322,7 +353,6 @@ Singleton {
 
 	ElapsedTimer {
 		id: timer
-
 	}
 
 	Timer {
@@ -422,6 +452,8 @@ Singleton {
 			}
 			property Overview overview: Overview {
 			}
+			property Screenshot screenshot: Screenshot {
+			}
 			property Services services: Services {
 			}
 			property SidebarConfig sidebar: SidebarConfig {

Config/DynamicColors.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import Quickshell.Io
+import Quickshell.Hyprland
 import QtQuick
 import ZShell
 import qs.Helpers
@@ -78,12 +79,59 @@ Singleton {
 		return Qt.hsla(c.hslHue, c.hslSaturation, 0.1, 1);
 	}
 
+	function reloadHyprRules(): void {
+		const blur = transparency.enabled ? 1 : 0;
+		const alpha = transparency.base - 0.03;
+
+		const rules = `
+			hl.layer_rule({
+				match = { namespace = "ZShell-Bar" },
+				blur = ${blur}
+			})
+
+			hl.layer_rule({
+				match = { namespace = "ZShell-Bar" },
+				ignore_alpha = ${alpha}
+			})
+
+			hl.layer_rule({
+				match = { namespace = "ZShell-Auth" },
+				blur = ${blur}
+			})
+
+			hl.layer_rule({
+				match = { namespace = "ZShell-Auth" },
+				ignore_alpha = ${alpha}
+			})
+		`;
+
+		Hypr.extras.message(`eval ${rules}`);
+	}
+
 	function setMode(mode: string): void {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", mode]);
 		Config.general.color.mode = mode;
 		Config.save();
 	}
 
+	Component.onCompleted: debounceTimer.triggered()
+
+	Connections {
+		function onUsingLuaChanged(): void {
+			root.reloadHyprRules();
+		}
+
+		target: Hyprland
+	}
+
+	Connections {
+		function onConfigReloaded(): void {
+			root.reloadHyprRules();
+		}
+
+		target: Hypr
+	}
+
 	FileView {
 		path: `${Paths.state}/scheme.json`
 		watchChanges: true
@@ -92,72 +140,20 @@ Singleton {
 		onLoaded: root.load(text(), false)
 	}
 
+	Timer {
+		id: debounceTimer
+
+		interval: 300
+
+		onTriggered: root.reloadHyprRules()
+	}
+
 	ImageAnalyser {
 		id: analyser
 
 		source: WallpaperPath.currentWallpaperPath
 	}
 
-	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 +275,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()
 	}
 }

Config/General.qml

@@ -6,6 +6,7 @@ JsonObject {
 	}
 	property Color color: Color {
 	}
+	property string dateFormat: "ddd d MMM - hh:mm:ss"
 	property bool desktopIcons: false
 	property Idle idle: Idle {
 	}

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

Config/LockConf.qml

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

Config/Screenshot.qml

@@ -0,0 +1,13 @@
+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 real shadow_blur_radius: 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
+}

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

Daemons/NotifServer.qml

@@ -113,11 +113,12 @@ Singleton {
 		id: storage
 
 		path: `${Paths.state}/notifs.json`
+		printErrors: false
 
 		onLoadFailed: err => {
 			if (err === FileViewError.FileNotFound) {
 				root.loaded = true;
-				setText("[]");
+				Qt.callLater(() => setText("[]"));
 			}
 		}
 		onLoaded: {

Drawers/Drawing.qml

@@ -3,184 +3,33 @@ import QtQuick
 Canvas {
 	id: root
 
-	property rect dirtyRect: Qt.rect(0, 0, 0, 0)
-	property bool frameQueued: false
-	property bool fullRepaintPending: true
-	property point lastPoint: Qt.point(0, 0)
-	property real minPointDistance: 2.0
 	property color penColor: "white"
 	property real penWidth: 4
-	property var pendingSegments: []
+	property var points: []
-	property bool strokeActive: false
-	property var strokes: []
 
-	function appendPoint(x, y) {
+	function clear(): void {
-		if (!strokeActive || strokes.length === 0)
+		var ctx = getContext('2d');
+		root.points = [];
+		ctx.reset();
+		root.requestPaint();
+	}
+
+	renderStrategy: Canvas.Cooperative
+
+	onPaint: {
+		if (points.length < 2)
 			return;
-		const dx = x - lastPoint.x;
+		var ctx = root.getContext('2d');
-		const dy = y - lastPoint.y;
+		ctx.save();
-
+		ctx.lineWidth = root.penWidth;
-		if ((dx * dx + dy * dy) < (minPointDistance * minPointDistance))
+		ctx.strokeStyle = root.penColor;
-			return;
-		const x1 = lastPoint.x;
-		const y1 = lastPoint.y;
-		const x2 = x;
-		const y2 = y;
-
-		strokes[strokes.length - 1].push(Qt.point(x2, y2));
-
-		pendingSegments.push({
-			dot: false,
-			x1: x1,
-			y1: y1,
-			x2: x2,
-			y2: y2
-		});
-
-		lastPoint = Qt.point(x2, y2);
-		queueDirty(segmentDirtyRect(x1, y1, x2, y2));
-	}
-
-	function beginStroke(x, y) {
-		const p = Qt.point(x, y);
-		strokes.push([p]);
-		lastPoint = p;
-		strokeActive = true;
-
-		pendingSegments.push({
-			dot: true,
-			x: x,
-			y: y
-		});
-
-		queueDirty(pointDirtyRect(x, y));
-	}
-
-	function clear() {
-		strokes = [];
-		pendingSegments = [];
-		dirtyRect = Qt.rect(0, 0, 0, 0);
-		fullRepaintPending = true;
-		markDirty(Qt.rect(0, 0, width, height));
-	}
-
-	function drawDot(ctx, x, y) {
-		ctx.beginPath();
-		ctx.arc(x, y, penWidth / 2, 0, Math.PI * 2);
-		ctx.fill();
-	}
-
-	function drawSegment(ctx, x1, y1, x2, y2) {
-		ctx.beginPath();
-		ctx.moveTo(x1, y1);
-		ctx.lineTo(x2, y2);
-		ctx.stroke();
-	}
-
-	function endStroke() {
-		strokeActive = false;
-	}
-
-	function pointDirtyRect(x, y) {
-		const pad = penWidth + 2;
-		return Qt.rect(x - pad, y - pad, pad * 2, pad * 2);
-	}
-
-	function queueDirty(r) {
-		dirtyRect = unionRects(dirtyRect, r);
-
-		if (frameQueued)
-			return;
-		frameQueued = true;
-
-		requestAnimationFrame(function () {
-			frameQueued = false;
-
-			if (dirtyRect.width > 0 && dirtyRect.height > 0) {
-				markDirty(dirtyRect);
-				dirtyRect = Qt.rect(0, 0, 0, 0);
-			}
-		});
-	}
-
-	function replayAll(ctx) {
-		ctx.clearRect(0, 0, width, height);
-
-		for (const stroke of strokes) {
-			if (!stroke || stroke.length === 0)
-				continue;
-			if (stroke.length === 1) {
-				const p = stroke[0];
-				drawDot(ctx, p.x, p.y);
-				continue;
-			}
-
-			ctx.beginPath();
-			ctx.moveTo(stroke[0].x, stroke[0].y);
-			for (let i = 1; i < stroke.length; ++i)
-				ctx.lineTo(stroke[i].x, stroke[i].y);
-			ctx.stroke();
-		}
-	}
-
-	function requestFullRepaint() {
-		fullRepaintPending = true;
-		markDirty(Qt.rect(0, 0, width, height));
-	}
-
-	function segmentDirtyRect(x1, y1, x2, y2) {
-		const pad = penWidth + 2;
-		const left = Math.min(x1, x2) - pad;
-		const top = Math.min(y1, y2) - pad;
-		const right = Math.max(x1, x2) + pad;
-		const bottom = Math.max(y1, y2) + pad;
-		return Qt.rect(left, top, right - left, bottom - top);
-	}
-
-	function unionRects(a, b) {
-		if (a.width <= 0 || a.height <= 0)
-			return b;
-		if (b.width <= 0 || b.height <= 0)
-			return a;
-
-		const left = Math.min(a.x, b.x);
-		const top = Math.min(a.y, b.y);
-		const right = Math.max(a.x + a.width, b.x + b.width);
-		const bottom = Math.max(a.y + a.height, b.y + b.height);
-
-		return Qt.rect(left, top, right - left, bottom - top);
-	}
-
-	anchors.fill: parent
-	contextType: "2d"
-	renderStrategy: Canvas.Threaded
-	renderTarget: Canvas.Image
-
-	onHeightChanged: requestFullRepaint()
-	onPaint: region => {
-		const ctx = getContext("2d");
-
 		ctx.lineCap = "round";
-		ctx.lineJoin = "round";
+		ctx.beginPath();
-		ctx.lineWidth = penWidth;
+		ctx.moveTo(points[0].x, points[0].y);
-		ctx.strokeStyle = penColor;
+		for (var i = 1; i < points.length; i++)
-		ctx.fillStyle = penColor;
+			ctx.lineTo(points[i].x, points[i].y);
-
+		ctx.stroke();
-		if (fullRepaintPending) {
+		points = points.slice(points.length - 2);
-			fullRepaintPending = false;
+		ctx.restore();
-			replayAll(ctx);
-			pendingSegments = [];
-			return;
 	}
-
-		for (const seg of pendingSegments) {
-			if (seg.dot)
-				drawDot(ctx, seg.x, seg.y);
-			else
-				drawSegment(ctx, seg.x1, seg.y1, seg.x2, seg.y2);
-		}
-
-		pendingSegments = [];
-	}
-	onWidthChanged: requestFullRepaint()
 }

Drawers/DrawingInput.qml

@@ -30,8 +30,10 @@ CustomMouseArea {
 		const x = event.x;
 		const y = event.y;
 
-		if (event.buttons & Qt.LeftButton)
+		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
-			root.drawing.appendPoint(x, y);
+			root.drawing.points.push(Qt.point(x, y));
+			root.drawing.requestPaint();
+		}
 
 		if (root.inLeftPanel(root.popout, x, y)) {
 			root.z = -2;
@@ -44,7 +46,8 @@ CustomMouseArea {
 
 		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
 			root.panels.drawing.expanded = false;
-			root.drawing.beginStroke(x, y);
+			root.drawing.points.push(Qt.point(x, y));
+			root.drawing.requestPaint();
 			return;
 		}
 
@@ -52,7 +55,6 @@ CustomMouseArea {
 			root.drawing.clear();
 	}
 	onReleased: {
-		if (root.visibilities.isDrawing)
+		root.drawing.points = [];
-			root.drawing.endStroke();
 	}
 }

Drawers/Exclusions.qml

@@ -12,22 +12,37 @@ Scope {
 	required property ShellScreen screen
 
 	ExclusionZone {
+		id: top
+
 		anchors.top: true
 		exclusiveZone: root.bar.exclusiveZone
 	}
 
 	ExclusionZone {
+		id: left
+
 		anchors.left: true
 	}
 
 	ExclusionZone {
+		id: right
+
 		anchors.right: true
 	}
 
 	ExclusionZone {
+		id: bottom
+
 		anchors.bottom: true
 	}
 
+	Timer {
+		interval: 5000
+		running: true
+
+		onTriggered: console.log("top height:", top.exclusiveZone, "left width:", left.exclusiveZone, "right width:", right.exclusiveZone, "bottom height:", bottom.exclusiveZone)
+	}
+
 	component ExclusionZone: CustomWindow {
 		exclusiveZone: Config.barConfig.border
 		implicitHeight: 1

Drawers/Interactions.qml

@@ -52,8 +52,9 @@ CustomMouseArea {
 	}
 
 	anchors.fill: parent
+	cursorShape: (pressed && dragStart.y < bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
 	hoverEnabled: true
-	propagateComposedEvents: true
+	propagateComposedEvents: false
 
 	onContainsMouseChanged: {
 		if (!containsMouse) {
@@ -71,24 +72,32 @@ CustomMouseArea {
 		}
 	}
 	onPositionChanged: event => {
-		if (popouts.isDetached)
-			return;
-
 		const x = event.x;
 		const y = event.y;
 		const dragX = x - dragStart.x;
 		const dragY = y - dragStart.y;
 
 		if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
-			root.input.z = 2;
+			// root.input.z = 2;
 			root.panels.drawing.expanded = false;
 		}
 
 		if (!visibilities.bar && Config.barConfig.autoHide && y < bar.implicitHeight)
 			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.osd, x, y);
+			const showOsd = inRightPanel(panels.osdWrapper, x, y);
 
 			if (showOsd) {
 				osdShortcutActive = false;
@@ -96,7 +105,7 @@ CustomMouseArea {
 			}
 		} else {
 			const outOfSidebar = x < width - panels.sidebar.width;
-			const showOsd = outOfSidebar && inRightPanel(panels.osd, x, y);
+			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
 
 			if (!osdShortcutActive) {
 				visibilities.osd = showOsd;
@@ -107,13 +116,14 @@ CustomMouseArea {
 			}
 		}
 
-		if (!visibilities.dock && !visibilities.launcher && inBottomPanel(panels.dock, x, y))
+		if (Config.dock.enable && !Config.dock.hoverToReveal && !visibilities.dock && !visibilities.launcher && inBottomPanel(panels.dock, x, y))
 			visibilities.dock = true;
 
 		if (y < root.bar.implicitHeight) {
 			root.bar.checkPopout(x);
 		}
 	}
+	onPressed: event => dragStart = Qt.point(event.x, event.y)
 
 	Connections {
 		function onDashboardChanged() {
@@ -180,6 +190,7 @@ CustomMouseArea {
 			if (root.visibilities.settings) {
 				root.visibilities.resources = false;
 				root.visibilities.dashboard = false;
+				root.visibilities.sidebar = false;
 				root.panels.popouts.hasCurrent = false;
 				root.visibilities.launcher = false;
 			}
@@ -188,6 +199,7 @@ CustomMouseArea {
 		function onSidebarChanged() {
 			if (root.visibilities.sidebar) {
 				root.visibilities.dashboard = false;
+				root.visibilities.settings = false;
 				root.popouts.hasCurrent = false;
 			}
 		}

Drawers/Panels.qml

@@ -13,6 +13,7 @@ import qs.Modules.Resources as Resources
 import qs.Modules.Settings as Settings
 import qs.Modules.Drawing as Drawing
 import qs.Modules.Dock as Dock
+import qs.Modules.SysTray.Popouts as SysPopouts
 import qs.Config
 
 Item {
@@ -20,18 +21,24 @@ Item {
 
 	required property Item bar
 	readonly property alias dashboard: dashboard
+	readonly property alias dashboardWrapper: dashboardWrapper
 	readonly property alias dock: dock
 	readonly property alias drawing: drawing
 	required property Canvas drawingItem
 	readonly property alias launcher: launcher
 	readonly property alias notifications: notifications
 	readonly property alias osd: osd
-	readonly property alias popouts: popouts
+	readonly property alias osdWrapper: osdWrapper
+	readonly property alias popouts: popouts.content
+	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
+	readonly property alias resourcesWrapper: resourcesWrapper
 	required property ShellScreen screen
 	readonly property alias settings: settings
+	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
+	readonly property alias traySubmenus: traySubmenus
 	readonly property alias utilities: utilities
 	required property PersistentProperties visibilities
 
@@ -39,6 +46,15 @@ Item {
 	anchors.margins: Config.barConfig.border
 	anchors.topMargin: bar.implicitHeight
 
+	Item {
+		id: resourcesWrapper
+
+		anchors.left: parent.left
+		anchors.top: parent.top
+		clip: true
+		implicitHeight: resources.implicitHeight * (1 - resources.offsetScale)
+		implicitWidth: resources.implicitWidth
+
 		Resources.Wrapper {
 			id: resources
 
@@ -46,6 +62,28 @@ Item {
 			anchors.top: parent.top
 			visibilities: root.visibilities
 		}
+	}
+
+	Item {
+		id: osdWrapper
+
+		anchors.right: parent.right
+		anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
+		anchors.verticalCenter: parent.verticalCenter
+		clip: sidebar.visible
+		implicitHeight: osd.implicitHeight
+		implicitWidth: osd.implicitWidth * (1 - osd.offsetScale)
+
+		Osd.Wrapper {
+			id: osd
+
+			anchors.right: parent.right
+			anchors.verticalCenter: parent.verticalCenter
+			screen: root.screen
+			sidebarOrSessionVisible: sidebar.visible
+			visibilities: root.visibilities
+		}
+	}
 
 	Drawing.Wrapper {
 		id: drawing
@@ -57,29 +95,84 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Osd.Wrapper {
+	Item {
-		id: osd
+		id: traySubmenus
 
-		anchors.right: parent.right
+		Repeater {
-		anchors.rightMargin: sidebar.width
+			model: popouts.content.state.submenus
-		anchors.verticalCenter: parent.verticalCenter
+
-		clip: sidebar.width > 0
+			CustomClippingRect {
-		screen: root.screen
+				id: subMenuWrapper
-		visibilities: root.visibilities
+
+				required property int index
+				required property var modelData
+				property real targetX: 0
+				property real targetY: 0
+
+				function updatePosition() {
+					let sourceItem = modelData.sourceItem;
+					if (!sourceItem || !sourceItem.parent)
+						return;
+
+					let mapped = sourceItem.mapToItem(root, 0, -Appearance.padding.small);
+
+					let rightX = mapped.x + modelData.sourceWidth + Config.barConfig.border;
+					let leftX = mapped.x - implicitWidth - Config.barConfig.border;
+
+					if (rightX + implicitWidth > root.width) {
+						targetX = leftX;
+					} else {
+						targetX = rightX;
 					}
 
-	Modules.Wrapper {
+					targetY = mapped.y;
+
+					if (targetY + implicitHeight > root.height) {
+						targetY = root.height - implicitHeight;
+					}
+					if (targetY < 0)
+						targetY = 0;
+				}
+
+				implicitHeight: subMenuContent.implicitHeight + Appearance.padding.small * 2
+				implicitWidth: subMenuContent.implicitWidth + Appearance.padding.small * 2
+				radius: Appearance.rounding.normal
+				x: targetX
+				y: targetY
+
+				Behavior on implicitHeight {
+					Anim {
+					}
+				}
+				Behavior on implicitWidth {
+					Anim {
+					}
+				}
+
+				Component.onCompleted: {
+					updatePosition();
+				}
+				onImplicitHeightChanged: updatePosition()
+				onImplicitWidthChanged: updatePosition()
+
+				SysPopouts.SubMenu {
+					id: subMenuContent
+
+					anchors.centerIn: parent
+					handle: subMenuWrapper.modelData.handle
+					level: subMenuWrapper.index + 1
+					popouts: root.popouts.state
+					screen: root.screen
+				}
+			}
+		}
+	}
+
+	Modules.ClipWrapper {
 		id: popouts
 
 		anchors.top: parent.top
 		screen: root.screen
-		x: {
-			const off = currentCenter - nonAnimWidth / 2;
-			const diff = root.width - Math.floor(off + nonAnimWidth);
-			if (diff < 0)
-				return off + diff;
-			return Math.floor(Math.max(off, 0));
-		}
 	}
 
 	Toasts.Toasts {
@@ -96,6 +189,7 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
+		sidebarPanel: sidebar
 		visibilities: root.visibilities
 	}
 
@@ -119,13 +213,34 @@ Item {
 		visibilities: root.visibilities
 	}
 
+	Item {
+		id: dashboardWrapper
+
+		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
+
+		anchors.right: parent.right
+		anchors.top: parent.top
+		clip: true
+		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
+		implicitWidth: dashboard.implicitWidth
+
+		Behavior on offsetScale {
+			Anim {
+				duration: Appearance.anim.durations.expressiveDefaultSpatial
+				easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+			}
+		}
+
 		Dashboard.Wrapper {
 			id: dashboard
 
 			anchors.right: parent.right
 			anchors.top: parent.top
+			anchors.topMargin: (-implicitHeight - 5) * offsetScale
+			offsetScale: dashboardWrapper.offsetScale
 			visibilities: root.visibilities
 		}
+	}
 
 	Sidebar.Wrapper {
 		id: sidebar
@@ -137,15 +252,26 @@ Item {
 		visibilities: root.visibilities
 	}
 
+	Item {
+		id: settingsWrapper
+
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		clip: true
+		implicitHeight: settings.implicitHeight * (1 - settings.offsetScale)
+		implicitWidth: settings.implicitWidth
+
 		Settings.Wrapper {
 			id: settings
 
 			anchors.horizontalCenter: parent.horizontalCenter
 			anchors.top: parent.top
+			// anchors.centerIn: parent
 			panels: root
 			screen: root.screen
 			visibilities: root.visibilities
 		}
+	}
 
 	Dock.Wrapper {
 		id: dock

Drawers/Windows.qml

@@ -3,8 +3,10 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Effects
 import Quickshell
+import Quickshell.Io
 import Quickshell.Wayland
 import Quickshell.Hyprland
+import ZShell.Blobs
 import qs.Daemons
 import qs.Components
 import qs.Modules
@@ -62,7 +64,7 @@ Variants {
 
 				height: win.height - bar.implicitHeight - Config.barConfig.border
 				intersection: Intersection.Xor
-				regions: popoutRegions.instances
+				regions: [...popoutRegions.instances, ...subMenuRegions.instances]
 				width: win.width - Config.barConfig.border * 2
 				x: Config.barConfig.border
 				y: bar.implicitHeight
@@ -91,6 +93,22 @@ Variants {
 				}
 			}
 
+			Variants {
+				id: subMenuRegions
+
+				model: panels.traySubmenus.children
+
+				Region {
+					required property Item modelData
+
+					height: modelData.height
+					intersection: Intersection.Subtract
+					width: modelData.width
+					x: modelData.x + panels.traySubmenus.x + Config.barConfig.border
+					y: modelData.y + panels.traySubmenus.y + bar.implicitHeight
+				}
+			}
+
 			HyprlandFocusGrab {
 				id: focusGrab
 
@@ -126,6 +144,14 @@ Variants {
 				Component.onCompleted: Visibilities.load(scope.modelData, this)
 			}
 
+			IpcHandler {
+				function toggleLauncher(fix: string): void {
+					visibilities.launcher = !visibilities.launcher;
+				}
+
+				target: "visibilities"
+			}
+
 			Binding {
 				property: "bar"
 				target: visibilities
@@ -144,16 +170,165 @@ Variants {
 					shadowEnabled: true
 				}
 
-				Border {
+				BlobGroup {
-					bar: bar
+					id: blobGroup
-					visibilities: visibilities
+
+					color: DynamicColors.palette.m3surface
+					smoothing: Config.barConfig.smoothing
+
+					Behavior on color {
+						CAnim {
+						}
+					}
 				}
 
-				Backgrounds {
+				BlobInvertedRect {
-					bar: bar
+					anchors.fill: parent
-					panels: panels
+					anchors.margins: -50
-					visibilities: visibilities
+					borderBottom: Config.barConfig.border - anchors.margins
-					z: 1
+					borderLeft: Config.barConfig.border - anchors.margins
+					borderRight: Config.barConfig.border - anchors.margins
+					borderTop: bar.implicitHeight - anchors.margins
+					group: blobGroup
+					radius: Config.barConfig.rounding
+				}
+
+				PanelBg {
+					id: dashBg
+
+					property real extraHeight: 0.2
+
+					deformAmount: 0.06
+					implicitHeight: panels.dashboard.height * (1 + extraHeight)
+					implicitWidth: panels.dashboard.width
+					panel: panels.dashboardWrapper
+					radius: Appearance.rounding.normal
+					x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
+					y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
+				}
+
+				PanelBg {
+					id: launcherBg
+
+					property real extraHeight: 0.2
+
+					deformAmount: 0.06
+					implicitHeight: panels.launcher.height * (1 + extraHeight)
+					panel: panels.launcher
+					radius: Appearance.rounding.smallest + 5
+					y: panels.launcher.y + bar.implicitHeight
+				}
+
+				PanelBg {
+					id: sidebarBg
+
+					bottomLeftRadius: 0
+					deformAmount: 0.04
+					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
+					implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
+					panel: panels.sidebar
+				}
+
+				PanelBg {
+					id: osdBg
+
+					deformAmount: 0.1
+					implicitHeight: panels.osd.height
+					implicitWidth: panels.osd.width
+					panel: panels.osdWrapper
+					radius: 20
+					x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
+					y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
+				}
+
+				PanelBg {
+					id: notifsBg
+
+					panel: panels.notifications
+				}
+
+				PanelBg {
+					id: utilsBg
+
+					deformAmount: panels.sidebar.visible ? (0.1) : (0.1)
+					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
+					panel: panels.utilities
+					topLeftRadius: 0
+				}
+
+				PanelBg {
+					id: popoutBg
+
+					property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
+
+					deformAmount: panels.popouts.isDetached ? 0.05 : panels.popouts.hasCurrent ? 0.15 : 0.1
+					implicitHeight: panels.popouts.height * (1 + extraHeight)
+					implicitWidth: panels.popouts.width
+					panel: panels.popoutsWrapper
+					radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
+					x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
+					y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
+
+					Behavior on extraHeight {
+						Anim {
+						}
+					}
+				}
+
+				PanelBg {
+					id: resourcesBg
+
+					deformAmount: 0.05
+					implicitHeight: panels.resources.height
+					implicitWidth: panels.resources.width
+					panel: panels.resourcesWrapper
+					radius: Appearance.rounding.normal
+					x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
+					y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
+				}
+
+				PanelBg {
+					id: settingsBg
+
+					property real extraHeight: 0.2
+
+					deformAmount: 0.03
+					implicitHeight: panels.settings.height * (1 + extraHeight)
+					implicitWidth: panels.settings.width
+					panel: panels.settings
+					radius: Appearance.rounding.large
+					topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
+					topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
+					x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
+					y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight
+				}
+
+				PanelBg {
+					id: dockBg
+
+					deformAmount: 0.08
+					panel: panels.dock
+					radius: Appearance.rounding.normal
+				}
+
+				PanelBg {
+					id: drawingBg
+
+					deformAmount: 0.08
+					panel: panels.drawing
+					radius: Appearance.rounding.normal
+				}
+
+				Repeater {
+					model: panels.traySubmenus.children
+
+					PanelBg {
+						required property Item modelData
+
+						deformAmount: 0.1
+						panel: modelData
+						radius: 20 * Appearance.rounding.scale
+					}
 				}
 			}
 
@@ -195,6 +370,37 @@ Variants {
 					drawingItem: drawing
 					screen: scope.modelData
 					visibilities: visibilities
+
+					dashboard.transform: Matrix4x4 {
+						matrix: dashBg.deformMatrix
+					}
+					dock.transform: Matrix4x4 {
+						matrix: dockBg.deformMatrix
+					}
+					launcher.transform: Matrix4x4 {
+						matrix: launcherBg.deformMatrix
+					}
+					notifications.transform: Matrix4x4 {
+						matrix: notifsBg.deformMatrix
+					}
+					osd.transform: Matrix4x4 {
+						matrix: osdBg.deformMatrix
+					}
+					popouts.transform: Matrix4x4 {
+						matrix: popoutBg.deformMatrix
+					}
+					resources.transform: Matrix4x4 {
+						matrix: resourcesBg.deformMatrix
+					}
+					settings.transform: Matrix4x4 {
+						matrix: settingsBg.deformMatrix
+					}
+					sidebar.transform: Matrix4x4 {
+						matrix: sidebarBg.deformMatrix
+					}
+					utilities.transform: Matrix4x4 {
+						matrix: utilsBg.deformMatrix
+					}
 				}
 
 				BarLoader {
@@ -203,10 +409,24 @@ Variants {
 					anchors.left: parent.left
 					anchors.right: parent.right
 					popouts: panels.popouts
+					popoutsWrapper: panels.popoutsWrapper
 					screen: scope.modelData
 					visibilities: visibilities
 				}
 			}
 		}
 	}
+
+	component PanelBg: BlobRect {
+		property real deformAmount: 0.15
+		required property Item panel
+
+		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
+		group: blobGroup
+		implicitHeight: panel.height
+		implicitWidth: panel.width
+		radius: Appearance.rounding.smallest
+		x: panel.x + Config.barConfig.border
+		y: panel.y + bar.implicitHeight
+	}
 }

Greeter/Helpers/SystemUsage.qml

@@ -346,7 +346,6 @@ Singleton {
 
 		stdout: StdioCollector {
 			onStreamFinished: {
-				console.log("this is running");
 				if (root.gpuType === "GENERIC") {
 					const percs = text.trim().split("\n");
 					const sum = percs.reduce((acc, d) => acc + parseInt(d, 10), 0);

Greeter/Helpers/Users.qml

@@ -7,23 +7,30 @@ import QtQuick
 Singleton {
 	id: root
 
-	// The list of users that can log in graphically
+	readonly property string defaultUserFile: "/etc/zshell-greeter/default-user"
-	// Each user object has: username, uid, home, shell, gecos (full name), face (avatar path)
+	property int selectedIndex: 0
+	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
+	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
 	property var users: []
 
-	// The currently selected user index
+	function saveDefaultUser(): void {
-	property int selectedIndex: 0
+		if (selectedUser) {
+			defaultUserStorage.setText(selectedUser.username);
+		}
+	}
 
-	// The currently selected user object (or null if none)
+	function selectNext(): void {
-	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
+		if (users.length === 0)
+			return;
+		selectedIndex = (selectedIndex + 1) % users.length;
+	}
 
-	// Convenience property for the selected username
+	function selectPrevious(): void {
-	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
+		if (users.length === 0)
+			return;
+		selectedIndex = (selectedIndex - 1 + users.length) % users.length;
+	}
 
-	// Path to store the default user preference
-	readonly property string defaultUserFile: "/etc/zshell-greeter/default-user"
-
-	// Select a user by username
 	function selectUser(username: string): bool {
 		for (let i = 0; i < users.length; i++) {
 			if (users[i].username === username) {
@@ -34,28 +41,6 @@ Singleton {
 		return false;
 	}
 
-	// Select the next user in the list (wraps around)
-	function selectNext(): void {
-		if (users.length === 0)
-			return;
-		selectedIndex = (selectedIndex + 1) % users.length;
-	}
-
-	// Select the previous user in the list (wraps around)
-	function selectPrevious(): void {
-		if (users.length === 0)
-			return;
-		selectedIndex = (selectedIndex - 1 + users.length) % users.length;
-	}
-
-	// Save the current user as the default for next login
-	function saveDefaultUser(): void {
-		if (selectedUser) {
-			defaultUserStorage.setText(selectedUser.username);
-		}
-	}
-
-	// Process to fetch the list of graphical users
 	Process {
 		id: userLister
 
@@ -67,13 +52,10 @@ Singleton {
 				try {
 					root.users = JSON.parse(text);
 
-					// If we have users and no selection yet, try to select the default user
 					if (root.users.length > 0) {
-						// Try to load the default user
 						if (defaultUserStorage.loaded) {
 							const defaultUsername = defaultUserStorage.text().trim();
 							if (defaultUsername && !root.selectUser(defaultUsername)) {
-								// Default user not found, select first user
 								root.selectedIndex = 0;
 							}
 						} else {
@@ -87,15 +69,14 @@ Singleton {
 		}
 	}
 
-	// FileView for persisting the default user
 	FileView {
 		id: defaultUserStorage
 
 		path: root.defaultUserFile
 		preload: true
 
+		onLoadFailed: {}
 		onLoaded: {
-			// If users are already loaded, try to select the default user
 			if (root.users.length > 0) {
 				const defaultUsername = text().trim();
 				if (defaultUsername) {
@@ -103,10 +84,5 @@ Singleton {
 				}
 			}
 		}
-
-		onLoadFailed: {
-			// File doesn't exist yet, that's fine - we'll create it on first save
-			console.log("No default user file found, will use first user");
-		}
 	}
 }

Greeter/UserDock.qml

@@ -67,6 +67,7 @@ ColumnLayout {
 
 			anchors.fill: parent
 			clip: true
+			currentIndex: root.greeter.selectedUser ? root.greeter.users.indexOf(root.greeter.selectedUser) : -1
 			highlightFollowsCurrentItem: false
 			model: root.greeter.users
 			spacing: Appearance.spacing.small
@@ -84,7 +85,7 @@ ColumnLayout {
 
 				StateLayer {
 					function onClicked(): void {
-						users.currentIndex = index;
+						root.greeter.selectUser(modelData.username);
 					}
 				}
 
@@ -95,13 +96,25 @@ ColumnLayout {
 					anchors.margins: Appearance.padding.normal
 					spacing: Appearance.spacing.normal
 
+					CustomClippingRect {
+						Layout.preferredHeight: 50
+						Layout.preferredWidth: 50
+						radius: Appearance.rounding.full
+
 						MaterialIcon {
+							anchors.centerIn: parent
 							color: user.index === users.currentIndex ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurfaceVariant
 							fill: 1
 							font.pointSize: Appearance.font.size.extraLarge
 							text: modelData.kind === "x11" ? "tv" : "account_circle"
 						}
 
+						CachingImage {
+							anchors.fill: parent
+							path: modelData.face
+						}
+					}
+
 					ColumnLayout {
 						Layout.fillWidth: true
 						spacing: Appearance.spacing.small / 2

Greeter/scripts/get-users

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import glob
 import json
 import os
 import pwd
@@ -17,21 +18,59 @@ INVALID_SHELLS = {
 
 # Minimum UID for regular users (typically 1000 on most Linux distributions)
 MIN_UID = 1000
+GREETER_IMAGES_DIR = "/etc/zshell-greeter/images"
 
 
 def get_face_path(home: str, username: str) -> str:
     """Get the path to the user's face/avatar image if it exists."""
+    greeter_candidates = [
+        os.path.join(GREETER_IMAGES_DIR, f"{username}.face"),
+        os.path.join(GREETER_IMAGES_DIR, f"{username}.face.icon"),
+    ]
+
+    for path in greeter_candidates:
+        if os.path.isfile(path):
+            return path
+
+    for path in sorted(glob.glob(os.path.join(GREETER_IMAGES_DIR, f"{username}.*"))):
+        if os.path.isfile(path):
+            return path
+
+    direct_path = os.path.join(GREETER_IMAGES_DIR, username)
+    if os.path.isfile(direct_path):
+        return direct_path
+
+    accountsservice_user = f"/var/lib/AccountsService/users/{username}"
+    if os.path.isfile(accountsservice_user):
+        try:
+            with open(accountsservice_user, "r", encoding="utf-8") as handle:
+                for line in handle:
+                    if line.startswith("Icon="):
+                        icon_path = line.split("=", 1)[1].strip()
+                        if icon_path:
+                            if not os.path.isabs(icon_path):
+                                icon_path = os.path.join("/var/lib/AccountsService/icons", icon_path)
+                            if os.path.isfile(icon_path):
+                                return icon_path
+        except OSError:
+            pass
+
     # Check common locations for user avatars
     candidates = [
         os.path.join(home, ".face"),
         os.path.join(home, ".face.icon"),
         f"/var/lib/AccountsService/icons/{username}",
+        f"/usr/share/pixmaps/faces/{username}",
     ]
 
     for path in candidates:
         if os.path.isfile(path):
             return path
 
+    for path in sorted(glob.glob(f"/var/lib/AccountsService/icons/{username}.*")):
+        if os.path.isfile(path):
+            return path
+
     return ""
 
 

Helpers/GameMode.qml

@@ -0,0 +1,72 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import ZShell
+import qs.Config
+
+Singleton {
+	id: root
+
+	property alias enabled: props.enabled
+
+	function setHyprConf(): void {
+		Hypr.extras.applyOptions({
+			"animations.enabled": 0,
+			"decoration.shadow.enabled": 0,
+			"decoration.blur.enabled": 0,
+			"general.border_size": 0,
+			"decoration.rounding": 0
+		});
+	}
+
+	onEnabledChanged: {
+		if (enabled) {
+			setHyprConf();
+			if (Config.utilities.toasts.gameModeChanged)
+				Toaster.toast(qsTr("Game mode enabled"), qsTr("Disabled Hyprland animations, blur, shadows and corner radius"), "gamepad");
+		} else {
+			Hypr.extras.message("reload");
+			if (Config.utilities.toasts.gameModeChanged)
+				Toaster.toast(qsTr("Game mode disabled"), qsTr("Hyprland settings restored"), "gamepad");
+		}
+	}
+
+	PersistentProperties {
+		id: props
+
+		property bool enabled: Hypr.options["animations:enabled"] === 0
+
+		reloadableId: "gamemode"
+	}
+
+	Connections {
+		function onConfigReloaded(): void {
+			if (props.enabled)
+				root.setHyprConf();
+		}
+
+		target: Hypr
+	}
+
+	IpcHandler {
+		function disable(): void {
+			props.enabled = false;
+		}
+
+		function enable(): void {
+			props.enabled = true;
+		}
+
+		function isEnabled(): bool {
+			return props.enabled;
+		}
+
+		function toggle(): void {
+			props.enabled = !props.enabled;
+		}
+
+		target: "gameMode"
+	}
+}

Helpers/Network.qml

@@ -1,11 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import Quickshell.Networking
-
-Singleton {
-	id: root
-
-	property NetworkDevice activeDevice: devices.find(d => d.connected)
-	property list<NetworkDevice> devices: Networking.devices.values
-}

Helpers/Picker.qml

@@ -66,7 +66,8 @@ MouseArea {
 
 	function save(): void {
 		const tmpfile = Qt.resolvedUrl(`/tmp/zshell-picker-${Quickshell.processId}-${Date.now()}.png`);
-		ZShellIo.saveItem(screencopy, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => Quickshell.execDetached(["swappy", "-f", path]));
+		const cmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--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();
 	}
 

Helpers/PixelSnap.qml

@@ -0,0 +1,6 @@
+pragma Singleton
+
+import Quickshell
+
+Singleton {
+}

Helpers/Recorder.qml

@@ -0,0 +1,41 @@
+// pragma Singleton
+//
+// import Quickshell
+// import QtQuick
+//
+// Singleton {
+// 	id: root
+//
+// 	function start(extraArgs = []): void {
+// 		needsStart = true;
+// 		startArgs = extraArgs;
+// 		checkProc.running = true;
+// 	}
+//
+// 	PersistentProperties {
+// 		id: props
+//
+// 		property real elapsed: 0
+// 		property bool paused: false
+// 		property bool running: false
+//
+// 		reloadableId: "recorder"
+// 	}
+//
+// 	Process {
+// 		id: checkProc
+//
+// 		command: ["pidof", "gpu-screen-recorder"]
+// 		running: true
+//
+// 		onExited: code => {
+// 			props.running = code === 0;
+//
+// 			if (code === 0) {
+// 				if (root.needsStop) {
+// 					Quickshell.execDetached(["zshell-cli"]);
+// 				}
+// 			}
+// 		}
+// 	}
+// }

Helpers/SystemUsage.qml

@@ -81,6 +81,9 @@ Singleton {
 			meminfo.reload();
 			if (root.gpuType === "GENERIC")
 				gpuUsage.running = true;
+
+			if (root.gpuType === "GENERIC" && root.gpuMemTotal === 0)
+				oneshotMemAmd.running = true;
 		}
 	}
 
@@ -303,6 +306,26 @@ Singleton {
 		}
 	}
 
+	Process {
+		id: oneshotMemAmd
+
+		command: ["sh", "-c", "cat /sys/class/drm/card*/device/mem_info_vram_total"]
+		running: root.gpuType === "GENERIC" && root.gpuMemTotal === 0
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				const values = text.trim().split("\n").map(v => parseInt(v, 10)).filter(v => Number.isFinite(v));
+
+				if (values.length > 0) {
+					const totalBytes = values.reduce((a, b) => a + b, 0);
+					root.gpuMemTotal = totalBytes / (1024 * 1024);
+				}
+
+				oneshotMemAmd.running = false;
+			}
+		}
+	}
+
 	Process {
 		id: gpuUsageNvidia
 
@@ -342,15 +365,45 @@ Singleton {
 	Process {
 		id: gpuUsage
 
-		command: root.gpuType === "GENERIC" ? ["sh", "-c", "cat /sys/class/drm/card*/device/gpu_busy_percent"] : ["echo"]
+		command: root.gpuType === "GENERIC" ? ["sh", "-c", "paste -d ' ' /sys/class/drm/card*/device/gpu_busy_percent /sys/class/drm/card*/device/mem_info_vram_used"] : ["echo"]
 
 		stdout: StdioCollector {
 			onStreamFinished: {
-				console.log("this is running");
 				if (root.gpuType === "GENERIC") {
-					const percs = text.trim().split("\n");
+					const lines = text.trim().split("\n");
-					const sum = percs.reduce((acc, d) => acc + parseInt(d, 10), 0);
+
-					root.gpuPerc = sum / percs.length / 100;
+					let percSum = 0;
+					let memSum = 0;
+					let count = 0;
+
+					for (const line of lines) {
+						const parts = line.trim().split(/\s+/);
+						if (parts.length < 2)
+							continue;
+
+						const gpuBusy = parseInt(parts[0], 10);
+						const memUsed = parseInt(parts[1], 10);
+
+						if (!Number.isFinite(gpuBusy) || !Number.isFinite(memUsed))
+							continue;
+
+						percSum += gpuBusy;
+						memSum += memUsed;
+						count++;
+					}
+
+					if (count > 0) {
+						// GPU usage %
+						root.gpuPerc = (percSum / count) / 100;
+
+						// VRAM usage (bytes → MiB → normalized)
+						const memUsedMiB = memSum / (1024 * 1024);
+
+						const newGpuMemUsed = root.gpuMemTotal > 0 ? Math.max(0, Math.min(1, memUsedMiB / root.gpuMemTotal)) : 0;
+
+						if (Math.abs(root.gpuMemUsed - newGpuMemUsed) >= 0.01)
+							root.gpuMemUsed = newGpuMemUsed;
+					}
 				} else {
 					root.gpuPerc = 0;
 					root.gpuTemp = 0;

Helpers/Time.qml

@@ -1,18 +1,23 @@
 pragma Singleton
 
 import Quickshell
+import QtQuick
+import qs.Config
 
 Singleton {
-	readonly property string amPmStr: timeComponents[2] ?? ""
+	id: root
+
 	readonly property date date: clock.date
+	readonly property string dateStr: format(Config.general.dateFormat)
 	property alias enabled: clock.enabled
 	readonly property string hourStr: timeComponents[0] ?? ""
 	readonly property int hours: clock.hours
 	readonly property string minuteStr: timeComponents[1] ?? ""
 	readonly property int minutes: clock.minutes
+	readonly property string secondStr: timeComponents[2] ?? ""
 	readonly property int seconds: clock.seconds
 	readonly property list<string> timeComponents: timeStr.split(":")
-	readonly property string timeStr: format("hh:mm")
+	readonly property string timeStr: format("hh:mm:ss")
 
 	function format(fmt: string): string {
 		return Qt.formatDateTime(clock.date, fmt);

Helpers/Updates.qml

@@ -5,15 +5,19 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import qs.Paths
+import qs.Config
 
 Singleton {
 	id: root
 
 	property int availableUpdates: 0
+	property string cmd: ""
 	property bool commandReady
 	property bool loaded
 	property double now: Date.now()
 	property var updates: ({})
+	property bool updating
+	property string updatingPackage: ""
 
 	function formatUpdateTime(timestamp) {
 		const diffMs = root.now - timestamp;
@@ -33,6 +37,22 @@ Singleton {
 		return Qt.formatDateTime(new Date(timestamp), "dd hh:mm");
 	}
 
+	function performPackageUpdate(pkg: string): void {
+		if (root.cmd === "pacman")
+			pkgUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Sy", pkg];
+		else
+			pkgUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Sy", pkg];
+		pkgUpdateProc.running = true;
+	}
+
+	function performSystemUpdate(): void {
+		if (root.cmd === "pacman")
+			sysUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Syu"];
+		else
+			sysUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Syu"];
+		sysUpdateProc.running = true;
+	}
+
 	onUpdatesChanged: {
 		if (!root.loaded)
 			return;
@@ -44,12 +64,13 @@ Singleton {
 	Timer {
 		interval: 1
 		repeat: true
-		running: true
+		running: Config.services.updates
 
 		onTriggered: {
 			if (!root.loaded || !root.commandReady)
 				return;
 
+			if (Config.services.updates)
 				updatesProc.running = true;
 			interval = 5000;
 		}
@@ -66,6 +87,33 @@ Singleton {
 	Process {
 		id: cmdDetect
 
+		command: ["sh", "-c", "command -v checkupdates || command -v yay || command -v paru"]
+		running: true
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				const cmd = this.text.trim();
+				let helper;
+
+				if (cmd.length > 0) {
+					helper = cmd.split("/").pop();
+				} else {
+					helper = "pacman";
+				}
+
+				if (helper === "checkupdates") {
+					updatesProc.command = [helper];
+				} else {
+					updatesProc.command = [helper, "-Qu"];
+				}
+				root.commandReady = true;
+			}
+		}
+	}
+
+	Process {
+		id: updateCmdDetect
+
 		command: ["sh", "-c", "command -v yay || command -v paru"]
 		running: true
 
@@ -80,8 +128,7 @@ Singleton {
 					helper = "pacman";
 				}
 
-				updatesProc.command = [helper, "-Qu"];
+				root.cmd = helper;
-				root.commandReady = true;
 			}
 		}
 	}
@@ -109,6 +156,44 @@ Singleton {
 		}
 	}
 
+	Process {
+		id: sysUpdateProc
+
+		command: []
+		running: false
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				root.updating = false;
+			}
+		}
+
+		onRunningChanged: {
+			if (running)
+				root.updating = true;
+		}
+	}
+
+	Process {
+		id: pkgUpdateProc
+
+		command: []
+		running: false
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				root.updating = false;
+			}
+		}
+
+		onRunningChanged: {
+			if (running) {
+				root.updatingPackage = command[command.length - 1];
+				root.updating = true;
+			}
+		}
+	}
+
 	Timer {
 		id: saveTimer
 

Helpers/Wallpapers.qml

@@ -14,6 +14,7 @@ Searcher {
 	property string actualCurrent: WallpaperPath.currentWallpaperPath
 	readonly property string current: showPreview ? previewPath : actualCurrent
 	property string previewPath
+	property bool recentlyChanged
 	property bool showPreview: false
 
 	function preview(path: string): void {
@@ -27,6 +28,8 @@ Searcher {
 		actualCurrent = path;
 		WallpaperPath.currentWallpaperPath = path;
 		Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]);
+		if (Config.general.color.schemeGeneration)
+			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);
 	}
 
 	function stopPreview(): void {

Modules/AudioWidget.qml

@@ -1,96 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Services.Pipewire
-import qs.Daemons
-import qs.Modules
-import qs.Config
-import qs.Components
-
-CustomRect {
-	id: root
-
-	property color barColor: DynamicColors.palette.m3primary
-	property color textColor: DynamicColors.palette.m3onSurface
-
-	color: DynamicColors.tPalette.m3surfaceContainer
-	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
-	implicitWidth: 150
-	radius: Appearance.rounding.full
-
-	Behavior on implicitWidth {
-		NumberAnimation {
-			duration: 300
-			easing.type: Easing.OutCubic
-		}
-	}
-
-	Component.onCompleted: console.log(root.height, root.implicitHeight)
-
-	RowLayout {
-		id: layout
-
-		anchors.left: parent.left
-		anchors.leftMargin: Appearance.padding.small
-		anchors.verticalCenter: parent.verticalCenter
-		width: root.implicitWidth - Appearance.padding.small * 3
-
-		MaterialIcon {
-			Layout.alignment: Qt.AlignVCenter
-			animate: true
-			color: Audio.muted ? DynamicColors.palette.m3error : root.textColor
-			font.pointSize: Appearance.font.size.larger
-			text: Audio.muted ? "volume_off" : "volume_up"
-		}
-
-		CustomRect {
-			Layout.fillWidth: true
-			color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
-			implicitHeight: 4
-			radius: 20
-
-			CustomRect {
-				id: sinkVolumeBar
-
-				color: Audio.muted ? DynamicColors.palette.m3error : root.barColor
-				implicitWidth: parent.width * (Audio.volume ?? 0)
-				radius: parent.radius
-
-				anchors {
-					bottom: parent.bottom
-					left: parent.left
-					top: parent.top
-				}
-			}
-		}
-
-		MaterialIcon {
-			Layout.alignment: Qt.AlignVCenter
-			animate: true
-			color: (Audio.sourceMuted ?? false) ? DynamicColors.palette.m3error : root.textColor
-			font.pointSize: Appearance.font.size.larger
-			text: Audio.sourceMuted ? "mic_off" : "mic"
-		}
-
-		CustomRect {
-			Layout.fillWidth: true
-			color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
-			implicitHeight: 4
-			radius: 20
-
-			CustomRect {
-				id: sourceVolumeBar
-
-				color: (Audio.sourceMuted ?? false) ? DynamicColors.palette.m3error : root.barColor
-				implicitWidth: parent.width * (Audio.sourceVolume ?? 0)
-				radius: parent.radius
-
-				anchors {
-					bottom: parent.bottom
-					left: parent.left
-					top: parent.top
-				}
-			}
-		}
-	}
-}

Modules/Bar/Bar.qml

@@ -7,7 +7,8 @@ import qs.Components
 import qs.Modules
 import qs.Config
 import qs.Helpers
-import qs.Modules.UPower
+import qs.Modules.SysTray
+import qs.Modules.SysTray.Widgets
 import qs.Modules.Network
 import qs.Modules.Updates
 
@@ -15,6 +16,7 @@ RowLayout {
 	id: root
 
 	required property Wrapper popouts
+	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
 	readonly property int vPadding: 6
 	required property PersistentProperties visibilities
@@ -31,6 +33,24 @@ RowLayout {
 		if (visibilities.sidebar || visibilities.dashboard || visibilities.resources || visibilities.settings)
 			return;
 
+		if (ch.id === "tray") {
+			const tray = ch.item;
+			const localPos = tray.mapFromItem(root, x, height / 2);
+			const sub = tray.getHoveredSubItem(localPos.x, localPos.y);
+			if (sub) {
+				popouts.currentName = sub.id;
+				popouts.currentCenter = Qt.binding(() => {
+					const centerX = sub.item.mapToItem(root, sub.item.width / 2, 0).x;
+					return centerX;
+				});
+				popouts.hasCurrent = true;
+				return;
+			}
+
+			if (!popouts.currentName.startsWith("traymenu"))
+				popouts.hasCurrent = false;
+		}
+
 		const id = ch.id;
 		const top = ch.x;
 		const item = ch.item;
@@ -93,15 +113,6 @@ RowLayout {
 				}
 			}
 
-			DelegateChoice {
-				roleValue: "audio"
-
-				delegate: WrappedLoader {
-					sourceComponent: AudioWidget {
-					}
-				}
-			}
-
 			DelegateChoice {
 				roleValue: "tray"
 
@@ -165,15 +176,6 @@ RowLayout {
 				}
 			}
 
-			DelegateChoice {
-				roleValue: "upower"
-
-				delegate: WrappedLoader {
-					sourceComponent: UPowerWidget {
-					}
-				}
-			}
-
 			DelegateChoice {
 				roleValue: "network"
 

Modules/Bar/BarLoader.qml

@@ -8,7 +8,8 @@ import qs.Components
 import qs.Modules
 import qs.Config
 import qs.Helpers
-import qs.Modules.UPower
+import qs.Modules.SysTray
+import qs.Modules.SysTray.Widgets
 import qs.Modules.Network
 
 Item {
@@ -19,6 +20,7 @@ Item {
 	property bool isHovered
 	readonly property int padding: Math.max(Appearance.padding.smaller, Config.barConfig.border)
 	required property Wrapper popouts
+	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
 	readonly property bool shouldBeVisible: (!Config.barConfig.autoHide || visibilities.bar || isHovered)
 	readonly property int vPadding: 6
@@ -75,6 +77,7 @@ Item {
 		sourceComponent: Bar {
 			height: root.contentHeight
 			popouts: root.popouts
+			popoutsWrapper: root.popoutsWrapper
 			screen: root.screen
 			visibilities: root.visibilities
 		}

Modules/ClipWrapper.qml

@@ -0,0 +1,61 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import qs.Components
+import qs.Config
+
+Item {
+	id: root
+
+	readonly property alias content: content
+	property real offsetScale: y > 0 || content.hasCurrent ? 0 : 1
+	required property ShellScreen screen
+
+	clip: true
+	implicitHeight: content.implicitHeight * (1 - offsetScale)
+	implicitWidth: content.implicitWidth
+	visible: width > 0 && height > 0
+	x: {
+		if (content.isDetached)
+			return (parent.width - content.nonAnimWidth) / 2;
+
+		const off = content.currentCenter - Config.barConfig.border - content.nonAnimWidth / 2;
+		const diff = parent.width - Math.floor(off + content.nonAnimWidth);
+		if (diff < 0)
+			return off + diff;
+		return Math.floor(Math.max(off, 0));
+	}
+	y: content.isDetached ? (parent.height - content.nonAnimHeight) / 2 : 0
+
+	Behavior on offsetScale {
+		Anim {
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+		}
+	}
+	Behavior on x {
+		enabled: root.offsetScale < 1
+
+		Anim {
+			duration: content.animLength
+			easing.bezierCurve: content.animCurve
+		}
+	}
+	Behavior on y {
+		Anim {
+			duration: content.animLength
+			easing.bezierCurve: content.animCurve
+		}
+	}
+
+	Wrapper {
+		id: content
+
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		anchors.topMargin: (-implicitHeight - 5) * root.offsetScale
+		offsetScale: root.offsetScale
+		screen: root.screen
+	}
+}

Modules/Clock.qml

@@ -3,7 +3,7 @@ import QtQuick
 import QtQuick.Layouts
 import qs.Config
 import qs.Modules
-import qs.Helpers as Helpers
+import qs.Helpers
 import qs.Components
 
 CustomRect {
@@ -23,6 +23,7 @@ CustomRect {
 
 		anchors.centerIn: parent
 		color: root.visibilities.dashboard ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+		font: Appearance.font.family.mono
 		text: Time.dateStr
 
 		Behavior on color {

Modules/Content.qml

@@ -7,7 +7,7 @@ import qs.Config
 import qs.Components
 import qs.Modules.WSOverview
 import qs.Modules.Network
-import qs.Modules.UPower
+import qs.Modules.SysTray.Popouts
 import qs.Modules.Updates
 
 Item {
@@ -15,7 +15,8 @@ Item {
 
 	readonly property Item current: currentPopout?.item ?? null
 	readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null
-	required property Item wrapper
+	required property PopoutState popouts
+	required property ShellScreen screen
 
 	implicitHeight: (currentPopout?.implicitHeight ?? 0) + 5 * 2
 	implicitWidth: (currentPopout?.implicitWidth ?? 0) + 5 * 2
@@ -49,40 +50,32 @@ Item {
 
 				Connections {
 					function onHasCurrentChanged(): void {
-						if (root.wrapper.hasCurrent && trayMenu.shouldBeActive) {
+						if (root.popouts.hasCurrent && trayMenu.shouldBeActive) {
 							trayMenu.sourceComponent = null;
 							trayMenu.sourceComponent = trayMenuComponent;
 						}
 					}
 
-					target: root.wrapper
+					target: root.popouts
 				}
 
 				Component {
 					id: trayMenuComponent
 
 					TrayMenuPopout {
-						popouts: root.wrapper
+						popouts: root.popouts
+						screen: root.screen
 						trayItem: trayMenu.modelData.menu
 					}
 				}
 			}
 		}
 
-		Popout {
-			name: "overview"
-
-			sourceComponent: OverviewPopout {
-				screen: root.wrapper.screen
-				wrapper: root.wrapper
-			}
-		}
-
 		Popout {
 			name: "upower"
 
 			sourceComponent: UPowerPopout {
-				wrapper: root.wrapper
+				wrapper: root.popouts
 			}
 		}
 
@@ -90,7 +83,7 @@ Item {
 			name: "network"
 
 			sourceComponent: NetworkPopout {
-				wrapper: root.wrapper
+				wrapper: root.popouts
 			}
 		}
 
@@ -98,7 +91,7 @@ Item {
 			name: "updates"
 
 			sourceComponent: UpdatesPopout {
-				wrapper: root.wrapper
+				wrapper: root.popouts
 			}
 		}
 	}
@@ -107,12 +100,13 @@ Item {
 		id: popout
 
 		required property string name
-		readonly property bool shouldBeActive: root.wrapper.currentName === name
+		readonly property bool shouldBeActive: root.popouts.currentName === name
 
 		active: false
-		anchors.horizontalCenter: parent.horizontalCenter
+		// anchors.horizontalCenter: parent.horizontalCenter
-		anchors.top: parent.top
+		// anchors.top: parent.top
-		anchors.topMargin: 5
+		// anchors.topMargin: 5
+		anchors.centerIn: parent
 		opacity: 0
 		scale: 0.8
 

Modules/DashWidget.qml

@@ -1,31 +0,0 @@
-import Quickshell
-import QtQuick
-import qs.Config
-import qs.Helpers
-import qs.Components
-
-CustomRect {
-	id: root
-
-	required property PersistentProperties visibilities
-
-	anchors.bottom: parent.bottom
-	anchors.bottomMargin: 6
-	anchors.top: parent.top
-	anchors.topMargin: 6
-	color: DynamicColors.tPalette.m3surfaceContainer
-	implicitWidth: 40
-	radius: Appearance.rounding.full
-
-	StateLayer {
-		onClicked: {
-			root.visibilities.dashboard = !root.visibilities.dashboard;
-		}
-	}
-
-	MaterialIcon {
-		anchors.centerIn: parent
-		color: DynamicColors.palette.m3onSurface
-		text: "widgets"
-	}
-}

Modules/Dashboard/Wrapper.qml

@@ -15,73 +15,21 @@ Item {
 		reloadableId: "dashboardState"
 	}
 	readonly property real nonAnimHeight: state === "visible" ? (content.item?.nonAnimHeight ?? 0) : 0
+	required property real offsetScale
+	readonly property bool shouldBeActive: root.visibilities.dashboard && Config.dashboard.enabled
 	required property PersistentProperties visibilities
 
-	implicitHeight: 0
+	implicitHeight: content.implicitHeight
-	implicitWidth: content.implicitWidth
+	implicitWidth: content.implicitWidth || 854 // Hard coded fallback for first open
-	visible: height > 0
+	opacity: 1 - offsetScale
-
+	visible: offsetScale < 1
-	states: State {
-		name: "visible"
-		when: root.visibilities.dashboard && Config.dashboard.enabled
-
-		PropertyChanges {
-			root.implicitHeight: content.implicitHeight
-		}
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
-
-			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		}
-	]
-
-	onStateChanged: {
-		if (state === "visible" && timer.running) {
-			timer.triggered();
-			timer.stop();
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: Appearance.anim.durations.extraLarge
-		running: true
-
-		onTriggered: {
-			content.active = Qt.binding(() => (root.visibilities.dashboard && Config.dashboard.enabled) || root.visible);
-			content.visible = true;
-		}
-	}
-
-	CustomClippingRect {
-		anchors.fill: parent
 
 	Loader {
 		id: content
 
-			active: true
+		active: root.shouldBeActive || root.visible
 		anchors.bottom: parent.bottom
 		anchors.horizontalCenter: parent.horizontalCenter
-			visible: false
 
 		sourceComponent: Content {
 			state: root.dashState
@@ -89,4 +37,3 @@ Item {
 		}
 	}
 }
-}

Modules/Dock/Wrapper.qml

@@ -11,97 +11,36 @@ Item {
 	property int contentHeight
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.dock
 	required property PersistentProperties visibilities
 
-	implicitHeight: 0
+	readonly property bool shouldBeActive: visibilities.dock
-	implicitWidth: content.implicitWidth
+	property real offsetScale: shouldBeActive ? 0 : 1
-	visible: height > 0
 
-	Behavior on implicitWidth {
+	visible: offsetScale < 1
+	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: content.implicitHeight
+	implicitWidth: content.implicitWidth || 400
+	opacity: 1 - offsetScale
+
+	Behavior on offsetScale {
 		Anim {
-			duration: Appearance.anim.durations.small
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-		}
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-	}
-
-	onShouldBeActiveChanged: {
-		if (shouldBeActive) {
-			timer.stop();
-			hideAnim.stop();
-			showAnim.start();
-		} else {
-			showAnim.stop();
-			hideAnim.start();
-		}
-	}
-
-	SequentialAnimation {
-		id: showAnim
-
-		Anim {
-			duration: Appearance.anim.durations.small
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
-			property: "implicitHeight"
-			target: root
-			to: root.contentHeight
-		}
-
-		ScriptAction {
-			script: root.implicitHeight = Qt.binding(() => content.implicitHeight)
-		}
-	}
-
-	SequentialAnimation {
-		id: hideAnim
-
-		ScriptAction {
-			script: root.implicitHeight = root.implicitHeight
-		}
-
-		Anim {
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
-			property: "implicitHeight"
-			target: root
-			to: 0
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: Appearance.anim.durations.small
-
-		onRunningChanged: {
-			if (running && !root.shouldBeActive) {
-				content.visible = false;
-				content.active = true;
-			} else {
-				content.active = Qt.binding(() => root.shouldBeActive || root.visible);
-				content.visible = true;
-				if (showAnim.running) {
-					showAnim.stop();
-					showAnim.start();
-				}
-			}
 		}
 	}
 
 	Loader {
 		id: content
 
-		active: false
 		anchors.left: parent.left
 		anchors.top: parent.top
-		visible: false
+
+		active: root.shouldBeActive || root.visible
 
 		sourceComponent: Content {
 			panels: root.panels
 			screen: root.screen
 			visibilities: root.visibilities
-
+		}
-			Component.onCompleted: root.contentHeight = implicitHeight
-		}
-
-		Component.onCompleted: timer.start()
 	}
 }

Modules/Drawing/Wrapper.qml

@@ -12,90 +12,29 @@ Item {
 
 	required property Canvas drawing
 	property bool expanded: true
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property ShellScreen screen
 	readonly property bool shouldBeActive: visibilities.isDrawing
 	required property var visibilities
 
+	anchors.leftMargin: (-implicitWidth - 5) * offsetScale
 	implicitHeight: content.implicitHeight
-	implicitWidth: 0
+	implicitWidth: root.expanded ? content.implicitWidth : icon.implicitWidth
-	visible: width > 0
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	states: [
+	Behavior on implicitWidth {
-		State {
-			name: "hidden"
-			when: !root.shouldBeActive
-
-			PropertyChanges {
-				root.implicitWidth: 0
-			}
-
-			PropertyChanges {
-				icon.opacity: 0
-			}
-
-			PropertyChanges {
-				content.opacity: 0
-			}
-		},
-		State {
-			name: "collapsed"
-			when: root.shouldBeActive && !root.expanded
-
-			PropertyChanges {
-				root.implicitWidth: icon.implicitWidth
-			}
-
-			PropertyChanges {
-				icon.opacity: 1
-			}
-
-			PropertyChanges {
-				content.opacity: 0
-			}
-		},
-		State {
-			name: "visible"
-			when: root.shouldBeActive && root.expanded
-
-			PropertyChanges {
-				root.implicitWidth: content.implicitWidth
-			}
-
-			PropertyChanges {
-				icon.opacity: 0
-			}
-
-			PropertyChanges {
-				content.opacity: 1
-			}
-		}
-	]
-	transitions: [
-		Transition {
-			from: "*"
-			to: "*"
-
-			ParallelAnimation {
 		Anim {
-					easing.bezierCurve: MaterialEasing.expressiveEffects
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-					property: "implicitWidth"
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-					target: root
 		}
-
+	}
+	Behavior on offsetScale {
 		Anim {
-					duration: Appearance.anim.durations.small
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-					property: "opacity"
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-					target: icon
-				}
-
-				Anim {
-					duration: Appearance.anim.durations.small
-					property: "opacity"
-					target: content
 		}
 	}
-		}
-	]
 
 	onVisibleChanged: {
 		if (!visible)
@@ -109,8 +48,12 @@ Item {
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
 		height: content.contentItem.height
-		opacity: 1
+		opacity: root.expanded ? 0 : 1
 
+		Behavior on opacity {
+			Anim {
+			}
+		}
 		sourceComponent: MaterialIcon {
 			font.pointSize: Appearance.font.size.larger
 			text: "arrow_forward_ios"
@@ -122,7 +65,12 @@ Item {
 
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
+		opacity: root.expanded ? 1 : 0
 
+		Behavior on opacity {
+			Anim {
+			}
+		}
 		sourceComponent: Content {
 			drawing: root.drawing
 			visibilities: root.visibilities

Modules/Launcher/Services/Apps.qml

@@ -9,17 +9,19 @@ import qs.Paths
 Searcher {
 	id: root
 
+	readonly property list<string> command: Config.launcher.uwsm ? ["app2unit", "--"] : []
+
 	function launch(entry: DesktopEntry): void {
 		appDb.incrementFrequency(entry.id);
 
 		if (entry.runInTerminal)
 			Quickshell.execDetached({
-				command: ["app2unit", "--", ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command],
+				command: [...root.command, ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command],
 				workingDirectory: entry.workingDirectory
 			});
 		else
 			Quickshell.execDetached({
-				command: ["app2unit", "--", ...entry.command],
+				command: [...root.command, ...entry.command],
 				workingDirectory: entry.workingDirectory
 			});
 	}

Modules/Launcher/Services/SchemeVariants.qml

@@ -26,7 +26,7 @@ Searcher {
 			description: qsTr("Pastel palette with a low chroma.")
 			icon: "android"
 			name: qsTr("Tonal Spot")
-			variant: "tonalspot"
+			variant: "tonal-spot"
 		},
 		Variant {
 			description: qsTr("Hue-shifted, artistic or playful colors.")

Modules/Launcher/Wrapper.qml

@@ -21,55 +21,33 @@ Item {
 	}
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.launcher
 	required property PersistentProperties visibilities
+	readonly property bool shouldBeActive: visibilities.launcher
+	property real offsetScale: shouldBeActive ? 0 : 1
 
-	implicitHeight: 0
-	implicitWidth: content.implicitWidth
-	visible: height > 0
-
-	onMaxHeightChanged: timer.start()
 	onShouldBeActiveChanged: {
 		if (shouldBeActive) {
+			implicitHeight = Qt.binding(() => content.implicitHeight);
 			timer.stop();
-			hideAnim.stop();
-			showAnim.start();
 		} else {
-			showAnim.stop();
+			implicitHeight = implicitHeight;
-			hideAnim.start();
 		}
 	}
 
-	SequentialAnimation {
+	visible: offsetScale < 1
-		id: showAnim
+	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: content.implicitHeight
+	implicitWidth: content.implicitWidth || 400
+	opacity: 1 - offsetScale
 
+	Behavior on offsetScale {
 		Anim {
-			duration: Appearance.anim.durations.small
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-			property: "implicitHeight"
-			target: root
-			to: root.contentHeight
-		}
-
-		ScriptAction {
-			script: root.implicitHeight = Qt.binding(() => content.implicitHeight)
 		}
 	}
 
-	SequentialAnimation {
+	onMaxHeightChanged: timer.start()
-		id: hideAnim
-
-		ScriptAction {
-			script: root.implicitHeight = root.implicitHeight
-		}
-
-		Anim {
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
-			property: "implicitHeight"
-			target: root
-			to: 0
-		}
-	}
 
 	Connections {
 		function onEnabledChanged(): void {
@@ -105,10 +83,6 @@ Item {
 				root.contentHeight = Math.min(root.maxHeight, content.implicitHeight);
 				content.active = Qt.binding(() => root.shouldBeActive || root.visible);
 				content.visible = true;
-				if (showAnim.running) {
-					showAnim.stop();
-					showAnim.start();
-				}
 			}
 		}
 	}
@@ -119,7 +93,6 @@ Item {
 		active: false
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
-		visible: false
 
 		sourceComponent: Content {
 			maxHeight: root.maxHeight

Modules/Lock/IdleMonitors.qml

@@ -8,8 +8,8 @@ import qs.Helpers
 Scope {
 	id: root
 
-	required property Lock lock
 	readonly property bool enabled: !Players.list.some(p => p.isPlaying)
+	required property Lock lock
 
 	function handleIdleAction(action: var): void {
 		if (!action)
@@ -19,6 +19,10 @@ Scope {
 			lock.lock.locked = true;
 		else if (action === "unlock")
 			lock.lock.locked = false;
+		else if (action === "dpms on")
+			Hypr.dispatch('hl.dsp.dpms({ action = "enable" })');
+		else if (action === "dpms off")
+			Hypr.dispatch('hl.dsp.dpms({ action = "disable" })');
 		else if (typeof action === "string")
 			Hypr.dispatch(action);
 		else
@@ -33,6 +37,7 @@ Scope {
 
 			enabled: root.enabled && modelData.timeout > 0 ? true : false
 			timeout: modelData.timeout
+
 			onIsIdleChanged: root.handleIdleAction(isIdle ? modelData.idleAction : modelData.activeAction)
 		}
 	}

Modules/Lock/LockSurface.qml

@@ -150,6 +150,7 @@ WlSessionLockSurface {
 		id: background
 
 		anchors.fill: parent
+		fillMode: Image.PreserveAspectCrop
 		source: WallpaperPath.lockscreenBg
 	}
 

Modules/Lock/NotifGroup.qml

@@ -284,6 +284,8 @@ CustomRect {
 		Layout.fillWidth: true
 		color: root.urgency === "critical" ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
 		text: {
+			if (!Config.lock.showNotifContent)
+				return "Unlock to view";
 			const summary = modelData.summary.replace(/\n/g, " ");
 			const body = modelData.body.replace(/\n/g, " ");
 			const color = root.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3outline;

Modules/Notifications/Content.qml

@@ -25,6 +25,9 @@ Item {
 			height += list.itemAtIndex(i)?.nonAnimHeight ?? 0;
 
 		if (visibilities && panels) {
+			if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x || visibilities.dashboard)
+				return 0;
+
 			if (visibilities.osd) {
 				const h = panels.osd.y - 8 * 2 - padding * 2;
 				if (height > h)
@@ -194,8 +197,7 @@ Item {
 	}
 
 	component Anim: NumberAnimation {
-		duration: MaterialEasing.expressiveEffectsTime
+		duration: Appearance.anim.durations.expressiveDefaultSpatial
-		easing.bezierCurve: MaterialEasing.expressiveEffects
+		easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		easing.type: Easing.BezierSpline
 	}
 }

Modules/Notifications/Sidebar/Background.qml

@@ -1,7 +1,7 @@
-import qs.Components
-import qs.Config
 import QtQuick
 import QtQuick.Shapes
+import qs.Components
+import qs.Config
 
 ShapePath {
 	id: root
@@ -10,7 +10,7 @@ ShapePath {
 	readonly property real notifsRoundingX: panels.notifications.height > 0 && notifsWidthDiff < rounding * 2 ? notifsWidthDiff / 2 : rounding
 	readonly property real notifsWidthDiff: panels.notifications.width - wrapper.width
 	required property var panels
-	readonly property real rounding: 8
+	readonly property real rounding: Config.barConfig.rounding
 	readonly property real utilsRoundingX: utilsWidthDiff < rounding * 2 ? utilsWidthDiff / 2 : rounding
 	readonly property real utilsWidthDiff: panels.utilities.width - wrapper.width
 	required property Wrapper wrapper

Modules/Notifications/Sidebar/Notif.qml

@@ -19,11 +19,12 @@ CustomRect {
 	required property var visibilities
 
 	color: {
-		const c = root.modelData.urgency === "critical" ? DynamicColors.palette.m3secondaryContainer : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2);
+		const c = root.modelData?.urgency === "critical" ? DynamicColors.palette.m3secondaryContainer : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2);
 		return expanded ? c : Qt.alpha(c, 0);
 	}
 	implicitHeight: nonAnimHeight
 	radius: 6
+	state: expanded ? "expanded" : ""
 
 	Behavior on implicitHeight {
 		Anim {
@@ -33,7 +34,6 @@ CustomRect {
 	}
 	states: State {
 		name: "expanded"
-		when: root.expanded
 
 		PropertyChanges {
 			compactBody.anchors.margins: 10
@@ -63,10 +63,10 @@ CustomRect {
 
 		anchors.left: parent.left
 		anchors.top: parent.top
-		color: root.modelData.urgency === "critical" ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+		color: root.modelData?.urgency === "critical" ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
 		elide: Text.ElideRight
 		maximumLineCount: 1
-		text: root.modelData.summary
+		text: root.modelData?.summary ?? ""
 		width: parent.width
 		wrapMode: Text.WordWrap
 	}
@@ -76,7 +76,7 @@ CustomRect {
 
 		anchors.left: parent.left
 		anchors.top: parent.top
-		text: root.modelData.summary
+		text: root.modelData?.summary ?? ""
 		visible: false
 	}
 
@@ -90,9 +90,9 @@ CustomRect {
 		shouldBeActive: !root.expanded
 
 		sourceComponent: CustomText {
-			color: root.modelData.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3outline
+			color: root.modelData?.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3outline
 			elide: Text.ElideRight
-			text: root.modelData.body.replace(/\n/g, " ")
+			text: String(root.modelData?.body ?? "").replace(/\n/g, " ")
 			textFormat: Text.StyledText
 		}
 	}
@@ -108,7 +108,7 @@ CustomRect {
 			animate: true
 			color: DynamicColors.palette.m3outline
 			font.pointSize: 11
-			text: root.modelData.timeStr
+			text: root.modelData?.timeStr ?? ""
 		}
 	}
 
@@ -130,8 +130,8 @@ CustomRect {
 				id: body
 
 				Layout.fillWidth: true
-				color: root.modelData.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3onSurface
+				color: root.modelData?.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3onSurface
-				text: root.modelData.body.replace(/(.)\n(?!\n)/g, "$1\n\n") || qsTr("No body given")
+				text: String(root.modelData?.body ?? "").replace(/(.)\n(?!\n)/g, "$1\n\n") || qsTr("No body given")
 				textFormat: Text.MarkdownText
 				wrapMode: Text.WordWrap
 
@@ -148,14 +148,51 @@ CustomRect {
 	}
 
 	component WrappedLoader: Loader {
+		id: comp
+
 		required property bool shouldBeActive
 
-		active: opacity > 0
+		active: false
-		opacity: shouldBeActive ? 1 : 0
+		opacity: 0
+
+		states: State {
+			name: "active"
+			when: comp.shouldBeActive
+
+			PropertyChanges {
+				comp.active: true
+				comp.opacity: 1
+			}
+		}
+		transitions: [
+			Transition {
+				from: ""
+				to: "active"
+
+				SequentialAnimation {
+					PropertyAction {
+						property: "active"
+					}
 
-		Behavior on opacity {
 					Anim {
+						property: "opacity"
+					}
+				}
+			},
+			Transition {
+				from: "active"
+				to: ""
+
+				SequentialAnimation {
+					Anim {
+						property: "opacity"
+					}
+
+					PropertyAction {
+						property: "active"
 					}
 				}
 			}
+		]
+	}
 }

Modules/Notifications/Sidebar/NotifActionList.qml

@@ -35,7 +35,7 @@ Item {
 					{
 						isClose: true
 					},
-					...root.notif.actions,
+					...(root.notif?.actions ?? ""),
 					{
 						isCopy: true
 					}
@@ -97,7 +97,7 @@ Item {
 						id: actionInner
 
 						anchors.centerIn: parent
-						sourceComponent: action.modelData.isClose || action.modelData.isCopy ? iconBtn : root.notif.hasActionIcons ? iconComp : textComp
+						sourceComponent: action.modelData.isClose || action.modelData.isCopy ? iconBtn : root.notif?.hasActionIcons ? iconComp : textComp
 					}
 
 					Component {

Modules/Notifications/Sidebar/NotifDock.qml

@@ -129,20 +129,27 @@ Item {
 	Timer {
 		id: clearTimer
 
-		interval: 50
+		interval: Math.max(15, Math.min(80, 69.8 - 12.3 * Math.log(NotifServer.notClosed.length)))
 		repeat: true
+		triggeredOnStart: true
 
 		onTriggered: {
-			let next = null;
+			const first = NotifServer.notClosed[0];
-			for (let i = 0; i < notifList.repeater.count; i++) {
+			if (!first) {
-				next = notifList.repeater.itemAt(i);
-				if (!next?.closed)
-					break;
-			}
-			if (next)
-				next.closeAll();
-			else
 				stop();
+				return;
+			}
+
+			const appName = first.appName;
+			let cleared = 0;
+			for (const n of NotifServer.notClosed.filter(n => n.appName === appName)) {
+				n.close();
+				cleared++;
+				if (cleared > 30) {
+					interval = 5;
+					return;
+				}
+			}
 		}
 	}
 

Modules/Notifications/Sidebar/NotifDockList.qml

@@ -1,60 +1,47 @@
 pragma ComponentBehavior: Bound
 
+import Quickshell
+import QtQuick
+import ZShell.Components
 import qs.Components
 import qs.Config
 import qs.Modules
 import qs.Daemons
-import Quickshell
-import QtQuick
 
-Item {
+LazyListView {
 	id: root
 
 	required property Flickable container
-	property bool flag
 	required property Props props
-	readonly property alias repeater: repeater
+	required property PersistentProperties visibilities
-	readonly property int spacing: 8
-	required property var visibilities
 
-	anchors.left: parent.left
+	anchors.left: parent?.left
-	anchors.right: parent.right
+	anchors.right: parent?.right
-	implicitHeight: {
+	asynchronous: true
-		const item = repeater.itemAt(repeater.count - 1);
+	cacheBuffer: 400
-		return item ? item.y + item.implicitHeight : 0;
+	implicitHeight: contentHeight
-	}
+	readyDelay: 1
-
+	removeDuration: Appearance.anim.durations.normal
-	Repeater {
+	spacing: Appearance.spacing.small
-		id: repeater
+	useCustomViewport: true
-
+	viewport: Qt.rect(0, container.contentY, width, container.height)
-		model: ScriptModel {
-			values: {
-				const map = new Map();
-				for (const n of NotifServer.notClosed)
-					map.set(n.appName, null);
-				for (const n of NotifServer.list)
-					map.set(n.appName, null);
-				return [...map.keys()];
-			}
-
-			onValuesChanged: root.flagChanged()
-		}
 
+	delegate: Component {
 		MouseArea {
 			id: notif
 
 			readonly property bool closed: notifInner.notifCount === 0
 			required property int index
 			required property string modelData
-			readonly property alias nonAnimHeight: notifInner.nonAnimHeight
 			property int startY
 
 			function closeAll(): void {
-				for (const n of NotifServer.notClosed.filter(n => n.appName === modelData)) {
+				clearTimer.start();
-					n.close();
-				}
 			}
 
+			LazyListView.preferredHeight: closed ? 0 : notifInner.nonAnimHeight
+			LazyListView.trackViewport: !notifInner.expanded && notifInner.nonAnimHeight < notifInner.implicitHeight
+			LazyListView.visibleHeight: notifInner.implicitHeight
 			acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
 			cursorShape: pressed ? Qt.ClosedHandCursor : undefined
 			drag.axis: Drag.XAxis
@@ -62,39 +49,39 @@ Item {
 			enabled: !closed
 			hoverEnabled: true
 			implicitHeight: notifInner.implicitHeight
-			implicitWidth: root.width
+			opacity: LazyListView.removing || closed || LazyListView.adding ? 0 : 1
 			preventStealing: true
-			y: {
+			scale: LazyListView.removing || closed ? 0.6 : LazyListView.adding ? 0 : 1
-				root.flag; // Force update
-				let y = 0;
-				for (let i = 0; i < index; i++) {
-					const item = repeater.itemAt(i);
-					if (!item.closed)
-						y += item.nonAnimHeight + root.spacing;
-				}
-				return y;
-			}
 
-			containmentMask: QtObject {
+			Behavior on opacity {
-				function contains(p: point): bool {
+				Anim {
-					if (!root.container.contains(notif.mapToItem(root.container, p)))
+				}
-						return false;
+			}
-					return notifInner.contains(p);
+			Behavior on scale {
+				Anim {
+					duration: Appearance.anim.durations.expressiveDefaultSpatial
+					easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 				}
 			}
 			Behavior on x {
 				Anim {
-					duration: MaterialEasing.expressiveEffectsTime
+					duration: Appearance.anim.durations.expressiveDefaultSpatial
-					easing.bezierCurve: MaterialEasing.expressiveEffects
+					easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 				}
 			}
 			Behavior on y {
+				enabled: notif.LazyListView.ready
+
 				Anim {
-					duration: MaterialEasing.expressiveEffectsTime
+					duration: Appearance.anim.durations.expressiveDefaultSpatial
-					easing.bezierCurve: MaterialEasing.expressiveEffects
+					easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 				}
 			}
 
+			onDoubleClicked: event => {
+				if (event.button === Qt.LeftButton)
+					notifInner.toggleExpand(!notifInner.expanded);
+			}
 			onPositionChanged: event => {
 				if (pressed) {
 					const diffY = event.y - startY;
@@ -116,39 +103,22 @@ Item {
 					closeAll();
 			}
 
-			ParallelAnimation {
+			Timer {
-				running: true
+				id: clearTimer
 
-				Anim {
+				interval: 15
-					from: 0
+				repeat: true
-					property: "opacity"
+				triggeredOnStart: true
-					target: notif
+
-					to: 1
+				onTriggered: {
+					const notifs = NotifServer.notClosed.filter(n => n.appName === notif.modelData);
+					if (notifs.length === 0) {
+						stop();
+						return;
 					}
 
-				Anim {
+					for (const n of notifs.slice(0, 30))
-					duration: MaterialEasing.expressiveEffectsTime
+						n.close();
-					easing.bezierCurve: MaterialEasing.expressiveEffects
-					from: 0
-					property: "scale"
-					target: notif
-					to: 1
-				}
-			}
-
-			ParallelAnimation {
-				running: notif.closed
-
-				Anim {
-					property: "opacity"
-					target: notif
-					to: 0
-				}
-
-				Anim {
-					property: "scale"
-					target: notif
-					to: 0.6
 				}
 			}
 
@@ -162,4 +132,30 @@ Item {
 			}
 		}
 	}
+	model: ScriptModel {
+		values: {
+			const map = new Map();
+			for (const n of NotifServer.notClosed)
+				map.set(n.appName, null);
+			for (const n of NotifServer.list)
+				map.set(n.appName, null);
+			return [...map.keys()];
+		}
+	}
+
+	onViewportAdjustNeeded: d => {
+		if (contentYAnim.running)
+			contentYAnim.complete();
+		contentYAnim.to = Math.max(0, container.contentY + d);
+		contentYAnim.start();
+	}
+
+	Anim {
+		id: contentYAnim
+
+		duration: Appearance.anim.durations.expressiveDefaultSpatial
+		easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+		property: "contentY"
+		target: root.container
+	}
 }

Modules/Notifications/Sidebar/NotifGroup.qml

@@ -20,7 +20,7 @@ CustomRect {
 	required property string modelData
 	readonly property int nonAnimHeight: {
 		const headerHeight = header.implicitHeight + (root.expanded ? Math.round(7 / 2) : 0);
-		const columnHeight = headerHeight + notifList.nonAnimHeight + column.Layout.topMargin + column.Layout.bottomMargin;
+		const columnHeight = headerHeight + notifList.layoutHeight + column.Layout.topMargin + column.Layout.bottomMargin;
 		return Math.round(Math.max(Config.notifs.sizes.image, columnHeight) + 10 * 2);
 	}
 	readonly property int notifCount: notifs.reduce((acc, n) => n.closed ? acc : acc + 1, 0)
@@ -166,7 +166,7 @@ CustomRect {
 
 				CustomRect {
 					color: root.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3error : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 3)
-					implicitHeight: groupCount.implicitHeight + 10
+					implicitHeight: groupCount.implicitHeight + Appearance.padding.small
 					implicitWidth: expandBtn.implicitWidth + 7 * 2
 					radius: Appearance.rounding.full
 
@@ -196,7 +196,7 @@ CustomRect {
 
 						MaterialIcon {
 							Layout.rightMargin: -10 / 2
-							Layout.topMargin: root.expanded ? -Math.floor(7 / 2) : 0
+							// Layout.topMargin: root.expanded ? -Math.floor(7 / 2) : 0
 							color: root.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
 							rotation: root.expanded ? 180 : 0
 							text: "expand_more"

Modules/Notifications/Sidebar/NotifGroupList.qml

@@ -1,120 +1,59 @@
 pragma ComponentBehavior: Bound
 
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Components
 import qs.Components
 import qs.Config
 import qs.Modules
 import qs.Daemons
-import Quickshell
-import QtQuick
-import QtQuick.Layouts
 
-Item {
+LazyListView {
 	id: root
 
 	required property Flickable container
 	required property bool expanded
-	property bool flag
-	readonly property real nonAnimHeight: {
-		let h = -root.spacing;
-		for (let i = 0; i < repeater.count; i++) {
-			const item = repeater.itemAt(i);
-			if (!item.modelData.closed && !item.previewHidden)
-				h += item.nonAnimHeight + root.spacing;
-		}
-		return h;
-	}
 	required property list<var> notifs
 	required property Props props
-	property bool showAllNotifs
+	required property PersistentProperties visibilities
-	readonly property int spacing: Math.round(7 / 2)
-	required property var visibilities
 
 	signal requestToggleExpand(expand: bool)
 
 	Layout.fillWidth: true
-	implicitHeight: nonAnimHeight
+	asynchronous: true
-
+	cacheBuffer: 400
-	Behavior on implicitHeight {
+	implicitHeight: contentHeight
-		Anim {
+	readyDelay: 1
-			duration: MaterialEasing.expressiveEffectsTime
+	removeDuration: Appearance.anim.durations.normal
-			easing.bezierCurve: MaterialEasing.expressiveEffects
+	spacing: Math.round(Appearance.spacing.small / 2)
-		}
+	useCustomViewport: true
-	}
+	viewport: {
-
+		tWatcher.transform; // mapToItem is not reactive so use this to trigger updates
-	onExpandedChanged: {
+		return Qt.rect(0, container.contentY - mapToItem(container.contentItem, 0, 0).y, width, container.height);
-		if (expanded) {
-			clearTimer.stop();
-			showAllNotifs = true;
-		} else {
-			clearTimer.start();
-		}
-	}
-
-	Timer {
-		id: clearTimer
-
-		interval: MaterialEasing.standardTime
-
-		onTriggered: root.showAllNotifs = false
-	}
-
-	Repeater {
-		id: repeater
-
-		model: ScriptModel {
-			values: root.showAllNotifs ? root.notifs : root.notifs.slice(0, Config.notifs.groupPreviewNum + 1)
-
-			onValuesChanged: root.flagChanged()
 	}
 
+	delegate: Component {
 		MouseArea {
 			id: notif
 
 			required property int index
 			required property NotifServer.Notif modelData
-			readonly property alias nonAnimHeight: notifInner.nonAnimHeight
-			readonly property bool previewHidden: {
-				if (root.expanded)
-					return false;
-
-				let extraHidden = 0;
-				for (let i = 0; i < index; i++)
-					if (root.notifs[i].closed)
-						extraHidden++;
-
-				return index >= Config.notifs.groupPreviewNum + extraHidden;
-			}
 			property int startY
 
+			LazyListView.preferredHeight: modelData?.closed || LazyListView.removing ? 0 : notifInner.nonAnimHeight
+			LazyListView.visibleHeight: modelData?.closed || LazyListView.removing ? 0 : notifInner.implicitHeight
 			acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
 			cursorShape: notifInner.body?.hoveredLink ? Qt.PointingHandCursor : pressed ? Qt.ClosedHandCursor : undefined
 			drag.axis: Drag.XAxis
 			drag.target: this
-			enabled: !modelData.closed
+			enabled: !(modelData?.closed ?? true)
 			hoverEnabled: true
 			implicitHeight: notifInner.implicitHeight
-			implicitWidth: root.width
+			opacity: LazyListView.removing || LazyListView.adding ? 0 : 1
-			opacity: previewHidden ? 0 : 1
 			preventStealing: !root.expanded
-			scale: previewHidden ? 0.7 : 1
+			scale: LazyListView.removing || LazyListView.adding ? 0.7 : 1
-			y: {
-				root.flag; // Force update
-				let y = 0;
-				for (let i = 0; i < index; i++) {
-					const item = repeater.itemAt(i);
-					if (!item.modelData.closed && !item.previewHidden)
-						y += item.nonAnimHeight + root.spacing;
-				}
-				return y;
-			}
 
-			containmentMask: QtObject {
-				function contains(p: point): bool {
-					if (!root.container.contains(notif.mapToItem(root.container, p)))
-						return false;
-					return notifInner.contains(p);
-				}
-			}
 			Behavior on opacity {
 				Anim {
 				}
@@ -130,14 +69,20 @@ Item {
 				}
 			}
 			Behavior on y {
+				enabled: notif.LazyListView.ready
+
 				Anim {
 					duration: MaterialEasing.expressiveEffectsTime
 					easing.bezierCurve: MaterialEasing.expressiveEffects
 				}
 			}
 
-			Component.onCompleted: modelData.lock(this)
+			Component.onCompleted: modelData?.lock(this)
-			Component.onDestruction: modelData.unlock(this)
+			Component.onDestruction: modelData?.unlock(this)
+			onDoubleClicked: event => {
+				if (event.button === Qt.LeftButton)
+					root.requestToggleExpand(!root.expanded);
+			}
 			onPositionChanged: event => {
 				if (pressed && !root.expanded) {
 					const diffY = event.y - startY;
@@ -150,37 +95,19 @@ Item {
 				if (event.button === Qt.RightButton)
 					root.requestToggleExpand(!root.expanded);
 				else if (event.button === Qt.MiddleButton)
-					modelData.close();
+					modelData?.close();
 			}
 			onReleased: event => {
 				if (Math.abs(x) < width * Config.notifs.clearThreshold)
 					x = 0;
 				else
-					modelData.close();
+					modelData?.close();
 			}
 
 			ParallelAnimation {
-				Component.onCompleted: running = !notif.previewHidden
+				running: notif.modelData?.closed ?? false
 
-				Anim {
+				onFinished: notif.modelData?.unlock(notif)
-					from: 0
-					property: "opacity"
-					target: notif
-					to: 1
-				}
-
-				Anim {
-					from: 0.7
-					property: "scale"
-					target: notif
-					to: 1
-				}
-			}
-
-			ParallelAnimation {
-				running: notif.modelData.closed
-
-				onFinished: notif.modelData.unlock(notif)
 
 				Anim {
 					property: "opacity"
@@ -206,4 +133,28 @@ Item {
 			}
 		}
 	}
+	model: ScriptModel {
+		values: {
+			if (root.expanded)
+				return root.notifs;
+
+			let count = 0;
+			let i = 0;
+			const previewNum = Config.notifs.groupPreviewNum;
+			while (i < root.notifs.length && count < previewNum) {
+				if (!(root.notifs[i]?.closed ?? true))
+					count++;
+				i++;
+			}
+
+			return root.notifs.slice(0, i);
+		}
+	}
+
+	TransformWatcher {
+		id: tWatcher
+
+		a: root.container.contentItem
+		b: root
+	}
 }

Modules/Notifications/Sidebar/Utils/Background.qml

@@ -7,7 +7,7 @@ ShapePath {
 	id: root
 
 	readonly property bool flatten: wrapper.height < rounding * 2
-	readonly property real rounding: 8
+	readonly property real rounding: Config.barConfig.rounding
 	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
 	required property var sidebar
 	required property Wrapper wrapper

Modules/Notifications/Sidebar/Utils/Cards/Toggles.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import qs.Components
 import qs.Config
 import qs.Modules
+import qs.Helpers
 import qs.Daemons
 
 CustomRect {
@@ -32,7 +33,7 @@ CustomRect {
 			Toggle {
 				checked: Network.wifiEnabled
 				icon: Network.wifiEnabled ? "wifi" : "wifi_off"
-				visible: QSNetwork.Networking.devices.values.length > 0
+				visible: QSNetwork.Networking.devices.values.some(n => n.type === QSNetwork.DeviceType.Wifi)
 
 				onClicked: Network.toggleWifi()
 			}
@@ -79,6 +80,13 @@ CustomRect {
 						adapter.enabled = !adapter.enabled;
 				}
 			}
+
+			Toggle {
+				checked: GameMode.enabled
+				icon: GameMode.enabled ? "videogame_asset" : "videogame_asset_off"
+
+				onClicked: GameMode.enabled = !GameMode.enabled
+			}
 		}
 	}
 

Modules/Notifications/Sidebar/Utils/Wrapper.qml

@@ -20,69 +20,29 @@ Item {
 	required property Item sidebar
 	required property var visibilities
 
-	implicitHeight: 0
+	property real offsetScale: shouldBeActive ? 0 : 1
-	implicitWidth: sidebar.visible ? sidebar.width : Config.utilities.sizes.width
-	visible: height > 0
 
-	states: State {
+	visible: offsetScale < 1
-		name: "visible"
+	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
-		when: root.shouldBeActive
+	implicitHeight: content.implicitHeight + 8 * 2
-
+	implicitWidth: sidebar.width * (1 - sidebar.offsetScale)
-		PropertyChanges {
+	opacity: 1 - offsetScale
-			root.implicitHeight: content.implicitHeight + 8 * 2
-		}
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
 
+	Behavior on offsetScale {
 		Anim {
-				duration: MaterialEasing.expressiveEffectsTime
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: MaterialEasing.expressiveEffects
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		}
-	]
-
-	onStateChanged: {
-		if (state === "visible" && timer.running) {
-			timer.triggered();
-			timer.stop();
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: 1000
-		running: true
-
-		onTriggered: {
-			content.active = Qt.binding(() => root.shouldBeActive || root.visible);
-			content.visible = true;
 		}
 	}
 
 	Loader {
 		id: content
 
-		active: true
 		anchors.left: parent.left
 		anchors.margins: 8
 		anchors.top: parent.top
-		visible: false
+
+		active: root.shouldBeActive || root.visible
 
 		sourceComponent: Content {
 			implicitWidth: root.implicitWidth - 8 * 2

Modules/Notifications/Sidebar/Wrapper.qml

@@ -7,50 +7,29 @@ import QtQuick
 Item {
 	id: root
 
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	readonly property Props props: Props {
 	}
+	readonly property bool shouldBeActive: root.visibilities.sidebar && Config.sidebar.enabled
 	required property var visibilities
 
-	implicitWidth: 0
+	anchors.rightMargin: (-implicitWidth - 5) * offsetScale
-	visible: width > 0
+	implicitWidth: Config.sidebar.sizes.width
-
+	opacity: 1 - offsetScale
-	states: State {
+	visible: offsetScale < 1
-		name: "visible"
-		when: root.visibilities.sidebar
-
-		PropertyChanges {
-			root.implicitWidth: Config.sidebar.sizes.width
-		}
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
 
+	Behavior on offsetScale {
 		Anim {
-				duration: MaterialEasing.expressiveEffectsTime
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: MaterialEasing.expressiveEffects
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-				property: "implicitWidth"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitWidth"
-				target: root
 		}
 	}
-	]
 
 	Loader {
 		id: content
 
-		active: true
+		active: root.shouldBeActive || root.visible
 		anchors.bottom: parent.bottom
 		anchors.bottomMargin: 0
 		anchors.left: parent.left
@@ -58,11 +37,9 @@ Item {
 		anchors.top: parent.top
 
 		sourceComponent: Content {
-			implicitWidth: Config.sidebar.sizes.width - 8 * 2
+			implicitWidth: Config.sidebar.sizes.width - Appearance.padding.smaller * 2
 			props: root.props
 			visibilities: root.visibilities
 		}
-
-		Component.onCompleted: active = Qt.binding(() => (root.visibilities.sidebar && Config.sidebar.enabled) || root.visible)
 	}
 }

Modules/Notifications/Wrapper.qml

@@ -6,29 +6,13 @@ Item {
 	id: root
 
 	required property Item panels
+	required property Item sidebarPanel
 	required property var visibilities
 
 	implicitHeight: content.implicitHeight
-	implicitWidth: Math.max(panels.sidebar.width, content.implicitWidth)
+	implicitWidth: Math.max(sidebarPanel.width * (1 - sidebarPanel.offsetScale), content.implicitWidth)
 	visible: height > 0
 
-	states: State {
-		name: "hidden"
-		when: root.visibilities.sidebar || root.visibilities.dashboard || (root.panels.popouts.hasCurrent && root.panels.popouts.currentName.startsWith("traymenu"))
-
-		PropertyChanges {
-			root.implicitHeight: 0
-		}
-	}
-	transitions: Transition {
-		Anim {
-			duration: MaterialEasing.expressiveEffectsTime
-			easing.bezierCurve: MaterialEasing.expressiveEffects
-			property: "implicitHeight"
-			target: root
-		}
-	}
-
 	Content {
 		id: content
 

Modules/Osd/Wrapper.qml

@@ -26,40 +26,22 @@ Item {
 		timer.restart();
 	}
 
+	property real offsetScale: shouldBeActive ? 0 : 1
+	required property bool sidebarOrSessionVisible
+	property real sidebarOffset: sidebarOrSessionVisible ? 12 : 0
+
+	visible: offsetScale < 1
+	anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale
+	implicitWidth: content.implicitWidth
 	implicitHeight: content.implicitHeight
-	implicitWidth: 0
+	opacity: 1 - offsetScale
-	visible: width > 0
-
-	states: State {
-		name: "visible"
-		when: root.shouldBeActive
-
-		PropertyChanges {
-			root.implicitWidth: content.implicitWidth
-		}
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
 
+	Behavior on offsetScale {
 		Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-				property: "implicitWidth"
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitWidth"
-				target: root
 		}
 	}
-	]
 
 	Component.onCompleted: {
 		volume = Audio.volume;
@@ -113,15 +95,14 @@ Item {
 		}
 	}
 
-	CustomClippingRect {
-		anchors.fill: parent
-
 	Loader {
 		id: content
 
 		anchors.left: parent.left
 		anchors.verticalCenter: parent.verticalCenter
 
+		active: root.shouldBeActive || root.visible
+
 		sourceComponent: Content {
 			brightness: root.brightness
 			monitor: root.monitor
@@ -131,8 +112,5 @@ Item {
 			visibilities: root.visibilities
 			volume: root.volume
 		}
-
-			Component.onCompleted: active = Qt.binding(() => root.shouldBeActive || root.visible)
-		}
 	}
 }

Modules/PopoutState.qml

@@ -0,0 +1,36 @@
+import QtQuick
+
+QtObject {
+	id: root
+
+	property string currentName
+	property bool hasCurrent
+	property var submenus: []
+
+	signal detachRequested(mode: string)
+
+	function clearSubmenus(): void {
+		submenus = [];
+	}
+
+	function closeSubmenus(level: int): void {
+		submenus = submenus.slice(0, level);
+	}
+
+	function pushSubmenu(level: int, handle: var, sourceItem: var, sourceWidth: int): void {
+		let newSubmenus = submenus.slice(0, level);
+		newSubmenus.push({
+			"handle": handle,
+			"sourceItem": sourceItem,
+			"sourceWidth": sourceWidth
+		});
+		submenus = newSubmenus;
+	}
+
+	onCurrentNameChanged: {
+		root.clearSubmenus();
+	}
+	onHasCurrentChanged: {
+		root.clearSubmenus();
+	}
+}

Modules/Resource.qml

@@ -21,6 +21,7 @@ RowLayout {
 	property int warningThreshold: 80
 
 	percentage: 0
+	spacing: Appearance.spacing.smaller
 
 	Behavior on animatedPercentage {
 		Anim {
@@ -38,6 +39,7 @@ RowLayout {
 	MaterialIcon {
 		id: icon
 
+		Layout.preferredWidth: 16
 		color: root.iconColor
 		font.pointSize: Appearance.font.size.larger
 		text: root.icon
@@ -52,16 +54,16 @@ RowLayout {
 		CustomRect {
 			id: fill
 
-			anchors.fill: parent
+			anchors.bottom: parent.bottom
-			antialiasing: false
+			anchors.left: parent.left
+			anchors.right: parent.right
 			color: root.mainColor
 			implicitHeight: Math.ceil(root.percentage * parent.height)
-			radius: Appearance.rounding.full
 
-			transform: Scale {
+			// Behavior on implicitHeight {
-				origin.y: fill.height
+			// 	Anim {
-				yScale: Math.max(0.001, root.animatedPercentage)
+			// 	}
-			}
+			// }
 		}
 	}
 }

Modules/Resources.qml

@@ -17,7 +17,7 @@ CustomRect {
 	color: visibilities.resources ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
 	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
 	implicitWidth: rowLayout.implicitWidth + Appearance.padding.normal * 2
-	radius: height / 2
+	radius: Appearance.rounding.full
 
 	StateLayer {
 		onClicked: root.visibilities.resources = !root.visibilities.resources

Modules/Resources/Wrapper.qml

@@ -9,73 +9,30 @@ Item {
 	id: root
 
 	readonly property real nonAnimHeight: state === "visible" ? (content.item?.nonAnimHeight ?? 0) : 0
+	property real offsetScale: shouldBeActive ? 0 : 1
+	readonly property bool shouldBeActive: root.visibilities.resources
 	required property PersistentProperties visibilities
 
-	implicitHeight: 0
+	anchors.topMargin: (-implicitHeight - 5) * offsetScale
-	implicitWidth: content.implicitWidth
+	clip: true
-	visible: height > 0
+	implicitHeight: content.implicitHeight
-
+	implicitWidth: content.implicitWidth || 854 // Hard coded fallback for first open
-	states: State {
+	opacity: 1 - offsetScale
-		name: "visible"
+	visible: offsetScale < 1
-		when: root.visibilities.resources
-
-		PropertyChanges {
-			root.implicitHeight: content.implicitHeight
-		}
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
 
+	Behavior on offsetScale {
 		Anim {
-				duration: MaterialEasing.expressiveEffectsTime
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: MaterialEasing.expressiveEffects
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
 		}
 	}
-	]
-
-	onStateChanged: {
-		if (state === "visible" && timer.running) {
-			timer.triggered();
-			timer.stop();
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: Appearance.anim.durations.extraLarge
-		running: true
-
-		onTriggered: {
-			content.active = Qt.binding(() => (root.visibilities.resources) || root.visible);
-			content.visible = true;
-		}
-	}
-
-	CustomClippingRect {
-		anchors.fill: parent
 
 	Loader {
 		id: content
 
-			active: true
+		active: root.shouldBeActive || root.visible
 		anchors.bottom: parent.bottom
 		anchors.horizontalCenter: parent.horizontalCenter
-			visible: false
 
 		sourceComponent: Content {
 			padding: Appearance.padding.normal
@@ -83,4 +40,3 @@ Item {
 		}
 	}
 }
-}

Modules/Settings/Categories.qml

@@ -104,6 +104,18 @@ Item {
 			key: "launcher"
 			name: "Launcher"
 		}
+
+		ListElement {
+			icon: "screenshot_region"
+			key: "screenshot"
+			name: "Screenshot"
+		}
+
+		ListElement {
+			icon: "cached"
+			key: "updates"
+			name: "Updates"
+		}
 	}
 
 	CustomClippingRect {
@@ -153,7 +165,7 @@ Item {
 		required property string name
 
 		implicitHeight: 42
-		implicitWidth: 200
+		implicitWidth: 250
 		radius: Appearance.rounding.normal - Appearance.padding.smaller
 
 		RowLayout {
@@ -171,9 +183,15 @@ Item {
 				Layout.fillHeight: true
 				Layout.preferredWidth: icon.contentWidth
 				color: categoryItem.index === clayout.currentIndex ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+				fill: categoryItem.index === clayout.currentIndex ? 1 : 0
 				font.pointSize: Appearance.font.size.small * 2
 				text: categoryItem.icon
 				verticalAlignment: Text.AlignVCenter
+
+				Behavior on fill {
+					Anim {
+					}
+				}
 			}
 
 			CustomText {

Modules/Settings/Categories/Appearance.qml

@@ -57,6 +57,16 @@ SettingsPage {
 			setting: "scale"
 			step: 0.1
 		}
+
+		Separator {
+		}
+
+		SettingSpinBox {
+			name: "Deform animation scale"
+			object: Config.appearance.deform
+			setting: "scale"
+			step: 0.1
+		}
 	}
 
 	SettingsSection {
@@ -66,7 +76,7 @@ SettingsPage {
 			name: "Fonts"
 		}
 
-		SettingInput {
+		SettingListView {
 			name: "Sans family"
 			object: Config.appearance.font.family
 			setting: "sans"
@@ -75,29 +85,11 @@ SettingsPage {
 		Separator {
 		}
 
-		SettingInput {
+		SettingListView {
 			name: "Monospace family"
 			object: Config.appearance.font.family
 			setting: "mono"
 		}
-
-		Separator {
-		}
-
-		SettingInput {
-			name: "Material family"
-			object: Config.appearance.font.family
-			setting: "material"
-		}
-
-		Separator {
-		}
-
-		SettingInput {
-			name: "Clock family"
-			object: Config.appearance.font.family
-			setting: "clock"
-		}
 	}
 
 	SettingsSection {
@@ -118,9 +110,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Session GIF speed"
 			max: 5
 			min: 0
+			name: "Session GIF speed"
 			object: Config.appearance.anim
 			setting: "sessionGifSpeed"
 			step: 0.1
@@ -144,9 +136,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Base opacity"
 			max: 1
 			min: 0
+			name: "Base opacity"
 			object: Config.appearance.transparency
 			setting: "base"
 			step: 0.05
@@ -156,9 +148,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Layer opacity"
 			max: 1
 			min: 0
+			name: "Layer opacity"
 			object: Config.appearance.transparency
 			setting: "layers"
 			step: 0.05

Modules/Settings/Categories/Background.qml

@@ -1,3 +1,4 @@
+import QtQuick.Layouts
 import qs.Modules.Settings.Controls
 import qs.Config
 
@@ -21,11 +22,27 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Fade duration"
 			min: 0
+			name: "Fade duration"
 			object: Config.background
 			setting: "wallFadeDuration"
 			step: 50
 		}
+
+		Separator {
+		}
+
+		WallpaperCropper {
+			Layout.fillWidth: true
+			Layout.preferredHeight: 600
+		}
+	}
+
+	SettingsSection {
+		sectionId: "Wallpapers"
+
+		WallpaperGrid {
+			Layout.fillWidth: true
+		}
 	}
 }

Modules/Settings/Categories/Bar.qml

@@ -19,8 +19,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Height"
 			min: 1
+			name: "Height"
 			object: Config.barConfig
 			setting: "height"
 		}
@@ -29,8 +29,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Rounding"
 			min: 0
+			name: "Rounding"
 			object: Config.barConfig
 			setting: "rounding"
 		}
@@ -39,11 +39,21 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Border"
 			min: 0
+			name: "Border"
 			object: Config.barConfig
 			setting: "border"
 		}
+
+		Separator {
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Smoothing"
+			object: Config.barConfig
+			setting: "smoothing"
+		}
 	}
 
 	SettingsSection {
@@ -145,8 +155,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Dock height"
 			min: 1
+			name: "Dock height"
 			object: Config.dock
 			setting: "height"
 		}
@@ -173,8 +183,8 @@ SettingsPage {
 		}
 
 		SettingStringList {
-			name: "Pinned apps"
 			addLabel: qsTr("Add pinned app")
+			name: "Pinned apps"
 			object: Config.dock
 			setting: "pinnedApps"
 		}
@@ -183,8 +193,8 @@ SettingsPage {
 		}
 
 		SettingStringList {
-			name: "Ignored app regexes"
 			addLabel: qsTr("Add ignored regex")
+			name: "Ignored app regexes"
 			object: Config.dock
 			setting: "ignoredAppRegexes"
 		}

Modules/Settings/Categories/General.qml

@@ -1,6 +1,8 @@
+import Quickshell
 import qs.Modules.Settings.Controls
 import qs.Config
 import qs.Components
+import qs.Helpers
 
 SettingsPage {
 	id: root
@@ -45,6 +47,15 @@ SettingsPage {
 			object: Config.general
 			setting: "desktopIcons"
 		}
+
+		Separator {
+		}
+
+		SettingInput {
+			name: "Date format"
+			object: Config.general
+			setting: "dateFormat"
+		}
 	}
 
 	SettingsSection {
@@ -74,6 +85,11 @@ SettingsPage {
 			onSelected: item => {
 				Config.general.color.mode = item.value;
 				Config.save();
+
+				if (item.value === "light")
+					ModeScheduler.applyLightMode();
+				else if (item.value === "dark")
+					ModeScheduler.applyDarkMode();
 			}
 		}
 
@@ -111,7 +127,7 @@ SettingsPage {
 				MenuItem {
 					icon: "gradient"
 					text: qsTr("Tonal spot")
-					value: "tonalSpot"
+					value: "tonal-spot"
 				},
 				MenuItem {
 					icon: "target"
@@ -131,13 +147,15 @@ SettingsPage {
 				MenuItem {
 					icon: "nutrition"
 					text: qsTr("Fruit salad")
-					value: "fruitSalad"
+					value: "fruit-salad"
 				}
 			]
 
 			onSelected: item => {
 				Config.colors.schemeType = item.value;
 				Config.save();
+
+				Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--scheme", item.value]);
 			}
 		}
 

Modules/Settings/Categories/Launcher.qml

@@ -10,8 +10,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max apps shown"
 			min: 1
+			name: "Max apps shown"
 			object: Config.launcher
 			setting: "maxAppsShown"
 		}
@@ -20,8 +20,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max wallpapers shown"
 			min: 1
+			name: "Max wallpapers shown"
 			object: Config.launcher
 			setting: "maxWallpapers"
 		}
@@ -43,6 +43,15 @@ SettingsPage {
 			object: Config.launcher
 			setting: "specialPrefix"
 		}
+
+		Separator {
+		}
+
+		SettingSwitch {
+			name: "Use UWSM launch command"
+			object: Config.launcher
+			setting: "uwsm"
+		}
 	}
 
 	SettingsSection {
@@ -103,8 +112,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Item width"
 			min: 1
+			name: "Item width"
 			object: Config.launcher.sizes
 			setting: "itemWidth"
 		}
@@ -113,8 +122,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Item height"
 			min: 1
+			name: "Item height"
 			object: Config.launcher.sizes
 			setting: "itemHeight"
 		}
@@ -123,8 +132,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Wallpaper width"
 			min: 1
+			name: "Wallpaper width"
 			object: Config.launcher.sizes
 			setting: "wallpaperWidth"
 		}
@@ -133,8 +142,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Wallpaper height"
 			min: 1
+			name: "Wallpaper height"
 			object: Config.launcher.sizes
 			setting: "wallpaperHeight"
 		}

Modules/Settings/Categories/Lockscreen.qml

@@ -31,8 +31,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max fingerprint tries"
 			min: 1
+			name: "Max fingerprint tries"
 			object: Config.lock
 			setting: "maxFprintTries"
 			step: 1
@@ -41,9 +41,18 @@ SettingsPage {
 		Separator {
 		}
 
+		SettingSwitch {
+			name: "Show notification details"
+			object: Config.lock
+			setting: "showNotifContent"
+		}
+
+		Separator {
+		}
+
 		SettingSpinBox {
-			name: "Blur amount"
 			min: 0
+			name: "Blur amount"
 			object: Config.lock
 			setting: "blurAmount"
 			step: 1
@@ -53,9 +62,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Height multiplier"
 			max: 2
 			min: 0.1
+			name: "Height multiplier"
 			object: Config.lock.sizes
 			setting: "heightMult"
 			step: 0.05
@@ -65,9 +74,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Aspect ratio"
 			max: 4
 			min: 0.5
+			name: "Aspect ratio"
 			object: Config.lock.sizes
 			setting: "ratio"
 			step: 0.05
@@ -77,8 +86,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Center width"
 			min: 100
+			name: "Center width"
 			object: Config.lock.sizes
 			setting: "centerWidth"
 			step: 10

Modules/Settings/Categories/Lockscreen/Idle.qml

@@ -22,6 +22,13 @@ ColumnLayout {
 		Config.save();
 	}
 
+	function deleteTimeoutEntry(index) {
+		let list = [...Config.general.idle.timeouts];
+		list.splice(index, 1);
+		Config.general.idle.timeouts = list;
+		Config.save();
+	}
+
 	function updateTimeoutEntry(i, key, value) {
 		const list = [...Config.general.idle.timeouts];
 		let entry = list[i];
@@ -49,6 +56,9 @@ ColumnLayout {
 			onAddActiveActionRequested: {
 				root.updateTimeoutEntry(index, "activeAction", "");
 			}
+			onDeleteRequested: function (index) {
+				root.deleteTimeoutEntry(index);
+			}
 			onFieldEdited: function (key, value) {
 				root.updateTimeoutEntry(index, key, value);
 			}

Modules/Settings/Categories/Screenshot.qml

@@ -0,0 +1,130 @@
+import qs.Modules.Settings.Controls
+import qs.Config
+import qs.Components
+
+SettingsPage {
+	SettingsSection {
+		sectionId: "Screenshot"
+
+		SettingsHeader {
+			name: "Screenshot"
+		}
+
+		SettingSwitch {
+			name: "Enable effects"
+			object: Config.screenshot
+			setting: "enable_pp"
+		}
+
+		Separator {
+		}
+
+		CustomSplitButtonRow {
+			// active: true
+			label: qsTr("Effects mode")
+
+			menuItems: [
+				MenuItem {
+					icon: "build"
+					text: qsTr("Manual")
+					value: "manual"
+				},
+				MenuItem {
+					icon: "rotate_auto"
+					text: qsTr("Auto")
+					value: "auto"
+				}
+			]
+
+			onSelected: item => {
+				Config.screenshot.mode = item.value;
+				Config.save();
+			}
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Corner radius"
+			object: Config.screenshot
+			setting: "corner_radius"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSwitch {
+			name: "Enable drop shadow"
+			object: Config.screenshot
+			setting: "drop_shadow"
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSwitch {
+			name: "Enable rounded corners"
+			object: Config.screenshot
+			setting: "rounded_corners"
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Shadow blur radius"
+			object: Config.screenshot
+			setting: "shadow_blur_radius"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSwitch {
+			name: "Shadow color broken atm"
+			object: Config.Screenshot
+			setting: "shadow_color"
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Shadow offset X"
+			object: Config.screenshot
+			setting: "shadow_offset_x"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Shadow offset Y"
+			object: Config.screenshot
+			setting: "shadow_offset_y"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+	}
+}

Modules/Settings/Categories/Services.qml

@@ -18,6 +18,15 @@ SettingsPage {
 		Separator {
 		}
 
+		SettingSwitch {
+			name: "Check for updates"
+			object: Config.services
+			setting: "updates"
+		}
+
+		Separator {
+		}
+
 		SettingSwitch {
 			name: "Use Fahrenheit"
 			object: Config.services
@@ -60,9 +69,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Audio increment"
 			max: 1
 			min: 0
+			name: "Audio increment"
 			object: Config.services
 			setting: "audioIncrement"
 			step: 0.05
@@ -72,9 +81,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Brightness increment"
 			max: 1
 			min: 0
+			name: "Brightness increment"
 			object: Config.services
 			setting: "brightnessIncrement"
 			step: 0.05
@@ -84,9 +93,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max volume"
 			max: 5
 			min: 0
+			name: "Max volume"
 			object: Config.services
 			setting: "maxVolume"
 			step: 0.05
@@ -105,8 +114,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Visualizer bars"
 			min: 1
+			name: "Visualizer bars"
 			object: Config.services
 			setting: "visualizerBars"
 			step: 1

Modules/Settings/Categories/SystemUpdates.qml

@@ -0,0 +1,197 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick.Layouts
+import QtQuick
+import qs.Config
+import qs.Helpers
+import qs.Components
+import qs.Modules.Settings.Controls
+
+CustomClippingRect {
+	id: root
+
+	radius: Appearance.rounding.normal - Appearance.padding.smaller
+
+	ColumnLayout {
+		anchors.fill: parent
+
+		RowLayout {
+			Layout.fillWidth: true
+			Layout.margins: Appearance.padding.large
+			spacing: Appearance.spacing.large
+
+			MaterialIcon {
+				font.pointSize: Appearance.font.size.larger * 4
+				text: "update"
+			}
+
+			ColumnLayout {
+				CustomText {
+					font.pointSize: Appearance.font.size.large * 2
+					text: "System updates"
+				}
+
+				RowLayout {
+					id: row
+
+					Layout.fillWidth: true
+
+					CustomText {
+						id: text
+
+						Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+						Layout.fillWidth: true
+						font.pointSize: Appearance.font.size.larger
+						text: `${Updates.availableUpdates} available updates`
+					}
+
+					CustomRect {
+						Layout.preferredHeight: 40
+						Layout.preferredWidth: 150
+						color: Updates.updating ? DynamicColors.layer(DynamicColors.palette.m3outline, 2) : DynamicColors.palette.m3primary
+						radius: Appearance.rounding.full
+
+						RowLayout {
+							anchors.centerIn: parent
+
+							MaterialIcon {
+								animate: true
+								color: DynamicColors.palette.m3onPrimary
+								font.pointSize: Appearance.font.size.large
+								text: Updates.updating ? "update" : "download"
+							}
+
+							CustomText {
+								color: Updates.updating ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onPrimary
+								text: "Update all"
+							}
+						}
+
+						StateLayer {
+							color: DynamicColors.palette.m3onPrimary
+							disabled: Updates.updating
+
+							onClicked: Updates.performSystemUpdate()
+						}
+					}
+				}
+			}
+		}
+
+		CustomListView {
+			id: view
+
+			readonly property int itemHeight: 50 + Appearance.padding.smaller * 2
+
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			clip: true
+			contentHeight: height
+			spacing: Appearance.spacing.normal
+
+			delegate: CustomRect {
+				id: update
+
+				required property var modelData
+				readonly property list<string> sections: modelData.update.split(" ")
+
+				color: DynamicColors.tPalette.m3surfaceContainer
+				implicitHeight: view.itemHeight
+				implicitWidth: parent.width
+				radius: Appearance.rounding.small - Appearance.padding.small
+
+				RowLayout {
+					anchors.fill: parent
+					anchors.leftMargin: Appearance.padding.smaller
+					anchors.rightMargin: Appearance.padding.smaller
+
+					MaterialIcon {
+						font.pointSize: Appearance.font.size.large * 2
+						text: "package_2"
+					}
+
+					ColumnLayout {
+						Layout.fillWidth: true
+
+						CustomText {
+							Layout.fillWidth: true
+							Layout.preferredHeight: 25
+							elide: Text.ElideRight
+							font.pointSize: Appearance.font.size.large
+							text: update.sections[0]
+						}
+
+						CustomText {
+							Layout.fillWidth: true
+							color: DynamicColors.palette.m3onSurfaceVariant
+							text: Updates.formatUpdateTime(update.modelData.timestamp)
+						}
+					}
+
+					RowLayout {
+						Layout.fillHeight: true
+						Layout.preferredWidth: 500
+
+						MarqueeText {
+							id: versionFrom
+
+							Layout.fillHeight: true
+							Layout.preferredWidth: 225
+							animate: true
+							color: DynamicColors.palette.m3tertiary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignHCenter
+							marqueeEnabled: true
+							pauseMs: 4000
+							text: update.sections[1]
+							width: 225
+						}
+
+						MaterialIcon {
+							Layout.fillHeight: true
+							color: DynamicColors.palette.m3secondary
+							font.pointSize: Appearance.font.size.extraLarge
+							horizontalAlignment: Text.AlignHCenter
+							text: "arrow_right_alt"
+							verticalAlignment: Text.AlignVCenter
+						}
+
+						MarqueeText {
+							id: versionTo
+
+							Layout.fillHeight: true
+							Layout.preferredWidth: 225
+							animate: true
+							color: DynamicColors.palette.m3primary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignHCenter
+							marqueeEnabled: true
+							pauseMs: 4000
+							text: update.sections[3]
+							width: 225
+						}
+					}
+
+					IconButton {
+						Layout.preferredHeight: width
+						icon: "download"
+
+						onClicked: {
+							Updates.performPackageUpdate(update.sections[0]);
+						}
+					}
+				}
+			}
+			model: ScriptModel {
+				id: script
+
+				objectProp: "update"
+				values: Object.entries(Updates.updates).sort((a, b) => b[1] - a[1]).map(([update, timestamp]) => ({
+							update,
+							timestamp
+						}))
+			}
+		}
+	}
+}

Modules/Settings/Content.qml

@@ -74,6 +74,10 @@ Item {
 				stack.push(osd);
 			else if (currentCategory === "launcher")
 				stack.push(launcher);
+			else if (currentCategory === "screenshot")
+				stack.push(screenshot);
+			else if (currentCategory === "updates")
+				stack.push(updates);
 		}
 
 		target: root
@@ -225,4 +229,18 @@ Item {
 		Cat.Launcher {
 		}
 	}
+
+	Component {
+		id: screenshot
+
+		Cat.Screenshot {
+		}
+	}
+
+	Component {
+		id: updates
+
+		Cat.SystemUpdates {
+		}
+	}
 }

Modules/Settings/Controls/SettingBarEntryList.qml

@@ -28,72 +28,11 @@ Item {
 	property int uidCounter: 0
 	property var visualEntries: []
 
-	function beginVisualDrag(uid, modelData, item) {
-		const pos = item.mapToItem(root, 0, 0);
-
-		root.draggedUid = uid;
-		root.draggedModelData = modelData;
-		root.dragHeight = item.height;
-		root.dragStartX = pos.x;
-		root.dragStartY = pos.y;
-		root.dragX = pos.x;
-		root.dragY = pos.y;
-		root.dragActive = true;
-		root.dropAnimating = false;
-		root.pendingCommitEntries = [];
-	}
-
-	function commitVisualOrder(entries) {
-		const list = [];
-
-		for (let i = 0; i < entries.length; i++)
-			list.push(entries[i].entry);
-
-		root.object[root.setting] = list;
-		Config.save();
-		root.rebuildVisualEntries();
-	}
-
-	function endVisualDrag() {
-		const entries = root.visualEntries.slice();
-		const finalIndex = root.indexForUid(root.draggedUid);
-		const finalItem = listView.itemAtIndex(finalIndex);
-
-		root.dragActive = false;
-
-		if (!finalItem) {
-			root.pendingCommitEntries = entries;
-			root.finishVisualDrag();
-			return;
-		}
-
-		const pos = finalItem.mapToItem(root, 0, 0);
-
-		root.pendingCommitEntries = entries;
-		root.dropAnimating = true;
-		settleX.to = pos.x;
-		settleY.to = pos.y;
-		settleAnim.start();
-	}
-
 	function ensureVisualEntries() {
 		if (!root.dragActive && !root.dropAnimating)
 			root.rebuildVisualEntries();
 	}
 
-	function finishVisualDrag() {
-		const entries = root.pendingCommitEntries.slice();
-
-		root.dragActive = false;
-		root.dropAnimating = false;
-		root.draggedUid = "";
-		root.draggedModelData = null;
-		root.pendingCommitEntries = [];
-		root.dragHeight = 0;
-
-		root.commitVisualOrder(entries);
-	}
-
 	function iconForId(id) {
 		switch (id) {
 		case "workspaces":
@@ -153,7 +92,7 @@ Item {
 		case "spacer":
 			return qsTr("Spacer");
 		case "activeWindow":
-			return qsTr("Active window");
+			return qsTr("Title");
 		case "tray":
 			return qsTr("Tray");
 		case "upower":
@@ -163,34 +102,14 @@ Item {
 		case "clock":
 			return qsTr("Clock");
 		case "notifBell":
-			return qsTr("Notification bell");
+			return qsTr("Notifs");
+		case "hyprsunset":
+			return qsTr("Night light");
 		default:
 			return id;
 		}
 	}
 
-	function moveArrayItem(list, from, to) {
-		const next = list.slice();
-		const [item] = next.splice(from, 1);
-		next.splice(to, 0, item);
-		return next;
-	}
-
-	function previewVisualMove(from, hovered, before) {
-		let to = hovered + (before ? 0 : 1);
-
-		if (to > from)
-			to -= 1;
-
-		to = Math.max(0, Math.min(visualModel.items.count - 1, to));
-
-		if (from === to)
-			return;
-
-		visualModel.items.move(from, to);
-		root.visualEntries = root.moveArrayItem(root.visualEntries, from, to);
-	}
-
 	function rebuildVisualEntries() {
 		const entries = root.object[root.setting] ?? [];
 		const next = [];
@@ -225,7 +144,6 @@ Item {
 		list[index] = entry;
 		root.object[root.setting] = list;
 		Config.save();
-		root.ensureVisualEntries();
 	}
 
 	Layout.fillWidth: true
@@ -233,7 +151,7 @@ Item {
 
 	Component.onCompleted: root.rebuildVisualEntries()
 
-	Rectangle {
+	CustomRect {
 		anchors.fill: parent
 		anchors.margins: -Appearance.padding.smaller
 		color: DynamicColors.palette.m3primaryContainer
@@ -248,39 +166,12 @@ Item {
 		}
 	}
 
-	ParallelAnimation {
+	RowLayout {
-		id: settleAnim
-
-		onFinished: root.finishVisualDrag()
-
-		Anim {
-			id: settleX
-
-			duration: Appearance.anim.durations.normal
-			property: "dragX"
-			target: root
-		}
-
-		Anim {
-			id: settleY
-
-			duration: Appearance.anim.durations.normal
-			property: "dragY"
-			target: root
-		}
-	}
-
-	ColumnLayout {
 		id: layout
 
 		anchors.fill: parent
-		spacing: Appearance.spacing.smaller
 
-		CustomText {
+		// spacing: Appearance.spacing.smaller
-			Layout.fillWidth: true
-			font.pointSize: Appearance.font.size.larger
-			text: root.name
-		}
 
 		DelegateModel {
 			id: visualModel
@@ -293,248 +184,40 @@ Item {
 			}
 		}
 
-		ListView {
+		Repeater {
-			id: listView
+			delegate: entryDelegate
-
-			Layout.fillWidth: true
-			Layout.preferredHeight: contentHeight
-			boundsBehavior: Flickable.StopAtBounds
-			clip: false
-			implicitHeight: contentHeight
-			implicitWidth: width
-			interactive: !(root.dragActive || root.dropAnimating)
 			model: visualModel
-			spacing: Appearance.spacing.small
-
-			add: Transition {
-				Anim {
-					properties: "opacity,scale"
-					to: 1
-				}
-			}
-			addDisplaced: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-			displaced: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-			move: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-			removeDisplaced: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-		}
-	}
-
-	Loader {
-		active: root.dragActive || root.dropAnimating
-		asynchronous: false
-
-		sourceComponent: Item {
-			Drag.active: root.dragActive
-			Drag.hotSpot.x: width / 2
-			Drag.hotSpot.y: height / 2
-			height: proxyRect.implicitHeight
-			implicitHeight: proxyRect.implicitHeight
-			implicitWidth: listView.width
-			visible: root.draggedModelData !== null
-			width: listView.width
-			x: root.dragX
-			y: root.dragY
-			z: 100
-
-			Drag.source: QtObject {
-				property string uid: root.draggedUid
-				property int visualIndex: root.indexForUid(root.draggedUid)
-			}
-
-			CustomRect {
-				id: proxyRect
-
-				color: DynamicColors.tPalette.m3surface
-				implicitHeight: proxyRow.implicitHeight + Appearance.padding.small * 2
-				implicitWidth: parent.width
-				opacity: 0.95
-				radius: Appearance.rounding.normal
-				width: parent.width
-
-				RowLayout {
-					id: proxyRow
-
-					anchors.fill: parent
-					anchors.margins: Appearance.padding.small
-					spacing: Appearance.spacing.normal
-
-					CustomRect {
-						color: Qt.alpha(DynamicColors.palette.m3onSurface, 0.12)
-						implicitHeight: 32
-						implicitWidth: implicitHeight
-						radius: Appearance.rounding.small
-
-						MaterialIcon {
-							anchors.centerIn: parent
-							color: DynamicColors.palette.m3onSurfaceVariant
-							text: "drag_indicator"
-						}
-					}
-
-					MaterialIcon {
-						color: DynamicColors.palette.m3onSurfaceVariant
-						text: root.iconForId(root.draggedModelData?.entry?.id ?? "")
-					}
-
-					CustomText {
-						Layout.fillWidth: true
-						font.pointSize: Appearance.font.size.larger
-						text: root.labelForId(root.draggedModelData?.entry?.id ?? "")
-					}
-
-					CustomSwitch {
-						checked: root.draggedModelData?.entry?.enabled ?? true
-						enabled: false
-					}
-				}
-			}
 		}
 	}
 
 	Component {
 		id: entryDelegate
 
-		DropArea {
+		IconButton {
-			id: slot
+			required property int index
-
-			readonly property var entryData: modelData.entry
 			required property var modelData
-			readonly property string uid: modelData.uid
 
-			function previewReorder(drag) {
-				const source = drag.source;
-				if (!source || !source.uid || source.uid === slot.uid)
-					return;
-
-				const from = source.visualIndex;
-				const hovered = slot.DelegateModel.itemsIndex;
-
-				if (from < 0 || hovered < 0)
-					return;
-
-				root.previewVisualMove(from, hovered, drag.y < height / 2);
-			}
-
-			height: entryRow.implicitHeight
-			implicitHeight: entryRow.implicitHeight
-			implicitWidth: listView.width
-			width: ListView.view ? ListView.view.width : listView.width
-
-			onEntered: drag => previewReorder(drag)
-			onPositionChanged: drag => previewReorder(drag)
-
-			CustomRect {
-				id: entryRow
-
-				anchors.fill: parent
-				color: DynamicColors.tPalette.m3surface
-				implicitHeight: entryLayout.implicitHeight + Appearance.padding.small * 2
-				implicitWidth: parent.width
-				opacity: root.draggedUid === slot.uid ? 0 : 1
-				radius: Appearance.rounding.full
-
-				Behavior on opacity {
-					Anim {
-					}
-				}
-
-				RowLayout {
-					id: entryLayout
-
-					anchors.fill: parent
-					anchors.margins: Appearance.padding.small
-					spacing: Appearance.spacing.normal
-
-					CustomRect {
-						id: handle
-
-						color: Qt.alpha(DynamicColors.palette.m3onSurface, handleDrag.active ? 0.12 : handleHover.hovered ? 0.09 : 0.06)
-						implicitHeight: 32
-						implicitWidth: implicitHeight
-						radius: Appearance.rounding.full
-
-						Behavior on color {
-							CAnim {
-							}
-						}
-
-						MaterialIcon {
-							anchors.centerIn: parent
-							color: DynamicColors.palette.m3onSurfaceVariant
-							text: "drag_indicator"
-						}
-
-						HoverHandler {
-							id: handleHover
-
-							cursorShape: handleDrag.active ? Qt.ClosedHandCursor : Qt.OpenHandCursor
-						}
-
-						DragHandler {
-							id: handleDrag
-
-							enabled: true
-							grabPermissions: PointerHandler.CanTakeOverFromAnything
-							target: null
-							xAxis.enabled: false
-							yAxis.enabled: true
-
-							onActiveChanged: {
-								if (active) {
-									root.beginVisualDrag(slot.uid, slot.modelData, entryRow);
-								} else if (root.draggedUid === slot.uid) {
-									root.endVisualDrag();
-								}
-							}
-							onActiveTranslationChanged: {
-								if (!active || root.draggedUid !== slot.uid)
-									return;
-
-								root.dragX = root.dragStartX;
-								root.dragY = root.dragStartY + activeTranslation.y;
-							}
-						}
-					}
-
-					MaterialIcon {
-						color: DynamicColors.palette.m3onSurfaceVariant
-						text: root.iconForId(slot.entryData.id)
-					}
-
-					CustomText {
 			Layout.fillWidth: true
-						font.pointSize: Appearance.font.size.larger
+			Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? 18 : internalChecked ? 7 : 0)
-						text: root.labelForId(slot.entryData.id)
+			checked: modelData.entry.enabled ?? true
+			font: Appearance.font.family.sans
+			// icon: root.iconForId(modelData.entry.id)
+			icon: root.labelForId(modelData.entry.id)
+			inactiveColour: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2)
+			radius: stateLayer.pressed ? 6 / 2 : internalChecked ? 6 : 8
+			radiusAnim.duration: MaterialEasing.expressiveEffectsTime
+			radiusAnim.easing.bezierCurve: MaterialEasing.expressiveEffects
+			toggle: true
+			visible: !["spacer", "upower", "dash", "audio"].some(prefix => modelData.entry.id.startsWith(prefix))
+
+			Behavior on Layout.preferredWidth {
+				Anim {
+					duration: MaterialEasing.expressiveEffectsTime
+					easing.bezierCurve: MaterialEasing.expressiveEffects
+				}
 			}
 
-					CustomSwitch {
+			onClicked: root.updateEntry(index, internalChecked)
-						Layout.rightMargin: Appearance.padding.small
-						checked: slot.entryData.enabled ?? true
-
-						onToggled: root.updateEntry(slot.DelegateModel.itemsIndex, checked)
-					}
-				}
-			}
 		}
 	}
 }

Modules/Settings/Controls/SettingInput.qml

@@ -59,7 +59,7 @@ Item {
 			id: rect
 
 			Layout.preferredHeight: 33
-			Layout.preferredWidth: Math.max(Math.min(textField.contentWidth + Appearance.padding.normal * 2, 550), 50)
+			Layout.preferredWidth: Math.max(Math.min(textField.contentWidth + Appearance.padding.large * 2, 550), 50)
 			color: DynamicColors.tPalette.m3surfaceContainerHigh
 			radius: Appearance.rounding.full
 
@@ -68,7 +68,7 @@ Item {
 
 				anchors.centerIn: parent
 				horizontalAlignment: Text.AlignHCenter
-				implicitWidth: Math.min(contentWidth, 550)
+				implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, 550)
 				text: root.formattedValue()
 
 				onEditingFinished: {

Modules/Settings/Controls/SettingList.qml

@@ -10,6 +10,7 @@ Item {
 	required property var modelData
 
 	signal addActiveActionRequested
+	signal deleteRequested(int index)
 	signal fieldEdited(string key, var value)
 
 	Layout.fillWidth: true
@@ -65,42 +66,64 @@ Item {
 
 			HoverHandler {
 				id: nameHover
+			}
 
+			HoverIconButton {
+				id: editButton
+
+				anchors.left: parent.left
+				anchors.verticalCenter: parent.verticalCenter
+				font.pointSize: Appearance.font.size.large
+				icon: "edit"
+				shouldBeVisible: nameHover.hovered && !nameCell.editing
+
+				onClicked: nameCell.beginEdit()
 			}
 
 			CustomText {
 				anchors.left: parent.left
-				anchors.right: editButton.left
+				anchors.leftMargin: nameHover.hovered ? editButton.width + Appearance.spacing.smaller * 2 : 0
+				anchors.right: deleteButton.left
 				anchors.rightMargin: Appearance.spacing.small
 				anchors.verticalCenter: parent.verticalCenter
 				elide: Text.ElideRight    // enable if CustomText supports it
 				font.pointSize: Appearance.font.size.larger
 				text: root.modelData.name
 				visible: !nameCell.editing
+
+				Behavior on anchors.leftMargin {
+					Anim {
+					}
+				}
 			}
 
-			IconButton {
+			HoverIconButton {
-				id: editButton
+				id: deleteButton
 
 				anchors.right: parent.right
 				anchors.verticalCenter: parent.verticalCenter
 				font.pointSize: Appearance.font.size.large
-				icon: "edit"
+				icon: "delete"
-				visible: nameHover.hovered && !nameCell.editing
+				shouldBeVisible: nameHover.hovered && !nameCell.editing
 
-				onClicked: nameCell.beginEdit()
+				onClicked: root.deleteRequested(root.index)
 			}
 
 			CustomRect {
-				anchors.fill: parent
+				anchors.left: parent.left
+				anchors.verticalCenter: parent.verticalCenter
 				color: DynamicColors.tPalette.m3surface
+				implicitHeight: nameEditor.implicitHeight + (Appearance.padding.normal * 2)
+				implicitWidth: Math.min(nameEditor.contentWidth + (Appearance.padding.normal * 2), parent.width - Appearance.padding.normal)
 				radius: Appearance.rounding.small
 				visible: nameCell.editing
 
 				CustomTextField {
 					id: nameEditor
 
-					anchors.fill: parent
+					anchors.centerIn: parent
+					horizontalAlignment: Text.AlignHCenter
+					implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, nameCell.width - Appearance.padding.normal)
 					text: nameCell.draftName
 
 					Keys.onEscapePressed: {

Modules/Settings/Controls/SettingListView.qml

@@ -0,0 +1,140 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import qs.Config
+import qs.Components
+
+Item {
+	id: root
+
+	required property string name
+	required property var object
+	required property string setting
+
+	Layout.fillWidth: true
+	Layout.preferredHeight: row.height
+
+	RowLayout {
+		id: row
+
+		anchors.left: parent.left
+		anchors.margins: Appearance.padding.small
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+
+		CustomText {
+			id: text
+
+			Layout.fillWidth: true
+			font.pointSize: Appearance.font.size.larger
+			text: root.name
+		}
+
+		CustomClippingRect {
+			id: fontArea
+
+			Layout.preferredHeight: 42 * 6 + Appearance.padding.normal * 2 + Appearance.spacing.small * 5
+			Layout.preferredWidth: 500
+			color: DynamicColors.tPalette.m3surfaceContainer
+			radius: (21 + Appearance.padding.normal) * Appearance.rounding.scale
+
+			CustomRect {
+				id: searchBox
+
+				anchors.left: parent.left
+				anchors.margins: Appearance.padding.normal
+				anchors.right: parent.right
+				anchors.top: parent.top
+				color: DynamicColors.tPalette.m3surfaceContainer
+				implicitHeight: 42
+				radius: Appearance.rounding.full
+
+				MaterialIcon {
+					id: searchIcon
+
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.leftMargin: Appearance.padding.large
+					anchors.top: parent.top
+					font.pointSize: Appearance.font.size.large
+					text: "search"
+					verticalAlignment: Text.AlignVCenter
+				}
+
+				CustomTextField {
+					id: fontSearch
+
+					anchors.left: searchIcon.right
+					anchors.leftMargin: Appearance.spacing.small
+					anchors.right: parent.right
+					anchors.rightMargin: Appearance.spacing.normal
+					anchors.verticalCenter: parent.verticalCenter
+					placeholderText: "Search..."
+				}
+			}
+
+			CustomClippingRect {
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.margins: Appearance.padding.normal
+				anchors.right: parent.right
+				anchors.top: searchBox.bottom
+				bottomLeftRadius: 21
+				bottomRightRadius: 21
+
+				CustomListView {
+					anchors.fill: parent
+					clip: true
+					spacing: Appearance.spacing.small
+
+					delegate: CustomRect {
+						id: fontDelegate
+
+						required property string modelData
+
+						anchors.left: parent.left
+						anchors.right: parent.right
+						implicitHeight: 42
+						radius: Appearance.rounding.smallest
+
+						CustomText {
+							anchors.fill: parent
+							anchors.leftMargin: Appearance.padding.normal
+							text: modelData
+							verticalAlignment: Text.AlignVCenter
+						}
+
+						MaterialIcon {
+							anchors.fill: parent
+							anchors.rightMargin: Appearance.padding.normal
+							color: DynamicColors.palette.m3primary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignRight
+							text: "check_circle"
+							verticalAlignment: Text.AlignVCenter
+							visible: root.object[root.setting] === fontDelegate.modelData
+						}
+
+						StateLayer {
+							onClicked: {
+								root.object[root.setting] = fontDelegate.modelData;
+								Config.save();
+							}
+						}
+					}
+					model: ScriptModel {
+						values: {
+							const fonts = Qt.fontFamilies();
+							const search = fontSearch.text;
+							var regex = new RegExp(search, "i");
+
+							return fonts.filter(n => regex.test(n));
+						}
+					}
+				}
+			}
+		}
+	}
+}

Modules/Settings/Controls/SettingsPage.qml

@@ -4,7 +4,7 @@ import qs.Components
 import qs.Config
 import qs.Helpers
 
-CustomFlickable {
+CustomClippingRect {
 	id: root
 
 	default property alias contentData: clayout.data
@@ -17,7 +17,7 @@ CustomFlickable {
 			if (section.sectionId === sectionId) {
 				// Scroll to the section with some padding
 				const targetY = section.y - Appearance.padding.normal;
-				contentY = Math.max(0, Math.min(targetY, contentHeight - height));
+				flickable.contentY = Math.max(0, Math.min(targetY, flickable.contentHeight - flickable.height));
 
 				// Use the singleton to highlight the setting
 				SettingsHighlight.highlight(settingName);
@@ -27,8 +27,19 @@ CustomFlickable {
 		return false;
 	}
 
+	radius: Appearance.rounding.normal - Appearance.padding.smaller
+
+	CustomFlickable {
+		id: flickable
+
+		anchors.fill: parent
+		clip: true
 		contentHeight: clayout.implicitHeight
 
+		CustomScrollBar.vertical: CustomScrollBar {
+			flickable: flickable
+		}
+
 		TapHandler {
 			acceptedButtons: Qt.LeftButton
 
@@ -57,3 +68,4 @@ CustomFlickable {
 			spacing: Appearance.spacing.small
 		}
 	}
+}

Modules/Settings/Controls/WallpaperCropper.qml

@@ -0,0 +1,114 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Quickshell
+import qs.Config
+import qs.Components
+import qs.Helpers
+
+Item {
+	id: root
+
+	Image {
+		id: imageView
+
+		property real displayH: paintedHeight
+		property real displayW: paintedWidth
+		property real displayX: (width - paintedWidth) * 0.5
+		property real displayY: (height - paintedHeight) * 0.5
+		property real scaleX: sourceW / displayW
+		property real scaleY: sourceH / displayH
+		property real sourceH: Quickshell.screens[0].height
+		property real sourceW: Quickshell.screens[0].width
+
+		anchors.fill: parent
+		fillMode: Image.PreserveAspectFit
+		smooth: true
+		source: Wallpapers.current
+	}
+
+	Item {
+		id: overlay
+
+		clip: true
+		height: imageView.displayH
+		width: imageView.displayW
+		x: imageView.displayX
+		y: imageView.displayY
+
+		CustomRect {
+			id: cropRect
+
+			property real aspectRatio: Quickshell.screens[0].width / Quickshell.screens[0].height
+			readonly property rect sourceRect: Qt.rect(x * imageView.scaleX, y * imageView.scaleY, width * imageView.scaleX, height * imageView.scaleY)
+			property real zoom: Config.background.zoom
+
+			function clampToBounds() {
+				x = Math.max(0, Math.min(x, overlay.width - width));
+
+				y = Math.max(0, Math.min(y, overlay.height - height));
+			}
+
+			border.color: DynamicColors.palette.m3primary
+			border.width: 2
+			color: DynamicColors.tPalette.m3primary
+			height: width / aspectRatio
+			radius: Appearance.rounding.small
+			visible: imageView.status === Image.Ready
+			width: Math.min(overlay.width / zoom, overlay.height * aspectRatio / zoom)
+			x: Config.background.sourceClipX / imageView.scaleX
+			y: Config.background.sourceClipY / imageView.scaleY
+		}
+
+		MouseArea {
+			function updateCrop(mouseX, mouseY) {
+				let nx = mouseX - cropRect.width * 0.5;
+				let ny = mouseY - cropRect.height * 0.5;
+
+				nx = Math.max(0, Math.min(nx, overlay.width - cropRect.width));
+
+				ny = Math.max(0, Math.min(ny, overlay.height - cropRect.height));
+
+				cropRect.x = nx;
+				cropRect.y = ny;
+			}
+
+			anchors.fill: parent
+			hoverEnabled: true
+			preventStealing: true
+
+			onPositionChanged: mouse => {
+				if (pressed)
+					updateCrop(mouse.x, mouse.y);
+			}
+			onPressed: mouse => {
+				updateCrop(mouse.x, mouse.y);
+			}
+			onReleased: {
+				Wallpapers.recentlyChanged = false;
+				Config.background.sourceClipX = cropRect.sourceRect.x;
+				Config.background.sourceClipY = cropRect.sourceRect.y;
+				Config.background.sourceClipW = cropRect.sourceRect.width;
+				Config.background.sourceClipH = cropRect.sourceRect.height;
+				Config.save();
+			}
+			onWheel: wheel => {
+				let oldCenterX = cropRect.x + cropRect.width * 0.5;
+				let oldCenterY = cropRect.y + cropRect.height * 0.5;
+
+				if (wheel.angleDelta.y > 0)
+					cropRect.zoom *= 1.1;
+				else
+					cropRect.zoom /= 1.1;
+
+				cropRect.zoom = Math.max(1.0, Math.min(cropRect.zoom, 10.0));
+				Config.background.zoom = cropRect.zoom;
+
+				cropRect.x = oldCenterX - cropRect.width * 0.5;
+				cropRect.y = oldCenterY - cropRect.height * 0.5;
+
+				cropRect.clampToBounds();
+			}
+		}
+	}
+}

Modules/Settings/Controls/WallpaperGrid.qml

@@ -0,0 +1,146 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Models
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+GridView {
+	id: root
+
+	readonly property int columnsCount: Math.max(1, Math.floor(width / minCellWidth))
+	readonly property int minCellWidth: 200 + Appearance.spacing.normal
+
+	Layout.preferredHeight: contentHeight
+	cellHeight: 140 + Appearance.spacing.normal
+	cellWidth: width / columnsCount
+	clip: true
+	interactive: false
+	model: Wallpapers.list
+
+	delegate: Item {
+		required property int index
+		readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent
+		readonly property real itemMargin: Appearance.spacing.normal / 2
+		readonly property real itemRadius: Appearance.rounding.normal
+		required property var modelData
+
+		height: root.cellHeight
+		width: root.cellWidth
+
+		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
+		}
+
+		CustomClippingRect {
+			id: image
+
+			anchors.bottomMargin: itemMargin
+			anchors.fill: parent
+			anchors.leftMargin: itemMargin
+			anchors.rightMargin: itemMargin
+			anchors.topMargin: itemMargin
+			antialiasing: true
+			color: DynamicColors.tPalette.m3surfaceContainer
+			layer.enabled: true
+			layer.smooth: true
+			radius: itemRadius
+
+			CachingImage {
+				id: cachingImage
+
+				anchors.fill: parent
+				antialiasing: true
+				cache: true
+				fillMode: Image.PreserveAspectCrop
+				opacity: status === Image.Ready ? 1 : 0
+				path: modelData.path
+				smooth: true
+				sourceSize: Qt.size(width, height)
+				visible: opacity > 0
+
+				Behavior on opacity {
+					NumberAnimation {
+						duration: 1000
+						easing.type: Easing.OutQuad
+					}
+				}
+			}
+
+			Image {
+				id: fallbackImage
+
+				anchors.fill: parent
+				antialiasing: true
+				asynchronous: true
+				cache: true
+				fillMode: Image.PreserveAspectCrop
+				opacity: status === Image.Ready && cachingImage.status !== Image.Ready ? 1 : 0
+				smooth: true
+				source: fallbackTimer.triggered && cachingImage.status !== Image.Ready ? modelData.path : ""
+				sourceSize: Qt.size(width, height)
+				visible: opacity > 0
+
+				Behavior on opacity {
+					NumberAnimation {
+						duration: 1000
+						easing.type: Easing.OutQuad
+					}
+				}
+			}
+
+			Timer {
+				id: fallbackTimer
+
+				property bool triggered: false
+
+				interval: 800
+				running: cachingImage.status === Image.Loading || cachingImage.status === Image.Null
+
+				onTriggered: triggered = true
+			}
+		}
+
+		Rectangle {
+			anchors.bottomMargin: itemMargin
+			anchors.fill: parent
+			anchors.leftMargin: itemMargin
+			anchors.rightMargin: itemMargin
+			anchors.topMargin: itemMargin
+			antialiasing: true
+			border.color: DynamicColors.palette.m3primary
+			border.width: isCurrent ? 2 : 0
+			color: "transparent"
+			radius: itemRadius - border.width
+			smooth: true
+
+			Behavior on border.width {
+				NumberAnimation {
+					duration: 150
+					easing.type: Easing.OutQuad
+				}
+			}
+
+			MaterialIcon {
+				anchors.margins: Appearance.padding.small
+				anchors.right: parent.right
+				anchors.top: parent.top
+				color: DynamicColors.palette.m3primary
+				font.pointSize: Appearance.font.size.large
+				text: "check_circle"
+				visible: isCurrent
+			}
+		}
+	}
+}

Modules/Settings/SettingsSearch.qml

@@ -6,7 +6,7 @@ import QtQuick.Controls
 import qs.Components
 import qs.Config
 import "../../scripts/fuzzysort.js" as Fuzzy
-import "./SettingsIndex.mjs" as SettingsIndex
+import "../../scripts/SettingsIndex.mjs" as SettingsIndex
 
 Item {
 	id: root
@@ -51,9 +51,14 @@ Item {
 	implicitHeight: searchContainer.implicitHeight
 	implicitWidth: 200
 
+	Shortcut {
+		sequence: "/"
+
+		onActivated: searchField.forceActiveFocus()
+	}
+
 	ListModel {
 		id: resultsModel
-
 	}
 
 	CustomRect {

Modules/Settings/Wrapper.qml

@@ -7,45 +7,24 @@ import qs.Helpers
 Item {
 	id: root
 
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
+	readonly property bool shouldBeActive: visibilities.settings
 	required property PersistentProperties visibilities
 
-	implicitHeight: 0
+	anchors.topMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth
-	visible: height > 0
+	opacity: 1 - offsetScale
-
+	visible: offsetScale < 1
-	states: State {
-		name: "visible"
-		when: root.visibilities.settings
-
-		PropertyChanges {
-			root.implicitHeight: content.implicitHeight
-		}
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
 
+	Behavior on offsetScale {
 		Anim {
-				duration: MaterialEasing.expressiveEffectsTime
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: MaterialEasing.expressiveEffects
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
 		}
 	}
-	]
 
 	CustomClippingRect {
 		anchors.fill: parent

Modules/Shortcuts.qml

@@ -14,8 +14,8 @@ Scope {
 		description: "Toggle launcher"
 		name: "toggle-launcher"
 
-		onPressed: root.launcherInterrupted = false
+		onPressed: {
-		onReleased: {
+			root.launcherInterrupted = false;
 			if (!root.launcherInterrupted && !root.hasFullscreen) {
 				const visibilities = Visibilities.getForActive();
 				visibilities.launcher = !visibilities.launcher;

Modules/SysTray/Popouts/AudioPopup.qml

@@ -18,193 +18,35 @@ Item {
 	readonly property int topMargin: 0
 	required property var wrapper
 
-	implicitHeight: layout.implicitHeight + Appearance.padding.small * 2
+	implicitHeight: vol.implicitHeight + Appearance.padding.small * 2
-	implicitWidth: layout.implicitWidth + Appearance.padding.small * 2
+	implicitWidth: 400 + Appearance.padding.small * 2
 
 	CustomRect {
 		anchors.left: parent.left
 		anchors.right: parent.right
+		anchors.top: parent.top
 		color: DynamicColors.tPalette.m3surfaceContainer
 		implicitHeight: parent.implicitHeight
 		radius: Appearance.rounding.small
 		y: parent.y
 
 		Behavior on implicitHeight {
-			Anim {
-				duration: MaterialEasing.emphasizedDecelTime
-				easing.bezierCurve: MaterialEasing.emphasized
-			}
-		}
-	}
-
-	ColumnLayout {
-		id: layout
-
-		anchors.centerIn: parent
-		implicitWidth: stack.currentItem ? stack.currentItem.childrenRect.height : 0
-		spacing: 12
-
-		RowLayout {
-			id: tabBar
-
-			property int tabHeight: 36
-
-			Layout.fillWidth: true
-			spacing: 6
-
-			CustomClippingRect {
-				Layout.fillWidth: true
-				Layout.preferredHeight: tabBar.tabHeight
-				color: stack.currentIndex === 0 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
-				radius: root.rounding
-
-				StateLayer {
-					function onClicked(): void {
-						stack.currentIndex = 0;
-					}
-
-					CustomText {
-						anchors.centerIn: parent
-						color: stack.currentIndex === 0 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
-						text: qsTr("Volumes")
-					}
-				}
-			}
-
-			CustomClippingRect {
-				Layout.fillWidth: true
-				Layout.preferredHeight: tabBar.tabHeight
-				color: stack.currentIndex === 1 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
-				radius: root.rounding
-
-				StateLayer {
-					function onClicked(): void {
-						stack.currentIndex = 1;
-					}
-
-					CustomText {
-						anchors.centerIn: parent
-						color: stack.currentIndex === 1 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
-						text: qsTr("Devices")
-					}
-				}
-			}
-		}
-
-		StackLayout {
-			id: stack
-
-			Layout.fillWidth: true
-			Layout.preferredHeight: currentIndex === 0 ? vol.childrenRect.height : dev.childrenRect.height
-			currentIndex: 0
-
-			Behavior on currentIndex {
-				SequentialAnimation {
-					ParallelAnimation {
 			Anim {
 				duration: MaterialEasing.expressiveEffectsTime
-							property: "opacity"
+				easing.bezierCurve: MaterialEasing.expressiveEffects
-							target: stack
-							to: 0
-						}
-
-						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "scale"
-							target: stack
-							to: 0.9
-						}
-					}
-
-					PropertyAction {
-					}
-
-					ParallelAnimation {
-						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "opacity"
-							target: stack
-							to: 1
-						}
-
-						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "scale"
-							target: stack
-							to: 1
-						}
 			}
 		}
 	}
 
 	VolumesTab {
 		id: vol
+
+		anchors.left: parent.left
+		anchors.margins: Appearance.padding.small
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
 	}
 
-			DevicesTab {
-				id: dev
-			}
-		}
-	}
-
-	component DevicesTab: Item {
-		implicitHeight: deviceColumn.height + Appearance.padding.normal
-		implicitWidth: deviceColumn.width + Appearance.padding.normal
-
-		ColumnLayout {
-			id: deviceColumn
-
-			anchors.centerIn: parent
-			spacing: 12
-
-			ButtonGroup {
-				id: sinks
-			}
-
-			ButtonGroup {
-				id: sources
-			}
-
-			CustomText {
-				font.weight: 500
-				text: qsTr("Output device")
-			}
-
-			Repeater {
-				model: Audio.sinks
-
-				CustomRadioButton {
-					required property PwNode modelData
-
-					ButtonGroup.group: sinks
-					checked: Audio.sink?.id === modelData.id
-					text: modelData.description
-
-					onClicked: Audio.setAudioSink(modelData)
-				}
-			}
-
-			CustomText {
-				Layout.topMargin: 10
-				font.weight: 500
-				text: qsTr("Input device")
-			}
-
-			Repeater {
-				model: Audio.sources
-
-				CustomRadioButton {
-					required property PwNode modelData
-
-					ButtonGroup.group: sources
-					checked: Audio.source?.id === modelData.id
-					text: modelData.description
-
-					onClicked: Audio.setAudioSource(modelData)
-				}
-			}
-		}
-	}
 	component VolumesTab: ColumnLayout {
 		spacing: 12
 
@@ -294,13 +136,35 @@ Item {
 			}
 		}
 
-		CustomRect {
+		CustomClippingRect {
 			Layout.fillWidth: true
 			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
 
+			PwNodePeakMonitor {
+				id: sourcePeak
+
+				node: Audio.source
+			}
+
+			CustomRect {
+				id: sourcePeakFill
+
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.top: parent.top
+				color: Qt.alpha(DynamicColors.palette.m3primary, 0.15)
+				implicitWidth: parent.width * sourcePeak.peak
+
+				Behavior on implicitWidth {
+					Anim {
+						duration: MaterialEasing.expressiveEffectsTime
+					}
+				}
+			}
+
 			RowLayout {
 				id: inputVolume
 

Modules/SysTray/Popouts/SubMenu.qml

@@ -0,0 +1,158 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import Quickshell.Widgets
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Effects
+import qs.Components
+import qs.Modules
+import qs.Config
+
+Column {
+	id: menu
+
+	property int biggestWidth: 0
+	required property QsMenuHandle handle
+	required property int level
+	required property PopoutState popouts
+	required property ShellScreen screen
+	property bool shown: true
+
+	height: childrenRect.height
+	opacity: shown ? 1 : 0
+	padding: 0
+	scale: shown ? 1 : 0.8
+	spacing: 4
+	width: biggestWidth
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+
+	QsMenuOpener {
+		id: menuOpener
+
+		menu: menu.handle
+	}
+
+	Repeater {
+		model: menuOpener.children
+
+		CustomRect {
+			id: item
+
+			required property int index
+			required property QsMenuEntry modelData
+
+			color: modelData.isSeparator ? DynamicColors.palette.m3outlineVariant : "transparent"
+			implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight
+			implicitWidth: menu.biggestWidth
+			radius: Appearance.rounding.full
+			visible: index !== (menuOpener.children.values.length - 1) ? true : (modelData.isSeparator ? false : true)
+
+			Loader {
+				id: children
+
+				active: !item.modelData.isSeparator
+				anchors.left: parent.left
+				anchors.right: parent.right
+				asynchronous: true
+
+				sourceComponent: Item {
+					implicitHeight: 30
+
+					StateLayer {
+						function onClicked(): void {
+							const entry = item.modelData;
+							if (entry.hasChildren) {
+								menu.popouts.pushSubmenu(menu.level, entry, item, menu.biggestWidth);
+							} else {
+								entry.triggered();
+								menu.popouts.hasCurrent = false;
+							}
+						}
+
+						disabled: !item.modelData.enabled
+						radius: item.radius
+					}
+
+					Loader {
+						id: icon
+
+						active: item.modelData.icon !== ""
+						anchors.right: parent.right
+						anchors.rightMargin: 10
+						anchors.verticalCenter: parent.verticalCenter
+						asynchronous: true
+
+						sourceComponent: Item {
+							implicitHeight: label.implicitHeight
+							implicitWidth: label.implicitHeight
+
+							IconImage {
+								id: iconImage
+
+								implicitSize: parent.implicitHeight
+								source: item.modelData.icon
+								visible: false
+							}
+
+							MultiEffect {
+								anchors.fill: iconImage
+								colorization: 1.0
+								colorizationColor: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+								source: iconImage
+							}
+						}
+					}
+
+					CustomText {
+						id: label
+
+						anchors.left: parent.left
+						anchors.leftMargin: 10
+						anchors.verticalCenter: parent.verticalCenter
+						color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+						text: labelMetrics.elidedText
+					}
+
+					TextMetrics {
+						id: labelMetrics
+
+						font.family: label.font.family
+						font.pointSize: label.font.pointSize
+						text: item.modelData.text
+
+						Component.onCompleted: {
+							var biggestWidth = menu.biggestWidth;
+							var currentWidth = labelMetrics.width + (item.modelData.icon ?? "" ? 30 : 0) + (item.modelData.hasChildren ? 30 : 0) + 20;
+							if (currentWidth > biggestWidth) {
+								menu.biggestWidth = currentWidth;
+							}
+						}
+					}
+
+					Loader {
+						id: expand
+
+						active: item.modelData.hasChildren
+						anchors.right: parent.right
+						anchors.verticalCenter: parent.verticalCenter
+						asynchronous: true
+
+						sourceComponent: MaterialIcon {
+							color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+							text: "chevron_right"
+						}
+					}
+				}
+			}
+		}
+	}
+}

Modules/SysTray/Popouts/TrayMenuPopout.qml

@@ -0,0 +1,16 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import qs.Components
+import qs.Modules
+import qs.Config
+
+SubMenu {
+	id: root
+
+	handle: trayItem
+	level: 0
+
+	required property QsMenuHandle trayItem
+}