Merge branch 'main' into clang-tidy-fixes

.clang-format

@@ -1,15 +1,15 @@
 ---
 BasedOnStyle: LLVM
 AccessModifierOffset: 0
-AlignAfterOpenBracket: AlwaysBreak
+AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignOperands: Align
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortIfStatementsOnASingleLine: Never
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
+AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
 BreakBeforeBraces: Attach

.clang-tidy

@@ -2,10 +2,6 @@
 Checks: >
     -*,
     bugprone-*,
-    -bugprone-throwing-static-initialization,
-    -bugprone-invalid-enum-default-initialization,
-    -bugprone-suspicious-include,
-    -bugprone-branch-clone,
     -bugprone-easily-swappable-parameters,
     -bugprone-narrowing-conversions,
     -bugprone-implicit-widening-of-multiplication-result,
@@ -16,7 +12,6 @@ Checks: >
     readability-else-after-return,
     readability-make-member-function-const,
     readability-redundant-*,
-    -readability-redundant-inline-specifier,
     readability-simplify-*,
     modernize-use-override,
     modernize-use-nullptr,

.gitea/ISSUE_TEMPLATE/bug.yaml

@@ -1,108 +0,0 @@
-name: Bug Report
-about: Something broke
-title: "bug: "
-labels:
-    - bug
-
-body:
-    - type: textarea
-      id: description
-      attributes:
-          label: What happened
-          placeholder: Describe the bug
-      validations:
-          required: true
-
-    - type: textarea
-      id: expected
-      attributes:
-          label: What should happen
-          placeholder: Expected behavior
-      validations:
-          required: true
-
-    - type: textarea
-      id: steps
-      attributes:
-          label: Steps to reproduce
-          placeholder: |
-              1.
-              2.
-              3.
-          render: shell
-      validations:
-          required: true
-
-    - type: dropdown
-      id: os
-      attributes:
-          label: OS
-          options:
-              - NixOS
-              - Arch
-              - Debian / Ubuntu
-              - Fedora
-              - Alpine
-              - Artix
-              - Gentoo
-              - Other
-      validations:
-          required: false
-
-    - type: input
-      id: other-os
-      attributes:
-          label: Other OS (if "Other" above)
-          placeholder: e.g. Void, Gentoo, FreeBSD
-      validations:
-          required: false
-
-    - type: dropdown
-      id: init
-      attributes:
-          label: Init system
-          description: Relevant for UWSM configuration
-          options:
-              - systemd
-              - non-systemd (openrc / runit / s6 / ...)
-      validations:
-          required: false
-
-    - type: input
-      id: other-init
-      attributes:
-          label: Other init system (if "non-systemd" above)
-          placeholder: e.g. openrc, runit, s6, dinit
-      validations:
-          required: false
-
-    - type: input
-      id: qt-version
-      attributes:
-          label: Qt version
-          placeholder: 6.11.1
-      validations:
-          required: false
-
-    - type: input
-      id: commit
-      attributes:
-          label: Branch / commit
-          placeholder: main / abc1234
-      validations:
-          required: false
-
-    - type: textarea
-      id: logs
-      attributes:
-          label: Logs / backtrace / screenshots
-          render: shell
-      validations:
-          required: false
-
-    - type: textarea
-      id: workaround
-      attributes:
-          label: Found a workaround?
-      validations:
-          required: false

.gitea/ISSUE_TEMPLATE/feature.yaml

@@ -1,51 +0,0 @@
-name: Feature Request
-about: Idea or improvement
-title: "feat: "
-labels:
-  - enhancement
-
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: What's missing / annoying
-      placeholder: The use case or pain point
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: How should it work
-      placeholder: Describe the desired behavior
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Other approaches considered
-    validations:
-      required: false
-
-  - type: dropdown
-    id: scope
-    attributes:
-      label: Area
-      options:
-        - Core / Daemon
-        - UI / Components
-        - Plugin system
-        - CMake / Build
-        - CI / Tooling
-        - Documentation
-        - Other
-    validations:
-      required: false
-
-  - type: textarea
-    id: context
-    attributes:
-      label: Mockups / references / notes
-    validations:
-      required: false

.gitea/PULL_REQUEST_TEMPLATE.yaml

@@ -1,59 +0,0 @@
-name: Pull Request
-about: Submit changes
-title: ""
-labels: []
-
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: What & why
-      placeholder: Describe the change and motivation
-    validations:
-      required: true
-
-  - type: input
-    id: issue
-    attributes:
-      label: Related issue
-      placeholder: "#123"
-    validations:
-      required: false
-
-  - type: dropdown
-    id: type
-    attributes:
-      label: Type
-      options:
-        - Bug fix
-        - New feature
-        - Refactor / style
-        - CI / build / tooling
-        - Documentation
-    validations:
-      required: true
-
-  - type: checkboxes
-    id: tested
-    attributes:
-      label: Tested
-      options:
-        - label: Build succeeds
-        - label: Existing tests pass
-        - label: Manually verified
-
-  - type: textarea
-    id: breaking
-    attributes:
-      label: Breaking changes?
-      placeholder: API/ABI breakage? Migration path?
-
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      options:
-        - label: CI passes (format, lint, typecheck)
-        - label: Clean commits
-        - label: No new warnings
-        - label: Docs updated if needed

.gitea/workflows/ci-image.yml

@@ -2,27 +2,19 @@ name: Rebuild CI Image
 
 on:
     schedule:
-        - cron: "0 6 * * 1"
+        - cron: '0 6 * * 1'
     workflow_dispatch:
 
 jobs:
     build:
         runs-on: alpine
-        container:
-            image: node:26-alpine
         env:
-            IMAGE: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
+            IMAGE: git.aramjonghu.nl/aramjonghu/zshell-ci:latest
 
         steps:
             - name: Checkout
               uses: actions/checkout@v4
 
-            - name: Install Docker CLI
-              run: apk add --no-cache docker-cli
-
-            - name: Login to registry
-              run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login git.aramjonghu.dev --username aramjonghu --password-stdin
-
             - name: Build image
               run: docker build -t "$IMAGE" -f ci/Dockerfile .
 

.gitea/workflows/cpp.yml

@@ -4,49 +4,14 @@ on:
     pull_request:
 
 jobs:
-    fmt:
-        runs-on: alpine
-        container:
-            image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Format check
-              run: |
-                  find . \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) \
-                    -not -path './build/*' \
-                    -exec clang-format -i --style=file {} +
-                  git diff --exit-code && echo "clang-format: passed"
-
     build:
         runs-on: alpine
         container:
-            image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
+            image: git.aramjonghu.nl/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
-              with:
-                  fetch-depth: 0
 
             - name: Configure
               run: cmake -B build -G Ninja -DENABLE_MODULES=plugin -DCMAKE_BUILD_TYPE=Release
@@ -55,8 +20,8 @@ jobs:
               run: ninja -C build
 
             - name: clang-tidy
+              continue-on-error: true
               run: |
-                  sed -i 's/-mno-direct-extern-access //g' build/compile_commands.json
                   set -o pipefail
                   run-clang-tidy -p build -j $(nproc) -header-filter="Plugins/.*" 2>&1 | \
-                    grep -v 'Suppressed\|non-user\|non-system\|unknown argument.*mno-direct\|Found compiler error\|warnings generated\.\|^Use -header-filter'
+                    grep -v 'Suppressed\|non-user\|non-system\|unknown argument.*mno-direct'

.gitea/workflows/lint-js.yml

@@ -1,10 +1,10 @@
-name: JS/TS
+name: Lint & Format (JS/TS)
 
 on:
     pull_request:
 
 jobs:
-    fmt:
+    lint-format:
         runs-on: alpine
         container: node:26-alpine
 
@@ -18,6 +18,7 @@ jobs:
                     git
 
             - name: Prettier
+              continue-on-error: true
               run: |
                   if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
                     npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .prettierignore
@@ -25,19 +26,6 @@ jobs:
                     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/lint-python.yml

@@ -0,0 +1,65 @@
+name: Python
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git \
+                    python3 \
+                    py3-pip
+                  python3 -m venv .venv
+                  . .venv/bin/activate
+                  pip install --no-cache-dir ruff
+
+            - name: Format check
+              continue-on-error: true
+              run: |
+                  . .venv/bin/activate
+                  ruff format --check .
+
+            - name: Lint
+              run: |
+                  . .venv/bin/activate
+                  ruff check .
+
+    test:
+        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 \
+                    py3-pillow \
+                    build-base
+                  python3 -m venv .venv
+                  . .venv/bin/activate
+                  pip install --no-cache-dir \
+                    typer \
+                    pillow \
+                    materialyoucolor \
+                    jinja2 \
+                    pytest
+
+            - name: Test
+              run: |
+                  . .venv/bin/activate
+                  cd cli
+                  python -m pytest tests/ -v

.gitea/workflows/lint-rust.yml

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

.gitea/workflows/python.yml

@@ -1,67 +0,0 @@
-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:
-    static:
-        runs-on: debian
-        container: node:26-trixie-slim
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  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
-
-            - name: Format check
-              run: |
-                  . .venv/bin/activate
-                  ruff format --check .
-
-            - name: Lint
-              run: |
-                  . .venv/bin/activate
-                  ruff check .
-
-    verify:
-        if: always()
-        runs-on: debian
-        container: node:26-trixie-slim
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  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 basedpyright nuitka .
-
-            - name: Type check
-              run: |
-                  . .venv/bin/activate
-                  basedpyright
-
-            - name: Test
-              run: |
-                  . .venv/bin/activate
-                  cd cli
-                  python -m pytest tests/ -v
-
-            - name: Nuitka module check
-              run: |
-                  . .venv/bin/activate
-                  nuitka --module --include-package=zshell cli/src/zshell/

.gitea/workflows/rust.yml

