ci: rework Dockerfile image + buildx dep added

-a

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

.gitea/workflows/ci-image.yml

@@ -18,7 +18,7 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Install Docker CLI
-              run: apk add --no-cache docker-cli
+              run: apk add --no-cache docker-cli docker-cli-buildx
 
             - name: Login to registry
               run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login git.aramjonghu.dev --username aramjonghu --password-stdin

.gitea/workflows/cpp.yml

@@ -20,28 +20,10 @@ jobs:
                     -exec clang-format -i --style=file {} +
                   git diff --exit-code && echo "clang-format: passed"
 
-    build:
+    build & lint:
         runs-on: alpine
         container:
             image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
-            - name: Configure
-              run: cmake -B build -G Ninja -DENABLE_MODULES=plugin -DCMAKE_BUILD_TYPE=Release
-
-            - name: Build
-              run: ninja -C build
-
-    clang-tidy:
-        runs-on: alpine
-        container:
-            image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
-
         steps:
             - name: Checkout
               uses: actions/checkout@v4

.gitea/workflows/js-ts.yml

@@ -4,7 +4,7 @@ on:
     pull_request:
 
 jobs:
-    fmt:
+    fmt & lint:
         runs-on: alpine
         container: node:26-alpine
 
@@ -24,20 +24,6 @@ jobs:
                   else
                     echo "No JS/TS files found"
                   fi
-
-    lint:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                    git
-
             - 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

.gitea/workflows/python.yml

@@ -7,7 +7,7 @@ on:
     pull_request:
 
 jobs:
-    static:
+    fmt & lint:
         runs-on: debian
         container: node:26-trixie-slim
 
@@ -33,7 +33,7 @@ jobs:
                   . .venv/bin/activate
                   ruff check .
 
-    verify:
+    test & nuitka build:
         if: always()
         runs-on: debian
         container: node:26-trixie-slim

.gitea/workflows/rust.yml

@@ -3,8 +3,9 @@ name: Rust
 on:
     pull_request:
 
+# jobs can be separated if we integrate tests
 jobs:
-    build:
+    build, clippy & fmt:
         runs-on: alpine
         container: node:26-alpine
         env:
@@ -34,7 +35,9 @@ jobs:
                   apk add --no-cache \
                     git \
                     cargo \
-                    rust
+                    rust \
+                    rust-clippy \
+                    rustfmt
 
             - name: Cargo check
               run: |
@@ -50,90 +53,6 @@ jobs:
                   else
                     echo "No Rust project found"
                   fi
