fix(clang-tidy): make cpp-lint has proper clang-tidy check

Reviewed-on: #155

.clangd

@@ -0,0 +1,5 @@
+CompileFlags:
+  Remove:
+    # GCC-only flags from the system's default spec that clang/clangd cannot
+    # parse. They appear in compile_commands.json but are not set by the project.
+    - -mno-direct-extern-access

.gitea/ISSUE_TEMPLATE/bug.yaml

@@ -38,7 +38,6 @@ body:
       attributes:
           label: OS
           options:
-              - NixOS
               - Arch
               - Debian / Ubuntu
               - Fedora

.gitea/PULL_REQUEST_TEMPLATE.yaml

@@ -30,6 +30,7 @@ body:
         - Refactor / style
         - CI / build / tooling
         - Documentation
+        - Other (Describe in description box with header "Issue type")
     validations:
       required: true
 

.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

@@ -1,12 +1,15 @@
 name: Python
 
+env:
+    APT_DEPS: git python3 python3-pip python3-venv python3-gi python3-cairo python3-dbus python3-pyudev python3-psutil python3-evdev python3-yaml python3-xlib python3-pillow gir1.2-gtk-3.0
+
 on:
     pull_request:
 
 jobs:
-    fmt:
-        runs-on: alpine
-        container: node:26-alpine
+    fmt & lint:
+        runs-on: debian
+        container: node:26-trixie-slim
 
         steps:
             - name: Checkout
@@ -14,10 +17,8 @@ jobs:
 
             - name: Install tools
               run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip
+                  apt-get update
+                  apt-get install -y --no-install-recommends git python3 python3-pip python3-venv
                   python3 -m venv .venv
                   . .venv/bin/activate
                   pip install --no-cache-dir ruff
@@ -27,32 +28,15 @@ jobs:
                   . .venv/bin/activate
                   ruff format --check .
 
-    lint:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip
-                  python3 -m venv .venv
-                  . .venv/bin/activate
-                  pip install --no-cache-dir ruff
-
             - name: Lint
               run: |
                   . .venv/bin/activate
                   ruff check .
 
-    test:
-        runs-on: alpine
-        container: node:26-alpine
+    test & nuitka build:
+        if: always()
+        runs-on: debian
+        container: node:26-trixie-slim
 
         steps:
             - name: Checkout
@@ -60,20 +44,16 @@ jobs:
 
             - name: Install tools
               run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip \
-                    py3-pillow \
-                    build-base
-                  python3 -m venv .venv
+                  apt-get update
+                  apt-get install -y --no-install-recommends $APT_DEPS build-essential python3-dev
+                  python3 -m venv --system-site-packages .venv
                   . .venv/bin/activate
-                  pip install --no-cache-dir \
-                    typer \
-                    pillow \
-                    materialyoucolor \
-                    jinja2 \
-                    pytest
+                  pip install --no-cache-dir basedpyright nuitka .
+
+            - name: Type check
+              run: |
+                  . .venv/bin/activate
+                  basedpyright
 
             - name: Test
               run: |
@@ -81,51 +61,6 @@ jobs:
                   cd cli
                   python -m pytest tests/ -v
 
-    typecheck:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                      git \
-                      python3 \
-                      py3-pip
-                  python3 -m venv .venv
-                  . .venv/bin/activate
-                  pip install --no-cache-dir basedpyright typer pillow materialyoucolor jinja2
-
-            - name: Type check
-              run: |
-                  . .venv/bin/activate
-                  basedpyright
-
-    buildcheck:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                    git \
-                    python3 \
-                    py3-pip \
-                    build-base \
-                    python3-dev \
-                    gcc \
-                    g++
-                  python3 -m venv .venv
-                  . .venv/bin/activate
-                  pip install --no-cache-dir nuitka
-
             - name: Nuitka module check
               run: |
                   . .venv/bin/activate

.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

.gitignore

@@ -16,3 +16,8 @@ dist/
 **/test-plugins/
 **/Charts/
 network-dev/
+**/zshell.build/
+**/zshell.dist/
+.opencode/
+run-agent.sh
+AGENTS.md

.prettierignore

@@ -1,3 +1,4 @@
 .venv/
 scripts/fzf.js
 scripts/fuzzysort.js
+scripts/settings-indexer.js

.qmlformat.ini

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

CMakeLists.txt

@@ -26,49 +26,51 @@ if(NOT DEFINED VERSION)
 	endif()
 endif()
 