@@ -1,152 +0,0 @@
-name: Rust
-
-on:
-    pull_request:
-
-jobs:
-    build:
-        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-build-${{ 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
-
-            - name: Cargo check
-              run: |
-                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
-                    for manifest in $(find . -name "Cargo.toml"); do
-                      cargo check --manifest-path "$manifest" && \
-                        echo "$manifest: check passed" || \
-                        { echo "$manifest: check failed"; exit 1; }
-                    done
-                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
-                    echo "Rust files found but no Cargo.toml"
-                    exit 1
-                  else
-                    echo "No Rust project found"
-                  fi
-
-    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
-                    status=0
-                    for manifest in $(find . -name "Cargo.toml"); do
-                      cargo clippy --manifest-path "$manifest" --all-targets --all-features -- -D warnings && \
-                        echo "$manifest: Clippy passed" || \
-                        { echo "$manifest: Clippy failed"; status=1; }
-                    done
-                    exit $status
-                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
-                    echo "Rust files found but no Cargo.toml"
-                    exit 1
-                  else
-                    echo "No Rust project found"
-                  fi

.gitignore

@@ -15,6 +15,3 @@ dist/
 **/target/
 **/test-plugins/
 **/Charts/
-network-dev/
-**/zshell.build/
-**/zshell.dist/

CMakeLists.txt

@@ -36,15 +36,13 @@ 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" 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(CMAKE_INSTALL_MESSAGE NEVER)
-
 add_compile_options(
 	-Wall -Wextra -Wpedantic -Wshadow -Wconversion
 	-Wold-style-cast -Wnull-dereference -Wdouble-promotion
@@ -54,110 +52,13 @@ add_compile_options(
 )
 
 
-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()
-
-	# Nuitka compilation
-	set(ZSHELL_CLI_BUILD_DIR "${CMAKE_BINARY_DIR}/zshell-cli")
-	set(ZSHELL_CLI_DIST "${ZSHELL_CLI_BUILD_DIR}/zshell.dist")
-	set(ZSHELL_CLI_SRC "${CMAKE_SOURCE_DIR}/cli/src/zshell")
-
-	find_program(NUITKA_EXECUTABLE nuitka)
-
-	if(NUITKA_EXECUTABLE)
-		file(GLOB_RECURSE ZSHELL_CLI_SOURCES CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_SRC}/*.py"
-		)
-		file(GLOB_RECURSE ZSHELL_CLI_ASSETS CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_SRC}/assets/*"
-		)
-
-		add_custom_command(
-			OUTPUT "${ZSHELL_CLI_DIST}/zshell-cli"
-			COMMAND ${CMAKE_COMMAND} -E make_directory "${ZSHELL_CLI_BUILD_DIR}"
-			COMMAND ${CMAKE_COMMAND} -E rm -rf "${ZSHELL_CLI_DIST}"
-
-			COMMAND
-				${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/
-
-			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cli
-			DEPENDS ${ZSHELL_CLI_SOURCES} ${ZSHELL_CLI_ASSETS}
-		)
-
-		add_custom_target(zshell-cli ALL DEPENDS "${ZSHELL_CLI_DIST}/zshell-cli")
-
-		install(PROGRAMS "${ZSHELL_CLI_DIST}/zshell-cli" DESTINATION "${INSTALL_LIBDIR}/zshell-cli")
-		install(DIRECTORY "${ZSHELL_CLI_DIST}/" DESTINATION "${INSTALL_LIBDIR}/zshell-cli" PATTERN "zshell-cli" EXCLUDE)
-
-		configure_file(
-			"${CMAKE_SOURCE_DIR}/Plugins/cmake/zshell-cli.cmake.in"
-			"${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli.cmake"
-			@ONLY
-		)
-		install(SCRIPT "${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli.cmake")
-	else()
-		message(STATUS "Nuitka not found, building zshell-cli as a Python wheel instead")
-
-		find_package(Python3 COMPONENTS Interpreter REQUIRED)
-
-		set(ZSHELL_CLI_DIR "${CMAKE_SOURCE_DIR}")
-		set(ZSHELL_CLI_DIST_DIR "${ZSHELL_CLI_DIR}/dist")
-		set(ZSHELL_CLI_WHEEL_STAMP "${CMAKE_BINARY_DIR}/zshell-cli/wheel.stamp")
-
-		file(GLOB_RECURSE ZSHELL_CLI_SOURCES CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_DIR}/src/zshell/*.py"
-		)
-		file(GLOB_RECURSE ZSHELL_CLI_ASSETS CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_DIR}/src/zshell/assets/*"
-		)
-
-		add_custom_command(
-			OUTPUT "${ZSHELL_CLI_WHEEL_STAMP}"
-			COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/zshell-cli"
-			COMMAND ${CMAKE_COMMAND} -E rm -rf "${ZSHELL_CLI_DIST_DIR}"
-			COMMAND ${Python3_EXECUTABLE} -m build --wheel --no-isolation
-			COMMAND ${CMAKE_COMMAND} -E touch "${ZSHELL_CLI_WHEEL_STAMP}"
-			WORKING_DIRECTORY "${ZSHELL_CLI_DIR}"
-			DEPENDS ${ZSHELL_CLI_SOURCES} ${ZSHELL_CLI_ASSETS}
-			COMMENT "Building zshell-cli python wheel"
-		)
-
-		add_custom_target(zshell-cli ALL DEPENDS "${ZSHELL_CLI_WHEEL_STAMP}")
-
-		configure_file(
-			"${CMAKE_SOURCE_DIR}/Plugins/cmake/zshell-cli-python.cmake.in"
-			"${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli-python.cmake"
-			@ONLY
-		)
-		install(SCRIPT "${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli-python.cmake")
-	endif()
-endif()
-
 if("plugin" IN_LIST ENABLE_MODULES)
 	add_subdirectory(Plugins)
+
 endif()
 
 if("shell" IN_LIST ENABLE_MODULES)
-	foreach(dir assets scripts Components Services Modules Daemons Drawers Effects Helpers Paths)
+	foreach(dir assets scripts Components Config Modules Daemons Drawers Effects Helpers Paths)
 		install(DIRECTORY ${dir} DESTINATION "${INSTALL_QSCONFDIR}")
 	endforeach()
 
@@ -170,22 +71,3 @@ if("shell" IN_LIST ENABLE_MODULES)
 	# Greeter
 	install(DIRECTORY Greeter/ DESTINATION "${INSTALL_GREETERCONFDIR}")
 endif()
-
-if("m3shapes" IN_LIST ENABLE_MODULES)
-	message(STATUS "Fetching M3Shapes module")
-	include(FetchContent)
-	set(M3SHAPES_REV bdc327b29f95394a732baf3c9b19658ba23755b6)
-	FetchContent_Declare(
-		m3shapes_external
-		GIT_REPOSITORY https://github.com/soramanew/m3shapes.git
-		GIT_TAG        ${M3SHAPES_REV}
-		SOURCE_DIR     "${CMAKE_BINARY_DIR}/_deps/m3shapes-${M3SHAPES_REV}"
-	)
-	FetchContent_MakeAvailable(m3shapes_external)
-	message(STATUS "Done fetching M3Shapes module")
-
-	# Fix m3shapes wrong rpath
-	if(TARGET m3shapesplugin)
-		set_target_properties(m3shapesplugin PROPERTIES INSTALL_RPATH "$ORIGIN")
-	endif()
-endif()

Components/AnchorAnim.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ZShell.Config
+import qs.Config
 
 AnchorAnimation {
 	enum Type {
@@ -20,32 +20,32 @@ AnchorAnimation {
 
 	duration: {
 		if (type < AnchorAnim.StandardSmall || type > AnchorAnim.SlowSpatial)
-			return Tokens.anim.durations.expressiveDefaultSpatial;
+			return Appearance.anim.durations.expressiveDefaultSpatial;
 
 		if (type == AnchorAnim.FastSpatial)
-			return Tokens.anim.durations.expressiveFastSpatial;
+			return Appearance.anim.durations.expressiveFastSpatial;
 		if (type == AnchorAnim.DefaultSpatial)
-			return Tokens.anim.durations.expressiveDefaultSpatial;
+			return Appearance.anim.durations.expressiveDefaultSpatial;
 		if (type == AnchorAnim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Appearance.anim.durations.large;
 
 		const types = ["small", "normal", "large", "extraLarge"];
 		const idx = type % 4;
-		return Tokens.anim.durations[types[idx]];
+		return Appearance.anim.durations[types[idx]];
 	}
 	easing.bezierCurve: {
 		if (type == AnchorAnim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Appearance.anim.curves.expressiveFastSpatial;
 		if (type == AnchorAnim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Appearance.anim.curves.expressiveDefaultSpatial;
 		if (type == AnchorAnim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Appearance.anim.curves.expressiveSlowSpatial;
 
 		if (type >= AnchorAnim.StandardSmall && type <= AnchorAnim.StandardExtraLarge)
-			return Tokens.anim.curves.standard;
+			return Appearance.anim.curves.standard;
 		if (type >= AnchorAnim.EmphasizedSmall && type <= AnchorAnim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
+			return Appearance.anim.curves.emphasized;
 
-		return Tokens.anim.curves.expressiveDefaultSpatial;
+		return Appearance.anim.curves.expressiveDefaultSpatial;
 	}
 }

Components/Anim.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ZShell.Config
+import qs.Config
 
 NumberAnimation {
 	enum Type {
@@ -23,41 +23,41 @@ NumberAnimation {
 
 	duration: {
 		if (type < Anim.StandardSmall || type > Anim.SlowEffects)
-			return Tokens.anim.durations.normal;
+			return Appearance.anim.durations.normal;
 
 		if (type === Anim.FastSpatial)
-			return Tokens.anim.durations.expressiveFastSpatial;
+			return Appearance.anim.durations.expressiveFastSpatial;
 		if (type === Anim.DefaultSpatial)
-			return Tokens.anim.durations.expressiveDefaultSpatial;
+			return Appearance.anim.durations.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.durations.large;
+			return Appearance.anim.durations.large;
 		if (type === Anim.FastEffects)
-			return Tokens.anim.durations.expressiveFastEffects;
+			return Appearance.anim.durations.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.durations.expressiveEffects;
+			return Appearance.anim.durations.expressiveEffects;
 		if (type === Anim.SlowEffects)
-			return Tokens.anim.durations.expressiveSlowEffects;
+			return Appearance.anim.durations.expressiveSlowEffects;
 
 		const types = ["small", "normal", "large", "extraLarge"];
 		const idx = type % 4;
-		return Tokens.anim.durations[types[idx]];
+		return Appearance.anim.durations[types[idx]];
 	}
 	easing.bezierCurve: {
 		if (type === Anim.FastSpatial)
-			return Tokens.anim.curves.expressiveFastSpatial;
+			return Appearance.anim.curves.expressiveFastSpatial;
 		if (type === Anim.DefaultSpatial)
-			return Tokens.anim.curves.expressiveDefaultSpatial;
+			return Appearance.anim.curves.expressiveDefaultSpatial;
 		if (type === Anim.SlowSpatial)
-			return Tokens.anim.curves.expressiveSlowSpatial;
+			return Appearance.anim.curves.expressiveSlowSpatial;
 		if (type === Anim.FastEffects)
-			return Tokens.anim.curves.expressiveFastEffects;
+			return Appearance.anim.curves.expressiveFastEffects;
 		if (type === Anim.DefaultEffects)
-			return Tokens.anim.curves.expressiveDefaultEffects;
+			return Appearance.anim.curves.expressiveDefaultEffects;
 		if (type === Anim.SlowEffects)
-			return Tokens.anim.curves.expressiveSlowEffects;
+			return Appearance.anim.curves.expressiveSlowEffects;
 
 		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
-			return Tokens.anim.curves.emphasized;
-		return Tokens.anim.curves.standard;
+			return Appearance.anim.curves.emphasized;
+		return Appearance.anim.curves.standard;
 	}
 }

Components/BaseStyledSlider.qml

@@ -1,12 +1,11 @@
 import QtQuick
 import QtQuick.Templates
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Slider {
 	id: root
 
-	property color color: Colors.palette.m3secondary
+	property color color: DynamicColors.palette.m3secondary
 	required property string icon
 	property bool initialized: false
 	readonly property bool isHorizontal: orientation === Qt.Horizontal
@@ -20,9 +19,9 @@ Slider {
 	background: CustomRect {
 		id: groove
 
-		color: Colors.layer(Colors.palette.m3surfaceContainer, 2)
+		color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
 		height: root.availableHeight
-		radius: Tokens.rounding.full
+		radius: Appearance.rounding.full
 		width: root.availableWidth
 		x: root.leftPadding
 		y: root.topPadding
@@ -63,8 +62,8 @@ Slider {
 			id: rect
 
 			anchors.fill: parent
-			color: Colors.palette.m3inverseSurface
-			radius: Tokens.rounding.full
+			color: DynamicColors.palette.m3inverseSurface
+			radius: Appearance.rounding.full
 
 			MouseArea {
 				id: handleInteraction
@@ -83,12 +82,12 @@ Slider {
 				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;
+					font.pointSize = moving ? Appearance.font.size.small : Appearance.font.size.larger;
+					font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material;
 				}
 
 				anchors.centerIn: parent
-				color: Colors.palette.m3inverseOnSurface
+				color: DynamicColors.palette.m3inverseOnSurface
 				text: root.icon
 
 				onMovingChanged: anim.restart()
@@ -106,8 +105,8 @@ Slider {
 					id: anim
 
 					Anim {
-						duration: Tokens.anim.durations.normal / 2
-						easing.bezierCurve: Tokens.anim.curves.standardAccel
+						duration: Appearance.anim.durations.normal / 2
+						easing.bezierCurve: Appearance.anim.curves.standardAccel
 						property: "scale"
 						target: icon
 						to: 0
@@ -118,8 +117,8 @@ Slider {
 					}
 
 					Anim {
-						duration: Tokens.anim.durations.normal / 2
-						easing.bezierCurve: Tokens.anim.curves.standardDecel
+						duration: Appearance.anim.durations.normal / 2
+						easing.bezierCurve: Appearance.anim.curves.standardDecel
 						property: "scale"
 						target: icon
 						to: 1
@@ -130,7 +129,7 @@ Slider {
 	}
 	Behavior on value {
 		Anim {
-			duration: Tokens.anim.durations.large
+			duration: Appearance.anim.durations.large
 		}
 	}
 

Components/ButtonBase.qml

@@ -1,6 +1,5 @@
 import QtQuick
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 CustomRect {
 	id: root
@@ -14,14 +13,14 @@ CustomRect {
 	property color activeColor
 	property color activeOnColor
 	property bool checked
-	property real checkedRadius: Tokens.rounding.medium
-	property real defaultRadius: Math.min(width, height) / 2
-	property color disabledColor: Qt.alpha(Colors.palette.m3onSurface, 0.1)
-	property color disabledOnColor: Qt.alpha(Colors.palette.m3onSurface, 0.38)
+	property real checkedRadius: Appearance.rounding.medium
+	property real defaultRadius: Appearance.rounding.large
+	property color disabledColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color disabledOnColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
 	property bool fillWidth
 	property font font: ({
-			family: Config.appearance.font.family.sans,
-			pointSize: Tokens.font.size.larger,
+			family: Appearance.font.family.sans,
+			pointSize: Appearance.font.size.larger,
 			bold: false
 		})
 	property real horizontalPadding: padding
@@ -36,7 +35,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: Appearance.rounding.small
 	readonly property alias radiusAnim: radiusAnim
 	property bool radiusMorph: true
 	property alias shapeMorph: stateLayer.shapeMorph
@@ -54,7 +53,7 @@ CustomRect {
 		if (internalChecked)
 			return checkedRadius;
 		if (isRound)
-			return (height || implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale);
+			return (height || implicitHeight) / 2 * Math.min(1, Appearance.rounding.scale);
 		return defaultRadius;
 	}
 

Components/CAnim.qml

@@ -1,63 +1,8 @@
 import QtQuick
-import ZShell.Config
+import qs.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: MaterialEasing.standardTime
+	easing.bezierCurve: MaterialEasing.standard
+	easing.type: Easing.BezierSpline
 }

Components/CircularIndicator.qml

@@ -1,8 +1,7 @@
-import ZShell.Config
+import qs.Config
 import ZShell.Internal
 import QtQuick
 import QtQuick.Templates
-import qs.Services
 
 BusyIndicator {
 	id: root
@@ -18,12 +17,12 @@ 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 color bgColor: DynamicColors.palette.m3secondaryContainer
+	property color fgColor: DynamicColors.palette.m3primary
+	property real implicitSize: Appearance.font.size.normal * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
-	property real strokeWidth: Tokens.padding.small * 0.8
+	property real strokeWidth: Appearance.padding.small * 0.8
 	property alias type: manager.indeterminateAnimationType
 
 	implicitHeight: implicitSize
@@ -34,7 +33,6 @@ BusyIndicator {
 		anchors.fill: parent
 		bgColor: root.bgColor
 		fgColor: root.fgColor
-		hasEndIndicator: false
 		padding: root.padding
 		rotation: manager.rotation
 		startAngle: manager.startFraction * 360
@@ -52,9 +50,8 @@ BusyIndicator {
 	}
 	transitions: Transition {
 		Anim {
-			duration: manager.completeEndDuration * Tokens.anim.durations.scale
+			duration: manager.completeEndDuration * Appearance.anim.durations.scale
 			properties: "opacity,internalStrokeWidth"
-			type: Anim.DefaultEffects
 		}
 	}
 
@@ -79,7 +76,7 @@ BusyIndicator {
 	}
 
 	NumberAnimation {
-		duration: manager.duration * Tokens.anim.durations.scale
+		duration: manager.duration * Appearance.anim.durations.scale
 		from: 0
 		loops: Animation.Infinite
 		property: "progress"
@@ -89,7 +86,7 @@ BusyIndicator {
 	}
 
 	NumberAnimation {
-		duration: manager.completeEndDuration * Tokens.anim.durations.scale
+		duration: manager.completeEndDuration * Appearance.anim.durations.scale
 		from: 0
 		property: "completeEndProgress"
 		running: root.animState === CircularIndicator.Completing

Components/CircularProgress.qml

@@ -3,25 +3,24 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Shapes
 import ZShell.Components
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Item {
 	id: root
 
 	readonly property real arcRadius: (size - padding - strokeWidth * (1 + waveAmplitude * 2)) / 2
-	property color bgColor: Colors.palette.m3secondaryContainer
+	property color bgColor: DynamicColors.palette.m3secondaryContainer
 	property real clampedVal: Math.max(1 / 360, Math.min(1, isNaN(value) ? 0 : value))
 	readonly property real dotAngleRad: (startAngle + sweepAngle - gapAngle * (sweepAngle < 360 ? 0 : 1)) * Math.PI / 180
-	property color fgColor: Colors.palette.m3primary
+	property color fgColor: DynamicColors.palette.m3primary
 	readonly property real gapAngle: ((spacing + strokeWidth) / (arcRadius || 1)) * (180 / Math.PI)
 	property alias hasEndIndicator: dot.active
 	property real implicitSize
 	property int padding: 0
 	readonly property real size: Math.min(width, height)
-	property int spacing: Tokens.spacing.small
+	property int spacing: Appearance.spacing.small
 	property int startAngle: -90
-	property int strokeWidth: Tokens.padding.small
+	property int strokeWidth: Appearance.padding.small
 	property int sweepAngle: 360
 	readonly property real thickness: strokeWidth * (1 + waveAmplitude) * 2
 	property real value
@@ -111,7 +110,7 @@ Item {
 			implicitHeight: Math.min(1, remainingArc.sweepAngle) * Math.min(4, root.strokeWidth)
 			implicitWidth: Math.min(1, remainingArc.sweepAngle) * Math.min(4, root.strokeWidth)
 			opacity: Math.min(1, remainingArc.sweepAngle)
-			radius: Tokens.rounding.full
+			radius: Appearance.rounding.full
 		}
 	}
 }

Components/CollapsibleSection.qml

@@ -0,0 +1,135 @@
+import QtQuick
+import QtQuick.Layouts
+import qs.Config
+
+ColumnLayout {
+	id: root
+
+	default property alias content: contentColumn.data
+	property string description: ""
+	property bool expanded: false
+	property bool nested: false
+	property bool showBackground: false
+	required property string title
+
+	signal toggleRequested
+
+	Layout.fillWidth: true
+	spacing: Appearance.spacing.small
+
+	Item {
+		id: sectionHeaderItem
+
+		Layout.fillWidth: true
+		Layout.preferredHeight: Math.max(titleRow.implicitHeight + Appearance.padding.normal * 2, 48)
+
+		RowLayout {
+			id: titleRow
+
+			anchors.left: parent.left
+			anchors.leftMargin: Appearance.padding.normal
+			anchors.right: parent.right
+			anchors.rightMargin: Appearance.padding.normal
+			anchors.verticalCenter: parent.verticalCenter
+			spacing: Appearance.spacing.normal
+
+			CustomText {
+				font.pointSize: Appearance.font.size.larger
+				font.weight: 500
+				text: root.title
+			}
+
+			Item {
+				Layout.fillWidth: true
+			}
+
+			MaterialIcon {
+				color: DynamicColors.palette.m3onSurfaceVariant
+				font.pointSize: Appearance.font.size.normal
+				rotation: root.expanded ? 180 : 0
+				text: "expand_more"
+
+				Behavior on rotation {
+					Anim {
+						duration: Appearance.anim.durations.small
+						easing.bezierCurve: Appearance.anim.curves.standard
+					}
+				}
+			}
+		}
+
+		StateLayer {
+			anchors.fill: parent
+			color: DynamicColors.palette.m3onSurface
+			radius: Appearance.rounding.normal
+			showHoverBackground: false
+
+			onClicked: {
+				root.toggleRequested();
+				root.expanded = !root.expanded;
+			}
+		}
+	}
+
+	Item {
+		id: contentWrapper
+
+		Layout.fillWidth: true
+		Layout.preferredHeight: root.expanded ? (contentColumn.implicitHeight + Appearance.spacing.small * 2) : 0
+		clip: true
+
+		Behavior on Layout.preferredHeight {
+			Anim {
+				easing.bezierCurve: Appearance.anim.curves.standard
+			}
+		}
+
+		CustomRect {
+			id: backgroundRect
+
+			anchors.fill: parent
+			color: DynamicColors.transparency.enabled ? DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, root.nested ? 3 : 2) : (root.nested ? DynamicColors.palette.m3surfaceContainerHigh : DynamicColors.palette.m3surfaceContainer)
+			opacity: root.showBackground && root.expanded ? 1.0 : 0.0
+			radius: Appearance.rounding.normal
+			visible: root.showBackground
+
+			Behavior on opacity {
+				Anim {
+					easing.bezierCurve: Appearance.anim.curves.standard
+				}
+			}
+		}
+
+		ColumnLayout {
+			id: contentColumn
+
+			anchors.bottomMargin: Appearance.spacing.small
+			anchors.left: parent.left
+			anchors.leftMargin: Appearance.padding.normal
+			anchors.right: parent.right
+			anchors.rightMargin: Appearance.padding.normal
+			opacity: root.expanded ? 1.0 : 0.0
+			spacing: Appearance.spacing.small
+			y: Appearance.spacing.small
+
+			Behavior on opacity {
+				Anim {
+					easing.bezierCurve: Appearance.anim.curves.standard
+				}
+			}
+
+			CustomText {
+				id: descriptionText
+
+				Layout.bottomMargin: root.description !== "" ? Appearance.spacing.small : 0
+				Layout.fillWidth: true
+				Layout.topMargin: root.description !== "" ? Appearance.spacing.smaller : 0
+				color: DynamicColors.palette.m3onSurfaceVariant
+				font.pointSize: Appearance.font.size.small
+				text: root.description
+				visible: root.description !== ""
+				wrapMode: Text.Wrap
+			}
+		}
+	}
+}

Components/ColorArcPicker.qml

@@ -1,8 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Item {
 	id: root
@@ -19,9 +18,9 @@ Item {
 	property real lastChromaticHue: 0
 	readonly property real radius: (Math.min(width, height) - handleSize) / 2
 	readonly property int segmentCount: 240
-	readonly property color thumbColor: Colors.palette.m3inverseSurface
-	readonly property color thumbContentColor: Colors.palette.m3inverseOnSurface
-	readonly property color trackColor: Colors.layer(Colors.palette.m3surfaceContainer, 2)
+	readonly property color thumbColor: DynamicColors.palette.m3inverseSurface
+	readonly property color thumbContentColor: DynamicColors.palette.m3inverseOnSurface
+	readonly property color trackColor: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
 
 	function hueToAngle(hue) {
 		return arcStartAngle + arcSweep * hue;
@@ -154,8 +153,8 @@ Item {
 		anchors.centerIn: parent
 		color: root.drawing?.drawingState.penColor
 		implicitHeight: implicitWidth
-		implicitWidth: canvas.height - root.handleSize - Tokens.padding.extraLarge * 2
-		radius: Tokens.rounding.full
+		implicitWidth: canvas.height - root.handleSize - Appearance.padding.extraLarge * 2
+		radius: Appearance.rounding.full
 
 		Behavior on color {
 			enabled: false

Components/CustomAudioSlider.qml

@@ -0,0 +1,70 @@
+import QtQuick
+import QtQuick.Templates
+import qs.Config
+
+Slider {
+	id: root
+
+	property color nonPeakColor: DynamicColors.tPalette.m3primary
+	required property real peak
+	property color peakColor: DynamicColors.palette.m3primary
+
+	background: Item {
+		CustomRect {
+			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 3
+			anchors.left: parent.left
+			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 3
+			bottomRightRadius: root.implicitHeight / 15
+			color: root.nonPeakColor
+			implicitWidth: root.handle.x - root.implicitHeight
+			radius: Appearance.rounding.full
+			topRightRadius: root.implicitHeight / 15
+
+			CustomRect {
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.top: parent.top
+				bottomRightRadius: root.implicitHeight / 15
+				color: root.peakColor
+				implicitWidth: parent.width * root.peak
+				radius: Appearance.rounding.full
+				topRightRadius: root.implicitHeight / 15
+
+				Behavior on implicitWidth {
+					Anim {
+						duration: 50
+					}
+				}
+			}
+		}
+
+		CustomRect {
+			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 3
+			anchors.right: parent.right
+			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 3
+			bottomLeftRadius: root.implicitHeight / 15
+			color: DynamicColors.tPalette.m3surfaceContainer
+			implicitWidth: root.implicitWidth - root.handle.x - root.handle.implicitWidth - root.implicitHeight
+			radius: Appearance.rounding.full
+			topLeftRadius: root.implicitHeight / 15
+		}
+	}
+	handle: CustomRect {
+		anchors.verticalCenter: parent.verticalCenter
+		color: DynamicColors.palette.m3primary
+		implicitHeight: 15
+		implicitWidth: 5
+		radius: Appearance.rounding.full
+		x: root.visualPosition * root.availableWidth - implicitWidth / 2
+
+		MouseArea {
+			acceptedButtons: Qt.NoButton
+			anchors.fill: parent
+			cursorShape: Qt.PointingHandCursor
+		}
+	}
+}

Components/CustomBusyIndicator.qml

@@ -0,0 +1,69 @@
+import QtQuick
+import QtQuick.Controls.Basic
+
+BusyIndicator {
+	id: control
+
+	property int busySize: 64
+	property color color: delegate.color
+
+	contentItem: Item {
+		implicitHeight: control.busySize
+		implicitWidth: control.busySize
+
+		Item {
+			id: item
+
+			height: control.busySize
+			opacity: control.running ? 1 : 0
+			width: control.busySize
+			x: parent.width / 2 - (control.busySize / 2)
+			y: parent.height / 2 - (control.busySize / 2)
+
+			Behavior on opacity {
+				OpacityAnimator {
+					duration: 250
+				}
+			}
+
+			RotationAnimator {
+				duration: 1250
+				from: 0
+				loops: Animation.Infinite
+				running: control.visible && control.running
+				target: item
+				to: 360
+			}
+
+			Repeater {
+				id: repeater
+
+				model: 6
+
+				CustomRect {
+					id: delegate
+
+					required property int index
+
+					color: control.color
+					implicitHeight: 10
+					implicitWidth: 10
+					radius: 5
+					x: item.width / 2 - width / 2
+					y: item.height / 2 - height / 2
+
+					transform: [
+						Translate {
+							y: -Math.min(item.width, item.height) * 0.5 + 5
+						},
+						Rotation {
+							angle: delegate.index / repeater.count * 360
+							origin.x: 5
+							origin.y: 5
+						}
+					]
+				}
+			}
+		}
+	}
+}

Components/CustomButton.qml

@@ -0,0 +1,32 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Config
+
+Button {
+	id: control
+
+	property color bgColor: DynamicColors.palette.m3primary
+	property int radius: Appearance.rounding.smallest / 2
+	property color textColor: DynamicColors.palette.m3onPrimary
+
+	background: CustomRect {
+		color: control.bgColor
+		opacity: control.enabled ? 1.0 : 0.5
+		radius: control.radius
+	}
+	contentItem: CustomText {
+		color: control.textColor
+		horizontalAlignment: Text.AlignHCenter
+		opacity: control.enabled ? 1.0 : 0.5
+		text: control.text
+		verticalAlignment: Text.AlignVCenter
+	}
+
+	StateLayer {
+		radius: control.radius
+
+		onClicked: {
+			control.clicked();
+		}
+	}
+}

Components/CustomCheckbox.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Controls
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 CheckBox {
 	id: control
@@ -19,14 +18,14 @@ CheckBox {
 	indicator: CustomRect {
 		// x: control.leftPadding
 		// y: parent.implicitHeight / 2 - implicitHeight / 2
-		border.color: control.checked ? Colors.palette.m3primary : "transparent"
-		color: Colors.palette.m3surfaceVariant
+		border.color: control.checked ? DynamicColors.palette.m3primary : "transparent"
+		color: DynamicColors.palette.m3surfaceVariant
 		implicitHeight: control.checkHeight
 		implicitWidth: control.checkWidth
-		radius: Tokens.rounding.smallest / 2
+		radius: Appearance.rounding.smallest / 2
 
 		CustomRect {
-			color: Colors.palette.m3primary
+			color: DynamicColors.palette.m3primary
 			implicitHeight: control.checkHeight - (y * 2)
 			implicitWidth: control.checkWidth - (x * 2)
 			radius: 3

Components/CustomComboBox.qml

@@ -0,0 +1,169 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import qs.Config
+
+ComboBox {
+	id: root
+
+	property int cornerRadius: Appearance.rounding.normal
+	property int fieldHeight: 42
+	property bool filled: true
+	property real focusRingOpacity: 0.70
+	property int hPadding: 16
+	property int menuCornerRadius: 16
+	property int menuRowHeight: 46
+	property int menuVisibleRows: 7
+	property bool preferPopupWindow: false
+
+	hoverEnabled: true
+	implicitHeight: fieldHeight
+	implicitWidth: 240
+	spacing: 8
+
+	// ---------- Field background (filled/outlined + state layers + focus ring) ----------
+	background: Item {
+		anchors.fill: parent
+
+		CustomRect {
+			id: container
+
+			anchors.fill: parent
+			color: DynamicColors.palette.m3surfaceVariant
+			radius: root.cornerRadius
+
+			StateLayer {
+			}
+		}
+	}
+
+	// ---------- Content ----------
+	contentItem: RowLayout {
+		anchors.fill: parent
+		anchors.leftMargin: root.hPadding
+		anchors.rightMargin: root.hPadding
+		spacing: 12
+
+		// Display text
+		CustomText {
+			Layout.fillWidth: true
+			color: root.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSurfaceVariant
+			elide: Text.ElideRight
+			font.pixelSize: 16
+			font.weight: Font.Medium
+			text: root.currentText
+			verticalAlignment: Text.AlignVCenter
+		}
+
+		// Indicator chevron (simple, replace with your icon system)
+		CustomText {
+			color: root.enabled ? DynamicColors.palette.m3onSurfaceVariant : DynamicColors.palette.m3onSurfaceVariant
+			rotation: root.popup.visible ? 180 : 0
+			text: "▾"
+			transformOrigin: Item.Center
+			verticalAlignment: Text.AlignVCenter
+
+			Behavior on rotation {
+				NumberAnimation {
+					duration: 140
+					easing.type: Easing.OutCubic
+				}
+			}
+		}
+	}
+	popup: Popup {
+		id: p
+
+		implicitHeight: list.contentItem.height + Appearance.padding.small * 2
+		implicitWidth: root.width
+		modal: true
+		popupType: root.preferPopupWindow ? Popup.Window : Popup.Item
+		y: -list.currentIndex * (root.menuRowHeight + Appearance.spacing.small) - Appearance.padding.small
+
+		background: CustomRect {
+			color: DynamicColors.palette.m3surface
+			radius: root.menuCornerRadius
+		}
+		contentItem: ListView {
+			id: list
+
+			anchors.bottomMargin: Appearance.padding.small
+			anchors.fill: parent
+			anchors.topMargin: Appearance.padding.small
+			clip: true
+			currentIndex: root.currentIndex
+			model: root.delegateModel
+			spacing: Appearance.spacing.small
+
+			delegate: CustomRect {
+				required property int index
+				required property var modelData
+
+				anchors.horizontalCenter: parent.horizontalCenter
+				color: (index === root.currentIndex) ? DynamicColors.palette.m3primary : "transparent"
+				implicitHeight: root.menuRowHeight
+				implicitWidth: p.implicitWidth - Appearance.padding.small * 2
+				radius: Appearance.rounding.normal - Appearance.padding.small
+
+				RowLayout {
+					anchors.fill: parent
+					spacing: 10
+
+					CustomText {
+						Layout.fillWidth: true
+						color: DynamicColors.palette.m3onSurface
+						elide: Text.ElideRight
+						font.pixelSize: 15
+						text: modelData
+						verticalAlignment: Text.AlignVCenter
+					}
+
+					CustomText {
+						color: DynamicColors.palette.m3onSurfaceVariant
+						text: "✓"
+						verticalAlignment: Text.AlignVCenter
+						visible: index === root.currentIndex
+					}
+				}
+
+				StateLayer {
+					onClicked: {
+						root.currentIndex = index;
+						p.close();
+					}
+				}
+			}
+		}
+
+		// Expressive-ish open/close motion: subtle scale+fade (tune to taste). :contentReference[oaicite:5]{index=5}
+		enter: Transition {
+			Anim {
+				from: 0
+				property: "opacity"
+				to: 1
+			}
+
+			Anim {
+				from: 0.98
+				property: "scale"
+				to: 1.0
+			}
+		}
+		exit: Transition {
+			Anim {
+				from: 1
+				property: "opacity"
+				to: 0
+			}
+		}
+
+		Elevation {
+			anchors.fill: parent
+			level: 2
+			radius: root.menuCornerRadius
+			z: -1
+		}
+	}
+}

Components/CustomFlickable.qml

@@ -4,30 +4,12 @@ import qs.Helpers
 Flickable {
 	id: root
 
-	property bool doneFakeFlick
-
 	interactive: !Visibilities.getForActive().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
-	}
 }

Components/CustomListView.qml

@@ -6,7 +6,7 @@ ListView {
 
 	property bool doneFakeFlick
 
-	interactive: !Visibilities.getForActive()?.isDrawing
+	interactive: !Visibilities.getForActive().isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {

Components/CustomProgressBar.qml

@@ -5,8 +5,7 @@ import QtQuick.Templates
 import ZShell
 import ZShell.Components
 import ZShell.Internal
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 ProgressBar {
 	id: root
@@ -17,8 +16,8 @@ ProgressBar {
 		Stopped
 	}
 
-	property color bgColor: Colors.palette.m3secondaryContainer
-	property color fgColor: Colors.palette.m3primary
+	property color bgColor: DynamicColors.palette.m3secondaryContainer
+	property color fgColor: DynamicColors.palette.m3primary
 	property int indeterminateAnimState: CustomProgressBar.Stopped
 	property real waveAmplitude: 0.5
 	property int waveDuration: 1000
@@ -65,7 +64,7 @@ ProgressBar {
 	LinearIndicatorManager {
 		id: manager
 
-		gap: Tokens.spacing.extraSmall
+		gap: Appearance.spacing.extraSmall
 
 		Anim on completeEndProgress {
 			duration: manager.completeEndDuration
@@ -95,7 +94,7 @@ ProgressBar {
 				id: remaining
 
 				anchors.right: parent.right
-				implicitWidth: parent.width - wave.implicitWidth - Tokens.spacing.extraSmall
+				implicitWidth: parent.width - wave.implicitWidth - Appearance.spacing.extraSmall
 			}
 
 			Line {
@@ -107,7 +106,7 @@ ProgressBar {
 				color: root.fgColor
 				implicitHeight: implicitSize
 				implicitWidth: implicitSize
-				radius: Tokens.rounding.full
+				radius: Appearance.rounding.full
 
 				Behavior on implicitSize {
 					Anim {
@@ -201,7 +200,7 @@ ProgressBar {
 		color: root.bgColor
 		implicitHeight: parent.height
 		implicitWidth: bounds.y - bounds.x
-		radius: Tokens.rounding.full
+		radius: Appearance.rounding.full
 		x: bounds.x
 	}
 	component Wave: WavyLine {

Components/CustomRadioButton.qml

@@ -1,12 +1,11 @@
 import QtQuick
 import QtQuick.Templates
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 RadioButton {
 	id: root
 
-	font.pointSize: Tokens.font.size.normal
+	font.pointSize: Appearance.font.size.normal
 	implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
 	implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin
 
@@ -21,12 +20,12 @@ RadioButton {
 		id: outerCircle
 
 		anchors.verticalCenter: parent.verticalCenter
-		border.color: root.checked ? Colors.palette.m3primary : Colors.palette.m3onSurfaceVariant
+		border.color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurfaceVariant
 		border.width: 2
 		color: "transparent"
 		implicitHeight: 16
 		implicitWidth: 16
-		radius: Tokens.rounding.full
+		radius: Appearance.rounding.full
 
 		Behavior on border.color {
 			CAnim {
@@ -35,7 +34,7 @@ RadioButton {
 
 		StateLayer {
 			anchors.margins: -7
-			color: root.checked ? Colors.palette.m3onSurface : Colors.palette.m3primary
+			color: root.checked ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3primary
 			z: -1
 
 			onClicked: {
@@ -45,10 +44,10 @@ RadioButton {
 
 		CustomRect {
 			anchors.centerIn: parent
-			color: Qt.alpha(Colors.palette.m3primary, root.checked ? 1 : 0)
+			color: Qt.alpha(DynamicColors.palette.m3primary, root.checked ? 1 : 0)
 			implicitHeight: 8
 			implicitWidth: 8
-			radius: Tokens.rounding.full
+			radius: Appearance.rounding.full
 		}
 	}
 }

Components/CustomScrollBar.qml

@@ -1,8 +1,7 @@
 import QtQuick
 import QtQuick.Templates
 import qs.Helpers
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 ScrollBar {
 	id: root
@@ -18,7 +17,7 @@ ScrollBar {
 	readonly property real travelScale: root.rawTravel > 0 ? root.effectiveTravel / root.rawTravel : 0
 
 	enabled: !Visibilities.getForActive().isDrawing
-	implicitWidth: Tokens.padding.extraSmall * 2
+	implicitWidth: Appearance.padding.extraSmall * 2
 
 	contentItem: Item {
 	}
@@ -52,15 +51,15 @@ ScrollBar {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		implicitWidth: handle.implicitWidth
-		radius: Tokens.rounding.full
+		radius: Appearance.rounding.full
 
 		CustomRect {
 			id: handle
 
 			anchors.right: parent.right
-			color: Colors.palette.m3secondary
+			color: DynamicColors.palette.m3secondary
 			implicitHeight: root.height * root.effectiveSize
-			implicitWidth: fullMouse.pressed || fullMouse.containsMouse ? Tokens.padding.extraSmall * 2 : Tokens.padding.extraSmall
+			implicitWidth: fullMouse.pressed || fullMouse.containsMouse ? Appearance.padding.extraSmall * 2 : Appearance.padding.extraSmall
 			opacity: {
 				if (!root.enabled)
 					return 0;
@@ -74,7 +73,7 @@ ScrollBar {
 					return 0.6;
 				return 0;
 			}
-			radius: Tokens.rounding.full
+			radius: Appearance.rounding.full
 			y: root.reversed ? root.height * (1 + root.nonAnimY) * root.travelScale : root.height * root.nonAnimY * root.travelScale
 
 			Behavior on implicitWidth {

Components/CustomSlider.qml

@@ -5,23 +5,20 @@ import QtQuick.Templates
 import ZShell.Components
 import ZShell
 import qs.Components
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Slider {
 	id: root
 
 	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 color bgColor: enabled ? DynamicColors.palette.m3secondaryContainer : Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color fgColor: enabled ? DynamicColors.palette.m3primary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
 	property real filledWidth
 	property alias inset: inset
-	property color insetColor: enabled ? (inset.attached ? Colors.palette.m3onSecondaryContainer : Colors.palette.m3onPrimary) : Colors.palette.m3onSurface
+	property color insetColor: enabled ? (inset.attached ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onPrimary) : DynamicColors.palette.m3onSurface
 	property string insetIcon: ""
-	property bool interactionOnMove: true
 	property real pos: visualPosition
-	property int radius: Tokens.rounding.small
+	property int radius: Appearance.rounding.small
 	property int waveDuration: 1000
 	property real waveFrequency: 6
 	property bool wavy
@@ -38,15 +35,15 @@ Slider {
 			id: remaining
 
 			anchors.left: handle.right
-			anchors.leftMargin: Tokens.spacing.extraSmall
+			anchors.leftMargin: Appearance.spacing.extraSmall
 			anchors.right: parent.right
 			anchors.verticalCenter: parent.verticalCenter
-			bottomLeftRadius: Tokens.rounding.extraSmall / 2
+			bottomLeftRadius: Appearance.rounding.extraSmall / 2
 			color: root.bgColor
 			implicitHeight: parent.height * (parent.height <= 12 ? opacity : Math.min(opacity * 2, 1))
 			opacity: Math.min(width, 12) / 12
 			radius: root.radius
-			topLeftRadius: Tokens.rounding.extraSmall / 2
+			topLeftRadius: Appearance.rounding.extraSmall / 2
 		}
 
 		CustomRect {
@@ -57,14 +54,14 @@ Slider {
 			implicitHeight: 4 * remaining.opacity
 			implicitWidth: implicitHeight
 			opacity: remaining.opacity
-			radius: Tokens.rounding.full
+			radius: Appearance.rounding.full
 		}
 
 		CustomRect {
 			id: handle
 
 			anchors.left: filled.right
-			anchors.leftMargin: Tokens.spacing.extraSmall
+			anchors.leftMargin: Appearance.spacing.extraSmall
 			anchors.verticalCenter: parent.verticalCenter
 			color: root.fgColor
 			implicitHeight: {
@@ -73,7 +70,7 @@ Slider {
 				return parent.height * (mouse.pressed ? lerp(3.5, 1.5) : lerp(3, 1.2));
 			}
 			implicitWidth: 4
-			radius: Tokens.rounding.full
+			radius: Appearance.rounding.full
 
 			Behavior on implicitHeight {
 				Anim {
@@ -94,17 +91,17 @@ Slider {
 		MaterialIcon {
 			id: inset
 
-			readonly property bool attached: root.width ? (root.width - handle.implicitWidth - handle.anchors.leftMargin) * root.pos < inset.paintedWidth + Tokens.spacing.extraSmall * 2 : false
+			readonly property bool attached: root.width ? (root.width - handle.implicitWidth - handle.anchors.leftMargin) * root.pos < inset.paintedWidth + Appearance.spacing.extraSmall * 2 : false
 			property real dockT: attached ? 1 : 0
 
 			anchors.bottom: parent.bottom
 			anchors.top: parent.top
 			color: root.insetColor
-			font.pixelSize: Tokens.font.size.smaller * 2
+			font.pixelSize: Appearance.font.size.smaller * 2
 			text: root.insetIcon
 			verticalAlignment: Text.AlignVCenter
 			visible: !root.wavy && root.insetIcon !== ""
-			x: Tokens.spacing.extraSmall + dockT * (handle.x + Tokens.spacing.small)
+			x: Appearance.spacing.extraSmall + dockT * (handle.x + Appearance.spacing.small)
 
 			Behavior on dockT {
 				Anim {
@@ -116,12 +113,12 @@ Slider {
 			id: lineComp
 
 			CustomRect {
-				bottomRightRadius: Tokens.rounding.extraSmall / 2
+				bottomRightRadius: Appearance.rounding.extraSmall / 2
 				color: root.fgColor
 				implicitHeight: root.height
 				implicitWidth: root.filledWidth
 				radius: root.radius
-				topRightRadius: Tokens.rounding.extraSmall / 2
+				topRightRadius: Appearance.rounding.extraSmall / 2
 			}
 		}
 
@@ -141,7 +138,7 @@ Slider {
 					CAnim {
 					}
 				}
-				NumberAnimation on waveProgress {
+				Anim on waveProgress {
 					duration: root.waveDuration
 					easing.type: Easing.Linear
 					from: 0
@@ -188,8 +185,7 @@ Slider {
 
 		onPositionChanged: e => {
 			dragMovement = (e.x - pressStartX) / width;
-			if (root.interactionOnMove)
-				root.interaction(posBinding.value);
+			root.interaction(posBinding.value);
 		}
 		onPressed: e => {
 			widthBehavior.enabled = false;

Components/CustomSpinBox.qml

@@ -1,133 +1,168 @@
-import QtQuick
-import QtQuick.Templates
-import ZShell.Config
-import qs.Services
+pragma ComponentBehavior: Bound
 
-DoubleSpinBox {
+import QtQuick
+import QtQuick.Layouts
+import qs.Config
+
+RowLayout {
 	id: root
 
-	property int cLayer: 1
-	property int repeatDecay: 50
-	property int repeatRate: 400
+	property string displayText: root.value.toString()
+	property bool isEditing: false
+	property real max: Infinity
+	property real min: -Infinity
+	property alias repeatRate: timer.interval
+	property real step: 1
+	property real value
 
-	function decrease(): void {
-		let newValue = Math.max(from, value - stepSize);
-		const decimals = stepSize < 1 ? Math.max(1, Math.ceil(-Math.log10(stepSize))) : 0;
-		newValue = Math.round(newValue * Math.pow(10, decimals)) / Math.pow(10, decimals);
-		value = newValue;
-		valueModified();
+	signal valueModified(value: real)
+
+	spacing: Appearance.spacing.small
+
+	onValueChanged: {
+		if (!root.isEditing) {
+			root.displayText = root.value.toString();
+		}
 	}
 
-	function increase(): void {
-		let newValue = Math.min(to, value + stepSize);
-		const decimals = stepSize < 1 ? Math.max(1, Math.ceil(-Math.log10(stepSize))) : 0;
-		newValue = Math.round(newValue * Math.pow(10, decimals)) / Math.pow(10, decimals);
-		value = newValue;
-		valueModified();
-	}
+	CustomTextField {
+		id: textField
 
-	decimals: stepSize < 1 ? Math.max(1, Math.ceil(-Math.log10(stepSize))) : 0
-	editable: true
-	implicitHeight: Math.max(up.indicator.implicitHeight, down.indicator.implicitHeight, contentItem.implicitHeight) + topPadding + bottomPadding
-	implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
-	leftPadding: up.indicator.implicitWidth + Tokens.spacing.extraSmall / 2
-	rightPadding: down.indicator.implicitWidth + Tokens.spacing.extraSmall / 2
-	spacing: Tokens.spacing.small
-
-	contentItem: TextFieldBase {
-		horizontalAlignment: TextField.AlignHCenter
-		implicitWidth: 65
+		color: root.enabled ? DynamicColors.palette.m3onSurface : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
+		implicitHeight: upButton.implicitHeight
 		inputMethodHints: Qt.ImhFormattedNumbersOnly
-		leftPadding: Tokens.padding.larger
-		readOnly: !root.editable
-		rightPadding: Tokens.padding.larger
-		text: root.textFromValue(root.value, root.locale)
-		validator: root.validator
+		leftPadding: Appearance.padding.normal
+		padding: Appearance.padding.small
+		rightPadding: Appearance.padding.normal
+		text: root.isEditing ? text : root.displayText
 
 		background: CustomRect {
-			color: Colors.layer(Colors.palette.m3surfaceContainerHighest, root.cLayer)
-			radius: Tokens.rounding.extraSmall
+			color: root.enabled ? DynamicColors.tPalette.m3surfaceContainerHigh : DynamicColors.tPalette.m3surfaceContainerLow
+			implicitWidth: 100
+			radius: Appearance.rounding.full
+		}
+		validator: DoubleValidator {
+			bottom: root.min
+			decimals: root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0
+			top: root.max
+		}
+
+		onAccepted: {
+			const numValue = parseFloat(text);
+			if (!isNaN(numValue)) {
+				const clampedValue = Math.max(root.min, Math.min(root.max, numValue));
+				root.value = clampedValue;
+				root.displayText = clampedValue.toString();
+				root.valueModified(clampedValue);
+			} else {
+				text = root.displayText;
+			}
+			root.isEditing = false;
+		}
+		onActiveFocusChanged: {
+			if (activeFocus) {
+				root.isEditing = true;
+			} else {
+				root.isEditing = false;
+				root.displayText = root.value.toString();
+			}
+		}
+		onEditingFinished: {
+			if (text !== root.displayText) {
+				const numValue = parseFloat(text);
+				if (!isNaN(numValue)) {
+					const clampedValue = Math.max(root.min, Math.min(root.max, numValue));
+					root.value = clampedValue;
+					root.displayText = clampedValue.toString();
+					root.valueModified(clampedValue);
+				} else {
+					text = root.displayText;
+				}
+			}
+			root.isEditing = false;
 		}
 	}
-	down.indicator: IconButton {
-		id: downButton
 
-		bottomRightRadius: pressed ? Tokens.rounding.small : Tokens.rounding.extraSmall
-		color: enabled ? Colors.layer(Colors.palette.m3surfaceContainerHighest, root.cLayer) : disabledColor
-		disabledColor: Qt.alpha(Colors.palette.m3surfaceContainerHighest, 0.4)
-		icon: "remove"
-		isRound: true
-		label.anchors.horizontalCenterOffset: pressed ? 0 : 2
-		padding: Tokens.padding.extraSmall
-		topRightRadius: pressed ? Tokens.rounding.small : Tokens.rounding.extraSmall
-		type: IconButton.Text
-
-		Behavior on bottomRightRadius {
-			Anim {
-				type: Anim.DefaultEffects
-			}
-		}
-		Behavior on label.anchors.horizontalCenterOffset {
-			Anim {
-				type: Anim.DefaultEffects
-			}
-		}
-		Behavior on topRightRadius {
-			Anim {
-				type: Anim.DefaultEffects
-			}
-		}
-	}
-	up.indicator: IconButton {
+	CustomRect {
 		id: upButton
 
-		anchors.right: parent.right
-		bottomLeftRadius: pressed ? Tokens.rounding.small : Tokens.rounding.extraSmall
-		color: enabled ? Colors.layer(Colors.palette.m3surfaceContainerHighest, root.cLayer) : disabledColor
-		disabledColor: Qt.alpha(Colors.palette.m3surfaceContainerHighest, 0.4)
-		icon: "add"
-		isRound: true
-		label.anchors.horizontalCenterOffset: pressed ? 0 : -2
-		padding: Tokens.padding.extraSmall
-		topLeftRadius: pressed ? Tokens.rounding.small : Tokens.rounding.extraSmall
-		type: IconButton.Text
+		color: root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 1)
+		implicitHeight: upIcon.implicitHeight + Appearance.padding.small * 2
+		implicitWidth: implicitHeight
+		radius: Appearance.rounding.full
 
-		Behavior on bottomLeftRadius {
-			Anim {
-				type: Anim.DefaultEffects
+		StateLayer {
+			id: upState
+
+			color: DynamicColors.palette.m3onPrimary
+
+			onClicked: {
+				let newValue = Math.min(root.max, root.value + root.step);
+				// Round to avoid floating point precision errors
+				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
+				newValue = Math.round(newValue * Math.pow(10, decimals)) / Math.pow(10, decimals);
+				root.value = newValue;
+				root.displayText = newValue.toString();
+				root.valueModified(newValue);
 			}
+			onPressAndHold: timer.start()
+			onReleased: timer.stop()
 		}
-		Behavior on label.anchors.horizontalCenterOffset {
-			Anim {
-				type: Anim.DefaultEffects
-			}
+
+		MaterialIcon {
+			id: upIcon
+
+			anchors.centerIn: parent
+			color: root.enabled ? DynamicColors.palette.m3onPrimary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
+			text: "keyboard_arrow_up"
 		}
-		Behavior on topLeftRadius {
-			Anim {
-				type: Anim.DefaultEffects
+	}
+
+	CustomRect {
+		color: root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 1)
+		implicitHeight: downIcon.implicitHeight + Appearance.padding.small * 2
+		implicitWidth: implicitHeight
+		radius: Appearance.rounding.full
+
+		StateLayer {
+			id: downState
+
+			color: DynamicColors.palette.m3onPrimary
+
+			onClicked: {
+				let newValue = Math.max(root.min, root.value - root.step);
+				// Round to avoid floating point precision errors
+				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
+				newValue = Math.round(newValue * Math.pow(10, decimals)) / Math.pow(10, decimals);
+				root.value = newValue;
+				root.displayText = newValue.toString();
+				root.valueModified(newValue);
 			}
+			onPressAndHold: timer.start()
+			onReleased: timer.stop()
+		}
+
+		MaterialIcon {
+			id: downIcon
+
+			anchors.centerIn: parent
+			color: root.enabled ? DynamicColors.palette.m3onPrimary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
+			text: "keyboard_arrow_down"
 		}
 	}
 
 	Timer {
 		id: timer
 
-		interval: root.repeatRate
+		interval: 100
 		repeat: true
-		running: upButton.pressed || downButton.pressed
 		triggeredOnStart: true
 
-		onRunningChanged: {
-			if (!running)
-				interval = root.repeatRate;
-		}
 		onTriggered: {
-			if (upButton.pressed)
-				root.increase();
-			else if (downButton.pressed)
-				root.decrease();
-			if (interval > root.repeatDecay)
-				interval -= root.repeatDecay;
+			if (upState.pressed)
+				upState.onClicked();
+			else if (downState.pressed)
+				downState.onClicked();
 		}
 	}
 }

Components/CustomSplitButton.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Row {
 	id: root
@@ -12,14 +11,14 @@ Row {
 	}
 
 	property alias active: menu.active
-	property color color: type == CustomSplitButton.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)
+	property color color: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
+	property color disabledColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color disabledTextColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
 	readonly property alias expandBtn: expandBtn
 	property alias expanded: menu.expanded
 	property string fallbackIcon
 	property string fallbackText
-	property real horizontalPadding: Tokens.padding.larger
+	property real horizontalPadding: Appearance.padding.larger
 	readonly property alias iconLabel: iconLabel
 	readonly property alias label: label
 	readonly property alias menu: menu
@@ -27,20 +26,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 == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
 	readonly property alias textRow: textRow
 	property int type: CustomSplitButton.Filled
-	property real verticalPadding: Tokens.padding.small
+	property real verticalPadding: Appearance.padding.small
 
-	spacing: Math.floor(Tokens.spacing.extraSmall)
+	spacing: Math.floor(Appearance.spacing.extraSmall)
 
 	CustomRect {
-		bottomRightRadius: Tokens.rounding.small / 2
+		bottomRightRadius: Appearance.rounding.small / 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
+		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
+		topRightRadius: Appearance.rounding.small / 2
 
 		StateLayer {
 			id: stateLayer
@@ -58,7 +57,7 @@ Row {
 
 			anchors.centerIn: parent
 			anchors.horizontalCenterOffset: Math.floor(root.verticalPadding / 4)
-			spacing: Tokens.spacing.small
+			spacing: Appearance.spacing.small
 
 			MaterialIcon {
 				id: iconLabel
@@ -92,13 +91,13 @@ 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, Appearance.rounding.scale) : Appearance.rounding.small / 2
 
 		bottomLeftRadius: rad
 		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandIcon.implicitHeight + root.verticalPadding * 2
 		implicitWidth: implicitHeight
-		radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
+		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
 		topLeftRadius: rad
 
 		Behavior on rad {
@@ -142,7 +141,7 @@ Row {
 
 		attachSideY: root.menuOnTop ? Menu.Top : Menu.Bottom
 		attachTo: expandBtn
-		marginY: Tokens.spacing.small * (root.menuOnTop ? -1 : 1)
+		marginY: Appearance.spacing.small * (root.menuOnTop ? -1 : 1)
 		thisSideY: root.menuOnTop ? Menu.Bottom : Menu.Top
 	}
 }

Components/CustomSplitButtonRow.qml

@@ -2,8 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Item {
 	id: root
@@ -22,7 +21,7 @@ Item {
 	anchors.left: parent.left
 	anchors.right: parent.right
 	clip: false
-	implicitHeight: row.implicitHeight + Tokens.padding.smaller * 2
+	implicitHeight: row.implicitHeight + Appearance.padding.smaller * 2
 	opacity: shouldBeActive ? 1 : 0
 	scale: shouldBeActive ? 1 : 0.8
 	z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
@@ -40,15 +39,15 @@ Item {
 		id: row
 
 		anchors.left: parent.left
-		anchors.margins: Tokens.padding.small
+		anchors.margins: Appearance.padding.small
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
-		spacing: Tokens.spacing.normal
+		spacing: Appearance.spacing.normal
 
 		CustomText {
 			Layout.fillWidth: true
-			color: root.enabled ? Colors.palette.m3onSurface : Colors.palette.m3onSurfaceVariant
-			font.pointSize: Tokens.font.size.larger
+			color: root.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSurfaceVariant
+			font.pointSize: Appearance.font.size.larger
 			text: root.label
 		}
 

Components/CustomSwitch.qml

@@ -1,8 +1,7 @@
 import QtQuick
 import QtQuick.Shapes
 import QtQuick.Templates
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Switch {
 	id: root
@@ -13,20 +12,20 @@ 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: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
+		implicitHeight: Appearance.font.size.medium + Appearance.padding.normal * 2
 		implicitWidth: implicitHeight * 1.7
-		radius: Tokens.rounding.full
+		radius: Appearance.rounding.full
 
 		CustomRect {
 			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)
-			implicitHeight: parent.implicitHeight - Tokens.padding.extraSmall
+			color: root.checked && root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
+			implicitHeight: parent.implicitHeight - Appearance.padding.extraSmall
 			implicitWidth: nonAnimWidth
-			radius: Tokens.rounding.full
-			x: root.checked ? parent.implicitWidth - nonAnimWidth - Tokens.padding.extraSmall / 2 : Tokens.padding.extraSmall / 2
+			radius: Appearance.rounding.full
+			x: root.checked ? parent.implicitWidth - nonAnimWidth - Appearance.padding.extraSmall / 2 : Appearance.padding.extraSmall / 2
 
 			Behavior on implicitWidth {
 				Anim {
@@ -41,7 +40,7 @@ Switch {
 
 			CustomRect {
 				anchors.fill: parent
-				color: root.checked && root.enabled ? Colors.palette.m3primary : Colors.palette.m3onSurface
+				color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
 				opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0
 				radius: parent.radius
 
@@ -92,7 +91,7 @@ Switch {
 
 				anchors.centerIn: parent
 				asynchronous: true
-				height: parent.implicitHeight - Tokens.padding.larger
+				height: parent.implicitHeight - Appearance.padding.larger
 				preferredRendererType: Shape.CurveRenderer
 				width: height
 
@@ -118,8 +117,8 @@ Switch {
 					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: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
+					strokeWidth: Appearance.font.size.larger * 0.15
 
 					Behavior on strokeColor {
 						CAnim {
@@ -152,7 +151,7 @@ Switch {
 	}
 
 	component PropAnim: PropertyAnimation {
-		duration: Tokens.anim.durations.expressiveFastSpatial
-		easing.bezierCurve: Tokens.anim.curves.expressiveFastSpatial
+		duration: Appearance.anim.durations.expressiveFastSpatial
+		easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
 	}
 }

Components/CustomText.qml

@@ -1,8 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Text {
 	id: root
@@ -13,10 +12,10 @@ Text {
 	property string animateProp: "scale"
 	property real animateTo: 1
 
-	color: Colors.palette.m3onSurface
-	font.family: Config.appearance.font.family.sans
-	font.pointSize: Tokens.font.size.normal
-	linkColor: Colors.palette.m3onPrimaryFixedVariant
+	color: DynamicColors.palette.m3onSurface
+	font.family: Appearance.font.family.sans
+	font.pointSize: Appearance.font.size.normal
+	linkColor: DynamicColors.palette.m3onPrimaryFixedVariant
 	renderType: Text.NativeRendering
 	textFormat: Text.PlainText
 

Components/CustomTextField.qml

@@ -1,303 +1,77 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtQuick.Shapes
-import ZShell.Config
-import qs.Services
+import QtQuick.Controls
+import qs.Config
 
-TextFieldBase {
+TextField {
 	id: root
 
-	enum TextFieldType {
-		Outlined,
-		Filled
-	}
+	property int cursorHeight: root.height
 
-	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
-	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
-	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
-	property alias sLayer: stateLayer
-	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
+	background: null
+	color: DynamicColors.palette.m3onSurface
+	cursorVisible: !readOnly
+	font.family: Appearance.font.family.sans
+	font.pointSize: Appearance.font.size.smaller
+	placeholderTextColor: DynamicColors.palette.m3outline
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
 
-	bottomPadding: Tokens.padding.large + supportingTextOffset - filledOffset
-	leftPadding: horizontalPadding + leadingOffset
-	rightPadding: horizontalPadding + trailingOffset
-	topPadding: Tokens.padding.large + 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
+	Behavior on color {
+		CAnim {
 		}
 	}
+	cursorDelegate: CustomRect {
+		id: cursor
 
-	onEditingFinished: {
-		if (!valid)
-			isError = true;
-	}
-	onPressed: {
-		if (stateLayer.enabled)
-			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
-	}
-	onTextEdited: {
-		if (isError)
-			isError = false;
-	}
+		property bool disableBlink
 
-	Item {
-		id: contentWrapper
+		color: DynamicColors.palette.m3primary
+		implicitWidth: 2
+		radius: Appearance.rounding.normal
 
-		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 {
-					properties: "scale,leftMargin"
-					type: Anim.DefaultEffects
-				}
-
-				AnchorAnim {
-					duration: Tokens.anim.durations.expressiveEffects
-					easing.bezierCurve: Tokens.anim.curves.expressiveEffects
-				}
+		Behavior on opacity {
+			Anim {
+				duration: Appearance.anim.durations.small
 			}
 		}
 
-		Loader {
-			id: leadingIconLoader
-
-			active: root.leadingIcon
-			anchors.left: parent.left
-			anchors.leftMargin: Tokens.padding.normal
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				font.pointSize: Tokens.font.size.larger
-				text: root.leadingIcon
-			}
-		}
-
-		Loader {
-			id: trailingIconLoader
-
-			active: root.trailingIcon
-			anchors.right: parent.right
-			anchors.rightMargin: Tokens.padding.normal
-			anchors.verticalCenter: parent.verticalCenter
-
-			sourceComponent: MaterialIcon {
-				color: Colors.palette.m3onSurfaceVariant
-				text: root.trailingIcon
-			}
-		}
-	}
-
-	Loader {
-		id: supportingTextLoader
-
-		active: root.effectiveSupportingText
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
-		anchors.leftMargin: root.horizontalPadding
-
-		sourceComponent: CustomText {
-			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
-			font.pointSize: Tokens.font.size.small
-			text: root.effectiveSupportingText
-		}
-	}
-
-	TapHandler {
-		id: tapHandler
-	}
-
-	Component {
-		id: outlineComp
-
-		Shape {
-			id: bg
-
-			asynchronous: true
-			preferredRendererType: Shape.CurveRenderer
-
-			ShapePath {
-				id: path
-
-				readonly property real inset: strokeWidth / 2
-				readonly property real outlineGap: placeholder.width * root.smallFontScale + Tokens.spacing.small * 2
-				property real outlineGapScale: root.activeFocus || root.text ? 1 : 0
-
-				capStyle: ShapePath.RoundCap
-				fillColor: "transparent"
-				startX: path.inset + root.horizontalPadding - root.clampedRadius + path.outlineGap * (1 - path.outlineGapScale) / 2 + path.outlineGap * path.outlineGapScale
-				startY: path.inset
-				strokeColor: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
-				strokeWidth: root.activeFocus ? 2 : 1
-
-				Behavior on outlineGapScale {
-					Anim {
-						type: Anim.DefaultEffects
-					}
-				}
-				Behavior on strokeColor {
-					CAnim {
-					}
-				}
-				Behavior on strokeWidth {
-					Anim {
-					}
-				}
-
-				PathLine {
-					x: bg.width - path.inset - root.clampedRadius
-					y: path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathLine {
-					x: bg.width - path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: bg.width - path.inset - root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.clampedRadius
-					y: bg.height - path.inset
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset
-					y: bg.height - path.inset - root.clampedRadius
-				}
-
-				PathLine {
-					x: path.inset
-					y: path.inset + root.clampedRadius
-				}
-
-				PathArc {
-					radiusX: root.clampedRadius
-					radiusY: root.clampedRadius
-					x: path.inset + root.clampedRadius
-					y: path.inset
-				}
-
-				PathLine {
-					x: path.inset + root.horizontalPadding - root.clampedRadius / 2 + path.outlineGap * (1 - path.outlineGapScale) / 2
-					y: path.inset
+		Connections {
+			function onCursorPositionChanged(): void {
+				if (root.activeFocus && root.cursorVisible) {
+					cursor.opacity = 1;
+					cursor.disableBlink = true;
+					enableBlink.restart();
 				}
 			}
+
+			target: root
+		}
+
+		Timer {
+			id: enableBlink
+
+			interval: 100
+
+			onTriggered: cursor.disableBlink = false
+		}
+
+		Timer {
+			interval: 500
+			repeat: true
+			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+			triggeredOnStart: true
+
+			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+		}
+
+		Binding {
+			cursor.opacity: 0
+			when: !root.activeFocus || !root.cursorVisible
 		}
 	}
-
-	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 {
 		}
 	}
 }

Components/CustomTextInput.qml

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

Components/CustomTooltip.qml

@@ -0,0 +1,25 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Components
+
+ToolTip {
+	id: root
+
+	property bool alternativeVisibleCondition: false
+	property bool extraVisibleCondition: true
+	readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition
+
+	background: null
+	horizontalPadding: 10
+	verticalPadding: 5
+	visible: internalVisibleCondition
+
+	contentItem: CustomTooltipContent {
+		id: contentItem
+
+		horizontalPadding: root.horizontalPadding
+		shown: root.internalVisibleCondition
+		text: root.text
+		verticalPadding: root.verticalPadding
+	}
+}

Components/CustomTooltipContent.qml

@@ -0,0 +1,54 @@
+import QtQuick
+import qs.Components
+import qs.Config
+
+Item {
+	id: root
+
+	property real horizontalPadding: 10
+	property bool isVisible: backgroundRectangle.implicitHeight > 0
+	property bool shown: false
+	required property string text
+	property real verticalPadding: 5
+
+	implicitHeight: tooltipTextObject.implicitHeight + 2 * root.verticalPadding
+	implicitWidth: tooltipTextObject.implicitWidth + 2 * root.horizontalPadding
+
+	Rectangle {
+		id: backgroundRectangle
+
+		clip: true
+		color: DynamicColors.tPalette.m3inverseSurface ?? "#3C4043"
+		implicitHeight: shown ? (tooltipTextObject.implicitHeight + 2 * root.verticalPadding) : 0
+		implicitWidth: shown ? (tooltipTextObject.implicitWidth + 2 * root.horizontalPadding) : 0
+		opacity: shown ? 1 : 0
+		radius: Appearance.rounding.smallest
+
+		Behavior on implicitHeight {
+			Anim {
+			}
+		}
+		Behavior on implicitWidth {
+			Anim {
+			}
+		}
+		Behavior on opacity {
+			Anim {
+			}
+		}
+
+		anchors {
+			bottom: root.bottom
+			horizontalCenter: root.horizontalCenter
+		}
+
+		CustomText {
+			id: tooltipTextObject
+
+			anchors.centerIn: parent
+			color: DynamicColors.palette.m3inverseOnSurface ?? "#FFFFFF"
+			text: root.text
+			wrapMode: Text.Wrap
+		}
+	}
+}

Components/Elevation.qml

@@ -1,14 +1,13 @@
 import QtQuick
 import QtQuick.Effects
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 RectangularShadow {
 	property real dp: [0, 1, 3, 6, 8, 12][level]
 	property int level
 
 	blur: (dp * 5) ** 0.7
-	color: Qt.alpha(Colors.palette.m3shadow, 0.7)
+	color: Qt.alpha(DynamicColors.palette.m3shadow, 0.7)
 	offset.y: dp / 2
 	spread: -dp * 0.3 + (dp * 0.1) ** 2
 

Components/ExtraIndicator.qml

@@ -0,0 +1,44 @@
+import qs.Config
+import QtQuick
+
+CustomRect {
+	required property int extra
+
+	anchors.margins: 8
+	anchors.right: parent.right
+	color: DynamicColors.palette.m3tertiary
+	implicitHeight: count.implicitHeight + 4 * 2
+	implicitWidth: count.implicitWidth + 8 * 2
+	opacity: extra > 0 ? 1 : 0
+	radius: Appearance.rounding.smallest
+	scale: extra > 0 ? 1 : 0.5
+
+	Behavior on opacity {
+		Anim {
+			duration: MaterialEasing.expressiveEffectsTime
+		}
+	}
+	Behavior on scale {
+		Anim {
+			duration: MaterialEasing.expressiveEffectsTime
+			easing.bezierCurve: MaterialEasing.expressiveEffects
+		}
+	}
+
+	Elevation {
+		anchors.fill: parent
+		level: 2
+		opacity: parent.opacity
+		radius: parent.radius
+		z: -1
+	}
+
+	CustomText {
+		id: count
+
+		anchors.centerIn: parent
+		animate: parent.opacity > 0
+		color: DynamicColors.palette.m3onTertiary
+		text: qsTr("+%1").arg(parent.extra)
+	}
+}

Components/FadeImage.qml

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

Components/FilledSlider.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ZShell.Config
+import qs.Config
 
 BaseStyledSlider {
 	id: root

Components/GradientSlider.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ZShell.Config
+import qs.Config
 
 BaseStyledSlider {
 	id: root

Components/HoverIconButton.qml

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

Components/IconButton.qml

@@ -1,6 +1,5 @@
 import QtQuick
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 ButtonBase {
 	id: root
@@ -8,8 +7,8 @@ ButtonBase {
 	property alias icon: label.text
 	readonly property alias label: label
 
-	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
+	activeColor: type === IconButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondary
+	activeOnColor: type === IconButton.Filled ? DynamicColors.palette.m3onPrimary : type === IconButton.Tonal ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3primary
 	implicitHeight: {
 		const h = label.implicitHeight + padding * 2;
 		if (h % 2 !== 0)
@@ -19,15 +18,15 @@ ButtonBase {
 	implicitWidth: implicitHeight
 	inactiveColor: {
 		if (!isToggle && type === IconButton.Filled)
-			return Colors.palette.m3primary;
-		return type === IconButton.Filled ? Colors.tPalette.m3surfaceContainer : Colors.palette.m3secondaryContainer;
+			return DynamicColors.palette.m3primary;
+		return type === IconButton.Filled ? DynamicColors.tPalette.m3surfaceContainer : DynamicColors.palette.m3secondaryContainer;
 	}
 	inactiveOnColor: {
 		if (!isToggle && type === IconButton.Filled)
-			return Colors.palette.m3onPrimary;
-		return type === IconButton.Tonal ? Colors.palette.m3onSecondaryContainer : Colors.palette.m3onSurfaceVariant;
+			return DynamicColors.palette.m3onPrimary;
+		return type === IconButton.Tonal ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurfaceVariant;
 	}
-	padding: type === IconButton.Text ? Tokens.padding.extraSmall / 2 : Tokens.padding.small
+	padding: type === IconButton.Text ? Appearance.padding.extraSmall / 2 : Appearance.padding.small
 
 	MaterialIcon {
 		id: label

Components/IconTextButton.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 ButtonBase {
 	id: root
@@ -11,34 +10,34 @@ ButtonBase {
 	readonly property alias label: label
 	property alias text: label.text
 
-	activeColor: type === TextButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondary
+	activeColor: type === TextButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondary
 	activeOnColor: {
 		if (type === TextButton.Text)
-			return Colors.palette.m3primary;
-		return type === TextButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondary;
+			return DynamicColors.palette.m3primary;
+		return type === TextButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondary;
 	}
-	horizontalPadding: Tokens.padding.larger
+	horizontalPadding: Appearance.padding.larger
 	implicitHeight: row.implicitHeight + verticalPadding * 2
 	implicitWidth: row.implicitWidth + horizontalPadding * 2
 	inactiveColor: {
 		if (!isToggle && type === TextButton.Filled)
-			return Colors.palette.m3primary;
-		return type === TextButton.Filled ? Colors.tPalette.m3surfaceContainer : Colors.palette.m3secondaryContainer;
+			return DynamicColors.palette.m3primary;
+		return type === TextButton.Filled ? DynamicColors.tPalette.m3surfaceContainer : DynamicColors.palette.m3secondaryContainer;
 	}
 	inactiveOnColor: {
 		if (!isToggle && type === TextButton.Filled)
-			return Colors.palette.m3onPrimary;
+			return DynamicColors.palette.m3onPrimary;
 		if (type === TextButton.Text)
-			return Colors.palette.m3primary;
-		return type === TextButton.Filled ? Colors.palette.m3onSurface : Colors.palette.m3onSecondaryContainer;
+			return DynamicColors.palette.m3primary;
+		return type === TextButton.Filled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSecondaryContainer;
 	}
-	verticalPadding: Tokens.padding.small
+	verticalPadding: Appearance.padding.small
 
 	RowLayout {
 		id: row
 
 		anchors.centerIn: parent
-		spacing: Tokens.spacing.small
+		spacing: Appearance.spacing.small
 
 		MaterialIcon {
 			id: iconLabel
@@ -64,7 +63,6 @@ ButtonBase {
 			id: label
 
 			Layout.alignment: Qt.AlignVCenter
-			Layout.topMargin: -1
 			color: root.onColor
 			font: root.font
 		}

Components/LoadingIndicator.qml

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

Components/MarqueeText.qml

@@ -1,13 +1,12 @@
 import QtQuick
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 Item {
 	id: root
 
 	property alias anim: marqueeAnim
 	property bool animate: false
-	property color color: Colors.palette.m3onSurface
+	property color color: DynamicColors.palette.m3onSurface
 	property int fadeStrengthAnimMs: 180
 	property real fadeStrengthIdle: 0.0
 	property real fadeStrengthMoving: 1.0
@@ -18,14 +17,13 @@ Item {
 	property real leftFadeStrength: overflowing && leftFadeEnabled ? fadeStrengthMoving : fadeStrengthIdle
 	property int leftFadeWidth: 28
 	property bool marqueeEnabled: true
-	readonly property bool overflowing: metrics.width > content.width
+	readonly property bool overflowing: metrics.width > root.width
 	property int pauseMs: 1200
 	property real pixelsPerSecond: 40
 	property real rightFadeStrength: overflowing ? fadeStrengthMoving : fadeStrengthIdle
 	property int rightFadeWidth: 28
 	property bool sliding: false
 	property alias text: elideText.text
-	property bool vertical: false
 
 	function durationForDistance(px): int {
 		return Math.max(1, Math.round(Math.abs(px) / root.pixelsPerSecond * 1000));
@@ -42,9 +40,8 @@ Item {
 		}
 	}
 
-	clip: false
-	implicitHeight: vertical ? elideText.implicitWidth : elideText.implicitHeight
-	implicitWidth: vertical ? elideText.implicitHeight : elideText.implicitWidth
+	clip: true
+	implicitHeight: elideText.implicitHeight
 
 	Behavior on leftFadeStrength {
 		Anim {
@@ -55,187 +52,171 @@ Item {
 		}
 	}
 
-	onHeightChanged: resetMarquee()
 	onTextChanged: resetMarquee()
-	onVerticalChanged: resetMarquee()
 	onVisibleChanged: if (!visible)
 		resetMarquee()
 	onWidthChanged: resetMarquee()
 
+	TextMetrics {
+		id: metrics
+
+		font: elideText.font
+		text: elideText.text
+	}
+
+	CustomText {
+		id: elideText
+
+		anchors.verticalCenter: parent.verticalCenter
+		animate: root.animate
+		animateProp: "scale,opacity"
+		color: root.color
+		elide: Text.ElideNone
+		visible: !root.overflowing
+		width: root.width
+	}
+
 	Item {
-		id: content
+		id: marqueeViewport
 
-		anchors.centerIn: parent
-		height: root.vertical ? root.width : root.height
-		width: root.vertical ? root.height : root.width
+		anchors.fill: parent
+		clip: true
+		layer.enabled: true
+		visible: root.overflowing
 
-		transform: Rotation {
-			angle: root.vertical ? -90 : 0
-			origin.x: content.width / 2
-			origin.y: content.height / 2
-		}
-
-		TextMetrics {
-			id: metrics
-
-			font: elideText.font
-			text: elideText.text
-		}
-
-		CustomText {
-			id: elideText
-
-			anchors.verticalCenter: parent.verticalCenter
-			animate: root.animate
-			animateProp: "scale,opacity"
-			color: root.color
-			elide: Text.ElideNone
-			visible: !root.overflowing
-			width: content.width
+		layer.effect: OpacityMask {
+			maskSource: rightFadeMask
 		}
 
 		Item {
-			id: marqueeViewport
+			id: strip
 
-			anchors.fill: parent
-			clip: false
-			layer.enabled: true
-			visible: root.overflowing
+			anchors.verticalCenter: parent.verticalCenter
+			height: t1.implicitHeight
+			width: t1.width + root.gap + t2.width
+			x: 0
 
-			layer.effect: OpacityMask {
-				maskSource: rightFadeMask
+			CustomText {
+				id: t1
+
+				animate: root.animate
+				animateProp: "opacity"
+				color: root.color
+				font.pointSize: elideText.font.pointSize
+				text: elideText.text
 			}
 
-			Item {
-				id: strip
+			CustomText {
+				id: t2
 
-				anchors.verticalCenter: parent.verticalCenter
-				height: t1.implicitHeight
-				width: t1.width + root.gap + t2.width
-				x: 0
+				animate: root.animate
+				animateProp: "opacity"
+				color: root.color
+				font.pointSize: elideText.font.pointSize
+				text: t1.text
+				x: t1.width + root.gap
+			}
+		}
 
-				CustomText {
-					id: t1
+		SequentialAnimation {
+			id: marqueeAnim
 
-					animate: root.animate
-					animateProp: "opacity"
-					color: root.color
-					font.pointSize: elideText.font.pointSize
-					text: elideText.text
-				}
+			running: false
 
-				CustomText {
-					id: t2
+			onFinished: pauseTimer.restart()
 
-					animate: root.animate
-					animateProp: "opacity"
-					color: root.color
-					font.pointSize: elideText.font.pointSize
-					text: t1.text
-					x: t1.width + root.gap
+			ScriptAction {
+				script: {
+					root.sliding = true;
+					root.leftFadeEnabled = true;
 				}
 			}
 
-			SequentialAnimation {
-				id: marqueeAnim
+			Anim {
+				duration: root.durationForDistance(t1.width)
+				easing.bezierCurve: Easing.Linear
+				easing.type: Easing.Linear
+				from: 0
+				property: "x"
+				target: strip
+				to: -t1.width
+			}
 
-				running: false
-
-				onFinished: pauseTimer.restart()
-
-				ScriptAction {
-					script: {
-						root.sliding = true;
-						root.leftFadeEnabled = true;
-					}
-				}
-
-				Anim {
-					duration: root.durationForDistance(t1.width)
-					easing.bezierCurve: Easing.Linear
-					easing.type: Easing.Linear
-					from: 0
-					property: "x"
-					target: strip
-					to: -t1.width
-				}
-
-				ScriptAction {
-					script: {
-						root.leftFadeEnabled = false;
-					}
-				}
-
-				Anim {
-					duration: root.durationForDistance(root.gap)
-					easing.bezierCurve: Easing.Linear
-					easing.type: Easing.Linear
-					from: -t1.width
-					property: "x"
-					target: strip
-					to: -(t1.width + root.gap)
-				}
-
-				ScriptAction {
-					script: {
-						root.sliding = false;
-						strip.x = 0;
-					}
+			ScriptAction {
+				script: {
+					root.leftFadeEnabled = false;
 				}
 			}
 
-			Timer {
-				id: pauseTimer
+			Anim {
+				duration: root.durationForDistance(root.gap)
+				easing.bezierCurve: Easing.Linear
+				easing.type: Easing.Linear
+				from: -t1.width
+				property: "x"
+				target: strip
+				to: -(t1.width + root.gap)
+			}
 
-				interval: root.pauseMs
-				repeat: false
-				running: true
-
-				onTriggered: {
-					if (root.marqueeEnabled)
-						marqueeAnim.start();
+			ScriptAction {
+				script: {
+					root.sliding = false;
+					strip.x = 0;
 				}
 			}
 		}
 
-		Rectangle {
-			id: rightFadeMask
+		Timer {
+			id: pauseTimer
 
-			readonly property real fadeStartPos: {
-				const w = Math.max(1, width);
-				return Math.max(0, Math.min(1, (w - root.rightFadeWidth) / w));
+			interval: root.pauseMs
+			repeat: false
+			running: true
+
+			onTriggered: {
+				if (root.marqueeEnabled)
+					marqueeAnim.start();
 			}
-			readonly property real leftFadeEndPos: {
-				const w = Math.max(1, width);
-				return Math.max(0, Math.min(1, root.leftFadeWidth / w));
+		}
+	}
+
+	Rectangle {
+		id: rightFadeMask
+
+		readonly property real fadeStartPos: {
+			const w = Math.max(1, width);
+			return Math.max(0, Math.min(1, (w - root.rightFadeWidth) / w));
+		}
+		readonly property real leftFadeEndPos: {
+			const w = Math.max(1, width);
+			return Math.max(0, Math.min(1, root.leftFadeWidth / w));
+		}
+
+		anchors.fill: marqueeViewport
+		layer.enabled: true
+		visible: false
+
+		gradient: Gradient {
+			orientation: Gradient.Horizontal
+
+			GradientStop {
+				color: Qt.rgba(1, 1, 1, 1.0 - root.leftFadeStrength)
+				position: 0.0
 			}
 
-			anchors.fill: marqueeViewport
-			layer.enabled: true
-			visible: false
+			GradientStop {
+				color: Qt.rgba(1, 1, 1, 1.0)
+				position: rightFadeMask.leftFadeEndPos
+			}
 
-			gradient: Gradient {
-				orientation: Gradient.Horizontal
+			GradientStop {
+				color: Qt.rgba(1, 1, 1, 1.0)
+				position: rightFadeMask.fadeStartPos
+			}
 
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 1.0 - root.leftFadeStrength)
-					position: 0.0
-				}
-
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 1.0)
-					position: rightFadeMask.leftFadeEndPos
-				}
-
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 1.0)
-					position: rightFadeMask.fadeStartPos
-				}
-
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 1.0 - root.rightFadeStrength)
-					position: 1.0
-				}
+			GradientStop {
+				color: Qt.rgba(1, 1, 1, 1.0 - root.rightFadeStrength)
+				position: 1.0
 			}
 		}
 	}

Components/MaterialIcon.qml

@@ -1,12 +1,11 @@
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 CustomText {
 	id: root
 
 	readonly property list<int> allowed: [20, 24, 40, 48]
 	property real fill: 0
-	property int grade: Colors.light ? 0 : -25
+	property int grade: DynamicColors.light ? 0 : -25
 	readonly property int opsz: clampOpsz(optical)
 	property int optical: fontInfo.pixelSize
 
@@ -17,7 +16,7 @@ CustomText {
 	}
 
 	font.family: "Material Symbols Rounded"
-	font.pointSize: Tokens.font.size.larger
+	font.pointSize: Appearance.font.size.larger
 	font.variableAxes: ({
 			FILL: fill,
 			GRAD: grade,

Components/Menu.qml

@@ -3,9 +3,8 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
-import ZShell.Config
+import qs.Config
 import qs.Drawers
-import qs.Services
 
 MouseArea {
 	id: root
@@ -31,9 +30,8 @@ MouseArea {
 	signal itemSelected(item: MenuItem)
 
 	anchors.fill: parent
-	cursorShape: expanded ? Qt.ArrowCursor : undefined
+	cursorShape: undefined
 	enabled: expanded
-	hoverEnabled: expanded
 	layer.enabled: opacity < 1
 	opacity: expanded ? 1 : 0
 	parent: {
@@ -78,7 +76,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: Appearance.rounding.medium
 		x: {
 			watcher.transform;
 			const item = root.attachTo;
@@ -108,15 +106,15 @@ MouseArea {
 
 		CustomRect {
 			anchors.fill: parent
-			color: Colors.palette.m3surfaceContainerLow
+			color: DynamicColors.palette.m3surfaceContainerLow
 			radius: parent.radius
 
 			ColumnLayout {
 				id: column
 
 				anchors.fill: parent
-				anchors.margins: Tokens.padding.extraSmall
-				spacing: Tokens.spacing.extraSmall
+				anchors.margins: Appearance.padding.extraSmall
+				spacing: Appearance.spacing.extraSmall
 
 				Repeater {
 					id: repeater
@@ -126,15 +124,15 @@ MouseArea {
 					CustomRect {
 						id: item
 
-						readonly property bool active: modelData === root?.active
+						readonly property bool active: modelData === root.active
 						required property int index
 						required property MenuItem modelData
 
 						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
+						color: Qt.alpha(DynamicColors.palette.m3tertiaryContainer, active ? 1 : 0)
+						implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.larger * 2
+						implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.larger * 2
+						radius: Appearance.rounding.small
 
 						Behavior on radius {
 							Anim {
@@ -142,7 +140,7 @@ MouseArea {
 						}
 
 						StateLayer {
-							color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
+							color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
 							enabled: root.expanded
 
 							onClicked: {
@@ -157,30 +155,30 @@ MouseArea {
 							id: menuOptionRow
 
 							anchors.fill: parent
-							anchors.margins: Tokens.padding.larger
-							spacing: Tokens.spacing.small
+							anchors.margins: Appearance.padding.larger
+							spacing: Appearance.spacing.small
 
 							MaterialIcon {
 								Layout.alignment: Qt.AlignVCenter
-								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
-								text: item.modelData?.icon ?? ""
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
+								text: item.modelData.icon
 							}
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter
 								Layout.fillWidth: true
-								color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurface
-								text: item.modelData?.text ?? ""
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
+								text: item.modelData.text
 							}
 
 							Loader {
 								Layout.alignment: Qt.AlignVCenter
-								active: item.modelData?.trailingIcon.length > 0
+								active: item.modelData.trailingIcon.length > 0
 								asynchronous: true
 								visible: active
 
 								sourceComponent: MaterialIcon {
-									color: item.active ? Colors.palette.m3onTertiaryContainer : Colors.palette.m3onSurfaceVariant
+									color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
 									text: item.modelData.trailingIcon
 								}
 							}

Components/PathMenu.qml

@@ -0,0 +1,76 @@
+import QtQuick
+
+Path {
+	id: root
+
+	required property real viewHeight
+	required property real viewWidth
+
+	startX: root.viewWidth / 2
+	startY: 0
+
+	PathAttribute {
+		name: "itemOpacity"
+		value: 0.25
+	}
+
+	PathLine {
+		x: root.viewWidth / 2
+		y: root.viewHeight * (1 / 6)
+	}
+
+	PathAttribute {
+		name: "itemOpacity"
+		value: 0.45
+	}
+
+	PathLine {
+		x: root.viewWidth / 2
+		y: root.viewHeight * (2 / 6)
+	}
+
+	PathAttribute {
+		name: "itemOpacity"
+		value: 0.70
+	}
+
+	PathLine {
+		x: root.viewWidth / 2
+		y: root.viewHeight * (3 / 6)
+	}
+
+	PathAttribute {
+		name: "itemOpacity"
+		value: 1.00
+	}
+
+	PathLine {
+		x: root.viewWidth / 2
+		y: root.viewHeight * (4 / 6)
+	}
+
+	PathAttribute {
+		name: "itemOpacity"
+		value: 0.70
+	}
+
+	PathLine {
+		x: root.viewWidth / 2
+		y: root.viewHeight * (5 / 6)
+	}
+
+	PathAttribute {
+		name: "itemOpacity"
+		value: 0.45
+	}
+
+	PathLine {
+		x: root.viewWidth / 2
+		y: root.viewHeight
+	}
+
+	PathAttribute {
+		name: "itemOpacity"
+		value: 0.25
+	}
+}

Components/PathViewMenu.qml

@@ -0,0 +1,180 @@
+import QtQuick
+import QtQuick.Effects
+import qs.Config
+
+Elevation {
+	id: root
+
+	required property int currentIndex
+	property bool expanded
+	required property int from
+	property color insideTextColor: DynamicColors.palette.m3onPrimary
+	property int itemHeight
+	property int listHeight: 200
+	property color outsideTextColor: DynamicColors.palette.m3onSurfaceVariant
+	readonly property var spinnerModel: root.range(root.from, root.to)
+	required property int to
+	property Item triggerItem
+
+	signal itemSelected(item: int)
+
+	function range(first, last) {
+		let out = [];
+		for (let i = first; i <= last; ++i)
+			out.push(i);
+		return out;
+	}
+
+	implicitHeight: root.expanded ? view.implicitHeight : 0
+	level: root.expanded ? 2 : 0
+	radius: itemHeight / 2
+	visible: implicitHeight > 0
+	z: root.expanded ? 100 : 0
+
+	Behavior on implicitHeight {
+		Anim {
+		}
+	}
+
+	onExpandedChanged: {
+		if (!root.expanded)
+			root.itemSelected(view.currentIndex + 1);
+	}
+
+	Component {
+		id: spinnerDelegate
+
+		Item {
+			id: wrapper
+
+			readonly property color delegateTextColor: wrapper.PathView.view ? wrapper.PathView.view.delegateTextColor : "white"
+			required property var modelData
+
+			height: root.itemHeight
+			opacity: wrapper.PathView.itemOpacity
+			visible: wrapper.PathView.onPath
+			width: wrapper.PathView.view ? wrapper.PathView.view.width : 0
+			z: wrapper.PathView.isCurrentItem ? 100 : Math.round(wrapper.PathView.itemScale * 100)
+
+			CustomText {
+				anchors.centerIn: parent
+				color: wrapper.delegateTextColor
+				font.pointSize: Appearance.font.size.large
+				text: wrapper.modelData
+			}
+		}
+	}
+
+	CustomClippingRect {
+		anchors.fill: parent
+		color: DynamicColors.palette.m3surfaceContainer
+		radius: parent.radius
+		z: root.z
+
+		// Main visible spinner: normal/outside text color
+		PathView {
+			id: view
+
+			property color delegateTextColor: root.outsideTextColor
+
+			anchors.left: parent.left
+			anchors.right: parent.right
+			anchors.verticalCenter: parent.verticalCenter
+			clip: true
+			currentIndex: root.currentIndex - 1
+			delegate: spinnerDelegate
+			dragMargin: width
+			highlightRangeMode: PathView.StrictlyEnforceRange
+			implicitHeight: root.listHeight
+			model: root.spinnerModel
+			pathItemCount: 7
+			preferredHighlightBegin: 0.5
+			preferredHighlightEnd: 0.5
+			snapMode: PathView.SnapToItem
+
+			path: PathMenu {
+				viewHeight: view.height
+				viewWidth: view.width
+			}
+		}
+
+		// The selection rectangle itself
+		CustomRect {
+			id: selectionRect
+
+			anchors.verticalCenter: parent.verticalCenter
+			color: DynamicColors.palette.m3primary
+			height: root.itemHeight
+			radius: root.itemHeight / 2
+			width: parent.width
+			z: 2
+		}
+
+		// Hidden source: same PathView, but with the "inside selection" text color
+		Item {
+			id: selectedTextSource
+
+			anchors.fill: parent
+			layer.enabled: true
+			visible: false
+
+			PathView {
+				id: selectedTextView
+
+				property color delegateTextColor: root.insideTextColor
+
+				anchors.left: parent.left
+				anchors.right: parent.right
+				anchors.verticalCenter: parent.verticalCenter
+				clip: true
+				currentIndex: view.currentIndex
+				delegate: spinnerDelegate
+				dragMargin: view.dragMargin
+				highlightRangeMode: view.highlightRangeMode
+				implicitHeight: root.listHeight
+				interactive: false
+				model: view.model
+
+				// Keep this PathView visually locked to the real one
+				offset: view.offset
+				pathItemCount: view.pathItemCount
+				preferredHighlightBegin: view.preferredHighlightBegin
+				preferredHighlightEnd: view.preferredHighlightEnd
+				snapMode: view.snapMode
+
+				path: PathMenu {
+					viewHeight: selectedTextView.height
+					viewWidth: selectedTextView.width
+				}
+			}
+		}
+
+		// Mask matching the selection rectangle
+		Item {
+			id: selectionMask
+
+			anchors.fill: parent
+			layer.enabled: true
+			visible: false
+
+			CustomRect {
+				color: "white"
+				height: selectionRect.height
+				radius: selectionRect.radius
+				width: selectionRect.width
+				x: selectionRect.x
+				y: selectionRect.y
+			}
+		}
+
+		// Only show the "inside selection" text where the mask exists
+		MultiEffect {
+			anchors.fill: selectedTextSource
+			maskEnabled: true
+			maskInverted: false
+			maskSource: selectionMask
+			source: selectedTextSource
+			z: 3
+		}
+	}
+}

Components/SearchBar.qml

@@ -1,95 +0,0 @@
-import QtQuick
-import ZShell.Config
-import qs.Services
-
-TextFieldBase {
-	id: root
-
-	readonly property alias bg: bg
-	readonly property alias clearIcon: clearIcon
-	readonly property alias searchIcon: searchIcon
-
-	bottomPadding: Tokens.padding.large
-	leftPadding: searchIcon.width + searchIcon.anchors.leftMargin + Tokens.spacing.small
-	rightPadding: clearIcon.width + clearIcon.anchors.rightMargin + Tokens.spacing.small
-	topPadding: Tokens.padding.large
-
-	background: CustomRect {
-		id: bg
-
-		anchors.fill: parent
-		color: Colors.tPalette.m3surfaceContainer
-		radius: Tokens.rounding.full
-
-		StateLayer {
-			id: stateLayer
-
-			cursorShape: Qt.IBeamCursor
-			enabled: !root.activeFocus
-			manualPressOverride: tapHandler.pressed
-
-			onClicked: root.focus = true
-		}
-	}
-
-	onPressed: {
-		if (stateLayer.enabled)
-			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
-	}
-
-	CustomText {
-		id: placeholder
-
-		anchors.left: parent.left
-		anchors.leftMargin: root.leftPadding
-		anchors.verticalCenter: parent.verticalCenter
-		color: root.placeholderTextColor
-		font: root.font
-		opacity: root.text ? 0 : 1
-		text: root.placeholderText
-
-		Behavior on opacity {
-			Anim {
-				type: Anim.DefaultEffects
-			}
-		}
-	}
-
-	MaterialIcon {
-		id: searchIcon
-
-		anchors.left: parent.left
-		anchors.leftMargin: Tokens.padding.large
-		anchors.verticalCenter: parent.verticalCenter
-		color: Colors.palette.m3onSurfaceVariant
-		font.pointSize: Tokens.font.size.large
-		text: "search"
-	}
-
-	IconButton {
-		id: clearIcon
-
-		anchors.right: parent.right
-		anchors.rightMargin: Tokens.padding.larger
-		anchors.verticalCenter: parent.verticalCenter
-		enabled: root.text
-		icon: "clear"
-		opacity: root.text ? 1 : 0
-		radius: Tokens.rounding.full
-		radiusMorph: false
-		stateLayer.hoverEnabled: enabled
-		type: IconButton.Text
-
-		Behavior on opacity {
-			Anim {
-				type: Anim.DefaultEffects
-			}
-		}
-
-		onClicked: root.clear()
-	}
-
-	TapHandler {
-		id: tapHandler
-	}
-}

Components/SpinBoxRow.qml

@@ -0,0 +1,50 @@
+import QtQuick
+import QtQuick.Layouts
+import qs.Config
+
+CustomRect {
+	id: root
+
+	required property string label
+	required property real max
+	required property real min
+	property var onValueModified: function (value) {}
+	property real step: 1
+	required property real value
+
+	Layout.fillWidth: true
+	color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
+	implicitHeight: row.implicitHeight + Appearance.padding.large * 2
+	radius: Appearance.rounding.normal
+
+	Behavior on implicitHeight {
+		Anim {
+		}
+	}
+
+	RowLayout {
+		id: row
+
+		anchors.left: parent.left
+		anchors.margins: Appearance.padding.large
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+		spacing: Appearance.spacing.normal
+
+		CustomText {
+			Layout.fillWidth: true
+			text: root.label
+		}
+
+		CustomSpinBox {
+			max: root.max
+			min: root.min
+			step: root.step
+			value: root.value
+
+			onValueModified: value => {
+				root.onValueModified(value);
+			}
+		}
+	}
+}

Components/StateLayer.qml

@@ -3,8 +3,7 @@ import QtQuick.Shapes
 import ZShell
 import ZShell.Components
 import qs.Helpers
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 MouseArea {
 	id: root
@@ -21,7 +20,6 @@ MouseArea {
 		return (Math.sqrt(Math.max(d1, d2, d3, d4)) + (shapeMorph ? 24 : 0)) * 1.3;
 	}
 	property real endRadiusAtPress
-	property bool manualHoverOverride
 	property bool manualPressOverride
 	property real pressX: width / 2
 	property real pressY: height / 2
@@ -29,7 +27,7 @@ MouseArea {
 	readonly property alias rect: base
 	property bool shapeMorph
 	property bool showHoverBackground: true
-	property real stateOpacity: containsMouse || manualHoverOverride ? 0.08 : 0
+	property real stateOpacity: containsMouse ? 0.08 : 0
 	property alias topLeftRadius: base.topLeftRadius
 	property alias topRightRadius: base.topRightRadius
 
@@ -53,7 +51,7 @@ MouseArea {
 
 	anchors.fill: parent
 	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
-	enabled: parent.enabled && !Visibilities.getForActive()?.isDrawing
+	enabled: parent.enabled && !Visibilities.getForActive().isDrawing
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -80,8 +78,8 @@ MouseArea {
 		id: rippleAnim
 
 		alwaysRunToEnd: true
-		duration: Tokens.anim.durations.expressiveSlowEffects * 2
-		easing.bezierCurve: Tokens.anim.curves.standard
+		duration: Appearance.anim.durations.expressiveSlowEffects * 2
+		easing.bezierCurve: Appearance.anim.curves.standard
 		property: "circleRadius"
 		target: root
 		to: root.endRadius
@@ -102,7 +100,7 @@ MouseArea {
 		anchors.fill: parent
 		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
 		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
-		color: Colors.palette.m3onSurface
+		color: DynamicColors.palette.m3onSurface
 		opacity: root.stateOpacity
 		// Pick up radius from parent if it has one (parent can be anything with radius props)
 		// qmllint disable missing-property

Components/TextButton.qml

@@ -1,6 +1,5 @@
 import QtQuick
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 ButtonBase {
 	id: root
@@ -8,28 +7,28 @@ ButtonBase {
 	readonly property alias label: label
 	property alias text: label.text
 
-	activeColor: type === TextButton.Filled ? Colors.palette.m3primary : Colors.palette.m3secondary
+	activeColor: type === TextButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondary
 	activeOnColor: {
 		if (type === TextButton.Text)
-			return Colors.palette.m3primary;
-		return type === TextButton.Filled ? Colors.palette.m3onPrimary : Colors.palette.m3onSecondary;
+			return DynamicColors.palette.m3primary;
+		return type === TextButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondary;
 	}
-	horizontalPadding: Tokens.padding.normal
+	horizontalPadding: Appearance.padding.normal
 	implicitHeight: label.implicitHeight + verticalPadding * 2
 	implicitWidth: label.implicitWidth + horizontalPadding * 2
 	inactiveColor: {
 		if (!isToggle && type === TextButton.Filled)
-			return Colors.palette.m3primary;
-		return type === TextButton.Filled ? Colors.tPalette.m3surfaceContainer : Colors.palette.m3secondaryContainer;
+			return DynamicColors.palette.m3primary;
+		return type === TextButton.Filled ? DynamicColors.tPalette.m3surfaceContainer : DynamicColors.palette.m3secondaryContainer;
 	}
 	inactiveOnColor: {
 		if (!isToggle && type === TextButton.Filled)
-			return Colors.palette.m3onPrimary;
+			return DynamicColors.palette.m3onPrimary;
 		if (type === TextButton.Text)
-			return Colors.palette.m3primary;
-		return type === TextButton.Filled ? Colors.palette.m3onSurface : Colors.palette.m3onSecondaryContainer;
+			return DynamicColors.palette.m3primary;
+		return type === TextButton.Filled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSecondaryContainer;
 	}
-	verticalPadding: Tokens.padding.small
+	verticalPadding: Appearance.padding.small
 
 	CustomText {
 		id: label

Components/TextFieldBase.qml

@@ -1,89 +0,0 @@
-import QtQuick
-import QtQuick.Templates
-import ZShell.Config
-import qs.Services
-
-TextField {
-	id: root
-
-	color: Colors.palette.m3onSurface
-	cursorVisible: !readOnly
-	font.pointSize: Tokens.font.size.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
-	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.large
-		x: root.cursorRectangle.x
-		y: root.cursorRectangle.y
-
-		Behavior on opacity {
-			Anim {
-				type: Anim.StandardSmall
-			}
-		}
-		Behavior on x {
-			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/Toast/ToastItem.qml

@@ -2,8 +2,7 @@ import ZShell
 import QtQuick
 import QtQuick.Layouts
 import qs.Components
-import ZShell.Config
-import qs.Services
+import qs.Config
 
 CustomRect {
 	id: root
@@ -13,27 +12,27 @@ CustomRect {
 	anchors.left: parent.left
 	anchors.right: parent.right
 	border.color: {
-		let colour = Colors.palette.m3outlineVariant;
+		let colour = DynamicColors.palette.m3outlineVariant;
 		if (root.modelData.type === Toast.Success)
-			colour = Colors.palette.m3success;
+			colour = DynamicColors.palette.m3success;
 		if (root.modelData.type === Toast.Warning)
-			colour = Colors.palette.m3secondaryContainer;
+			colour = DynamicColors.palette.m3secondaryContainer;
 		if (root.modelData.type === Toast.Error)
-			colour = Colors.palette.m3error;
+			colour = DynamicColors.palette.m3error;
 		return Qt.alpha(colour, 0.3);
 	}
 	border.width: 1
 	color: {
 		if (root.modelData.type === Toast.Success)
-			return Colors.palette.m3successContainer;
+			return DynamicColors.palette.m3successContainer;
 		if (root.modelData.type === Toast.Warning)
-			return Colors.palette.m3secondary;
+			return DynamicColors.palette.m3secondary;
 		if (root.modelData.type === Toast.Error)
-			return Colors.palette.m3errorContainer;
-		return Colors.palette.m3surface;
+			return DynamicColors.palette.m3errorContainer;
+		return DynamicColors.palette.m3surface;
 	}
-	implicitHeight: layout.implicitHeight + Tokens.padding.smaller * 2
-	radius: Tokens.rounding.normal
+	implicitHeight: layout.implicitHeight + Appearance.padding.smaller * 2
+	radius: Appearance.rounding.normal
 
 	Behavior on border.color {
 		CAnim {
@@ -52,24 +51,24 @@ 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: Appearance.padding.normal
+		anchors.margins: Appearance.padding.smaller
+		anchors.rightMargin: Appearance.padding.normal
+		spacing: Appearance.spacing.normal
 
 		CustomRect {
 			color: {
 				if (root.modelData.type === Toast.Success)
-					return Colors.palette.m3success;
+					return DynamicColors.palette.m3success;
 				if (root.modelData.type === Toast.Warning)
-					return Colors.palette.m3secondaryContainer;
+					return DynamicColors.palette.m3secondaryContainer;
 				if (root.modelData.type === Toast.Error)
-					return Colors.palette.m3error;
-				return Colors.palette.m3surfaceContainerHigh;
+					return DynamicColors.palette.m3error;
+				return DynamicColors.palette.m3surfaceContainerHigh;
 			}
-			implicitHeight: icon.implicitHeight + Tokens.padding.smaller * 2
+			implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2
 			implicitWidth: implicitHeight
-			radius: Tokens.rounding.normal
+			radius: Appearance.rounding.normal
 
 			MaterialIcon {
 				id: icon
@@ -77,14 +76,14 @@ CustomRect {
 				anchors.centerIn: parent
 				color: {
 					if (root.modelData.type === Toast.Success)
-						return Colors.palette.m3onSuccess;
+						return DynamicColors.palette.m3onSuccess;
 					if (root.modelData.type === Toast.Warning)
-						return Colors.palette.m3onSecondaryContainer;
+						return DynamicColors.palette.m3onSecondaryContainer;
 					if (root.modelData.type === Toast.Error)
-						return Colors.palette.m3onError;
-					return Colors.palette.m3onSurfaceVariant;
+						return DynamicColors.palette.m3onError;
+					return DynamicColors.palette.m3onSurfaceVariant;
 				}
-				font.pointSize: Math.round(Tokens.font.size.large * 1.2)
+				font.pointSize: Math.round(Appearance.font.size.large * 1.2)
 				text: root.modelData.icon
 			}
 		}
@@ -99,15 +98,15 @@ CustomRect {
 				Layout.fillWidth: true
 				color: {
 					if (root.modelData.type === Toast.Success)
-						return Colors.palette.m3onSuccessContainer;
+						return DynamicColors.palette.m3onSuccessContainer;
 					if (root.modelData.type === Toast.Warning)
-						return Colors.palette.m3onSecondary;
+						return DynamicColors.palette.m3onSecondary;
 					if (root.modelData.type === Toast.Error)
-						return Colors.palette.m3onErrorContainer;
-					return Colors.palette.m3onSurface;
+						return DynamicColors.palette.m3onErrorContainer;
+					return DynamicColors.palette.m3onSurface;
 				}
 				elide: Text.ElideRight
-				font.pointSize: Tokens.font.size.normal
+				font.pointSize: Appearance.font.size.normal
 				text: root.modelData.title
 			}
 
@@ -115,12 +114,12 @@ CustomRect {
 				Layout.fillWidth: true
 				color: {
 					if (root.modelData.type === Toast.Success)
-						return Colors.palette.m3onSuccessContainer;
+						return DynamicColors.palette.m3onSuccessContainer;
 					if (root.modelData.type === Toast.Warning)
-						return Colors.palette.m3onSecondary;
+						return DynamicColors.palette.m3onSecondary;
 					if (root.modelData.type === Toast.Error)
-						return Colors.palette.m3onErrorContainer;
-					return Colors.palette.m3onSurface;
+						return DynamicColors.palette.m3onErrorContainer;
+					return DynamicColors.palette.m3onSurface;
 				}
 				elide: Text.ElideRight
 				opacity: 0.8

Components/Toast/Toasts.qml

@@ -4,13 +4,13 @@ import ZShell
 import Quickshell
 import QtQuick
 import qs.Components
-import ZShell.Config
+import qs.Config
 
 Item {
 	id: root
 
 	property bool flag
-	readonly property int spacing: Tokens.spacing.small
+	readonly property int spacing: Appearance.spacing.small
 
 	implicitHeight: {
 		let h = -spacing;
@@ -21,7 +21,7 @@ Item {
 		}
 		return h;
 	}
-	implicitWidth: Config.utilities.sizes.toastWidth - Tokens.padding.normal * 2
+	implicitWidth: Config.utilities.sizes.toastWidth - Appearance.padding.normal * 2
 
 	Repeater {
 		id: repeater
@@ -81,8 +81,8 @@ Item {
 
 		Behavior on anchors.bottomMargin {
 			Anim {
-				duration: Tokens.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+				duration: Appearance.anim.durations.expressiveDefaultSpatial
+				easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 			}
 		}
 		Behavior on opacity {
@@ -104,8 +104,8 @@ Item {
 		Anim {
 			id: initAnim
 
-			duration: Tokens.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 			from: 0
 			properties: "opacity,scale"
 			target: toast

Components/VerticalFadeFlickable.qml

@@ -1,71 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Effects
-
-CustomFlickable {
-	id: root
-
-	property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
-	property real fadeAmount: 0.1
-	property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
-
-	function fadeShouldBeActive(isStart: bool): bool {
-		// When content is smaller than flickable size, hide fade when rebound starts
-		if (contentHeight + topMargin + bottomMargin < height && rebound.running && ((isStart ? verticalOvershoot > 0 : verticalOvershoot < 0)))
-			return false;
-
-		if (isStart)
-			return visibleArea.yPosition > 0;
-		return visibleArea.yPosition + visibleArea.heightRatio < 1;
-	}
-
-	flickableDirection: Flickable.VerticalFlick
-	layer.enabled: true
-
-	Behavior on bottomFadeOpacity {
-		Anim {
-			type: Anim.SlowEffects
-		}
-	}
-	layer.effect: Mask {
-		maskSource: mask
-
-		Rectangle {
-			id: mask
-
-			anchors.fill: parent
-			layer.enabled: true
-			visible: false
-
-			gradient: Gradient {
-				orientation: Gradient.Vertical
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, root.topFadeOpacity)
-					position: 0
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: root.fadeAmount
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: 1 - root.fadeAmount
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, root.bottomFadeOpacity)
-					position: 1
-				}
-			}
-		}
-	}
-	Behavior on topFadeOpacity {
-		Anim {
-			type: Anim.SlowEffects
-		}
-	}
-}

Components/VerticalFadeListView.qml

@@ -1,102 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Effects
-
-CustomListView {
-	id: root
-
-	property real endFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
-	property real fadeAmount: 0.1
-	readonly property bool horizontal: orientation === ListView.Horizontal
-	property real startFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
-
-	function contentSize(): real {
-		return horizontal ? contentWidth : contentHeight;
-	}
-
-	function fadeShouldBeActive(isStart: bool): bool {
-		// When content is smaller than flickable size, hide fade when rebound starts.
-		if (contentSize() + marginStart() + marginEnd() < viewportSize() && rebound.running && ((isStart ? overshootStart() > 0 : overshootStart() < 0))) {
-			return false;
-		}
-
-		if (isStart)
-			return visibleStart() > 0;
-
-		return visibleStart() + visibleRatio() < 1;
-	}
-
-	function marginEnd(): real {
-		return horizontal ? rightMargin : bottomMargin;
-	}
-
-	function marginStart(): real {
-		return horizontal ? leftMargin : topMargin;
-	}
-
-	function overshootStart(): real {
-		return horizontal ? horizontalOvershoot : verticalOvershoot;
-	}
-
-	function viewportSize(): real {
-		return horizontal ? width : height;
-	}
-
-	function visibleRatio(): real {
-		return horizontal ? visibleArea.widthRatio : visibleArea.heightRatio;
-	}
-
-	function visibleStart(): real {
-		return horizontal ? visibleArea.xPosition : visibleArea.yPosition;
-	}
-
-	flickableDirection: horizontal ? Flickable.HorizontalFlick : Flickable.VerticalFlick
-	layer.enabled: true
-
-	Behavior on endFadeOpacity {
-		Anim {
-			type: Anim.SlowEffects
-		}
-	}
-	layer.effect: Mask {
-		maskSource: mask
-
-		Rectangle {
-			id: mask
-
-			anchors.fill: parent
-			layer.enabled: true
-			visible: false
-
-			gradient: Gradient {
-				orientation: root.horizontal ? Gradient.Horizontal : Gradient.Vertical
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, root.startFadeOpacity)
-					position: 0
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: root.fadeAmount
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: 1 - root.fadeAmount
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, root.endFadeOpacity)
-					position: 1
-				}
-			}
-		}
-	}
-	Behavior on startFadeOpacity {
-		Anim {
-			type: Anim.SlowEffects
-		}
-	}
-}

Components/WavyTopRect.qml

@@ -1,47 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import ZShell.Config
-import qs.Services
-
-Shape {
-	id: root
-
-	property real amplitude: 3
-	property color color: Colors.palette.m3surfaceContainer
-	readonly property real waveHeight: amplitude * 2
-	property int waves: 4
-
-	asynchronous: true
-	preferredRendererType: Shape.CurveRenderer
-
-	ShapePath {
-		fillColor: root.color
-		strokeColor: "transparent"
-		strokeWidth: 0
-
-		Behavior on fillColor {
-			CAnim {
-			}
-		}
-
-		PathSvg {
-			path: {
-				const w = root.width;
-				const h = root.height;
-				const a = root.amplitude;
-				const n = Math.max(1, root.waves);
-				const wl = w / n;
-				const half = wl / 2;
-
-				let d = `M 0,${a} `;
-				for (let i = 0; i < n; ++i) {
-					const x = i * wl;
-					d += `Q ${x + half / 2},${-a} ${x + half},${a} `;
-					d += `Q ${x + half + half / 2},${3 * a} ${x + wl},${a} `;
-				}
-				d += `L ${w},${h} L 0,${h} Z`;
-				return d;
-			}
-		}
-	}
-}

Config/AccentColor.qml

@@ -0,0 +1,13 @@
+import Quickshell.Io
+
+JsonObject {
+	property Accents accents: Accents {
+	}
+
+	component Accents: JsonObject {
+		property string primary: "#4080ff"
+		property string primaryAlt: "#60a0ff"
+		property string warning: "#ff6b6b"
+		property string warningAlt: "#ff8787"
+	}
+}

Config/Appearance.qml

@@ -0,0 +1,13 @@
+pragma Singleton
+
+import Quickshell
+
+Singleton {
+	readonly property AppearanceConf.Anim anim: Config.appearance.anim
+	readonly property AppearanceConf.Deform deform: Config.appearance.deform
+	readonly property AppearanceConf.FontStuff font: Config.appearance.font
+	readonly property AppearanceConf.Padding padding: Config.appearance.padding
+	readonly property AppearanceConf.Rounding rounding: Config.appearance.rounding
+	readonly property AppearanceConf.Spacing spacing: Config.appearance.spacing
+	readonly property AppearanceConf.Transparency transparency: Config.appearance.transparency
+}

Config/AppearanceConf.qml

@@ -0,0 +1,116 @@
+import Quickshell.Io
+
+JsonObject {
+	property Anim anim: Anim {
+	}
+	property Deform deform: Deform {
+	}
+	property FontStuff font: FontStuff {
+	}
+	property Padding padding: Padding {
+	}
+	property Rounding rounding: Rounding {
+	}
+	property Spacing spacing: Spacing {
+	}
+	property Transparency transparency: Transparency {
+	}
+
+	component Anim: JsonObject {
+		property AnimCurves curves: AnimCurves {
+		}
+		property AnimDurations durations: AnimDurations {
+		}
+		property real mediaGifSpeedAdjustment: 300
+		property real sessionGifSpeed: 0.7
+	}
+	component AnimCurves: JsonObject {
+		property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
+		property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
+		property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+		property list<real> expressiveDefaultEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+		property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
+		property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+		property list<real> expressiveFastEffects: [0.31, 0.94, 0.34, 1, 1, 1]
+		property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
+		property list<real> expressiveSlowEffects: [0.34, 0.88, 0.34, 1, 1, 1]
+		property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
+		property list<real> standard: [0.2, 0, 0, 1, 1, 1]
+		property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
+		property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
+	}
+	component AnimDurations: JsonObject {
+		property int expressiveDefaultSpatial: 500 * scale
+		property int expressiveEffects: 200 * scale
+		property int expressiveFastEffects: 150 * scale
+		property int expressiveFastSpatial: 350 * scale
+		property int expressiveSlowEffects: 300 * scale
+		property int extraLarge: 1000 * scale
+		property int large: 600 * scale
+		property int normal: 400 * scale
+		property real scale: 1
+		property int small: 200 * scale
+	}
+	component Deform: JsonObject {
+		property real scale: 1
+	}
+	component FontFamily: JsonObject {
+		property string clock: "Rubik"
+		property string material: "Material Symbols Rounded"
+		property string mono: "CaskaydiaCove NF"
+		property string sans: "Segoe UI Variable Text"
+	}
+	component FontSize: JsonObject {
+		property int extraLarge: 28 * scale
+		property int large: 18 * scale
+		property int larger: 16 * scale
+		property int medium: 14 * scale
+		property int normal: 13 * scale
+		property real scale: 1
+		property int small: 11 * scale
+		property int smaller: 12 * scale
+	}
+	component FontStuff: JsonObject {
+		property FontFamily family: FontFamily {
+		}
+		property FontSize size: FontSize {
+		}
+	}
+	component Padding: JsonObject {
+		property int extraLarge: 28 * scale
+		property int extraLargeIncreased: 32 * scale
+		property int extraSmall: 4 * scale
+		property int large: 16 * scale
+		property int largeIncreased: 20 * scale
+		property int larger: 12 * scale
+		property int normal: 8 * scale
+		property real scale: 1
+		property int small: 5 * scale
+		property int smaller: 7 * scale
+		property int smallest: 2 * scale
+	}
+	component Rounding: JsonObject {
+		property int extraSmall: 4 * scale
+		property int full: 1000 * scale
+		property int large: 24 * scale
+		property int medium: 16 * scale
+		property int normal: 18 * scale
+		property real scale: 1
+		property int small: 12 * scale
+		property int smallest: 8 * scale
+	}
+	component Spacing: JsonObject {
+		property int extraSmall: 4 * scale
+		property int large: 20 * scale
+		property int larger: 16 * scale
+		property int normal: 12 * scale
+		property real scale: 1
+		property int small: 8 * scale
+		property int smaller: 10 * scale
+	}
+	component Transparency: JsonObject {
+		property real base: 0.85
+		property bool enabled: false
+		property real layers: 0.4
+	}
+}

Config/BackgroundConfig.qml

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

Config/BarConfig.qml

@@ -0,0 +1,77 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool autoHide: false
+	property int border: 8
+	property list<var> entries: [
+		{
+			id: "workspaces",
+			enabled: true
+		},
+		{
+			id: "media",
+			enabled: true
+		},
+		{
+			id: "resources",
+			enabled: true
+		},
+		{
+			id: "updates",
+			enabled: true
+		},
+		{
+			id: "spacer",
+			enabled: true
+		},
+		{
+			id: "activeWindow",
+			enabled: true
+		},
+		{
+			id: "spacer",
+			enabled: true
+		},
+		{
+			id: "hyprsunset",
+			enabled: true
+		},
+		{
+			id: "tray",
+			enabled: true
+		},
+		{
+			id: "network",
+			enabled: false
+		},
+		{
+			id: "clock",
+			enabled: true
+		},
+		{
+			id: "notifBell",
+			enabled: true
+		},
+	]
+	property int height: 34
+	property bool hideWhenNotif: false
+	property Popouts popouts: Popouts {
+	}
+	property int rounding: 8
+	property int smoothing: 32
+	property Tray tray: Tray {
+	}
+
+	component Popouts: JsonObject {
+		property bool activeWindow: true
+		property bool audio: true
+		property bool clock: true
+		property bool network: true
+		property bool resources: true
+		property bool tray: true
+		property bool upower: true
+	}
+	component Tray: JsonObject {
+		property int trayIconSize: 24
+	}
+}

Config/ClipboardConfig.qml

@@ -0,0 +1,15 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enabled: true
+	property int maxEntriesShown: 10
+	property Sizes sizes: Sizes {
+	}
+
+	component Sizes: JsonObject {
+		property int itemHeight: 60
+		property int minPreviewWidth: 200
+		property int previewWidth: 500
+		property int width: 500
+	}
+}

Config/Colors.qml

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

Config/Config.qml

@@ -0,0 +1,497 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Io
+import ZShell
+import QtQuick
+import qs.Helpers
+import qs.Paths
+
+Singleton {
+	id: root
+
+	property alias appearance: adapter.appearance
+	property alias background: adapter.background
+	property alias barConfig: adapter.barConfig
+	property alias clipboard: adapter.clipboard
+	property alias colors: adapter.colors
+	property alias dashboard: adapter.dashboard
+	property alias dock: adapter.dock
+	property alias general: adapter.general
+	property alias launcher: adapter.launcher
+	property alias lock: adapter.lock
+	property alias notifs: adapter.notifs
+	property alias osd: adapter.osd
+	property alias overview: adapter.overview
+	property bool recentlySaved: false
+	property alias screenshot: adapter.screenshot
+	property alias services: adapter.services
+	property alias sidebar: adapter.sidebar
+	property alias utilities: adapter.utilities
+
+	function save(): void {
+		saveTimer.restart();
+		recentlySaved = true;
+		recentSaveCooldown.restart();
+	}
+
+	function saveNoToast(): void {
+		saveTimer.restart();
+	}
+
+	function serializeAppearance(): var {
+		return {
+			rounding: {
+				scale: appearance.rounding.scale
+			},
+			spacing: {
+				scale: appearance.spacing.scale
+			},
+			padding: {
+				scale: appearance.padding.scale
+			},
+			deform: {
+				scale: appearance.deform.scale
+			},
+			font: {
+				family: {
+					sans: appearance.font.family.sans,
+					mono: appearance.font.family.mono,
+					material: appearance.font.family.material,
+					clock: appearance.font.family.clock
+				},
+				size: {
+					scale: appearance.font.size.scale
+				}
+			},
+			anim: {
+				mediaGifSpeedAdjustment: appearance.anim.mediaGifSpeedAdjustment,
+				sessionGifSpeed: appearance.anim.sessionGifSpeed,
+				durations: {
+					scale: appearance.anim.durations.scale
+				}
+			},
+			transparency: {
+				enabled: appearance.transparency.enabled,
+				base: appearance.transparency.base,
+				layers: appearance.transparency.layers
+			}
+		};
+	}
+
+	function serializeBackground(): var {
+		return {
+			wallFadeDuration: background.wallFadeDuration,
+			enabled: background.enabled,
+			alignX: background.alignX,
+			sourceClipX: background.sourceClipX,
+			sourceClipY: background.sourceClipY,
+			sourceClipW: background.sourceClipW,
+			sourceClipH: background.sourceClipH,
+			alignY: background.alignY,
+			zoom: background.zoom
+		};
+	}
+
+	function serializeBar(): var {
+		return {
+			autoHide: barConfig.autoHide,
+			hideWhenNotif: barConfig.hideWhenNotif,
+			rounding: barConfig.rounding,
+			border: barConfig.border,
+			smoothing: barConfig.smoothing,
+			height: barConfig.height,
+			tray: {
+				trayIconSize: barConfig.tray.trayIconSize
+			},
+			popouts: {
+				tray: barConfig.popouts.tray,
+				audio: barConfig.popouts.audio,
+				activeWindow: barConfig.popouts.activeWindow,
+				resources: barConfig.popouts.resources,
+				clock: barConfig.popouts.clock,
+				network: barConfig.popouts.network,
+				upower: barConfig.popouts.upower
+			},
+			entries: barConfig.entries
+		};
+	}
+
+	function serializeClipboard(): var {
+		return {
+			enabled: clipboard.enabled,
+			maxEntriesShown: clipboard.maxEntriesShown,
+			sizes: {
+				width: clipboard.sizes.width,
+				previewWidth: clipboard.sizes.previewWidth,
+				minPreviewWidth: clipboard.sizes.minPreviewWidth,
+				itemHeight: clipboard.sizes.itemHeight
+			}
+		};
+	}
+
+	function serializeColors(): var {
+		return {
+			schemeType: colors.schemeType,
+			presets: {
+				name: colors.presets.name,
+				variant: colors.presets.variant,
+				accent: colors.presets.accent
+			}
+		};
+	}
+
+	function serializeConfig(): var {
+		return {
+			barConfig: serializeBar(),
+			lock: serializeLock(),
+			general: serializeGeneral(),
+			services: serializeServices(),
+			notifs: serializeNotifs(),
+			sidebar: serializeSidebar(),
+			utilities: serializeUtilities(),
+			dashboard: serializeDashboard(),
+			appearance: serializeAppearance(),
+			osd: serializeOsd(),
+			background: serializeBackground(),
+			launcher: serializeLauncher(),
+			colors: serializeColors(),
+			dock: serializeDock(),
+			screenshot: serializeScreenshot(),
+			clipboard: serializeClipboard()
+		};
+	}
+
+	function serializeDashboard(): var {
+		return {
+			enabled: dashboard.enabled,
+			mediaUpdateInterval: dashboard.mediaUpdateInterval,
+			resourceUpdateInterval: dashboard.resourceUpdateInterval,
+			dragThreshold: dashboard.dragThreshold,
+			performance: {
+				showBattery: dashboard.performance.showBattery,
+				showGpu: dashboard.performance.showGpu,
+				showCpu: dashboard.performance.showCpu,
+				showMemory: dashboard.performance.showMemory,
+				showStorage: dashboard.performance.showStorage,
+				showNetwork: dashboard.performance.showNetwork
+			},
+			sizes: {
+				tabIndicatorHeight: dashboard.sizes.tabIndicatorHeight,
+				tabIndicatorSpacing: dashboard.sizes.tabIndicatorSpacing,
+				infoWidth: dashboard.sizes.infoWidth,
+				infoIconSize: dashboard.sizes.infoIconSize,
+				dateTimeWidth: dashboard.sizes.dateTimeWidth,
+				mediaWidth: dashboard.sizes.mediaWidth,
+				mediaProgressSweep: dashboard.sizes.mediaProgressSweep,
+				mediaProgressThickness: dashboard.sizes.mediaProgressThickness,
+				resourceProgessThickness: dashboard.sizes.resourceProgessThickness,
+				weatherWidth: dashboard.sizes.weatherWidth,
+				mediaCoverArtSize: dashboard.sizes.mediaCoverArtSize,
+				mediaVisualizerSize: dashboard.sizes.mediaVisualizerSize,
+				resourceSize: dashboard.sizes.resourceSize
+			}
+		};
+	}
+
+	function serializeDock(): var {
+		return {
+			enable: dock.enable,
+			height: dock.height,
+			hoverToReveal: dock.hoverToReveal,
+			pinnedApps: dock.pinnedApps,
+			pinnedOnStartup: dock.pinnedOnStartup,
+			ignoredAppRegexes: dock.ignoredAppRegexes
+		};
+	}
+
+	function serializeGeneral(): var {
+		return {
+			logo: general.logo,
+			wallpaperPath: general.wallpaperPath,
+			showOverFullscreen: general.showOverFullscreen,
+			desktopIcons: general.desktopIcons,
+			dateFormat: general.dateFormat,
+			color: {
+				mode: general.color.mode,
+				smart: general.color.smart,
+				scheduleDark: general.color.scheduleDark,
+				scheduleHyprsunset: general.color.scheduleHyprsunset,
+				scheduleHyprsunsetStart: general.color.scheduleHyprsunsetStart,
+				hyprsunsetTemp: general.color.hyprsunsetTemp,
+				scheduleHyprsunsetEnd: general.color.scheduleHyprsunsetEnd,
+				schemeGeneration: general.color.schemeGeneration,
+				scheduleDarkStart: general.color.scheduleDarkStart,
+				scheduleDarkEnd: general.color.scheduleDarkEnd,
+				neovimColors: general.color.neovimColors
+			},
+			apps: {
+				terminal: general.apps.terminal,
+				audio: general.apps.audio,
+				playback: general.apps.playback,
+				explorer: general.apps.explorer
+			},
+			idle: {
+				timeouts: general.idle.timeouts
+			},
+			battery: {
+				popupThresholds: general.battery.popupThresholds,
+				critPerc: general.battery.critPerc
+			}
+		};
+	}
+
+	function serializeLauncher(): var {
+		return {
+			maxAppsShown: launcher.maxAppsShown,
+			maxWallpapers: launcher.maxWallpapers,
+			uwsm: launcher.uwsm,
+			actionPrefix: launcher.actionPrefix,
+			specialPrefix: launcher.specialPrefix,
+			useFuzzy: {
+				apps: launcher.useFuzzy.apps,
+				actions: launcher.useFuzzy.actions,
+				schemes: launcher.useFuzzy.schemes,
+				variants: launcher.useFuzzy.variants,
+				wallpapers: launcher.useFuzzy.wallpapers
+			},
+			sizes: {
+				itemWidth: launcher.sizes.itemWidth,
+				itemHeight: launcher.sizes.itemHeight,
+				wallpaperWidth: launcher.sizes.wallpaperWidth,
+				wallpaperHeight: launcher.sizes.wallpaperHeight
+			},
+			actions: launcher.actions
+		};
+	}
+
+	function serializeLock(): var {
+		return {
+			recolorLogo: lock.recolorLogo,
+			enableFprint: lock.enableFprint,
+			showNotifContent: lock.showNotifContent,
+			showNotifIcon: lock.showNotifIcon,
+			maxFprintTries: lock.maxFprintTries,
+			blurAmount: lock.blurAmount,
+			sizes: {
+				heightMult: lock.sizes.heightMult,
+				ratio: lock.sizes.ratio,
+				centerWidth: lock.sizes.centerWidth
+			}
+		};
+	}
+
+	function serializeNotifs(): var {
+		return {
+			expire: notifs.expire,
+			defaultExpireTimeout: notifs.defaultExpireTimeout,
+			appNotifCooldown: notifs.appNotifCooldown,
+			clearThreshold: notifs.clearThreshold,
+			expandThreshold: notifs.expandThreshold,
+			actionOnClick: notifs.actionOnClick,
+			groupPreviewNum: notifs.groupPreviewNum,
+			sizes: {
+				width: notifs.sizes.width,
+				image: notifs.sizes.image,
+				badge: notifs.sizes.badge
+			}
+		};
+	}
+
+	function serializeOsd(): var {
+		return {
+			enabled: osd.enabled,
+			hideDelay: osd.hideDelay,
+			enableBrightness: osd.enableBrightness,
+			enableMicrophone: osd.enableMicrophone,
+			allMonBrightness: osd.allMonBrightness,
+			sizes: {
+				sliderWidth: osd.sizes.sliderWidth,
+				sliderHeight: osd.sizes.sliderHeight
+			}
+		};
+	}
+
+	function serializeScreenshot(): var {
+		return {
+			enable_pp: screenshot.enable_pp,
+			mode: screenshot.mode,
+			radius: screenshot.radius,
+			shadow: screenshot.shadow,
+			rounding: screenshot.rounding,
+			shadow_blur: screenshot.shadow_blur,
+			shadow_color: screenshot.shadow_color,
+			shadow_offset_x: screenshot.shadow_offset_x,
+			shadow_offset_y: screenshot.shadow_offset_y
+		};
+	}
+
+	function serializeServices(): var {
+		return {
+			weatherLocation: services.weatherLocation,
+			updates: services.updates,
+			useFahrenheit: services.useFahrenheit,
+			minBrightness: services.minBrightness,
+			ddcutilService: services.ddcutilService,
+			useTwelveHourClock: services.useTwelveHourClock,
+			gpuType: services.gpuType,
+			audioIncrement: services.audioIncrement,
+			brightnessIncrement: services.brightnessIncrement,
+			maxVolume: services.maxVolume,
+			defaultPlayer: services.defaultPlayer,
+			playerAliases: services.playerAliases,
+			visualizerBars: services.visualizerBars
+		};
+	}
+
+	function serializeSidebar(): var {
+		return {
+			enabled: sidebar.enabled,
+			sizes: {
+				width: sidebar.sizes.width
+			}
+		};
+	}
+
+	function serializeUtilities(): var {
+		return {
+			enabled: utilities.enabled,
+			maxToasts: utilities.maxToasts,
+			sizes: {
+				width: utilities.sizes.width,
+				toastWidth: utilities.sizes.toastWidth
+			},
+			toasts: {
+				configLoaded: utilities.toasts.configLoaded,
+				chargingChanged: utilities.toasts.chargingChanged,
+				gameModeChanged: utilities.toasts.gameModeChanged,
+				dndChanged: utilities.toasts.dndChanged,
+				audioOutputChanged: utilities.toasts.audioOutputChanged,
+				audioInputChanged: utilities.toasts.audioInputChanged,
+				capsLockChanged: utilities.toasts.capsLockChanged,
+				numLockChanged: utilities.toasts.numLockChanged,
+				kbLayoutChanged: utilities.toasts.kbLayoutChanged,
+				vpnChanged: utilities.toasts.vpnChanged,
+				nowPlaying: utilities.toasts.nowPlaying
+			},
+			vpn: {
+				enabled: utilities.vpn.enabled,
+				provider: utilities.vpn.provider
+			}
+		};
+	}
+
+	ElapsedTimer {
+		id: timer
+	}
+
+	Timer {
+		id: saveTimer
+
+		interval: 500
+
+		onTriggered: {
+			timer.restart();
+			try {
+				let config = {};
+				try {
+					config = JSON.parse(fileView.text());
+				} catch (e) {
+					config = {};
+				}
+
+				config = root.serializeConfig();
+
+				fileView.setText(JSON.stringify(config, null, 4));
+			} catch (e) {
+				Toaster.toast(qsTr("Failed to serialize config"), e.message, "settings_alert", Toast.Error);
+			}
+		}
+	}
+
+	Timer {
+		id: recentSaveCooldown
+
+		interval: 2000
+
+		onTriggered: {
+			root.recentlySaved = false;
+		}
+	}
+
+	FileView {
+		id: fileView
+
+		path: `${Paths.config}/config.json`
+		watchChanges: true
+
+		onFileChanged: {
+			if (!root.recentlySaved) {
+				timer.restart();
+				reload();
+			} else {
+				reload();
+			}
+		}
+		onLoadFailed: err => {
+			if (err !== FileViewError.FileNotFound)
+				Toaster.toast(qsTr("Failed to read config"), FileViewError.toString(err), "settings_alert", Toast.Warning);
+		}
+		onLoaded: {
+			ModeScheduler.checkStartup();
+			Hyprsunset.checkStartup();
+			try {
+				JSON.parse(text());
+				const elapsed = timer.elapsedMs();
+
+				if (adapter.utilities.toasts.configLoaded && !root.recentlySaved) {
+					Toaster.toast(qsTr("Config loaded"), qsTr("Config loaded in %1ms").arg(elapsed), "rule_settings");
+				} else if (adapter.utilities.toasts.configLoaded && root.recentlySaved) {
+					Toaster.toast(qsTr("Config saved"), qsTr("Config reloaded in %1ms").arg(elapsed), "settings_alert");
+				}
+			} catch (e) {
+				Toaster.toast(qsTr("Failed to load config"), e.message, "settings_alert", Toast.Error);
+			}
+		}
+		onSaveFailed: err => Toaster.toast(qsTr("Failed to save config"), FileViewError.toString(err), "settings_alert", Toast.Error)
+
+		JsonAdapter {
+			id: adapter
+
+			property AppearanceConf appearance: AppearanceConf {
+			}
+			property BackgroundConfig background: BackgroundConfig {
+			}
+			property BarConfig barConfig: BarConfig {
+			}
+			property ClipboardConfig clipboard: ClipboardConfig {
+			}
+			property Colors colors: Colors {
+			}
+			property DashboardConfig dashboard: DashboardConfig {
+			}
+			property DockConfig dock: DockConfig {
+			}
+			property General general: General {
+			}
+			property Launcher launcher: Launcher {
+			}
+			property LockConf lock: LockConf {
+			}
+			property NotifConfig notifs: NotifConfig {
+			}
+			property Osd osd: Osd {
+			}
+			property Overview overview: Overview {
+			}
+			property Screenshot screenshot: Screenshot {
+			}
+			property Services services: Services {
+			}
+			property SidebarConfig sidebar: SidebarConfig {
+			}
+			property UtilConfig utilities: UtilConfig {
+			}
+		}
+	}
+}

Config/DashboardConfig.qml

@@ -0,0 +1,36 @@
+import Quickshell.Io
+
+JsonObject {
+	property int dragThreshold: 50
+	property bool enabled: true
+	property int mediaUpdateInterval: 500
+	property Performance performance: Performance {
+	}
+	property int resourceUpdateInterval: 1000
+	property Sizes sizes: Sizes {
+	}
+
+	component Performance: JsonObject {
+		property bool showBattery: true
+		property bool showCpu: true
+		property bool showGpu: true
+		property bool showMemory: true
+		property bool showNetwork: true
+		property bool showStorage: true
+	}
+	component Sizes: JsonObject {
+		readonly property int dateTimeWidth: 110
+		readonly property int infoIconSize: 25
+		readonly property int infoWidth: 200
+		readonly property int mediaCoverArtSize: 150
+		readonly property int mediaProgressSweep: 180
+		readonly property int mediaProgressThickness: 8
+		readonly property int mediaVisualizerSize: 200
+		readonly property int mediaWidth: 200
+		readonly property int resourceProgessThickness: 10
+		readonly property int resourceSize: 200
+		readonly property int tabIndicatorHeight: 3
+		readonly property int tabIndicatorSpacing: 5
+		readonly property int weatherWidth: 250
+	}
+}

Config/DockConfig.qml

@@ -0,0 +1,10 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enable: false
+	property real height: 60
+	property bool hoverToReveal: true
+	property list<string> ignoredAppRegexes: []
+	property list<string> pinnedApps: ["org.kde.dolphin", "kitty",]
+	property bool pinnedOnStartup: false
+}

Config/DynamicColors.qml

@@ -6,7 +6,6 @@ import Quickshell.Io
 import Quickshell.Hyprland
 import QtQuick
 import ZShell
-import ZShell.Config
 import qs.Helpers
 import qs.Paths
 
@@ -69,7 +68,7 @@ Singleton {
 		}
 
 		for (const [name, color] of Object.entries(scheme.colors)) {
-			const propName = `m3${name}`;
+			const propName = name.startsWith("term") ? name : `m3${name}`;
 			if (colors.hasOwnProperty(propName))
 				colors[propName] = `${color}`;
 		}
@@ -113,6 +112,7 @@ Singleton {
 	function setMode(mode: string): void {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", mode]);
 		Config.general.color.mode = mode;
+		Config.save();
 	}
 
 	function swapRG(c: color): color {
@@ -280,9 +280,9 @@ Singleton {
 		readonly property color m3tertiary_paletteKeyColor: root.layer(root.palette.m3tertiary_paletteKeyColor)
 	}
 	component Transparency: QtObject {
-		readonly property real base: Math.max(0, Math.min(1, Config.appearance.transparency.base - (root.light ? 0.1 : 0)))
-		readonly property bool enabled: Config.appearance.transparency.enabled
-		readonly property real layers: Config.appearance.transparency.layers
+		readonly property real base: Math.max(0, Math.min(1, Appearance.transparency.base - (root.light ? 0.1 : 0)))
+		readonly property bool enabled: Appearance.transparency.enabled
+		readonly property real layers: Appearance.transparency.layers
 
 		onBaseChanged: debounceTimer.restart()
 		onEnabledChanged: debounceTimer.restart()

Config/General.qml

@@ -0,0 +1,68 @@
+import Quickshell.Io
+import Quickshell
+
+JsonObject {
+	property Apps apps: Apps {
+	}
+	property Battery battery: Battery {
+	}
+	property Color color: Color {
+	}
+	property string dateFormat: "ddd d MMM - hh:mm:ss"
+	property bool desktopIcons: false
+	property Idle idle: Idle {
+	}
+	property string logo: ""
+	property bool showOverFullscreen: true
+	property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers"
+
+	component Apps: JsonObject {
+		property list<string> archiver: ["ark"]
+		property list<string> audio: ["pavucontrol"]
+		property list<string> document: ["libreoffice"]
+		property list<string> editor: ["kate"]
+		property list<string> explorer: ["dolphin"]
+		property list<string> image: ["imv"]
+		property list<string> playback: ["mpv"]
+		property list<string> terminal: ["kitty"]
+	}
+	component Battery: JsonObject {
+		property int critPerc: 5
+		property list<var> popupThresholds: [
+			{
+				perc: 20,
+				name: qsTr("Low battery"),
+				message: qsTr("Battery is low"),
+				icon: "battery_android_frame_2"
+			},
+		]
+	}
+	component Color: JsonObject {
+		property int hyprsunsetTemp: 5000
+		property string mode: "dark"
+		property bool neovimColors: false
+		property bool scheduleDark: false
+		property int scheduleDarkEnd: 0
+		property int scheduleDarkStart: 0
+		property bool scheduleHyprsunset: false
+		property int scheduleHyprsunsetEnd: 0
+		property int scheduleHyprsunsetStart: 0
+		property bool schemeGeneration: true
+		property bool smart: false
+	}
+	component Idle: JsonObject {
+		property list<var> timeouts: [
+			{
+				name: "Lock",
+				timeout: 180,
+				idleAction: "lock"
+			},
+			{
+				name: "Screen",
+				timeout: 300,
+				idleAction: "dpms off",
+				activeAction: "dpms on"
+			}
+		]
+	}
+}

Config/IdleTimeout.qml

@@ -0,0 +1,15 @@
+import Quickshell.Io
+
+JsonObject {
+	property list<var> timeouts: [
+		{
+			timeout: 180,
+			idleAction: "lock"
+		},
+		{
+			timeout: 300,
+			idleAction: "dpms off",
+			activeAction: "dpms on"
+		}
+	]
+}

Config/Launcher.qml

@@ -0,0 +1,109 @@
+import Quickshell.Io
+
+JsonObject {
+	property string actionPrefix: ">"
+	property list<var> actions: [
+		{
+			name: "Calculator",
+			icon: "calculate",
+			description: "Do simple math equations",
+			command: ["autocomplete", "calc"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Light",
+			icon: "light_mode",
+			description: "Change to light mode",
+			command: ["setMode", "light"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Dark",
+			icon: "dark_mode",
+			description: "Change to dark mode",
+			command: ["setMode", "dark"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Wallpaper",
+			icon: "image",
+			description: "Change the current wallpaper",
+			command: ["autocomplete", "wallpaper"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Variant",
+			icon: "colors",
+			description: "Change the current scheme variant",
+			command: ["autocomplete", "variant"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Shutdown",
+			icon: "power_settings_new",
+			description: "Shutdown the system",
+			command: ["systemctl", "poweroff"],
+			enabled: true,
+			dangerous: true
+		},
+		{
+			name: "Reboot",
+			icon: "cached",
+			description: "Reboot the system",
+			command: ["systemctl", "reboot"],
+			enabled: true,
+			dangerous: true
+		},
+		{
+			name: "Logout",
+			icon: "logout",
+			description: "Log out of the current session",
+			command: ["loginctl", "terminate-user", ""],
+			enabled: true,
+			dangerous: true
+		},
+		{
+			name: "Lock",
+			icon: "lock",
+			description: "Lock the current session",
+			command: ["loginctl", "lock-session"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Sleep",
+			icon: "bedtime",
+			description: "Suspend then hibernate",
+			command: ["systemctl", "suspend-then-hibernate"],
+			enabled: true,
+			dangerous: false
+		},
+	]
+	property int maxAppsShown: 10
+	property int maxWallpapers: 7
+	property Sizes sizes: Sizes {
+	}
+	property string specialPrefix: "@"
+	property UseFuzzy useFuzzy: UseFuzzy {
+	}
+	property bool uwsm: true
+
+	component Sizes: JsonObject {
+		property int itemHeight: 50
+		property int itemWidth: 600
+		property int wallpaperHeight: 200
+		property int wallpaperWidth: 280
+	}
+	component UseFuzzy: JsonObject {
+		property bool actions: false
+		property bool apps: false
+		property bool schemes: false
+		property bool variants: false
+		property bool wallpapers: false
+	}
+}

Config/LockConf.qml

@@ -0,0 +1,18 @@
+import Quickshell.Io
+
+JsonObject {
+	property int blurAmount: 40
+	property bool enableFprint: true
+	property int maxFprintTries: 3
+	property bool recolorLogo: false
+	property bool showNotifContent: false
+	property bool showNotifIcon: true
+	property Sizes sizes: Sizes {
+	}
+
+	component Sizes: JsonObject {
+		property int centerWidth: 600
+		property real heightMult: 0.7
+		property real ratio: 16 / 9
+	}
+}

Config/MaterialEasing.qml

@@ -0,0 +1,26 @@
+pragma Singleton
+import Quickshell
+
+Singleton {
+	id: root
+
+	readonly property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
+	readonly property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
+	readonly property int emphasizedAccelTime: 200 * scale
+	readonly property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+	readonly property int emphasizedDecelTime: 400 * scale
+	readonly property int emphasizedTime: 500 * scale
+	readonly property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1.00, 1, 1]
+	readonly property int expressiveDefaultSpatialTime: 500 * scale
+	readonly property list<real> expressiveEffects: [0.34, 0.80, 0.34, 1.00, 1, 1]
+	readonly property int expressiveEffectsTime: 200 * scale
+	readonly property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.90, 1, 1]
+	readonly property int expressiveFastSpatialTime: 350 * scale
+	property real scale: Appearance.anim.durations.scale
+	readonly property list<real> standard: [0.2, 0, 0, 1, 1, 1]
+	readonly property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
+	readonly property int standardAccelTime: 200 * scale
+	readonly property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
+	readonly property int standardDecelTime: 250 * scale
+	readonly property int standardTime: 300 * scale
+}

Config/NotifConfig.qml

@@ -0,0 +1,20 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool actionOnClick: false
+	property int appNotifCooldown: 0
+	property real clearThreshold: 0.3
+	property int defaultExpireTimeout: 5000
+	property int expandThreshold: 20
+	property bool expire: true
+	property int groupPreviewNum: 3
+	property bool openExpanded: false
+	property Sizes sizes: Sizes {
+	}
+
+	component Sizes: JsonObject {
+		property int badge: 20
+		property int image: 41
+		property int width: 400
+	}
+}

Config/Osd.qml

@@ -0,0 +1,16 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool allMonBrightness: false
+	property bool enableBrightness: true
+	property bool enableMicrophone: true
+	property bool enabled: true
+	property int hideDelay: 3000
+	property Sizes sizes: Sizes {
+	}
+
+	component Sizes: JsonObject {
+		property int sliderHeight: 150
+		property int sliderWidth: 30
+	}
+}

Config/Overview.qml

@@ -0,0 +1,8 @@
+import Quickshell.Io
+
+JsonObject {
+	property int columns: 5
+	property bool enable: false
+	property int rows: 2
+	property real scale: 0.16
+}

Config/Screenshot.qml

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

Config/Services.qml

@@ -0,0 +1,23 @@
+import Quickshell.Io
+import QtQuick
+
+JsonObject {
+	property real audioIncrement: 0.1
+	property real brightnessIncrement: 0.1
+	property bool ddcutilService: false
+	property string defaultPlayer: "Spotify"
+	property string gpuType: ""
+	property real maxVolume: 1.0
+	property real minBrightness: 0.01
+	property list<var> playerAliases: [
+		{
+			"from": "com.github.th_ch.youtube_music",
+			"to": "YT Music"
+		}
+	]
+	property bool updates: true
+	property bool useFahrenheit: false
+	property bool useTwelveHourClock: Qt.locale().timeFormat(Locale.ShortFormat).toLowerCase().includes("a")
+	property int visualizerBars: 30
+	property string weatherLocation: ""
+}

Config/SidebarConfig.qml

@@ -0,0 +1,11 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enabled: true
+	property Sizes sizes: Sizes {
+	}
+
+	component Sizes: JsonObject {
+		property int width: 430
+	}
+}

Config/Transparency.qml

@@ -0,0 +1,7 @@
+import Quickshell.Io
+
+JsonObject {
+	property real base: 0.85
+	property bool enabled: false
+	property real layers: 0.4
+}

Config/UtilConfig.qml

@@ -0,0 +1,35 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enabled: true
+	property int maxToasts: 4
+	property Sizes sizes: Sizes {
+	}
+	property Toasts toasts: Toasts {
+	}
+	property Vpn vpn: Vpn {
+	}
+
+	component Sizes: JsonObject {
+		property int toastWidth: 430
+		property int width: 430
+	}
+	component Toasts: JsonObject {
+		property bool audioInputChanged: true
+		property bool audioOutputChanged: true
+		property bool capsLockChanged: true
+		property bool chargingChanged: true
+		property bool configLoaded: true
+		property bool dndChanged: true
+		property bool gameModeChanged: true
+		property bool kbLayoutChanged: true
+		property bool kbLimit: true
+		property bool nowPlaying: false
+		property bool numLockChanged: true
+		property bool vpnChanged: true
+	}
+	component Vpn: JsonObject {
+		property bool enabled: false
+		property list<var> provider: ["netbird"]
+	}
+}

Config/WorkspaceWidget.qml

@@ -0,0 +1,6 @@
+import Quickshell.Io
+
+JsonObject {
+	property string inactiveTextColor: "white"
+	property string textColor: "black"
+}

Daemons/Audio.qml

@@ -5,7 +5,7 @@ import ZShell
 import Quickshell
 import Quickshell.Services.Pipewire
 import QtQuick
-import ZShell.Config
+import qs.Config
 
 Singleton {
 	id: root

Daemons/BatteryService.qml

@@ -2,7 +2,7 @@ import Quickshell
 import Quickshell.Services.UPower
 import QtQuick
 import ZShell
-import ZShell.Config
+import qs.Config
 import qs.Components.Toast
 import qs.Helpers
 

Daemons/NotifServer.qml

@@ -11,7 +11,7 @@ import qs.Components
 import qs.Modules
 import qs.Helpers
 import qs.Paths
-import ZShell.Config
+import qs.Config
 
 Singleton {
 	id: root
@@ -25,7 +25,7 @@ Singleton {
 	property alias server: server
 
 	function shouldThrottle(appName: string): bool {
-		if (props.dnd || [...Visibilities.screens.values()].some(v => v.sidebar))
+		if (props.dnd)
 			return false;
 
 		const key = (appName || "unknown").trim().toLowerCase();
@@ -49,6 +49,11 @@ Singleton {
 		if (loaded) {
 			saveTimer.restart();
 		}
+		if (root.list.length > 0) {
+			HasNotifications.hasNotifications = true;
+		} else {
+			HasNotifications.hasNotifications = false;
+		}
 	}
 
 	Timer {

Drawers/Drawers.qml

@@ -11,46 +11,15 @@ Variants {
 
 		required property ShellScreen modelData
 
-		function rebuild(): void {
-			loader.active = false;
-			loader.active = true;
-		}
-
-		LazyLoader {
-			id: loader
-
-			active: true
-
-			Drawer {
-				screen: scope.modelData
-			}
-		}
-
-		Connections {
-			function onConfigPositionChanged(): void {
-				Qt.callLater(scope.rebuild);
-			}
-
-			target: (loader.item as Drawer)?.geometry ?? null
-		}
-	}
-
-	component Drawer: Scope {
-		id: drawer
-
-		readonly property alias geometry: content.geometry
-		required property ShellScreen screen
-
 		Exclusions {
 			bar: content.bar
-			geometry: content.geometry
-			screen: drawer.screen
+			screen: scope.modelData
 		}
 
 		Windows {
 			id: content
 
-			screen: drawer.screen
+			screen: scope.modelData
 		}
 	}
 }

Drawers/EdgeGeometry.qml

@@ -1,55 +0,0 @@
-import QtQuick
-import qs.Modules.Bar as Bar
-
-QtObject {
-	id: root
-
-	required property Bar.BarLoader bar
-	readonly property real barClamped: bar.clampedExtent
-	readonly property real barExtent: bar.extent
-	readonly property bool barOnBottom: position === "bottom"
-	readonly property bool barOnLeft: position === "left"
-	readonly property bool barOnTop: position === "top"
-	required property string configPosition
-	readonly property bool horizontal: position !== "left"
-	readonly property string position: configPosition === "top" || configPosition === "bottom" ? configPosition : "left"
-	required property var win
-
-	function axisPos(x: real, y: real): real {
-		return horizontal ? x : y;
-	}
-
-	function barContains(x: real, y: real, clamped = false): bool {
-		const extent = clamped ? barClamped : barExtent;
-		if (barOnTop)
-			return y < extent;
-		if (barOnBottom)
-			return y > win.height - extent;
-		return x < extent;
-	}
-
-	function insetBottom(border: real, clamped = false): real {
-		return barOnBottom ? (clamped ? barClamped : barExtent) : border;
-	}
-
-	function insetLeft(border: real, clamped = false): real {
-		return barOnLeft ? (clamped ? barClamped : barExtent) : border;
-	}
-
-	function insetTop(border: real, clamped = false): real {
-		return barOnTop ? (clamped ? barClamped : barExtent) : border;
-	}
-
-	function inwardDrag(dragX: real, dragY: real): real {
-		if (barOnTop)
-			return dragY;
-		if (barOnBottom)
-			return -dragY;
-		return dragX;
-	}
-
-	onConfigPositionChanged: {
-		if (!["left", "top", "bottom"].includes(configPosition))
-			console.warn(`Invalid bar position '${configPosition}', falling back to left`);
-	}
-}

Drawers/Exclusions.qml

@@ -1,33 +1,27 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
-import Quickshell.Wayland
 import QtQuick
-import ZShell.Config
+import qs.Config
 import qs.Components
 
 Scope {
 	id: root
 
 	required property Item bar
-	required property EdgeGeometry geometry
 	required property ShellScreen screen
 
 	ExclusionZone {
 		id: top
 
-		WlrLayershell.layer: WlrLayer.Overlay
-		anchors.left: true
-		anchors.right: true
 		anchors.top: true
-		hasBar: root.geometry.barOnTop
+		exclusiveZone: root.bar.exclusiveZone
 	}
 
 	ExclusionZone {
 		id: left
 
 		anchors.left: true
-		hasBar: root.geometry.barOnLeft
 	}
 
 	ExclusionZone {
@@ -40,7 +34,6 @@ Scope {
 		id: bottom
 
 		anchors.bottom: true
-		hasBar: root.geometry.barOnBottom
 	}
 
 	Timer {
@@ -51,9 +44,7 @@ Scope {
 	}
 
 	component ExclusionZone: CustomWindow {
-		property bool hasBar
-
-		exclusiveZone: hasBar ? root.bar.exclusiveZone : Config.bar.border
+		exclusiveZone: Config.barConfig.border
 		implicitHeight: 1
 		implicitWidth: 1
 		name: "Bar-Exclusion"

Drawers/Interactions.qml

@@ -1,9 +1,9 @@
 import Quickshell
 import QtQuick
 import qs.Components
-import ZShell.Config
+import qs.Config
 import qs.Helpers
-import qs.Modules.Bar.Popouts
+import qs.Modules as BarPopouts
 
 Item {
 	id: root
@@ -12,47 +12,43 @@ Item {
 	required property real borderThickness
 	property bool dashboardShortcutActive
 	required property Drawing drawing
-	required property EdgeGeometry geometry
 	property bool osdShortcutActive
 	required property Panels panels
-	required property Wrapper popouts
+	required property BarPopouts.Wrapper popouts
 	required property ShellScreen screen
 	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
 	required property PersistentProperties visibilities
 
 	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);
+		return y > root.height - panel.height - Config.barConfig.border && 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);
+		return x < panel.x + panel.width + Config.barConfig.border && withinPanelHeight(panel, x, y);
 	}
 
 	function inRightPanel(panel: Item, x: real, y: real): bool {
-		return x > panel.x + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
+		return x > panel.x - Config.barConfig.border && 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);
+		return y < bar.implicitHeight + panel.height && withinPanelWidth(panel, x, y);
+	}
+
+	function onWheel(event: WheelEvent): void {
+		if (event.x < bar.implicitWidth) {
+			bar.handleWheel(event.y, event.angleDelta);
+		}
 	}
 
 	function withinPanelHeight(panel: Item, x: real, y: real): bool {
-		const panelY = panel.y + geometry.insetTop(borderThickness);
+		const panelY = panel.y + bar.implicitHeight;
 		return y >= panelY && y <= panelY + panel.height;
 	}
 
 	function withinPanelWidth(panel: Item, x: real, y: real): bool {
-		const panelX = panel.x + geometry.insetLeft(borderThickness);
+		const panelX = panel.x + root.borderThickness;
 		return x >= panelX && x <= panelX + panel.width;
 	}
 
@@ -79,13 +75,13 @@ Item {
 			const dragX = x - centroid.pressPosition.x;
 			const dragY = y - centroid.pressPosition.y;
 
-			if (centroid.pressPosition.y >= root.screen.height - Config.bar.border && centroid.pressPosition.x > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
+			if (centroid.pressPosition.y >= root.screen.height - Config.barConfig.border && centroid.pressPosition.x > root.screen.width / 5 && dragY < -200)
 				root.visibilities.launcher = true;
 
 			if (root.singleGestureTriggered)
 				return;
 
-			if (root.geometry.insetTop(root.borderThickness) > centroid.pressPosition.y) {
+			if (centroid.pressPosition.y < root.bar.implicitHeight) {
 				if (dragY > 20) {
 					root.visibilities.settings = true;
 					root.singleGestureTriggered = true;
@@ -95,26 +91,26 @@ Item {
 				}
 			}
 
-			if (centroid.pressPosition.y > root.screen.height - root.geometry.insetBottom(root.borderThickness) && centroid.pressPosition.x < root.screen.width / 5 && dragY < -50)
+			if (centroid.pressPosition.y > root.screen.height - Config.barConfig.border && centroid.pressPosition.x < root.screen.width / 5 && dragY < -50)
 				root.visibilities.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 && centroid.pressPosition.y > root.screen.height - root.bar.implicitHeight && centroid.pressPosition.x > root.screen.width / 5 && !root.visibilities.launcher)
 				if (dragY < -10) {
 					root.visibilities.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) {
+			if (centroid.pressPosition.x > root.screen.width - Config.barConfig.border && centroid.pressPosition.y < (root.screen.height / 2) && dragX < -20) {
 				root.visibilities.sidebar = true;
 				root.singleGestureTriggered = true;
 			}
 
-			if (centroid.pressPosition.x >= root.screen.width - Config.bar.border && centroid.pressPosition.y > (root.screen.height / 2) && dragX < -20) {
+			if (centroid.pressPosition.x >= root.screen.width - Config.barConfig.border && centroid.pressPosition.y > (root.screen.height / 2) && dragX < -20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
 
-			if (centroid.pressPosition.x <= Config.bar.border && dragX > 20) {
+			if (centroid.pressPosition.x <= Config.barConfig.border && dragX > 20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
@@ -162,19 +158,6 @@ Item {
 		}
 	}
 
-	Timer {
-		id: unhideTimer
-
-		interval: Config.bar.revealDelay
-		repeat: false
-		running: false
-
-		onTriggered: {
-			if (hoverHandler.hovered)
-				root.bar.isHovered = true;
-		}
-	}
-
 	HoverHandler {
 		id: hoverHandler
 
@@ -187,11 +170,11 @@ Item {
 					root.panels.osd.hovered = false;
 				}
 
-				if (!root.popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
+				if (!root.popouts.currentName.startsWith("traymenu")) {
 					root.popouts.hasCurrent = false;
 				}
 
-				if (Config.bar.autoHide || root.bar.fullscreen)
+				if (Config.barConfig.autoHide)
 					root.bar.isHovered = false;
 			}
 		}
@@ -210,13 +193,10 @@ Item {
 				return;
 			}
 
-			if (!root.visibilities.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
+			if (!root.visibilities.bar && Config.barConfig.autoHide && y < root.bar.implicitHeight)
 				root.bar.isHovered = true;
 
-			if (root.bar.fullscreen && !root.bar.isHovered)
-				unhideTimer.start();
-
-			if (root.panels.sidebar.offsetScale === 1) {
+			if (root.panels.sidebar.width === 0) {
 				const showOsd = root.inRightPanel(root.panels.osdWrapper, x, y);
 
 				if (showOsd) {
@@ -224,7 +204,7 @@ Item {
 					root.panels.osd.hovered = true;
 				}
 			} else {
-				const outOfSidebar = x < root.width - root.panels.sidebar.width * (1 - root.panels.sidebar.offsetScale);
+				const outOfSidebar = x < root.width - root.panels.sidebar.width;
 				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
 
 				if (!root.osdShortcutActive) {
@@ -236,11 +216,11 @@ Item {
 				}
 			}
 
-			if (Config.dock.enabled && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
+			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 (root.geometry.barContains(x, y))
-				root.bar.checkPopout(root.geometry.axisPos(x, y));
+			if (y < root.bar.implicitHeight)
+				root.bar.checkPopout(x);
 		}
 	}
 
@@ -329,6 +309,17 @@ Item {
 			}
 		}
 
+		function onUtilitiesChanged() {
+			if (root.visibilities.utilities) {
+				const inUtilitiesArea = root.inBottomPanel(root.panels.utilities, root.mouseX, root.mouseY);
+				if (!inUtilitiesArea) {
+					root.utilitiesShortcutActive = true;
+				}
+			} else {
+				root.utilitiesShortcutActive = false;
+			}
+		}
+
 		target: root.visibilities
 	}
 }