-
-    fmt:
-        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-fmt-${{ runner.os }}-${{ 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
-
-            - name: Format check
-              run: |
-                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
-                    status=0
-                    for manifest in $(find . -name "Cargo.toml"); do
-                      cargo fmt --manifest-path "$manifest" --check && \
-                        echo "$manifest: formatting OK" || \
-                        { echo "$manifest: needs formatting"; 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
-
-    clippy:
-        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-clippy-${{ runner.os }}-${{ 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 \
-                    rust-clippy
-
             - name: Clippy
               run: |
                   if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
@@ -150,3 +69,19 @@ jobs:
                   else
                     echo "No Rust project found"
                   fi
+            - name: Format check
+              run: |
+                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    status=0
+                    for manifest in $(find . -name "Cargo.toml"); do
+                      cargo fmt --manifest-path "$manifest" --check && \
+                        echo "$manifest: formatting OK" || \
+                        { echo "$manifest: needs formatting"; 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

CMakeLists.txt

@@ -50,7 +50,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(QT_NO_PRIVATE_MODULE_WARNING ON)
 set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
 
 set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")

Components/ClipRect.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import Quickshell
 import ZShell.Components
 
 Item {
@@ -20,7 +19,7 @@ Item {
 	}
 
 	ShaderEffectSource {
-		id: src
+		id: source
 
 		hideSource: true
 		sourceItem: contentItem
@@ -28,7 +27,7 @@ Item {
 
 	RoundedMask {
 		anchors.fill: parent
-		source: src
+		source: source
 		topLeftRadius: root.topLeftRadius
 		topRightRadius: root.topRightRadius
 		bottomRightRadius: root.bottomRightRadius

Components/HorizontalScrollBarTrack.qml

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

Components/Menu.qml

@@ -34,7 +34,7 @@ MouseArea {
 	cursorShape: expanded ? Qt.ArrowCursor : undefined
 	enabled: expanded
 	hoverEnabled: expanded
-	layer.enabled: false
+	layer.enabled: opacity < 1
 	opacity: expanded ? 1 : 0
 	parent: {
 		const win = QsWindow.window;
@@ -101,7 +101,8 @@ MouseArea {
 			yScale: root.expanded ? 1 : 0.1
 
 			Behavior on yScale {
-				Anim {}
+				Anim {
+				}
 			}
 		}
 
@@ -136,7 +137,8 @@ MouseArea {
 						radius: menu.radius - column.anchors.margins
 
 						Behavior on radius {
-							Anim {}
+							Anim {
+							}
 						}
 
 						StateLayer {

Components/TextFieldBase.qml

@@ -12,7 +12,7 @@ TextField {
 	implicitHeight: contentHeight + topPadding + bottomPadding
 	implicitWidth: contentWidth + leftPadding + rightPadding
 	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
-	renderType: TextField.QtRendering
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.QtRendering
 	selectedTextColor: color
 	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
 	verticalAlignment: TextInput.AlignVCenter

Components/VerticalFadeFlickable.qml

@@ -30,7 +30,7 @@ CustomFlickable {
 			type: Anim.SlowEffects
 		}
 	}
-	layer.textureSize: Qt.size(width * dpr, height * dpr)
+	// layer.textureSize: Qt.size(width * dpr, height * dpr)
 	layer.effect: Mask {
 		maskSource: mask
 

Components/VerticalScrollBarTrack.qml

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

Drawers/Exclusions.qml

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

Drawers/Panels.qml

@@ -19,11 +19,15 @@ import ZShell.Config
 Item {
 	id: root
 
+	required property Item bar
+	required property real borderThickness
 	readonly property alias clipboard: clipboard
 	readonly property alias dashboard: dashboard
 	readonly property alias dashboardWrapper: dashboardWrapper
 	readonly property alias dock: dock
 	readonly property alias drawing: drawing
+	required property var drawingItem
+	required property EdgeGeometry geometry
 	readonly property alias launcher: launcher
 	readonly property alias notifications: notifications
 	readonly property alias osd: osd
@@ -32,19 +36,14 @@ Item {
 	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
+	required property ShellScreen screen
+	required property ScreenState screenState
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
 
-	required property Item bar
-	required property real borderThickness
-	required property var drawingItem
-	required property EdgeGeometry geometry
-	required property ShellScreen screen
-	required property ScreenState screenState
-
 	anchors.bottomMargin: geometry.insetBottom(borderThickness)
 	anchors.fill: parent
 	anchors.leftMargin: geometry.insetLeft(borderThickness)

Greeter/Center.qml

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

Greeter/Components/CircularIndicator.qml

@@ -20,7 +20,7 @@ BusyIndicator {
 	property int animState
 	property color bgColor: Colors.palette.m3secondaryContainer
 	property color fgColor: Colors.palette.m3primary
-	property real implicitSize: Tokens.font.body.medium.pointSize * 3
+	property real implicitSize: Tokens.font.size.normal * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
 	property real strokeWidth: Tokens.padding.extraSmall * 0.8

Greeter/Components/ClipRect.qml

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

Greeter/Components/CustomFlickable.qml

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

Greeter/Components/CustomListView.qml

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

Greeter/Components/CustomMouseArea.qml

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

Greeter/Components/CustomRect.qml

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

Greeter/Components/CustomText.qml

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

Greeter/Components/CustomTextField.qml

@@ -1,305 +1,76 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtQuick.Shapes
+import QtQuick.Controls
 import ZShell.Config
 import qs.Services
 
-TextFieldBase {
+TextField {
 	id: root
 
-	enum TextFieldType {
+	background: null
-		Outlined,
+	color: Colors.palette.m3onSurface
-		Filled
+	cursorVisible: !readOnly
-	}
+	font.family: Config.appearance.font.family.sans
+	font.pointSize: Tokens.font.size.smaller
+	placeholderTextColor: Colors.palette.m3outline
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
 
-	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
+	Behavior on color {
-	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
+		CAnim {
-	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
-	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
-	readonly property real smallFontScale: smallFontSize / font.pointSize
-	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
-	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
-	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
-
-	property int horizontalPadding: Tokens.padding.large
-	property int verticalPadding: Tokens.padding.large
-
-	property int radius: Tokens.rounding.small
-
-	property string supportingText
-	property string trailingIcon
-	property int smallFontSize: Tokens.font.label.small.pointSize
-
-	property int type: CustomTextField.Outlined
-	property var validate // Regex or function
-	property bool emptyIsValid: true
-	property string errorText
-	property bool isError
-	property string leadingIcon
-
-	bottomPadding: verticalPadding + supportingTextOffset - filledOffset
-	leftPadding: horizontalPadding + leadingOffset
-	rightPadding: horizontalPadding + trailingOffset
-	topPadding: verticalPadding + filledOffset
-
-	background: Loader {
-		anchors.bottomMargin: root.supportingTextOffset
-		anchors.fill: parent
-		sourceComponent: root.type === CustomTextField.Filled ? filledComp : outlineComp
-
-		StateLayer {
-			id: stateLayer
-
-			cursorShape: Qt.IBeamCursor
-			enabled: !root.activeFocus
-			manualPressOverride: tapHandler.pressed
-			radius: root.type === CustomTextField.Outlined ? root.clampedRadius : 0
-			topLeftRadius: root.clampedRadius
-			topRightRadius: root.clampedRadius
-
-			onClicked: root.focus = true
 		}
 	}
+	cursorDelegate: CustomRect {
+		id: cursor
 
-	onEditingFinished: {
+		property bool disableBlink
-		if (!valid)
-			isError = true;
-	}
-	onPressed: {
-		if (stateLayer.enabled)
-			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
-	}
-	onTextEdited: {
-		if (isError)
-			isError = false;
-	}
 
-	Item {
+		color: Colors.palette.m3primary
-		id: contentWrapper
+		implicitWidth: 2
+		radius: Tokens.rounding.medium
 
-		anchors.bottomMargin: root.supportingTextOffset
+		Behavior on opacity {
-		anchors.fill: parent
+			Anim {
-
+				duration: Tokens.anim.durations.small
-		CustomText {
-			id: placeholder
-
-			anchors.left: parent.left
-			anchors.leftMargin: root.leftPadding
-			anchors.topMargin: Tokens.padding.extraSmall
-			anchors.verticalCenter: parent.verticalCenter
-			color: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : root.text ? Colors.palette.m3outline : root.placeholderTextColor)
-			font.family: root.font.family
-			font.pointSize: root.font.pointSize
-			font.variableAxes: root.font.variableAxes
-			font.weight: root.font.weight
-			renderType: Text.QtRendering
-			text: root.placeholderText
-
-			states: [
-				State {
-					name: "smallOutlined"
-					when: root.type === CustomTextField.Outlined && (root.activeFocus || root.text)
-
-					PropertyChanges {
-						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding
-						placeholder.scale: root.smallFontScale
-					}
-
-					AnchorChanges {
-						anchors.verticalCenter: contentWrapper.top
-						target: placeholder
-					}
-				},
-				State {
-					name: "smallFilled"
-					when: root.type === CustomTextField.Filled && (root.activeFocus || root.text)
-
-					PropertyChanges {
-						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding + root.leadingOffset
-						placeholder.scale: root.smallFontScale
-					}
-
-					AnchorChanges {
-						anchors.top: contentWrapper.top
-						anchors.verticalCenter: undefined
-						target: placeholder
-					}
-				}
-			]
-			transitions: Transition {
-				Anim {
-					properties: "scale,leftMargin"
-					type: Anim.DefaultEffects
-				}
-
-				AnchorAnim {
-					duration: Tokens.anim.durations.expressiveDefaultEffects
-					easing: Tokens.anim.expressiveDefaultEffects
-				}
 			}
 		}
 
-		Loader {
+		Connections {
-			id: leadingIconLoader
+			function onCursorPositionChanged(): void {
-
+				if (root.activeFocus && root.cursorVisible) {
-			active: root.leadingIcon
+					cursor.opacity = 1;
-			anchors.left: parent.left
+					cursor.disableBlink = true;
-			anchors.leftMargin: Tokens.padding.small
+					enableBlink.restart();
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				text: root.leadingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
-			}
-		}
-
-		Loader {
-			id: trailingIconLoader
-
-			active: root.trailingIcon
-			anchors.right: parent.right
-			anchors.rightMargin: Tokens.padding.small
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				text: root.trailingIcon
-				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
-			}
-		}
-	}
-
-	Loader {
-		id: supportingTextLoader
-
-		active: root.effectiveSupportingText
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
-		anchors.leftMargin: root.horizontalPadding
-
-		sourceComponent: CustomText {
-			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
-			font: Tokens.font.label.small
-			text: root.effectiveSupportingText
-		}
-	}
-
-	TapHandler {
-		id: tapHandler
-	}
-
-	Component {
-		id: outlineComp
-
-		Shape {
-			id: bg
-
-			asynchronous: true
-			preferredRendererType: Shape.CurveRenderer
-
-			ShapePath {
-				id: path
-
-				readonly property real inset: strokeWidth / 2
-				readonly property real outlineGap: placeholder.width * root.smallFontScale + Tokens.spacing.small * 2
-				property real outlineGapScale: root.activeFocus || root.text ? 1 : 0
-
-				capStyle: ShapePath.RoundCap
-				fillColor: "transparent"
-				startX: path.inset + root.horizontalPadding - root.clampedRadius + path.outlineGap * (1 - path.outlineGapScale) / 2 + path.outlineGap * path.outlineGapScale
-				startY: path.inset
-				strokeColor: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
-				strokeWidth: root.activeFocus ? 2 : 1
-
-				Behavior on outlineGapScale {
-					Anim {
-						type: Anim.DefaultEffects
-					}
-				}
-				Behavior on strokeColor {
-					CAnim {}
-				}
-				Behavior on strokeWidth {
-					Anim {}
-				}
-
-				PathLine {
-					x: bg.width - path.inset - root.clampedRadius
-					y: path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathLine {
-					x: bg.width - path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset - root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathLine {
-					x: path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset + root.clampedRadius
-					y: path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.horizontalPadding - root.clampedRadius / 2 + path.outlineGap * (1 - path.outlineGapScale) / 2
-					y: path.inset
 				}
 			}
+
+			target: root
+		}
+
+		Timer {
+			id: enableBlink
+
+			interval: 100
+
+			onTriggered: cursor.disableBlink = false
+		}
+
+		Timer {
+			interval: 500
+			repeat: true
+			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+			triggeredOnStart: true
+
+			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+		}
+
+		Binding {
+			cursor.opacity: 0
+			when: !root.activeFocus || !root.cursorVisible
 		}
 	}
-
+	Behavior on placeholderTextColor {
-	Component {
+		CAnim {
-		id: filledComp
-
-		CustomRect {
-			color: root.activeFocus ? Colors.tPalette.m3surfaceContainerHighest : Colors.tPalette.m3surfaceContainerHigh
-			topLeftRadius: root.clampedRadius
-			topRightRadius: root.clampedRadius
-
-			CustomRect {
-				anchors.bottom: parent.bottom
-				anchors.left: parent.left
-				anchors.right: parent.right
-				color: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
-				implicitHeight: root.activeFocus ? 2 : 1
-
-				Behavior on implicitHeight {
-					Anim {}
-				}
-			}
 		}
 	}
 }

Greeter/Components/CustomTextInput.qml

@@ -1,16 +1,15 @@
 import QtQuick
-import QtQuick.Controls
 import ZShell.Config
 import qs.Services
 
 TextInput {
 	renderType: Text.NativeRendering
 	selectedTextColor: Colors.palette.m3onSecondaryContainer
-	selectionColor: Colors.tPalette.colSecondaryContainer
+	selectionColor: Colors.tPalette.m3onSecondaryContainer
 
 	font {
 		family: Config.appearance?.font.family.sans ?? "sans-serif"
 		hintingPreference: Font.PreferFullHinting
-		pixelSize: Config.appearance?.font.size.normal ?? 15
+		pixelSize: Tokens?.font.size.normal ?? 15
 	}
 }

Greeter/Components/FadeImage.qml

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

Greeter/Components/LoadingIndicator.qml

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

Greeter/Components/MaterialIcon.qml

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

Greeter/Components/StateLayer.qml

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

Greeter/Content.qml

@@ -13,16 +13,34 @@ RowLayout {
 
 	spacing: Tokens.spacing.largeIncreased * 2
 
-	CustomRect {
+	ColumnLayout {
-		Layout.fillHeight: true
 		Layout.fillWidth: true
-		topLeftRadius: Tokens.rounding.largeIncreased
+		spacing: Tokens.spacing.medium
-		bottomLeftRadius: Tokens.rounding.largeIncreased
-		color: Colors.tPalette.m3surfaceContainer
-		radius: Tokens.rounding.small
 
-		UserDock {
+		CustomRect {
-			greeter: root.greeter
+			Layout.fillWidth: true
+			color: Colors.tPalette.m3surfaceContainer
+			implicitHeight: weather.implicitHeight
+			radius: Tokens.rounding.small
+			topLeftRadius: Tokens.rounding.largeIncreased
+
+			WeatherInfo {
+				id: weather
+
+				rootHeight: root.height
+			}
+		}
+
+		CustomClippingRect {
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			bottomLeftRadius: Tokens.rounding.largeIncreased
+			color: Colors.tPalette.m3surfaceContainer
+			radius: Tokens.rounding.small
+
+			UserDock {
+				greeter: root.greeter
+			}
 		}
 	}
 
@@ -31,16 +49,21 @@ RowLayout {
 		screenHeight: root.screenHeight
 	}
 
-	CustomRect {
+	ColumnLayout {
-		Layout.fillHeight: true
 		Layout.fillWidth: true
-		bottomRightRadius: Tokens.rounding.largeIncreased
+		spacing: Tokens.spacing.medium
-		color: Colors.tPalette.m3surfaceContainer
-		radius: Tokens.rounding.small
-		topRightRadius: Tokens.rounding.largeIncreased
 
-		SessionDock {
+		CustomRect {
-			greeter: root.greeter
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			bottomRightRadius: Tokens.rounding.largeIncreased
+			color: Colors.tPalette.m3surfaceContainer
+			radius: Tokens.rounding.small
+			topRightRadius: Tokens.rounding.largeIncreased
+
+			SessionDock {
+				greeter: root.greeter
+			}
 		}
 	}
 }

Greeter/GreeterSurface.qml

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

Greeter/InputField.qml

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

Greeter/SessionDock.qml

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

Greeter/UserDock.qml

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

Greeter/WeatherInfo.qml

@@ -0,0 +1,171 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import ZShell.Config
+import qs.Components
+import qs.Helpers
+import qs.Services
+
+ColumnLayout {
+	id: root
+
+	required property int rootHeight
+
+	anchors.left: parent.left
+	anchors.margins: Tokens.padding.large * 2
+	anchors.right: parent.right
+	spacing: Tokens.spacing.small
+
+	Loader {
+		Layout.alignment: Qt.AlignHCenter
+		Layout.bottomMargin: -Tokens.padding.large
+		Layout.topMargin: Tokens.padding.large * 2
+		active: root.rootHeight > 610
+		visible: active
+
+		sourceComponent: CustomText {
+			color: Colors.palette.m3primary
+			font.pointSize: Tokens.font.size.extraLarge
+			font.weight: 500
+			text: qsTr("Weather")
+		}
+	}
+
+	RowLayout {
+		Layout.fillWidth: true
+		spacing: Tokens.spacing.largeIncreased
+
+		MaterialIcon {
+			animate: true
+			color: Colors.palette.m3secondary
+			font.pointSize: Tokens.font.size.extraLarge * 2.5
+			text: Weather.icon
+		}
+
+		ColumnLayout {
+			spacing: Tokens.spacing.small
+
+			CustomText {
+				Layout.fillWidth: true
+				animate: true
+				color: Colors.palette.m3secondary
+				elide: Text.ElideRight
+				font.pointSize: Tokens.font.size.large
+				font.weight: 500
+				text: Weather.description
+			}
+
+			CustomText {
+				Layout.fillWidth: true
+				animate: true
+				color: Colors.palette.m3onSurfaceVariant
+				elide: Text.ElideRight
+				font.pointSize: Tokens.font.size.normal
+				text: qsTr("Humidity: %1%").arg(Weather.humidity)
+			}
+		}
+
+		Loader {
+			Layout.rightMargin: Tokens.padding.small
+			active: root.width > 400
+			visible: active
+
+			sourceComponent: ColumnLayout {
+				spacing: Tokens.spacing.small
+
+				CustomText {
+					Layout.fillWidth: true
+					animate: true
+					color: Colors.palette.m3primary
+					elide: Text.ElideLeft
+					font.pointSize: Tokens.font.size.extraLarge
+					font.weight: 500
+					horizontalAlignment: Text.AlignRight
+					text: Weather.temp
+				}
+
+				CustomText {
+					Layout.fillWidth: true
+					animate: true
+					color: Colors.palette.m3outline
+					elide: Text.ElideLeft
+					font.pointSize: Tokens.font.size.smaller
+					horizontalAlignment: Text.AlignRight
+					text: qsTr("Feels like: %1").arg(Weather.feelsLike)
+				}
+			}
+		}
+	}
+
+	Loader {
+		id: forecastLoader
+
+		Layout.bottomMargin: Tokens.padding.large * 2
+		Layout.fillWidth: true
+		Layout.topMargin: Tokens.spacing.small
+		active: root.rootHeight > 820
+		visible: active
+
+		sourceComponent: RowLayout {
+			spacing: Tokens.spacing.largeIncreased
+
+			Repeater {
+				model: {
+					const forecast = Weather.hourlyForecast;
+					const count = root.width < 320 ? 3 : root.width < 400 ? 4 : 5;
+					if (!forecast)
+						return Array.from({
+							length: count
+						}, () => null);
+
+					const start = Math.max(0, Weather.currentHourIndex);
+					return forecast.slice(start, start + count);
+				}
+
+				ColumnLayout {
+					id: forecastHour
+
+					required property var modelData
+
+					Layout.fillWidth: true
+					spacing: Tokens.spacing.small
+
+					CustomText {
+						Layout.fillWidth: true
+						color: Colors.palette.m3outline
+						font.pointSize: Tokens.font.size.larger
+						horizontalAlignment: Text.AlignHCenter
+						text: {
+							const hour = forecastHour.modelData?.hour ?? 0;
+							return hour > 12 ? `${(hour - 12).toString().padStart(2, "0")} PM` : `${hour.toString().padStart(2, "0")} AM`;
+						}
+					}
+
+					MaterialIcon {
+						Layout.alignment: Qt.AlignHCenter
+						font.pointSize: Tokens.font.size.extraLarge * 1.5
+						font.weight: 500
+						text: forecastHour.modelData?.icon ?? "cloud_alert"
+					}
+
+					CustomText {
+						Layout.alignment: Qt.AlignHCenter
+						color: Colors.palette.m3secondary
+						font.pointSize: Tokens.font.size.larger
+						text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C`
+					}
+				}
+			}
+		}
+	}
+
+	Timer {
+		interval: 900000 // 15 minutes
+		repeat: true
+		running: true
+		triggeredOnStart: true
+
+		onTriggered: Weather.reload()
+	}
+}

Helpers/Wallpapers.qml

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

Modules/Bar/Bar.qml

@@ -210,7 +210,8 @@ GridLayout {
 				roleValue: "network"
 
 				delegate: EntryWrapper {
-					NetworkWidget {}
+					NetworkWidget {
+					}
 				}
 			}
 

Modules/Bar/Border.qml

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

Modules/Bar/Components/Clock.qml

@@ -45,9 +45,7 @@ WidgetBase {
 	}
 	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property int roundedWidth: Math.round(timeText.implicitWidth)
+	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
-	readonly property int evenWidth: roundedWidth % 2 === 0 ? roundedWidth : roundedWidth + 1
-	readonly property real size: horizontal ? evenWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
 	required property ScreenState screenState
 
 	implicitHeight: horizontal ? baseSize : size

Modules/Bar/Components/Common/BatteryIcon.qml

@@ -24,7 +24,7 @@ Row {
 		color: Battery.getColors(root.percentage, root.devState).bg
 		height: root.batHeight
 		radius: root.radius
-		width: root.batWidth - 1
+		width: root.batWidth
 
 		CustomText {
 			color: Battery.getColors(root.percentage, root.devState).fg

Modules/Bar/Components/MediaWidget.qml

@@ -13,7 +13,7 @@ WidgetBase {
 	readonly property int textWidth: Math.min(metrics.width, 200)
 
 	implicitHeight: horizontal ? baseSize : layout.implicitHeight + Tokens.padding.small * 2
-	implicitWidth: horizontal ? (layout.implicitWidth % 2 === 0 ? layout.implicitWidth : layout.implicitWidth + 1) + Tokens.padding.small * 2 : baseSize
+	implicitWidth: horizontal ? layout.implicitWidth + Tokens.padding.small * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	Behavior on implicitHeight {

Modules/Bar/Components/Resource.qml

@@ -12,6 +12,7 @@ GridLayout {
 	property real animatedPercentage: 0
 	readonly property real arcStartAngle: 0.75 * Math.PI
 	readonly property real arcSweep: 1.5 * Math.PI
+	readonly property real dpr: (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1
 	required property bool horizontal
 	property string icon
 	required property color iconColor
@@ -22,12 +23,17 @@ GridLayout {
 	property bool warning: percentage * 100 >= warningThreshold
 	property int warningThreshold: 80
 
+	function snap(v) {
+		return Math.round(v * dpr) / dpr;
+	}
+
 	columnSpacing: Tokens.spacing.medium
 	columns: horizontal ? -1 : 1
 	percentage: 0
 
 	Behavior on animatedPercentage {
-		Anim {}
+		Anim {
+		}
 	}
 
 	Component.onCompleted: animatedPercentage = percentage
@@ -53,7 +59,7 @@ GridLayout {
 		Layout.preferredHeight: root.horizontal ? icon.implicitHeight - Tokens.padding.extraSmall : 4
 		Layout.preferredWidth: root.horizontal ? 4 : icon.implicitWidth
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
-		radius: Tokens.rounding.full
+		radius: Math.min(width, height) / 2
 
 		Item {
 			id: clipper
@@ -63,20 +69,18 @@ GridLayout {
 			anchors.left: root.horizontal ? undefined : parent.left
 			anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
 			clip: true
-			implicitHeight: root.horizontal ? root.percentage * track.height : track.height * 2
+			height: root.horizontal ? root.snap(root.percentage * track.height) : track.height * 2
-			implicitWidth: root.horizontal ? track.width * 2 : root.percentage * track.width
+			width: root.horizontal ? track.width * 2 : root.snap(root.percentage * track.width)
 
 			CustomRect {
 				anchors.bottom: root.horizontal ? parent.bottom : undefined
 				anchors.horizontalCenter: root.horizontal ? parent.horizontalCenter : undefined
 				anchors.left: root.horizontal ? undefined : parent.left
 				anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
-
 				color: root.mainColor
+				height: track.height
 				radius: track.radius
-
+				width: track.width
-				implicitHeight: track.height
-				implicitWidth: track.width
 			}
 		}
 	}

Modules/Bar/Components/Resources.qml

@@ -33,7 +33,6 @@ WidgetBase {
 		anchors.horizontalCenterOffset: root.horizontal ? 0 : 1
 		anchors.verticalCenterOffset: root.horizontal ? 0 : -3
 		columnSpacing: Tokens.spacing.small
-		rowSpacing: 0
 		columns: root.horizontal ? -1 : 1
 
 		ServiceRef {
@@ -52,7 +51,6 @@ WidgetBase {
 			Layout.alignment: Qt.AlignVCenter
 			Layout.fillHeight: root.horizontal
 			Layout.fillWidth: !root.horizontal
-
 			horizontal: root.horizontal
 			icon: "memory"
 			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface

Modules/Bar/Components/StatusIcons.qml

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

Modules/Bar/Components/StatusIcons/AudioWidget.qml

@@ -6,7 +6,7 @@ import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: root
+	id: speaker
 
 	required property bool horizontal
 
@@ -15,8 +15,6 @@ MaterialIcon {
 	fill: 1
 	fontStyle: Tokens.font.icon.small
 	text: Audio.muted ? "volume_off" : "volume_up"
-	width: Math.round(implicitWidth)
-	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
 		Anim {}

Modules/Bar/Components/StatusIcons/MicWidget.qml

@@ -6,7 +6,7 @@ import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: root
+	id: mic
 
 	required property bool horizontal
 
@@ -15,8 +15,6 @@ MaterialIcon {
 	fill: 1
 	fontStyle: Tokens.font.icon.small
 	text: Audio.sourceMuted ? "mic_off" : "mic"
-	width: Math.round(implicitWidth)
-	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
 		Anim {}

Modules/Bar/Components/Tray/TrayItem.qml

@@ -79,7 +79,6 @@ Item {
 
 		anchors.centerIn: parent
 		antialiasing: true
-		backer.retainWhileLoading: true
 		color: root.current && !Config.bar.tray.showOnHover ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		implicitSize: Config.bar.tray.trayIconSize * root.dpr
 		layer.enabled: Config.bar.tray.recolorIcons

Modules/Bar/Components/TrayIcons.qml

@@ -38,7 +38,6 @@ WidgetBase {
 		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
 		rowSpacing: -2
-		columnSpacing: Tokens.spacing.extraSmall
 
 		Repeater {
 			id: repeater

Modules/Bar/Components/Workspaces.qml

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

Modules/Bar/Popouts/AudioPopout.qml

@@ -134,7 +134,7 @@ Item {
 				node: Audio.source
 			}
 
-			ClipRect {
+			CustomClippingRect {
 				anchors.fill: parent
 				radius: parent.radius
 
@@ -249,7 +249,7 @@ Item {
 					node: appBox.modelData
 				}
 
-				ClipRect {
+				CustomClippingRect {
 					anchors.fill: parent
 					radius: parent.radius
 

Modules/Clipboard/Content.qml

@@ -25,7 +25,7 @@ Item {
 		searchField.forceActiveFocus();
 	}
 
-	ClipRect {
+	CustomClippingRect {
 		id: search
 
 		anchors.left: parent.left
@@ -54,7 +54,7 @@ Item {
 		}
 	}
 
-	CustomRect {
+	CustomClippingRect {
 		id: preview
 
 		anchors.bottom: parent.bottom
@@ -64,7 +64,6 @@ Item {
 		color: Colors.tPalette.m3surfaceContainer
 		implicitWidth: ClipHistory.previewIsImage ? Math.max(Math.min(imagePreview.sourceSize.width + Tokens.padding.large * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth) : Math.max(Math.min(textPreviewColumn.width + textPreviewColumn.anchors.margins * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth)
 		radius: 25
-		clip: true
 
 		Behavior on implicitWidth {
 			Anim {}
@@ -229,12 +228,11 @@ Item {
 					anchors.fill: parent
 					spacing: Tokens.spacing.small
 
-					Item {
+					CustomClippingRect {
 						id: textRect
 
 						Layout.fillHeight: true
 						Layout.fillWidth: true
-						clip: true
 
 						Item {
 							id: textWrapper

Modules/Dashboard/Dash/User.qml

@@ -14,7 +14,7 @@ Row {
 	padding: 20
 	spacing: 12
 
-	ClipRect {
+	CustomClippingRect {
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
 		implicitHeight: info.implicitHeight
 		implicitWidth: info.implicitHeight

Modules/Dashboard/Media.qml

@@ -16,7 +16,7 @@ Item {
 	implicitWidth: 1000
 	implicitHeight: 320
 
-	ClipRect {
+	CustomClippingRect {
 		anchors.fill: parent
 		radius: root.radius
 

Modules/Dashboard/Processes/ProcessesList.qml

@@ -46,7 +46,7 @@ CustomListView {
 			anchors.bottom: parent.bottom
 			spacing: Tokens.spacing.extraSmall / 2
 
-			ClipRect {
+			CustomClippingRect {
 				id: iconClip
 
 				Layout.fillHeight: true

Modules/DesktopIcons/BackgroundContextMenu.qml

@@ -25,7 +25,7 @@ Item {
 		onClicked: root.close()
 	}
 
-	ClipRect {
+	CustomClippingRect {
 		id: popupBackground
 		readonly property real padding: 4
 

Modules/DesktopIcons/DesktopIconContextMenu.qml

@@ -40,7 +40,7 @@ Item {
 	visible: false
 	z: 999
 
-	ClipRect {
+	CustomClippingRect {
 		id: popupBackground
 
 		readonly property real padding: Tokens.padding.extraSmall

Modules/Launcher/Items/WallpaperTile.qml

@@ -1,5 +1,3 @@
-pragma ComponentBehavior: Bound
-
 import Quickshell
 import QtQuick
 import ZShell.Config
@@ -11,7 +9,7 @@ Item {
 	id: root
 
 	required property bool isCurrent
-	required property var modelData
+	required property var modelData // FileSystemEntry-like {path, relativePath}
 	required property real tileHeight
 	required property real tileWidth
 	required property ScreenState screenState
@@ -21,7 +19,7 @@ Item {
 	implicitHeight: tileHeight + Tokens.padding.large * 2
 	implicitWidth: tileWidth
 
-	ClipRect {
+	CustomClippingRect {
 		id: image
 
 		anchors.horizontalCenter: parent.horizontalCenter
@@ -31,75 +29,25 @@ Item {
 		radius: Tokens.rounding.small
 		y: Tokens.padding.large
 
-		Loader {
+		MaterialIcon {
-			active: opacity > 0
 			anchors.centerIn: parent
-			opacity: img.status === Image.Ready ? 0 : 1
+			color: Colors.tPalette.m3outline
-
+			fontStyle: Tokens.font.icon.builders.extraLarge.scale(2).weight(Font.DemiBold).build()
-			Behavior on opacity {
+			text: "image"
-				Anim {}
-			}
-			sourceComponent: CustomRect {
-				color: Colors.palette.m3primaryContainer
-				implicitHeight: loadingIndicator.implicitSize + Tokens.padding.large * 2
-				implicitWidth: loadingIndicator.implicitSize + Tokens.padding.large * 2
-				radius: Tokens.rounding.full
-
-				LoadingIndicator {
-					id: loadingIndicator
-
-					anchors.centerIn: parent
-					containsIcon: true
-					implicitSize: Math.min(image.width, image.height) * 0.3
-				}
-			}
 		}
 
-		Image {
+		CachingImage {
-			id: img
 			anchors.bottom: parent.bottom
 			anchors.horizontalCenter: parent.horizontalCenter
 			anchors.top: parent.top
-			asynchronous: true
+			cache: true
 			fillMode: Image.PreserveAspectCrop
 			height: root.tileHeight
-			source: root.modelData ? root.modelData.thumbnailPath : ""
+			path: root.modelData ? root.modelData.path : ""
 			smooth: root.isCurrent
 			sourceSize.height: root.tileHeight
 			sourceSize.width: root.tileHeight * (16 / 9)
 			width: root.tileHeight * (16 / 9)
-
-			opacity: status === Image.Ready ? 1 : 0
-			Behavior on opacity {
-				Anim {
-					type: Anim.SlowEffects
-				}
-			}
-
-			Loader {
-				opacity: root.modelData.isVideo && img.status === Image.Ready ? 1 : 0
-				active: opacity > 0
-				anchors.centerIn: parent
-				Behavior on opacity {
-					Anim {
-						type: Anim.SlowEffects
-					}
-				}
-
-				sourceComponent: CustomRect {
-					implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
-					implicitHeight: implicitWidth
-					radius: Tokens.rounding.full
-					color: Colors.tPalette.m3surface
-
-					MaterialIcon {
-						id: videoIcon
-						anchors.centerIn: parent
-						text: "video_library"
-						fontStyle: Tokens.font.icon.extraLarge
-					}
-				}
-			}
 		}
 
 		StateLayer {

Modules/Lock/Center.qml

@@ -55,7 +55,7 @@ ColumnLayout {
 		text: Time.format("dddd, d MMMM yyyy")
 	}
 
-	ClipRect {
+	CustomClippingRect {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer

Modules/Lock/Content.qml

@@ -5,13 +5,14 @@ import qs.Helpers
 import ZShell.Config
 import qs.Services
 
-Item {
+CustomClippingRect {
 	id: root
 
 	required property var lock
 
 	implicitHeight: layout.implicitHeight
 	implicitWidth: layout.implicitWidth
+	radius: Tokens.rounding.largeIncreased
 
 	RowLayout {
 		id: layout
@@ -49,10 +50,22 @@ Item {
 			lock: root.lock
 		}
 
-		NotifDock {
+		ColumnLayout {
-			Layout.fillHeight: true
 			Layout.fillWidth: true
-			lock: root.lock
+			spacing: Tokens.spacing.medium
+
+			CustomRect {
+				Layout.fillHeight: true
+				Layout.fillWidth: true
+				bottomRightRadius: Tokens.rounding.largeIncreased
+				color: Colors.tPalette.m3surfaceContainer
+				radius: Tokens.rounding.small
+				topRightRadius: Tokens.rounding.largeIncreased
+
+				NotifDock {
+					lock: root.lock
+				}
+			}
 		}
 	}
 }

Modules/Lock/LockSurface.qml

@@ -221,9 +221,9 @@ WlSessionLockSurface {
 
 			anchors.fill: parent
 			color: Colors.palette.m3surface
+			layer.enabled: true
 			opacity: Colors.transparency.enabled ? Colors.transparency.base : 1
 			radius: lockContent.radius
-			layer.enabled: true
 
 			layer.effect: MultiEffect {
 				blurMax: 15

Modules/Lock/Media.qml

@@ -2,49 +2,44 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import ZShell.Components
-import ZShell.Config
 import qs.Components
+import ZShell.Config
 import qs.Helpers
 import qs.Services
 
-Item {
+CustomClippingRect {
 	id: root
 
 	required property var lock
 
+	color: Colors.tPalette.m3surfaceContainer
 	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
+	radius: Tokens.rounding.small
+
+	FadeImage {
+		id: image
 
-	ClipRect {
 		anchors.fill: parent
+		asynchronous: true
+		fillMode: Image.PreserveAspectCrop
+		layer.enabled: true
+		opacity: status === Image.Ready ? 1 : 0
+		source: Players.getArtUrl(Players.active)
+		sourceSize: {
+			const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
+			return Qt.size(width * dpr, height * dpr);
+		}
 
-		color: Colors.tPalette.m3surfaceContainer
+		Behavior on opacity {
-		radius: Tokens.rounding.small
+			Anim {
-		bottomLeftRadius: Tokens.rounding.largeIncreased
+				type: Anim.StandardExtraLarge
-
+			}
-		FadeImage {
+		}
-			id: image
 
+		CustomRect {
 			anchors.fill: parent
-			asynchronous: true
+			color: Colors.palette.m3surface
-			fillMode: Image.PreserveAspectCrop
+			opacity: 0.7
-			opacity: status === Image.Ready ? 1 : 0
-			source: Players.getArtUrl(Players.active)
-			sourceSize: {
-				const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
-				return Qt.size(width * dpr, height * dpr);
-			}
-
-			Behavior on opacity {
-				Anim {
-					type: Anim.StandardExtraLarge
-				}
-			}
-
-			CustomRect {
-				anchors.fill: parent
-				color: Colors.palette.m3surface
-				opacity: 0.7
-			}
 		}
 	}
 
@@ -82,7 +77,7 @@ Item {
 			spacing: Tokens.spacing.extraSmall
 
 			IconButton {
-				enabled: Players.active?.canGoPrevious ?? false
+				enabled: Players.active?.canGoPrevious
 				icon: "skip_previous"
 				isRound: true
 				shapeMorph: true
@@ -93,7 +88,7 @@ Item {
 
 			IconButton {
 				checked: Players.active?.isPlaying ?? false
-				enabled: Players.active?.canTogglePlaying ?? false
+				enabled: Players.active?.canTogglePlaying
 				icon: Players.active?.isPlaying ? "pause" : "play_arrow"
 				implicitWidth: implicitHeight + Tokens.padding.largeIncreased * 2
 				isRound: true
@@ -103,7 +98,7 @@ Item {
 			}
 
 			IconButton {
-				enabled: Players.active?.canGoNext ?? false
+				enabled: Players.active?.canGoNext
 				icon: "skip_next"
 				isRound: true
 				shapeMorph: true

Modules/Lock/NotifDock.qml

@@ -11,116 +11,127 @@ import ZShell.Config
 import qs.Daemons
 import qs.Services
 
-CustomRect {
+ColumnLayout {
 	id: root
 
 	required property var lock
 
-	bottomRightRadius: Tokens.rounding.largeIncreased
+	anchors.fill: parent
-	color: Colors.tPalette.m3surfaceContainer
+	anchors.margins: Tokens.padding.large
-	radius: Tokens.rounding.small
+	spacing: Tokens.spacing.small
-	topRightRadius: Tokens.rounding.largeIncreased
 
-	ColumnLayout {
+	CustomText {
-		anchors.fill: parent
+		Layout.fillWidth: true
-		anchors.margins: Tokens.padding.large
+		color: Colors.palette.m3outline
-		spacing: Tokens.spacing.small
+		elide: Text.ElideRight
+		font.family: Config.appearance.font.family.mono
+		font.weight: 500
+		text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
+	}
 
-		CustomText {
+	ClippingRectangle {
-			Layout.fillWidth: true
+		id: clipRect
-			color: Colors.palette.m3outline
-			elide: Text.ElideRight
-			font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
-			text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
-		}
 
-		Item {
+		Layout.fillHeight: true
-			Layout.fillHeight: true
+		Layout.fillWidth: true
-			Layout.fillWidth: true
+		color: "transparent"
+		radius: Tokens.rounding.small
 
-			Loader {
+		Loader {
-				active: opacity > 0
+			active: opacity > 0
-				anchors.centerIn: parent
+			anchors.centerIn: parent
-				opacity: NotifServer.list.length > 0 ? 0 : 1
+			opacity: NotifServer.list.length > 0 ? 0 : 1
 
-				Behavior on opacity {
+			Behavior on opacity {
-					Anim {
+				Anim {
-						duration: Tokens.anim.durations.extraLarge
+					duration: Tokens.anim.durations.extraLarge
-					}
-				}
-				sourceComponent: ColumnLayout {
-					spacing: Tokens.spacing.largeIncreased
-
-					CustomText {
-						Layout.alignment: Qt.AlignHCenter
-						color: Colors.palette.m3outlineVariant
-						font: Tokens.font.headline.builders.small.width(90).build()
-						text: qsTr("No Notifications")
-					}
 				}
 			}
+			sourceComponent: ColumnLayout {
+				spacing: Tokens.spacing.largeIncreased
 
-			CustomListView {
+				Image {
-				anchors.fill: parent
+					asynchronous: true
-				clip: true
+					fillMode: Image.PreserveAspectFit
-				spacing: Tokens.spacing.small
+					layer.enabled: true
+					source: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/dino.png`)
+					sourceSize.width: clipRect.width * 0.8
 
-				add: Transition {
+					layer.effect: Coloriser {
-					Anim {
+						brightness: 1
-						from: 0
+						colorizationColor: Colors.palette.m3outlineVariant
-						property: "opacity"
-						to: 1
-					}
-
-					Anim {
-						duration: Tokens.anim.durations.expressiveDefaultSpatial
-						easing: Tokens.anim.expressiveDefaultSpatial
-						from: 0
-						property: "scale"
-						to: 1
 					}
 				}
-				delegate: NotifGroup {}
-				displaced: Transition {
-					Anim {
-						properties: "opacity,scale"
-						to: 1
-					}
 
-					Anim {
+				CustomText {
-						duration: Tokens.anim.durations.expressiveDefaultSpatial
+					Layout.alignment: Qt.AlignHCenter
-						easing: Tokens.anim.expressiveDefaultSpatial
+					color: Colors.palette.m3outlineVariant
-						property: "y"
+					font: Tokens.font.headline.builders.small.width(90).build()
-					}
+					text: qsTr("No Notifications")
 				}
-				model: ScriptModel {
+			}
-					values: {
+		}
-						const list = NotifServer.notClosed.map(n => [n.appName, null]);
-						return [...new Map(list).keys()];
-					}
-				}
-				move: Transition {
-					Anim {
-						properties: "opacity,scale"
-						to: 1
-					}
 
-					Anim {
+		CustomListView {
-						duration: Tokens.anim.durations.expressiveDefaultSpatial
+			anchors.fill: parent
-						easing: Tokens.anim.expressiveDefaultSpatial
+			clip: true
-						property: "y"
+			spacing: Tokens.spacing.small
-					}
-				}
-				remove: Transition {
-					Anim {
-						property: "opacity"
-						to: 0
-					}
 
-					Anim {
+			add: Transition {
-						property: "scale"
+				Anim {
-						to: 0.6
+					from: 0
-					}
+					property: "opacity"
+					to: 1
+				}
+
+				Anim {
+					duration: Tokens.anim.durations.expressiveDefaultSpatial
+					easing: Tokens.anim.expressiveDefaultSpatial
+					from: 0
+					property: "scale"
+					to: 1
+				}
+			}
+			delegate: NotifGroup {}
+			displaced: Transition {
+				Anim {
+					properties: "opacity,scale"
+					to: 1
+				}
+
+				Anim {
+					duration: Tokens.anim.durations.expressiveDefaultSpatial
+					easing: Tokens.anim.expressiveDefaultSpatial
+					property: "y"
+				}
+			}
+			model: ScriptModel {
+				values: {
+					const list = NotifServer.notClosed.map(n => [n.appName, null]);
+					return [...new Map(list).keys()];
+				}
+			}
+			move: Transition {
+				Anim {
+					properties: "opacity,scale"
+					to: 1
+				}
+
+				Anim {
+					duration: Tokens.anim.durations.expressiveDefaultSpatial
+					easing: Tokens.anim.expressiveDefaultSpatial
+					property: "y"
+				}
+			}
+			remove: Transition {
+				Anim {
+					property: "opacity"
+					to: 0
+				}
+
+				Anim {
+					property: "scale"
+					to: 0.6
 				}
 			}
 		}

Modules/Lock/NotifGroup.qml

@@ -85,7 +85,7 @@ CustomRect {
 				}
 			}
 
-			ClipRect {
+			ClippingRectangle {
 				anchors.fill: parent
 				color: root.urgency === "critical" ? Colors.palette.m3error : root.urgency === "low" ? Colors.layer(Colors.palette.m3surfaceContainerHighest, 3) : Colors.palette.m3secondaryContainer
 				radius: Tokens.rounding.full

Modules/Lock/UserImage.qml

@@ -1,13 +1,12 @@
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
-import qs.Components
 import qs.Paths
 
 Item {
 	id: root
 
-	ClipRect {
+	ClippingRectangle {
 		anchors.fill: parent
 		radius: Tokens.rounding.full
 

Modules/Lock/Weather/BriefInfo.qml

@@ -16,7 +16,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.body.large
+		font: Tokens.font.title.large
 		text: Weather.description
 	}
 
@@ -29,7 +29,7 @@ ColumnLayout {
 
 			animate: true
 			color: Colors.palette.m3primary
-			font: Tokens.font.title.large
+			font: Tokens.font.body.large
 			text: Weather.temp
 		}
 
@@ -37,7 +37,6 @@ ColumnLayout {
 			animate: true
 			color: Colors.palette.m3secondary
 			text: Weather.icon
-			fontStyle: Tokens.font.icon.large
 		}
 	}
 
@@ -54,7 +53,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.body.medium
+		font: Tokens.font.body.normal
 		text: {
 			const today = Weather.forecast[0];
 			return qsTr("High %1 • Low %2").arg(Weather.formatTemp(today?.maxTempC)).arg(Weather.formatTemp(today?.minTempC));

Modules/Lock/Weather/Forecast.qml

@@ -36,7 +36,7 @@ CustomRect {
 		}
 	}
 
-	CustomListView {
+	VerticalFadeListView {
 		id: layout
 
 		anchors.bottom: parent.bottom
@@ -45,20 +45,13 @@ CustomRect {
 		anchors.margins: Tokens.padding.large
 		anchors.right: parent.right
 		implicitHeight: contentItem.childrenRect.height
-		currentIndex: Weather.currentHourIndex
+		model: Weather.hourlyForecast
-		// highlightFollowsCurrentItem: true
-		// preferredHighlightEnd: currentItem.implicitWidth
-		// preferredHighlightBegin: 0
-		// highlightRangeMode: ListView.ApplyRange
-		clip: true
-		model: Weather.hourlyForecast.slice(Weather.currentHourIndex - 1)
 		orientation: VerticalFadeListView.Horizontal
 		spacing: Tokens.spacing.medium
 
 		delegate: ColumnLayout {
 			id: hour
 
-			readonly property bool current: ListView.view.currentItem === this
 			readonly property var cond: modelData
 			required property int index
 			required property var modelData
@@ -67,7 +60,7 @@ CustomRect {
 
 			MaterialShape {
 				Layout.alignment: Qt.AlignHCenter
-				color: Qt.alpha(Colors.palette.m3primary, hour.current ? 1 : 0)
+				color: Qt.alpha(Colors.palette.m3primary, hour.index === Weather.currentHourIndex ? 1 : 0)
 				implicitSize: temp.implicitHeight + Tokens.padding.small * 2
 				shape: MaterialShape.Cookie4Sided
 
@@ -79,7 +72,7 @@ CustomRect {
 					id: temp
 
 					anchors.centerIn: parent
-					color: hour.current ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+					color: hour.index === Weather.currentHourIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 					font: Tokens.font.body.medium
 					text: Weather.formatTemp(hour.cond.tempC).slice(0, -1) // Remove C/F
 				}
@@ -103,7 +96,7 @@ CustomRect {
 				Layout.topMargin: Tokens.spacing.extraSmall
 				color: Colors.palette.m3onSurfaceVariant
 				font: Tokens.font.body.small
-				text: hour.current ? qsTr("Now") : Qt.formatDateTime(new Date(hour.cond.timestamp.replace("T", " ")), Config.services.useTwelveHourClock ? "ha" : "hh:00")
+				text: hour.index === 0 ? qsTr("Now") : Qt.formatDateTime(new Date(hour.cond.timestamp.replace("T", " ")), Config.services.useTwelveHourClock ? "ha" : "hh:00")
 			}
 		}
 	}

Modules/Lock/WeatherInfo.qml

@@ -19,7 +19,6 @@ CustomRect {
 		return base + brief.anchors.topMargin;
 	}
 	radius: Tokens.rounding.small
-	topLeftRadius: Tokens.rounding.largeIncreased
 
 	Timer {
 		interval: 900000 // 15 minutes
@@ -49,6 +48,7 @@ CustomRect {
 		anchors.right: parent.right
 		asynchronous: true
 
-		sourceComponent: Forecast {}
+		sourceComponent: Forecast {
+		}
 	}
 }

Modules/Notifications/Content.qml

@@ -28,10 +28,7 @@ Item {
 		for (let i = 0; i < count; i++)
 			height += (list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0;
 
-		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x)
+		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x || screenState.dashboard)
-			return 0;
-
-		if (screenState.dashboard && (panels.dashboard.x + panels.dashboard.width >= panels.notifications.x))
 			return 0;
 
 		if (screenState.osd) {

Modules/Notifications/Notification.qml

@@ -108,7 +108,7 @@ CustomRect {
 				visible: root.hasImage || root.hasAppIcon
 				width: Config.notifs.sizes.image
 
-				sourceComponent: ClipRect {
+				sourceComponent: CustomClippingRect {
 					color: root.modelData.urgency === NotificationUrgency.Critical ? Colors.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colors.layer(Colors.palette.m3surfaceContainerHighest, 2) : Colors.palette.m3secondaryContainer
 					implicitHeight: Config.notifs.sizes.image
 					implicitWidth: Config.notifs.sizes.image

Modules/Resources/Cards/BatteryTank.qml

@@ -5,7 +5,7 @@ import ZShell.Config
 import qs.Components
 import qs.Services
 
-ClipRect {
+CustomClippingRect {
 	id: root
 
 	property real animPerc: UPower.displayDevice.percentage

Modules/Resources/Cards/HeroCard.qml

@@ -19,7 +19,7 @@ CustomRect {
 	implicitWidth: 450
 	radius: Tokens.rounding.largeIncreased
 
-	ClipRect {
+	CustomClippingRect {
 		anchors.fill: parent
 		radius: parent.radius
 

Modules/Settings/Common/PageBase.qml

@@ -149,7 +149,7 @@ ColumnLayout {
 		}
 	}
 
-	CustomFlickable {
+	Flickable {
 		id: flickable
 
 		Layout.fillHeight: true

Modules/Settings/Common/WallItem.qml

@@ -25,7 +25,7 @@ Item {
 		anchors.fill: parent
 		spacing: Tokens.spacing.small
 
-		ClipRect {
+		CustomClippingRect {
 			id: imgWrapper
 
 			Layout.fillWidth: true
@@ -39,7 +39,8 @@ Item {
 				opacity: img.status === Image.Ready ? 0 : 1
 
 				Behavior on opacity {
-					Anim {}
+					Anim {
+					}
 				}
 				sourceComponent: CustomRect {
 					color: Colors.palette.m3primaryContainer
@@ -63,43 +64,18 @@ Item {
 				anchors.fill: parent
 				asynchronous: true
 				fillMode: Image.PreserveAspectCrop
+				opacity: status === Image.Ready ? 1 : 0
 				retainWhileLoading: true
 				sourceSize: {
 					const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
 					return Qt.size(width * dpr, height * dpr);
 				}
 
-				opacity: status === Image.Ready ? 1 : 0
 				Behavior on opacity {
 					Anim {
 						type: Anim.SlowEffects
 					}
 				}
-
-				Loader {
-					opacity: root.modelData.isVideo && img.status === Image.Ready ? 1 : 0
-					active: opacity > 0
-					anchors.centerIn: parent
-					Behavior on opacity {
-						Anim {
-							type: Anim.SlowEffects
-						}
-					}
-
-					sourceComponent: CustomRect {
-						implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
-						implicitHeight: implicitWidth
-						radius: Tokens.rounding.full
-						color: Colors.tPalette.m3surface
-
-						MaterialIcon {
-							id: videoIcon
-							anchors.centerIn: parent
-							text: "video_library"
-							fontStyle: Tokens.font.icon.extraLarge
-						}
-					}
-				}
 			}
 		}
 	}

Modules/Settings/Common/WallpaperCropper.qml

@@ -13,14 +13,9 @@ import qs.Services
 Item {
 	id: wrapper
 
-	readonly property bool isVideo: Wallpapers.currentIsVideo
+	property int buttonRowHeight: Tokens.padding.large * 3
-	readonly property string currentWallpaper: Wallpapers.current
-	readonly property var currentScreen: screens.length > selectedScreenIndex ? screens[selectedScreenIndex] : null
-	readonly property real maxZoom: 5.0
 	readonly property bool changesMade: {
 		cropRevision;
-		Wallpapers.cropVersion;
-		wrapper.currentWallpaper;
 
 		const r = cropRectLoader.item;
 		if (!r || !currentScreen || scaledImg.status !== Image.Ready)
@@ -30,9 +25,9 @@ Item {
 
 		return Math.abs(r.x - t.x) > 0.5 || Math.abs(r.y - t.y) > 0.5 || Math.abs(r.zoom - t.zoom) > 0.001;
 	}
-
-	property int buttonRowHeight: Tokens.padding.large * 3
 	property int cropRevision: 0
+	readonly property var currentScreen: screens.length > selectedScreenIndex ? screens[selectedScreenIndex] : null
+	readonly property real maxZoom: 5.0
 	property var screens: []
 	property int selectedScreenIndex: 0
 	property bool shouldBeActive: true
@@ -105,28 +100,29 @@ Item {
 	visible: opacity > 0
 
 	Behavior on opacity {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on scale {
-		Anim {}
+		Anim {
+		}
 	}
 	Behavior on y {
-		Anim {}
+		Anim {
+		}
 	}
 
 	Component.onCompleted: {
 		refreshScreens();
 		Qt.callLater(syncCropToScreen);
 	}
-	onCurrentWallpaperChanged: {
-		Qt.callLater(syncCropToScreen);
-	}
 	onSelectedScreenIndexChanged: {
 		Qt.callLater(syncCropToScreen);
 	}
 
-	Loader {
+	ButtonRow {
-		id: selectorLoader
+		id: screenSelector
+
 		anchors.bottom: imageSlot.top
 		anchors.bottomMargin: Tokens.spacing.medium
 		anchors.left: parent.left
@@ -134,32 +130,25 @@ Item {
 		anchors.right: parent.right
 		anchors.rightMargin: Tokens.padding.extraLarge * 2
 		anchors.top: parent.top
+		spacing: Tokens.spacing.small
 
-		active: wrapper.screens.length > 1 && !wrapper.isVideo
+		Repeater {
+			model: wrapper.screens
 
-		sourceComponent: ButtonRow {
+			delegate: TextButton {
-			id: screenSelector
+				required property int index
+				readonly property bool isCurrent: wrapper.selectedScreenIndex === index
+				required property var modelData
 
-			spacing: Tokens.spacing.small
+				fillWidth: true
+				font: Tokens.font.body.builders.large.weight(Font.DemiBold).build()
+				inactiveColor: isCurrent ? Colors.palette.m3primary : Qt.alpha(Colors.palette.m3surfaceContainer, 0.7)
+				inactiveOnColor: isCurrent ? Colors.palette.m3onPrimary : Qt.alpha(Colors.palette.m3onSurface, 0.7)
+				isRound: true
+				shapeMorph: true
+				text: modelData.name
 
-			Repeater {
+				onClicked: wrapper.selectScreen(index)
-				model: wrapper.screens
-
-				delegate: TextButton {
-					required property int index
-					readonly property bool isCurrent: wrapper.selectedScreenIndex === index
-					required property var modelData
-
-					fillWidth: true
-					font: Tokens.font.body.builders.large.weight(Font.DemiBold).build()
-					inactiveColor: isCurrent ? Colors.palette.m3primary : Qt.alpha(Colors.palette.m3surfaceContainer, 0.7)
-					inactiveOnColor: isCurrent ? Colors.palette.m3onPrimary : Qt.alpha(Colors.palette.m3onSurface, 0.7)
-					isRound: true
-					shapeMorph: true
-					text: modelData.name
-
-					onClicked: wrapper.selectScreen(index)
-				}
 			}
 		}
 	}
@@ -171,7 +160,6 @@ Item {
 		anchors.left: parent.left
 		anchors.right: parent.right
 		implicitHeight: 30
-		enabled: !wrapper.isVideo
 
 		CustomSlider {
 			id: zoomSlider
@@ -234,9 +222,9 @@ Item {
 		anchors.left: parent.left
 		anchors.right: parent.right
 		anchors.top: parent.top
-		anchors.topMargin: selectorLoader.active ? wrapper.buttonRowHeight + Tokens.spacing.medium : Tokens.spacing.medium
+		anchors.topMargin: wrapper.buttonRowHeight + Tokens.spacing.medium
 
-		ClipRect {
+		CustomClippingRect {
 			id: fitBox
 
 			readonly property real aspect: scaledImg.implicitHeight > 0 ? scaledImg.implicitWidth / scaledImg.implicitHeight : 1
@@ -283,7 +271,7 @@ Item {
 				opacity: status === Image.Ready ? 1 : 0
 				retainWhileLoading: true
 				smooth: true
-				source: Wallpapers.currentThumbnail
+				source: Wallpapers.current
 				sourceSize.height: {
 					const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
 					return imageSlot.height * dpr;
@@ -294,37 +282,12 @@ Item {
 						type: Anim.SlowEffects
 					}
 				}
-
-				Loader {
-					opacity: wrapper.isVideo && scaledImg.status === Image.Ready ? 1 : 0
-					active: opacity > 0
-					anchors.centerIn: parent
-					Behavior on opacity {
-						Anim {
-							type: Anim.SlowEffects
-						}
-					}
-
-					sourceComponent: CustomRect {
-						implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
-						implicitHeight: implicitWidth
-						radius: Tokens.rounding.full
-						color: Colors.tPalette.m3surface
-
-						MaterialIcon {
-							id: videoIcon
-							anchors.centerIn: parent
-							text: "video_library"
-							fontStyle: Tokens.font.icon.extraLarge
-						}
-					}
-				}
 			}
 
 			Loader {
 				id: cropRectLoader
 
-				active: scaledImg.status === Image.Ready && !wrapper.isVideo
+				active: scaledImg.status === Image.Ready
 
 				sourceComponent: Component {
 					CustomRect {
@@ -367,6 +330,7 @@ Item {
 							y = t.y;
 						}
 
+						// Where the rect should be according to saved data (same rules as a restore).
 						function savedTarget() {
 							const data = Wallpapers.getCrop(wrapper.currentScreen.name);
 							const hasCrop = data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001);
@@ -393,7 +357,8 @@ Item {
 						width: Math.round(baseWidth / zoom)
 
 						Behavior on color {
-							CAnim {}
+							CAnim {
+							}
 						}
 
 						Component.onCompleted: {
@@ -469,10 +434,9 @@ Item {
 				}
 
 				anchors.fill: parent
-				cursorShape: wrapper.isVideo ? Qt.ArrowCursor : pressed ? Qt.ClosedHandCursor : insideCropRect(mouseX, mouseY) ? Qt.OpenHandCursor : Qt.PointingHandCursor
+				cursorShape: pressed ? Qt.ClosedHandCursor : insideCropRect(mouseX, mouseY) ? Qt.OpenHandCursor : Qt.PointingHandCursor
 				hoverEnabled: true
 				preventStealing: true
-				enabled: !wrapper.isVideo
 
 				onPositionChanged: mouse => {
 					if (pressed) {

Modules/Settings/Content.qml

@@ -38,7 +38,6 @@ Item {
 	}
 
 	BlobInvertedRect {
-		id: blobRect
 		anchors.fill: parent
 		borderBottom: Tokens.padding.small
 		borderLeft: navPane.width + navPane.anchors.margins * 2
@@ -66,7 +65,6 @@ Item {
 		anchors.bottom: parent.bottom
 		anchors.left: navPane.right
 		anchors.leftMargin: navPane.anchors.margins + anchors.margins
-		anchors.bottomMargin: blobRect.borderBottom
 		anchors.margins: Tokens.padding.extraLarge
 		anchors.right: parent.right
 		anchors.top: parent.top

Modules/Settings/Pages.qml

@@ -38,6 +38,7 @@ Item {
 		id: container
 
 		anchors.fill: parent
+		layer.enabled: opacity < 1
 		objectName: "PageContainer"
 
 		Component.onCompleted: root.loadPage(root.sState.currentPageIdx)

Modules/Settings/Pages/Wallpaper/WallpaperSelect.qml

@@ -50,12 +50,11 @@ PageBase {
 				}
 
 				WallItem {
-					id: wallItem
+					required property FileSystemEntry modelData
-					required property WallpaperEntry modelData
 
 					enabled: modelData
 					opacity: modelData ? 1 : 0
-					source: String(modelData?.thumbnailPath ?? "")
+					source: String(modelData?.path ?? "")
 
 					onClicked: {
 						Wallpapers.setWallpaper(modelData.path);

Modules/Settings/Pages/WallpaperPage.qml

@@ -13,42 +13,6 @@ import qs.Services
 PageBase {
 	id: root
 
-	readonly property list<MenuItem> wallTransitions: [
-		MenuItem {
-			text: "Bowtie"
-		},
-		MenuItem {
-			text: "Fade"
-		},
-		MenuItem {
-			text: "LinearBlur"
-		},
-		MenuItem {
-			text: "WindowSlices"
-		},
-		MenuItem {
-			text: "WipeRight"
-		},
-		MenuItem {
-			text: "WipeDown"
-		},
-		MenuItem {
-			text: "TilesWave"
-		},
-		MenuItem {
-			text: "SplitSlideInHorizontal"
-		},
-		MenuItem {
-			text: "Hexagonalize"
-		},
-		MenuItem {
-			text: "DoomMelt"
-		},
-		MenuItem {
-			text: "Random"
-		}
-	]
-
 	title: qsTr("Wallpaper & style")
 
 	ColumnLayout {
@@ -109,18 +73,6 @@ PageBase {
 			onToggled: Config.background.enabled = checked
 		}
 
-		SelectRow {
-			Layout.topMargin: Tokens.spacing.extraSmall / 2 - parent.spacing
-			active: root.wallTransitions[Config.background.wallTransition]
-			menuItems: root.wallTransitions
-			menuOnTop: true
-			settingAnchor: "style-wallpaper-transition"
-			subtext: qsTr("Currently selected: %1").arg(active.text)
-			text: qsTr("Wallpaper transition")
-
-			onSelected: item => Config.background.wallTransition = root.wallTransitions.indexOf(item)
-		}
-
 		ToggleRow {
 			Layout.topMargin: Tokens.spacing.extraSmall / 2 - parent.spacing
 			checked: Colors.transparency.enabled

Modules/Sidebar/Chat/ChatContent.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import QtQuick.Layouts
-import ZShell.Services
 import ZShell.Components
 import ZShell.Config
 import ZShell.Llm
@@ -91,9 +90,7 @@ Item {
 	signal requestClose
 
 	readonly property bool atNewestEnd: !listLoader.item || listLoader.item.contentY < 4
-	readonly property bool importing: importIds.length > 0
 
-	property var importIds: []
 	property var pendingAttachments: []
 
 	function attachFiles(): void {
@@ -439,7 +436,7 @@ Item {
 			width: attachments.cellWidth
 			height: width
 			opacity: modelData ? 1 : 0
-			ClipRect {
+			CustomClippingRect {
 				anchors.fill: parent
 				anchors.margins: Tokens.spacing.extraSmall
 
@@ -544,7 +541,7 @@ Item {
 		bg.border.color: Colors.palette.m3outlineVariant
 		bg.color: Colors.tPalette.m3surfaceContainerLowest
 		fastGlow: LlmClient.busy
-		glow.opacity: !ChatState.narrowSidebarExpanded ? (input.activeFocus && (!LlmClient.busy || ChatState.isWindow) ? 1 : 0) : 0
+		glow.opacity: input.activeFocus && (!LlmClient.busy || ChatState.isWindow)
 		font: Tokens.font.body.small
 		implicitHeight: Math.min(root.height / 5, contentHeight + topPadding + bottomPadding)
 		focus: true
@@ -581,52 +578,4 @@ Item {
 				root.send(text);
 		}
 	}
-
-	Connections {
-		target: DropImporter
-
-		function onImportFinished(id: int, paths: var, errors: var): void {
-			if (!root.importIds.includes(id))
-				return;
-			root.importIds = root.importIds.filter(i => i !== id);
-
-			if (paths.length > 0) {
-				const added = root.chatData.addAttachments(paths);
-				root.pendingAttachments = root.pendingAttachments.concat(added);
-			}
-			for (const e of errors)
-				console.warn("Drop import:", e);
-		}
-	}
-
-	DropArea {
-		id: dropArea
-
-		anchors.fill: parent
-
-		onEntered: drag => {
-			drag.accepted = drag.hasUrls || drag.hasText || drag.hasHtml || drag.formats.some(f => f.startsWith("image/"));
-		}
-
-		onDropped: drop => {
-			const formats = drop.formats;
-			const urls = drop.hasUrls ? drop.urls : [];
-			const text = drop.hasText ? drop.text : "";
-			const html = drop.hasHtml ? drop.html : "";
-
-			const imgFormat = formats.find(f => f.startsWith("image/"));
-			const raw = imgFormat ? drop.getDataAsArrayBuffer(imgFormat) : new ArrayBuffer(0);
-
-			switch (DropImporter.decide(urls, text, html, raw.byteLength > 0)) {
-			case DropImporter.Attach:
-				root.importIds = [...root.importIds, DropImporter.importAttachments(urls, html, raw)];
-				break;
-			case DropImporter.InsertText:
-				input.insert(input.cursorPosition, text || urls.map(u => u.toString()).join("\n"));
-				root.focusInput();
-				break;
-			}
-			drop.acceptProposedAction();
-		}
-	}
 }

Modules/Sidebar/Chat/ChatDelegate.qml

@@ -91,50 +91,6 @@ CustomRect {
 
 		opacity: root.slim ? 0 : 1
 
-		state: titleText.readOnly ? "static" : "editing"
-
-		states: [
-			State {
-				name: "static"
-				PropertyChanges {
-					staticText.opacity: 1
-				}
-				PropertyChanges {
-					titleText.opacity: 0
-				}
-			},
-			State {
-				name: "editing"
-				PropertyChanges {
-					staticText.opacity: 0
-				}
-				PropertyChanges {
-					titleText.opacity: 1
-				}
-			}
-		]
-
-		transitions: [
-			// Going static: titleText fades out (animated), staticText snaps in
-			Transition {
-				to: "static"
-				Anim {
-					target: titleText
-					property: "opacity"
-					type: Anim.SlowEffects
-				}
-			},
-			// Going editing: staticText fades out (animated), titleText snaps in
-			Transition {
-				to: "editing"
-				Anim {
-					target: staticText
-					property: "opacity"
-					type: Anim.SlowEffects
-				}
-			}
-		]
-
 		Behavior on opacity {
 			Anim {
 				type: Anim.DefaultEffects
@@ -150,7 +106,7 @@ CustomRect {
 			color: Colors.layer(Colors.palette.m3surfaceContainerHighest, 1)
 			implicitHeight: titleText.implicitHeight + Tokens.padding.extraSmall * 2
 			radius: Tokens.rounding.full
-			implicitWidth: titleText.width + Tokens.padding.large * 2
+			implicitWidth: titleText.implicitWidth + Tokens.padding.large * 2
 			opacity: titleText.readOnly ? 0 : 1
 
 			Behavior on opacity {
@@ -166,6 +122,11 @@ CustomRect {
 			anchors.right: parent.right
 			implicitHeight: titleText.implicitHeight + Tokens.padding.small * 2
 
+			layer.enabled: true
+			layer.effect: OpacityMask {
+				maskSource: fadeMask
+			}
+
 			TextFieldBase {
 				id: titleText
 
@@ -173,12 +134,10 @@ CustomRect {
 				anchors.leftMargin: readOnly ? 0 : Tokens.padding.large
 				anchors.top: parent.top
 				anchors.topMargin: readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
-				width: Math.min(implicitWidth, parent.width - Tokens.padding.large * 2)
 				font: Tokens.font.body.medium
 				text: root.modelData.title || qsTr("New chat")
 				readOnly: true
 				color: Colors.palette.m3onSurface
-				opacity: 0
 
 				Behavior on anchors.leftMargin {
 					Anim {}
@@ -187,11 +146,6 @@ CustomRect {
 					Anim {}
 				}
 
-				function cancelTitleEdit(): void {
-					text = root.modelData.title;
-					readOnly = true;
-				}
-
 				onEditingFinished: root.modelData.title = text
 				onReadOnlyChanged: {
 					if (!readOnly) {
@@ -202,24 +156,27 @@ CustomRect {
 					}
 				}
 			}
+		}
 
-			CustomText {
+		CustomRect {
-				id: staticText
+			id: fadeMask
 
-				anchors.left: parent.left
+			anchors.fill: titleWrapper
-				anchors.leftMargin: titleText.readOnly ? 0 : Tokens.padding.large
-				anchors.top: parent.top
-				anchors.topMargin: titleText.readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
-				anchors.right: parent.right
-				font: titleText.font
-				text: titleText.text
-				elide: CustomText.ElideRight
 
-				Behavior on anchors.leftMargin {
+			layer.enabled: true
-					Anim {}
+			visible: false
+
+			gradient: Gradient {
+				orientation: Gradient.Horizontal
+
+				GradientStop {
+					color: Qt.rgba(1, 1, 1, 1.0)
+					position: 0.85
 				}
-				Behavior on anchors.topMargin {
+
-					Anim {}
+				GradientStop {
+					color: Qt.rgba(1, 1, 1, 0)
+					position: 1.0
 				}
 			}
 		}
@@ -366,13 +323,7 @@ CustomRect {
 			inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 3)
 			inactiveOnColor: Colors.palette.m3onSurfaceVariant
 
-			onClicked: {
+			onClicked: root.remove(root.modelData)
-				if (!titleText.readOnly) {
-					titleText.cancelTitleEdit();
-					return;
-				}
-				root.remove(root.modelData);
-			}
 		}
 
 		IconButton {
@@ -415,10 +366,7 @@ CustomRect {
 		}
 
 		StateLayer {
-			onClicked: {
+			onClicked: root.expanded = !root.expanded
-				root.expanded = !root.expanded;
-				titleText.readOnly = true;
-			}
 		}
 
 		MaterialIcon {

Modules/Sidebar/Chat/ChatList.qml

@@ -140,7 +140,7 @@ Item {
 		label.transform: Rotation {
 			origin.y: fabRoot.label.height / 2
 			origin.x: fabRoot.label.width / 2
-			angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded || !ChatState.isWide || !ChatState.isWindow) ? 135 : 0
+			angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded && !ChatState.isWide || !ChatState.isWindow) ? 135 : 0
 
 			Behavior on angle {
 				Anim {}
@@ -148,9 +148,8 @@ Item {
 		}
 
 		onClicked: {
-			if ((root.slim && !ChatState.narrowSidebarExpanded) || ChatState.shrinkSidebarOverride) {
+			if (root.slim && !ChatState.narrowSidebarExpanded) {
 				root.requestExpand();
-				ChatState.shrinkSidebarOverride = false;
 				return;
 			}
 
@@ -184,10 +183,6 @@ Item {
 					name: "pop out in window"
 					icon: "open_in_new"
 				}
-				ListElement {
-					name: "shrink sidebar"
-					icon: "left_panel_close"
-				}
 			}
 
 			CustomRect {
@@ -201,18 +196,7 @@ Item {
 
 				radius: sLayer.pressed ? Tokens.rounding.small : implicitHeight / 2
 				color: Colors.palette.m3primaryContainer
-				visible: {
+				visible: !(modelData.name === "pop out in window" && ChatState.isWindow)
-					const n = modelData.name;
-					const w = ChatState.isWindow;
-					const wide = ChatState.isWide;
-
-					if (n === "pop out in window" && w)
-						return false;
-					if (n === "shrink sidebar" && (!w || !wide))
-						return false;
-					else
-						return true;
-				}
 				clip: true
 
 				Behavior on radius {
@@ -313,8 +297,6 @@ Item {
 							root.newChatRequest();
 						else if (name === "pop out in window")
 							Detach.create();
-						else if (name === "shrink sidebar")
-							ChatState.shrinkSidebarOverride = true;
 
 						ChatState.fabExpanded = false;
 					}

Modules/Sidebar/Chat/ChatState.qml

@@ -19,7 +19,7 @@ Singleton {
 	property bool settledSlim: false
 	property bool settledWide: false
 	property bool narrowSidebarExpanded: false
-	property bool shrinkSidebarOverride: false
+	property bool windowIsWide: false
 	property ShellScreen screen
 	property bool sidebarVisible: ShellState.forActive().sidebar
 
@@ -28,9 +28,6 @@ Singleton {
 		root.currentIdx = -1;
 	}
 
-	onIsWideChanged: if (isWide)
-		narrowSidebarExpanded = false
-
 	onSidebarVisibleChanged: if (!sidebarVisible)
 		fabExpanded = false
 }

Modules/Sidebar/Chat/Content/ApprovalPrompt.qml

@@ -337,7 +337,7 @@ Item {
 										}
 									}
 
-									Item {
+									CustomClippingRect {
 										id: expandedTool
 
 										anchors.top: collapsedRow.bottom
@@ -348,16 +348,8 @@ Item {
 										anchors.topMargin: Tokens.spacing.medium
 
 										implicitHeight: fullToolCall.implicitHeight + fullToolCall.anchors.margins * 2
-										clip: true
+										radius: Tokens.rounding.medium
-
+										color: Colors.palette.m3surfaceContainerLow
-										CustomRect {
-											id: bg
-
-											anchors.fill: parent
-
-											radius: Tokens.rounding.medium
-											color: Colors.palette.m3surfaceContainerLow
-										}
 
 										CustomText {
 											id: fullToolCall

Modules/Sidebar/Chat/Content/ChatHost.qml

@@ -59,6 +59,7 @@ Item {
 		id: container
 
 		anchors.fill: parent
+		layer.enabled: opacity < 1
 		objectName: "ConversationContainer"
 
 		Component.onCompleted: {

Modules/Sidebar/Chat/Content/CodeBlockView.qml

@@ -220,8 +220,9 @@ CustomRect {
 
 			Layout.alignment: Qt.AlignVCenter
 			color: root.codeHeaderColor
-			font: Tokens.font.label.builders.small.capitalization(Font.Capitalize).build()
+			font: Tokens.font.label.small
 			text: CodeIcons.name(root.language)
+			visible: root.language.length > 0
 		}
 
 		Item {
@@ -251,7 +252,7 @@ CustomRect {
 		}
 	}
 
-	CustomRect {
+	CustomClippingRect {
 		id: codeRect
 
 		anchors.left: parent.left
@@ -264,7 +265,6 @@ CustomRect {
 		implicitWidth: codeText.implicitWidth + codeFlick.anchors.margins * 2
 		implicitHeight: codeText.implicitHeight + codeFlick.anchors.margins * 2
 		color: CodeColors.active.bg
-		clip: true
 
 		Flickable {
 			id: codeFlick
@@ -272,9 +272,6 @@ CustomRect {
 			anchors.fill: parent
 			anchors.margins: Tokens.padding.small
 
-			boundsBehavior: Flickable.StopAtBounds
-			contentWidth: codeText.implicitWidth
-
 			CustomScrollBar.horizontal: CustomScrollBar {
 				flickable: codeFlick
 				parent: codeFlick.parent
@@ -283,13 +280,16 @@ CustomRect {
 				anchors.right: parent.right
 			}
 
-			CustomText {
+			TextAreaBase.flickable: TextAreaBase {
 				id: codeText
 
 				color: CodeColors.active.normal
+				layer.enabled: true
+				clip: false
 				font: Tokens.font.mono.small
-				textFormat: Text.RichText
+				textFormat: root.colored ? Text.RichText : Text.PlainText
 				text: root.colored ? root.html : root.plainForDisplay(root.code)
+				readOnly: true
 			}
 		}
 	}

Modules/Sidebar/Chat/Content/ProcessBlock.qml

@@ -125,7 +125,7 @@ Item {
 		current: root.current
 	}
 
-	Item {
+	CustomClippingRect {
 		id: expandedRect
 
 		anchors.left: parent.left
@@ -133,19 +133,11 @@ Item {
 		anchors.top: layout.bottom
 		anchors.bottom: parent.bottom
 		anchors.topMargin: Tokens.spacing.small
+		color: Colors.palette.m3surfaceContainerLow
 		implicitHeight: expandedContent.contentHeight + expandedContent.anchors.margins * 2
 		opacity: root.expanded ? 1 : 0
+		radius: Tokens.rounding.medium
 		visible: opacity > 0
-		clip: true
-
-		CustomRect {
-			id: bg
-
-			anchors.fill: parent
-
-			radius: Tokens.rounding.medium
-			color: Colors.palette.m3surfaceContainerLow
-		}
 
 		Behavior on opacity {
 			Anim {}

Modules/Sidebar/Chat/SidebarView.qml

@@ -21,8 +21,12 @@ Item {
 	property bool chatOpen: ChatState.chatSession !== null
 
 	readonly property bool isWide: root.width >= root.breakpoint
-	readonly property bool wideExpandedSidebar: isWide && !ChatState.shrinkSidebarOverride
+
-	readonly property bool narrowExpandedSidebar: !isWide && ChatState.narrowSidebarExpanded
+	readonly property bool showList: isWide || !chatOpen
+	readonly property bool showContent: !isWide && chatOpen
+
+	function openConversation(conv: ChatSession, index: int): void {
+	}
 
 	BlobGroup {
 		id: blobGroup
@@ -50,9 +54,9 @@ Item {
 		anchors.left: parent.left
 		anchors.bottom: parent.bottom
 		anchors.margins: Tokens.padding.medium
-		implicitWidth: root.wideExpandedSidebar || root.narrowExpandedSidebar ? Config.sidebar.sizes.width : root.iconSize
+		implicitWidth: root.isWide || ChatState.narrowSidebarExpanded ? Config.sidebar.sizes.width : root.iconSize
 		highlight: true
-		slim: !root.wideExpandedSidebar && !root.narrowExpandedSidebar
+		slim: !root.isWide && !ChatState.narrowSidebarExpanded
 		z: 1
 
 		Behavior on implicitWidth {
@@ -82,13 +86,13 @@ Item {
 		}
 	}
 
-	Item {
+	CustomClippingRect {
 		anchors.fill: parent
 		anchors.leftMargin: invertedRect.borderLeft
 		anchors.topMargin: invertedRect.borderTop
 		anchors.bottomMargin: invertedRect.borderBottom
 		anchors.rightMargin: invertedRect.borderRight
-		clip: true
+		radius: invertedRect.radius
 
 		children: [contentArea, dim]
 	}
@@ -96,10 +100,9 @@ Item {
 	CustomRect {
 		id: dim
 		anchors.fill: parent
-		radius: invertedRect.radius
 
 		color: Colors.palette.m3shadow
-		opacity: root.narrowExpandedSidebar ? 0.3 : 0
+		opacity: ChatState.narrowSidebarExpanded && !root.isWide ? 0.3 : 0
 		z: 1
 
 		Behavior on opacity {
@@ -152,7 +155,7 @@ Item {
 			id: dimArea
 			anchors.fill: parent
 			preventStealing: true
-			enabled: root.narrowExpandedSidebar
+			enabled: !root.isWide && ChatState.narrowSidebarExpanded
 			cursorShape: undefined
 
 			onClicked: {
@@ -172,6 +175,12 @@ Item {
 		}
 	}
 
+	Binding {
+		target: ChatState
+		property: "windowIsWide"
+		value: root.showList
+	}
+
 	Binding {
 		target: ChatState
 		property: "isWide"

Modules/Sidebar/NotifActionList.qml

@@ -17,6 +17,76 @@ Item {
 
 	Layout.fillWidth: true
 	implicitHeight: flickable.contentHeight
+	layer.enabled: true
+	layer.smooth: true
+
+	layer.effect: Mask {
+		maskSource: gradientMask
+	}
+
+	Item {
+		id: gradientMask
+
+		anchors.fill: parent
+		layer.enabled: true
+		visible: false
+
+		Rectangle {
+			anchors.fill: parent
+
+			gradient: Gradient {
+				orientation: Gradient.Horizontal
+
+				GradientStop {
+					color: Qt.rgba(0, 0, 0, 0)
+					position: 0
+				}
+
+				GradientStop {
+					color: Qt.rgba(0, 0, 0, 1)
+					position: 0.1
+				}
+
+				GradientStop {
+					color: Qt.rgba(0, 0, 0, 1)
+					position: 0.9
+				}
+
+				GradientStop {
+					color: Qt.rgba(0, 0, 0, 0)
+					position: 1
+				}
+			}
+		}
+
+		Rectangle {
+			anchors.bottom: parent.bottom
+			anchors.left: parent.left
+			anchors.top: parent.top
+			implicitWidth: parent.width / 2
+			opacity: flickable.contentX > 0 ? 0 : 1
+
+			Behavior on opacity {
+				Anim {
+					type: Anim.DefaultEffects
+				}
+			}
+		}
+
+		Rectangle {
+			anchors.bottom: parent.bottom
+			anchors.right: parent.right
+			anchors.top: parent.top
+			implicitWidth: parent.width / 2
+			opacity: flickable.contentX < flickable.contentWidth - parent.width ? 0 : 1
+
+			Behavior on opacity {
+				Anim {
+					type: Anim.DefaultEffects
+				}
+			}
+		}
+	}
 
 	CustomFlickable {
 		id: flickable

Modules/Sidebar/NotifGroup.qml

@@ -112,7 +112,7 @@ CustomRect {
 				}
 			}
 
-			ClipRect {
+			CustomClippingRect {
 				anchors.fill: parent
 				color: root.urgency === NotificationUrgency.Critical ? Colors.palette.m3error : root.urgency === NotificationUrgency.Low ? Colors.layer(Colors.palette.m3surfaceContainerHigh, 3) : Colors.palette.m3secondaryContainer
 				radius: Tokens.rounding.full

Plugins/CMakeLists.txt

@@ -20,14 +20,6 @@ pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
 pkg_check_modules(EGL REQUIRED IMPORTED_TARGET egl)
 pkg_check_modules(WAYLAND_EGL REQUIRED IMPORTED_TARGET wayland-egl)
 pkg_check_modules(GL REQUIRED IMPORTED_TARGET gl)
-pkg_check_modules(MPV REQUIRED IMPORTED_TARGET mpv)
-
-pkg_check_modules(AVCODEC REQUIRED IMPORTED_TARGET libavcodec)
-pkg_check_modules(AVFORMAT REQUIRED IMPORTED_TARGET libavformat)
-pkg_check_modules(AVUTIL REQUIRED IMPORTED_TARGET libavutil)
-pkg_check_modules(LIBVA QUIET IMPORTED_TARGET libva)
-
-find_package(CUDAToolkit QUIET)
 pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED)
 pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED)
 pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED)

Plugins/ZShell/CMakeLists.txt

@@ -37,7 +37,6 @@ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
 add_subdirectory(Settings)
 add_subdirectory(Models)
 add_subdirectory(Internal)
-add_subdirectory(Wallpaper)
 add_subdirectory(Services)
 add_subdirectory(Components)
 add_subdirectory(Blobs)

Plugins/ZShell/Config/background.hpp

@@ -1,9 +1,6 @@
 #pragma once
-
-#include <qqmlintegration.h>
-
 #include "common.hpp"
-#include "enums.hpp"
+#include <qqmlintegration.h>
 
 namespace ZShell::config {
 
@@ -12,8 +9,6 @@ class Background : public settings::ObjectNode {
 
 	CONFIG_PROPERTY(bool, enabled, true)
 	CONFIG_PROPERTY(int, wallFadeDuration, 300)
-	CONFIG_ENUM_PROPERTY(
-		WallpaperTransition, wallTransition, WallpaperTransition::Fade)
 };
 
 } // namespace ZShell::config

Plugins/ZShell/Config/enums.hpp

@@ -23,19 +23,6 @@ ENUM(NotifsFullscreen, On, Off)
 ENUM(TemperatureUnit, Auto, Celsius, Fahrenheit, Kelvin)
 ENUM(DataUnit, Binary, Decimal)
 ENUM(ClockFormat, Auto, TwelveHour, TwentyFourHour)
-ENUM(
-	WallpaperTransition,
-	Bowtie,
-	Fade,
-	LinearBlur,
-	WindowSlices,
-	WipeRight,
-	WipeDown,
-	TilesWave,
-	SplitSlideInHorizontal,
-	Hexagonalize,
-	DoomMelt,
-	Random)
 
 #undef ENUM
 

Plugins/ZShell/Config/fontbuilder.cpp

@@ -52,7 +52,7 @@ FontBuilder FontBuilder::letterSpacing(qreal spacing, bool absolute) {
 	return *this;
 }
 
-FontBuilder FontBuilder::capitalization(QFont::Capitalization cap) {
+FontBuilder FontBuilder::capitalisation(QFont::Capitalization cap) {
 	m_font.setCapitalization(cap);
 	return *this;
 }

Plugins/ZShell/Config/fontbuilder.hpp

@@ -23,7 +23,7 @@ class FontBuilder {
 	[[nodiscard]] Q_INVOKABLE FontBuilder
 	letterSpacing(qreal spacing, bool absolute = true);
 	[[nodiscard]] Q_INVOKABLE FontBuilder
-	capitalization(QFont::Capitalization cap);
+	capitalisation(QFont::Capitalization cap);
 	[[nodiscard]] Q_INVOKABLE FontBuilder vaxis(const QString& tag, float value);
 	[[nodiscard]] Q_INVOKABLE FontBuilder vaxes(const QVariantMap& axes);
 	[[nodiscard]] Q_INVOKABLE QFont build() const;

Plugins/ZShell/HyprPlugins/main.cpp

@@ -14,10 +14,9 @@
 #include <hyprland/src/plugins/PluginAPI.hpp>
 #include <hyprland/src/render/OpenGL.hpp>
 #include <hyprland/src/render/Renderer.hpp>
-#include <hyprland/src/render/Context.hpp>
 #undef private
 
-#include <hyprland/src/ipc/s2/S2.hpp>
+#include <hyprland/src/managers/EventManager.hpp>
 
 extern "C" {
 #include <lua.h>
@@ -28,7 +27,6 @@ extern "C" {
 
 using ZShell::services::kelvinToGain;
 
-using Render::CRenderContext;
 using Render::IFramebuffer;
 using Render::GL::CHyprOpenGLImpl;
 using Render::GL::g_pHyprOpenGL;
@@ -151,14 +149,25 @@ static bool gainIsNeutral(const std::array<float, 3>& gain) {
 }
 
 static CFunctionHook* g_pBeginHook = nullptr;
-using origBegin = bool (*)(
+using origBegin = void (*)(
 	CHyprOpenGLImpl*,
-	CRenderContext&,
 	PHLMONITOR,
 	const CRegion&,
 	SP<IFramebuffer>,
 	std::optional<CRegion>);
 
+static CFunctionHook* g_pSaveMirrorHook = nullptr;
+using origSaveMirror = bool (*)(CHyprOpenGLImpl*, const CBox&);
+
+static bool hkSaveBufferForMirror(CHyprOpenGLImpl* thisptr, const CBox& box) {
+	const bool saved = thisptr->m_applyFinalShader;
+	thisptr->m_applyFinalShader = false;
+	const bool result = (*reinterpret_cast<origSaveMirror>(
+		g_pSaveMirrorHook->m_original))(thisptr, box);
+	thisptr->m_applyFinalShader = saved;
+	return result;
+}
+
 static void installShader() {
 	auto* gl = g_pHyprOpenGL.get();
 	if (!gl) return;
@@ -189,33 +198,34 @@ static void setUniformGain(const std::array<float, 3>& gain) {
 	shader->setUniformFloat3(SHADER_TINT, gain[0], gain[1], gain[2]);
 }
 
-static bool hkBegin(
+static void hkBegin(
 	CHyprOpenGLImpl* thisptr,
-	CRenderContext& ctx,
 	PHLMONITOR mon,
 	const CRegion& damage,
 	SP<IFramebuffer> fb,
 	std::optional<CRegion> finalDamage) {
-	const bool ok = (*reinterpret_cast<origBegin>(
+	(*reinterpret_cast<origBegin>(
-		g_pBeginHook->m_original))(thisptr, ctx, mon, damage, fb, finalDamage);
+		g_pBeginHook->m_original))(thisptr, mon, damage, fb, finalDamage);
-	if (!ok) return false;
 
-	if (fb) ctx.m_data.blockScreenShader = true;
+	if (fb) {
+		auto* renderer = g_pHyprRenderer.get();
+		if (renderer) renderer->m_renderData.blockScreenShader = true;
+	}
 
-	if (!g_active) return true;
+	if (!g_active) return;
 
 	auto* gl = g_pHyprOpenGL.get();
-	if (!gl) return true;
+	if (!gl) return;
 
 	if (gl->m_finalScreenShader.get() && gl->m_finalScreenShader->program() < 1)
 		installShader();
 	if (!gl->m_finalScreenShader.get() ||
 		gl->m_finalScreenShader->program() < 1)
-		return true;
+		return;
 
 	if (g_transition.active) {
 		auto* monPtr = mon.get();
-		if (!monPtr) return true;
+		if (!monPtr) return;
 		const float elapsed =
 			std::chrono::duration<float>(
 				std::chrono::steady_clock::now() - g_transition.start)
@@ -255,7 +265,6 @@ static bool hkBegin(
 	} else if (g_uniformMode) {
 		setUniformGain(g_currentGain);
 	}
-	return true;
 }
 
 static constexpr int KELVIN_MIN = 2000;
@@ -324,10 +333,9 @@ static int luaNightlightState(lua_State* L) {
 }
 
 static void postStateEvent(bool enabled, bool animating) {
-	auto& sock = IPC::Socket2::sock();
+	if (!g_pEventManager) return;
-	if (!sock) return;
+	g_pEventManager->postEvent(
-	sock->postEvent(
+		SHyprIPCEvent{
-		IPC::Socket2::SEvent{
 			.event = "zshell-nightlight",
 			.data = std::format(
 				"{},{},{},{}",
@@ -369,6 +377,31 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 		throw std::runtime_error("[zshell-nightlight] version mismatch");
 	}
 
+	static const auto SAVEMIRROR_METHODS =
+		HyprlandAPI::findFunctionsByName(PHANDLE, "saveBufferForMirror");
+	const SFunctionMatch* saveMirrorTarget = findExactMethod(
+		SAVEMIRROR_METHODS,
+		manglePrefix("CHyprOpenGLImpl", "saveBufferForMirror"));
+
+	if (saveMirrorTarget) {
+		g_pSaveMirrorHook = HyprlandAPI::createFunctionHook(
+			PHANDLE,
+			saveMirrorTarget->address,
+			reinterpret_cast<void*>(&hkSaveBufferForMirror));
+		if (g_pSaveMirrorHook && g_pSaveMirrorHook->hook())
+			dlog(
+				"saveBufferForMirror hook installed: " +
+				saveMirrorTarget->signature);
+	}
+
+	if (!g_pSaveMirrorHook)
+		HyprlandAPI::addNotification(
+			PHANDLE,
+			"[zshell-nightlight] WARNING: couldn't hook saveBufferForMirror — "
+			"captures may still show the nightlight",
+			CHyprColor{1.f, 0.6f, 0.2f, 1.f},
+			8000);
+
 	static const auto METHODS =
 		HyprlandAPI::findFunctionsByName(PHANDLE, "begin");
 	const SFunctionMatch* target =

Plugins/ZShell/Internal/CMakeLists.txt

@@ -1,3 +1,8 @@
+wl_proto(wlp-layer-shell wlr-layer-shell-unstable-v1 "${CMAKE_CURRENT_SOURCE_DIR}/protocols")
+wl_proto(wlp-viewporter viewporter "${WAYLAND_PROTOCOLS}/stable/viewporter")
+wl_proto(wlp-fractional-scale fractional-scale-v1 "${WAYLAND_PROTOCOLS}/staging/fractional-scale")
+wl_proto(wlp-xdg-shell xdg-shell "${WAYLAND_PROTOCOLS}/stable/xdg-shell")
+
 qml_module(ZShell-internal
 	URI ZShell.Internal
 	INCLUDE_PREFIX internal
@@ -8,6 +13,10 @@ qml_module(ZShell-internal
 		circularindicatormanager.hpp circularindicatormanager.cpp
 		circularbuffer.hpp circularbuffer.cpp
 		arcgauge.hpp arcgauge.cpp
+		wallpaperimage.hpp wallpaperimage.cpp
+		wallpaperservice.hpp wallpaperservice.cpp
+		wallpapersurface.hpp wallpapersurface.cpp
+		wallpaperobject.hpp wallpaperobject.cpp
 		lidwatcher.hpp lidwatcher.cpp
 		visualizerbars.hpp visualizerbars.cpp
 		linearindicatormanager.hpp linearindicatormanager.cpp
@@ -18,14 +27,16 @@ qml_module(ZShell-internal
 		Qt::Gui
 		Qt::Quick
 		Qt::Concurrent
-		Qt::Sql
 		Qt::Core
 		Qt::Network
 		Qt::DBus
 		Qt::CanvasPainter
 		Qt::GuiPrivate
+		wlp-layer-shell
+		wlp-xdg-shell
+		wlp-viewporter
+		wlp-fractional-scale
 		PkgConfig::EGL
 		PkgConfig::WAYLAND_EGL
 		PkgConfig::GL
-		ZShell-config
 )

Plugins/ZShell/Internal/wallpaperimage.cpp

@@ -8,7 +8,7 @@
 #include <QtConcurrent>
 #include <QQuickWindow>
 
-namespace ZShell::wallpaper {
+namespace ZShell::internal {
 
 QThreadPool* WallpaperImage::loadPool() {
 	static QThreadPool* pool = [] {
@@ -352,4 +352,4 @@ QSGNode* WallpaperImage::updatePaintNode(
 	return m_rootNode;
 }
 
-} // namespace ZShell::wallpaper
+} // namespace ZShell::internal