+if(NOT DEFINED GIT_REVISION)
+	execute_process(COMMAND git rev-parse HEAD
+								WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+								OUTPUT_VARIABLE GIT_REVISION
+								OUTPUT_STRIP_TRAILING_WHITESPACE
+				)
+
+	if("${GIT_REVISION}" STREQUAL "")
+		message(FATAL_ERROR "GIT_REVISION is not set and failed to get from git")
+	endif()
+endif()
+
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 project(ZShell VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 message(STATUS "ZShell version: ${VERSION}")
 
+include(GNUInstallDirs)
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(ENABLE_MODULES "plugin;shell;m3shapes" CACHE STRING "Modules to build/install")
+set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
 
-set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
-set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
-set(INSTALL_QSCONFDIR "etc/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")
-set(INSTALL_GREETERCONFDIR "etc/xdg/quickshell/zshell-greeter" CACHE STRING "Quickshell greeter install dir")
+set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
+set(INSTALL_QMLDIR "${CMAKE_INSTALL_LIBDIR}/qt6/qml" CACHE STRING "QML install dir")
+set(INSTALL_QSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")
+set(INSTALL_GREETERCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/xdg/quickshell/zshell-greeter" CACHE STRING "Quickshell greeter install dir")
 
 set(CMAKE_INSTALL_MESSAGE NEVER)
 
 add_compile_options(
 	-Wall -Wextra -Wpedantic -Wshadow -Wconversion
-	-Wold-style-cast -Wnull-dereference -Wdouble-promotion
-	-Wformat=2 -Wfloat-equal -Woverloaded-virtual
+	-Wnull-dereference -Wdouble-promotion
+	-Wformat=2 -Wfloat-equal
 	-Wsign-conversion -Wredundant-decls -Wswitch
 	-Wunreachable-code
+	$<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
+	$<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
 )
 
 
-if("shell" IN_LIST ENABLE_MODULES)
-	# Build settings index
-	find_package(Python3 COMPONENTS Interpreter REQUIRED)
-	set(SETTINGS_INDEX_JSON "${CMAKE_BINARY_DIR}/settings-index.json")
-	execute_process(
-		COMMAND ${Python3_EXECUTABLE}
-			"${CMAKE_SOURCE_DIR}/scripts/build-settings-index.py"
-			"${CMAKE_SOURCE_DIR}/Modules/Settings"
-			"${SETTINGS_INDEX_JSON}"
-		RESULT_VARIABLE SETTINGS_INDEX_RESULT
-	)
-	if(NOT SETTINGS_INDEX_RESULT EQUAL 0)
-		message(FATAL_ERROR "Failed to build settings search index")
-	endif()
-
+if("cli" IN_LIST ENABLE_MODULES)
 	# Nuitka compilation
 	set(ZSHELL_CLI_BUILD_DIR "${CMAKE_BINARY_DIR}/zshell-cli")
 	set(ZSHELL_CLI_DIST "${ZSHELL_CLI_BUILD_DIR}/zshell.dist")
@@ -93,6 +95,8 @@ if("shell" IN_LIST ENABLE_MODULES)
 				${NUITKA_EXECUTABLE}
 				--standalone
 				--include-data-dir=${CMAKE_SOURCE_DIR}/cli/src/zshell/assets=zshell/assets
+				--include-package=gi.overrides
+				--include-package-data=solaar
 				--output-dir=${ZSHELL_CLI_BUILD_DIR}
 				--output-filename=zshell-cli
 				${CMAKE_SOURCE_DIR}/cli/src/zshell/
@@ -186,4 +190,11 @@ if("m3shapes" IN_LIST ENABLE_MODULES)
 	if(TARGET m3shapesplugin)
 		set_target_properties(m3shapesplugin PROPERTIES INSTALL_RPATH "$ORIGIN")
 	endif()
+
+	# Silence warnings that come from m3shapes files we do not manage.
+	foreach(m3shapes_target m3shapes_core m3shapes_morph m3shapes_shapes m3shapes m3shapesplugin)
+		if(TARGET ${m3shapes_target})
+			target_compile_options(${m3shapes_target} PRIVATE -Wno-shadow -Wno-float-equal)
+		endif()
+	endforeach()
 endif()

Components/AnchorAnim.qml

@@ -27,25 +27,25 @@ AnchorAnimation {
 		if (type == AnchorAnim.DefaultSpatial)
 			return Tokens.anim.durations.expressiveDefaultSpatial;
 		if (type == AnchorAnim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Tokens.anim.durations.expressiveSlowSpatial;
 
 		const types = ["small", "normal", "large", "extraLarge"];
-		const idx = type % 4;
+		const idx = type % 4; // 0-7 are the 4 standard types
 		return Tokens.anim.durations[types[idx]];
 	}
-	easing.bezierCurve: {
+	easing: {
 		if (type == AnchorAnim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Tokens.anim.expressiveFastSpatial;
 		if (type == AnchorAnim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Tokens.anim.expressiveDefaultSpatial;
 		if (type == AnchorAnim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Tokens.anim.expressiveSlowSpatial;
 
 		if (type >= AnchorAnim.StandardSmall && type <= AnchorAnim.StandardExtraLarge)
-			return Tokens.anim.curves.standard;
+			return Tokens.anim.standard;
 		if (type >= AnchorAnim.EmphasizedSmall && type <= AnchorAnim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
+			return Tokens.anim.emphasized;
 
-		return Tokens.anim.curves.expressiveDefaultSpatial;
+		return Tokens.anim.expressiveDefaultSpatial;
 	}
 }

Components/Anim.qml

@@ -30,34 +30,34 @@ NumberAnimation {
 		if (type === Anim.DefaultSpatial)
 			return Tokens.anim.durations.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Tokens.anim.durations.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
 			return Tokens.anim.durations.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.durations.expressiveEffects;
+			return Tokens.anim.durations.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
 			return Tokens.anim.durations.expressiveSlowEffects;
 
 		const types = ["small", "normal", "large", "extraLarge"];
-		const idx = type % 4;
+		const idx = type % 4; // 0-7 are the 4 standard types
 		return Tokens.anim.durations[types[idx]];
 	}
-	easing.bezierCurve: {
+	easing: {
 		if (type === Anim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Tokens.anim.expressiveFastSpatial;
 		if (type === Anim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Tokens.anim.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Tokens.anim.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
-			return Tokens.anim.curves.expressiveFastEffects;
+			return Tokens.anim.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.curves.expressiveDefaultEffects;
+			return Tokens.anim.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
-			return Tokens.anim.curves.expressiveSlowEffects;
+			return Tokens.anim.expressiveSlowEffects;
 
 		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
-		return Tokens.anim.curves.standard;
+			return Tokens.anim.emphasized;
+		return Tokens.anim.standard;
 	}
 }

Components/BaseStyledSlider.qml

@@ -80,49 +80,29 @@ Slider {
 
 				property bool moving
 
-				function update(): void {
-					animate = !moving;
-					binding.when = moving;
-					font.pointSize = moving ? Tokens.font.size.small : Tokens.font.size.larger;
-					font.family = moving ? Config.appearance.font.family.sans : Config.appearance.font.family.material;
-				}
-
 				anchors.centerIn: parent
+				anchors.verticalCenterOffset: 1
+				text: moving ? Math.round(root.value * 100) : root.icon
 				color: Colors.palette.m3inverseOnSurface
-				text: root.icon
-
-				onMovingChanged: anim.restart()
-
-				Binding {
-					id: binding
-
-					property: "text"
-					target: icon
-					value: Math.round(root.value * root.multiplier)
-					when: false
-				}
+				font: moving ? Tokens.font.body.small : Tokens.font.icon.medium
 
+				Behavior on moving {
 					SequentialAnimation {
-					id: anim
-
 						Anim {
-						duration: Tokens.anim.durations.normal / 2
-						easing.bezierCurve: Tokens.anim.curves.standardAccel
-						property: "scale"
 							target: icon
-						to: 0
+							property: "scale"
+							to: 0.3
+							duration: Tokens.anim.durations.small / 2
+							easing: Tokens.anim.standardAccel
 						}
-
-					ScriptAction {
-						script: icon.update()
-					}
-
+						PropertyAction {}
 						Anim {
-						duration: Tokens.anim.durations.normal / 2
-						easing.bezierCurve: Tokens.anim.curves.standardDecel
-						property: "scale"
 							target: icon
+							property: "scale"
 							to: 1
+							duration: Tokens.anim.durations.normal / 2
+							easing: Tokens.anim.standardDecel
+						}
 					}
 				}
 			}
@@ -130,7 +110,7 @@ Slider {
 	}
 	Behavior on value {
 		Anim {
-			duration: Tokens.anim.durations.large
+			type: Anim.StandardLarge
 		}
 	}
 
@@ -138,7 +118,6 @@ Slider {
 	onValueChanged: {
 		if (!initialized) {
 			initialized = true;
-			oldValue = value;
 			return;
 		}
 

Components/ButtonBase.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import ZShell.Config
+import qs.Components
 import qs.Services
 
 CustomRect {
@@ -19,11 +20,7 @@ CustomRect {
 	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
 	property color disabledOnColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	property bool fillWidth
-	property font font: ({
-			family: Config.appearance.font.family.sans,
-			pointSize: Tokens.font.size.larger,
-			bold: false
-		})
+	property font font: Tokens.font.body.small
 	property real horizontalPadding: padding
 	readonly property alias hovered: stateLayer.containsMouse
 	required implicitHeight
@@ -36,7 +33,7 @@ CustomRect {
 	readonly property color onColor: !enabled ? disabledOnColor : internalChecked ? activeOnColor : inactiveOnColor
 	property real padding
 	readonly property alias pressed: stateLayer.pressed
-	property real pressedRadius: Tokens.rounding.smallest
+	property real pressedRadius: Tokens.rounding.small
 	readonly property alias radiusAnim: radiusAnim
 	property bool radiusMorph: true
 	property alias shapeMorph: stateLayer.shapeMorph
@@ -54,7 +51,7 @@ CustomRect {
 		if (internalChecked)
 			return checkedRadius;
 		if (isRound)
-			return (height || implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale);
+			return implicitHeight / 2 * Math.min(1, Tokens.rounding.scale);
 		return defaultRadius;
 	}
 

Components/CAnim.qml

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

Components/CircularIndicator.qml

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

Components/CircularProgress.qml

@@ -21,7 +21,7 @@ Item {
 	readonly property real size: Math.min(width, height)
 	property int spacing: Tokens.spacing.small
 	property int startAngle: -90
-	property int strokeWidth: Tokens.padding.small
+	property int strokeWidth: Tokens.padding.extraSmall
 	property int sweepAngle: 360
 	readonly property real thickness: strokeWidth * (1 + waveAmplitude) * 2
 	property real value

Components/ClipRect.qml

@@ -0,0 +1,41 @@
+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 {}
+	}
+}

Components/ColorArcPicker.qml

@@ -46,10 +46,10 @@ Item {
 	}
 
 	function syncFromPenColor() {
-		if (!drawing.drawingState)
+		if (!drawing.screenState)
 			return;
 
-		const c = drawing.drawingState.penColor;
+		const c = drawing.screenState.penColor;
 
 		if (c.hsvSaturation > 0) {
 			currentHue = c.hsvHue;
@@ -86,7 +86,7 @@ Item {
 
 		currentHue = relative / arcSweep;
 		lastChromaticHue = currentHue;
-		drawing.drawingState.penColor = Qt.hsva(currentHue, drawing.drawingState.penColor.hsvSaturation, drawing.drawingState.penColor.hsvValue, drawing.drawingState.penColor.a);
+		drawing.screenState.penColor = Qt.hsva(currentHue, drawing.screenState.penColor.hsvSaturation, drawing.screenState.penColor.hsvValue, drawing.screenState.penColor.a);
 	}
 
 	implicitHeight: 180
@@ -112,7 +112,7 @@ Item {
 			root.syncFromPenColor();
 		}
 
-		target: root.drawing.drawingState
+		target: root.drawing.screenState
 	}
 
 	Canvas {
@@ -152,7 +152,7 @@ Item {
 
 	CustomRect {
 		anchors.centerIn: parent
-		color: root.drawing?.drawingState.penColor
+		color: root.drawing?.screenState.penColor
 		implicitHeight: implicitWidth
 		implicitWidth: canvas.height - root.handleSize - Tokens.padding.extraLarge * 2
 		radius: Tokens.rounding.full

Components/CustomCheckbox.qml

@@ -23,7 +23,7 @@ CheckBox {
 		color: Colors.palette.m3surfaceVariant
 		implicitHeight: control.checkHeight
 		implicitWidth: control.checkWidth
-		radius: Tokens.rounding.smallest / 2
+		radius: Tokens.rounding.small / 2
 
 		CustomRect {
 			color: Colors.palette.m3primary

Components/CustomFlickable.qml

@@ -1,12 +1,12 @@
 import QtQuick
-import qs.Helpers
+import qs.Services
 
 Flickable {
 	id: root
 
 	property bool doneFakeFlick
 
-	interactive: !Visibilities.getForActive().isDrawing
+	interactive: !ShellState.forActive().isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {
@@ -28,6 +28,9 @@ Flickable {
 		interval: 10
 		running: root.doneFakeFlick
 
-		onTriggered: root.doneFakeFlick = false
+		onTriggered: {
+			root.doneFakeFlick = false;
+			root.returnToBounds();
+		}
 	}
 }

Components/CustomListView.qml

@@ -1,33 +1,36 @@
 import QtQuick
-import qs.Helpers
+import qs.Services
 
 ListView {
 	id: root
 
 	property bool doneFakeFlick
 
-	interactive: !Visibilities.getForActive()?.isDrawing
+	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());
-			}
-		}
+		// 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
-	}
+	// Timer {
+	// 	interval: 10
+	// 	running: root.doneFakeFlick
+	//
+	// 	onTriggered: {
+	// 		root.doneFakeFlick = false;
+	// 	}
+	// }
 }

Components/CustomMouseArea.qml

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

Components/CustomRadioButton.qml

@@ -6,7 +6,7 @@ import qs.Services
 RadioButton {
 	id: root
 
-	font.pointSize: Tokens.font.size.normal
+	font: Tokens.font.body.medium
 	implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
 	implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin
 
@@ -14,7 +14,7 @@ RadioButton {
 		anchors.left: outerCircle.right
 		anchors.leftMargin: 10
 		anchors.verticalCenter: parent.verticalCenter
-		font.pointSize: root.font.pointSize
+		font: root.font
 		text: root.text
 	}
 	indicator: Rectangle {
@@ -29,8 +29,7 @@ RadioButton {
 		radius: Tokens.rounding.full
 
 		Behavior on border.color {
-			CAnim {
-			}
+			CAnim {}
 		}
 
 		StateLayer {

Components/CustomRect.qml

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

Components/CustomScrollBar.qml

@@ -1,32 +1,41 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Templates
-import qs.Helpers
-import ZShell.Config
 import qs.Services
+import ZShell.Config
 
 ScrollBar {
 	id: root
 
+	required property Flickable flickable
+
+	readonly property bool isHorizontal: flickable && flickable.ScrollBar.horizontal === root
+	readonly property real axisSize: isHorizontal ? flickable.width : flickable.height
+	readonly property real axisContentSize: isHorizontal ? flickable.contentWidth : flickable.contentHeight
+	readonly property real axisContentPos: isHorizontal ? (reversed ? flickable.contentX : (flickable.contentX - flickable.originX)) : (reversed ? flickable.contentY : (flickable.contentY - flickable.originY))
+	readonly property real axisLength: isHorizontal ? root.width : root.height
 	readonly property real effectiveSize: Math.max(nonAnimHeight, root.minimumSize)
 	readonly property real effectiveTravel: Math.max(0, 1 - root.effectiveSize)
-	required property Flickable flickable
-	readonly property real nonAnimHeight: flickable.height / flickable.contentHeight
-	readonly property real nonAnimY: flickable.contentY / flickable.contentHeight
+	readonly property real nonAnimHeight: root.axisSize / root.axisContentSize
+	readonly property real nonAnimY: root.axisContentPos / root.axisContentSize
 	readonly property real rawTravel: Math.max(0, 1 - root.nonAnimHeight)
-	readonly property bool reversed: flickable instanceof ListView && flickable.verticalLayoutDirection === ListView.BottomToTop
-	property bool shouldBeActive
+	readonly property bool reversed: isHorizontal ? (flickable instanceof ListView && flickable.layoutDirection === Qt.RightToLeft) : (flickable instanceof ListView && flickable.verticalLayoutDirection === ListView.BottomToTop)
 	readonly property real travelScale: root.rawTravel > 0 ? root.effectiveTravel / root.rawTravel : 0
 
-	enabled: !Visibilities.getForActive().isDrawing
-	implicitWidth: Tokens.padding.extraSmall * 2
+	property bool shouldBeActive
+	property bool inverted
 
-	contentItem: Item {
-	}
+	enabled: !ShellState.forActive().isDrawing
+
+	implicitWidth: size === 1 ? 0 : isHorizontal ? 0 : Tokens.padding.extraSmall * 2
+	implicitHeight: size === 1 ? 0 : isHorizontal ? Tokens.padding.extraSmall * 2 : 0
+
+	contentItem: Item {}
 	Behavior on position {
 		enabled: !fullMouse.pressed
 
-		Anim {
-		}
+		Anim {}
 	}
 
 	onHoveredChanged: {
@@ -47,54 +56,27 @@ ScrollBar {
 		target: root.flickable
 	}
 
-	CustomClippingRect {
-		anchors.bottom: parent.bottom
-		anchors.right: parent.right
-		anchors.top: parent.top
-		implicitWidth: handle.implicitWidth
-		radius: Tokens.rounding.full
-
-		CustomRect {
-			id: handle
-
-			anchors.right: parent.right
-			color: Colors.palette.m3secondary
-			implicitHeight: root.height * root.effectiveSize
-			implicitWidth: fullMouse.pressed || fullMouse.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
-			opacity: {
-				if (!root.enabled)
-					return 0;
-				if (root.size === 1)
-					return 0;
-				if (fullMouse.pressed)
-					return 1;
-				if (fullMouse.containsMouse)
-					return 0.8;
-				if (root.policy === ScrollBar.AlwaysOn || root.shouldBeActive)
-					return 0.6;
-				return 0;
-			}
-			radius: Tokens.rounding.full
-			y: root.reversed ? root.height * (1 + root.nonAnimY) * root.travelScale : root.height * root.nonAnimY * root.travelScale
-
-			Behavior on implicitWidth {
-				Anim {
-				}
-			}
-			Behavior on opacity {
-				Anim {
-					type: Anim.DefaultEffects
-				}
-			}
-
-			MouseArea {
-				id: mouse
-
-				acceptedButtons: Qt.NoButton
+	Loader {
 		anchors.fill: parent
-				cursorShape: Qt.PointingHandCursor
-				hoverEnabled: true
+		active: root.size < 1
+		sourceComponent: root.isHorizontal ? horizontalTrack : verticalTrack
 	}
+
+	Component {
+		id: verticalTrack
+
+		VerticalScrollBarTrack {
+			scrollBar: root
+			mouseArea: fullMouse
+		}
+	}
+
+	Component {
+		id: horizontalTrack
+
+		HorizontalScrollBarTrack {
+			scrollBar: root
+			mouseArea: fullMouse
 		}
 	}
 
@@ -111,25 +93,40 @@ ScrollBar {
 
 		property real pressOffset: 0
 
-		function contentYFromThumbTop(thumbTop) {
-			var visualPos = root.effectiveTravel > 0 ? thumbTop / root.travelScale : 0;
-
-			return root.reversed ? (visualPos - 1) * root.flickable.contentHeight : visualPos * root.flickable.contentHeight;
+		function contentPosFromThumbStart(thumbStart) {
+			var visualPos = root.effectiveTravel > 0 ? thumbStart / root.travelScale : 0;
+			return root.reversed ? (visualPos - 1) * root.axisContentSize : visualPos * root.axisContentSize;
 		}
 
 		function updateFromEvent(event) {
-			var posInTrack = event.y / root.height;
-			var thumbTop = posInTrack - pressOffset;
-			thumbTop = Math.max(0, Math.min(root.effectiveTravel, thumbTop));
+			var eventPos = root.isHorizontal ? event.x : event.y;
+			var posInTrack = eventPos / root.axisLength;
+			var thumbStart = posInTrack - pressOffset;
+			thumbStart = Math.max(0, Math.min(root.effectiveTravel, thumbStart));
 
-			root.flickable.contentY = contentYFromThumbTop(thumbTop);
+			var newPos = contentPosFromThumbStart(thumbStart);
+			if (root.isHorizontal)
+				root.flickable.contentX = newPos + (root.flickable.originX + (root.reversed ? root.flickable.contentWidth : 0));
+			else
+				root.flickable.contentY = newPos + (root.flickable.originY + (root.reversed ? root.flickable.contentHeight : 0));
 		}
 
-		function visualThumbTop() {
+		function visualThumbStart() {
 			const visualPos = root.reversed ? (1 + root.nonAnimY) : root.nonAnimY;
 			return visualPos * root.travelScale;
 		}
 
+		function onWheel(event: WheelEvent): void {
+			if (root.horizontal) {
+				event.accepted = false;
+				return;
+			}
+
+			var delta = event.angleDelta.y > 0 ? -0.1 : 0.1;
+			var newPos = Math.max(0, Math.min(1 - root.size, root.position + (root.inverted ? -delta : delta)));
+			root.position = newPos;
+		}
+
 		anchors.fill: parent
 		cursorShape: undefined
 		hoverEnabled: true
@@ -140,24 +137,15 @@ ScrollBar {
 				updateFromEvent(event);
 		}
 		onPressed: event => {
-			var currentTop = visualThumbTop();
-			var currentBottom = currentTop + root.effectiveSize;
-			var clickPos = event.y / root.height;
+			var currentStart = visualThumbStart();
+			var currentEnd = currentStart + root.effectiveSize;
+			var eventPos = root.isHorizontal ? event.x : event.y;
+			var clickPos = eventPos / root.axisLength;
 
-			var clickedInsideThumb = clickPos >= currentTop && clickPos <= currentBottom;
-
-			if (clickedInsideThumb) {
-				pressOffset = clickPos - currentTop;
-			} else {
-				pressOffset = root.effectiveSize / 2;
-			}
+			var clickedInsideThumb = clickPos >= currentStart && clickPos <= currentEnd;
+			pressOffset = clickedInsideThumb ? (clickPos - currentStart) : root.effectiveSize / 2;
 
 			updateFromEvent(event);
 		}
-		onWheel: event => {
-			var delta = event.angleDelta.y > 0 ? -0.1 : 0.1;
-			var newPos = Math.max(0, Math.min(1 - root.size, root.position + delta));
-			root.position = newPos;
-		}
 	}
 }

Components/CustomSlider.qml

@@ -13,11 +13,13 @@ Slider {
 
 	property bool animateWave
 	property color bgColor: enabled ? Colors.palette.m3secondaryContainer : Qt.alpha(Colors.palette.m3onSurface, 0.1)
+	readonly property bool dragging: mouse.pressed
 	property color fgColor: enabled ? Colors.palette.m3primary : Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	property real filledWidth
 	property alias inset: inset
 	property color insetColor: enabled ? (inset.attached ? Colors.palette.m3onSecondaryContainer : Colors.palette.m3onPrimary) : Colors.palette.m3onSurface
 	property string insetIcon: ""
+	property bool interactionOnMove: true
 	property real pos: visualPosition
 	property int radius: Tokens.rounding.small
 	property int waveDuration: 1000
@@ -98,15 +100,19 @@ Slider {
 			anchors.bottom: parent.bottom
 			anchors.top: parent.top
 			color: root.insetColor
-			font.pixelSize: Tokens.font.size.smaller * 2
+			fontStyle: {
+				if (root.height < 96)
+					return Tokens.font.icon.pixelSize(24).build();
+				else
+					return Tokens.font.icon.pixelSize(32).build();
+			}
 			text: root.insetIcon
 			verticalAlignment: Text.AlignVCenter
 			visible: !root.wavy && root.insetIcon !== ""
 			x: Tokens.spacing.extraSmall + dockT * (handle.x + Tokens.spacing.small)
 
 			Behavior on dockT {
-				Anim {
-				}
+				Anim {}
 			}
 		}
 
@@ -136,8 +142,7 @@ Slider {
 				startX: x
 
 				Behavior on color {
-					CAnim {
-					}
+					CAnim {}
 				}
 				Anim on waveProgress {
 					duration: root.waveDuration
@@ -154,8 +159,7 @@ Slider {
 	Behavior on filledWidth {
 		id: widthBehavior
 
-		Anim {
-		}
+		Anim {}
 	}
 
 	Component.onCompleted: {
@@ -186,6 +190,7 @@ Slider {
 
 		onPositionChanged: e => {
 			dragMovement = (e.x - pressStartX) / width;
+			if (root.interactionOnMove)
 				root.interaction(posBinding.value);
 		}
 		onPressed: e => {

Components/CustomSpinBox.qml

@@ -38,9 +38,9 @@ DoubleSpinBox {
 		horizontalAlignment: TextField.AlignHCenter
 		implicitWidth: 65
 		inputMethodHints: Qt.ImhFormattedNumbersOnly
-		leftPadding: Tokens.padding.larger
+		leftPadding: Tokens.padding.small
 		readOnly: !root.editable
-		rightPadding: Tokens.padding.larger
+		rightPadding: Tokens.padding.small
 		text: root.textFromValue(root.value, root.locale)
 		validator: root.validator
 

Components/CustomSplitButtonRow.qml

@@ -1,70 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Config
-import qs.Services
-
-Item {
-	id: root
-
-	property alias active: splitButton.active
-	property alias buttonAlias: splitButton
-	property alias expanded: splitButton.expanded
-	property int expandedZ: 100
-	required property string label
-	property alias menuItems: splitButton.menuItems
-	property bool shouldBeActive: true
-	property alias type: splitButton.type
-
-	signal selected(item: MenuItem)
-
-	anchors.left: parent.left
-	anchors.right: parent.right
-	clip: false
-	implicitHeight: row.implicitHeight + Tokens.padding.smaller * 2
-	opacity: shouldBeActive ? 1 : 0
-	scale: shouldBeActive ? 1 : 0.8
-	z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
-
-	Behavior on opacity {
-		Anim {
-		}
-	}
-	Behavior on scale {
-		Anim {
-		}
-	}
-
-	RowLayout {
-		id: row
-
-		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
-		anchors.right: parent.right
-		anchors.verticalCenter: parent.verticalCenter
-		spacing: Tokens.spacing.normal
-
-		CustomText {
-			Layout.fillWidth: true
-			color: root.enabled ? Colors.palette.m3onSurface : Colors.palette.m3onSurfaceVariant
-			font.pointSize: Tokens.font.size.larger
-			text: root.label
-		}
-
-		CustomSplitButton {
-			id: splitButton
-
-			enabled: root.enabled
-			type: CustomSplitButton.Filled
-			z: 2
-
-			menu.onItemSelected: item => {
-				root.selected(item);
-			}
-			stateLayer.onClicked: {
-				splitButton.expanded = !splitButton.expanded;
-			}
-		}
-	}
-}

Components/CustomSwitch.qml

@@ -13,8 +13,12 @@ Switch {
 	implicitWidth: implicitIndicatorWidth
 
 	indicator: CustomRect {
-		color: root.checked && root.enabled ? Colors.palette.m3primary : Colors.layer(Colors.palette.m3surfaceContainerHighest, root.cLayer)
-		implicitHeight: Tokens.font.size.medium + Tokens.padding.normal * 2
+		color: {
+			if (!root.enabled)
+				return root.checked ? Qt.alpha(Colors.palette.m3onSurface, 0.12) : Qt.alpha(Colors.palette.m3surfaceContainerHighest, 0.38);
+			return root.checked ? Colors.palette.m3primary : Colors.layer(Colors.palette.m3surfaceContainerHighest, root.cLayer);
+		}
+		implicitHeight: 14 + Tokens.padding.small * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Tokens.rounding.full
 
@@ -22,7 +26,11 @@ Switch {
 			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.2 : implicitHeight
 
 			anchors.verticalCenter: parent.verticalCenter
-			color: root.checked && root.enabled ? Colors.palette.m3onPrimary : Colors.layer(Colors.palette.m3outline, root.cLayer + 1)
+			color: {
+				if (!root.enabled)
+					return root.checked ? Qt.alpha(Colors.palette.m3surface, 0.7) : Qt.alpha(Colors.palette.m3onSurface, 0.12);
+				return root.checked ? Colors.palette.m3onPrimary : Colors.layer(Colors.palette.m3outline, root.cLayer + 1);
+			}
 			implicitHeight: parent.implicitHeight - Tokens.padding.extraSmall
 			implicitWidth: nonAnimWidth
 			radius: Tokens.rounding.full
@@ -92,7 +100,7 @@ Switch {
 
 				anchors.centerIn: parent
 				asynchronous: true
-				height: parent.implicitHeight - Tokens.padding.larger
+				height: parent.implicitHeight - Tokens.padding.medium
 				preferredRendererType: Shape.CurveRenderer
 				width: height
 
@@ -114,12 +122,16 @@ Switch {
 				}
 
 				ShapePath {
-					capStyle: ShapePath.RoundCap
+					capStyle: Tokens.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
 					fillColor: "transparent"
 					startX: icon.start1.x
 					startY: icon.start1.y
-					strokeColor: root.checked && root.enabled ? Colors.palette.m3primary : Colors.palette.m3surfaceContainerHighest
-					strokeWidth: Tokens.font.size.larger * 0.15
+					strokeColor: {
+						if (!root.enabled)
+							return root.checked ? Colors.palette.m3outline : Colors.palette.m3surfaceContainer;
+						return root.checked ? Colors.palette.m3primary : Colors.palette.m3surfaceContainerHighest;
+					}
+					strokeWidth: 16 * 0.15
 
 					Behavior on strokeColor {
 						CAnim {
@@ -153,6 +165,6 @@ Switch {
 
 	component PropAnim: PropertyAnimation {
 		duration: Tokens.anim.durations.expressiveFastSpatial
-		easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
+		easing: Tokens.anim.expressiveFastSpatial
 	}
 }

Components/CustomText.qml

@@ -14,10 +14,9 @@ Text {
 	property real animateTo: 1
 
 	color: Colors.palette.m3onSurface
-	font.family: Config.appearance.font.family.sans
-	font.pointSize: Tokens.font.size.normal
+	font: Tokens.font.body.small
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.NativeRendering
+	renderType: Text.QtRendering
 	textFormat: Text.PlainText
 
 	Behavior on color {

Components/CustomTextField.qml

@@ -15,28 +15,33 @@ TextFieldBase {
 
 	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
 	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
+	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
+	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
+	readonly property real smallFontScale: smallFontSize / font.pointSize
+	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
+	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
+	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
+
+	property int horizontalPadding: Tokens.padding.large
+	property int verticalPadding: Tokens.padding.large
+
+	property int radius: Tokens.rounding.small
+
+	property string supportingText
+	property string trailingIcon
+	property int smallFontSize: Tokens.font.label.small.pointSize
+
+	property int type: CustomTextField.Outlined
+	property var validate // Regex or function
 	property bool emptyIsValid: true
 	property string errorText
-	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
-	readonly property int horizontalPadding: Tokens.padding.large
 	property bool isError
 	property string leadingIcon
-	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
-	property int radius: Tokens.rounding.small
-	readonly property real smallFontScale: smallFontSize / font.pointSize
-	property int smallFontSize: Tokens.font.size.small
-	property string supportingText
-	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
-	property string trailingIcon
-	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
-	property int type: CustomTextField.Outlined
-	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
-	property var validate // Regex or function
 
-	bottomPadding: Tokens.padding.large + supportingTextOffset - filledOffset
+	bottomPadding: verticalPadding + supportingTextOffset - filledOffset
 	leftPadding: horizontalPadding + leadingOffset
 	rightPadding: horizontalPadding + trailingOffset
-	topPadding: Tokens.padding.large + filledOffset
+	topPadding: verticalPadding + filledOffset
 
 	background: Loader {
 		anchors.bottomMargin: root.supportingTextOffset
@@ -129,8 +134,8 @@ TextFieldBase {
 				}
 
 				AnchorAnim {
-					duration: Tokens.anim.durations.expressiveEffects
-					easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+					duration: Tokens.anim.durations.expressiveDefaultEffects
+					easing: Tokens.anim.expressiveDefaultEffects
 				}
 			}
 		}
@@ -140,12 +145,13 @@ TextFieldBase {
 
 			active: root.leadingIcon
 			anchors.left: parent.left
-			anchors.leftMargin: Tokens.padding.normal
+			anchors.leftMargin: Tokens.padding.small
 			anchors.verticalCenter: parent.verticalCenter
 
 			sourceComponent: MaterialIcon {
 				color: Colors.palette.m3onSurfaceVariant
 				text: root.leadingIcon
+				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}
 		}
 
@@ -154,12 +160,13 @@ TextFieldBase {
 
 			active: root.trailingIcon
 			anchors.right: parent.right
-			anchors.rightMargin: Tokens.padding.normal
+			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()
 			}
 		}
 	}
@@ -174,7 +181,7 @@ TextFieldBase {
 
 		sourceComponent: CustomText {
 			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
-			font.pointSize: Tokens.font.size.small
+			font: Tokens.font.label.small
 			text: root.effectiveSupportingText
 		}
 	}
@@ -212,12 +219,10 @@ TextFieldBase {
 					}
 				}
 				Behavior on strokeColor {
-					CAnim {
-					}
+					CAnim {}
 				}
 				Behavior on strokeWidth {
-					Anim {
-					}
+					Anim {}
 				}
 
 				PathLine {
@@ -292,8 +297,7 @@ TextFieldBase {
 				implicitHeight: root.activeFocus ? 2 : 1
 
 				Behavior on implicitHeight {
-					Anim {
-					}
+					Anim {}
 				}
 			}
 		}

Components/GeminiGlow.qml

@@ -0,0 +1,42 @@
+import QtQuick
+import Quickshell
+
+ShaderEffect {
+	id: root
+
+	property Item target: parent
+
+	property real glowSize: 40
+	property real innerGlow: 0
+	property real lineWidth: 2
+	property real intensity: 1.0
+	property real speed: 1.0
+	property int period: 6000
+	property bool running: true
+
+	property color color1: "#4285F4"
+	property color color2: "#9B72CB"
+	property color color3: "#D96570"
+	property color color4: "#F2A54A"
+
+	readonly property size itemSize: Qt.size(width, height)
+	readonly property size rectSize: target ? Qt.size(target.width, target.height) : Qt.size(0, 0)
+	readonly property real radius: (target as Rectangle).radius ?? 0
+	property real phase: 0
+
+	anchors.fill: target
+	anchors.margins: -glowSize
+	z: -1
+
+	enabled: false
+
+	fragmentShader: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/shaders/geminiglow.frag.qsb`)
+
+	FrameAnimation {
+		running: root.running && root.visible
+		onTriggered: {
+			const dt = frameTime * 1000;
+			root.phase = (root.phase + dt * root.speed / root.period) % 1.0;
+		}
+	}
+}

Components/HorizontalScrollBarTrack.qml

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

Components/IconButton.qml

@@ -8,6 +8,7 @@ ButtonBase {
 	property alias icon: label.text
 	readonly property alias label: label
 
+	font: Tokens.font.icon.medium
 	activeColor: type === IconButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondary
 	activeOnColor: type === IconButton.Filled ? Colors.palette.m3onPrimary : type === IconButton.Tonal ? Colors.palette.m3onSecondary : Colors.palette.m3primary
 	implicitHeight: {
@@ -27,7 +28,7 @@ ButtonBase {
 			return Colors.palette.m3onPrimary;
 		return type === IconButton.Tonal ? Colors.palette.m3onSecondaryContainer : Colors.palette.m3onSurfaceVariant;
 	}
-	padding: type === IconButton.Text ? Tokens.padding.extraSmall / 2 : Tokens.padding.small
+	padding: type === IconButton.Text ? Tokens.padding.extraSmall / 2 : Tokens.padding.extraSmall
 
 	MaterialIcon {
 		id: label
@@ -36,7 +37,7 @@ ButtonBase {
 		anchors.verticalCenterOffset: 1
 		color: root.onColor
 		fill: !root.isToggle || root.internalChecked ? 1 : 0
-		font.pointSize: root.font.pointSize
+		fontStyle: root.font
 
 		Behavior on fill {
 			Anim {

Components/IconTextButton.qml

@@ -17,7 +17,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondary;
 	}
-	horizontalPadding: Tokens.padding.larger
+	horizontalPadding: Tokens.padding.small
 	implicitHeight: row.implicitHeight + verticalPadding * 2
 	implicitWidth: row.implicitWidth + horizontalPadding * 2
 	inactiveColor: {
@@ -32,7 +32,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onSurface : Colors.palette.m3onSecondaryContainer;
 	}
-	verticalPadding: Tokens.padding.small
+	verticalPadding: Tokens.padding.extraSmall
 
 	RowLayout {
 		id: row
@@ -46,10 +46,9 @@ ButtonBase {
 			Layout.alignment: Qt.AlignVCenter
 			color: root.onColor
 			fill: root.internalChecked ? 1 : 0
-			font: {
+			fontStyle: {
 				const f = Qt.font(root.font);
 				f.pointSize = Math.round(root.font.pointSize * 1.2);
-				f.family = "Material Symbols Rounded";
 				return f;
 			}
 

Components/LineGraph.qml

@@ -0,0 +1,467 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+
+Item {
+	id: root
+
+	required property list<var> values
+
+	property int xSteps: 24
+	property real yMin: NaN
+	property real yMax: NaN
+	property real yPaddingTop: 0
+	property real yPaddingBottom: 0
+
+	property int verticalLineStep: 0
+	property int horizontalLineStep: 0
+	property bool firstXLine: true
+	property bool lastXLine: false
+	property int minHorizontalLines: 0
+
+	property var xLabel: null
+	property var yLabel: null
+
+	property real smoothing: 0
+	property bool curveSmoothing: true
+	property real markerX: -1
+	property real markerGap: 2 // px gap between line and marker dot edge, each side
+
+	property color lineColor: "white"
+	property color gridColor: "white"
+	property color markerColor: "white"
+	property color labelColor: "white"
+	property real gridAlpha: 0.12
+	property real labelAlpha: 0.6
+	property real fillAlpha: 0.15
+	property real lineWidth: 2
+	property real markerDotRadius: 4
+	property real labelFontSize: 10
+
+	Canvas {
+		id: canvas
+
+		anchors.fill: parent
+		renderStrategy: Canvas.Immediate
+
+		onWidthChanged: requestPaint()
+		onHeightChanged: requestPaint()
+
+		function strokeCurve(ctx, pts) {
+			ctx.beginPath();
+			ctx.moveTo(pts[0].x, pts[0].y);
+
+			if (root.curveSmoothing && pts.length > 2) {
+				const k = 1 / 6;
+				const n = pts.length;
+
+				for (let i = 0; i < n - 1; i++) {
+					const p0 = pts[Math.max(i - 1, 0)];
+					const p1 = pts[i];
+					const p2 = pts[i + 1];
+					const p3 = pts[Math.min(i + 2, n - 1)];
+
+					let c1x = p1.x + (p2.x - p0.x) * k;
+					let c1y = p1.y + (p2.y - p0.y) * k;
+					let c2x = p2.x - (p3.x - p1.x) * k;
+					let c2y = p2.y - (p3.y - p1.y) * k;
+
+					const minY = Math.min(p1.y, p2.y);
+					const maxY = Math.max(p1.y, p2.y);
+					c1y = Math.max(minY, Math.min(maxY, c1y));
+					c2y = Math.max(minY, Math.min(maxY, c2y));
+
+					ctx.bezierCurveTo(c1x, c1y, c2x, c2y, p2.x, p2.y);
+				}
+			} else {
+				for (let i = 0; i < pts.length - 1; i++) {
+					const p0 = pts[i];
+					const p1 = pts[i + 1];
+					const cx = (p0.x + p1.x) * 0.5;
+					ctx.bezierCurveTo(cx, p0.y, cx, p1.y, p1.x, p1.y);
+				}
+			}
+		}
+
+		// Control points for segment i (pts[i] -> pts[i+1]), matching strokeCurve
+		function segmentControls(pts, i) {
+			const p0 = pts[Math.max(i - 1, 0)];
+			const p1 = pts[i];
+			const p2 = pts[i + 1];
+			const p3 = pts[Math.min(i + 2, pts.length - 1)];
+
+			if (root.curveSmoothing && pts.length > 2) {
+				const k = 1 / 6;
+				let c1x = p1.x + (p2.x - p0.x) * k;
+				let c1y = p1.y + (p2.y - p0.y) * k;
+				let c2x = p2.x - (p3.x - p1.x) * k;
+				let c2y = p2.y - (p3.y - p1.y) * k;
+
+				const minY = Math.min(p1.y, p2.y);
+				const maxY = Math.max(p1.y, p2.y);
+				c1y = Math.max(minY, Math.min(maxY, c1y));
+				c2y = Math.max(minY, Math.min(maxY, c2y));
+
+				return [c1x, c1y, c2x, c2y];
+			}
+
+			const cx = (p1.x + p2.x) * 0.5;
+			return [cx, p1.y, cx, p2.y];
+		}
+
+		// Point on the curve at a given x (x is monotonic per segment)
+		function pointAtX(pts, targetX) {
+			let j = pts.length - 2;
+			for (let i = 0; i < pts.length - 1; i++) {
+				if (targetX <= pts[i + 1].x) {
+					j = i;
+					break;
+				}
+			}
+
+			const p1 = pts[j];
+			const p2 = pts[j + 1];
+			const [c1x, c1y, c2x, c2y] = segmentControls(pts, j);
+
+			let tlo = 0;
+			let thi = 1;
+			for (let it = 0; it < 24; it++) {
+				const tm = (tlo + thi) / 2;
+				const u = 1 - tm;
+				const x = u * u * u * p1.x + 3 * u * u * tm * c1x + 3 * u * tm * tm * c2x + tm * tm * tm * p2.x;
+				if (x < targetX)
+					tlo = tm;
+				else
+					thi = tm;
+			}
+
+			const t = (tlo + thi) / 2;
+			const u = 1 - t;
+			const y = u * u * u * p1.y + 3 * u * u * t * c1y + 3 * u * t * t * c2y + t * t * t * p2.y;
+			return { x: targetX, y };
+		}
+
+		// Part of the curve left/right of a cut x, including the cut point
+		function cutLeft(pts, targetX) {
+			if (targetX <= pts[0].x)
+				return [];
+			if (targetX >= pts[pts.length - 1].x)
+				return pts.slice();
+
+			let j = pts.length - 2;
+			for (let i = 0; i < pts.length - 1; i++) {
+				if (targetX <= pts[i + 1].x) {
+					j = i;
+					break;
+				}
+			}
+
+			const left = pts.slice(0, j + 1);
+			if (targetX > pts[j].x)
+				left.push(pointAtX(pts, targetX));
+			return left;
+		}
+
+		function cutRight(pts, targetX) {
+			if (targetX >= pts[pts.length - 1].x)
+				return [];
+			if (targetX <= pts[0].x)
+				return pts.slice();
+
+			let j = pts.length - 2;
+			for (let i = 0; i < pts.length - 1; i++) {
+				if (targetX <= pts[i + 1].x) {
+					j = i;
+					break;
+				}
+			}
+
+			const right = pts.slice(j + 1);
+			if (targetX < pts[j + 1].x)
+				right.unshift(pointAtX(pts, targetX));
+			return right;
+		}
+
+		onPaint: {
+			const ctx = getContext("2d");
+			ctx.reset();
+
+			const W = width;
+			const H = height;
+			if (W < 2 || H < 2)
+				return;
+
+			const padLeft = root.labelFontSize * 3.4;
+			const padRight = 2;
+			const padTop = 2;
+			const padBottom = root.labelFontSize + 8;
+			const plot = {
+				x: padLeft,
+				y: padTop,
+				w: W - padLeft - padRight,
+				h: H - padTop - padBottom
+			};
+			if (plot.w < 2 || plot.h < 2)
+				return;
+
+			// Auto-fit: NaN yMin/yMax derive from the data, snapped to the
+			// horizontal step grid, honoring minHorizontalLines
+			let lo = root.yMin;
+			let hi = root.yMax;
+			const loAuto = Number.isNaN(lo);
+			const hiAuto = Number.isNaN(hi);
+
+			if (loAuto || hiAuto) {
+				let dmin = Infinity;
+				let dmax = -Infinity;
+				for (const v of root.values) {
+					if (v == null)
+						continue;
+					if (v < dmin)
+						dmin = v;
+					if (v > dmax)
+						dmax = v;
+				}
+				if (dmin === Infinity) {
+					dmin = 0;
+					dmax = 1;
+				}
+
+				const step = root.horizontalLineStep;
+				const minSteps = root.minHorizontalLines > 1 ? root.minHorizontalLines - 1 : 0;
+
+				if (step > 0) {
+					if (hiAuto) {
+						const baseLo = loAuto ? Math.floor(dmin / step) * step : lo;
+						const span = Math.max(Math.ceil((dmax - baseLo) / step), minSteps, 1);
+						lo = baseLo;
+						hi = baseLo + span * step;
+					} else {
+						const span = Math.max(Math.ceil((hi - dmin) / step), minSteps, 1);
+						lo = hi - span * step;
+					}
+				} else {
+					if (loAuto)
+						lo = dmin;
+					if (hiAuto)
+						hi = dmax;
+					if (hi <= lo)
+						hi = lo + 1;
+				}
+			}
+
+			const scaleBottom = lo - root.yPaddingBottom;
+			const scaleTop = hi + root.yPaddingTop;
+			const range = scaleTop - scaleBottom;
+			if (range <= 0 || root.xSteps < 1)
+				return;
+
+			let series = root.values;
+			if (root.smoothing > 0 && series.length > 0) {
+				const radius = Math.round(root.smoothing);
+				const raw = series;
+				series = raw.map((v, i) => {
+					if (v == null)
+						return null;
+
+					let sum = 0;
+					let n = 0;
+					for (let j = -radius; j <= radius; j++) {
+						const u = raw[i + j];
+						if (u != null) {
+							sum += u;
+							n++;
+						}
+					}
+					return n > 0 ? sum / n : null;
+				});
+			}
+
+			const xAt = i => plot.x + (i / root.xSteps) * plot.w;
+			const yAt = v => plot.y + (1 - (v - scaleBottom) / range) * plot.h;
+			const crisp = v => Math.floor(v) + 0.5;
+
+			// 1. Grid lines
+			ctx.strokeStyle = Qt.alpha(root.gridColor, root.gridAlpha);
+			ctx.lineWidth = 1;
+
+			if (root.verticalLineStep > 0) {
+				for (let i = 0; i <= root.xSteps; i += root.verticalLineStep) {
+					if (i === 0 && !root.firstXLine)
+						continue;
+					if (i === root.xSteps && !root.lastXLine)
+						continue;
+
+					const x = crisp(xAt(i));
+					ctx.beginPath();
+					ctx.moveTo(x, plot.y);
+					ctx.lineTo(x, H);
+					ctx.stroke();
+				}
+			}
+
+			// Lines extend down into yPaddingBottom, snapped to the grid
+			const vStart = lo - (root.yPaddingBottom > 0 ? Math.floor(root.yPaddingBottom / root.horizontalLineStep) * root.horizontalLineStep : 0);
+
+			if (root.horizontalLineStep > 0) {
+				for (let v = vStart; v <= hi + 0.001; v += root.horizontalLineStep) {
+					const y = crisp(yAt(v));
+					ctx.beginPath();
+					ctx.moveTo(0, y);
+					ctx.lineTo(plot.x + plot.w, y);
+					ctx.stroke();
+				}
+			}
+
+			// 2. Labels
+			ctx.fillStyle = Qt.alpha(root.labelColor, root.labelAlpha);
+			ctx.font = root.labelFontSize + "px sans-serif";
+
+			ctx.textAlign = "left";
+			ctx.textBaseline = "top";
+			if (root.verticalLineStep > 0 && root.xLabel) {
+				for (let i = 0; i <= root.xSteps; i += root.verticalLineStep) {
+					if (i === 0 && !root.firstXLine)
+						continue;
+					if (i === root.xSteps && !root.lastXLine)
+						continue;
+
+					const text = root.xLabel(i);
+					if (text)
+						ctx.fillText(text, xAt(i) + 4, plot.y + plot.h + 4);
+				}
+			}
+
+			ctx.textBaseline = "bottom";
+			if (root.horizontalLineStep > 0 && root.yLabel) {
+				for (let v = vStart; v <= hi + 0.001; v += root.horizontalLineStep) {
+					const text = root.yLabel(v);
+					if (text)
+						ctx.fillText(text, 2, yAt(v) - 2);
+				}
+			}
+
+			// 3. Curve, split into segments at null gaps
+			const segments = [];
+			let current = null;
+			for (let i = 0; i < series.length; i++) {
+				if (series[i] == null) {
+					if (current)
+						segments.push(current);
+					current = null;
+					continue;
+				}
+				const pt = {
+					x: xAt(i),
+					y: yAt(series[i])
+				};
+				if (!current)
+					current = [];
+				current.push(pt);
+			}
+			if (current)
+				segments.push(current);
+
+			ctx.lineCap = "round";
+			ctx.lineJoin = "round";
+
+			const hasMarker = root.markerX >= 0 && root.markerX <= root.xSteps;
+			const markerPx = hasMarker ? xAt(root.markerX) : 0;
+			let gapPx = 0;
+			if (hasMarker) {
+				// markerGap is measured from the dot edge, perpendicular to the
+				// curve; project onto x via the local curve slope
+				let slope = 0;
+				const seg = segments.find(s => s[0].x <= markerPx && markerPx <= s[s.length - 1].x);
+				if (seg && seg.length > 2 && markerPx - 1 >= seg[0].x && markerPx + 1 <= seg[seg.length - 1].x)
+					slope = (pointAtX(seg, markerPx + 1).y - pointAtX(seg, markerPx - 1).y) / 2;
+				gapPx = (root.markerDotRadius + root.markerGap) / Math.sqrt(1 + slope * slope);
+			}
+
+			for (const seg of segments) {
+				if (seg.length < 2)
+					continue;
+
+				// Fill stays continuous under the marker
+				ctx.fillStyle = Qt.alpha(root.lineColor, root.fillAlpha);
+				strokeCurve(ctx, seg);
+				ctx.lineTo(seg[seg.length - 1].x, plot.y + plot.h);
+				ctx.lineTo(seg[0].x, plot.y + plot.h);
+				ctx.closePath();
+				ctx.fill();
+
+				// Stroke has a gap around the marker
+				const pieces = hasMarker ? [cutLeft(seg, markerPx - gapPx), cutRight(seg, markerPx + gapPx)] : [seg];
+
+				for (const pts of pieces) {
+					if (pts.length < 2)
+						continue;
+
+					ctx.strokeStyle = root.lineColor;
+					ctx.lineWidth = root.lineWidth;
+					strokeCurve(ctx, pts);
+					ctx.stroke();
+				}
+			}
+
+			// 4. Marker: dashed vertical + dot
+			if (root.markerX >= 0 && root.markerX <= root.xSteps) {
+				const x = markerPx;
+
+				ctx.setLineDash([4, 4]);
+				ctx.strokeStyle = Qt.alpha(root.markerColor, 0.6);
+				ctx.lineWidth = 1;
+				ctx.beginPath();
+				ctx.moveTo(crisp(x), plot.y);
+				ctx.lineTo(crisp(x), H);
+				ctx.stroke();
+				ctx.setLineDash([]);
+
+				const i0 = Math.floor(root.markerX);
+				const v0 = series[i0];
+				const v1 = series[i0 + 1];
+				let y = null;
+
+				if (v0 != null && v1 != null)
+					y = yAt(v0 + (v1 - v0) * (root.markerX - i0));
+				else if (v0 != null)
+					y = yAt(v0);
+
+				if (y != null) {
+					ctx.fillStyle = root.markerColor;
+					ctx.beginPath();
+					ctx.arc(x, y, root.markerDotRadius, 0, Math.PI * 2);
+					ctx.fill();
+				}
+			}
+		}
+	}
+
+	onValuesChanged: canvas.requestPaint()
+	onXStepsChanged: canvas.requestPaint()
+	onYMinChanged: canvas.requestPaint()
+	onYMaxChanged: canvas.requestPaint()
+	onYPaddingTopChanged: canvas.requestPaint()
+	onYPaddingBottomChanged: canvas.requestPaint()
+	onVerticalLineStepChanged: canvas.requestPaint()
+	onHorizontalLineStepChanged: canvas.requestPaint()
+	onFirstXLineChanged: canvas.requestPaint()
+	onLastXLineChanged: canvas.requestPaint()
+	onMinHorizontalLinesChanged: canvas.requestPaint()
+	onXLabelChanged: canvas.requestPaint()
+	onYLabelChanged: canvas.requestPaint()
+	onSmoothingChanged: canvas.requestPaint()
+	onCurveSmoothingChanged: canvas.requestPaint()
+	onMarkerXChanged: canvas.requestPaint()
+	onMarkerGapChanged: canvas.requestPaint()
+	onLineColorChanged: canvas.requestPaint()
+	onGridColorChanged: canvas.requestPaint()
+	onMarkerColorChanged: canvas.requestPaint()
+	onLabelColorChanged: canvas.requestPaint()
+	onGridAlphaChanged: canvas.requestPaint()
+	onLabelAlphaChanged: canvas.requestPaint()
+	onFillAlphaChanged: canvas.requestPaint()
+	onLineWidthChanged: canvas.requestPaint()
+	onMarkerDotRadiusChanged: canvas.requestPaint()
+	onLabelFontSizeChanged: canvas.requestPaint()
+}

Components/MaterialIcon.qml

@@ -1,27 +1,14 @@
+import QtQuick
 import ZShell.Config
 import qs.Services
 
 CustomText {
 	id: root
 
-	readonly property list<int> allowed: [20, 24, 40, 48]
 	property real fill: 0
 	property int grade: Colors.light ? 0 : -25
-	readonly property int opsz: clampOpsz(optical)
-	property int optical: fontInfo.pixelSize
+	property font fontStyle: Tokens.font.icon.small
 
-	function clampOpsz(value): int {
-		return allowed.reduce((closest, current) => {
-			return Math.abs(current - value) < Math.abs(closest - value) ? current : closest;
-		});
-	}
-
-	font.family: "Material Symbols Rounded"
-	font.pointSize: Tokens.font.size.larger
-	font.variableAxes: ({
-			FILL: fill,
-			GRAD: grade,
-			opsz: opsz,
-			wght: fontInfo.weight
-		})
+	renderType: Text.NativeRendering
+	font: Tokens.font.icon.size(fontStyle.pointSize).weight(fontStyle.weight).vaxes(fontStyle.variableAxes).fill(fill.toFixed(1)).grade(grade).build()
 }

Components/Menu.qml

@@ -78,7 +78,7 @@ MouseArea {
 		implicitHeight: column.implicitHeight + column.anchors.margins * 2
 		implicitWidth: Math.max(200, column.implicitWidth + column.anchors.margins * 2)
 		level: 2
-		radius: Tokens.rounding.medium
+		radius: Tokens.rounding.large
 		x: {
 			watcher.transform;
 			const item = root.attachTo;
@@ -124,7 +124,7 @@ MouseArea {
 					model: root.items
 
 					CustomRect {
-						id: item
+						id: menuItem
 
 						readonly property bool active: modelData === root?.active
 						required property int index
@@ -132,9 +132,9 @@ MouseArea {
 
 						Layout.fillWidth: true
 						color: Qt.alpha(Colors.palette.m3tertiaryContainer, active ? 1 : 0)
-						implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.larger * 2
-						implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.larger * 2
-						radius: Tokens.rounding.small
+						implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.medium * 2
+						implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.medium * 2
+						radius: menu.radius - column.anchors.margins
 
 						Behavior on radius {
 							Anim {
@@ -142,13 +142,13 @@ MouseArea {
 						}
 
 						StateLayer {
-							color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
+							color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
 							enabled: root.expanded
 
 							onClicked: {
-								root.itemSelected(item.modelData);
-								root.active = item.modelData;
-								item.modelData.clicked();
+								root.itemSelected(menuItem.modelData);
+								root.active = menuItem.modelData;
+								menuItem.modelData.clicked();
 								root.expanded = false;
 							}
 						}
@@ -157,31 +157,32 @@ MouseArea {
 							id: menuOptionRow
 
 							anchors.fill: parent
-							anchors.margins: Tokens.padding.larger
+							anchors.margins: Tokens.padding.medium
 							spacing: Tokens.spacing.small
 
 							MaterialIcon {
 								Layout.alignment: Qt.AlignVCenter
-								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-								text: item.modelData?.icon ?? ""
+								color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
+								text: menuItem.modelData?.icon ?? ""
+								visible: text !== ""
 							}
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter
 								Layout.fillWidth: true
-								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
-								text: item.modelData?.text ?? ""
+								color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
+								text: menuItem.modelData?.text ?? ""
 							}
 
 							Loader {
 								Layout.alignment: Qt.AlignVCenter
-								active: item.modelData?.trailingIcon.length > 0
+								active: menuItem.modelData?.trailingIcon.length > 0
 								asynchronous: true
 								visible: active
 
 								sourceComponent: MaterialIcon {
-									color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-									text: item.modelData.trailingIcon
+									color: menuItem.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
+									text: menuItem.modelData.trailingIcon
 								}
 							}
 						}

Components/ScreenState.qml

@@ -0,0 +1,40 @@
+import QtQuick
+import Quickshell
+
+PersistentProperties {
+	required property ShellScreen modelData
+
+	reloadableId: "screenState"
+
+	// Drawer visibilities
+	property bool bar
+	property bool clipboard
+	property bool dashboard
+	property bool dock
+	property bool isDrawing
+	property bool launcher
+	property bool osd
+	property bool resources
+	property bool settings
+	property bool sidebar
+
+	// Dashboard state
+	property int dashboardTab: 0
+	property date dashboardDate: new Date()
+
+	// Sidebar state
+	property int sidebarTab: 0
+	property list<string> expandedNotifs: []
+
+	// Utilities state
+	property string recordingConfirmDelete
+	property bool recordingListExpanded
+	property string recordingMode
+
+	// Drawing state
+	property color penColor: "white"
+	property int penWidth: 4
+
+	// Screenshot state
+	property bool screenshot
+}

Components/SearchBar.qml

@@ -62,7 +62,7 @@ TextFieldBase {
 		anchors.leftMargin: Tokens.padding.large
 		anchors.verticalCenter: parent.verticalCenter
 		color: Colors.palette.m3onSurfaceVariant
-		font.pointSize: Tokens.font.size.large
+		fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 		text: "search"
 	}
 
@@ -70,7 +70,7 @@ TextFieldBase {
 		id: clearIcon
 
 		anchors.right: parent.right
-		anchors.rightMargin: Tokens.padding.larger
+		anchors.rightMargin: Tokens.padding.small
 		anchors.verticalCenter: parent.verticalCenter
 		enabled: root.text
 		icon: "clear"

Components/SplitButton.qml

@@ -12,14 +12,14 @@ Row {
 	}
 
 	property alias active: menu.active
-	property color color: type == CustomSplitButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondaryContainer
+	property color color: type == SplitButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondaryContainer
 	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
 	property color disabledTextColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
 	readonly property alias expandBtn: expandBtn
 	property alias expanded: menu.expanded
 	property string fallbackIcon
 	property string fallbackText
-	property real horizontalPadding: Tokens.padding.larger
+	property real horizontalPadding: Tokens.padding.medium
 	readonly property alias iconLabel: iconLabel
 	readonly property alias label: label
 	readonly property alias menu: menu
@@ -27,20 +27,20 @@ Row {
 	property bool menuOnTop
 	property real minLeftWidth
 	readonly property alias stateLayer: stateLayer
-	property color textColor: type == CustomSplitButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondaryContainer
+	property color textColor: type == SplitButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondaryContainer
 	readonly property alias textRow: textRow
-	property int type: CustomSplitButton.Filled
+	property int type: SplitButton.Filled
 	property real verticalPadding: Tokens.padding.small
 
-	spacing: Math.floor(Tokens.spacing.extraSmall)
+	spacing: Math.floor(Tokens.spacing.extraSmall / 2)
 
 	CustomRect {
-		bottomRightRadius: Tokens.rounding.small / 2
+		bottomRightRadius: Tokens.rounding.medium / 2
 		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandBtn.implicitHeight
 		implicitWidth: Math.max(root.minLeftWidth, textRow.implicitWidth + root.horizontalPadding * 2)
 		radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
-		topRightRadius: Tokens.rounding.small / 2
+		topRightRadius: Tokens.rounding.medium / 2
 
 		StateLayer {
 			id: stateLayer
@@ -92,7 +92,7 @@ Row {
 	CustomRect {
 		id: expandBtn
 
-		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.small / 2
+		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.medium / 2
 
 		bottomLeftRadius: rad
 		color: !root.enabled ? root.disabledColor : root.color

Components/StateLayer.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Shapes
 import ZShell
-import ZShell.Components
-import qs.Helpers
 import ZShell.Config
 import qs.Services
 
@@ -53,7 +51,7 @@ MouseArea {
 
 	anchors.fill: parent
 	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
-	enabled: parent.enabled && !Visibilities.getForActive()?.isDrawing
+	enabled: parent.enabled && !ShellState.forActive()?.isDrawing
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -81,7 +79,7 @@ MouseArea {
 
 		alwaysRunToEnd: true
 		duration: Tokens.anim.durations.expressiveSlowEffects * 2
-		easing.bezierCurve: Tokens.anim.curves.standard
+		easing: Tokens.anim.standard
 		property: "circleRadius"
 		target: root
 		to: root.endRadius
@@ -100,13 +98,13 @@ MouseArea {
 		id: base
 
 		anchors.fill: parent
-		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
-		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		color: Colors.palette.m3onSurface
 		opacity: root.stateOpacity
 		// Pick up radius from parent if it has one (parent can be anything with radius props)
 		// qmllint disable missing-property
 		radius: root.parent?.radius ?? 0
+		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
+		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		topLeftRadius: root.parent?.topLeftRadius ?? radius ?? 0
 		topRightRadius: root.parent?.topRightRadius ?? radius ?? 0
 		// qmllint enable missing-property

Components/TextAreaBase.qml

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

Components/TextButton.qml

@@ -14,7 +14,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondary;
 	}
-	horizontalPadding: Tokens.padding.normal
+	horizontalPadding: Tokens.padding.small
 	implicitHeight: label.implicitHeight + verticalPadding * 2
 	implicitWidth: label.implicitWidth + horizontalPadding * 2
 	inactiveColor: {
@@ -29,7 +29,7 @@ ButtonBase {
 			return Colors.palette.m3primary;
 		return type === TextButton.Filled ? Colors.palette.m3onSurface : Colors.palette.m3onSecondaryContainer;
 	}
-	verticalPadding: Tokens.padding.small
+	verticalPadding: Tokens.padding.extraSmall
 
 	CustomText {
 		id: label

Components/TextEditBase.qml

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

Components/TextFieldBase.qml

@@ -8,24 +8,21 @@ TextField {
 
 	color: Colors.palette.m3onSurface
 	cursorVisible: !readOnly
-	font.pointSize: Tokens.font.size.small
+	font: Tokens.font.body.small
 	implicitHeight: contentHeight + topPadding + bottomPadding
 	implicitWidth: contentWidth + leftPadding + rightPadding
 	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
-	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
+	renderType: TextField.QtRendering
 	selectedTextColor: color
 	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
 	verticalAlignment: TextInput.AlignVCenter
 
 	Behavior on color {
-		CAnim {
-		}
-	}
-	cursorDelegate: Item {
+		CAnim {}
 	}
+	cursorDelegate: Item {}
 	Behavior on selectionColor {
-		CAnim {
-		}
+		CAnim {}
 	}
 
 	CustomRect {
@@ -36,7 +33,7 @@ TextField {
 		color: Colors.palette.m3primary
 		implicitHeight: root.cursorRectangle.height
 		implicitWidth: 1.5
-		radius: Tokens.rounding.large
+		radius: Tokens.rounding.largeIncreased
 		x: root.cursorRectangle.x
 		y: root.cursorRectangle.y
 

Components/Toast/ToastItem.qml

@@ -32,12 +32,11 @@ CustomRect {
 			return Colors.palette.m3errorContainer;
 		return Colors.palette.m3surface;
 	}
-	implicitHeight: layout.implicitHeight + Tokens.padding.smaller * 2
-	radius: Tokens.rounding.normal
+	implicitHeight: layout.implicitHeight + Tokens.padding.small * 2
+	radius: Tokens.rounding.medium
 
 	Behavior on border.color {
-		CAnim {
-		}
+		CAnim {}
 	}
 
 	Elevation {
@@ -52,10 +51,10 @@ CustomRect {
 		id: layout
 
 		anchors.fill: parent
-		anchors.leftMargin: Tokens.padding.normal
-		anchors.margins: Tokens.padding.smaller
-		anchors.rightMargin: Tokens.padding.normal
-		spacing: Tokens.spacing.normal
+		anchors.leftMargin: Tokens.padding.small
+		anchors.margins: Tokens.padding.small
+		anchors.rightMargin: Tokens.padding.small
+		spacing: Tokens.spacing.medium
 
 		CustomRect {
 			color: {
@@ -67,9 +66,9 @@ CustomRect {
 					return Colors.palette.m3error;
 				return Colors.palette.m3surfaceContainerHigh;
 			}
-			implicitHeight: icon.implicitHeight + Tokens.padding.smaller * 2
+			implicitHeight: icon.implicitHeight + Tokens.padding.small * 2
 			implicitWidth: implicitHeight
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 
 			MaterialIcon {
 				id: icon
@@ -84,7 +83,7 @@ CustomRect {
 						return Colors.palette.m3onError;
 					return Colors.palette.m3onSurfaceVariant;
 				}
-				font.pointSize: Math.round(Tokens.font.size.large * 1.2)
+				fontStyle: Tokens.font.icon.builders.large.scale(1.2).build()
 				text: root.modelData.icon
 			}
 		}
@@ -107,7 +106,7 @@ CustomRect {
 					return Colors.palette.m3onSurface;
 				}
 				elide: Text.ElideRight
-				font.pointSize: Tokens.font.size.normal
+				font: Tokens.font.title.small
 				text: root.modelData.title
 			}
 

Components/Toast/Toasts.qml

@@ -21,7 +21,7 @@ Item {
 		}
 		return h;
 	}
-	implicitWidth: Config.utilities.sizes.toastWidth - Tokens.padding.normal * 2
+	implicitWidth: Config.utilities.sizes.toastWidth - Tokens.padding.small * 2
 
 	Repeater {
 		id: repeater
@@ -82,7 +82,7 @@ Item {
 		Behavior on anchors.bottomMargin {
 			Anim {
 				duration: Tokens.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+				easing: Tokens.anim.expressiveDefaultSpatial
 			}
 		}
 		Behavior on opacity {
@@ -105,7 +105,7 @@ Item {
 			id: initAnim
 
 			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			easing: Tokens.anim.expressiveDefaultSpatial
 			from: 0
 			properties: "opacity,scale"
 			target: toast

Components/VerticalFadeFlickable.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import Quickshell
 import qs.Effects
 
 CustomFlickable {
@@ -9,6 +10,7 @@ CustomFlickable {
 	property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
 	property real fadeAmount: 0.1
 	property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
+	readonly property real dpr: Math.ceil((QsWindow.window as QsWindow)?.devicePixelRatio ?? 1)
 
 	function fadeShouldBeActive(isStart: bool): bool {
 		// When content is smaller than flickable size, hide fade when rebound starts
@@ -28,6 +30,7 @@ CustomFlickable {
 			type: Anim.SlowEffects
 		}
 	}
+	layer.textureSize: Qt.size(width * dpr, height * dpr)
 	layer.effect: Mask {
 		maskSource: mask
 

Components/VerticalFadeListView.qml

@@ -7,7 +7,9 @@ CustomListView {
 	id: root
 
 	property real endFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
+	property bool fadeEnabled: true
 	property real fadeAmount: 0.1
+	property real fadeThreshold: 0.0
 	readonly property bool horizontal: orientation === ListView.Horizontal
 	property real startFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
 
@@ -16,7 +18,9 @@ CustomListView {
 	}
 
 	function fadeShouldBeActive(isStart: bool): bool {
-		// When content is smaller than flickable size, hide fade when rebound starts.
+		if (!fadeEnabled)
+			return false;
+
 		if (contentSize() + marginStart() + marginEnd() < viewportSize() && rebound.running && ((isStart ? overshootStart() > 0 : overshootStart() < 0))) {
 			return false;
 		}
@@ -28,11 +32,11 @@ CustomListView {
 	}
 
 	function marginEnd(): real {
-		return horizontal ? rightMargin : bottomMargin;
+		return horizontal ? rightMargin - fadeThreshold : bottomMargin - fadeThreshold;
 	}
 
 	function marginStart(): real {
-		return horizontal ? leftMargin : topMargin;
+		return horizontal ? leftMargin - fadeThreshold : topMargin - fadeThreshold;
 	}
 
 	function overshootStart(): real {

Components/VerticalScrollBarTrack.qml

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

Daemons/NotifServer.qml

@@ -10,6 +10,7 @@ import ZShell
 import qs.Components
 import qs.Modules
 import qs.Helpers
+import qs.Services
 import qs.Paths
 import ZShell.Config
 
@@ -25,7 +26,7 @@ Singleton {
 	property alias server: server
 
 	function shouldThrottle(appName: string): bool {
-		if (props.dnd || [...Visibilities.screens.values()].some(v => v.sidebar))
+		if (props.dnd || ShellState.anySidebarOpen())
 			return false;
 
 		const key = (appName || "unknown").trim().toLowerCase();

Drawers/Drawing.qml

@@ -3,28 +3,23 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import ZShell.Internal
+import qs.Components
 
 Item {
 	id: root
 
 	readonly property alias content: contentLoader.item
-	readonly property PersistentProperties drawingState: PersistentProperties {
-		property color penColor: "white"
-		property int penWidth: 4
-
-		reloadableId: "drawingState"
-	}
-	required property PersistentProperties visibilities
+	required property ScreenState screenState
 
 	Loader {
 		id: contentLoader
 
-		active: root.visibilities.isDrawing
+		active: root.screenState.isDrawing
 		anchors.fill: parent
 
 		sourceComponent: StrokeCanvas {
-			penColor: root.drawingState.penColor
-			penWidth: root.drawingState.penWidth
+			penColor: root.screenState.penColor
+			penWidth: root.screenState.penWidth
 		}
 	}
 }

Drawers/Exclusions.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
+import Quickshell.Wayland
 import QtQuick
 import ZShell.Config
 import qs.Components
@@ -15,6 +16,9 @@ Scope {
 	ExclusionZone {
 		id: top
 
+		WlrLayershell.layer: WlrLayer.Overlay
+		anchors.left: true
+		anchors.right: true
 		anchors.top: true
 		hasBar: root.geometry.barOnTop
 	}
@@ -39,13 +43,6 @@ 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
 
@@ -55,7 +52,6 @@ Scope {
 		name: "Bar-Exclusion"
 		screen: root.screen
 
-		mask: Region {
-		}
+		mask: Region {}
 	}
 }

Drawers/Interactions.qml

@@ -1,7 +1,7 @@
 import Quickshell
 import QtQuick
-import qs.Components
 import ZShell.Config
+import qs.Components
 import qs.Helpers
 import qs.Modules.Bar.Popouts
 
@@ -19,7 +19,7 @@ Item {
 	required property ShellScreen screen
 	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
-	required property PersistentProperties visibilities
+	required property ScreenState screenState
 
 	function inBottomPanel(panel: Item, x: real, y: real): bool {
 		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
@@ -63,7 +63,7 @@ Item {
 
 		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
 		dragThreshold: 0
-		enabled: !root.visibilities.isDrawing
+		enabled: !root.screenState.isDrawing
 		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfSameType | PointerHandler.ApprovesTakeOverByAnything
 		maximumPointCount: 1
 		minimumPointCount: 1
@@ -76,45 +76,59 @@ Item {
 		onCentroidChanged: {
 			const x = centroid.position.x;
 			const y = centroid.position.y;
-			const dragX = x - centroid.pressPosition.x;
-			const dragY = y - centroid.pressPosition.y;
+			const pressX = centroid.pressPosition.x;
+			const pressY = centroid.pressPosition.y;
+			const dragX = x - pressX;
+			const dragY = y - pressY;
 
-			if (centroid.pressPosition.y >= root.screen.height - Config.bar.border && centroid.pressPosition.x > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
-				root.visibilities.launcher = true;
+			if (pressY >= root.screen.height - Config.bar.border && pressX > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
+				root.screenState.launcher = true;
 
 			if (root.singleGestureTriggered)
 				return;
 
-			if (root.geometry.insetTop(root.borderThickness) > centroid.pressPosition.y) {
+			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, pressX, pressY);
+
+			if (inDashboard && root.withinPanelWidth(root.panels.dashboardWrapper, x, y)) {
+				if (dragY > Config.dashboard.dragThreshold) {
+					root.screenState.dashboard = true;
+					root.singleGestureTriggered = true;
+				} else if (dragY < -Config.dashboard.dragThreshold) {
+					root.screenState.dashboard = false;
+					root.singleGestureTriggered = true;
+				}
+			}
+
+			if (root.geometry.insetTop(root.borderThickness) > pressY && (Config.dashboard.showOnHover || !inDashboard)) {
 				if (dragY > 20) {
-					root.visibilities.settings = true;
+					root.screenState.settings = true;
 					root.singleGestureTriggered = true;
 				} else if (dragY < -20) {
-					root.visibilities.settings = false;
+					root.screenState.settings = false;
 					root.singleGestureTriggered = true;
 				}
 			}
 
-			if (centroid.pressPosition.y > root.screen.height - root.geometry.insetBottom(root.borderThickness) && centroid.pressPosition.x < root.screen.width / 5 && dragY < -50)
-				root.visibilities.clipboard = true;
+			if (pressY > root.screen.height - root.geometry.insetBottom(root.borderThickness) && pressX < root.screen.width / 5 && dragY < -50)
+				root.screenState.clipboard = true;
 
-			if (!Config.dock.hoverToReveal && centroid.pressPosition.y > root.screen.height - root.geometry.insetTop(root.borderThickness) && centroid.pressPosition.x > root.screen.width / 5 && !root.visibilities.launcher)
+			if (!Config.dock.hoverToReveal && pressY > root.screen.height - root.geometry.insetTop(root.borderThickness) && pressX > root.screen.width / 5 && !root.screenState.launcher)
 				if (dragY < -10) {
-					root.visibilities.dock = true;
+					root.screenState.dock = true;
 					root.singleGestureTriggered = true;
 				}
 
-			if (centroid.pressPosition.x > root.screen.width - Config.bar.border && centroid.pressPosition.y < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
-				root.visibilities.sidebar = true;
+			if (pressX > root.screen.width - Config.bar.border && pressY < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
+				root.screenState.sidebar = true;
 				root.singleGestureTriggered = true;
 			}
 
-			if (centroid.pressPosition.x >= root.screen.width - Config.bar.border && centroid.pressPosition.y > (root.screen.height / 2) && dragX < -20) {
+			if (pressX >= root.screen.width - Config.bar.border && pressY > (root.screen.height / 2) && dragX < -20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
 
-			if (centroid.pressPosition.x <= Config.bar.border && dragX > 20) {
+			if (pressX <= Config.bar.border && dragX > 20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
@@ -127,7 +141,7 @@ Item {
 		property bool setInitialPoint: false
 
 		acceptedButtons: Qt.LeftButton | Qt.RightButton
-		enabled: root.visibilities.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)
+		enabled: root.screenState.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)
 
 		onActiveChanged: {
 			if (!active) {
@@ -162,15 +176,28 @@ Item {
 		}
 	}
 
+	Timer {
+		id: unhideTimer
+
+		interval: Config.bar.revealDelay
+		repeat: false
+		running: false
+
+		onTriggered: {
+			if (hoverHandler.hovered)
+				root.bar.isHovered = true;
+		}
+	}
+
 	HoverHandler {
 		id: hoverHandler
 
-		cursorShape: root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
+		cursorShape: root.screenState.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
 
 		onHoveredChanged: {
 			if (!hovered) {
 				if (!root.osdShortcutActive) {
-					root.visibilities.osd = false;
+					root.screenState.osd = false;
 					root.panels.osd.hovered = false;
 				}
 
@@ -178,15 +205,18 @@ Item {
 					root.popouts.hasCurrent = false;
 				}
 
-				if (Config.bar.autoHide)
+				if (Config.bar.autoHide || root.bar.fullscreen)
 					root.bar.isHovered = false;
+
+				if (root.screenState.dashboard && Config.dashboard.showOnHover)
+					root.screenState.dashboard = false;
 			}
 		}
 		onPointChanged: {
 			const x = point.position.x;
 			const y = point.position.y;
 
-			if (root.visibilities.isDrawing) {
+			if (root.screenState.isDrawing) {
 				if (root.inLeftPanel(root.panels.drawing, x, y) && !(drawingHandler.point.pressedButtons & Qt.LeftButton)) {
 					root.panels.drawing.expand();
 					root.drawing.content.hideHover();
@@ -197,9 +227,12 @@ Item {
 				return;
 			}
 
-			if (!root.visibilities.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
+			if (!root.screenState.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
 				root.bar.isHovered = true;
 
+			if (root.bar.fullscreen && !root.bar.isHovered)
+				unhideTimer.start();
+
 			if (root.panels.sidebar.offsetScale === 1) {
 				const showOsd = root.inRightPanel(root.panels.osdWrapper, x, y);
 
@@ -212,7 +245,7 @@ Item {
 				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
 
 				if (!root.osdShortcutActive) {
-					root.visibilities.osd = showOsd;
+					root.screenState.osd = showOsd;
 					root.panels.osd.hovered = showOsd;
 				} else if (showOsd) {
 					root.osdShortcutActive = false;
@@ -220,8 +253,13 @@ Item {
 				}
 			}
 
-			if (Config.dock.enable && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
-				root.visibilities.dock = true;
+			if (Config.dock.enable && Config.dock.hoverToReveal && !root.screenState.dock && !root.screenState.launcher && root.inBottomPanel(root.panels.dock, x, y))
+				root.screenState.dock = true;
+
+			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, x, y);
+
+			if (Config.dashboard.showOnHover)
+				root.screenState.dashboard = inDashboard;
 
 			if (root.geometry.barContains(x, y))
 				root.bar.checkPopout(root.geometry.axisPos(x, y));
@@ -230,16 +268,17 @@ Item {
 
 	Connections {
 		function onDashboardChanged() {
-			if (root.visibilities.dashboard) {
+			if (root.screenState.dashboard) {
 				const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
 				if (!inDashboardArea) {
 					root.dashboardShortcutActive = true;
 				}
 				if (root.panels.launcher.x + root.panels.launcher.width > root.panels.dashboardWrapper.x)
-					root.visibilities.launcher = false;
+					root.screenState.launcher = false;
 
-				root.visibilities.settings = false;
-				root.visibilities.sidebar = false;
+				root.screenState.settings = false;
+				root.screenState.sidebar = false;
+				root.screenState.resources = false;
 				root.popouts.hasCurrent = false;
 			} else {
 				root.dashboardShortcutActive = false;
@@ -247,12 +286,12 @@ Item {
 		}
 
 		function onIsDrawingChanged() {
-			if (!root.visibilities.isDrawing)
+			if (!root.screenState.isDrawing)
 				root.drawing.clear();
 		}
 
 		function onLauncherChanged() {
-			if (!root.visibilities.launcher) {
+			if (!root.screenState.launcher) {
 				root.dashboardShortcutActive = false;
 				root.osdShortcutActive = false;
 				root.utilitiesShortcutActive = false;
@@ -260,23 +299,23 @@ Item {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 
 				if (!inOsdArea) {
-					root.visibilities.osd = false;
+					root.screenState.osd = false;
 					root.panels.osd.hovered = false;
 				}
 			}
 
-			if (root.visibilities.launcher) {
+			if (root.screenState.launcher) {
 				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
-					root.visibilities.dashboard = false;
+					root.screenState.dashboard = false;
 				}
 
-				root.visibilities.dock = false;
-				root.visibilities.settings = false;
+				root.screenState.dock = false;
+				root.screenState.settings = false;
 			}
 		}
 
 		function onOsdChanged() {
-			if (root.visibilities.osd) {
+			if (root.screenState.osd) {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 				if (!inOsdArea) {
 					root.osdShortcutActive = true;
@@ -287,32 +326,33 @@ Item {
 		}
 
 		function onResourcesChanged() {
-			if (root.visibilities.resources && (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))) {
+			if (root.screenState.resources) {
+				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
 					root.popouts.hasCurrent = false;
-			}
 
-			if (root.visibilities.resources)
-				root.visibilities.settings = false;
+				root.screenState.settings = false;
+				root.screenState.dashboard = false;
+			}
 		}
 
 		function onSettingsChanged() {
-			if (root.visibilities.settings) {
-				root.visibilities.resources = false;
-				root.visibilities.dashboard = false;
-				root.visibilities.sidebar = false;
+			if (root.screenState.settings) {
+				root.screenState.resources = false;
+				root.screenState.dashboard = false;
+				root.screenState.sidebar = false;
 				root.panels.popouts.hasCurrent = false;
-				root.visibilities.launcher = false;
+				root.screenState.launcher = false;
 			}
 		}
 
 		function onSidebarChanged() {
-			if (root.visibilities.sidebar) {
-				root.visibilities.dashboard = false;
-				root.visibilities.settings = false;
+			if (root.screenState.sidebar) {
+				root.screenState.dashboard = false;
+				root.screenState.settings = false;
 				root.popouts.hasCurrent = false;
 			}
 		}
 
-		target: root.visibilities
+		target: root.screenState
 	}
 }

Drawers/Interactions2.qml

@@ -0,0 +1,315 @@
+import Quickshell
+import QtQuick
+import ZShell.Config
+import ZShell.Internal
+import qs.Components
+import qs.Helpers
+import qs.Modules.Bar.Popouts
+
+CustomMouseArea {
+	id: root
+
+	required property Item bar
+	required property real borderThickness
+	property bool dashboardShortcutActive
+	property point dragStart
+	required property Drawing drawing
+	required property EdgeGeometry geometry
+	property bool osdShortcutActive
+	required property Panels panels
+	required property Wrapper popouts
+	required property ShellScreen screen
+	required property ScreenState screenState
+	property bool setInitialPoint: false
+	property bool singleGestureTriggered: false
+	property bool utilitiesShortcutActive
+
+	function inBottomPanel(panel: Item, x: real, y: real): bool {
+		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
+		return y > root.height - (panelHeight + geometry.insetBottom(borderThickness)) && withinPanelWidth(panel, x, y);
+	}
+
+	function inLeftPanel(panel: Item, x: real, y: real): bool {
+		return x < panel.x + panel.width + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
+	}
+
+	function inPopoutArea(x: real, y: real): bool {
+		const panel = panels.popoutsWrapper;
+		if (!geometry.horizontal)
+			return inLeftPanel(panel, x, y);
+		return withinPanelWidth(panel, x, y) && withinPanelHeight(panel, x, y);
+	}
+
+	function inRightPanel(panel: Item, x: real, y: real): bool {
+		return x > panel.x + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
+	}
+
+	function inTopPanel(panel: Item, x: real, y: real): bool {
+		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
+		return y < geometry.insetTop(borderThickness) + panelHeight && withinPanelWidth(panel, x, y);
+	}
+
+	function withinPanelHeight(panel: Item, x: real, y: real): bool {
+		const panelY = panel.y + geometry.insetTop(borderThickness);
+		return y >= panelY && y <= panelY + panel.height;
+	}
+
+	function withinPanelWidth(panel: Item, x: real, y: real): bool {
+		const panelX = panel.x + geometry.insetLeft(borderThickness);
+		return x >= panelX && x <= panelX + panel.width;
+	}
+
+	acceptedButtons: bar.fullscreen ? Qt.NoButton : Qt.AllButtons
+	anchors.fill: parent
+	hoverEnabled: true
+
+	onContainsMouseChanged: {
+		if (!containsMouse) {
+			if (!osdShortcutActive) {
+				screenState.osd = false;
+				panels.osd.hovered = false;
+			}
+
+			if (!popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
+				popouts.hasCurrent = false;
+			}
+
+			if (Config.bar.autoHide || bar.fullscreen)
+				bar.isHovered = false;
+
+			if (screenState.dashboard && Config.dashboard.showOnHover)
+				screenState.dashboard = false;
+		}
+	}
+	onPositionChanged: event => {
+		const x = event.x;
+		const y = event.y;
+		const dragX = x - dragStart.x;
+		const dragY = y - dragStart.y;
+
+		if (screenState.isDrawing) {
+			if (pressed) {
+				drawing.content.appendPoint(x, y);
+			} else {
+				if (inLeftPanel(panels.drawing, x, y)) {
+					if (!(pressedButtons & Qt.LeftButton)) {
+						panels.drawing.expand();
+						drawing.content.hideHover();
+						Cursor.clearOverride();
+					}
+				} else {
+					Cursor.setOverride(Qt.BlankCursor);
+					drawing.content.showHover(x, y);
+				}
+			}
+			if (drawing.content.hoverVisible)
+				drawing.content.showHover(x, y);
+			return;
+		}
+
+		if (root.bar.fullscreen && !root.bar.isHovered)
+			unhideTimer.start();
+
+		if (pressed && dragStart.y >= screen.height - Config.bar.border && dragStart.x > screen.width / 5 && dragY < -Config.launcher.dragThreshold)
+			screenState.launcher = true;
+
+		const entryAt = bar.entryAt(geometry.axisPos(x, y));
+		const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboardWrapper, x, y) && (!entryAt || entryAt === "activeWindow");
+
+		if (!dashboardShortcutActive) {
+			screenState.dashboard = showDashboard;
+		} else if (showDashboard) {
+			dashboardShortcutActive = false;
+		}
+
+		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && withinPanelWidth(panels.dashboardWrapper, x, y)) {
+			if (dragY > Config.dashboard.dragThreshold)
+				screenState.dashboard = true;
+			else if (dragY < -Config.dashboard.dragThreshold)
+				screenState.dashboard = false;
+		}
+
+		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && !inTopPanel(panels.dashboardWrapper, dragStart.x, dragStart.y)) {
+			if (dragY > 20) {
+				screenState.settings = true;
+			} else if (dragY < -20) {
+				screenState.settings = false;
+			}
+		}
+
+		if (pressed && dragStart.y > screen.height - geometry.insetBottom(borderThickness) && dragStart.x < screen.width / 5 && dragY < -50)
+			screenState.clipboard = true;
+
+		if (pressed && !Config.dock.hoverToReveal && dragStart.y > screen.height - geometry.insetTop(borderThickness) && dragStart.x > screen.width / 5 && !screenState.launcher)
+			if (dragY < -10)
+				screenState.dock = true;
+
+		if (pressed && dragStart.x > screen.width - Config.bar.border && dragStart.y < (screen.height / 2) && dragX < -Config.sidebar.dragThreshold)
+			screenState.sidebar = true;
+
+		if (pressed && dragStart.x >= screen.width - Config.bar.border && dragStart.y > (screen.height / 2) && dragX < -20)
+			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
+
+		if (pressed && dragStart.x <= Config.bar.border && dragX > 20)
+			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
+
+		if (!screenState.bar && Config.bar.autoHide && geometry.barContains(x, y, true))
+			bar.isHovered = true;
+
+		if (panels.sidebar.offsetScale === 1) {
+			const showOsd = inRightPanel(panels.osdWrapper, x, y);
+
+			if (showOsd) {
+				osdShortcutActive = false;
+				panels.osd.hovered = true;
+			}
+		} else {
+			const outOfSidebar = x < width - panels.sidebar.width * (1 - panels.sidebar.offsetScale);
+			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
+
+			if (!osdShortcutActive) {
+				screenState.osd = showOsd;
+				panels.osd.hovered = showOsd;
+			} else if (showOsd) {
+				osdShortcutActive = false;
+				panels.osd.hovered = true;
+			}
+		}
+
+		if (Config.dock.enable && Config.dock.hoverToReveal && !screenState.dock && !screenState.launcher && inBottomPanel(panels.dock, x, y))
+			screenState.dock = true;
+
+		if (geometry.barContains(x, y))
+			bar.checkPopout(geometry.axisPos(x, y));
+	}
+	onPressed: event => {
+		dragStart = Qt.point(event.x, event.y);
+
+		if (screenState.isDrawing) {
+			if (event.button & Qt.RightButton) {
+				drawing.content.clear();
+				return;
+			}
+
+			if (!inLeftPanel(panels.drawing, mouseX, mouseY))
+				drawing.content.beginStroke(event.x, event.y);
+		}
+	}
+	onPressedChanged: {
+		if (!pressed) {
+			if (screenState.isDrawing) {
+				setInitialPoint = false;
+				drawing.content.endStroke();
+				if (!inLeftPanel(panels.drawing, mouseX, mouseY))
+					drawing.content.showHover(mouseX, mouseY);
+			}
+		} else {
+			if (screenState.isDrawing) {
+				panels.drawing.collapse();
+			}
+		}
+	}
+
+	Timer {
+		id: unhideTimer
+
+		interval: Config.bar.revealDelay
+		repeat: false
+		running: false
+
+		onTriggered: {
+			if (root.containsMouse)
+				root.bar.isHovered = true;
+		}
+	}
+
+	Connections {
+		function onDashboardChanged(): void {
+			if (root.screenState.dashboard) {
+				const inDashboardArea = root.inTopPanel(root.panels.dashboardWrapper, root.mouseX, root.mouseY);
+				if (!inDashboardArea) {
+					root.dashboardShortcutActive = true;
+				}
+
+				root.screenState.launcher = false;
+				root.screenState.settings = false;
+				root.screenState.sidebar = false;
+				root.screenState.resources = false;
+				root.popouts.hasCurrent = false;
+			} else {
+				root.dashboardShortcutActive = false;
+			}
+		}
+
+		function onIsDrawingChanged(): void {
+			if (root.screenState.isDrawing) {
+				Cursor.setOverride(Qt.BlankCursor);
+			} else {
+				Cursor.clearOverride();
+			}
+		}
+
+		function onLauncherChanged(): void {
+			if (!root.screenState.launcher) {
+				root.dashboardShortcutActive = false;
+				root.osdShortcutActive = false;
+				root.utilitiesShortcutActive = false;
+
+				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
+
+				if (!inOsdArea) {
+					root.screenState.osd = false;
+					root.panels.osd.hovered = false;
+				}
+			}
+
+			if (root.screenState.launcher) {
+				root.screenState.dashboard = false;
+				root.screenState.dock = false;
+				root.screenState.settings = false;
+			}
+		}
+
+		function onOsdChanged(): void {
+			if (root.screenState.osd) {
+				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
+				if (!inOsdArea) {
+					root.osdShortcutActive = true;
+				}
+			} else {
+				root.osdShortcutActive = false;
+			}
+		}
+
+		function onResourcesChanged(): void {
+			if (root.screenState.resources) {
+				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
+					root.popouts.hasCurrent = false;
+
+				root.screenState.settings = false;
+				root.screenState.dashboard = false;
+			}
+		}
+
+		function onSettingsChanged(): void {
+			if (root.screenState.settings) {
+				root.screenState.resources = false;
+				root.screenState.dashboard = false;
+				root.screenState.sidebar = false;
+				root.panels.popouts.hasCurrent = false;
+				root.screenState.launcher = false;
+			}
+		}
+
+		function onSidebarChanged(): void {
+			if (root.screenState.sidebar) {
+				if (root.panels.dashboardWrapper.x + root.panels.dashboardWrapper.width > root.panels.sidebar.x)
+					root.screenState.dashboard = false;
+				root.screenState.settings = false;
+				root.popouts.hasCurrent = false;
+			}
+		}
+
+		target: root.screenState
+	}
+}

Drawers/Panels.qml

@@ -3,8 +3,8 @@ import QtQuick
 import qs.Components
 import qs.Modules.Bar.Popouts as Popouts
 import qs.Modules.Notifications as Notifications
-import qs.Modules.Notifications.Sidebar as Sidebar
-import qs.Modules.Notifications.Sidebar.Utils as Utils
+import qs.Modules.Sidebar as Sidebar
+import qs.Modules.Sidebar.Utils as Utils
 import qs.Modules.Dashboard as Dashboard
 import qs.Modules.Osd as Osd
 import qs.Components.Toast as Toasts
@@ -19,15 +19,11 @@ 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
@@ -36,13 +32,18 @@ Item {
 	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
-	required property ShellScreen screen
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
-	required property PersistentProperties visibilities
+
+	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
@@ -64,7 +65,7 @@ Item {
 			id: resources
 
 			position: root.geometry.position
-			visibilities: root.visibilities
+			screenState: root.screenState
 		}
 	}
 
@@ -84,8 +85,8 @@ Item {
 			anchors.right: parent.right
 			anchors.verticalCenter: parent.verticalCenter
 			screen: root.screen
+			screenState: root.screenState
 			sidebarOrSessionVisible: sidebar.visible
-			visibilities: root.visibilities
 		}
 	}
 
@@ -96,7 +97,7 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 		drawing: root.drawingItem
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Popouts.ClipWrapper {
@@ -111,7 +112,7 @@ Item {
 		id: toasts
 
 		anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
-		anchors.margins: Tokens.padding.normal
+		anchors.margins: Tokens.padding.small
 		anchors.right: sidebar.left
 	}
 
@@ -121,8 +122,8 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
+		screenState: root.screenState
 		sidebarPanel: sidebar
-		visibilities: root.visibilities
 	}
 
 	Launcher.Wrapper {
@@ -132,7 +133,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Utils.Wrapper {
@@ -140,9 +141,8 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		popouts: popouts
+		screenState: root.screenState
 		sidebar: sidebar
-		visibilities: root.visibilities
 	}
 
 	Item {
@@ -150,18 +150,16 @@ Item {
 
 		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
 
-		anchors.bottom: root.geometry.barOnLeft || root.geometry.barOnBottom ? parent.bottom : undefined
-		anchors.left: root.geometry.barOnLeft ? parent.left : undefined
-		anchors.right: root.geometry.barOnLeft ? undefined : parent.right
-		anchors.top: root.geometry.barOnBottom || root.geometry.barOnLeft ? undefined : parent.top
-		clip: true
-		implicitHeight: root.geometry.horizontal ? dashboard.implicitHeight * (1 - offsetScale) : dashboard.implicitHeight
-		implicitWidth: root.geometry.horizontal ? dashboard.implicitWidth : dashboard.implicitWidth * (1 - offsetScale)
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		clip: offsetScale > 0
+		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
+		implicitWidth: dashboard.implicitWidth
 
 		Behavior on offsetScale {
 			Anim {
 				duration: Tokens.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+				easing: Tokens.anim.expressiveDefaultSpatial
 			}
 		}
 
@@ -169,8 +167,7 @@ Item {
 			id: dashboard
 
 			offsetScale: dashboardWrapper.offsetScale
-			position: root.geometry.position
-			visibilities: root.visibilities
+			screenState: root.screenState
 		}
 	}
 
@@ -181,7 +178,7 @@ Item {
 		anchors.right: parent.right
 		anchors.top: notifications.bottom
 		panels: root
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Item {
@@ -197,7 +194,7 @@ Item {
 			anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
 			panels: root
 			screen: root.screen
-			visibilities: root.visibilities
+			screenState: root.screenState
 		}
 	}
 
@@ -208,7 +205,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Clipboard.Wrapper {
@@ -217,6 +214,6 @@ Item {
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 }

Drawers/Windows.qml

@@ -50,49 +50,47 @@ CustomWindow {
 	readonly property alias menuRegion: regions.menuPopoutRegion
 	readonly property HyprlandMonitor monitor: Hypr.monitorFor(screen)
 	property var root: Quickshell.shellDir
+	readonly property ScreenState screenState: ShellState.forScreen(screen)
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
-	readonly property real shadowOpacity: 0.7 * (1 - fsTransitionProg)
+	readonly property real shadowOpacity: 0.5 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
 	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.settings ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+	WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 	WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
 	color: "transparent"
-	contentItem.focus: true
-	mask: visibilities.isDrawing ? null : (hasFullscreen ? emptyRegion : regions)
+	mask: screenState.isDrawing || screenState.screenshot ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
 	name: "Bar"
 
 	Behavior on fsTransitionProg {
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on surfaceColor {
-		CAnim {
-		}
+		CAnim {}
 	}
 
 	contentItem.Keys.onEscapePressed: {
 		if (Config.bar.autoHide)
-			visibilities.bar = false;
-		visibilities.launcher = false;
-		visibilities.sidebar = false;
-		visibilities.dashboard = false;
-		visibilities.osd = false;
-		visibilities.settings = false;
-		visibilities.resources = false;
-		visibilities.dock = false;
-		visibilities.clipboard = false;
+			screenState.bar = false;
+		screenState.launcher = false;
+		screenState.sidebar = false;
+		screenState.dashboard = false;
+		screenState.osd = false;
+		screenState.settings = false;
+		screenState.resources = false;
+		screenState.dock = false;
+		screenState.clipboard = false;
 		panels.popouts.hasCurrent = false;
 	}
 	onHasFullscreenChanged: {
-		visibilities.launcher = false;
-		visibilities.sidebar = false;
-		visibilities.dashboard = false;
-		visibilities.osd = false;
-		visibilities.settings = false;
-		visibilities.resources = false;
-		visibilities.clipboard = false;
-		visibilities.dock = false;
+		screenState.launcher = false;
+		screenState.sidebar = false;
+		screenState.dashboard = false;
+		screenState.osd = false;
+		screenState.settings = false;
+		screenState.resources = false;
+		screenState.clipboard = false;
+		screenState.dock = false;
 		panels.popouts.hasCurrent = false;
 	}
 
@@ -118,6 +116,12 @@ CustomWindow {
 			x: root.width - width
 			y: panels.osdWrapper.y + bar.implicitHeight
 		}
+
+		Region {
+			height: geometry.horizontal ? 1 : root.screen.height
+			width: geometry.horizontal ? root.screen.width : 1
+			y: geometry.position === "bottom" ? root.screen.height - 1 : 0
+		}
 	}
 
 	Regions {
@@ -138,44 +142,41 @@ CustomWindow {
 	HyprlandFocusGrab {
 		id: focusGrab
 
-		active: visibilities.dock || visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.clipboard || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu") && (!Config.bar.tray.showOnHover || (panels.popouts.current as StackView)?.depth > 1))
+		active: {
+			const s = root.screenState;
+			const c = Config;
+
+			if ((s.launcher && c.launcher.enabled) || (s.sidebar && c.sidebar.enabled) || (s.resources && c.dashboard.performance.enabled) || (s.clipboard && c.clipboard.enabled))
+				return true;
+			if (s.dashboard && !c.dashboard.showOnHover && c.dashboard.enabled)
+				return true;
+			if (!c.dock.hoverToReveal && s.dock && c.dock.enable)
+				return true;
+			if (panels.popouts.currentName.startsWith("traymenu") && (panels.popouts.current as StackView)?.depth > 1)
+				return true;
+			if (s.settings)
+				return true;
+			return false;
+		}
 		windows: [root]
 
 		onCleared: {
-			visibilities.launcher = false;
-			visibilities.sidebar = false;
-			visibilities.dashboard = false;
-			visibilities.osd = false;
-			visibilities.settings = false;
-			visibilities.resources = false;
-			visibilities.clipboard = false;
-			visibilities.dock = false;
+			root.screenState.launcher = false;
+			root.screenState.sidebar = false;
+			root.screenState.dashboard = false;
+			root.screenState.osd = false;
+			root.screenState.settings = false;
+			root.screenState.resources = false;
+			root.screenState.clipboard = false;
+			root.screenState.dock = false;
 			panels.popouts.hasCurrent = false;
 		}
 	}
 
-	PersistentProperties {
-		id: visibilities
-
-		property bool bar
-		property bool clipboard
-		property bool dashboard
-		property bool dock
-		property bool isDrawing
-		property bool launcher
-		property bool notif: NotifServer.popups.length > 0
-		property bool osd
-		property bool resources
-		property bool settings
-		property bool sidebar
-
-		Component.onCompleted: Visibilities.load(root.screen, this)
-	}
-
 	Binding {
 		property: "bar"
-		target: visibilities
-		value: visibilities.sidebar || visibilities.dashboard || visibilities.osd || (!Config.bar.hideWhenNotif && visibilities.notif) || visibilities.resources || visibilities.settings || bar.isHovered
+		target: root.screenState
+		value: root.screenState.sidebar || root.screenState.dashboard || root.screenState.osd || (!Config.bar.hideWhenNotif && NotifServer.popups.length > 0) || root.screenState.resources || root.screenState.settings || bar.isHovered
 		when: Config.bar.autoHide
 	}
 
@@ -183,23 +184,19 @@ CustomWindow {
 		id: surface
 
 		anchors.fill: parent
-		layer.enabled: true
 		opacity: root.surfaceColor.a
 
-		layer.effect: MultiEffect {
-			blurMax: 32
-			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
-			shadowEnabled: true
-		}
-
-		BlobGroup {
+		BlobGroup2 {
 			id: blobGroup
 
+			anchors.fill: parent
 			color: root.surfaceColor
+			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
+			shadowRadius: 18
 			smoothing: Config.bar.smoothing
 		}
 
-		BlobInvertedRect {
+		BlobInvertedRect2 {
 			anchors.fill: parent
 			anchors.margins: -50
 			borderBottom: geometry.insetBottom(root.borderThickness) - anchors.margins - root.sdfBorderOffset
@@ -219,7 +216,7 @@ CustomWindow {
 			implicitHeight: panels.dashboard.height * (geometry.horizontal ? 1 + extraExtent : 1)
 			implicitWidth: panels.dashboard.width * (geometry.horizontal ? 1 : 1 + extraExtent)
 			panel: panels.dashboardWrapper
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.extraLarge
 			x: panels.dashboardWrapper.x + panels.dashboard.x + geometry.insetLeft(root.borderThickness) - (geometry.horizontal ? 0 : panels.dashboard.width * extraExtent)
 			y: panels.dashboardWrapper.y + panels.dashboard.y + geometry.insetTop(root.borderThickness) - (geometry.horizontal && geometry.position !== "bottom" ? panels.dashboard.height * extraExtent : 0)
 		}
@@ -232,7 +229,7 @@ CustomWindow {
 			deformAmount: 0.06
 			implicitHeight: panels.launcher.height * (1 + extraHeight)
 			panel: panels.launcher
-			radius: Tokens.rounding.smallest + 5
+			radius: Tokens.rounding.medium + (Tokens.padding.largeIncreased / 4)
 			y: panels.launcher.y + geometry.insetTop(root.borderThickness)
 		}
 
@@ -249,6 +246,7 @@ CustomWindow {
 		PanelBg {
 			id: osdBg
 
+			atRestOverride: panels.osd.offsetScale < 0.99
 			deformAmount: 0.1
 			implicitHeight: panels.osd.height
 			implicitWidth: panels.osd.width
@@ -260,8 +258,9 @@ CustomWindow {
 		PanelBg {
 			id: notifsBg
 
+			atRestOverride: panel.implicitHeight > 0
 			panel: panels.notifications
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.large
 		}
 
 		PanelBg {
@@ -282,26 +281,28 @@ CustomWindow {
 			implicitHeight: panels.popouts.height * (geometry.horizontal ? 1 + extraExtent : 1)
 			implicitWidth: panels.popouts.width * (geometry.horizontal ? 1 : 1 + extraExtent)
 			panel: panels.popoutsWrapper
-			radius: panels.popouts.current?.panelRadius ?? Tokens.rounding.normal
+			radius: panels.popouts.current?.panelRadius ?? Tokens.rounding.large
 			x: panels.popoutsWrapper.x + panels.popouts.x + geometry.insetLeft(root.borderThickness) - (geometry.horizontal ? 0 : panels.popouts.width * extraExtent)
 			y: panels.popoutsWrapper.y + panels.popouts.y + geometry.insetTop(root.borderThickness) - (geometry.barOnTop ? panels.popouts.height * extraExtent : 0)
 
 			Behavior on extraExtent {
-				Anim {
-				}
+				Anim {}
 			}
 		}
 
 		PanelBg {
 			id: resourcesBg
 
+			property real extraExtent: 0.2
+
+			atRestOverride: panels.resources.offsetScale < 0.99
 			deformAmount: 0.05
-			implicitHeight: panels.resources.height
-			implicitWidth: panels.resources.width
+			implicitHeight: panels.resources.height * (1 + extraExtent)
+			implicitWidth: panels.resources.width * (1 + extraExtent)
 			panel: panels.resourcesWrapper
-			radius: Tokens.rounding.large
-			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness)
-			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness)
+			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
+			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness) - panels.resources.width * extraExtent
+			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness) - panels.resources.height * extraExtent
 		}
 
 		PanelBg {
@@ -309,7 +310,7 @@ CustomWindow {
 
 			deformAmount: 0.03
 			panel: panels.settings
-			radius: Tokens.rounding.large + Tokens.padding.normal
+			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
 		}
 
 		PanelBg {
@@ -317,7 +318,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.dock
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
@@ -325,15 +326,21 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.drawing
-			radius: Tokens.rounding.normal
+			radius: Tokens.rounding.medium
 		}
 
 		PanelBg {
 			id: clipboardBg
 
+			property real extraExtent: 0.2
+
 			deformAmount: 0.03
+			implicitHeight: panels.clipboard.height * (1 + extraExtent)
+			implicitWidth: panels.clipboard.width * (1 + extraExtent)
 			panel: panels.clipboard
 			radius: 29
+			x: panels.clipboard.x + geometry.insetLeft(root.borderThickness) - panels.clipboard.width * extraExtent
+			y: panels.clipboard.y + geometry.insetTop(root.borderThickness)
 		}
 	}
 
@@ -341,37 +348,11 @@ CustomWindow {
 		id: drawing
 
 		anchors.fill: parent
-		layer.enabled: true
-		visibilities: visibilities
+		screenState: root.screenState
 		z: 2
-
-		layer.effect: MultiEffect {
-			maskEnabled: true
-			maskInverted: true
-			maskSource: maskSource
-		}
 	}
 
-	Item {
-		id: maskSource
-
-		anchors.fill: parent
-		layer.enabled: true
-		visible: false
-
-		CustomRect {
-			readonly property int extraWidth: radius
-
-			color: "white"
-			implicitHeight: panels.drawing.height
-			implicitWidth: panels.drawing.width + extraWidth
-			radius: drawingBg.radius
-			x: -extraWidth + root.borderThickness + panels.drawing.x
-			y: panels.drawing.y + bar.implicitHeight
-		}
-	}
-
-	Interactions {
+	Interactions2 {
 		id: interactions
 
 		anchors.fill: parent
@@ -383,7 +364,7 @@ CustomWindow {
 		panels: panels
 		popouts: panels.popouts
 		screen: root.screen
-		visibilities: visibilities
+		screenState: root.screenState
 
 		Panels {
 			id: panels
@@ -393,7 +374,7 @@ CustomWindow {
 			drawingItem: drawing
 			geometry: geometry
 			screen: root.screen
-			visibilities: visibilities
+			screenState: root.screenState
 
 			clipboard.transform: Matrix4x4 {
 				matrix: clipboardBg.deformMatrix
@@ -436,27 +417,45 @@ CustomWindow {
 			anchors.bottom: geometry.barOnBottom ? parent.bottom : undefined
 			anchors.left: parent.left
 			anchors.top: geometry.barOnBottom ? undefined : parent.top
-			enabled: !visibilities.isDrawing
+			enabled: !screenState.isDrawing
 			fullscreen: root.hasFullscreen
 			height: geometry.horizontal ? implicitHeight : parent.height
 			popouts: panels.popouts
 			popoutsWrapper: panels.popoutsWrapper
 			position: geometry.position
 			screen: root.screen
-			visibilities: visibilities
+			screenState: root.screenState
 			width: geometry.horizontal ? parent.width : implicitWidth
 		}
 	}
 
-	component PanelBg: BlobRect {
+	LazyLoader {
+		id: loader
+
+		property bool closing: !root.screenState.screenshot
+
+		onClosingChanged: if (!closing)
+			activeAsync = true
+
+		Picker {
+			loader: loader
+			parent: root.contentItem
+			screen: root.screen
+			screenState: root.screenState
+		}
+	}
+
+	component PanelBg: BlobRect2 {
 		property real deformAmount: 0.15
 		required property Item panel
 
+		atRestOverride: panel?.offsetScale < 0.99 ?? false
+		damping: 28.3
 		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
 		group: blobGroup
 		implicitHeight: panel.height
 		implicitWidth: panel.width
-		radius: Tokens.rounding.smallest
+		radius: Tokens.rounding.small
 		x: panel.x + geometry.insetLeft(root.borderThickness)
 		y: panel.y + geometry.insetTop(root.borderThickness)
 	}

Effects/ShadowRect.qml

@@ -1,33 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-
-Item {
-	id: root
-
-	property real radius
-
-	Rectangle {
-		id: shadowRect
-
-		anchors.fill: root
-		color: "black"
-		layer.enabled: true
-		radius: root.radius
-		visible: false
-	}
-
-	MultiEffect {
-		id: effects
-
-		anchors.fill: shadowRect
-		autoPaddingEnabled: true
-		maskEnabled: true
-		maskInverted: true
-		maskSource: shadowRect
-		shadowBlur: 2.0
-		shadowColor: "black"
-		shadowEnabled: true
-		shadowOpacity: 1
-		source: shadowRect
-	}
-}

Greeter/Center.qml

@@ -18,7 +18,7 @@ ColumnLayout {
 	Layout.fillHeight: true
 	Layout.fillWidth: false
 	Layout.preferredWidth: centerWidth
-	spacing: Tokens.spacing.large * 2
+	spacing: Tokens.spacing.largeIncreased * 2
 
 	RowLayout {
 		Layout.alignment: Qt.AlignHCenter
@@ -27,27 +27,21 @@ ColumnLayout {
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: Time.hourStr
 		}
 
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3primary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: ":"
 		}
 
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: Time.minuteStr
 		}
 	}
@@ -56,15 +50,13 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: -Tokens.padding.large * 2
 		color: Colors.palette.m3tertiary
-		font.bold: true
-		font.family: Config.appearance.font.family.mono
-		font.pointSize: Math.floor(Tokens.font.size.extraLarge * root.centerScale)
+		font: Tokens.font.title.builders.medium.weight(Font.DemiBold).build()
 		text: Time.format("dddd, d MMMM yyyy")
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		Layout.alignment: Qt.AlignHCenter
-		Layout.topMargin: Tokens.spacing.large * 2
+		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer
 		implicitHeight: root.centerWidth / 2
 		implicitWidth: root.centerWidth / 2
@@ -73,7 +65,7 @@ ColumnLayout {
 		MaterialIcon {
 			anchors.centerIn: parent
 			color: Colors.palette.m3onSurfaceVariant
-			font.pointSize: Math.floor(root.centerWidth / 4)
+			fontStyle: Tokens.font.icon.size(root.centerWidth / 4).build()
 			text: "person"
 		}
 
@@ -88,9 +80,7 @@ ColumnLayout {
 	CustomText {
 		Layout.alignment: Qt.AlignHCenter
 		color: Colors.palette.m3onSurfaceVariant
-		font.family: Config.appearance.font.family.mono
-		font.pointSize: Tokens.font.size.normal
-		font.weight: 600
+		font: Tokens.font.body.large
 		text: root.greeter.username
 		visible: text.length > 0
 	}
@@ -99,7 +89,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		color: Colors.tPalette.m3surfaceContainer
 		focus: true
-		implicitHeight: input.implicitHeight + Tokens.padding.small * 2
+		implicitHeight: input.implicitHeight + Tokens.padding.extraSmall * 2
 		implicitWidth: root.centerWidth * 0.8
 		radius: Tokens.rounding.full
 
@@ -130,11 +120,11 @@ ColumnLayout {
 			id: input
 
 			anchors.fill: parent
-			anchors.margins: Tokens.padding.small
-			spacing: Tokens.spacing.normal
+			anchors.margins: Tokens.padding.extraSmall
+			spacing: Tokens.spacing.medium
 
 			Item {
-				implicitHeight: statusIcon.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: statusIcon.implicitHeight + Tokens.padding.extraSmall * 2
 				implicitWidth: implicitHeight
 
 				MaterialIcon {
@@ -155,8 +145,7 @@ ColumnLayout {
 					}
 
 					Behavior on opacity {
-						Anim {
-						}
+						Anim {}
 					}
 				}
 
@@ -174,7 +163,7 @@ ColumnLayout {
 
 			CustomRect {
 				color: root.greeter.buffer && !root.greeter.launching ? Colors.palette.m3primary : Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
-				implicitHeight: enterIcon.implicitHeight + Tokens.padding.small * 2
+				implicitHeight: enterIcon.implicitHeight + Tokens.padding.extraSmall * 2
 				implicitWidth: implicitHeight
 				radius: Tokens.rounding.full
 
@@ -191,7 +180,6 @@ 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"
 				}
 			}
@@ -200,12 +188,11 @@ ColumnLayout {
 
 	Item {
 		Layout.fillWidth: true
-		Layout.topMargin: -Tokens.spacing.large
+		Layout.topMargin: -Tokens.spacing.largeIncreased
 		implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)
 
 		Behavior on implicitHeight {
-			Anim {
-			}
+			Anim {}
 		}
 
 		CustomText {
@@ -245,12 +232,10 @@ ColumnLayout {
 			wrapMode: Text.WrapAtWordBoundaryOrAnywhere
 
 			Behavior on opacity {
-				Anim {
-				}
+				Anim {}
 			}
 			Behavior on scale {
-				Anim {
-				}
+				Anim {}
 			}
 
 			onMsgChanged: {
@@ -292,8 +277,7 @@ ColumnLayout {
 			anchors.left: parent.left
 			anchors.right: parent.right
 			color: isError ? Colors.palette.m3error : Colors.palette.m3primary
-			font.family: Config.appearance.font.family.mono
-			font.pointSize: Tokens.font.size.small
+			font: Tokens.font.mono.medium
 			horizontalAlignment: Qt.AlignHCenter
 			opacity: 0
 			scale: 0.7

Greeter/Components/Anim.qml

@@ -30,11 +30,11 @@ NumberAnimation {
 		if (type === Anim.DefaultSpatial)
 			return Tokens.anim.durations.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Tokens.anim.durations.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
 			return Tokens.anim.durations.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.durations.expressiveEffects;
+			return Tokens.anim.durations.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
 			return Tokens.anim.durations.expressiveSlowEffects;
 
@@ -42,22 +42,22 @@ NumberAnimation {
 		const idx = type % 4; // 0-7 are the 4 standard types
 		return Tokens.anim.durations[types[idx]];
 	}
-	easing.bezierCurve: {
+	easing: {
 		if (type === Anim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Tokens.anim.expressiveFastSpatial;
 		if (type === Anim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Tokens.anim.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Tokens.anim.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
-			return Tokens.anim.curves.expressiveFastEffects;
+			return Tokens.anim.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.curves.expressiveDefaultEffects;
+			return Tokens.anim.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
-			return Tokens.anim.curves.expressiveSlowEffects;
+			return Tokens.anim.expressiveSlowEffects;
 
 		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
-		return Tokens.anim.curves.standard;
+			return Tokens.anim.emphasized;
+		return Tokens.anim.standard;
 	}
 }

Greeter/Components/CAnim.qml

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

Greeter/Components/CircularIndicator.qml

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

Greeter/Components/CircularProgress.qml

@@ -21,7 +21,7 @@ Item {
 	readonly property real size: Math.min(width, height)
 	property int spacing: Tokens.spacing.small
 	property int startAngle: -90
-	property int strokeWidth: Tokens.padding.small
+	property int strokeWidth: Tokens.padding.extraSmall
 	property int sweepAngle: 360
 	readonly property real thickness: strokeWidth * (1 + waveAmplitude) * 2
 	property real value

Greeter/Components/ClipRect.qml

@@ -0,0 +1,41 @@
+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,13 +1,36 @@
 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,13 +1,36 @@
 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,6 +4,7 @@ MouseArea {
 	property int scrollAccumulatedY: 0
 
 	function onWheel(event: WheelEvent): void {
+		event.accepted = false;
 	}
 
 	onWheel: event => {

Greeter/Components/CustomRect.qml

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

Greeter/Components/CustomText.qml

@@ -14,10 +14,9 @@ Text {
 	property real animateTo: 1
 
 	color: Colors.palette.m3onSurface
-	font.family: Config.appearance.font.family.sans
-	font.pointSize: Tokens.font.size.normal
+	font: Tokens.font.body.small
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.NativeRendering
+	renderType: Text.QtRendering
 	textFormat: Text.PlainText
 
 	Behavior on color {
@@ -28,22 +27,25 @@ Text {
 		enabled: root.animate
 
 		SequentialAnimation {
-			Anim {
+			TAnim {
+				target: root
 				to: root.animateFrom
+				type: Anim.FastEffects
 			}
 
 			PropertyAction {
 			}
 
-			Anim {
+			TAnim {
+				target: root
 				to: root.animateTo
+				type: Anim.DefaultEffects
 			}
 		}
 	}
 
-	component Anim: NumberAnimation {
+	component TAnim: Anim {
 		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,76 +1,305 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Shapes
 import ZShell.Config
 import qs.Services
 
-TextField {
+TextFieldBase {
 	id: root
 
-	background: null
-	color: Colors.palette.m3onSurface
-	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
+	enum TextFieldType {
+		Outlined,
+		Filled
+	}
 
-	Behavior on color {
-		CAnim {
+	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
+	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
+	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
+	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
+	readonly property real smallFontScale: smallFontSize / font.pointSize
+	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
+	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
+	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
+
+	property int horizontalPadding: Tokens.padding.large
+	property int verticalPadding: Tokens.padding.large
+
+	property int radius: Tokens.rounding.small
+
+	property string supportingText
+	property string trailingIcon
+	property int smallFontSize: Tokens.font.label.small.pointSize
+
+	property int type: CustomTextField.Outlined
+	property var validate // Regex or function
+	property bool emptyIsValid: true
+	property string errorText
+	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
 
-		property bool disableBlink
+	onEditingFinished: {
+		if (!valid)
+			isError = true;
+	}
+	onPressed: {
+		if (stateLayer.enabled)
+			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
+	}
+	onTextEdited: {
+		if (isError)
+			isError = false;
+	}
 
-		color: Colors.palette.m3primary
-		implicitWidth: 2
-		radius: Tokens.rounding.normal
+	Item {
+		id: contentWrapper
 
-		Behavior on opacity {
+		anchors.bottomMargin: root.supportingTextOffset
+		anchors.fill: parent
+
+		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 {
-				duration: Tokens.anim.durations.small
+					properties: "scale,leftMargin"
+					type: Anim.DefaultEffects
+				}
+
+				AnchorAnim {
+					duration: Tokens.anim.durations.expressiveDefaultEffects
+					easing: Tokens.anim.expressiveDefaultEffects
+				}
 			}
 		}
 
-		Connections {
-			function onCursorPositionChanged(): void {
-				if (root.activeFocus && root.cursorVisible) {
-					cursor.opacity = 1;
-					cursor.disableBlink = true;
-					enableBlink.restart();
+		Loader {
+			id: leadingIconLoader
+
+			active: root.leadingIcon
+			anchors.left: parent.left
+			anchors.leftMargin: Tokens.padding.small
+			anchors.verticalCenter: parent.verticalCenter
+
+			sourceComponent: MaterialIcon {
+				color: Colors.palette.m3onSurfaceVariant
+				text: root.leadingIcon
+				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}
 		}
 
-			target: root
+		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()
+			}
+		}
 	}
 
-		Timer {
-			id: enableBlink
+	Loader {
+		id: supportingTextLoader
 
-			interval: 100
+		active: root.effectiveSupportingText
+		anchors.bottom: parent.bottom
+		anchors.left: parent.left
+		anchors.leftMargin: root.horizontalPadding
 
-			onTriggered: cursor.disableBlink = false
+		sourceComponent: CustomText {
+			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
+			font: Tokens.font.label.small
+			text: root.effectiveSupportingText
+		}
 	}
 
-		Timer {
-			interval: 500
-			repeat: true
-			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
-			triggeredOnStart: true
-
-			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+	TapHandler {
+		id: tapHandler
 	}
 
-		Binding {
-			cursor.opacity: 0
-			when: !root.activeFocus || !root.cursorVisible
+	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
+				}
+			}
+		}
+	}
+
+	Component {
+		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 {}
 				}
 			}
-	Behavior on placeholderTextColor {
-		CAnim {
 		}
 	}
 }

Greeter/Components/CustomTextInput.qml

@@ -6,7 +6,7 @@ import qs.Services
 TextInput {
 	renderType: Text.NativeRendering
 	selectedTextColor: Colors.palette.m3onSecondaryContainer
-	selectionColor: Colors.tPalette.m3onSecondaryContainer
+	selectionColor: Colors.tPalette.colSecondaryContainer
 
 	font {
 		family: Config.appearance?.font.family.sans ?? "sans-serif"

Greeter/Components/FadeImage.qml

@@ -0,0 +1,79 @@
+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

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

Greeter/Components/StateLayer.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Shapes
 import ZShell
-import ZShell.Components
-import qs.Helpers
 import ZShell.Config
 import qs.Services
 
@@ -13,7 +11,6 @@ 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);
@@ -22,6 +19,7 @@ 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
@@ -29,7 +27,7 @@ MouseArea {
 	readonly property alias rect: base
 	property bool shapeMorph
 	property bool showHoverBackground: true
-	property real stateOpacity: containsMouse ? 0.08 : 0
+	property real stateOpacity: containsMouse || manualHoverOverride ? 0.08 : 0
 	property alias topLeftRadius: base.topLeftRadius
 	property alias topRightRadius: base.topRightRadius
 
@@ -52,8 +50,8 @@ MouseArea {
 	}
 
 	anchors.fill: parent
-	cursorShape: disabled ? undefined : Qt.PointingHandCursor
-	enabled: !disabled
+	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
+	enabled: parent.enabled
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -81,7 +79,7 @@ MouseArea {
 
 		alwaysRunToEnd: true
 		duration: Tokens.anim.durations.expressiveSlowEffects * 2
-		easing.bezierCurve: Tokens.anim.curves.standard
+		easing: Tokens.anim.standard
 		property: "circleRadius"
 		target: root
 		to: root.endRadius
@@ -100,13 +98,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

@@ -11,30 +11,13 @@ RowLayout {
 	required property var greeter
 	required property real screenHeight
 
-	spacing: Tokens.spacing.large * 2
-
-	ColumnLayout {
-		Layout.fillWidth: true
-		spacing: Tokens.spacing.normal
+	spacing: Tokens.spacing.largeIncreased * 2
 
 	CustomRect {
-			Layout.fillWidth: true
-			color: Colors.tPalette.m3surfaceContainer
-			implicitHeight: weather.implicitHeight
-			radius: Tokens.rounding.small
-			topLeftRadius: Tokens.rounding.large
-
-			WeatherInfo {
-				id: weather
-
-				rootHeight: root.height
-			}
-		}
-
-		CustomClippingRect {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
-			bottomLeftRadius: Tokens.rounding.large
+		topLeftRadius: Tokens.rounding.largeIncreased
+		bottomLeftRadius: Tokens.rounding.largeIncreased
 		color: Colors.tPalette.m3surfaceContainer
 		radius: Tokens.rounding.small
 
@@ -42,28 +25,22 @@ RowLayout {
 			greeter: root.greeter
 		}
 	}
-	}
 
 	Center {
 		greeter: root.greeter
 		screenHeight: root.screenHeight
 	}
 
-	ColumnLayout {
-		Layout.fillWidth: true
-		spacing: Tokens.spacing.normal
-
 	CustomRect {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
-			bottomRightRadius: Tokens.rounding.large
+		bottomRightRadius: Tokens.rounding.largeIncreased
 		color: Colors.tPalette.m3surfaceContainer
 		radius: Tokens.rounding.small
-			topRightRadius: Tokens.rounding.large
+		topRightRadius: Tokens.rounding.largeIncreased
 
 		SessionDock {
 			greeter: root.greeter
 		}
 	}
 }
-}

Greeter/GreeterSurface.qml

@@ -43,7 +43,7 @@ Scope {
 					ParallelAnimation {
 						Anim {
 							duration: Tokens.anim.durations.expressiveFastSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
+							easing: Tokens.anim.expressiveFastSpatial
 							property: "scale"
 							target: lockContent
 							to: 1
@@ -65,7 +65,7 @@ Scope {
 
 						Anim {
 							duration: Tokens.anim.durations.expressiveDefaultSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+							easing: Tokens.anim.expressiveDefaultSpatial
 							property: "scale"
 							target: content
 							to: 1
@@ -74,12 +74,12 @@ Scope {
 						Anim {
 							property: "radius"
 							target: lockBg
-							to: Tokens.rounding.large * 1.5
+							to: Tokens.rounding.largeIncreased * 1.5
 						}
 
 						Anim {
 							duration: Tokens.anim.durations.expressiveDefaultSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+							easing: Tokens.anim.expressiveDefaultSpatial
 							property: "implicitWidth"
 							target: lockContent
 							to: (win.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio
@@ -87,7 +87,7 @@ Scope {
 
 						Anim {
 							duration: Tokens.anim.durations.expressiveDefaultSpatial
-							easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+							easing: Tokens.anim.expressiveDefaultSpatial
 							property: "implicitHeight"
 							target: lockContent
 							to: (win.screen?.height ?? 0) * Config.lock.sizes.heightMult
@@ -134,8 +134,7 @@ Scope {
 					id: lockIcon
 
 					anchors.centerIn: parent
-					font.bold: true
-					font.pointSize: Tokens.font.size.extraLarge * 4
+					fontStyle: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
 					text: "lock"
 				}
 

Greeter/InputField.qml

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

Greeter/Services/Colors.qml

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

Greeter/SessionDock.qml

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

Greeter/UserDock.qml

@@ -14,22 +14,19 @@ ColumnLayout {
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
-	spacing: Tokens.spacing.smaller
+	spacing: Tokens.spacing.large
 
 	CustomText {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font.family: Config.appearance.font.family.mono
-		font.weight: 500
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
 		text: root.greeter.users.length > 0 ? qsTr("%1 user%2").arg(root.greeter.users.length).arg(root.greeter.users.length === 1 ? "" : "s") : qsTr("Users")
 	}
 
-	CustomClippingRect {
+	Item {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
-		color: "transparent"
-		radius: Tokens.rounding.small
 
 		Loader {
 			active: opacity > 0
@@ -42,22 +39,20 @@ ColumnLayout {
 				}
 			}
 			sourceComponent: ColumnLayout {
-				spacing: Tokens.spacing.large
+				spacing: Tokens.spacing.largeIncreased
 
 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
 					fill: 1
-					font.pointSize: Tokens.font.size.extraLarge * 2
+					fontStyle: Tokens.font.icon.large
 					text: "account_circle"
 				}
 
 				CustomText {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font.family: Config.appearance.font.family.mono
-					font.pointSize: Tokens.font.size.large
-					font.weight: 500
+					font: Tokens.font.headline.builders.small.width(90).build()
 					text: qsTr("No Users Found")
 				}
 			}
@@ -70,6 +65,7 @@ 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
 
@@ -81,8 +77,8 @@ ColumnLayout {
 
 				anchors.left: parent?.left
 				anchors.right: parent?.right
-				implicitHeight: row.implicitHeight + Tokens.padding.normal * 2
-				radius: Tokens.rounding.normal - Tokens.padding.smaller
+				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
+				radius: Tokens.rounding.large
 
 				StateLayer {
 					onClicked: {
@@ -94,10 +90,10 @@ ColumnLayout {
 					id: row
 
 					anchors.fill: parent
-					anchors.margins: Tokens.padding.normal
-					spacing: Tokens.spacing.normal
+					anchors.margins: Tokens.padding.small
+					spacing: Tokens.spacing.medium
 
-					CustomClippingRect {
+					ClipRect {
 						Layout.preferredHeight: 50
 						Layout.preferredWidth: 50
 						radius: Tokens.rounding.full
@@ -106,7 +102,7 @@ ColumnLayout {
 							anchors.centerIn: parent
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
 							fill: 1
-							font.pointSize: Tokens.font.size.extraLarge
+							fontStyle: Tokens.font.icon.extraLarge
 							text: modelData.kind === "x11" ? "tv" : "account_circle"
 						}
 
@@ -124,8 +120,7 @@ ColumnLayout {
 							Layout.fillWidth: true
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 							elide: Text.ElideRight
-							font.pointSize: Tokens.font.size.normal
-							font.weight: 600
+							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
 							text: modelData.username
 						}
 					}
@@ -135,13 +130,13 @@ ColumnLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: users.currentItem?.implicitHeight ?? 0
 				implicitWidth: users.width
-				radius: Tokens.rounding.normal - Tokens.padding.smaller
+				radius: Tokens.rounding.large
 				y: users.currentItem?.y ?? 0
 
 				Behavior on y {
 					Anim {
-						duration: Tokens.anim.durations.small
-						easing.bezierCurve: Tokens.anim.curves.expressiveEffects
+						duration: Tokens.anim.durations.expressiveDefaultEffects
+						easing: Tokens.anim.expressiveDefaultEffects
 					}
 				}
 			}

Greeter/WeatherInfo.qml

@@ -1,170 +0,0 @@
-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.large
-
-		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.smaller
-			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.smaller
-		active: root.rootHeight > 820
-		visible: active
-
-		sourceComponent: RowLayout {
-			spacing: Tokens.spacing.large
-
-			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);
-
-					return forecast.slice(0, 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/AreaPicker.qml

@@ -1,88 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Io
-import Quickshell.Hyprland
-import ZShell
-import qs.Components
-
-Scope {
-	LazyLoader {
-		id: root
-
-		property bool closing
-		property bool freeze
-
-		Variants {
-			model: Quickshell.screens
-
-			PanelWindow {
-				id: win
-
-				required property ShellScreen modelData
-
-				WlrLayershell.exclusionMode: ExclusionMode.Ignore
-				WlrLayershell.keyboardFocus: root.closing ? WlrKeyboardFocus.None : WlrKeyboardFocus.Exclusive
-				WlrLayershell.layer: WlrLayer.Overlay
-				WlrLayershell.namespace: "areapicker"
-				color: "transparent"
-				mask: root.closing ? empty : null
-				screen: modelData
-
-				anchors {
-					bottom: true
-					left: true
-					right: true
-					top: true
-				}
-
-				Region {
-					id: empty
-
-				}
-
-				Picker {
-					loader: root
-					screen: win.modelData
-				}
-			}
-		}
-	}
-
-	IpcHandler {
-		function open(): void {
-			root.freeze = false;
-			root.closing = false;
-			root.activeAsync = true;
-		}
-
-		function openFreeze(): void {
-			root.freeze = true;
-			root.closing = false;
-			root.activeAsync = true;
-		}
-
-		target: "picker"
-	}
-
-	CustomShortcut {
-		name: "screenshot"
-
-		onPressed: {
-			root.freeze = false;
-			root.closing = false;
-			root.activeAsync = true;
-		}
-	}
-
-	CustomShortcut {
-		name: "screenshotFreeze"
-
-		onPressed: {
-			root.freeze = true;
-			root.closing = false;
-			root.activeAsync = true;
-		}
-	}
-}

Helpers/Battery.qml

@@ -1,35 +1,63 @@
 pragma Singleton
 
 import Quickshell
+import Quickshell.Io
 import Quickshell.Services.UPower
 import ZShell.Config
 import qs.Services
+import qs.Paths
 
 Singleton {
 	id: root
 
-	readonly property var colors: {
-		if (deviceState === UPowerDeviceState.Charging || deviceState === UPowerDeviceState.FullyCharged)
+	readonly property list<var> allPeripherals: [...logiDevices, ...upowerDevices.filter(d => !Battery.logiDevices.some(l => l.nativePath === d.nativePath))]
+	readonly property real currentPerc: UPower.displayDevice.percentage
+	readonly property var deviceState: UPower.displayDevice.state
+	readonly property string deviceStateString: UPowerDeviceState.toString(deviceState)
+	readonly property bool isLaptop: UPower.displayDevice.isLaptopBattery
+	readonly property alias logiDevices: adapter.devices
+	readonly property var lowestPeripheral: allPeripherals.reduce((lowest, current) => current.percentage < lowest.percentage ? current : lowest)
+	readonly property bool onBattery: UPower.onBattery
+	readonly property bool ready: UPower.displayDevice.ready
+	readonly property real timeToEmpty: UPower.displayDevice.timeToEmpty
+	readonly property real timeToFull: UPower.displayDevice.timeToFull
+	readonly property list<UPowerDevice> upowerDevices: UPower.devices.values.filter(d => d.state !== UPowerDeviceState.Unknown)
+
+	function getColors(percentage: real, state: string): var {
+		if (state === "charging" || state === "full" || state === "recharging")
 			return {
 				fg: Colors.swapRG(Colors.palette.m3error),
 				bg: Colors.swapRG(Colors.palette.m3onError)
 			};
-		else if (currentPerc <= 0.2)
+		else if (percentage <= 0.2)
 			return {
 				fg: Colors.palette.m3error,
 				bg: Colors.palette.m3onError
 			};
 		else
 			return {
-				fg: Colors.palette.m3onSurface,
-				bg: Colors.palette.m3surface
+				fg: Colors.palette.m3tertiary,
+				bg: Colors.palette.m3onTertiary
 			};
 	}
-	readonly property real currentPerc: UPower.displayDevice.percentage
-	readonly property var deviceState: UPower.displayDevice.state
-	readonly property bool isLaptop: UPower.displayDevice.isLaptopBattery
-	readonly property bool onBattery: UPower.onBattery
-	readonly property bool ready: UPower.displayDevice.ready
-	readonly property real timeToEmpty: UPower.displayDevice.timeToEmpty
-	readonly property real timeToFull: UPower.displayDevice.timeToFull
+
+	function startDaemon(): void {
+		Quickshell.execDetached(["zshell-cli", "battery", "daemon"]);
+	}
+
+	FileView {
+		id: fileView
+
+		path: `${Paths.cache}/battery.json`
+		watchChanges: true
+
+		onFileChanged: reload()
+
+		JsonAdapter {
+			id: adapter
+
+			property list<var> devices: []
+			property real updated: 0.0
+		}
+	}
 }

Helpers/DockApps.qml

@@ -1,70 +0,0 @@
-pragma Singleton
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Components
-import ZShell.Config
-
-Singleton {
-	id: root
-
-	property list<var> apps: {
-		var map = new Map();
-
-		const pinnedApps = Config.dock?.pinnedApps ?? [];
-		for (const appId of pinnedApps) {
-			if (!map.has(appId.toLowerCase()))
-				map.set(appId.toLowerCase(), ({
-						pinned: true,
-						toplevels: []
-					}));
-		}
-
-		if (pinnedApps.length > 0) {
-			map.set("SEPARATOR", {
-				pinned: false,
-				toplevels: []
-			});
-		}
-
-		var values = [];
-
-		for (const [key, value] of map) {
-			values.push(appEntryComp.createObject(null, {
-				appId: key,
-				toplevels: value.toplevels,
-				pinned: value.pinned
-			}));
-		}
-
-		return values;
-	}
-
-	function isPinned(appId) {
-		return Config.dock.pinnedApps.indexOf(appId) !== -1;
-	}
-
-	function togglePin(appId) {
-		if (root.isPinned(appId)) {
-			Config.dock.pinnedApps = Config.dock.pinnedApps.filter(id => id !== appId);
-		} else {
-			Config.dock.pinnedApps = Config.dock.pinnedApps.concat([appId]);
-		}
-	}
-
-	Component {
-		id: appEntryComp
-
-		TaskbarAppEntry {
-		}
-	}
-
-	component TaskbarAppEntry: QtObject {
-		id: wrapper
-
-		required property string appId
-		required property bool pinned
-		required property list<var> toplevels
-	}
-}

Helpers/FetchPresets.qml

@@ -1,63 +0,0 @@
-// FetchPresets.qml
-pragma Singleton
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-	id: root
-
-	property var parsedPresets: ({})
-	readonly property var presets: parsedPresets
-	property bool ready: false
-
-	function accents(presetName, variantName) {
-		const variant = parsedPresets[presetName]?.variants?.[variantName];
-
-		return variant?.accents ?? [];
-	}
-
-	function defaultAccent(presetName, variantName) {
-		const variant = parsedPresets[presetName]?.variants?.[variantName];
-
-		return variant?.default_accent ?? "";
-	}
-
-	function modes(presetName, variantName) {
-		const variant = parsedPresets[presetName]?.variants?.[variantName];
-
-		return variant?.modes ?? [];
-	}
-
-	function presetNames() {
-		return Object.keys(parsedPresets);
-	}
-
-	function variantNames(presetName) {
-		const preset = parsedPresets[presetName];
-
-		if (!preset || !preset.variants)
-			return [];
-
-		return Object.keys(preset.variants);
-	}
-
-	Process {
-		command: ["zshell-cli", "scheme", "list-presets", "--json"]
-		running: true
-
-		stdout: StdioCollector {
-			onStreamFinished: {
-				try {
-					const parsed = JSON.parse(text);
-
-					root.parsedPresets = parsed.presets ?? {};
-					root.ready = true;
-				} catch (e) {
-					console.error("Failed to parse presets JSON:", e);
-				}
-			}
-		}
-	}
-}

Helpers/Hyprsunset.qml

@@ -1,37 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import QtQuick
-import ZShell.Services
-import ZShell.Config
-
-Singleton {
-	id: root
-
-	readonly property bool enabled: service.enabled
-	readonly property int end: Config.general.color.scheduleHyprsunsetEnd
-	property bool manualToggle: false
-	readonly property int start: Config.general.color.scheduleHyprsunsetStart
-	readonly property int temp: Config.general.color.hyprsunsetTemp
-
-	function checkStartup(): void {
-		if (!Config.general.color.scheduleHyprsunset)
-			return;
-
-		service.apply();
-	}
-
-	function toggleNightLight(): void {
-		service.manualToggle = true;
-		service.toggle();
-	}
-
-	HyprsunsetManager {
-		id: service
-
-		activeAuto: Config.general.color.scheduleHyprsunset
-		endTime: root.end
-		startTime: root.start
-		temp: root.temp
-	}
-}

Helpers/ModeScheduler.qml

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

Helpers/NetworkUsage.qml

@@ -1,242 +0,0 @@
-pragma Singleton
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import ZShell.Internal
-import ZShell.Config
-
-Singleton {
-	id: root
-
-	property real _downloadSpeed: 0
-	property real _downloadTotal: 0
-
-	property real _initialRxBytes: 0
-	property real _initialTxBytes: 0
-	property bool _initialized: false
-
-	property real _prevRxBytes: 0
-	property real _prevTimestamp: 0
-	property real _prevTxBytes: 0
-	property real _uploadSpeed: 0
-	property real _uploadTotal: 0
-
-	readonly property CircularBuffer downloadBuffer: _downloadBuffer
-
-	readonly property real downloadSpeed: _downloadSpeed
-
-	readonly property real downloadTotal: _downloadTotal
-	readonly property int historyLength: Config.dashboard.performance.showVram ? 70 : 30
-	property int refCount: 0
-	readonly property CircularBuffer uploadBuffer: _uploadBuffer
-	readonly property real uploadSpeed: _uploadSpeed
-	readonly property real uploadTotal: _uploadTotal
-
-function resetSampling(): void {
-	netDevFile.reload();
-
-	const content = netDevFile.text();
-	if (!content)
-		return;
-
-	const data = root.parseNetDev(content);
-	const now = Date.now();
-
-	root._prevRxBytes = data.rx;
-	root._prevTxBytes = data.tx;
-	root._prevTimestamp = now;
-}
-
-	function formatBytes(bytes: real): var {
-		// Handle negative or invalid values
-		if (bytes < 0 || isNaN(bytes) || !isFinite(bytes)) {
-			return {
-				value: 0,
-				unit: "B/s"
-			};
-		}
-
-		if (bytes < 1024) {
-			return {
-				value: bytes,
-				unit: "B/s"
-			};
-		} else if (bytes < 1024 * 1024) {
-			return {
-				value: bytes / 1024,
-				unit: "KB/s"
-			};
-		} else if (bytes < 1024 * 1024 * 1024) {
-			return {
-				value: bytes / (1024 * 1024),
-				unit: "MB/s"
-			};
-		} else {
-			return {
-				value: bytes / (1024 * 1024 * 1024),
-				unit: "GB/s"
-			};
-		}
-	}
-
-	function formatBytesTotal(bytes: real): var {
-		// Handle negative or invalid values
-		if (bytes < 0 || isNaN(bytes) || !isFinite(bytes)) {
-			return {
-				value: 0,
-				unit: "B"
-			};
-		}
-
-		if (bytes < 1024) {
-			return {
-				value: bytes,
-				unit: "B"
-			};
-		} else if (bytes < 1024 * 1024) {
-			return {
-				value: bytes / 1024,
-				unit: "KB"
-			};
-		} else if (bytes < 1024 * 1024 * 1024) {
-			return {
-				value: bytes / (1024 * 1024),
-				unit: "MB"
-			};
-		} else {
-			return {
-				value: bytes / (1024 * 1024 * 1024),
-				unit: "GB"
-			};
-		}
-	}
-
-	function parseNetDev(content: string): var {
-		const lines = content.split("\n");
-		let totalRx = 0;
-		let totalTx = 0;
-
-		for (let i = 2; i < lines.length; i++) {
-			const line = lines[i].trim();
-			if (!line)
-				continue;
-
-			const parts = line.split(/\s+/);
-			if (parts.length < 10)
-				continue;
-
-			const iface = parts[0].replace(":", "");
-			// Skip loopback interface
-			if (iface === "lo")
-				continue;
-
-			const rxBytes = parseFloat(parts[1]) || 0;
-			const txBytes = parseFloat(parts[9]) || 0;
-
-			totalRx += rxBytes;
-			totalTx += txBytes;
-		}
-
-		return {
-			rx: totalRx,
-			tx: totalTx
-		};
-	}
-
-	CircularBuffer {
-		id: _downloadBuffer
-
-		capacity: root.historyLength + 1
-	}
-
-	CircularBuffer {
-		id: _uploadBuffer
-
-		capacity: root.historyLength + 1
-	}
-
-	FileView {
-		id: netDevFile
-
-		path: "/proc/net/dev"
-	}
-
-	Timer {
-		interval: Config.dashboard.resourceUpdateInterval
-		repeat: true
-		running: true
-		triggeredOnStart: true
-
-		onTriggered: {
-			if (root.refCount <= 0) {
-				root.resetSampling();
-				return;
-			}
-
-			netDevFile.reload();
-			const content = netDevFile.text();
-			if (!content)
-				return;
-
-			const data = root.parseNetDev(content);
-			const now = Date.now();
-
-			if (!root._initialized) {
-				root._initialRxBytes = data.rx;
-				root._initialTxBytes = data.tx;
-				root._prevRxBytes = data.rx;
-				root._prevTxBytes = data.tx;
-				root._prevTimestamp = now;
-				root._initialized = true;
-				return;
-			}
-
-			const timeDelta = (now - root._prevTimestamp) / 1000; // seconds
-			if (timeDelta > 0) {
-				// Calculate byte deltas
-				let rxDelta = data.rx - root._prevRxBytes;
-				let txDelta = data.tx - root._prevTxBytes;
-
-				// Handle counter overflow (when counters wrap around from max to 0)
-				// This happens when counters exceed 32-bit or 64-bit limits
-				if (rxDelta < 0) {
-					// Counter wrapped around - assume 64-bit counter
-					rxDelta += Math.pow(2, 64);
-				}
-				if (txDelta < 0) {
-					txDelta += Math.pow(2, 64);
-				}
-
-				// Calculate speeds
-				root._downloadSpeed = rxDelta / timeDelta;
-				root._uploadSpeed = txDelta / timeDelta;
-
-				if (root._downloadSpeed >= 0 && isFinite(root._downloadSpeed))
-					_downloadBuffer.push(root._downloadSpeed);
-
-				if (root._uploadSpeed >= 0 && isFinite(root._uploadSpeed))
-					_uploadBuffer.push(root._uploadSpeed);
-			}
-
-			// Calculate totals with overflow handling
-			let downTotal = data.rx - root._initialRxBytes;
-			let upTotal = data.tx - root._initialTxBytes;
-
-			// Handle counter overflow for totals
-			if (downTotal < 0) {
-				downTotal += Math.pow(2, 64);
-			}
-			if (upTotal < 0) {
-				upTotal += Math.pow(2, 64);
-			}
-
-			root._downloadTotal = downTotal;
-			root._uploadTotal = upTotal;
-
-			root._prevRxBytes = data.rx;
-			root._prevTxBytes = data.tx;
-			root._prevTimestamp = now;
-		}
-	}
-}

Helpers/Nightlight.qml

@@ -0,0 +1,39 @@
+pragma Singleton
+
+import Quickshell
+import QtQuick
+import ZShell.Services
+import ZShell.Config
+
+Singleton {
+	id: root
+
+	readonly property bool enabled: service.enabled
+	readonly property int end: Config.display.nightlight.scheduleEnd
+	property bool manualToggle: false
+	readonly property int start: Config.display.nightlight.scheduleStart
+	readonly property int temp: Config.display.nightlight.temp
+
+	function checkStartup(): void {
+		if (!Config.display.nightlight.schedule)
+			return;
+
+		service.apply();
+	}
+
+	function toggleNightLight(): void {
+		service.manualToggle = true;
+		service.toggle(true);
+	}
+
+	NightlightManager {
+		id: service
+
+		activeAuto: Config.display.nightlight.schedule
+		endTime: root.end
+		startTime: root.start
+		temp: root.temp
+		fadeDuration: Config.display.nightlight.fadeDuration / 1000
+		useNativeNightlight: Config.display.nightlight.useNative
+	}
+}

Helpers/Picker.qml

@@ -41,8 +41,9 @@ Item {
 	property real rsy: Math.min(sy, ey)
 	readonly property real scaleRatio: Hypr.monitorFor(screen).scale
 	required property ShellScreen screen
+	required property ScreenState screenState
 	property real sh: Math.abs(sy - ey)
-	readonly property color shadowColor: Hypr.options.decoration.shadow.color
+	readonly property color shadowColor: Hypr.options.decoration.shadow?.color ?? "black"
 	readonly property bool shadowEnabled: Hypr.options.decoration.shadow.enabled
 	readonly property var shadowOffset: Hypr.options.decoration.shadow.offset
 	readonly property int shadowRange: Hypr.options.decoration.shadow.range
@@ -97,10 +98,6 @@ Item {
 		const args = Config.screenshot.mode === "auto" ? ["--rounding", `${rounding}`, "--radius", root.cornerRadius, "--shadow", root.shadowEnabled, "--shadow-blur", `${shadow_blur}`, "--shadow-color", `${r},${g},${b},${a}`, "--shadow-offset-x", root.shadowOffset[0], "--shadow-offset-y", root.shadowOffset[1]] : [];
 		const postCmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--scale", root.scaleRatio, ...args, "--image"] : null;
 
-		overlay.visible = border.visible = false;
-		handles.visible = false;
-		toolbar.visible = false;
-
 		ZShellIo.saveItem(captureLayer, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => {
 			const finalize = finalPath => {
 				if (copyToClipboard) {
@@ -126,39 +123,35 @@ Item {
 	focus: true
 	opacity: 0
 
+	Behavior on rsx {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		Anim {}
+	}
+	Behavior on rsy {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		Anim {}
+	}
+	Behavior on sh {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		Anim {}
+	}
+	Behavior on sw {
+		enabled: !selectArea.pressed && root.mode === "select"
+
+		Anim {}
+	}
 	Behavior on opacity {
 		Anim {
 			duration: 300
 		}
 	}
-	Behavior on rsx {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		ExAnim {
-		}
-	}
-	Behavior on rsy {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		ExAnim {
-		}
-	}
-	Behavior on sh {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		ExAnim {
-		}
-	}
-	Behavior on sw {
-		enabled: !selectArea.pressed && root.mode === "select"
-
-		ExAnim {
-		}
-	}
 
 	Component.onCompleted: {
 		Hypr.extras.refreshOptions();
-		screencopy.active = true;
+		root.forceActiveFocus();
 
 		opacity = 1;
 
@@ -223,13 +216,63 @@ Item {
 		onReleased: root.enterEditMode()
 	}
 
+	Connections {
+		function onClosingChanged(): void {
+			if (root.loader.closing)
+				closeAnim.start();
+			else {
+				closeAnim.stop();
+				returnAnim.start();
+			}
+		}
+
+		target: root.loader
+	}
+
+	ParallelAnimation {
+		id: returnAnim
+
+		Anim {
+			duration: 300
+			property: "opacity"
+			target: root
+			to: 1
+		}
+
+		Anim {
+			property: "rsx"
+			target: root
+			to: Math.min(root.sx, root.ex)
+		}
+
+		Anim {
+			property: "rsy"
+			target: root
+			to: Math.min(root.sy, root.ey)
+		}
+
+		Anim {
+			property: "sw"
+			target: root
+			to: Math.abs(root.sx - root.ex)
+		}
+
+		Anim {
+			property: "sh"
+			target: root
+			to: Math.abs(root.sy - root.ey)
+		}
+	}
+
 	SequentialAnimation {
 		id: closeAnim
 
-		PropertyAction {
-			property: "closing"
-			target: root.loader
-			value: true
+		ScriptAction {
+			script: {
+				const states = ShellState.allStates();
+				for (const s of states)
+					s.screenshot = false;
+			}
 		}
 
 		ParallelAnimation {
@@ -240,19 +283,19 @@ Item {
 				to: 0
 			}
 
-			ExAnim {
+			Anim {
 				properties: "rsx,rsy"
 				target: root
 				to: 0
 			}
 
-			ExAnim {
+			Anim {
 				property: "sw"
 				target: root
 				to: root.screen.width
 			}
 
-			ExAnim {
+			Anim {
 				property: "sh"
 				target: root
 				to: root.screen.height
@@ -271,18 +314,13 @@ Item {
 
 		anchors.fill: parent
 
-		Loader {
+		ScreencopyView {
 			id: screencopy
 
-			active: false
 			anchors.fill: parent
-			asynchronous: true
-
-			sourceComponent: ScreencopyView {
 			captureSource: root.screen
 			paintCursor: false
 		}
-		}
 
 		AnnotationCanvas {
 			id: annotations
@@ -290,6 +328,7 @@ Item {
 			anchors.fill: parent
 			inkColor: root.inkColor
 			layer.enabled: true
+			selection: selectionRect
 			tool: root.mode === "edit" && root.tool !== "move" ? root.tool : "none"
 
 			layer.effect: MultiEffect {
@@ -301,15 +340,14 @@ Item {
 		}
 	}
 
-	Rectangle {
+	CustomRect {
 		id: overlay
 
 		anchors.fill: parent
 		color: "white"
 		layer.enabled: true
 		opacity: 0.3
-		radius: root.realRounding
-		visible: screencopy.item?.hasContent ?? false
+		visible: screencopy.hasContent
 
 		layer.effect: MultiEffect {
 			maskEnabled: true
@@ -338,39 +376,44 @@ Item {
 		}
 	}
 
-	Rectangle {
+	CustomRect {
 		id: border
 
 		border.color: Colors.palette.m3primary
 		border.width: root.realBorderWidth
-		color: "transparent"
 		implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
 		implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
 		radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
-		visible: screencopy.item?.hasContent ?? false
+		visible: screencopy.hasContent
 		x: selectionRect.x - root.realBorderWidth
 		y: selectionRect.y - root.realBorderWidth
 
 		Behavior on border.color {
-			Anim {
-			}
+			Anim {}
 		}
 	}
 
 	SelectionHandles {
 		id: handles
 
+		border: root.realBorderWidth
 		selH: root.sh
 		selW: root.sw
 		selX: root.rsx
 		selY: root.rsy
+		selection: selectionRect
+		tool: root.tool
 		visible: root.mode === "edit" && root.tool === "move"
 
 		onBoundsChanged: (x, y, w, h) => {
-			root.sx = x;
-			root.sy = y;
-			root.ex = x + w;
-			root.ey = y + h;
+			let nx = Math.max(0, x);
+			let ny = Math.max(0, y);
+			let nw = Math.min(w, root.screen.width - nx);
+			let nh = Math.min(h, root.screen.height - ny);
+			root.sx = nx;
+			root.sy = ny;
+			root.ex = nx + nw;
+			root.ey = ny + nh;
 		}
 		onMoveBy: (dx, dy) => {
 			const w = root.sw, h = root.sh;
@@ -391,7 +434,7 @@ Item {
 		tool: root.tool
 		visible: root.mode === "edit"
 		x: Math.max(8, Math.min(root.rsx + root.sw / 2 - width / 2, root.screen.width - width - 8))
-		y: (root.rsy + root.sh + height + Tokens.padding.normal <= root.screen.height) ? root.rsy + root.sh + Tokens.padding.normal : (root.rsy - height - Tokens.padding.normal <= 0) ? root.rsy + root.sh - height - Tokens.padding.normal : root.rsy - height - Tokens.padding.normal
+		y: (root.rsy + root.sh + height + Tokens.padding.small <= root.screen.height) ? root.rsy + root.sh + Tokens.padding.small : (root.rsy - height - Tokens.padding.small <= 0) ? root.rsy + root.sh - height - Tokens.padding.small : root.rsy - height - Tokens.padding.small
 
 		onCancelRequested: root.cancel()
 		onClearRequested: annotations.clearAll()
@@ -401,7 +444,4 @@ Item {
 		onToolSelected: t => root.tool = t
 		onUndoRequested: annotations.undo()
 	}
-
-	component ExAnim: Anim {
-	}
 }

Helpers/Picker/AnnotationCanvas.qml

@@ -8,13 +8,13 @@ Item {
 
 	property color inkColor: "#ff3b30"
 	property real inkWidth: 4
+	required property Rectangle selection
 	property string tool: "none"
 
 	signal changed
 
 	function clearAll() {
-		committedCanvas.clear();
-		previewCanvas.clear();
+		canvas.clear();
 		changed();
 	}
 
@@ -54,90 +54,85 @@ Item {
 	}
 
 	function undo() {
-		committedCanvas.undoLastGroup();
+		canvas.undoLastGroup();
 		changed();
 	}
 
 	anchors.fill: parent
+	enabled: tool !== "none"
 
 	StrokeCanvas {
-		id: committedCanvas
+		id: canvas
 
 		anchors.fill: parent
 		penColor: root.inkColor
 		penWidth: root.inkWidth
 	}
 
-	StrokeCanvas {
-		id: previewCanvas
-
-		anchors.fill: parent
-		penColor: root.inkColor
-		penWidth: root.inkWidth
-	}
-
-	PointHandler {
+	MouseArea {
 		id: drawHandler
 
 		property real startX
 		property real startY
-		property bool started: false
 
 		acceptedButtons: Qt.LeftButton | Qt.RightButton
-		enabled: root.tool !== "none"
+		anchors.fill: parent
+		cursorShape: undefined
+		enabled: root.enabled
 
-		onActiveChanged: {
-			if (active)
+		onPositionChanged: e => {
+			const x = e.x;
+			const y = e.y;
+
+			if (!pressed)
 				return;
 
 			if (root.tool === "pen") {
-				committedCanvas.endStroke();
-			} else if (started) {
-				const pts = root.sampleShape(root.tool, startX, startY, point.position.x, point.position.y);
-				if (pts.length > 0) {
-					committedCanvas.beginStroke(pts[0][0], pts[0][1], true);
-					for (let i = 1; i < pts.length; i++)
-						committedCanvas.appendPoint(pts[i][0], pts[i][1]);
-					committedCanvas.endStroke();
-				}
-				previewCanvas.clear();
-			}
-			started = false;
-			root.changed();
-		}
-		onPointChanged: {
-			if (!active)
+				canvas.appendPoint(x, y);
 				return;
+			}
 
-			if (point.pressedButtons & Qt.RightButton) {
-				root.clearAll();
-				return;
+			const pts = root.sampleShape(root.tool, startX, startY, x, y);
+			if (pts.length > 0) {
+				canvas.beginStroke(pts[0][0], pts[0][1], true);
+				for (let i = 1; i < pts.length; i++)
+					canvas.appendPoint(pts[i][0], pts[i][1]);
 			}
+		}
+		onPressed: e => {
+			if (e.button & Qt.LeftButton) {
+				startX = e.x;
+				startY = e.y;
+				canvas.beginStroke(e.x, e.y);
+			} else if (e.button & Qt.RightButton) {
+				root.clearAll();
+			}
+		}
+		onPressedChanged: if (!pressed)
+			canvas.endStroke()
+	}
+
+	HoverHandler {
+		cursorShape: {
+			if (root.tool === "none")
+				return undefined;
 
 			const x = point.position.x;
 			const y = point.position.y;
+			const withinXWidth = x > root.selection.x && x < root.selection.x + root.selection.implicitWidth;
+			const withinYHeight = y > root.selection.y && y < root.selection.y + root.selection.implicitHeight;
 
-			if (root.tool === "pen") {
-				if (!started) {
-					started = true;
-					committedCanvas.beginStroke(x, y);
-					return;
-				}
-				committedCanvas.appendPoint(x, y);
-				return;
-			}
-
-			if (!started) {
-				started = true;
-				startX = point.pressPosition.x;
-				startY = point.pressPosition.y;
-			}
-			const pts = root.sampleShape(root.tool, startX, startY, x, y);
-			if (pts.length > 0) {
-				previewCanvas.beginStroke(pts[0][0], pts[0][1], true);
-				for (let i = 1; i < pts.length; i++)
-					previewCanvas.appendPoint(pts[i][0], pts[i][1]);
+			if (withinXWidth && withinYHeight) {
+				if (!drawHandler.pressed)
+					canvas.showHover(x, y);
+				else
+					canvas.showHover(drawHandler.mouseX, drawHandler.mouseY);
+				return Qt.BlankCursor;
+			} else {
+				canvas.hideHover();
+				return undefined;
 			}
 		}
+		enabled: root.enabled
 	}
 }

Helpers/Picker/AnnotationToolbar.qml

@@ -49,9 +49,9 @@ CustomRect {
 	signal undoRequested
 
 	color: Colors.palette.m3surface
-	height: row.implicitHeight + Tokens.padding.normal * 2
+	height: row.implicitHeight + Tokens.padding.small * 2
 	radius: Tokens.rounding.full
-	width: row.implicitWidth + Tokens.padding.normal * 2
+	width: row.implicitWidth + Tokens.padding.small * 2
 
 	RowLayout {
 		id: row
@@ -73,6 +73,7 @@ CustomRect {
 					required property var modelData
 
 					color: root.tool === modelData.id ? "#3584e4" : "transparent"
+					font: Tokens.font.icon.medium
 					icon: tool.modelData.glyph
 					inactiveColor: root.tool === modelData.id ? Colors.palette.m3primary : "transparent"
 					inactiveOnColor: root.tool === modelData.id ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
@@ -98,11 +99,11 @@ CustomRect {
 				model: root.colorPalette
 
 				delegate: IconButton {
-					readonly property real buttonSize: toolRow.implicitHeight - Tokens.padding.normal
+					readonly property real buttonSize: toolRow.implicitHeight - Tokens.padding.small
 					required property color modelData
 
 					fillWidth: false
-					font.pointSize: 0
+					font: Tokens.font.icon.medium
 					icon: ""
 					implicitHeight: buttonSize
 					implicitWidth: buttonSize
@@ -127,6 +128,7 @@ CustomRect {
 			spacing: Tokens.spacing.extraSmall
 
 			IconButton {
+				font: Tokens.font.icon.medium
 				icon: "undo"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -138,6 +140,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font: Tokens.font.icon.medium
 				icon: "delete_history"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -149,6 +152,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font: Tokens.font.icon.medium
 				icon: "content_copy"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -160,6 +164,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font: Tokens.font.icon.medium
 				icon: "delete_forever"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface
@@ -171,6 +176,7 @@ CustomRect {
 			}
 
 			IconButton {
+				font: Tokens.font.icon.medium
 				icon: "check"
 				inactiveColor: "transparent"
 				inactiveOnColor: Colors.palette.m3onSurface

Helpers/Picker/SelectionHandles.qml

@@ -1,18 +1,23 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import ZShell.Internal
+import qs.Services
 
 Item {
 	id: root
 
-	property color handleBorder: "#3584e4"
-	property color handleFill: "white"
+	required property int border
+	property color handleBorder: Colors.palette.m3primary
+	property color handleFill: Colors.palette.m3onPrimary
 	property real hs: 12
 	property real minSize: 24
 	required property real selH
 	required property real selW
 	required property real selX
 	required property real selY
+	required property Rectangle selection
+	required property string tool
 
 	signal boundsChanged(x: real, y: real, w: real, h: real)
 	signal dragFinished
@@ -23,12 +28,16 @@ Item {
 	x: selX
 	y: selY
 
+	Component.onDestruction: Cursor.clearOverride()
+
 	DragHandler {
 		id: moveHandler
 
 		property real accumX: 0
 		property real accumY: 0
 
+		cursorShape: undefined
+		dragThreshold: 0
 		target: null
 
 		onActiveChanged: {
@@ -45,51 +54,63 @@ Item {
 		}
 	}
 
+	HoverHandler {
+		cursorShape: {
+			if (root.tool !== "move")
+				return undefined;
+
+			if ((moveHandler.centroid.pressedButtons & Qt.LeftButton) && moveHandler.active)
+				return Qt.ClosedHandCursor;
+			else
+				return Qt.OpenHandCursor;
+		}
+	}
+
 	Handle {
 		edge: "tl"
-		x: -root.hs / 2
-		y: -root.hs / 2
+		x: -(root.hs + root.border) / 2
+		y: -(root.hs + root.border) / 2
 	}
 
 	Handle {
 		edge: "t"
 		x: root.width / 2 - root.hs / 2
-		y: -root.hs / 2
+		y: -(root.hs + root.border) / 2
 	}
 
 	Handle {
 		edge: "tr"
-		x: root.width - root.hs / 2
-		y: -root.hs / 2
+		x: root.width - root.hs / 2 + root.border / 2
+		y: -(root.hs + root.border) / 2
 	}
 
 	Handle {
 		edge: "r"
-		x: root.width - root.hs / 2
+		x: root.width - root.hs / 2 + root.border / 2
 		y: root.height / 2 - root.hs / 2
 	}
 
 	Handle {
 		edge: "br"
-		x: root.width - root.hs / 2
-		y: root.height - root.hs / 2
+		x: root.width - root.hs / 2 + root.border / 2
+		y: root.height - root.hs / 2 + root.border / 2
 	}
 
 	Handle {
 		edge: "b"
 		x: root.width / 2 - root.hs / 2
-		y: root.height - root.hs / 2
+		y: root.height - root.hs / 2 + root.border / 2
 	}
 
 	Handle {
 		edge: "bl"
-		x: -root.hs / 2
-		y: root.height - root.hs / 2
+		x: -(root.hs + root.border) / 2
+		y: root.height - root.hs / 2 + root.border / 2
 	}
 
 	Handle {
 		edge: "l"
-		x: -root.hs / 2
+		x: -(root.hs + root.border) / 2
 		y: root.height / 2 - root.hs / 2
 	}
 
@@ -107,6 +128,8 @@ Item {
 		z: 10
 
 		HoverHandler {
+			id: hover
+
 			cursorShape: {
 				switch (handle.edge) {
 				case "tl":
@@ -132,6 +155,7 @@ Item {
 			property real startX
 			property real startY
 
+			dragThreshold: 0
 			grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.TakeOverForbidden
 			target: null
 
@@ -141,8 +165,10 @@ Item {
 					startY = root.y;
 					startW = root.width;
 					startH = root.height;
+					Cursor.setOverride(hover.cursorShape);
 				} else {
 					root.dragFinished();
+					Cursor.clearOverride();
 				}
 			}
 			onTranslationChanged: {

Helpers/Strings.qml

@@ -5,6 +5,15 @@ import Quickshell
 Singleton {
 	property var _regexCache: ({})
 
+	function percent(value: int): string {
+		// TRANSLATORS: %1 = a number
+		return qsTr("%1%").arg(value);
+	}
+
+	function percentOne(value: real): string {
+		return percent(Math.round(value * 100));
+	}
+
 	function testRegexList(filterList: list<string>, target: string): bool {
 		const regexChecker = /^\^.*\$$/;
 		for (const filter of filterList) {

Helpers/Updates.qml

@@ -11,8 +11,8 @@ Singleton {
 	id: root
 
 	property int availableUpdates: 0
-	property string cmd: ""
 	property bool commandReady
+	property bool hasHelper
 	property bool loaded
 	property double now: Date.now()
 	property var updates: ({})
@@ -38,18 +38,12 @@ Singleton {
 	}
 
 	function performPackageUpdate(pkg: string): void {
-		if (root.cmd === "pacman")
-			pkgUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Sy", pkg];
-		else
-			pkgUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Sy", pkg];
+		pkgUpdateProc.command = ["pkexec", "pacman", "--noconfirm", "-Sy", pkg];
 		pkgUpdateProc.running = true;
 	}
 
 	function performSystemUpdate(): void {
-		if (root.cmd === "pacman")
-			sysUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Syu"];
-		else
-			sysUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Syu"];
+		sysUpdateProc.command = ["pkexec", "pacman", "--noconfirm", "-Syu"];
 		sysUpdateProc.running = true;
 	}
 
@@ -87,7 +81,7 @@ Singleton {
 	Process {
 		id: cmdDetect
 
-		command: ["sh", "-c", "command -v checkupdates || command -v yay || command -v paru"]
+		command: ["sh", "-c", "command -v checkupdates"]
 		running: true
 
 		stdout: StdioCollector {
@@ -96,47 +90,20 @@ Singleton {
 				let helper;
 
 				if (cmd.length > 0) {
-					helper = cmd.split("/").pop();
+					helper = true;
 				} else {
-					helper = "pacman";
-				}
-
-				if (helper === "checkupdates") {
-					updatesProc.command = [helper];
-				} else {
-					updatesProc.command = [helper, "-Qu"];
+					helper = false;
 				}
+				root.hasHelper = helper;
 				root.commandReady = true;
 			}
 		}
 	}
 
-	Process {
-		id: updateCmdDetect
-
-		command: ["sh", "-c", "command -v yay || command -v paru"]
-		running: true
-
-		stdout: StdioCollector {
-			onStreamFinished: {
-				const cmd = this.text.trim();
-				let helper;
-
-				if (cmd.length > 0) {
-					helper = cmd.split("/").pop();
-				} else {
-					helper = "pacman";
-				}
-
-				root.cmd = helper;
-			}
-		}
-	}
-
 	Process {
 		id: updatesProc
 
-		command: []
+		command: root.hasHelper ? ["checkupdates"] : []
 		running: false
 
 		stdout: StdioCollector {