matugen: log worker messages

fixes #819

.githooks/pre-commit

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# DISABLED for now
+exit 0
+
+set -euo pipefail
+
+HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$HOOK_DIR/.." && pwd)"
+
+cd "$REPO_ROOT"
+
+if [[ -z "${POEDITOR_API_TOKEN:-}" ]] || [[ -z "${POEDITOR_PROJECT_ID:-}" ]]; then
+    exit 0
+fi
+
+if ! command -v python3 &>/dev/null; then
+    exit 0
+fi
+
+if ! python3 scripts/i18nsync.py check &>/dev/null; then
+    echo "Translations out of sync"
+    echo "run python3 scripts/i18nsync.py sync"
+    exit 1
+fi
+
+exit 0

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [avengemedia]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: danklinux
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,21 +9,15 @@ assignees: ""
 <!-- If your issue is related to ICONS 
 - Purple and black checkerboards are QT's way of signalling an icon doesn't exist
   - FIX: Configure a QT6 or Icon Pack in DMS Settings that has the icon you want
-  - Follow the [THEMING](https://github.com/AvengeMedia/DankMaterialShell/tree/master?tab=readme-ov-file#theming) section to ensure your QT environment variable is configured correctl for themes.
+  - Follow the [THEMING](https://danklinux.com/docs/dankmaterialshell/icon-theming) section to ensure your QT environment variable is configured correctly for themes.
   - Once done, configure an icon theme - either however you normally do with gtk3 or qt6ct, or through the built-in settings modal. -->
 
-<!-- If your issue is related to APP LAUNCHER/DOCK/Running Apps being stale
- Quickshell does not ever update its DesktopEntires.
- There is an open PR for it, that has been stuck unmerged over there to fix it.
- We unfortunately are at the mercy of quickshell to merge it.
- Until then, newly installed and removed apps will not react until the
- shell is restarted.
-  -->
-
 ## Compositor
 
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 - [ ] Other (specify)
 
 ## Distribution

.github/ISSUE_TEMPLATE/feature_request.md

@@ -21,6 +21,8 @@ Is this feature specific to one compositor?
 - [ ] All compositors
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 
 ## Proposed Solution
 

.github/ISSUE_TEMPLATE/support_request.md

@@ -10,6 +10,8 @@ assignees: ""
 
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 - [ ] other
 
 ## Distribution

.github/workflows/go-ci.yml

@@ -0,0 +1,42 @@
+name: Go CI
+
+on:
+  push:
+    branches:
+      - '**'
+    paths:
+      - 'core/**'
+      - '.github/workflows/go-ci.yml'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: core
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: ./core/go.mod
+
+      - name: Format check
+        run: |
+          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
+            echo "The following files are not formatted:"
+            gofmt -s -l .
+            exit 1
+          fi
+
+      - name: Test
+        run: go test -v ./...
+
+      - name: Build dms
+        run: go build -v ./cmd/dms
+
+      - name: Build dankinstall
+        run: go build -v ./cmd/dankinstall

.github/workflows/poeditor-export.yml

@@ -1,107 +0,0 @@
-name: POEditor Diff & Sync
-
-on:
-  push:
-    branches: [ master ]
-  workflow_dispatch: {}
-
-concurrency:
-  group: poeditor-sync
-  cancel-in-progress: false
-
-jobs:
-  sync-translations:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install jq
-        run: sudo apt-get update && sudo apt-get install -y jq
-
-      - name: Export and update translations from POEditor
-        env:
-          API_TOKEN: ${{ secrets.POEDITOR_API_TOKEN }}
-          PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
-        run: |
-          set -euo pipefail
-
-          LANGUAGES=(
-            "ja:translations/poexports/ja.json"
-            "zh-Hans:translations/poexports/zh_CN.json"
-            "pt-br:translations/poexports/pt.json"
-          )
-
-          ANY_CHANGED=false
-
-          for lang_pair in "${LANGUAGES[@]}"; do
-            IFS=':' read -r PO_LANG REPO_FILE <<< "$lang_pair"
-
-            echo "::group::Processing $PO_LANG"
-
-            RESP=$(curl -sS -X POST https://api.poeditor.com/v2/projects/export \
-              -d api_token="$API_TOKEN" \
-              -d id="$PROJECT_ID" \
-              -d language="$PO_LANG" \
-              -d type="key_value_json")
-
-            STATUS=$(echo "$RESP" | jq -r '.response.status')
-            if [[ "$STATUS" != "success" ]]; then
-              echo "POEditor export request failed for $PO_LANG: $RESP" >&2
-              continue
-            fi
-
-            URL=$(echo "$RESP" | jq -r '.result.url')
-            if [[ -z "$URL" || "$URL" == "null" ]]; then
-              echo "No export URL returned for $PO_LANG" >&2
-              continue
-            fi
-
-            curl -sS -L "$URL" -o "/tmp/po_export_${PO_LANG}.json"
-            jq -S . "/tmp/po_export_${PO_LANG}.json" > "/tmp/po_export_${PO_LANG}.norm.json"
-
-            if [[ -f "$REPO_FILE" ]]; then
-              jq -S . "$REPO_FILE" > "/tmp/repo_${PO_LANG}.norm.json" || echo "{}" > "/tmp/repo_${PO_LANG}.norm.json"
-            else
-              echo "{}" > "/tmp/repo_${PO_LANG}.norm.json"
-            fi
-
-            if diff -q "/tmp/po_export_${PO_LANG}.norm.json" "/tmp/repo_${PO_LANG}.norm.json" >/dev/null; then
-              echo "No changes for $PO_LANG"
-            else
-              echo "Detected changes for $PO_LANG"
-              mkdir -p "$(dirname "$REPO_FILE")"
-              cp "/tmp/po_export_${PO_LANG}.norm.json" "$REPO_FILE"
-              ANY_CHANGED=true
-            fi
-
-            echo "::endgroup::"
-          done
-
-          echo "any_changed=$ANY_CHANGED" >> "$GITHUB_OUTPUT"
-        id: export
-
-      - name: Commit and push translation updates
-        if: steps.export.outputs.any_changed == 'true'
-        run: |
-          set -euo pipefail
-
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-          git add translations/poexports/*.json
-          git commit -m "i18n: update translations"
-
-          for attempt in 1 2 3; do
-            if git push; then
-              echo "Successfully pushed translation updates"
-              exit 0
-            fi
-            echo "Push attempt $attempt failed, pulling and retrying..."
-            git pull --rebase
-            sleep $((attempt*2))
-          done
-
-          echo "Failed to push after retries" >&2
-          exit 1

.github/workflows/release.yml

@@ -1,46 +1,192 @@
-# Release from a dispatch event from the danklinux repo
-name: Create Release from DMS
+name: Release
 
 on:
-  repository_dispatch:
-    types: [dms_release]
+  push:
+    tags:
+      - 'v*'
 
 permissions:
   contents: write
+  actions: write
 
 concurrency:
-  group: release-${{ github.event.client_payload.tag }}
+  group: release-${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
-  create_release_from_dms:
-    runs-on: ubuntu-24.04
-    env:
-      TAG: ${{ github.event.client_payload.tag }}
-      DMS_REPO: ${{ github.event.client_payload.dms_repo }}
+  build-core:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+
+    defaults:
+      run:
+        working-directory: core
+
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Ensure VERSION and tag
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: ./core/go.mod
+
+      - name: Format check
         run: |
-          set -euxo pipefail
-          git config user.name  "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-          echo "${TAG}" > VERSION
-
-          git add -A VERSION
-
-          if ! git diff --cached --quiet; then
-            git commit -m "Update VERSION to ${TAG} (from DMS)"
+          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
+            echo "The following files are not formatted:"
+            gofmt -s -l .
+            exit 1
           fi
 
-          git tag -f "${TAG}"
+      - name: Run tests
+        run: go test -v ./...
 
-          git push origin HEAD
-          git push -f origin "${TAG}"
+      - name: Build dankinstall (${{ matrix.arch }})
+        env:
+          GOOS: linux
+          CGO_ENABLED: 0
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          set -eux
+          cd cmd/dankinstall
+          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+            -o ../../dankinstall-${{ matrix.arch }}
+          cd ../..
+          gzip -9 -k dankinstall-${{ matrix.arch }}
+          sha256sum dankinstall-${{ matrix.arch }}.gz > dankinstall-${{ matrix.arch }}.gz.sha256
+
+      - name: Build dms (${{ matrix.arch }})
+        env:
+          GOOS: linux
+          CGO_ENABLED: 0
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          set -eux
+          cd cmd/dms
+          go build -trimpath -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+            -o ../../dms-${{ matrix.arch }}
+          cd ../..
+          gzip -9 -k dms-${{ matrix.arch }}
+          sha256sum dms-${{ matrix.arch }}.gz > dms-${{ matrix.arch }}.gz.sha256
+
+      - name: Generate shell completions
+        if: matrix.arch == 'amd64'
+        run: |
+          set -eux
+          chmod +x dms-amd64
+          ./dms-amd64 completion bash > completion.bash
+          ./dms-amd64 completion fish > completion.fish
+          ./dms-amd64 completion zsh > completion.zsh
+
+      - name: Build dms-distropkg (${{ matrix.arch }})
+        env:
+          GOOS: linux
+          CGO_ENABLED: 0
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          set -eux
+          cd cmd/dms
+          go build -trimpath -tags distro_binary -ldflags "-s -w -X main.Version=${GITHUB_REF#refs/tags/}" \
+            -o ../../dms-distropkg-${{ matrix.arch }}
+          cd ../..
+          gzip -9 -k dms-distropkg-${{ matrix.arch }}
+          sha256sum dms-distropkg-${{ matrix.arch }}.gz > dms-distropkg-${{ matrix.arch }}.gz.sha256
+
+      - name: Upload artifacts (${{ matrix.arch }})
+        if: matrix.arch == 'arm64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-assets-${{ matrix.arch }}
+          path: |
+            core/dankinstall-${{ matrix.arch }}.gz
+            core/dankinstall-${{ matrix.arch }}.gz.sha256
+            core/dms-${{ matrix.arch }}.gz
+            core/dms-${{ matrix.arch }}.gz.sha256
+            core/dms-distropkg-${{ matrix.arch }}.gz
+            core/dms-distropkg-${{ matrix.arch }}.gz.sha256
+          if-no-files-found: error
+
+      - name: Upload artifacts with completions
+        if: matrix.arch == 'amd64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-assets-${{ matrix.arch }}
+          path: |
+            core/dankinstall-${{ matrix.arch }}.gz
+            core/dankinstall-${{ matrix.arch }}.gz.sha256
+            core/dms-${{ matrix.arch }}.gz
+            core/dms-${{ matrix.arch }}.gz.sha256
+            core/dms-distropkg-${{ matrix.arch }}.gz
+            core/dms-distropkg-${{ matrix.arch }}.gz.sha256
+            core/completion.bash
+            core/completion.fish
+            core/completion.zsh
+          if-no-files-found: error
+
+  update-versions:
+    runs-on: ubuntu-latest
+    needs: build-core
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: Update VERSION
+        run: |
+          set -euo pipefail
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          version="${GITHUB_REF#refs/tags/}"
+          version_no_v="${version#v}"
+          echo "Updating to version: $version"
+
+          # Update VERSION file in quickshell/
+          echo "${version}" > quickshell/VERSION
+
+          git add quickshell/VERSION
+
+          if ! git diff --cached --quiet; then
+            git commit -m "chore: bump version to $version"
+            git push origin HEAD:master || git push origin HEAD:main
+            echo "Pushed version updates to master"
+          else
+            echo "No version changes needed"
+          fi
+
+          # Force-push the tag to point to the commit with updated VERSION
+          git tag -f "${version}"
+          git push -f origin "${version}"
+
+  release:
+    runs-on: ubuntu-24.04
+    needs: [build-core, update-versions]
+    env:
+      TAG: ${{ github.ref_name }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Fetch updated tag after version bump
+        run: |
+          git fetch origin --force tag ${{ github.ref_name }}
+          git checkout ${{ github.ref_name }}
+
+      - name: Download core artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: core-assets-*
+          merge-multiple: true
+          path: ./_core_assets
 
       - name: Generate Changelog
         id: changelog
@@ -48,23 +194,31 @@ jobs:
           set -e
           PREVIOUS_TAG=$(git describe --tags --abbrev=0 "${TAG}^" 2>/dev/null || echo "")
           if [ -z "$PREVIOUS_TAG" ]; then
-            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" | head -50)
+            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /' | head -50)
           else
-            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" "${PREVIOUS_TAG}..${TAG}")
+            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" "${PREVIOUS_TAG}..${TAG}" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /')
           fi
 
           cat > RELEASE_BODY.md << 'EOF'
+          ## Installation
+
+          ```bash
+          curl -fsSL https://install.danklinux.com | sh
+          ```
+
           ## Assets
 
           ### Complete Packages
-          - **`dms-full-amd64.tar.gz`** - Complete package for x86_64 systems (CLI binaries + QML source + installation guide)
-          - **`dms-full-arm64.tar.gz`** - Complete package for ARM64 systems (CLI binaries + QML source + installation guide)
+          - **`dms-full-amd64.tar.gz`** - Complete package for x86_64 systems (CLI binaries + QML source + shell completions + installation guide)
+          - **`dms-full-arm64.tar.gz`** - Complete package for ARM64 systems (CLI binaries + QML source + shell completions + installation guide)
 
           ### Individual Components
           - **`dms-cli-amd64.gz`** - DMS CLI binary for x86_64 systems
           - **`dms-cli-arm64.gz`** - DMS CLI binary for ARM64 systems
           - **`dms-distropkg-amd64.gz`** - DMS CLI binary built with distro_package tag for AMD64 systems
           - **`dms-distropkg-arm64.gz`** - DMS CLI binary built with distro_package tag for ARM64 systems
+          - **`dankinstall-amd64.gz`** - Installer binary for x86_64 systems
+          - **`dankinstall-arm64.gz`** - Installer binary for ARM64 systems
           - **`dms-qml.tar.gz`** - QML source code only
 
           ### Checksums
@@ -88,30 +242,14 @@ jobs:
           cat RELEASE_BODY.md >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Create/Update DankMaterialShell Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ env.TAG }}
-          name: Release ${{ env.TAG }}
-          body: ${{ steps.changelog.outputs.changelog }}
-          draft: false
-          prerelease: ${{ contains(env.TAG, '-') }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Download and prepare release assets
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Prepare release assets
         run: |
           set -euxo pipefail
 
           mkdir -p _release_assets
 
-          # Download DMS CLI binaries from the danklinux repo
-          gh release download "${TAG}" -R "${DMS_REPO}" --dir ./_dms_assets
-
-          # Rename CLI binaries to dms-cli-* format and copy distropkg binaries
-          for file in _dms_assets/dms-*.gz*; do
+          # Copy core binaries and rename dms-*.gz to dms-cli-*.gz
+          for file in _core_assets/dms-*.gz*; do
             if [ -f "$file" ]; then
               basename=$(basename "$file")
               if [[ "$basename" == dms-distropkg-* ]]; then
@@ -123,13 +261,21 @@ jobs:
             fi
           done
 
-          # Create QML source package (exclude .git, .github, build artifacts)
-          tar --exclude='.git' \
+          # Copy dankinstall binaries
+          cp _core_assets/dankinstall-*.gz* _release_assets/
+
+          # Copy completions
+          cp _core_assets/completion.* _release_assets/ 2>/dev/null || true
+
+          # Create QML source package (exclude build artifacts and git files)
+          # Copy root LICENSE and CONTRIBUTING.md to quickshell/ for packaging
+          cp LICENSE CONTRIBUTING.md quickshell/
+
+          # Tar the CONTENTS of quickshell/, not the directory itself
+          (cd quickshell && tar --exclude='.git' \
               --exclude='.github' \
-              --exclude='_dms_assets' \
-              --exclude='_release_assets' \
               --exclude='*.tar.gz' \
-              -czf _release_assets/dms-qml.tar.gz .
+              -czf ../_release_assets/dms-qml.tar.gz .)
 
           # Generate checksum for QML package
           (cd _release_assets && sha256sum dms-qml.tar.gz > dms-qml.tar.gz.sha256)
@@ -138,24 +284,36 @@ jobs:
           for arch in amd64 arm64; do
             mkdir -p _temp_full/dms
             mkdir -p _temp_full/bin
+            mkdir -p _temp_full/completions
 
-            # Extract QML source to temp directory
+            # Extract QML source
             tar -xzf _release_assets/dms-qml.tar.gz -C _temp_full/dms
 
-            # Copy CLI binary if it exists
-            if [ -f "_dms_assets/dms-${arch}.gz" ]; then
-              gunzip -c "_dms_assets/dms-${arch}.gz" > _temp_full/bin/dms
+            # Add CLI binaries
+            if [ -f "_core_assets/dms-${arch}.gz" ]; then
+              gunzip -c "_core_assets/dms-${arch}.gz" > _temp_full/bin/dms
               chmod +x _temp_full/bin/dms
             fi
 
-            # Copy distropkg binary if it exists
-            if [ -f "_dms_assets/dms-distropkg-${arch}.gz" ]; then
-              gunzip -c "_dms_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg
+            if [ -f "_core_assets/dms-distropkg-${arch}.gz" ]; then
+              gunzip -c "_core_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg
               chmod +x _temp_full/bin/dms-distropkg
             fi
 
-            # Create INSTALL.md
-            cat > _temp_full/INSTALL.md << 'EOF'
+            # Add shell completions
+            for completion in _core_assets/completion.*; do
+              if [ -f "$completion" ]; then
+                cp "$completion" _temp_full/completions/
+              fi
+            done
+
+            # Copy docs directory
+            if [ -d "docs" ]; then
+              cp -r docs _temp_full/
+            fi
+
+            # Create installation guide
+            cat > _temp_full/INSTALL.md << 'EOFINSTALL'
           # DankMaterialShell Installation
 
           ## Requirements
@@ -175,16 +333,23 @@ jobs:
           2. **Install the DMS CLI binaries:**
              ```bash
              sudo install -m 755 bin/dms /usr/local/bin/dms
-             # or install to a local directory:
-             mkdir -p ~/.local/bin
-             install -m 755 bin/dms ~/.local/bin/dms
              ```
 
-          3. **Start the shell:**
+          3. **Install shell completions (optional):**
+             ```bash
+             # Bash
+             sudo install -m 644 completions/completion.bash /usr/share/bash-completion/completions/dms
+
+             # Fish
+             sudo install -m 644 completions/completion.fish /usr/share/fish/vendor_completions.d/dms.fish
+
+             # Zsh
+             sudo install -m 644 completions/completion.zsh /usr/share/zsh/site-functions/_dms
+             ```
+
+          4. **Start the shell:**
              ```bash
              dms run
-             # or directly with quickshell (will lack some dbus integrations & plugin management):
-             quickshell -p ~/.config/quickshell/dms
              ```
 
           ## Configuration
@@ -195,10 +360,9 @@ jobs:
 
           ## Troubleshooting
 
-          - Run with verbose output: `quickshell -v -p ~/.config/quickshell/dms`
-          - Check logs in `~/.local/state/DankMaterialShell/`
+          - Run with verbose output: `DMS_LOG_LEVEL=debug dms run`
           - Ensure all dependencies are installed
-          EOF
+          EOFINSTALL
 
             # Create the full package
             (cd _temp_full && tar -czf "../_release_assets/dms-full-${arch}.tar.gz" .)
@@ -210,10 +374,319 @@ jobs:
             rm -rf _temp_full
           done
 
-      - name: Attach all assets to release
+      - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.TAG }}
+          name: Release ${{ env.TAG }}
+          body: ${{ steps.changelog.outputs.changelog }}
           files: _release_assets/**
+          draft: false
+          prerelease: ${{ contains(env.TAG, '-') }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  trigger-obs-update:
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Install OSC
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osc
+          
+          mkdir -p ~/.config/osc
+          cat > ~/.config/osc/oscrc << EOF
+          [general]
+          apiurl = https://api.opensuse.org
+          
+          [https://api.opensuse.org]
+          user = ${{ secrets.OBS_USERNAME }}
+          pass = ${{ secrets.OBS_PASSWORD }}
+          EOF
+          chmod 600 ~/.config/osc/oscrc
+      
+      - name: Update OBS packages
+        run: |
+          VERSION="${{ github.ref_name }}"
+          cd distro
+          bash scripts/obs-upload.sh dms "Update to $VERSION"
+
+  trigger-ppa-update:
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Install build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            debhelper \
+            devscripts \
+            dput \
+            lftp \
+            build-essential \
+            fakeroot \
+            dpkg-dev
+      
+      - name: Configure GPG
+        env:
+          GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+        run: |
+          echo "$GPG_KEY" | gpg --import
+          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
+          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
+      
+      - name: Upload to PPA
+        run: |
+          VERSION="${{ github.ref_name }}"
+          cd distro/ubuntu/ppa
+          bash create-and-upload.sh ../dms dms questing
+
+  copr-build:
+    runs-on: ubuntu-latest
+    needs: release
+    env:
+      TAG: ${{ github.ref_name }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Determine version
+        id: version
+        run: |
+          VERSION="${TAG#v}"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Building DMS stable version: $VERSION"
+
+      - name: Setup build environment
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y rpm wget curl jq gzip
+          mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+
+      - name: Download release assets
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          cd ~/rpmbuild/SOURCES
+
+          wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || {
+            echo "Failed to download dms-qml.tar.gz for v${VERSION}"
+            exit 1
+          }
+
+      - name: Generate stable spec file
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          CHANGELOG_DATE="$(date '+%a %b %d %Y')"
+
+          cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
+          # Spec for DMS stable releases - Generated by GitHub Actions
+
+          %global debug_package %{nil}
+          %global version VERSION_PLACEHOLDER
+          %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
+
+          Name:           dms
+          Version:        %{version}
+          Release:        1%{?dist}
+          Summary:        %{pkg_summary}
+
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          Source0:        dms-qml.tar.gz
+
+          BuildRequires:  gzip
+          BuildRequires:  wget
+          BuildRequires:  systemd-rpm-macros
+
+          Requires:       (quickshell or quickshell-git)
+          Requires:       accountsservice
+          Requires:       dms-cli
+          Requires:       dgop
+
+          Recommends:     cava
+          Recommends:     cliphist
+          Recommends:     danksearch
+          Recommends:     hyprpicker
+          Recommends:     matugen
+          Recommends:     wl-clipboard
+          Recommends:     NetworkManager
+          Recommends:     qt6-qtmultimedia
+          Suggests:       qt6ct
+
+          %description
+          DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+          and optimized for the niri and hyprland compositors. Features notifications,
+          app launcher, wallpaper customization, and fully customizable with plugins.
+
+          Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+          process monitoring, notification center, clipboard history, dock, control center,
+          lock screen, and comprehensive plugin system.
+
+          %package -n dms-cli
+          Summary:        DankMaterialShell CLI tool
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          %description -n dms-cli
+          Command-line interface for DankMaterialShell configuration and management.
+          Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+          %package -n dgop
+          Summary:        Stateless CPU/GPU monitor for DankMaterialShell
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/dgop
+          Provides:       dgop
+
+          %description -n dgop
+          DGOP is a stateless system monitoring tool that provides CPU, GPU, memory, and
+          network statistics. Designed for integration with DankMaterialShell but can be
+          used standalone. This package always includes the latest stable dgop release.
+
+          %prep
+          %setup -q -c -n dms-qml
+
+          # Download architecture-specific binaries during build
+          case "%{_arch}" in
+            x86_64)
+              ARCH_SUFFIX="amd64"
+              ;;
+            aarch64)
+              ARCH_SUFFIX="arm64"
+              ;;
+            *)
+              echo "Unsupported architecture: %{_arch}"
+              exit 1
+              ;;
+          esac
+
+          wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dms-cli for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+          chmod +x %{_builddir}/dms-cli
+
+          wget -O %{_builddir}/dgop.gz "https://github.com/AvengeMedia/dgop/releases/latest/download/dgop-linux-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dgop for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dgop.gz > %{_builddir}/dgop
+          chmod +x %{_builddir}/dgop
+
+          %build
+
+          %install
+          install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+          install -Dm755 %{_builddir}/dgop %{buildroot}%{_bindir}/dgop
+
+          install -d %{buildroot}%{_datadir}/bash-completion/completions
+          install -d %{buildroot}%{_datadir}/zsh/site-functions
+          install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
+          %{_builddir}/dms-cli completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
+          %{_builddir}/dms-cli completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
+          %{_builddir}/dms-cli completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
+
+          install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+          install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+          cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+          rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+          %posttrans
+          if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+              rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+          fi
+
+          if [ "$1" -ge 2 ]; then
+            pkill -USR1 -x dms >/dev/null 2>&1 || true
+          fi
+
+          %files
+          %license LICENSE
+          %doc README.md CONTRIBUTING.md
+          %{_datadir}/quickshell/dms/
+          %{_userunitdir}/dms.service
+
+          %files -n dms-cli
+          %{_bindir}/dms
+          %{_datadir}/bash-completion/completions/dms
+          %{_datadir}/zsh/site-functions/_dms
+          %{_datadir}/fish/vendor_completions.d/dms.fish
+
+          %files -n dgop
+          %{_bindir}/dgop
+
+          %changelog
+          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-1
+          - Stable release VERSION_PLACEHOLDER
+          - Built from GitHub release
+          - Includes latest dms-cli and dgop binaries
+          SPECEOF
+
+          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+
+      - name: Build SRPM
+        id: build
+        run: |
+          cd ~/rpmbuild/SPECS
+          rpmbuild -bs dms.spec
+
+          SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
+          SRPM_NAME=$(basename "$SRPM")
+
+          echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
+          echo "srpm_name=$SRPM_NAME" >> $GITHUB_OUTPUT
+          echo "SRPM built: $SRPM_NAME"
+
+      - name: Upload SRPM artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dms-stable-srpm-${{ steps.version.outputs.version }}
+          path: ${{ steps.build.outputs.srpm_path }}
+          retention-days: 90
+
+      - name: Install Copr CLI
+        run: |
+          sudo apt-get install -y python3-pip
+          pip3 install copr-cli
+
+          mkdir -p ~/.config
+          cat > ~/.config/copr << EOF
+          [copr-cli]
+          login = ${{ secrets.COPR_LOGIN }}
+          username = avengemedia
+          token = ${{ secrets.COPR_TOKEN }}
+          copr_url = https://copr.fedorainfracloud.org
+          EOF
+          chmod 600 ~/.config/copr
+
+      - name: Upload to Copr
+        run: |
+          SRPM="${{ steps.build.outputs.srpm_path }}"
+          VERSION="${{ steps.version.outputs.version }}"
+
+          echo "Uploading SRPM to avengemedia/dms..."
+          BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
+          echo "$BUILD_OUTPUT"
+
+          BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")
+
+          if [ "$BUILD_ID" != "unknown" ]; then
+            echo "Build submitted: https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
+          fi

.github/workflows/run-copr.yml

@@ -1,22 +1,21 @@
 name: DMS Copr Stable Release
 
 on:
-  push:
-    tags:
-      - 'v*'
-  release:
-    types: [published]
   workflow_dispatch:
     inputs:
       version:
         description: 'Versioning (e.g., 0.1.14, leave empty for latest release)'
         required: false
         default: ''
+      release:
+        description: 'Release number (e.g., 1, 2, 3 for hotfixes)'
+        required: false
+        default: '1'
 
 jobs:
   build-and-upload:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -24,25 +23,23 @@ jobs:
       - name: Determine version
         id: version
         run: |
+          # Get version from manual input or latest release
           if [ -n "${{ github.event.inputs.version }}" ]; then
             VERSION="${{ github.event.inputs.version }}"
             echo "Using manual version: $VERSION"
-          elif [ "${{ github.event_name }}" = "release" ]; then
-            VERSION="${{ github.event.release.tag_name }}"
-            VERSION="${VERSION#v}"
-            echo "Using release version: $VERSION"
-          elif [ "${{ github.event_name }}" = "push" ] && [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            VERSION="${{ github.ref_name }}"
-            VERSION="${VERSION#v}"
-            echo "Using tag version: $VERSION"
           else
-            # Fallback to latest release
-            VERSION=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | jq -r '.tag_name' | sed 's/^v//')
+            VERSION=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r '.tag_name' | sed 's/^v//')
             echo "Using latest release version: $VERSION"
           fi
-          
+
+          RELEASE="${{ github.event.inputs.release }}"
+          if [ -z "$RELEASE" ]; then
+            RELEASE="1"
+          fi
+
           echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "✅ Building DMS stable version: $VERSION"
+          echo "release=$RELEASE" >> $GITHUB_OUTPUT
+          echo "✅ Building DMS hotfix version: $VERSION-$RELEASE"
       
       - name: Setup build environment
         run: |
@@ -71,6 +68,7 @@ jobs:
       - name: Generate stable spec file
         run: |
           VERSION="${{ steps.version.outputs.version }}"
+          RELEASE="${{ steps.version.outputs.release }}"
           CHANGELOG_DATE="$(date '+%a %b %d %Y')"
 
           cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
@@ -82,31 +80,29 @@ jobs:
 
           Name:           dms
           Version:        %{version}
-          Release:        1%{?dist}
+          Release:        RELEASE_PLACEHOLDER%{?dist}
           Summary:        %{pkg_summary}
 
-          License:        GPL-3.0-only
+          License:        MIT
           URL:            https://github.com/AvengeMedia/DankMaterialShell
 
           Source0:        dms-qml.tar.gz
 
           BuildRequires:  gzip
           BuildRequires:  wget
+          BuildRequires:  systemd-rpm-macros
 
           Requires:       (quickshell or quickshell-git)
+          Requires:       accountsservice
           Requires:       dms-cli
           Requires:       dgop
-          Requires:       fira-code-fonts
-          Requires:       material-symbols-fonts
-          Requires:       rsms-inter-fonts
 
-          Recommends:     brightnessctl
           Recommends:     cava
           Recommends:     cliphist
+          Recommends:     danksearch
           Recommends:     hyprpicker
           Recommends:     matugen
           Recommends:     wl-clipboard
-          Recommends:     gammastep
           Recommends:     NetworkManager
           Recommends:     qt6-qtmultimedia
           Suggests:       qt6ct
@@ -122,8 +118,8 @@ jobs:
 
           %package -n dms-cli
           Summary:        DankMaterialShell CLI tool
-          License:        GPL-3.0-only
-          URL:            https://github.com/AvengeMedia/danklinux
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
 
           %description -n dms-cli
           Command-line interface for DankMaterialShell configuration and management.
@@ -159,7 +155,7 @@ jobs:
           esac
 
           # Download dms-cli for target architecture
-          wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/danklinux/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+          wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
             echo "Failed to download dms-cli for architecture %{_arch}"
             exit 1
           }
@@ -180,36 +176,65 @@ jobs:
           install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
           install -Dm755 %{_builddir}/dgop %{buildroot}%{_bindir}/dgop
 
-          install -dm755 %{buildroot}%{_sysconfdir}/xdg/quickshell/dms
-          cp -r %{_builddir}/dms-qml/* %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/
+          # Shell completions
+          install -d %{buildroot}%{_datadir}/bash-completion/completions
+          install -d %{buildroot}%{_datadir}/zsh/site-functions
+          install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
+          %{_builddir}/dms-cli completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
+          %{_builddir}/dms-cli completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
+          %{_builddir}/dms-cli completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
 
-          rm -rf %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/.git*
-          rm -f %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/.gitignore
-          rm -rf %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/.github
-          rm -f %{buildroot}%{_sysconfdir}/xdg/quickshell/dms/*.spec
+          install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+          install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+          cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+          rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+          %posttrans
+          # Clean up old installation path from previous versions (only if empty)
+          if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+              # Remove directories only if empty (preserves any user-added files)
+              rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+          fi
+
+          # Restart DMS for active users after upgrade
+          if [ "$1" -ge 2 ]; then
+            pkill -USR1 -x dms >/dev/null 2>&1 || true
+          fi
 
           %files
           %license LICENSE
           %doc README.md CONTRIBUTING.md
-          %{_sysconfdir}/xdg/quickshell/dms/
+          %{_datadir}/quickshell/dms/
+          %{_userunitdir}/dms.service
 
           %files -n dms-cli
           %{_bindir}/dms
+          %{_datadir}/bash-completion/completions/dms
+          %{_datadir}/zsh/site-functions/_dms
+          %{_datadir}/fish/vendor_completions.d/dms.fish
 
           %files -n dgop
           %{_bindir}/dgop
 
           %changelog
-          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-1
+          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-RELEASE_PLACEHOLDER
           - Stable release VERSION_PLACEHOLDER
           - Built from GitHub release
           - Includes latest dms-cli and dgop binaries
           SPECEOF
 
           sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/RELEASE_PLACEHOLDER/${RELEASE}/g" ~/rpmbuild/SPECS/dms.spec
           sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
-          
-          echo "✅ Spec file generated for v${VERSION}"
+
+          echo "✅ Spec file generated for v${VERSION}-${RELEASE}"
           echo ""
           echo "=== Spec file preview ==="
           head -40 ~/rpmbuild/SPECS/dms.spec
@@ -283,7 +308,7 @@ jobs:
         run: |
           echo "### 🎉 DMS Stable Build Summary" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- **Version:** ${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version:** ${{ steps.version.outputs.version }}-${{ steps.version.outputs.release }}" >> $GITHUB_STEP_SUMMARY
           echo "- **SRPM:** ${{ steps.build.outputs.srpm_name }}" >> $GITHUB_STEP_SUMMARY
           echo "- **Project:** https://copr.fedorainfracloud.org/coprs/avengemedia/dms/" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY

.github/workflows/run-obs.yml

@@ -0,0 +1,243 @@
+name: Update OBS Packages
+
+on:
+  workflow_dispatch:
+    inputs:
+      package:
+        description: 'Package to update (dms, dms-git, or all)'
+        required: false
+        default: 'all'
+      rebuild_release:
+        description: 'Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)'
+        required: false
+        default: ''
+  push:
+    tags:
+      - 'v*'
+  schedule:
+    - cron: '0 */3 * * *'  # Every 3 hours for dms-git builds
+
+jobs:
+  check-updates:
+    name: Check for updates
+    runs-on: ubuntu-latest
+    
+    outputs:
+      has_updates: ${{ steps.check.outputs.has_updates }}
+      packages: ${{ steps.check.outputs.packages }}
+      version: ${{ steps.check.outputs.version }}
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Install OSC
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osc
+          
+          mkdir -p ~/.config/osc
+          cat > ~/.config/osc/oscrc << EOF
+          [general]
+          apiurl = https://api.opensuse.org
+          
+          [https://api.opensuse.org]
+          user = ${{ secrets.OBS_USERNAME }}
+          pass = ${{ secrets.OBS_PASSWORD }}
+          EOF
+          chmod 600 ~/.config/osc/oscrc
+      
+      - name: Check for updates
+        id: check
+        run: |
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Triggered by tag: $VERSION (always update)"
+          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "Checking if dms-git source has changed..."
+            
+            # Get latest commit hash from master branch
+            LATEST_COMMIT=$(git rev-parse origin/master 2>/dev/null || git rev-parse master 2>/dev/null || echo "")
+            
+            if [[ -z "$LATEST_COMMIT" ]]; then
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "Could not determine git commit, proceeding with update"
+            else
+              # Check OBS for last uploaded commit
+              OBS_BASE="$HOME/.cache/osc-checkouts"
+              mkdir -p "$OBS_BASE"
+              OBS_PROJECT="home:AvengeMedia:dms-git"
+              
+              if [[ -d "$OBS_BASE/$OBS_PROJECT/dms-git" ]]; then
+                cd "$OBS_BASE/$OBS_PROJECT/dms-git"
+                osc up -q 2>/dev/null || true
+                
+                # Check tarball age - if older than 3 hours, update needed
+                if [[ -f "dms-git-source.tar.gz" ]]; then
+                  TARBALL_MTIME=$(stat -c%Y "dms-git-source.tar.gz" 2>/dev/null || echo "0")
+                  CURRENT_TIME=$(date +%s)
+                  AGE_SECONDS=$((CURRENT_TIME - TARBALL_MTIME))
+                  AGE_HOURS=$((AGE_SECONDS / 3600))
+                  
+                  # If tarball is older than 3 hours, check for new commits
+                  if [[ $AGE_HOURS -ge 3 ]]; then
+                    # Check if there are new commits in the last 3 hours
+                    cd "${{ github.workspace }}"
+                    NEW_COMMITS=$(git log --since="3 hours ago" --oneline origin/master 2>/dev/null | wc -l)
+                    
+                    if [[ $NEW_COMMITS -gt 0 ]]; then
+                      echo "has_updates=true" >> $GITHUB_OUTPUT
+                      echo "📋 New commits detected in last 3 hours, update needed"
+                    else
+                      echo "has_updates=false" >> $GITHUB_OUTPUT
+                      echo "📋 No new commits in last 3 hours, skipping update"
+                    fi
+                  else
+                    echo "has_updates=false" >> $GITHUB_OUTPUT
+                    echo "📋 Recent upload exists (< 3 hours), skipping update"
+                  fi
+                else
+                  echo "has_updates=true" >> $GITHUB_OUTPUT
+                  echo "📋 No existing tarball in OBS, update needed"
+                fi
+                cd "${{ github.workspace }}"
+              else
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+                echo "📋 First upload to OBS, update needed"
+              fi
+            fi
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=all" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
+          fi
+
+  update-obs:
+    name: Upload to OBS
+    needs: check-updates
+    runs-on: ubuntu-latest
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      needs.check-updates.outputs.has_updates == 'true'
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Determine packages to update
+        id: packages
+        run: |
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            VERSION="${GITHUB_REF#refs/tags/}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "Triggered by tag: $VERSION"
+          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+            echo "Triggered by schedule: updating git package"
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
+          fi
+      
+      - name: Update dms-git spec version
+        if: contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all'
+        run: |
+          # Get commit info for dms-git versioning
+          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
+          COMMIT_COUNT=$(git rev-list --count HEAD)
+          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "0.6.2")
+          
+          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
+          echo "📦 Updating dms-git.spec to version: $NEW_VERSION"
+          
+          # Update version in spec
+          sed -i "s/^Version:.*/Version:        $NEW_VERSION/" distro/opensuse/dms-git.spec
+          
+          # Add changelog entry
+          DATE_STR=$(date "+%a %b %d %Y")
+          CHANGELOG_ENTRY="* $DATE_STR Avenge Media <AvengeMedia.US@gmail.com> - ${NEW_VERSION}-1\n- Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)"
+          sed -i "/%changelog/a\\$CHANGELOG_ENTRY" distro/opensuse/dms-git.spec
+      
+      - name: Update dms stable version
+        if: steps.packages.outputs.version != ''
+        run: |
+          VERSION="${{ steps.packages.outputs.version }}"
+          VERSION_NO_V="${VERSION#v}"
+          echo "Updating packaging to version $VERSION_NO_V"
+          
+          # Update openSUSE dms spec (stable only)
+          sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec
+          
+          # Update Debian _service files
+          for service in distro/debian/*/_service; do
+            if [[ -f "$service" ]]; then
+              sed -i "s|<param name=\"revision\">v[0-9.]*</param>|<param name=\"revision\">$VERSION</param>|" "$service"
+            fi
+          done
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+
+      - name: Install OSC
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y osc
+
+          mkdir -p ~/.config/osc
+          cat > ~/.config/osc/oscrc << EOF
+          [general]
+          apiurl = https://api.opensuse.org
+
+          [https://api.opensuse.org]
+          user = ${{ secrets.OBS_USERNAME }}
+          pass = ${{ secrets.OBS_PASSWORD }}
+          EOF
+          chmod 600 ~/.config/osc/oscrc
+
+      - name: Upload to OBS
+        env:
+          FORCE_REBUILD: ${{ github.event_name == 'workflow_dispatch' && 'true' || '' }}
+          REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
+        run: |
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          MESSAGE="Automated update from GitHub Actions"
+          
+          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
+            MESSAGE="Update to ${{ steps.packages.outputs.version }}"
+          fi
+          
+          if [[ "$PACKAGES" == "all" ]]; then
+            bash distro/scripts/obs-upload.sh dms "$MESSAGE"
+            bash distro/scripts/obs-upload.sh dms-git "Automated git update"
+          else
+            bash distro/scripts/obs-upload.sh "$PACKAGES" "$MESSAGE"
+          fi
+      
+      - name: Summary
+        run: |
+          echo "### OBS Package Update Complete" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
+          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
+            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          fi
+          if [[ "${{ needs.check-updates.outputs.has_updates }}" == "false" ]]; then
+            echo "- **Status**: Skipped (no changes detected)" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "- **Project**: https://build.opensuse.org/project/show/home:AvengeMedia" >> $GITHUB_STEP_SUMMARY

.github/workflows/run-ppa.yml

@@ -0,0 +1,114 @@
+name: Update PPA Packages
+
+on:
+  workflow_dispatch:
+    inputs:
+      package:
+        description: 'Package to upload (dms, dms-git, or all)'
+        required: false
+        default: 'dms-git'
+      rebuild_release:
+        description: 'Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)'
+        required: false
+        default: ''
+  schedule:
+    - cron: '0 */3 * * *'  # Every 3 hours for dms-git builds
+
+jobs:
+  upload-ppa:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+          cache: false  
+
+      - name: Install build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            debhelper \
+            devscripts \
+            dput \
+            lftp \
+            build-essential \
+            fakeroot \
+            dpkg-dev
+      
+      - name: Configure GPG
+        env:
+          GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+        run: |
+          echo "$GPG_KEY" | gpg --import
+          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
+          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
+      
+      - name: Determine packages to upload
+        id: packages
+        run: |
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            echo "Triggered by schedule: uploading git package"
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "packages=${{ github.event.inputs.package }}" >> $GITHUB_OUTPUT
+            echo "Manual trigger: ${{ github.event.inputs.package }}"
+          else
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+          fi
+      
+      - name: Upload to PPA
+        env:
+          REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
+        run: |
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          
+          if [[ "$PACKAGES" == "all" ]]; then
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms to PPA..."
+            if [ -n "$REBUILD_RELEASE" ]; then
+              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
+            fi
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms" dms questing
+            
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading dms-git to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/dms-git" dms-git questing
+          else
+            PPA_NAME="$PACKAGES"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading $PACKAGES to PPA..."
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            bash distro/scripts/ppa-upload.sh "distro/ubuntu/$PACKAGES" "$PPA_NAME" questing
+          fi
+      
+      - name: Summary
+        run: |
+          echo "### PPA Package Upload Complete" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Packages**: ${{ steps.packages.outputs.packages }}" >> $GITHUB_STEP_SUMMARY
+          
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          if [[ "$PACKAGES" == "all" ]]; then
+            echo "- **PPA dms**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
+            echo "- **PPA dms-git**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> $GITHUB_STEP_SUMMARY
+          elif [[ "$PACKAGES" == "dms-git" ]]; then
+            echo "- **PPA**: https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> $GITHUB_STEP_SUMMARY
+          fi
+          
+          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
+            echo "- **Version**: ${{ steps.packages.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Builds will appear once Launchpad processes the uploads." >> $GITHUB_STEP_SUMMARY

.github/workflows/update-vendor-hash.yml

@@ -0,0 +1,90 @@
+name: Update Vendor Hash
+
+on:
+  push:
+    paths:
+      - "core/go.mod"
+      - "core/go.sum"
+    branches:
+      - master
+
+jobs:
+  update-vendor-hash:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
+
+      - name: Update vendorHash in flake.nix
+        run: |
+          set -euo pipefail
+
+          # Try to build and capture the expected hash from error message
+          echo "Attempting nix build to get new vendorHash..."
+
+          if output=$(nix build .#dmsCli 2>&1); then
+            echo "Build succeeded, no hash update needed"
+            exit 0
+          fi
+
+          # Extract the expected hash from the error message
+          new_hash=$(echo "$output" | grep -oP "got:\s+\K\S+" | head -n1)
+
+          if [ -z "$new_hash" ]; then
+            echo "Could not extract new vendorHash from build output"
+            echo "Build output:"
+            echo "$output"
+            exit 1
+          fi
+
+          echo "New vendorHash: $new_hash"
+
+          # Get current hash from flake.nix
+          current_hash=$(grep -oP 'vendorHash = "\K[^"]+' flake.nix)
+          echo "Current vendorHash: $current_hash"
+
+          if [ "$current_hash" = "$new_hash" ]; then
+            echo "vendorHash is already up to date"
+            exit 0
+          fi
+
+          # Update the hash in flake.nix
+          sed -i "s|vendorHash = \"$current_hash\"|vendorHash = \"$new_hash\"|" flake.nix
+
+          # Verify the build works with the new hash
+          echo "Verifying build with new vendorHash..."
+          nix build .#dmsCli
+
+          echo "vendorHash updated successfully!"
+
+      - name: Commit and push vendorHash update
+        run: |
+          set -euo pipefail
+
+          if ! git diff --quiet flake.nix; then
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+
+            git add flake.nix
+            git commit -m "nix: update vendorHash for go.mod changes"
+
+            for attempt in 1 2 3; do
+              if git push; then
+                echo "Successfully pushed vendorHash update"
+                exit 0
+              fi
+              echo "Push attempt $attempt failed, pulling and retrying..."
+              git pull --rebase
+              sleep $((attempt*2))
+            done
+
+            echo "Failed to push after retries" >&2
+            exit 1
+          else
+            echo "No changes to flake.nix"
+          fi

.gitignore

@@ -27,7 +27,6 @@ qrc_*.cpp
 ui_*.h
 *.qmlc
 *.jsc
-Makefile*
 *build-*
 *.qm
 *.prl
@@ -101,4 +100,45 @@ go.work.sum
 
 # Editor/IDE
 # .idea/
-# .vscode/
+# .vscode/
+
+# If you prefer the allow list template instead of the deny list, see community template:
+# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
+#
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Code coverage profiles and other test artifacts
+*.out
+coverage.*
+*.coverprofile
+profile.cov
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Go workspace file
+go.work
+go.work.sum
+
+# env file
+.env
+
+# Editor/IDE
+# .idea/
+# .vscode/
+
+bin/
+
+# Extracted source trees in Ubuntu package directories  
+distro/ubuntu/*/dms-git-repo/
+distro/ubuntu/*/DankMaterialShell-*/
+distro/ubuntu/danklinux/*/dsearch-*/
+distro/ubuntu/danklinux/*/dgop-*/

CONTRIBUTING.md

@@ -2,28 +2,42 @@
 
 Contributions are welcome and encouraged.
 
-## Formatting
+To contribute fork this repository, make your changes, and open a pull request.
 
-The preferred tool for formatting files is [qmlfmt](https://github.com/jesperhh/qmlfmt) (also available on aur as qmlfmt-git). It actually kinda sucks, but `qmlformat` doesn't work with null safe operators and ternarys and pragma statements and a bunch of other things that are supported.
+## VSCode Setup
 
-We need some consistent style, so this at least gives the same formatter that Qt Creator uses.
+This is a monorepo, the easiest thing to do is to open an editor in either `quickshell`, `core`, or both depending on which part of the project you are working on.
 
-You can configure it to format on save in vscode by configuring the "custom local formatters" extension then adding this to settings json.
+### QML (`quickshell` directory)
+
+1. Install the [QML Extension](https://doc.qt.io/vscodeext/)
+2. Configure `ctrl+shift+p` -> user preferences (json) with qmlls path
 
 ```json
-  "customLocalFormatters.formatters": [
-    {
-      "command": "sh -c \"qmlfmt -t 4 -i 4 -b 250 | sed 's/pragma ComponentBehavior$/pragma ComponentBehavior: Bound/g'\"",
-      "languages": ["qml"]
-    }
-  ],
-  "[qml]": {
-    "editor.defaultFormatter": "jkillian.custom-local-formatters",
-    "editor.formatOnSave": true
-  },
+{
+  "qt-qml.doNotAskForQmllsDownload": true,
+  "qt-qml.qmlls.customExePath": "/usr/lib/qt6/bin/qmlls"
+}
 ```
 
-Sometimes it just breaks code though. Like turning `"_\""` into `"_""`, so you may not want to do formatOnSave.
+3. Create empty `.qmlls.ini` file in `quickshell/` directory
+
+```bash
+cd quickshell
+touch .qmlls.ini
+```
+
+4. Restart dms to generate the `.qmlls.ini` file
+
+5. Make your changes, test, and open a pull request.
+
+### GO (`core` directory)
+
+1. Install the [Go Extension](https://code.visualstudio.com/docs/languages/go)
+2. Ensure code is formatted with `make fmt`
+3. Add appropriate test coverage and ensure tests pass with `make test`
+4. Run `go mod tidy`
+5. Open pull request
 
 ## Pull request
 

Common/CacheData.qml

@@ -1,122 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtCore
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    readonly property int cacheConfigVersion: 1
-
-    readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
-
-    readonly property string _stateUrl: StandardPaths.writableLocation(StandardPaths.GenericCacheLocation)
-    readonly property string _stateDir: Paths.strip(_stateUrl)
-
-    property bool _loading: false
-
-    property string wallpaperLastPath: ""
-    property string profileLastPath: ""
-
-    Component.onCompleted: {
-        if (!isGreeterMode) {
-            loadCache()
-        }
-    }
-
-    function loadCache() {
-        _loading = true
-        parseCache(cacheFile.text())
-        _loading = false
-    }
-
-    function parseCache(content) {
-        _loading = true
-        try {
-            if (content && content.trim()) {
-                const cache = JSON.parse(content)
-
-                wallpaperLastPath = cache.wallpaperLastPath !== undefined ? cache.wallpaperLastPath : ""
-                profileLastPath = cache.profileLastPath !== undefined ? cache.profileLastPath : ""
-
-                if (cache.configVersion === undefined) {
-                    migrateFromUndefinedToV1(cache)
-                    cleanupUnusedKeys()
-                    saveCache()
-                }
-            }
-        } catch (e) {
-            console.warn("CacheData: Failed to parse cache:", e.message)
-        } finally {
-            _loading = false
-        }
-    }
-
-    function saveCache() {
-        if (_loading)
-            return
-        cacheFile.setText(JSON.stringify({
-                                             "wallpaperLastPath": wallpaperLastPath,
-                                             "profileLastPath": profileLastPath,
-                                             "configVersion": cacheConfigVersion
-                                         }, null, 2))
-    }
-
-    function migrateFromUndefinedToV1(cache) {
-        console.log("CacheData: Migrating configuration from undefined to version 1")
-    }
-
-    function cleanupUnusedKeys() {
-        const validKeys = [
-            "wallpaperLastPath",
-            "profileLastPath",
-            "configVersion"
-        ]
-
-        try {
-            const content = cacheFile.text()
-            if (!content || !content.trim()) return
-
-            const cache = JSON.parse(content)
-            let needsSave = false
-
-            for (const key in cache) {
-                if (!validKeys.includes(key)) {
-                    console.log("CacheData: Removing unused key:", key)
-                    delete cache[key]
-                    needsSave = true
-                }
-            }
-
-            if (needsSave) {
-                cacheFile.setText(JSON.stringify(cache, null, 2))
-            }
-        } catch (e) {
-            console.warn("CacheData: Failed to cleanup unused keys:", e.message)
-        }
-    }
-
-    FileView {
-        id: cacheFile
-
-        path: isGreeterMode ? "" : _stateDir + "/DankMaterialShell/cache.json"
-        blockLoading: true
-        blockWrites: true
-        atomicWrites: true
-        watchChanges: !isGreeterMode
-        onLoaded: {
-            if (!isGreeterMode) {
-                parseCache(cacheFile.text())
-            }
-        }
-        onLoadFailed: error => {
-            if (!isGreeterMode) {
-                console.log("CacheData: No cache file found, starting fresh")
-            }
-        }
-    }
-}

Common/I18n.qml

@@ -1,113 +0,0 @@
-import QtQuick
-import Qt.labs.folderlistmodel
-import Quickshell
-import Quickshell.Io
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-Singleton {
-    id: root
-
-    readonly property string _rawLocale: Qt.locale().name
-    readonly property string _lang: _rawLocale.split(/[_-]/)[0]
-    readonly property var    _candidates: {
-        const fullUnderscore = _rawLocale;
-        const fullHyphen     = _rawLocale.replace("_", "-");
-        return [fullUnderscore, fullHyphen, _lang].filter(c => c && c !== "en");
-    }
-
-  
-    readonly property url translationsFolder: Qt.resolvedUrl("../translations/poexports")
-
-    property string currentLocale: "en"
-    property var    translations: ({})
-    property bool   translationsLoaded: false
-
-    property url _selectedPath: ""
-
-    FolderListModel {
-        id: dir
-        folder: root.translationsFolder
-        nameFilters: ["*.json"]
-        showDirs: false
-        showDotAndDotDot: false
-
-        onStatusChanged: if (status === FolderListModel.Ready) root._pickTranslation()
-    }
-
-    FileView {
-        id: translationLoader
-        path: root._selectedPath
-
-        onLoaded: {
-            try {
-                root.translations = JSON.parse(text())
-                root.translationsLoaded = true
-                console.log(`I18n: Loaded translations for '${root.currentLocale}' ` +
-                            `(${Object.keys(root.translations).length} contexts)`)
-            } catch (e) {
-                console.warn(`I18n: Error parsing '${root.currentLocale}':`, e,
-                             "- falling back to English")
-                root._fallbackToEnglish()
-            }
-        }
-
-        onLoadFailed: (error) => {
-            console.warn(`I18n: Failed to load '${root.currentLocale}' (${error}), ` +
-                         "falling back to English")
-            root._fallbackToEnglish()
-        }
-    }
-
-    function _pickTranslation() {
-        const present = new Set()
-        for (let i = 0; i < dir.count; i++) {
-            const name = dir.get(i, "fileName") // e.g. "zh_CN.json"
-            if (name && name.endsWith(".json")) {
-                present.add(name.slice(0, -5))
-            }
-        }
-
-        for (let i = 0; i < _candidates.length; i++) {
-            const cand = _candidates[i]
-            if (present.has(cand)) {
-                _useLocale(cand, dir.folder + "/" + cand + ".json")
-                return
-            }
-        }
-
-        _fallbackToEnglish()
-    }
-
-    function _useLocale(localeTag, fileUrl) {
-        currentLocale = localeTag
-        _selectedPath = fileUrl
-        translationsLoaded = false
-        translations = ({})
-        console.log(`I18n: Using locale '${localeTag}' from ${fileUrl}`)
-    }
-
-    function _fallbackToEnglish() {
-        currentLocale = "en"
-        _selectedPath = ""
-        translationsLoaded = false
-        translations = ({})
-        console.warn("I18n: Falling back to built-in English strings")
-    }
-
-    function tr(term, context) {
-        if (!translationsLoaded || !translations) return term
-        const ctx = context || term
-        if (translations[ctx] && translations[ctx][term]) return translations[ctx][term]
-        for (const c in translations) {
-            if (translations[c] && translations[c][term]) return translations[c][term]
-        }
-        return term
-    }
-
-    function trContext(context, term) {
-        if (!translationsLoaded || !translations) return term
-        if (translations[context] && translations[context][term]) return translations[context][term]
-        return term
-    }
-}

Common/Paths.qml

@@ -1,65 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import QtCore
-
-Singleton {
-    id: root
-
-    readonly property url home: StandardPaths.standardLocations(
-                                    StandardPaths.HomeLocation)[0]
-    readonly property url pictures: StandardPaths.standardLocations(
-                                        StandardPaths.PicturesLocation)[0]
-
-    readonly property url data: `${StandardPaths.standardLocations(
-                                    StandardPaths.GenericDataLocation)[0]}/DankMaterialShell`
-    readonly property url state: `${StandardPaths.standardLocations(
-                                     StandardPaths.GenericStateLocation)[0]}/DankMaterialShell`
-    readonly property url cache: `${StandardPaths.standardLocations(
-                                     StandardPaths.GenericCacheLocation)[0]}/DankMaterialShell`
-    readonly property url config: `${StandardPaths.standardLocations(
-                                      StandardPaths.GenericConfigLocation)[0]}/DankMaterialShell`
-
-    readonly property url imagecache: `${cache}/imagecache`
-
-    function stringify(path: url): string {
-        return path.toString().replace(/%20/g, " ")
-    }
-
-    function expandTilde(path: string): string {
-        return strip(path.replace("~", stringify(root.home)))
-    }
-
-    function shortenHome(path: string): string {
-        return path.replace(strip(root.home), "~")
-    }
-
-    function strip(path: url): string {
-        return stringify(path).replace("file://", "")
-    }
-
-    function toFileUrl(path: string): string {
-        return path.startsWith("file://") ? path : "file://" + path
-    }
-
-    function mkdir(path: url): void {
-        Quickshell.execDetached(["mkdir", "-p", strip(path)])
-    }
-
-    function copy(from: url, to: url): void {
-        Quickshell.execDetached(["cp", strip(from), strip(to)])
-    }
-
-    // ! Spotify and maybe some other apps report the wrong app id in toplevels, hardcode special case
-    function moddedAppId(appId: string): string {
-        if (appId === "Spotify")
-            return "spotify-launcher"
-        if (appId === "beepertexts")
-            return "beeper"
-        if (appId === "home assistant desktop")
-            return "homeassistant-desktop"
-        if (appId.includes("com.transmissionbt.transmission"))
-            return "transmission-gtk"
-        return appId
-    }
-}

Common/Proc.qml

@@ -1,70 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    property int defaultDebounceMs: 50
-    property var _procDebouncers: ({}) // id -> { timer, command, callback, waitMs }
-
-    function runCommand(id, command, callback, debounceMs) {
-        const wait = (typeof debounceMs === "number" && debounceMs >= 0) ? debounceMs : defaultDebounceMs
-        let procId = id ? id : Math.random()        
-
-        if (!_procDebouncers[procId]) {
-            const t = Qt.createQmlObject('import QtQuick; Timer { repeat: false }', root)
-            t.triggered.connect(function() { _launchProc(procId) })
-            _procDebouncers[procId] = { timer: t, command: command, callback: callback, waitMs: wait }
-        } else {
-            _procDebouncers[procId].command = command
-            _procDebouncers[procId].callback = callback
-            _procDebouncers[procId].waitMs = wait
-        }
-
-        const entry = _procDebouncers[procId]
-        entry.timer.interval = entry.waitMs
-        entry.timer.restart()
-    }
-
-    function _launchProc(id) {
-        const entry = _procDebouncers[id]
-        if (!entry) return
-
-        const proc = Qt.createQmlObject('import Quickshell.Io; Process { running: false }', root)
-        const out = Qt.createQmlObject('import Quickshell.Io; StdioCollector {}', proc)
-        const err = Qt.createQmlObject('import Quickshell.Io; StdioCollector {}', proc)
-
-        proc.stdout = out
-        proc.stderr = err
-        proc.command = entry.command
-
-        let capturedOut = ""
-        let exitSeen = false
-        let exitCodeValue = -1
-
-        out.streamFinished.connect(function() {
-            capturedOut = out.text || ""
-            maybeComplete()
-        })
-
-        proc.exited.connect(function(code) {
-            exitSeen = true
-            exitCodeValue = code
-            maybeComplete()
-        })
-
-        function maybeComplete() {
-            if (!exitSeen) return
-            if (typeof entry.callback === "function") {
-                try { entry.callback(capturedOut, exitCodeValue) } catch (e) { console.warn("runCommand callback error:", e) }
-            }
-            try { proc.destroy() } catch (_) {}
-        }
-
-        proc.running = true
-    }
-}

Common/SessionData.qml

@@ -1,844 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtCore
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Services
-
-Singleton {
-    id: root
-
-    readonly property int sessionConfigVersion: 1
-
-    readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
-    property bool hasTriedDefaultSession: false
-    readonly property string _stateUrl: StandardPaths.writableLocation(StandardPaths.GenericStateLocation)
-    readonly property string _stateDir: Paths.strip(_stateUrl)
-
-    property bool isLightMode: false
-    property bool doNotDisturb: false
-
-    property string wallpaperPath: ""
-    property bool perMonitorWallpaper: false
-    property var monitorWallpapers: ({})
-    property bool perModeWallpaper: false
-    property string wallpaperPathLight: ""
-    property string wallpaperPathDark: ""
-    property var monitorWallpapersLight: ({})
-    property var monitorWallpapersDark: ({})
-    property string wallpaperTransition: "fade"
-    readonly property var availableWallpaperTransitions: ["none", "fade", "wipe", "disc", "stripes", "iris bloom", "pixelate", "portal"]
-    property var includedTransitions: availableWallpaperTransitions.filter(t => t !== "none")
-
-    property bool wallpaperCyclingEnabled: false
-    property string wallpaperCyclingMode: "interval"
-    property int wallpaperCyclingInterval: 300
-    property string wallpaperCyclingTime: "06:00"
-    property var monitorCyclingSettings: ({})
-
-    property bool nightModeEnabled: false
-    property int nightModeTemperature: 4500
-    property bool nightModeAutoEnabled: false
-    property string nightModeAutoMode: "time"
-    property int nightModeStartHour: 18
-    property int nightModeStartMinute: 0
-    property int nightModeEndHour: 6
-    property int nightModeEndMinute: 0
-    property real latitude: 0.0
-    property real longitude: 0.0
-    property string nightModeLocationProvider: ""
-
-    property var pinnedApps: []
-    property var recentColors: []
-    property bool showThirdPartyPlugins: false
-    property string launchPrefix: ""
-    property string lastBrightnessDevice: ""
-
-    property int selectedGpuIndex: 0
-    property bool nvidiaGpuTempEnabled: false
-    property bool nonNvidiaGpuTempEnabled: false
-    property var enabledGpuPciIds: []
-
-    Component.onCompleted: {
-        if (!isGreeterMode) {
-            loadSettings()
-        }
-    }
-
-    function loadSettings() {
-        if (isGreeterMode) {
-            parseSettings(greeterSessionFile.text())
-        } else {
-            parseSettings(settingsFile.text())
-        }
-    }
-
-    function parseSettings(content) {
-        try {
-            if (content && content.trim()) {
-                var settings = JSON.parse(content)
-                isLightMode = settings.isLightMode !== undefined ? settings.isLightMode : false
-                wallpaperPath = settings.wallpaperPath !== undefined ? settings.wallpaperPath : ""
-                perMonitorWallpaper = settings.perMonitorWallpaper !== undefined ? settings.perMonitorWallpaper : false
-                monitorWallpapers = settings.monitorWallpapers !== undefined ? settings.monitorWallpapers : {}
-                perModeWallpaper = settings.perModeWallpaper !== undefined ? settings.perModeWallpaper : false
-                wallpaperPathLight = settings.wallpaperPathLight !== undefined ? settings.wallpaperPathLight : ""
-                wallpaperPathDark = settings.wallpaperPathDark !== undefined ? settings.wallpaperPathDark : ""
-                monitorWallpapersLight = settings.monitorWallpapersLight !== undefined ? settings.monitorWallpapersLight : {}
-                monitorWallpapersDark = settings.monitorWallpapersDark !== undefined ? settings.monitorWallpapersDark : {}
-                doNotDisturb = settings.doNotDisturb !== undefined ? settings.doNotDisturb : false
-                nightModeEnabled = settings.nightModeEnabled !== undefined ? settings.nightModeEnabled : false
-                nightModeTemperature = settings.nightModeTemperature !== undefined ? settings.nightModeTemperature : 4500
-                nightModeAutoEnabled = settings.nightModeAutoEnabled !== undefined ? settings.nightModeAutoEnabled : false
-                nightModeAutoMode = settings.nightModeAutoMode !== undefined ? settings.nightModeAutoMode : "time"
-                if (settings.nightModeStartTime !== undefined) {
-                    const parts = settings.nightModeStartTime.split(":")
-                    nightModeStartHour = parseInt(parts[0]) || 18
-                    nightModeStartMinute = parseInt(parts[1]) || 0
-                } else {
-                    nightModeStartHour = settings.nightModeStartHour !== undefined ? settings.nightModeStartHour : 18
-                    nightModeStartMinute = settings.nightModeStartMinute !== undefined ? settings.nightModeStartMinute : 0
-                }
-                if (settings.nightModeEndTime !== undefined) {
-                    const parts = settings.nightModeEndTime.split(":")
-                    nightModeEndHour = parseInt(parts[0]) || 6
-                    nightModeEndMinute = parseInt(parts[1]) || 0
-                } else {
-                    nightModeEndHour = settings.nightModeEndHour !== undefined ? settings.nightModeEndHour : 6
-                    nightModeEndMinute = settings.nightModeEndMinute !== undefined ? settings.nightModeEndMinute : 0
-                }
-                latitude = settings.latitude !== undefined ? settings.latitude : 0.0
-                longitude = settings.longitude !== undefined ? settings.longitude : 0.0
-                nightModeLocationProvider = settings.nightModeLocationProvider !== undefined ? settings.nightModeLocationProvider : ""
-                pinnedApps = settings.pinnedApps !== undefined ? settings.pinnedApps : []
-                selectedGpuIndex = settings.selectedGpuIndex !== undefined ? settings.selectedGpuIndex : 0
-                nvidiaGpuTempEnabled = settings.nvidiaGpuTempEnabled !== undefined ? settings.nvidiaGpuTempEnabled : false
-                nonNvidiaGpuTempEnabled = settings.nonNvidiaGpuTempEnabled !== undefined ? settings.nonNvidiaGpuTempEnabled : false
-                enabledGpuPciIds = settings.enabledGpuPciIds !== undefined ? settings.enabledGpuPciIds : []
-                wallpaperCyclingEnabled = settings.wallpaperCyclingEnabled !== undefined ? settings.wallpaperCyclingEnabled : false
-                wallpaperCyclingMode = settings.wallpaperCyclingMode !== undefined ? settings.wallpaperCyclingMode : "interval"
-                wallpaperCyclingInterval = settings.wallpaperCyclingInterval !== undefined ? settings.wallpaperCyclingInterval : 300
-                wallpaperCyclingTime = settings.wallpaperCyclingTime !== undefined ? settings.wallpaperCyclingTime : "06:00"
-                monitorCyclingSettings = settings.monitorCyclingSettings !== undefined ? settings.monitorCyclingSettings : {}
-                lastBrightnessDevice = settings.lastBrightnessDevice !== undefined ? settings.lastBrightnessDevice : ""
-                launchPrefix = settings.launchPrefix !== undefined ? settings.launchPrefix : ""
-                wallpaperTransition = settings.wallpaperTransition !== undefined ? settings.wallpaperTransition : "fade"
-                includedTransitions = settings.includedTransitions !== undefined ? settings.includedTransitions : availableWallpaperTransitions.filter(t => t !== "none")
-                recentColors = settings.recentColors !== undefined ? settings.recentColors : []
-                showThirdPartyPlugins = settings.showThirdPartyPlugins !== undefined ? settings.showThirdPartyPlugins : false
-
-                if (settings.configVersion === undefined) {
-                    migrateFromUndefinedToV1(settings)
-                    saveSettings()
-                } else if (settings.configVersion === sessionConfigVersion) {
-                    cleanupUnusedKeys()
-                }
-
-                if (!isGreeterMode) {
-                    if (typeof Theme !== "undefined") {
-                        Theme.generateSystemThemesFromCurrentTheme()
-                    }
-                }
-            }
-        } catch (e) {
-
-        }
-    }
-
-    function saveSettings() {
-        if (isGreeterMode) return
-        settingsFile.setText(JSON.stringify({
-                                                "isLightMode": isLightMode,
-                                                "wallpaperPath": wallpaperPath,
-                                                "perMonitorWallpaper": perMonitorWallpaper,
-                                                "monitorWallpapers": monitorWallpapers,
-                                                "perModeWallpaper": perModeWallpaper,
-                                                "wallpaperPathLight": wallpaperPathLight,
-                                                "wallpaperPathDark": wallpaperPathDark,
-                                                "monitorWallpapersLight": monitorWallpapersLight,
-                                                "monitorWallpapersDark": monitorWallpapersDark,
-                                                "doNotDisturb": doNotDisturb,
-                                                "nightModeEnabled": nightModeEnabled,
-                                                "nightModeTemperature": nightModeTemperature,
-                                                "nightModeAutoEnabled": nightModeAutoEnabled,
-                                                "nightModeAutoMode": nightModeAutoMode,
-                                                "nightModeStartHour": nightModeStartHour,
-                                                "nightModeStartMinute": nightModeStartMinute,
-                                                "nightModeEndHour": nightModeEndHour,
-                                                "nightModeEndMinute": nightModeEndMinute,
-                                                "latitude": latitude,
-                                                "longitude": longitude,
-                                                "nightModeLocationProvider": nightModeLocationProvider,
-                                                "pinnedApps": pinnedApps,
-                                                "selectedGpuIndex": selectedGpuIndex,
-                                                "nvidiaGpuTempEnabled": nvidiaGpuTempEnabled,
-                                                "nonNvidiaGpuTempEnabled": nonNvidiaGpuTempEnabled,
-                                                "enabledGpuPciIds": enabledGpuPciIds,
-                                                "wallpaperCyclingEnabled": wallpaperCyclingEnabled,
-                                                "wallpaperCyclingMode": wallpaperCyclingMode,
-                                                "wallpaperCyclingInterval": wallpaperCyclingInterval,
-                                                "wallpaperCyclingTime": wallpaperCyclingTime,
-                                                "monitorCyclingSettings": monitorCyclingSettings,
-                                                "lastBrightnessDevice": lastBrightnessDevice,
-                                                "launchPrefix": launchPrefix,
-                                                "wallpaperTransition": wallpaperTransition,
-                                                "includedTransitions": includedTransitions,
-                                                "recentColors": recentColors,
-                                                "showThirdPartyPlugins": showThirdPartyPlugins,
-                                                "configVersion": sessionConfigVersion
-                                            }, null, 2))
-    }
-
-    function migrateFromUndefinedToV1(settings) {
-        console.log("SessionData: Migrating configuration from undefined to version 1")
-        if (typeof SettingsData !== "undefined") {
-            if (settings.acMonitorTimeout !== undefined) {
-                SettingsData.setAcMonitorTimeout(settings.acMonitorTimeout)
-            }
-            if (settings.acLockTimeout !== undefined) {
-                SettingsData.setAcLockTimeout(settings.acLockTimeout)
-            }
-            if (settings.acSuspendTimeout !== undefined) {
-                SettingsData.setAcSuspendTimeout(settings.acSuspendTimeout)
-            }
-            if (settings.acHibernateTimeout !== undefined) {
-                SettingsData.setAcHibernateTimeout(settings.acHibernateTimeout)
-            }
-            if (settings.batteryMonitorTimeout !== undefined) {
-                SettingsData.setBatteryMonitorTimeout(settings.batteryMonitorTimeout)
-            }
-            if (settings.batteryLockTimeout !== undefined) {
-                SettingsData.setBatteryLockTimeout(settings.batteryLockTimeout)
-            }
-            if (settings.batterySuspendTimeout !== undefined) {
-                SettingsData.setBatterySuspendTimeout(settings.batterySuspendTimeout)
-            }
-            if (settings.batteryHibernateTimeout !== undefined) {
-                SettingsData.setBatteryHibernateTimeout(settings.batteryHibernateTimeout)
-            }
-            if (settings.lockBeforeSuspend !== undefined) {
-                SettingsData.setLockBeforeSuspend(settings.lockBeforeSuspend)
-            }
-            if (settings.loginctlLockIntegration !== undefined) {
-                SettingsData.setLoginctlLockIntegration(settings.loginctlLockIntegration)
-            }
-            if (settings.launchPrefix !== undefined) {
-                SettingsData.setLaunchPrefix(settings.launchPrefix)
-            }
-        }
-        if (typeof CacheData !== "undefined") {
-            if (settings.wallpaperLastPath !== undefined) {
-                CacheData.wallpaperLastPath = settings.wallpaperLastPath
-            }
-            if (settings.profileLastPath !== undefined) {
-                CacheData.profileLastPath = settings.profileLastPath
-            }
-            CacheData.saveCache()
-        }
-    }
-
-    function cleanupUnusedKeys() {
-        const validKeys = [
-            "isLightMode", "wallpaperPath", "perMonitorWallpaper", "monitorWallpapers", "perModeWallpaper",
-            "wallpaperPathLight", "wallpaperPathDark", "monitorWallpapersLight",
-            "monitorWallpapersDark", "doNotDisturb", "nightModeEnabled",
-            "nightModeTemperature", "nightModeAutoEnabled", "nightModeAutoMode",
-            "nightModeStartHour", "nightModeStartMinute", "nightModeEndHour",
-            "nightModeEndMinute", "latitude", "longitude", "nightModeLocationProvider",
-            "pinnedApps", "selectedGpuIndex", "nvidiaGpuTempEnabled",
-            "nonNvidiaGpuTempEnabled", "enabledGpuPciIds", "wallpaperCyclingEnabled",
-            "wallpaperCyclingMode", "wallpaperCyclingInterval", "wallpaperCyclingTime",
-            "monitorCyclingSettings", "lastBrightnessDevice", "wallpaperTransition",
-            "includedTransitions", "recentColors", "showThirdPartyPlugins", "configVersion"
-        ]
-
-        try {
-            const content = settingsFile.text()
-            if (!content || !content.trim()) return
-
-            const settings = JSON.parse(content)
-            let needsSave = false
-
-            for (const key in settings) {
-                if (!validKeys.includes(key)) {
-                    console.log("SessionData: Removing unused key:", key)
-                    delete settings[key]
-                    needsSave = true
-                }
-            }
-
-            if (needsSave) {
-                settingsFile.setText(JSON.stringify(settings, null, 2))
-            }
-        } catch (e) {
-            console.warn("SessionData: Failed to cleanup unused keys:", e.message)
-        }
-    }
-
-    function setLightMode(lightMode) {
-        isLightMode = lightMode
-        syncWallpaperForCurrentMode()
-        saveSettings()
-    }
-
-    function setDoNotDisturb(enabled) {
-        doNotDisturb = enabled
-        saveSettings()
-    }
-
-    function setWallpaperPath(path) {
-        wallpaperPath = path
-        saveSettings()
-    }
-
-    function setWallpaper(imagePath) {
-        wallpaperPath = imagePath
-        if (perModeWallpaper) {
-            if (isLightMode) {
-                wallpaperPathLight = imagePath
-            } else {
-                wallpaperPathDark = imagePath
-            }
-        }
-        saveSettings()
-
-        if (typeof Theme !== "undefined") {
-            Theme.generateSystemThemesFromCurrentTheme()
-        }
-    }
-
-    function setWallpaperColor(color) {
-        wallpaperPath = color
-        if (perModeWallpaper) {
-            if (isLightMode) {
-                wallpaperPathLight = color
-            } else {
-                wallpaperPathDark = color
-            }
-        }
-        saveSettings()
-
-        if (typeof Theme !== "undefined") {
-            Theme.generateSystemThemesFromCurrentTheme()
-        }
-    }
-
-    function clearWallpaper() {
-        wallpaperPath = ""
-        saveSettings()
-
-        if (typeof Theme !== "undefined") {
-            if (typeof SettingsData !== "undefined" && SettingsData.theme) {
-                Theme.switchTheme(SettingsData.theme)
-            } else {
-                Theme.switchTheme("blue")
-            }
-        }
-    }
-
-    function setPerMonitorWallpaper(enabled) {
-        perMonitorWallpaper = enabled
-        if (enabled && perModeWallpaper) {
-            syncWallpaperForCurrentMode()
-        }
-        saveSettings()
-
-        if (typeof Theme !== "undefined") {
-            Theme.generateSystemThemesFromCurrentTheme()
-        }
-    }
-
-    function setPerModeWallpaper(enabled) {
-        if (enabled && wallpaperCyclingEnabled) {
-            setWallpaperCyclingEnabled(false)
-        }
-        if (enabled && perMonitorWallpaper) {
-            var monitorCyclingAny = false
-            for (var key in monitorCyclingSettings) {
-                if (monitorCyclingSettings[key].enabled) {
-                    monitorCyclingAny = true
-                    break
-                }
-            }
-            if (monitorCyclingAny) {
-                var newSettings = Object.assign({}, monitorCyclingSettings)
-                for (var screenName in newSettings) {
-                    newSettings[screenName].enabled = false
-                }
-                monitorCyclingSettings = newSettings
-            }
-        }
-
-        perModeWallpaper = enabled
-        if (enabled) {
-            if (perMonitorWallpaper) {
-                monitorWallpapersLight = Object.assign({}, monitorWallpapers)
-                monitorWallpapersDark = Object.assign({}, monitorWallpapers)
-            } else {
-                wallpaperPathLight = wallpaperPath
-                wallpaperPathDark = wallpaperPath
-            }
-        } else {
-            syncWallpaperForCurrentMode()
-        }
-        saveSettings()
-
-        if (typeof Theme !== "undefined") {
-            Theme.generateSystemThemesFromCurrentTheme()
-        }
-    }
-
-    function setMonitorWallpaper(screenName, path) {
-        var newMonitorWallpapers = Object.assign({}, monitorWallpapers)
-        if (path && path !== "") {
-            newMonitorWallpapers[screenName] = path
-        } else {
-            delete newMonitorWallpapers[screenName]
-        }
-        monitorWallpapers = newMonitorWallpapers
-
-        if (perModeWallpaper) {
-            if (isLightMode) {
-                var newLight = Object.assign({}, monitorWallpapersLight)
-                if (path && path !== "") {
-                    newLight[screenName] = path
-                } else {
-                    delete newLight[screenName]
-                }
-                monitorWallpapersLight = newLight
-            } else {
-                var newDark = Object.assign({}, monitorWallpapersDark)
-                if (path && path !== "") {
-                    newDark[screenName] = path
-                } else {
-                    delete newDark[screenName]
-                }
-                monitorWallpapersDark = newDark
-            }
-        }
-
-        saveSettings()
-
-        if (typeof Theme !== "undefined" && typeof Quickshell !== "undefined") {
-            var screens = Quickshell.screens
-            if (screens.length > 0 && screenName === screens[0].name) {
-                Theme.generateSystemThemesFromCurrentTheme()
-            }
-        }
-    }
-
-    function setWallpaperTransition(transition) {
-        wallpaperTransition = transition
-        saveSettings()
-    }
-
-    function setWallpaperCyclingEnabled(enabled) {
-        wallpaperCyclingEnabled = enabled
-        saveSettings()
-    }
-
-    function setWallpaperCyclingMode(mode) {
-        wallpaperCyclingMode = mode
-        saveSettings()
-    }
-
-    function setWallpaperCyclingInterval(interval) {
-        wallpaperCyclingInterval = interval
-        saveSettings()
-    }
-
-    function setWallpaperCyclingTime(time) {
-        wallpaperCyclingTime = time
-        saveSettings()
-    }
-
-    function setMonitorCyclingEnabled(screenName, enabled) {
-        var newSettings = Object.assign({}, monitorCyclingSettings)
-        if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
-        }
-        newSettings[screenName].enabled = enabled
-        monitorCyclingSettings = newSettings
-        saveSettings()
-    }
-
-    function setMonitorCyclingMode(screenName, mode) {
-        var newSettings = Object.assign({}, monitorCyclingSettings)
-        if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
-        }
-        newSettings[screenName].mode = mode
-        monitorCyclingSettings = newSettings
-        saveSettings()
-    }
-
-    function setMonitorCyclingInterval(screenName, interval) {
-        var newSettings = Object.assign({}, monitorCyclingSettings)
-        if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
-        }
-        newSettings[screenName].interval = interval
-        monitorCyclingSettings = newSettings
-        saveSettings()
-    }
-
-    function setMonitorCyclingTime(screenName, time) {
-        var newSettings = Object.assign({}, monitorCyclingSettings)
-        if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
-        }
-        newSettings[screenName].time = time
-        monitorCyclingSettings = newSettings
-        saveSettings()
-    }
-
-    function setNightModeEnabled(enabled) {
-        nightModeEnabled = enabled
-        saveSettings()
-    }
-
-    function setNightModeTemperature(temperature) {
-        nightModeTemperature = temperature
-        saveSettings()
-    }
-
-    function setNightModeAutoEnabled(enabled) {
-        console.log("SessionData: Setting nightModeAutoEnabled to", enabled)
-        nightModeAutoEnabled = enabled
-        saveSettings()
-    }
-
-    function setNightModeAutoMode(mode) {
-        nightModeAutoMode = mode
-        saveSettings()
-    }
-
-    function setNightModeStartHour(hour) {
-        nightModeStartHour = hour
-        saveSettings()
-    }
-
-    function setNightModeStartMinute(minute) {
-        nightModeStartMinute = minute
-        saveSettings()
-    }
-
-    function setNightModeEndHour(hour) {
-        nightModeEndHour = hour
-        saveSettings()
-    }
-
-    function setNightModeEndMinute(minute) {
-        nightModeEndMinute = minute
-        saveSettings()
-    }
-
-    function setLatitude(lat) {
-        console.log("SessionData: Setting latitude to", lat)
-        latitude = lat
-        saveSettings()
-    }
-
-    function setLongitude(lng) {
-        console.log("SessionData: Setting longitude to", lng)
-        longitude = lng
-        saveSettings()
-    }
-
-    function setNightModeLocationProvider(provider) {
-        nightModeLocationProvider = provider
-        saveSettings()
-    }
-
-    function setPinnedApps(apps) {
-        pinnedApps = apps
-        saveSettings()
-    }
-
-    function addPinnedApp(appId) {
-        if (!appId)
-            return
-        var currentPinned = [...pinnedApps]
-        if (currentPinned.indexOf(appId) === -1) {
-            currentPinned.push(appId)
-            setPinnedApps(currentPinned)
-        }
-    }
-
-    function removePinnedApp(appId) {
-        if (!appId)
-            return
-        var currentPinned = pinnedApps.filter(id => id !== appId)
-        setPinnedApps(currentPinned)
-    }
-
-    function isPinnedApp(appId) {
-        return appId && pinnedApps.indexOf(appId) !== -1
-    }
-
-    function addRecentColor(color) {
-        const colorStr = color.toString()
-        let recent = recentColors.slice()
-        recent = recent.filter(c => c !== colorStr)
-        recent.unshift(colorStr)
-        if (recent.length > 5) recent = recent.slice(0, 5)
-        recentColors = recent
-        saveSettings()
-    }
-
-    function setShowThirdPartyPlugins(enabled) {
-        showThirdPartyPlugins = enabled
-        saveSettings()
-    }
-
-    function setLaunchPrefix(prefix) {
-        launchPrefix = prefix
-        saveSettings()
-    }
-
-    function setLastBrightnessDevice(device) {
-        lastBrightnessDevice = device
-        saveSettings()
-    }
-
-    function setSelectedGpuIndex(index) {
-        selectedGpuIndex = index
-        saveSettings()
-    }
-
-    function setNvidiaGpuTempEnabled(enabled) {
-        nvidiaGpuTempEnabled = enabled
-        saveSettings()
-    }
-
-    function setNonNvidiaGpuTempEnabled(enabled) {
-        nonNvidiaGpuTempEnabled = enabled
-        saveSettings()
-    }
-
-    function setEnabledGpuPciIds(pciIds) {
-        enabledGpuPciIds = pciIds
-        saveSettings()
-    }
-
-    function syncWallpaperForCurrentMode() {
-        if (!perModeWallpaper) return
-
-        if (perMonitorWallpaper) {
-            monitorWallpapers = isLightMode ? Object.assign({}, monitorWallpapersLight) : Object.assign({}, monitorWallpapersDark)
-            return
-        }
-
-        wallpaperPath = isLightMode ? wallpaperPathLight : wallpaperPathDark
-    }
-
-    function getMonitorWallpaper(screenName) {
-        if (!perMonitorWallpaper) {
-            return wallpaperPath
-        }
-        return monitorWallpapers[screenName] || wallpaperPath
-    }
-
-    function getMonitorCyclingSettings(screenName) {
-        return monitorCyclingSettings[screenName] || {
-            enabled: false,
-            mode: "interval",
-            interval: 300,
-            time: "06:00"
-        }
-    }
-
-    FileView {
-        id: settingsFile
-
-        path: isGreeterMode ? "" : StandardPaths.writableLocation(StandardPaths.GenericStateLocation) + "/DankMaterialShell/session.json"
-        blockLoading: isGreeterMode
-        blockWrites: true
-        watchChanges: !isGreeterMode
-        onLoaded: {
-            if (!isGreeterMode) {
-                parseSettings(settingsFile.text())
-                hasTriedDefaultSession = false
-            }
-        }
-        onLoadFailed: error => {
-            if (!isGreeterMode && !hasTriedDefaultSession) {
-                hasTriedDefaultSession = true
-                defaultSessionCheckProcess.running = true
-            }
-        }
-    }
-
-    FileView {
-        id: greeterSessionFile
-
-        path: {
-            const greetCfgDir = Quickshell.env("DMS_GREET_CFG_DIR") || "/etc/greetd/.dms"
-            return greetCfgDir + "/session.json"
-        }
-        preload: isGreeterMode
-        blockLoading: false
-        blockWrites: true
-        watchChanges: false
-        printErrors: true
-        onLoaded: {
-            if (isGreeterMode) {
-                parseSettings(greeterSessionFile.text())
-            }
-        }
-    }
-
-    Process {
-        id: defaultSessionCheckProcess
-
-        command: ["sh", "-c", "CONFIG_DIR=\"" + _stateDir
-            + "/DankMaterialShell\"; if [ -f \"$CONFIG_DIR/default-session.json\" ] && [ ! -f \"$CONFIG_DIR/session.json\" ]; then cp --no-preserve=mode \"$CONFIG_DIR/default-session.json\" \"$CONFIG_DIR/session.json\" && echo 'copied'; else echo 'not_found'; fi"]
-        running: false
-        onExited: exitCode => {
-            if (exitCode === 0) {
-                console.log("Copied default-session.json to session.json")
-                settingsFile.reload()
-            }
-        }
-    }
-
-    IpcHandler {
-        target: "wallpaper"
-
-        function get(): string {
-            if (root.perMonitorWallpaper) {
-                return "ERROR: Per-monitor mode enabled. Use getFor(screenName) instead."
-            }
-            return root.wallpaperPath || ""
-        }
-
-        function set(path: string): string {
-            if (root.perMonitorWallpaper) {
-                return "ERROR: Per-monitor mode enabled. Use setFor(screenName, path) instead."
-            }
-
-            if (!path) {
-                return "ERROR: No path provided"
-            }
-
-            var absolutePath = path.startsWith("/") ? path : StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/" + path
-
-            try {
-                root.setWallpaper(absolutePath)
-                return "SUCCESS: Wallpaper set to " + absolutePath
-            } catch (e) {
-                return "ERROR: Failed to set wallpaper: " + e.toString()
-            }
-        }
-
-        function clear(): string {
-            root.setWallpaper("")
-            root.setPerMonitorWallpaper(false)
-            root.monitorWallpapers = {}
-            root.saveSettings()
-            return "SUCCESS: All wallpapers cleared"
-        }
-
-        function next(): string {
-            if (root.perMonitorWallpaper) {
-                return "ERROR: Per-monitor mode enabled. Use nextFor(screenName) instead."
-            }
-
-            if (!root.wallpaperPath) {
-                return "ERROR: No wallpaper set"
-            }
-
-            try {
-                WallpaperCyclingService.cycleNextManually()
-                return "SUCCESS: Cycling to next wallpaper"
-            } catch (e) {
-                return "ERROR: Failed to cycle wallpaper: " + e.toString()
-            }
-        }
-
-        function prev(): string {
-            if (root.perMonitorWallpaper) {
-                return "ERROR: Per-monitor mode enabled. Use prevFor(screenName) instead."
-            }
-
-            if (!root.wallpaperPath) {
-                return "ERROR: No wallpaper set"
-            }
-
-            try {
-                WallpaperCyclingService.cyclePrevManually()
-                return "SUCCESS: Cycling to previous wallpaper"
-            } catch (e) {
-                return "ERROR: Failed to cycle wallpaper: " + e.toString()
-            }
-        }
-
-        function getFor(screenName: string): string {
-            if (!screenName) {
-                return "ERROR: No screen name provided"
-            }
-            return root.getMonitorWallpaper(screenName) || ""
-        }
-
-        function setFor(screenName: string, path: string): string {
-            if (!screenName) {
-                return "ERROR: No screen name provided"
-            }
-
-            if (!path) {
-                return "ERROR: No path provided"
-            }
-
-            var absolutePath = path.startsWith("/") ? path : StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/" + path
-
-            try {
-                if (!root.perMonitorWallpaper) {
-                    root.setPerMonitorWallpaper(true)
-                }
-                root.setMonitorWallpaper(screenName, absolutePath)
-                return "SUCCESS: Wallpaper set for " + screenName + " to " + absolutePath
-            } catch (e) {
-                return "ERROR: Failed to set wallpaper for " + screenName + ": " + e.toString()
-            }
-        }
-
-        function nextFor(screenName: string): string {
-            if (!screenName) {
-                return "ERROR: No screen name provided"
-            }
-
-            var currentWallpaper = root.getMonitorWallpaper(screenName)
-            if (!currentWallpaper) {
-                return "ERROR: No wallpaper set for " + screenName
-            }
-
-            try {
-                WallpaperCyclingService.cycleNextForMonitor(screenName)
-                return "SUCCESS: Cycling to next wallpaper for " + screenName
-            } catch (e) {
-                return "ERROR: Failed to cycle wallpaper for " + screenName + ": " + e.toString()
-            }
-        }
-
-        function prevFor(screenName: string): string {
-            if (!screenName) {
-                return "ERROR: No screen name provided"
-            }
-
-            var currentWallpaper = root.getMonitorWallpaper(screenName)
-            if (!currentWallpaper) {
-                return "ERROR: No wallpaper set for " + screenName
-            }
-
-            try {
-                WallpaperCyclingService.cyclePrevForMonitor(screenName)
-                return "SUCCESS: Cycling to previous wallpaper for " + screenName
-            } catch (e) {
-                return "ERROR: Failed to cycle wallpaper for " + screenName + ": " + e.toString()
-            }
-        }
-    }
-}

Common/Theme.qml

@@ -1,992 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtCore
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import Quickshell.Services.UPower
-import qs.Common
-import qs.Services
-import "StockThemes.js" as StockThemes
-
-Singleton {
-    id: root
-
-    readonly property string stateDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()) + "/DankMaterialShell"
-
-    readonly property bool envDisableMatugen: Quickshell.env("DMS_DISABLE_MATUGEN") === "1" || Quickshell.env("DMS_DISABLE_MATUGEN") === "true"
-
-    readonly property real popupDistance: {
-        if (typeof SettingsData === "undefined") return 4
-        return SettingsData.popupGapsAuto ? Math.max(4, SettingsData.dankBarSpacing) : SettingsData.popupGapsManual
-    }
-
-    property string currentTheme: "blue"
-    property string currentThemeCategory: "generic"
-    property bool isLightMode: typeof SessionData !== "undefined" ? SessionData.isLightMode : false
-    property bool colorsFileLoadFailed: false
-
-    readonly property string dynamic: "dynamic"
-    readonly property string custom : "custom"
-
-    readonly property string homeDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.HomeLocation))
-    readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation))
-    readonly property string shellDir: Paths.strip(Qt.resolvedUrl(".").toString()).replace("/Common/", "")
-    readonly property string wallpaperPath: {
-        if (typeof SessionData === "undefined") return ""
-
-        if (SessionData.perMonitorWallpaper) {
-            var screens = Quickshell.screens
-            if (screens.length > 0) {
-                var firstMonitorWallpaper = SessionData.getMonitorWallpaper(screens[0].name)
-                var wallpaperPath = firstMonitorWallpaper || SessionData.wallpaperPath
-
-                if (wallpaperPath && wallpaperPath.startsWith("we:")) {
-                    return stateDir + "/we_screenshots/" + wallpaperPath.substring(3) + ".jpg"
-                }
-
-                return wallpaperPath
-            }
-        }
-
-        var wallpaperPath = SessionData.wallpaperPath
-        var screens = Quickshell.screens
-        if (screens.length > 0 && wallpaperPath && wallpaperPath.startsWith("we:")) {
-            return stateDir + "/we_screenshots/" + wallpaperPath.substring(3) + ".jpg"
-        }
-
-        return wallpaperPath
-    }
-    readonly property string rawWallpaperPath: {
-        if (typeof SessionData === "undefined") return ""
-        
-        if (SessionData.perMonitorWallpaper) {
-            // Use first monitor's wallpaper for dynamic theming
-            var screens = Quickshell.screens
-            if (screens.length > 0) {
-                var firstMonitorWallpaper = SessionData.getMonitorWallpaper(screens[0].name)
-                return firstMonitorWallpaper || SessionData.wallpaperPath
-            }
-        }
-
-        return SessionData.wallpaperPath
-    }
-
-    property bool matugenAvailable: false
-    property bool gtkThemingEnabled: typeof SettingsData !== "undefined" ? SettingsData.gtkAvailable : false
-    property bool qtThemingEnabled: typeof SettingsData !== "undefined" ? (SettingsData.qt5ctAvailable || SettingsData.qt6ctAvailable) : false
-    property var workerRunning: false
-    property var matugenColors: ({})
-    property var customThemeData: null
-
-    Component.onCompleted: {
-        Quickshell.execDetached(["mkdir", "-p", stateDir])
-        Proc.runCommand("matugenCheck", ["which", "matugen"], (output, code) => {
-            matugenAvailable = (code === 0) && !envDisableMatugen
-            const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
-
-            if (!matugenAvailable || isGreeterMode) {
-                return
-            }
-
-            if (colorsFileLoadFailed && currentTheme === dynamic && wallpaperPath) {
-                console.log("Theme: Matugen now available, regenerating colors for dynamic theme")
-                const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode)
-                const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
-                Quickshell.execDetached(["rm", "-f", stateDir + "/matugen.key"])
-                const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
-                if (wallpaperPath.startsWith("#")) {
-                    setDesiredTheme("hex", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                } else {
-                    setDesiredTheme("image", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                }
-                return
-            }
-
-            const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode)
-            const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
-
-            if (currentTheme === dynamic) {
-                if (wallpaperPath) {
-                    Quickshell.execDetached(["rm", "-f", stateDir + "/matugen.key"])
-                    const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
-                    if (wallpaperPath.startsWith("#")) {
-                        setDesiredTheme("hex", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                    } else {
-                        setDesiredTheme("image", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                    }
-                }
-            } else {
-                let primaryColor
-                let matugenType
-                if (currentTheme === "custom") {
-                    if (customThemeData && customThemeData.primary) {
-                        primaryColor = customThemeData.primary
-                        matugenType = customThemeData.matugen_type
-                    }
-                } else {
-                    primaryColor = currentThemeData.primary
-                    matugenType = currentThemeData.matugen_type
-                }
-
-                if (primaryColor) {
-                    Quickshell.execDetached(["rm", "-f", stateDir + "/matugen.key"])
-                    setDesiredTheme("hex", primaryColor, isLight, iconTheme, matugenType)
-                }
-            }
-        }, 0)
-        if (typeof SessionData !== "undefined") {
-            SessionData.isLightModeChanged.connect(root.onLightModeChanged)
-        }
-
-        if (typeof SettingsData !== "undefined" && SettingsData.currentThemeName) {
-            switchTheme(SettingsData.currentThemeName, false, false)
-        }
-    }
-
-    function applyGreeterTheme(themeName) {
-        switchTheme(themeName, false, false)
-        if (themeName === dynamic && dynamicColorsFileView.path) {
-            dynamicColorsFileView.reload()
-        }
-    }
-
-    function getMatugenColor(path, fallback) {
-        const colorMode = (typeof SessionData !== "undefined" && SessionData.isLightMode) ? "light" : "dark"
-        let cur = matugenColors && matugenColors.colors && matugenColors.colors[colorMode]
-        for (const part of path.split(".")) {
-            if (!cur || typeof cur !== "object" || !(part in cur))
-                return fallback
-            cur = cur[part]
-        }
-        return cur || fallback
-    }
-
-    readonly property var currentThemeData: {
-        if (currentTheme === "custom") {
-            return customThemeData || StockThemes.getThemeByName("blue", isLightMode)
-        } else if (currentTheme === dynamic) {
-            return {
-                "primary": getMatugenColor("primary", "#42a5f5"),
-                "primaryText": getMatugenColor("on_primary", "#ffffff"),
-                "primaryContainer": getMatugenColor("primary_container", "#1976d2"),
-                "secondary": getMatugenColor("secondary", "#8ab4f8"),
-                "surface": getMatugenColor("surface", "#1a1c1e"),
-                "surfaceText": getMatugenColor("on_background", "#e3e8ef"),
-                "surfaceVariant": getMatugenColor("surface_variant", "#44464f"),
-                "surfaceVariantText": getMatugenColor("on_surface_variant", "#c4c7c5"),
-                "surfaceTint": getMatugenColor("surface_tint", "#8ab4f8"),
-                "background": getMatugenColor("background", "#1a1c1e"),
-                "backgroundText": getMatugenColor("on_background", "#e3e8ef"),
-                "outline": getMatugenColor("outline", "#8e918f"),
-                "surfaceContainer": getMatugenColor("surface_container", "#1e2023"),
-                "surfaceContainerHigh": getMatugenColor("surface_container_high", "#292b2f"),
-                "surfaceContainerHighest": getMatugenColor("surface_container_highest", "#343740"),
-                "error": "#F2B8B5",
-                "warning": "#FF9800",
-                "info": "#2196F3",
-                "success": "#4CAF50"
-            }
-        } else {
-            return StockThemes.getThemeByName(currentTheme, isLightMode)
-        }
-    }
-
-    readonly property var availableMatugenSchemes: [
-        ({ "value": "scheme-tonal-spot", "label": "Tonal Spot", "description": "Balanced palette with focused accents (default)." }),
-        ({ "value": "scheme-content", "label": "Content", "description": "Derives colors that closely match the underlying image." }),
-        ({ "value": "scheme-expressive", "label": "Expressive", "description": "Vibrant palette with playful saturation." }),
-        ({ "value": "scheme-fidelity", "label": "Fidelity", "description": "High-fidelity palette that preserves source hues." }),
-        ({ "value": "scheme-fruit-salad", "label": "Fruit Salad", "description": "Colorful mix of bright contrasting accents." }),
-        ({ "value": "scheme-monochrome", "label": "Monochrome", "description": "Minimal palette built around a single hue." }),
-        ({ "value": "scheme-neutral", "label": "Neutral", "description": "Muted palette with subdued, calming tones." }),
-        ({ "value": "scheme-rainbow", "label": "Rainbow", "description": "Diverse palette spanning the full spectrum." })
-    ]
-
-    function getMatugenScheme(value) {
-        const schemes = availableMatugenSchemes
-        for (let i = 0; i < schemes.length; i++) {
-            if (schemes[i].value === value)
-                return schemes[i]
-        }
-        return schemes[0]
-    }
-
-    property color primary: currentThemeData.primary
-    property color primaryText: currentThemeData.primaryText
-    property color primaryContainer: currentThemeData.primaryContainer
-    property color secondary: currentThemeData.secondary
-    property color surface: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.background
-        }
-        return currentThemeData.surface
-    }
-    property color surfaceText: currentThemeData.surfaceText
-    property color surfaceVariant: currentThemeData.surfaceVariant
-    property color surfaceVariantText: currentThemeData.surfaceVariantText
-    property color surfaceTint: currentThemeData.surfaceTint
-    property color background: currentThemeData.background
-    property color backgroundText: currentThemeData.backgroundText
-    property color outline: currentThemeData.outline
-    property color outlineVariant: currentThemeData.outlineVariant || Qt.rgba(outline.r, outline.g, outline.b, 0.6)
-    property color surfaceContainer: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surface
-        }
-        return currentThemeData.surfaceContainer
-    }
-    property color surfaceContainerHigh: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surfaceContainer
-        }
-        return currentThemeData.surfaceContainerHigh
-    }
-    property color surfaceContainerHighest: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surfaceContainerHigh
-        }
-        return currentThemeData.surfaceContainerHighest
-    }
-
-    property color onSurface: surfaceText
-    property color onSurfaceVariant: surfaceVariantText
-    property color onPrimary: primaryText
-    property color onSurface_12: Qt.rgba(onSurface.r, onSurface.g, onSurface.b, 0.12)
-    property color onSurface_38: Qt.rgba(onSurface.r, onSurface.g, onSurface.b, 0.38)
-    property color onSurfaceVariant_30: Qt.rgba(onSurfaceVariant.r, onSurfaceVariant.g, onSurfaceVariant.b, 0.30)
-
-    property color error: currentThemeData.error || "#F2B8B5"
-    property color warning: currentThemeData.warning || "#FF9800"
-    property color info: currentThemeData.info || "#2196F3"
-    property color tempWarning: "#ff9933"
-    property color tempDanger: "#ff5555"
-    property color success: currentThemeData.success || "#4CAF50"
-
-    property color primaryHover: Qt.rgba(primary.r, primary.g, primary.b, 0.12)
-    property color primaryHoverLight: Qt.rgba(primary.r, primary.g, primary.b, 0.08)
-    property color primaryPressed: Qt.rgba(primary.r, primary.g, primary.b, 0.16)
-    property color primarySelected: Qt.rgba(primary.r, primary.g, primary.b, 0.3)
-    property color primaryBackground: Qt.rgba(primary.r, primary.g, primary.b, 0.04)
-
-    property color secondaryHover: Qt.rgba(secondary.r, secondary.g, secondary.b, 0.08)
-
-    property color surfaceHover: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.08)
-    property color surfacePressed: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.12)
-    property color surfaceSelected: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.15)
-    property color surfaceLight: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.1)
-    property color surfaceVariantAlpha: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.2)
-    property color surfaceTextHover: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.08)
-    property color surfaceTextAlpha: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.3)
-    property color surfaceTextLight: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.06)
-    property color surfaceTextMedium: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.7)
-
-    property color outlineButton: Qt.rgba(outline.r, outline.g, outline.b, 0.5)
-    property color outlineLight: Qt.rgba(outline.r, outline.g, outline.b, 0.05)
-    property color outlineMedium: Qt.rgba(outline.r, outline.g, outline.b, 0.08)
-    property color outlineStrong: Qt.rgba(outline.r, outline.g, outline.b, 0.12)
-
-    property color errorHover: Qt.rgba(error.r, error.g, error.b, 0.12)
-    property color errorPressed: Qt.rgba(error.r, error.g, error.b, 0.16)
-
-    property color shadowMedium: Qt.rgba(0, 0, 0, 0.08)
-    property color shadowStrong: Qt.rgba(0, 0, 0, 0.3)
-
-    readonly property var animationDurations: [
-        { shorter: 0, short: 0, medium: 0, long: 0, extraLong: 0 },
-        { shorter: 50, short: 75, medium: 150, long: 250, extraLong: 500 },
-        { shorter: 100, short: 150, medium: 300, long: 500, extraLong: 1000 },
-        { shorter: 150, short: 225, medium: 450, long: 750, extraLong: 1500 },
-        { shorter: 200, short: 300, medium: 600, long: 1000, extraLong: 2000 }
-    ]
-
-    readonly property int currentAnimationSpeed: typeof SettingsData !== "undefined" ? SettingsData.animationSpeed : SettingsData.AnimationSpeed.Short
-    readonly property var currentDurations: animationDurations[currentAnimationSpeed] || animationDurations[SettingsData.AnimationSpeed.Short]
-
-    property int shorterDuration: currentDurations.shorter
-    property int shortDuration: currentDurations.short
-    property int mediumDuration: currentDurations.medium
-    property int longDuration: currentDurations.long
-    property int extraLongDuration: currentDurations.extraLong
-    property int standardEasing: Easing.OutCubic
-    property int emphasizedEasing: Easing.OutQuart
-
-    property real cornerRadius: typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12
-    property real spacingXS: 4
-    property real spacingS: 8
-    property real spacingM: 12
-    property real spacingL: 16
-    property real spacingXL: 24
-    property real fontSizeSmall: (typeof SettingsData !== "undefined" ? SettingsData.fontScale : 1.0) * 12
-    property real fontSizeMedium: (typeof SettingsData !== "undefined" ? SettingsData.fontScale : 1.0) * 14
-    property real fontSizeLarge: (typeof SettingsData !== "undefined" ? SettingsData.fontScale : 1.0) * 16
-    property real fontSizeXLarge: (typeof SettingsData !== "undefined" ? SettingsData.fontScale : 1.0) * 20
-    property real barHeight: 48
-    property real iconSize: 24
-    property real iconSizeSmall: 16
-    property real iconSizeLarge: 32
-
-    property real panelTransparency: 0.85
-    property real widgetTransparency: typeof SettingsData !== "undefined" && SettingsData.dankBarWidgetTransparency !== undefined ? SettingsData.dankBarWidgetTransparency : 1.0
-    property real popupTransparency: typeof SettingsData !== "undefined" && SettingsData.popupTransparency !== undefined ? SettingsData.popupTransparency : 1.0
-
-    function screenTransition() {
-        CompositorService.isNiri && NiriService.doScreenTransition()
-    }
-
-    function switchTheme(themeName, savePrefs = true, enableTransition = true) {
-        if (enableTransition) {
-            screenTransition()
-            themeTransitionTimer.themeName = themeName
-            themeTransitionTimer.savePrefs = savePrefs
-            themeTransitionTimer.restart()
-            return
-        }
-
-        if (themeName === dynamic) {
-            currentTheme = dynamic
-            currentThemeCategory = dynamic
-        } else if (themeName === custom) {
-            currentTheme = custom
-            currentThemeCategory = custom
-            if (typeof SettingsData !== "undefined" && SettingsData.customThemeFile) {
-                loadCustomThemeFromFile(SettingsData.customThemeFile)
-            }
-        } else {
-            currentTheme = themeName
-            if (StockThemes.isCatppuccinVariant(themeName)) {
-                currentThemeCategory = "catppuccin"
-            } else {
-                currentThemeCategory = "generic"
-            }
-        }
-        const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
-        if (savePrefs && typeof SettingsData !== "undefined" && !isGreeterMode)
-            SettingsData.setTheme(currentTheme)
-
-        if (!isGreeterMode) {
-            generateSystemThemesFromCurrentTheme()
-        }
-    }
-
-    function setLightMode(light, savePrefs = true, enableTransition = false) {
-        if (enableTransition) {
-            screenTransition()
-            lightModeTransitionTimer.lightMode = light
-            lightModeTransitionTimer.savePrefs = savePrefs
-            lightModeTransitionTimer.restart()
-            return
-        }
-
-        const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
-        if (savePrefs && typeof SessionData !== "undefined" && !isGreeterMode)
-            SessionData.setLightMode(light)
-        if (!isGreeterMode) {
-            PortalService.setLightMode(light)
-            generateSystemThemesFromCurrentTheme()
-        }
-    }
-
-    function toggleLightMode(savePrefs = true) {
-        setLightMode(!isLightMode, savePrefs, true)
-    }
-
-    function forceGenerateSystemThemes() {
-        if (!matugenAvailable) {
-            return
-        }
-        generateSystemThemesFromCurrentTheme()
-    }
-
-    function getAvailableThemes() {
-        return StockThemes.getAllThemeNames()
-    }
-
-    function getThemeDisplayName(themeName) {
-        const themeData = StockThemes.getThemeByName(themeName, isLightMode)
-        return themeData.name
-    }
-
-    function getThemeColors(themeName) {
-        if (themeName === "custom" && customThemeData) {
-            return customThemeData
-        }
-        return StockThemes.getThemeByName(themeName, isLightMode)
-    }
-
-    function switchThemeCategory(category, defaultTheme) {
-        screenTransition()
-        themeCategoryTransitionTimer.category = category
-        themeCategoryTransitionTimer.defaultTheme = defaultTheme
-        themeCategoryTransitionTimer.restart()
-    }
-
-    function getCatppuccinColor(variantName) {
-        const catColors = {
-            "cat-rosewater": "#f5e0dc", "cat-flamingo": "#f2cdcd", "cat-pink": "#f5c2e7", "cat-mauve": "#cba6f7",
-            "cat-red": "#f38ba8", "cat-maroon": "#eba0ac", "cat-peach": "#fab387", "cat-yellow": "#f9e2af",
-            "cat-green": "#a6e3a1", "cat-teal": "#94e2d5", "cat-sky": "#89dceb", "cat-sapphire": "#74c7ec",
-            "cat-blue": "#89b4fa", "cat-lavender": "#b4befe"
-        }
-        return catColors[variantName] || "#cba6f7"
-    }
-
-    function getCatppuccinVariantName(variantName) {
-        const catNames = {
-            "cat-rosewater": "Rosewater", "cat-flamingo": "Flamingo", "cat-pink": "Pink", "cat-mauve": "Mauve",
-            "cat-red": "Red", "cat-maroon": "Maroon", "cat-peach": "Peach", "cat-yellow": "Yellow",
-            "cat-green": "Green", "cat-teal": "Teal", "cat-sky": "Sky", "cat-sapphire": "Sapphire",
-            "cat-blue": "Blue", "cat-lavender": "Lavender"
-        }
-        return catNames[variantName] || "Unknown"
-    }
-
-    function loadCustomTheme(themeData) {
-        if (themeData.dark || themeData.light) {
-            const colorMode = (typeof SessionData !== "undefined" && SessionData.isLightMode) ? "light" : "dark"
-            const selectedTheme = themeData[colorMode] || themeData.dark || themeData.light
-            customThemeData = selectedTheme
-        } else {
-            customThemeData = themeData
-        }
-
-        generateSystemThemesFromCurrentTheme()
-    }
-
-    function loadCustomThemeFromFile(filePath) {
-        customThemeFileView.path = filePath
-    }
-
-    property alias availableThemeNames: root._availableThemeNames
-    readonly property var _availableThemeNames: StockThemes.getAllThemeNames()
-    property string currentThemeName: currentTheme
-
-    function popupBackground() {
-        return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, popupTransparency)
-    }
-
-    function contentBackground() {
-        return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, popupTransparency)
-    }
-
-    function panelBackground() {
-        return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, panelTransparency)
-    }
-
-    property real notepadTransparency: SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : popupTransparency
-
-    property var widgetBaseBackgroundColor: {
-        const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch"
-        switch (colorMode) {
-            case "s":
-                return surface
-            case "sc":
-                return surfaceContainer
-            case "sch":
-                return surfaceContainerHigh
-            case "sth":
-            default:
-                return surfaceTextHover
-        }
-    }
-
-    property var widgetBaseHoverColor: {
-        const baseColor = widgetBaseBackgroundColor
-        const factor = 1.2
-        return isLightMode ? Qt.darker(baseColor, factor) : Qt.lighter(baseColor, factor)
-    }
-
-    property var widgetBackground: {
-        const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch"
-        switch (colorMode) {
-            case "s":
-                return Qt.rgba(surface.r, surface.g, surface.b, widgetTransparency)
-            case "sc":
-                return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, widgetTransparency)
-            case "sch":
-                return Qt.rgba(surfaceContainerHigh.r, surfaceContainerHigh.g, surfaceContainerHigh.b, widgetTransparency)
-            case "sth":
-            default:
-                return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, widgetTransparency)
-        }
-    }
-
-    function getPopupBackgroundAlpha() {
-        return popupTransparency
-    }
-
-    function getContentBackgroundAlpha() {
-        return popupTransparency
-    }
-
-    function isColorDark(c) {
-        return (0.299 * c.r + 0.587 * c.g + 0.114 * c.b) < 0.5
-    }
-
-    function barIconSize(barThickness, offset) {
-        const defaultOffset = offset !== undefined ? offset : -6
-        return Math.round((barThickness / 48) * (iconSize + defaultOffset))
-    }
-
-    function barTextSize(barThickness) {
-        const scale = barThickness / 48
-        const dankBarScale = (typeof SettingsData !== "undefined" ? SettingsData.dankBarFontScale : 1.0)
-        if (scale <= 0.75) return fontSizeSmall * 0.9 * dankBarScale
-        if (scale >= 1.25) return fontSizeMedium * dankBarScale
-        return fontSizeSmall * dankBarScale
-    }
-
-    function getBatteryIcon(level, isCharging, batteryAvailable) {
-        if (!batteryAvailable)
-            return _getBatteryPowerProfileIcon()
-
-        if (isCharging) {
-            if (level >= 90)
-                return "battery_charging_full"
-            if (level >= 80)
-                return "battery_charging_90"
-            if (level >= 60)
-                return "battery_charging_80"
-            if (level >= 50)
-                return "battery_charging_60"
-            if (level >= 30)
-                return "battery_charging_50"
-            if (level >= 20)
-                return "battery_charging_30"
-            return "battery_charging_20"
-        } else {
-            if (level >= 95)
-                return "battery_full"
-            if (level >= 85)
-                return "battery_6_bar"
-            if (level >= 70)
-                return "battery_5_bar"
-            if (level >= 55)
-                return "battery_4_bar"
-            if (level >= 40)
-                return "battery_3_bar"
-            if (level >= 25)
-                return "battery_2_bar"
-            if (level >= 10)
-                return "battery_1_bar"
-            return "battery_alert"
-        }
-    }
-
-    function _getBatteryPowerProfileIcon() {
-        if (typeof PowerProfiles === "undefined")
-            return "balance"
-
-        switch (PowerProfiles.profile) {
-        case PowerProfile.PowerSaver:
-            return "energy_savings_leaf"
-        case PowerProfile.Performance:
-            return "rocket_launch"
-        default:
-            return "balance"
-        }
-    }
-
-    function getPowerProfileIcon(profile) {
-        switch (profile) {
-        case PowerProfile.PowerSaver:
-            return "battery_saver"
-        case PowerProfile.Balanced:
-            return "battery_std"
-        case PowerProfile.Performance:
-            return "flash_on"
-        default:
-            return "settings"
-        }
-    }
-
-    function getPowerProfileLabel(profile) {
-        switch (profile) {
-        case PowerProfile.PowerSaver:
-            return "Power Saver"
-        case PowerProfile.Balanced:
-            return "Balanced"
-        case PowerProfile.Performance:
-            return "Performance"
-        default:
-            return profile.charAt(0).toUpperCase() + profile.slice(1)
-        }
-    }
-
-    function getPowerProfileDescription(profile) {
-        switch (profile) {
-        case PowerProfile.PowerSaver:
-            return "Extend battery life"
-        case PowerProfile.Balanced:
-            return "Balance power and performance"
-        case PowerProfile.Performance:
-            return "Prioritize performance"
-        default:
-            return "Custom power profile"
-        }
-    }
-
-
-    function onLightModeChanged() {
-        if (currentTheme === "custom" && customThemeFileView.path) {
-            customThemeFileView.reload()
-        }
-    }
-
-    function setDesiredTheme(kind, value, isLight, iconTheme, matugenType) {
-        if (!matugenAvailable) {
-            console.warn("Theme: matugen not available or disabled - cannot set system theme")
-            return
-        }
-
-        console.log("Theme: Setting desired theme -", kind, "mode:", isLight ? "light" : "dark", "type:", matugenType)
-
-        if (typeof NiriService !== "undefined" && CompositorService.isNiri) {
-            NiriService.suppressNextToast()
-        }
-
-        const desired = {
-            "kind": kind,
-            "value": value,
-            "mode": isLight ? "light" : "dark",
-            "iconTheme": iconTheme || "System Default",
-            "matugenType": matugenType || "scheme-tonal-spot",
-            "surfaceBase": (typeof SettingsData !== "undefined" && SettingsData.surfaceBase) ? SettingsData.surfaceBase : "sc",
-            "runUserTemplates": (typeof SettingsData !== "undefined") ? SettingsData.runUserMatugenTemplates : true
-        }
-
-        const json = JSON.stringify(desired)
-        const desiredPath = stateDir + "/matugen.desired.json"
-
-        Quickshell.execDetached(["sh", "-c", `mkdir -p '${stateDir}' && cat > '${desiredPath}' << 'EOF'\n${json}\nEOF`])
-        workerRunning = true
-        if (rawWallpaperPath.startsWith("we:")) {
-            console.log("Theme: Starting matugen worker (WE wallpaper)")
-            systemThemeGenerator.command = [
-                "sh", "-c",
-                `sleep 1 && ${shellDir}/scripts/matugen-worker.sh '${stateDir}' '${shellDir}' '${configDir}' --run`
-            ]
-        } else {
-            console.log("Theme: Starting matugen worker")
-            systemThemeGenerator.command = [shellDir + "/scripts/matugen-worker.sh", stateDir, shellDir, configDir, "--run"]
-        }
-        systemThemeGenerator.running = true
-    }
-
-    function generateSystemThemesFromCurrentTheme() {
-        const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
-        if (!matugenAvailable || isGreeterMode)
-            return
-
-        const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode)
-        const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
-
-        if (currentTheme === dynamic) {
-            if (!wallpaperPath) {
-                return
-            }
-            const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
-            if (wallpaperPath.startsWith("#")) {
-                setDesiredTheme("hex", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-            } else {
-                setDesiredTheme("image", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-            }
-        } else {
-            let primaryColor
-            let matugenType
-            if (currentTheme === "custom") {
-                if (!customThemeData || !customThemeData.primary) {
-                    console.warn("Custom theme data not available for system theme generation")
-                    return
-                }
-                primaryColor = customThemeData.primary
-                matugenType = customThemeData.matugen_type
-            } else {
-                primaryColor = currentThemeData.primary
-                matugenType = currentThemeData.matugen_type
-            }
-
-            if (!primaryColor) {
-                console.warn("No primary color available for theme:", currentTheme)
-                return
-            }
-            setDesiredTheme("hex", primaryColor, isLight, iconTheme, matugenType)
-        }
-    }
-
-    function applyGtkColors() {
-        if (!matugenAvailable) {
-            if (typeof ToastService !== "undefined") {
-                ToastService.showError("matugen not available or disabled - cannot apply GTK colors")
-            }
-            return
-        }
-
-        const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode) ? "true" : "false"
-        Proc.runCommand("gtkApplier", [shellDir + "/scripts/gtk.sh", configDir, isLight, shellDir], (output, exitCode) => {
-            if (exitCode === 0) {
-                if (typeof ToastService !== "undefined" && typeof NiriService !== "undefined" && !NiriService.matugenSuppression) {
-                    ToastService.showInfo("GTK colors applied successfully")
-                }
-            } else {
-                if (typeof ToastService !== "undefined") {
-                    ToastService.showError("Failed to apply GTK colors")
-                }
-            }
-        })
-    }
-
-    function applyQtColors() {
-        if (!matugenAvailable) {
-            if (typeof ToastService !== "undefined") {
-                ToastService.showError("matugen not available or disabled - cannot apply Qt colors")
-            }
-            return
-        }
-
-        Proc.runCommand("qtApplier", [shellDir + "/scripts/qt.sh", configDir], (output, exitCode) => {
-            if (exitCode === 0) {
-                if (typeof ToastService !== "undefined") {
-                    ToastService.showInfo("Qt colors applied successfully")
-                }
-            } else {
-                if (typeof ToastService !== "undefined") {
-                    ToastService.showError("Failed to apply Qt colors")
-                }
-            }
-        })
-    }
-
-    function withAlpha(c, a) { return Qt.rgba(c.r, c.g, c.b, a); }
-
-    function snap(value, dpr) {
-        const s = dpr || 1
-        return Math.round(value * s) / s
-    }
-
-    function px(value, dpr) {
-        const s = dpr || 1
-        return Math.round(value * s) / s
-    }
-
-    function hairline(dpr) {
-        return 1 / (dpr || 1)
-    }
-
-    function invertHex(hex) {
-        hex = hex.replace('#', '');
-
-        if (!/^[0-9A-Fa-f]{6}$/.test(hex)) {
-            return hex;
-        }
-
-        const r = parseInt(hex.substr(0, 2), 16);
-        const g = parseInt(hex.substr(2, 2), 16);
-        const b = parseInt(hex.substr(4, 2), 16);
-
-        const invR = (255 - r).toString(16).padStart(2, '0');
-        const invG = (255 - g).toString(16).padStart(2, '0');
-        const invB = (255 - b).toString(16).padStart(2, '0');
-
-        return `#${invR}${invG}${invB}`;
-    }
-
-    property string baseLogoColor: {
-        if (typeof SettingsData === "undefined") return ""
-        const colorOverride = SettingsData.launcherLogoColorOverride
-        if (!colorOverride || colorOverride === "") return ""
-        if (colorOverride === "primary") return primary
-        if (colorOverride === "surface") return surfaceText
-        return colorOverride
-    }
-
-    property string effectiveLogoColor: {
-        if (typeof SettingsData === "undefined") return ""
-
-        const colorOverride = SettingsData.launcherLogoColorOverride
-        if (!colorOverride || colorOverride === "") return ""
-
-        if (colorOverride === "primary") return primary
-        if (colorOverride === "surface") return surfaceText
-
-        if (!SettingsData.launcherLogoColorInvertOnMode) {
-            return colorOverride
-        }
-
-        if (isLightMode) {
-            return invertHex(colorOverride)
-        }
-
-        return colorOverride
-    }
-
-
-
-    Process {
-        id: systemThemeGenerator
-        running: false
-
-        onExited: exitCode => {
-            workerRunning = false
-
-            if (exitCode === 0) {
-                console.log("Theme: Matugen worker completed successfully")
-                if (currentTheme === dynamic) {
-                    console.log("Theme: Reloading dynamic colors file")
-                    dynamicColorsFileView.reload()
-                }
-            } else if (exitCode === 2) {
-                console.log("Theme: Matugen worker completed with code 2 (no changes needed)")
-            } else {
-                if (typeof ToastService !== "undefined") {
-                    ToastService.showError("Theme worker failed (" + exitCode + ")")
-                }
-                console.warn("Theme: Matugen worker failed with exit code:", exitCode)
-            }
-        }
-    }
-
-    FileView {
-        id: customThemeFileView
-        watchChanges: currentTheme === "custom"
-
-        function parseAndLoadTheme() {
-            try {
-                var themeData = JSON.parse(customThemeFileView.text())
-                loadCustomTheme(themeData)
-            } catch (e) {
-                ToastService.showError("Invalid JSON format: " + e.message)
-            }
-        }
-
-        onLoaded: {
-            parseAndLoadTheme()
-        }
-
-        onFileChanged: {
-            customThemeFileView.reload()
-        }
-
-        onLoadFailed: function (error) {
-            if (typeof ToastService !== "undefined") {
-                ToastService.showError("Failed to read theme file: " + error)
-            }
-        }
-    }
-
-    FileView {
-        id: dynamicColorsFileView
-        path: {
-            const greetCfgDir = Quickshell.env("DMS_GREET_CFG_DIR") || "/etc/greetd/.dms"
-            const colorsPath = SessionData.isGreeterMode
-                ? greetCfgDir + "/colors.json"
-                : stateDir + "/dms-colors.json"
-            return colorsPath
-        }
-        watchChanges: currentTheme === dynamic && !SessionData.isGreeterMode
-
-        function parseAndLoadColors() {
-            try {
-                const colorsText = dynamicColorsFileView.text()
-                if (colorsText) {
-                    root.matugenColors = JSON.parse(colorsText)
-                    if (typeof ToastService !== "undefined") {
-                        ToastService.clearWallpaperError()
-                    }
-                }
-            } catch (e) {
-                console.error("Theme: Failed to parse dynamic colors:", e)
-                if (typeof ToastService !== "undefined") {
-                    ToastService.wallpaperErrorStatus = "error"
-                    ToastService.showError("Dynamic colors parse error: " + e.message)
-                }
-            }
-        }
-
-        onLoaded: {
-            if (currentTheme === dynamic) {
-                console.log("Theme: Dynamic colors file loaded successfully")
-                colorsFileLoadFailed = false
-                parseAndLoadColors()
-            }
-        }
-
-        onFileChanged: {
-            if (currentTheme === dynamic) {
-                dynamicColorsFileView.reload()
-            }
-        }
-
-        onLoadFailed: function (error) {
-            if (currentTheme === dynamic) {
-                console.log("Theme: Dynamic colors file load failed, marking for regeneration")
-                colorsFileLoadFailed = true
-                const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
-                if (!isGreeterMode && matugenAvailable && wallpaperPath) {
-                    console.log("Theme: Matugen available, triggering immediate regeneration")
-                    generateSystemThemesFromCurrentTheme()
-                }
-            }
-        }
-
-        onPathChanged: {
-            colorsFileLoadFailed = false
-        }
-    }
-
-    IpcHandler {
-        target: "theme"
-
-        function toggle(): string {
-            root.toggleLightMode()
-            return root.isLightMode ? "dark" : "light"
-        }
-
-        function light(): string {
-            root.setLightMode(true, true, true)
-            return "light"
-        }
-
-        function dark(): string {
-            root.setLightMode(false, true, true)
-            return "dark"
-        }
-
-        function getMode(): string {
-            return root.isLightMode ? "light" : "dark"
-        }
-    }
-
-    // These timers are for screen transitions, since sometimes QML still beats the niri call
-    Timer {
-        id: themeTransitionTimer
-        interval: 50
-        repeat: false
-        property string themeName: ""
-        property bool savePrefs: true
-        onTriggered: root.switchTheme(themeName, savePrefs, false)
-    }
-
-    Timer {
-        id: lightModeTransitionTimer
-        interval: 100
-        repeat: false
-        property bool lightMode: false
-        property bool savePrefs: true
-        onTriggered: root.setLightMode(lightMode, savePrefs, false)
-    }
-
-    Timer {
-        id: themeCategoryTransitionTimer
-        interval: 50
-        repeat: false
-        property string category: ""
-        property string defaultTheme: ""
-        onTriggered: {
-            root.currentThemeCategory = category
-            root.switchTheme(defaultTheme, true, false)
-        }
-    }
-}

DMSGreeter.qml

@@ -1,29 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Services.Greetd
-import qs.Common
-import qs.Modules.Greetd
-
-Item {
-    id: root
-
-    WlSessionLock {
-        id: sessionLock
-        locked: false
-
-        Component.onCompleted: {
-            Qt.callLater(() => { locked = true })
-        }
-
-        onLockedChanged: {
-            if (!locked) {
-                console.log("Greetd session unlocked, exiting")
-            }
-        }
-
-        GreeterSurface {
-            lock: sessionLock
-        }
-    }
-}

DMSShellIPC.qml

@@ -1,352 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    required property var powerMenuModalLoader
-    required property var processListModalLoader
-    required property var controlCenterLoader
-    required property var dankDashPopoutLoader
-    required property var notepadSlideoutVariants
-    required property var hyprKeybindsModalLoader
-    required property var dankBarLoader
-
-    IpcHandler {
-        function open() {
-            root.powerMenuModalLoader.active = true
-            if (root.powerMenuModalLoader.item)
-                root.powerMenuModalLoader.item.openCentered()
-
-            return "POWERMENU_OPEN_SUCCESS"
-        }
-
-        function close() {
-            if (root.powerMenuModalLoader.item)
-                root.powerMenuModalLoader.item.close()
-
-            return "POWERMENU_CLOSE_SUCCESS"
-        }
-
-        function toggle() {
-            root.powerMenuModalLoader.active = true
-            if (root.powerMenuModalLoader.item) {
-                if (root.powerMenuModalLoader.item.shouldBeVisible) {
-                    root.powerMenuModalLoader.item.close()
-                } else {
-                    root.powerMenuModalLoader.item.openCentered()
-                }
-            }
-
-            return "POWERMENU_TOGGLE_SUCCESS"
-        }
-
-        target: "powermenu"
-    }
-
-    IpcHandler {
-        function open(): string {
-            root.processListModalLoader.active = true
-            if (root.processListModalLoader.item)
-                root.processListModalLoader.item.show()
-
-            return "PROCESSLIST_OPEN_SUCCESS"
-        }
-
-        function close(): string {
-            if (root.processListModalLoader.item)
-                root.processListModalLoader.item.hide()
-
-            return "PROCESSLIST_CLOSE_SUCCESS"
-        }
-
-        function toggle(): string {
-            root.processListModalLoader.active = true
-            if (root.processListModalLoader.item)
-                root.processListModalLoader.item.toggle()
-
-            return "PROCESSLIST_TOGGLE_SUCCESS"
-        }
-
-        target: "processlist"
-    }
-
-    IpcHandler {
-        function open(): string {
-            if (root.dankBarLoader.item) {
-                root.dankBarLoader.item.triggerControlCenterOnFocusedScreen()
-                return "CONTROL_CENTER_OPEN_SUCCESS"
-            }
-            return "CONTROL_CENTER_OPEN_FAILED"
-        }
-
-        function close(): string {
-            if (root.controlCenterLoader.item) {
-                root.controlCenterLoader.item.close()
-                return "CONTROL_CENTER_CLOSE_SUCCESS"
-            }
-            return "CONTROL_CENTER_CLOSE_FAILED"
-        }
-
-        function toggle(): string {
-            if (root.dankBarLoader.item) {
-                root.dankBarLoader.item.triggerControlCenterOnFocusedScreen()
-                return "CONTROL_CENTER_TOGGLE_SUCCESS"
-            }
-            return "CONTROL_CENTER_TOGGLE_FAILED"
-        }
-
-        target: "control-center"
-    }
-
-    IpcHandler {
-        function open(tab: string): string {
-            root.dankDashPopoutLoader.active = true
-            if (root.dankDashPopoutLoader.item) {
-                switch (tab.toLowerCase()) {
-                case "media":
-                    root.dankDashPopoutLoader.item.currentTabIndex = 1
-                    break
-                case "weather":
-                    root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 2 : 0
-                    break
-                default:
-                    root.dankDashPopoutLoader.item.currentTabIndex = 0
-                    break
-                }
-                root.dankDashPopoutLoader.item.setTriggerPosition(Screen.width / 2, Theme.barHeight + Theme.spacingS, 100, "center", Screen)
-                root.dankDashPopoutLoader.item.dashVisible = true
-                return "DASH_OPEN_SUCCESS"
-            }
-            return "DASH_OPEN_FAILED"
-        }
-
-        function close(): string {
-            if (root.dankDashPopoutLoader.item) {
-                root.dankDashPopoutLoader.item.dashVisible = false
-                return "DASH_CLOSE_SUCCESS"
-            }
-            return "DASH_CLOSE_FAILED"
-        }
-
-        function toggle(tab: string): string {
-            root.dankDashPopoutLoader.active = true
-            if (root.dankDashPopoutLoader.item) {
-                if (root.dankDashPopoutLoader.item.dashVisible) {
-                    root.dankDashPopoutLoader.item.dashVisible = false
-                } else {
-                    switch (tab.toLowerCase()) {
-                    case "media":
-                        root.dankDashPopoutLoader.item.currentTabIndex = 1
-                        break
-                    case "weather":
-                        root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 2 : 0
-                        break
-                    default:
-                        root.dankDashPopoutLoader.item.currentTabIndex = 0
-                        break
-                    }
-                    root.dankDashPopoutLoader.item.setTriggerPosition(Screen.width / 2, Theme.barHeight + Theme.spacingS, 100, "center", Screen)
-                    root.dankDashPopoutLoader.item.dashVisible = true
-                }
-                return "DASH_TOGGLE_SUCCESS"
-            }
-            return "DASH_TOGGLE_FAILED"
-        }
-
-        target: "dash"
-    }
-
-    IpcHandler {
-        function getFocusedScreenName() {
-            if (CompositorService.isHyprland && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor) {
-                return Hyprland.focusedWorkspace.monitor.name
-            }
-            if (CompositorService.isNiri && NiriService.currentOutput) {
-                return NiriService.currentOutput
-            }
-            return ""
-        }
-
-        function getActiveNotepadInstance() {
-            if (root.notepadSlideoutVariants.instances.length === 0) {
-                return null
-            }
-
-            if (root.notepadSlideoutVariants.instances.length === 1) {
-                return root.notepadSlideoutVariants.instances[0]
-            }
-
-            var focusedScreen = getFocusedScreenName()
-            if (focusedScreen && root.notepadSlideoutVariants.instances.length > 0) {
-                for (var i = 0; i < root.notepadSlideoutVariants.instances.length; i++) {
-                    var slideout = root.notepadSlideoutVariants.instances[i]
-                    if (slideout.modelData && slideout.modelData.name === focusedScreen) {
-                        return slideout
-                    }
-                }
-            }
-
-            for (var i = 0; i < root.notepadSlideoutVariants.instances.length; i++) {
-                var slideout = root.notepadSlideoutVariants.instances[i]
-                if (slideout.isVisible) {
-                    return slideout
-                }
-            }
-
-            return root.notepadSlideoutVariants.instances[0]
-        }
-
-        function open(): string {
-            var instance = getActiveNotepadInstance()
-            if (instance) {
-                instance.show()
-                return "NOTEPAD_OPEN_SUCCESS"
-            }
-            return "NOTEPAD_OPEN_FAILED"
-        }
-
-        function close(): string {
-            var instance = getActiveNotepadInstance()
-            if (instance) {
-                instance.hide()
-                return "NOTEPAD_CLOSE_SUCCESS"
-            }
-            return "NOTEPAD_CLOSE_FAILED"
-        }
-
-        function toggle(): string {
-            var instance = getActiveNotepadInstance()
-            if (instance) {
-                instance.toggle()
-                return "NOTEPAD_TOGGLE_SUCCESS"
-            }
-            return "NOTEPAD_TOGGLE_FAILED"
-        }
-
-        target: "notepad"
-    }
-
-    IpcHandler {
-        function toggle(): string {
-            SessionService.toggleIdleInhibit()
-            return SessionService.idleInhibited ? "Idle inhibit enabled" : "Idle inhibit disabled"
-        }
-
-        function enable(): string {
-            SessionService.enableIdleInhibit()
-            return "Idle inhibit enabled"
-        }
-
-        function disable(): string {
-            SessionService.disableIdleInhibit()
-            return "Idle inhibit disabled"
-        }
-
-        function status(): string {
-            return SessionService.idleInhibited ? "Idle inhibit is enabled" : "Idle inhibit is disabled"
-        }
-
-        function reason(newReason: string): string {
-            if (!newReason) {
-                return `Current reason: ${SessionService.inhibitReason}`
-            }
-
-            SessionService.setInhibitReason(newReason)
-            return `Inhibit reason set to: ${newReason}`
-        }
-
-        target: "inhibit"
-    }
-
-    IpcHandler {
-        function list(): string {
-            return MprisController.availablePlayers.map(p => p.identity).join("\n")
-        }
-
-        function play(): void {
-            if (MprisController.activePlayer && MprisController.activePlayer.canPlay) {
-                MprisController.activePlayer.play()
-            }
-        }
-
-        function pause(): void {
-            if (MprisController.activePlayer && MprisController.activePlayer.canPause) {
-                MprisController.activePlayer.pause()
-            }
-        }
-
-        function playPause(): void {
-            if (MprisController.activePlayer && MprisController.activePlayer.canTogglePlaying) {
-                MprisController.activePlayer.togglePlaying()
-            }
-        }
-
-        function previous(): void {
-            if (MprisController.activePlayer && MprisController.activePlayer.canGoPrevious) {
-                MprisController.activePlayer.previous()
-            }
-        }
-
-        function next(): void {
-            if (MprisController.activePlayer && MprisController.activePlayer.canGoNext) {
-                MprisController.activePlayer.next()
-            }
-        }
-
-        function stop(): void {
-            if (MprisController.activePlayer) {
-                MprisController.activePlayer.stop()
-            }
-        }
-
-        target: "mpris"
-    }
-
-    IpcHandler {
-        function openBinds(): string {
-            if (!CompositorService.isHyprland) {
-                return "HYPR_NOT_AVAILABLE"
-            }
-            root.hyprKeybindsModalLoader.active = true
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.open()
-                return "HYPR_KEYBINDS_OPEN_SUCCESS"
-            }
-            return "HYPR_KEYBINDS_OPEN_FAILED"
-        }
-
-        function closeBinds(): string {
-            if (!CompositorService.isHyprland) {
-                return "HYPR_NOT_AVAILABLE"
-            }
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.close()
-                return "HYPR_KEYBINDS_CLOSE_SUCCESS"
-            }
-            return "HYPR_KEYBINDS_CLOSE_FAILED"
-        }
-
-        function toggleBinds(): string {
-            if (!CompositorService.isHyprland) {
-                return "HYPR_NOT_AVAILABLE"
-            }
-            root.hyprKeybindsModalLoader.active = true
-            if (root.hyprKeybindsModalLoader.item) {
-                if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
-                    root.hyprKeybindsModalLoader.item.close()
-                } else {
-                    root.hyprKeybindsModalLoader.item.open()
-                }
-                return "HYPR_KEYBINDS_TOGGLE_SUCCESS"
-            }
-            return "HYPR_KEYBINDS_TOGGLE_FAILED"
-        }
-
-        target: "hypr"
-    }
-}

LICENSE

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+MIT License
+
+Copyright (c) 2025 Avenge Media LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Modals/Common/DankModal.qml

@@ -1,281 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Hyprland
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-
-PanelWindow {
-    id: root
-
-    WlrLayershell.namespace: "quickshell:modal"
-
-    property alias content: contentLoader.sourceComponent
-    property alias contentLoader: contentLoader
-    property Item directContent: null
-    property real width: 400
-    property real height: 300
-    readonly property real screenWidth: screen ? screen.width : 1920
-    readonly property real screenHeight: screen ? screen.height : 1080
-    readonly property real dpr: {
-        if (CompositorService.isNiri && screen) {
-            const niriScale = NiriService.displayScales[screen.name]
-            if (niriScale !== undefined) return niriScale
-        }
-        if (CompositorService.isHyprland && screen) {
-            const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === screen.name)
-            if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
-        }
-        return (screen?.devicePixelRatio) || 1
-    }
-    property bool showBackground: true
-    property real backgroundOpacity: 0.5
-    property string positioning: "center"
-    property point customPosition: Qt.point(0, 0)
-    property bool closeOnEscapeKey: true
-    property bool closeOnBackgroundClick: true
-    property string animationType: "scale"
-    property int animationDuration: Theme.shortDuration
-    property var animationEasing: Theme.emphasizedEasing
-    property color backgroundColor: Theme.surfaceContainer
-    property color borderColor: Theme.outlineMedium
-    property real borderWidth: 1
-    property real cornerRadius: Theme.cornerRadius
-    property bool enableShadow: false
-    property alias modalFocusScope: focusScope
-    property bool shouldBeVisible: false
-    property bool shouldHaveFocus: shouldBeVisible
-    property bool allowFocusOverride: false
-    property bool allowStacking: false
-    property bool keepContentLoaded: false
-
-    signal opened
-    signal dialogClosed
-    signal backgroundClicked
-
-    function open() {
-        ModalManager.openModal(root)
-        closeTimer.stop()
-        shouldBeVisible = true
-        visible = true
-        focusScope.forceActiveFocus()
-    }
-
-    function close() {
-        shouldBeVisible = false
-        closeTimer.restart()
-    }
-
-    function toggle() {
-        if (shouldBeVisible) {
-            close()
-        } else {
-            open()
-        }
-    }
-
-    visible: shouldBeVisible
-    color: "transparent"
-    WlrLayershell.layer: WlrLayershell.Top // if set to overlay -> virtual keyboards can be stuck under modal
-    WlrLayershell.exclusiveZone: -1
-    WlrLayershell.keyboardFocus: shouldHaveFocus ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
-    onVisibleChanged: {
-        if (root.visible) {
-            opened()
-        } else {
-            if (Qt.inputMethod) {
-                Qt.inputMethod.hide()
-                Qt.inputMethod.reset()
-            }
-            dialogClosed()
-        }
-    }
-
-    Connections {
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== root && !allowStacking && shouldBeVisible) {
-                close()
-            }
-        }
-
-        target: ModalManager
-    }
-
-    Timer {
-        id: closeTimer
-
-        interval: animationDuration + 100
-        onTriggered: {
-            visible = false
-        }
-    }
-
-    anchors {
-        top: true
-        left: true
-        right: true
-        bottom: true
-    }
-
-    Rectangle {
-        id: background
-
-        anchors.fill: parent
-        color: "black"
-        opacity: root.showBackground ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-        visible: root.showBackground
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: root.closeOnBackgroundClick
-            onClicked: mouse => {
-                           const localPos = mapToItem(contentContainer, mouse.x, mouse.y)
-                           if (localPos.x < 0 || localPos.x > contentContainer.width || localPos.y < 0 || localPos.y > contentContainer.height) {
-                               root.backgroundClicked()
-                           }
-                       }
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: root.animationDuration
-                easing.type: root.animationEasing
-            }
-        }
-    }
-
-    Rectangle {
-        id: contentContainer
-
-        width: Theme.px(root.width, dpr)
-        height: Theme.px(root.height, dpr)
-        anchors.centerIn: undefined
-        x: {
-            if (positioning === "center") {
-                return Theme.snap((root.screenWidth - width) / 2, dpr)
-            } else if (positioning === "top-right") {
-                return Theme.px(Math.max(Theme.spacingL, root.screenWidth - width - Theme.spacingL), dpr)
-            } else if (positioning === "custom") {
-                return Theme.snap(root.customPosition.x, dpr)
-            }
-            return 0
-        }
-        y: {
-            if (positioning === "center") {
-                return Theme.snap((root.screenHeight - height) / 2, dpr)
-            } else if (positioning === "top-right") {
-                return Theme.px(Theme.barHeight + Theme.spacingXS, dpr)
-            } else if (positioning === "custom") {
-                return Theme.snap(root.customPosition.y, dpr)
-            }
-            return 0
-        }
-        color: root.backgroundColor
-        radius: root.cornerRadius
-        border.color: root.borderColor
-        border.width: root.borderWidth
-        clip: false
-        layer.enabled: true
-        opacity: root.shouldBeVisible ? 1 : 0
-        transform: root.animationType === "slide" ? slideTransform : null
-
-        Translate {
-            id: slideTransform
-
-            readonly property real rawX: root.shouldBeVisible ? 0 : 15
-            readonly property real rawY: root.shouldBeVisible ? 0 : -30
-
-            x: Theme.snap(rawX, root.dpr)
-            y: Theme.snap(rawY, root.dpr)
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: animationDuration
-                easing.type: animationEasing
-            }
-        }
-
-        FocusScope {
-            anchors.fill: parent
-            focus: root.shouldBeVisible
-            clip: false
-
-            Item {
-                id: directContentWrapper
-
-                anchors.fill: parent
-                visible: root.directContent !== null
-                focus: true
-                clip: false
-
-                Component.onCompleted: {
-                    if (root.directContent) {
-                        root.directContent.parent = directContentWrapper
-                        root.directContent.anchors.fill = directContentWrapper
-                        Qt.callLater(() => root.directContent.forceActiveFocus())
-                    }
-                }
-
-                Connections {
-                    function onDirectContentChanged() {
-                        if (root.directContent) {
-                            root.directContent.parent = directContentWrapper
-                            root.directContent.anchors.fill = directContentWrapper
-                            Qt.callLater(() => root.directContent.forceActiveFocus())
-                        }
-                    }
-
-                    target: root
-                }
-            }
-
-            Loader {
-                id: contentLoader
-
-                anchors.fill: parent
-                active: root.directContent === null && (root.keepContentLoaded || root.shouldBeVisible || root.visible)
-                asynchronous: false
-                focus: true
-                clip: false
-                visible: root.directContent === null
-
-                onLoaded: {
-                    if (item) {
-                        Qt.callLater(() => item.forceActiveFocus())
-                    }
-                }
-            }
-        }
-    }
-
-    FocusScope {
-        id: focusScope
-
-        objectName: "modalFocusScope"
-        anchors.fill: parent
-        visible: root.shouldBeVisible || root.visible
-        focus: root.shouldBeVisible
-        Keys.onEscapePressed: event => {
-                                  if (root.closeOnEscapeKey && shouldHaveFocus) {
-                                      root.close()
-                                      event.accepted = true
-                                  }
-                              }
-        onVisibleChanged: {
-            if (visible && shouldHaveFocus) {
-                Qt.callLater(() => focusScope.forceActiveFocus())
-            }
-        }
-
-        Connections {
-            function onShouldHaveFocusChanged() {
-                if (shouldHaveFocus && shouldBeVisible) {
-                    Qt.callLater(() => focusScope.forceActiveFocus())
-                }
-            }
-
-            target: root
-        }
-    }
-}

Modals/DankColorPickerModal.qml

@@ -1,542 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    property string pickerTitle: "Choose Color"
-    property color selectedColor: SessionData.recentColors.length > 0 ? SessionData.recentColors[0] : Theme.primary
-    property var onColorSelectedCallback: null
-
-    signal colorSelected(color selectedColor)
-
-    property color currentColor: Theme.primary
-    property real hue: 0
-    property real saturation: 1
-    property real value: 1
-    property real alpha: 1
-    property real gradientX: 0
-    property real gradientY: 0
-
-    readonly property var standardColors: [
-        "#f44336", "#e91e63", "#9c27b0", "#673ab7", "#3f51b5", "#2196f3", "#03a9f4", "#00bcd4",
-        "#009688", "#4caf50", "#8bc34a", "#cddc39", "#ffeb3b", "#ffc107", "#ff9800", "#ff5722",
-        "#d32f2f", "#c2185b", "#7b1fa2", "#512da8", "#303f9f", "#1976d2", "#0288d1", "#0097a7",
-        "#00796b", "#388e3c", "#689f38", "#afb42b", "#fbc02d", "#ffa000", "#f57c00", "#e64a19",
-        "#c62828", "#ad1457", "#6a1b9a", "#4527a0", "#283593", "#1565c0", "#0277bd", "#00838f",
-        "#00695c", "#2e7d32", "#558b2f", "#9e9d24", "#f9a825", "#ff8f00", "#ef6c00", "#d84315",
-        "#ffffff", "#9e9e9e", "#212121"
-    ]
-
-    function show() {
-        currentColor = selectedColor
-        updateFromColor(currentColor)
-        open()
-    }
-
-    function hide() {
-        onColorSelectedCallback = null
-        close()
-    }
-
-    onColorSelected: (color) => {
-        if (onColorSelectedCallback) {
-            onColorSelectedCallback(color)
-        }
-    }
-
-    function copyColorToClipboard(colorValue) {
-        Quickshell.execDetached(["sh", "-c", `echo "${colorValue}" | wl-copy`])
-        ToastService.showInfo(`Color ${colorValue} copied`)
-        SessionData.addRecentColor(currentColor)
-    }
-
-    function updateFromColor(color) {
-        hue = color.hsvHue
-        saturation = color.hsvSaturation
-        value = color.hsvValue
-        alpha = color.a
-        gradientX = saturation
-        gradientY = 1 - value
-    }
-
-    function updateColor() {
-        currentColor = Qt.hsva(hue, saturation, value, alpha)
-    }
-
-    function updateColorFromGradient(x, y) {
-        saturation = Math.max(0, Math.min(1, x))
-        value = Math.max(0, Math.min(1, 1 - y))
-        updateColor()
-        selectedColor = currentColor
-    }
-
-    function pickColorFromScreen() {
-        hide()
-        Proc.runCommand("hyprpicker", ["hyprpicker", "--format=hex"], (output, errorCode) => {
-            if (errorCode !== 0) {
-                console.warn("hyprpicker exited with code:", errorCode)
-                root.show()
-                return
-            }
-            const colorStr = output.trim()
-            if (colorStr.length >= 7 && colorStr.startsWith('#')) {
-                const pickedColor = Qt.color(colorStr)
-                root.selectedColor = pickedColor
-                root.currentColor = pickedColor
-                root.updateFromColor(pickedColor)
-                copyColorToClipboard(colorStr)
-                root.show()
-            }
-        })
-    }
-
-    width: 680
-    height: 680
-    backgroundColor: Theme.surfaceContainer
-    cornerRadius: Theme.cornerRadius
-    borderColor: Theme.outlineMedium
-    borderWidth: 1
-    keepContentLoaded: true
-
-    onBackgroundClicked: hide()
-
-    content: Component {
-        FocusScope {
-            id: colorContent
-
-            property alias hexInput: hexInput
-
-            anchors.fill: parent
-            focus: true
-
-            Keys.onEscapePressed: event => {
-                root.hide()
-                event.accepted = true
-            }
-
-            Column {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingM
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Column {
-                        width: parent.width - 90
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: root.pickerTitle
-                            font.pixelSize: Theme.fontSizeLarge
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Select a color from the palette or use custom sliders")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceTextMedium
-                        }
-                    }
-
-                    DankActionButton {
-                        iconName: "colorize"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: () => {
-                            root.pickColorFromScreen()
-                        }
-                    }
-
-                    DankActionButton {
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: () => {
-                            root.hide()
-                        }
-                    }
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingM
-
-                    Rectangle {
-                        id: gradientPicker
-                        width: parent.width - 70
-                        height: 280
-                        radius: Theme.cornerRadius
-                        border.color: Theme.outlineStrong
-                        border.width: 1
-                        clip: true
-
-                        Rectangle {
-                            anchors.fill: parent
-                            color: Qt.hsva(root.hue, 1, 1, 1)
-
-                            Rectangle {
-                                anchors.fill: parent
-                                gradient: Gradient {
-                                    orientation: Gradient.Horizontal
-                                    GradientStop { position: 0.0; color: "#ffffff" }
-                                    GradientStop { position: 1.0; color: "transparent" }
-                                }
-                            }
-
-                            Rectangle {
-                                anchors.fill: parent
-                                gradient: Gradient {
-                                    orientation: Gradient.Vertical
-                                    GradientStop { position: 0.0; color: "transparent" }
-                                    GradientStop { position: 1.0; color: "#000000" }
-                                }
-                            }
-                        }
-
-                        Rectangle {
-                            id: pickerCircle
-                            width: 16
-                            height: 16
-                            radius: 8
-                            border.color: "white"
-                            border.width: 2
-                            color: "transparent"
-                            x: root.gradientX * parent.width - width / 2
-                            y: root.gradientY * parent.height - height / 2
-
-                            Rectangle {
-                                anchors.centerIn: parent
-                                width: parent.width - 4
-                                height: parent.height - 4
-                                radius: width / 2
-                                border.color: "black"
-                                border.width: 1
-                                color: "transparent"
-                            }
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            cursorShape: Qt.CrossCursor
-                            onPressed: mouse => {
-                                const x = Math.max(0, Math.min(1, mouse.x / width))
-                                const y = Math.max(0, Math.min(1, mouse.y / height))
-                                root.gradientX = x
-                                root.gradientY = y
-                                root.updateColorFromGradient(x, y)
-                            }
-                            onPositionChanged: mouse => {
-                                if (pressed) {
-                                    const x = Math.max(0, Math.min(1, mouse.x / width))
-                                    const y = Math.max(0, Math.min(1, mouse.y / height))
-                                    root.gradientX = x
-                                    root.gradientY = y
-                                    root.updateColorFromGradient(x, y)
-                                }
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        id: hueSlider
-                        width: 50
-                        height: 280
-                        radius: Theme.cornerRadius
-                        border.color: Theme.outlineStrong
-                        border.width: 1
-
-                        gradient: Gradient {
-                            orientation: Gradient.Vertical
-                            GradientStop { position: 0.00; color: "#ff0000" }
-                            GradientStop { position: 0.17; color: "#ffff00" }
-                            GradientStop { position: 0.33; color: "#00ff00" }
-                            GradientStop { position: 0.50; color: "#00ffff" }
-                            GradientStop { position: 0.67; color: "#0000ff" }
-                            GradientStop { position: 0.83; color: "#ff00ff" }
-                            GradientStop { position: 1.00; color: "#ff0000" }
-                        }
-
-                        Rectangle {
-                            id: hueIndicator
-                            width: parent.width
-                            height: 4
-                            color: "white"
-                            border.color: "black"
-                            border.width: 1
-                            y: root.hue * parent.height - height / 2
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            cursorShape: Qt.SizeVerCursor
-                            onPressed: mouse => {
-                                const h = Math.max(0, Math.min(1, mouse.y / height))
-                                root.hue = h
-                                root.updateColor()
-                                root.selectedColor = root.currentColor
-                            }
-                            onPositionChanged: mouse => {
-                                if (pressed) {
-                                    const h = Math.max(0, Math.min(1, mouse.y / height))
-                                    root.hue = h
-                                    root.updateColor()
-                                    root.selectedColor = root.currentColor
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    StyledText {
-                        text: I18n.tr("Material Colors")
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                    }
-
-                    GridView {
-                        width: parent.width
-                        height: 140
-                        cellWidth: 38
-                        cellHeight: 38
-                        clip: true
-                        interactive: false
-                        model: root.standardColors
-
-                        delegate: Rectangle {
-                            width: 36
-                            height: 36
-                            color: modelData
-                            radius: 4
-                            border.color: Theme.outlineStrong
-                            border.width: 1
-
-                            MouseArea {
-                                anchors.fill: parent
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: () => {
-                                    const pickedColor = Qt.color(modelData)
-                                    root.selectedColor = pickedColor
-                                    root.currentColor = pickedColor
-                                    root.updateFromColor(pickedColor)
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingS
-
-                        Column {
-                            width: 210
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Recent Colors")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                            }
-
-                            Row {
-                                width: parent.width
-                                spacing: Theme.spacingXS
-
-                                Repeater {
-                                    model: 5
-
-                                    Rectangle {
-                                        width: 36
-                                        height: 36
-                                        radius: 4
-                                        border.color: Theme.outlineStrong
-                                        border.width: 1
-
-                                        color: {
-                                            if (index < SessionData.recentColors.length) {
-                                                return SessionData.recentColors[index]
-                                            }
-                                            return Theme.surfaceContainerHigh
-                                        }
-
-                                        opacity: index < SessionData.recentColors.length ? 1.0 : 0.3
-
-                                        MouseArea {
-                                            anchors.fill: parent
-                                            cursorShape: index < SessionData.recentColors.length ? Qt.PointingHandCursor : Qt.ArrowCursor
-                                            enabled: index < SessionData.recentColors.length
-                                            onClicked: () => {
-                                                if (index < SessionData.recentColors.length) {
-                                                    const pickedColor = SessionData.recentColors[index]
-                                                    root.selectedColor = pickedColor
-                                                    root.currentColor = pickedColor
-                                                    root.updateFromColor(pickedColor)
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        Column {
-                            width: parent.width - 330
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Opacity")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                            }
-
-                            DankSlider {
-                                width: parent.width
-                                value: Math.round(root.alpha * 100)
-                                minimum: 0
-                                maximum: 100
-                                showValue: false
-                                onSliderValueChanged: (newValue) => {
-                                    root.alpha = newValue / 100
-                                    root.updateColor()
-                                    root.selectedColor = root.currentColor
-                                }
-                            }
-                        }
-
-                        Rectangle {
-                            width: 100
-                            height: 50
-                            radius: Theme.cornerRadius
-                            color: root.currentColor
-                            border.color: Theme.outlineStrong
-                            border.width: 2
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    StyledText {
-                        text: I18n.tr("Hex:")
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceTextMedium
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    DankTextField {
-                        id: hexInput
-                        width: 120
-                        height: 38
-                        text: root.currentColor.toString()
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: {
-                            if (text.length === 0) return Theme.surfaceText
-                            const hexPattern = /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/
-                            return hexPattern.test(text) ? Theme.surfaceText : Theme.error
-                        }
-                        placeholderText: "#000000"
-                        backgroundColor: Theme.surfaceHover
-                        borderWidth: 1
-                        focusedBorderWidth: 2
-                        topPadding: Theme.spacingS
-                        bottomPadding: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        onAccepted: () => {
-                            const hexPattern = /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/
-                            if (!hexPattern.test(text)) return
-                            const color = Qt.color(text)
-                            if (color) {
-                                root.selectedColor = color
-                                root.currentColor = color
-                                root.updateFromColor(color)
-                            }
-                        }
-                    }
-
-                    DankButton {
-                        width: 80
-                        buttonHeight: 36
-                        text: I18n.tr("Apply")
-                        backgroundColor: Theme.primary
-                        textColor: Theme.background
-                        anchors.verticalCenter: parent.verticalCenter
-                        onClicked: {
-                            const hexPattern = /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/
-                            if (!hexPattern.test(hexInput.text)) return
-                            const color = Qt.color(hexInput.text)
-                            if (color) {
-                                root.currentColor = color
-                                root.updateFromColor(color)
-                                root.selectedColor = root.currentColor
-                                root.colorSelected(root.currentColor)
-                                SessionData.addRecentColor(root.currentColor)
-                                root.hide()
-                            }
-                        }
-                    }
-
-                    Item {
-                        width: parent.width - 460
-                        height: 1
-                    }
-
-                    DankButton {
-                        width: 70
-                        buttonHeight: 36
-                        text: I18n.tr("Cancel")
-                        backgroundColor: "transparent"
-                        textColor: Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                        onClicked: root.hide()
-
-                        Rectangle {
-                            anchors.fill: parent
-                            radius: Theme.cornerRadius
-                            color: "transparent"
-                            border.color: Theme.surfaceVariantAlpha
-                            border.width: 1
-                            z: -1
-                        }
-                    }
-
-                    DankButton {
-                        width: 70
-                        buttonHeight: 36
-                        text: I18n.tr("Copy")
-                        backgroundColor: Theme.primary
-                        textColor: Theme.background
-                        anchors.verticalCenter: parent.verticalCenter
-                        onClicked: {
-                            const colorString = root.currentColor.toString()
-                            root.copyColorToClipboard(colorString)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Modals/HyprKeybindsModal.qml

@@ -1,266 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    width: 1400
-    height: 900
-    onBackgroundClicked: close()
-
-    function categorizeKeybinds() {
-        const categories = {
-            "Workspace": [],
-            "Window": [],
-            "Monitor": [],
-            "Execute": [],
-            "System": [],
-            "Other": []
-        }
-
-        function addKeybind(keybind) {
-            const dispatcher = keybind.dispatcher || ""
-            if (dispatcher.includes("workspace")) {
-                categories["Workspace"].push(keybind)
-            } else if (dispatcher.includes("monitor")) {
-                categories["Monitor"].push(keybind)
-            } else if (dispatcher.includes("window") || dispatcher.includes("focus") || dispatcher.includes("move") || dispatcher.includes("swap") || dispatcher.includes("resize") || dispatcher === "killactive" || dispatcher === "fullscreen" || dispatcher === "togglefloating") {
-                categories["Window"].push(keybind)
-            } else if (dispatcher === "exec") {
-                categories["Execute"].push(keybind)
-            } else if (dispatcher === "exit" || dispatcher.includes("dpms")) {
-                categories["System"].push(keybind)
-            } else {
-                categories["Other"].push(keybind)
-            }
-        }
-
-        const allKeybinds = HyprKeybindsService.keybinds.keybinds || []
-        for (let i = 0; i < allKeybinds.length; i++) {
-            addKeybind(allKeybinds[i])
-        }
-
-        const children = HyprKeybindsService.keybinds.children || []
-        for (let i = 0; i < children.length; i++) {
-            const child = children[i]
-            const childKeybinds = child.keybinds || []
-            for (let j = 0; j < childKeybinds.length; j++) {
-                addKeybind(childKeybinds[j])
-            }
-        }
-
-        categories["Workspace"].sort((a, b) => {
-            const dispA = a.dispatcher || ""
-            const dispB = b.dispatcher || ""
-            return dispA.localeCompare(dispB)
-        })
-
-        categories["Window"].sort((a, b) => {
-            const dispA = a.dispatcher || ""
-            const dispB = b.dispatcher || ""
-            return dispA.localeCompare(dispB)
-        })
-
-        categories["Monitor"].sort((a, b) => {
-            const dispA = a.dispatcher || ""
-            const dispB = b.dispatcher || ""
-            return dispA.localeCompare(dispB)
-        })
-
-        categories["Execute"].sort((a, b) => {
-            const modsA = a.mods || []
-            const keyA = a.key || ""
-            const bindA = [...modsA, keyA].join("+")
-
-            const modsB = b.mods || []
-            const keyB = b.key || ""
-            const bindB = [...modsB, keyB].join("+")
-
-            return bindA.localeCompare(bindB)
-        })
-
-        return categories
-    }
-
-    content: Component {
-        Item {
-            anchors.fill: parent
-
-            DankFlickable {
-                id: mainFlickable
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                contentWidth: rowLayout.implicitWidth
-                contentHeight: rowLayout.implicitHeight
-                clip: true
-
-                Row {
-                    id: rowLayout
-                    spacing: Theme.spacingM
-
-                    property var categories: root.categorizeKeybinds()
-                    property real columnWidth: (mainFlickable.width - spacing * 2) / 3
-
-                    Column {
-                        width: rowLayout.columnWidth
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: "Window / Monitor"
-                            font.pixelSize: Theme.fontSizeMedium
-                            font.weight: Font.Bold
-                            color: Theme.primary
-                        }
-
-                        Rectangle {
-                            width: parent.width
-                            height: 1
-                            color: Theme.primary
-                            opacity: 0.3
-                        }
-
-                        Item { width: 1; height: Theme.spacingXS }
-
-                        Column {
-                            width: parent.width
-                            spacing: Theme.spacingXS
-
-                            Repeater {
-                                model: [...(rowLayout.categories["Window"] || []), ...(rowLayout.categories["Monitor"] || [])]
-
-                                Row {
-                                    width: parent.width
-                                    spacing: Theme.spacingS
-
-                                    StyledRect {
-                                        width: Math.min(140, parent.width * 0.42)
-                                        height: 22
-                                        radius: 4
-                                        opacity: 0.3
-
-                                        StyledText {
-                                            anchors.centerIn: parent
-                                            anchors.margins: 2
-                                            width: parent.width - 4
-                                            text: {
-                                                const mods = modelData.mods || []
-                                                const key = modelData.key || ""
-                                                const parts = [...mods, key]
-                                                return parts.join("+")
-                                            }
-                                            font.pixelSize: Theme.fontSizeSmall
-                                            font.weight: Font.Medium
-                                            isMonospace: true
-                                            elide: Text.ElideRight
-                                            horizontalAlignment: Text.AlignHCenter
-                                        }
-                                    }
-
-                                    StyledText {
-                                        width: parent.width - 150
-                                        text: {
-                                            const comment = modelData.comment || ""
-                                            if (comment) return comment
-
-                                            const dispatcher = modelData.dispatcher || ""
-                                            const params = modelData.params || ""
-                                            return params ? `${dispatcher} ${params}` : dispatcher
-                                        }
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        opacity: 0.9
-                                        elide: Text.ElideRight
-                                        anchors.verticalCenter: parent.verticalCenter
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    Repeater {
-                        model: ["Workspace", "Execute"]
-
-                        Column {
-                            width: rowLayout.columnWidth
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: modelData
-                                font.pixelSize: Theme.fontSizeMedium
-                                font.weight: Font.Bold
-                                color: Theme.primary
-                            }
-
-                            Rectangle {
-                                width: parent.width
-                                height: 1
-                                color: Theme.primary
-                                opacity: 0.3
-                            }
-
-                            Item { width: 1; height: Theme.spacingXS }
-
-                            Column {
-                                width: parent.width
-                                spacing: Theme.spacingXS
-
-                                Repeater {
-                                    model: rowLayout.categories[modelData] || []
-
-                                    Row {
-                                        width: parent.width
-                                        spacing: Theme.spacingS
-
-                                        StyledRect {
-                                            width: Math.min(140, parent.width * 0.42)
-                                            height: 22
-                                            radius: 4
-                                            opacity: 0.3
-
-                                            StyledText {
-                                                anchors.centerIn: parent
-                                                anchors.margins: 2
-                                                width: parent.width - 4
-                                                text: {
-                                                    const mods = modelData.mods || []
-                                                    const key = modelData.key || ""
-                                                    const parts = [...mods, key]
-                                                    return parts.join("+")
-                                                }
-                                                font.pixelSize: Theme.fontSizeSmall
-                                                font.weight: Font.Medium
-                                                isMonospace: true
-                                                elide: Text.ElideRight
-                                                horizontalAlignment: Text.AlignHCenter
-                                            }
-                                        }
-
-                                        StyledText {
-                                            width: parent.width - 150
-                                            text: {
-                                                const comment = modelData.comment || ""
-                                                if (comment) return comment
-
-                                                const dispatcher = modelData.dispatcher || ""
-                                                const params = modelData.params || ""
-                                                return params ? `${dispatcher} ${params}` : dispatcher
-                                            }
-                                            font.pixelSize: Theme.fontSizeSmall
-                                            opacity: 0.9
-                                            elide: Text.ElideRight
-                                            anchors.verticalCenter: parent.verticalCenter
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Modals/PowerMenuModal.qml

@@ -1,454 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    property int selectedIndex: 0
-    property int optionCount: SessionService.hibernateSupported ? 5 : 4
-    property rect parentBounds: Qt.rect(0, 0, 0, 0)
-    property var parentScreen: null
-
-    signal powerActionRequested(string action, string title, string message)
-
-    function openCentered() {
-        parentBounds = Qt.rect(0, 0, 0, 0)
-        parentScreen = null
-        backgroundOpacity = 0.5
-        open()
-    }
-
-    function openFromControlCenter(bounds, targetScreen) {
-        parentBounds = bounds
-        parentScreen = targetScreen
-        backgroundOpacity = 0
-        open()
-    }
-
-    function selectOption(action) {
-        close();
-        const actions = {
-            "logout": {
-                "title": I18n.tr("Log Out"),
-                "message": I18n.tr("Are you sure you want to log out?")
-            },
-            "suspend": {
-                "title": I18n.tr("Suspend"),
-                "message": I18n.tr("Are you sure you want to suspend the system?")
-            },
-            "hibernate": {
-                "title": I18n.tr("Hibernate"),
-                "message": I18n.tr("Are you sure you want to hibernate the system?")
-            },
-            "reboot": {
-                "title": I18n.tr("Reboot"),
-                "message": I18n.tr("Are you sure you want to reboot the system?")
-            },
-            "poweroff": {
-                "title": I18n.tr("Power Off"),
-                "message": I18n.tr("Are you sure you want to power off the system?")
-            }
-        }
-        const selected = actions[action]
-        if (selected) {
-            root.powerActionRequested(action, selected.title, selected.message);
-        }
-
-    }
-
-    shouldBeVisible: false
-    width: 320
-    height: contentLoader.item ? contentLoader.item.implicitHeight : 300
-    enableShadow: true
-    screen: parentScreen
-    positioning: parentBounds.width > 0 ? "custom" : "center"
-    customPosition: {
-        if (parentBounds.width > 0) {
-            const centerX = parentBounds.x + (parentBounds.width - width) / 2
-            const centerY = parentBounds.y + (parentBounds.height - height) / 2
-            return Qt.point(centerX, centerY)
-        }
-        return Qt.point(0, 0)
-    }
-    onBackgroundClicked: () => {
-        return close();
-    }
-    onOpened: () => {
-        selectedIndex = 0;
-        Qt.callLater(() => modalFocusScope.forceActiveFocus());
-    }
-    modalFocusScope.Keys.onPressed: (event) => {
-        switch (event.key) {
-        case Qt.Key_Up:
-        case Qt.Key_Backtab:
-            selectedIndex = (selectedIndex - 1 + optionCount) % optionCount;
-            event.accepted = true;
-            break;
-        case Qt.Key_Down:
-        case Qt.Key_Tab:
-            selectedIndex = (selectedIndex + 1) % optionCount;
-            event.accepted = true;
-            break;
-        case Qt.Key_Return:
-        case Qt.Key_Enter:
-            const actions = ["logout", "suspend"];
-            if (SessionService.hibernateSupported) actions.push("hibernate");
-            actions.push("reboot", "poweroff");
-            if (selectedIndex < actions.length) {
-                selectOption(actions[selectedIndex]);
-            }
-            event.accepted = true;
-            break;
-        case Qt.Key_N:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex + 1) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        case Qt.Key_P:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex - 1 + optionCount) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        case Qt.Key_J:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex + 1) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        case Qt.Key_K:
-            if (event.modifiers & Qt.ControlModifier) {
-                selectedIndex = (selectedIndex - 1 + optionCount) % optionCount;
-                event.accepted = true;
-            }
-            break;
-        }
-    }
-
-    content: Component {
-        Item {
-            anchors.fill: parent
-            implicitHeight: mainColumn.implicitHeight + Theme.spacingL * 2
-
-            Column {
-                id: mainColumn
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingM
-
-                Row {
-                    width: parent.width
-
-                    StyledText {
-                        text: I18n.tr("Power Options")
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    Item {
-                        width: parent.width - 150
-                        height: 1
-                    }
-
-                    DankActionButton {
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: () => {
-                            return close();
-                        }
-                    }
-
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (selectedIndex === 0) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (logoutArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === 0 ? Theme.primary : "transparent"
-                        border.width: selectedIndex === 0 ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "logout"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Log Out")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: logoutArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = 0;
-                                selectOption("logout");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (selectedIndex === 1) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (suspendArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === 1 ? Theme.primary : "transparent"
-                        border.width: selectedIndex === 1 ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "bedtime"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Suspend")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: suspendArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = 1;
-                                selectOption("suspend");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (selectedIndex === 2) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (hibernateArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === 2 ? Theme.primary : "transparent"
-                        border.width: selectedIndex === 2 ? 1 : 0
-                        visible: SessionService.hibernateSupported
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "ac_unit"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Hibernate")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: hibernateArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = 2;
-                                selectOption("hibernate");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            const rebootIndex = SessionService.hibernateSupported ? 3 : 2;
-                            if (selectedIndex === rebootIndex) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (rebootArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === (SessionService.hibernateSupported ? 3 : 2) ? Theme.primary : "transparent"
-                        border.width: selectedIndex === (SessionService.hibernateSupported ? 3 : 2) ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "restart_alt"
-                                size: Theme.iconSize
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Reboot")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: rebootArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = SessionService.hibernateSupported ? 3 : 2;
-                                selectOption("reboot");
-                            }
-                        }
-
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            const powerOffIndex = SessionService.hibernateSupported ? 4 : 3;
-                            if (selectedIndex === powerOffIndex) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12);
-                            } else if (powerOffArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08);
-                            }
-                        }
-                        border.color: selectedIndex === (SessionService.hibernateSupported ? 4 : 3) ? Theme.primary : "transparent"
-                        border.width: selectedIndex === (SessionService.hibernateSupported ? 4 : 3) ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "power_settings_new"
-                                size: Theme.iconSize
-                                color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Power Off")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                        }
-
-                        MouseArea {
-                            id: powerOffArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                selectedIndex = SessionService.hibernateSupported ? 4 : 3;
-                                selectOption("poweroff");
-                            }
-                        }
-
-                    }
-
-                }
-
-                Item {
-                    height: Theme.spacingS
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modals/ProcessListModal.qml

@@ -1,356 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.Common
-import qs.Modals.Common
-import qs.Modules.ProcessList
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: processListModal
-
-    property int currentTab: 0
-    property var tabNames: ["Processes", "Performance", "System"]
-
-    function show() {
-        if (!DgopService.dgopAvailable) {
-            console.warn("ProcessListModal: dgop is not available");
-            return ;
-        }
-        open();
-        UserInfoService.getUptime();
-    }
-
-    function hide() {
-        close();
-        if (processContextMenu.visible) {
-            processContextMenu.close();
-        }
-
-    }
-
-    function toggle() {
-        if (!DgopService.dgopAvailable) {
-            console.warn("ProcessListModal: dgop is not available");
-            return ;
-        }
-        if (shouldBeVisible) {
-            hide();
-        } else {
-            show();
-        }
-    }
-
-    width: 900
-    height: 680
-    visible: false
-    backgroundColor: Theme.popupBackground()
-    cornerRadius: Theme.cornerRadius
-    enableShadow: true
-    onBackgroundClicked: () => {
-        return hide();
-    }
-
-    Component {
-        id: processesTabComponent
-
-        ProcessesTab {
-            contextMenu: processContextMenu
-        }
-
-    }
-
-    Component {
-        id: performanceTabComponent
-
-        PerformanceTab {
-        }
-
-    }
-
-    Component {
-        id: systemTabComponent
-
-        SystemTab {
-        }
-
-    }
-
-    ProcessContextMenu {
-        id: processContextMenu
-    }
-
-    content: Component {
-        Item {
-            anchors.fill: parent
-            focus: true
-            Keys.onPressed: (event) => {
-                if (event.key === Qt.Key_Escape) {
-                    processListModal.hide();
-                    event.accepted = true;
-                } else if (event.key === Qt.Key_1) {
-                    currentTab = 0;
-                    event.accepted = true;
-                } else if (event.key === Qt.Key_2) {
-                    currentTab = 1;
-                    event.accepted = true;
-                } else if (event.key === Qt.Key_3) {
-                    currentTab = 2;
-                    event.accepted = true;
-                }
-            }
-
-            // Show error message when dgop is not available
-            Rectangle {
-                anchors.centerIn: parent
-                width: 400
-                height: 200
-                radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.1)
-                border.color: Theme.error
-                border.width: 2
-                visible: !DgopService.dgopAvailable
-
-                Column {
-                    anchors.centerIn: parent
-                    spacing: Theme.spacingL
-
-                    DankIcon {
-                        name: "error"
-                        size: 48
-                        color: Theme.error
-                        anchors.horizontalCenter: parent.horizontalCenter
-                    }
-
-                    StyledText {
-                        text: I18n.tr("System Monitor Unavailable")
-                        font.pixelSize: Theme.fontSizeLarge
-                        font.weight: Font.Bold
-                        color: Theme.error
-                        anchors.horizontalCenter: parent.horizontalCenter
-                    }
-
-                    StyledText {
-                        text: I18n.tr("The 'dgop' tool is required for system monitoring.\nPlease install dgop to use this feature.")
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceText
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        horizontalAlignment: Text.AlignHCenter
-                        wrapMode: Text.WordWrap
-                    }
-
-                }
-
-            }
-
-            ColumnLayout {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingL
-                visible: DgopService.dgopAvailable
-
-                RowLayout {
-                    Layout.fillWidth: true
-                    height: 40
-
-                    StyledText {
-                        text: I18n.tr("System Monitor")
-                        font.pixelSize: Theme.fontSizeLarge + 4
-                        font.weight: Font.Bold
-                        color: Theme.surfaceText
-                        Layout.alignment: Qt.AlignVCenter
-                    }
-
-                    Item {
-                        Layout.fillWidth: true
-                    }
-
-                    DankActionButton {
-                        circular: false
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: () => {
-                            return processListModal.hide();
-                        }
-                        Layout.alignment: Qt.AlignVCenter
-                    }
-
-                }
-
-                Rectangle {
-                    Layout.fillWidth: true
-                    height: 52
-                    color: Theme.surfaceContainerHigh
-                    radius: Theme.cornerRadius
-                    border.color: Theme.outlineLight
-                    border.width: 1
-
-                    Row {
-                        anchors.fill: parent
-                        anchors.margins: 4
-                        spacing: 2
-
-                        Repeater {
-                            model: tabNames
-
-                            Rectangle {
-                                width: (parent.width - (tabNames.length - 1) * 2) / tabNames.length
-                                height: 44
-                                radius: Theme.cornerRadius
-                                color: currentTab === index ? Theme.primaryPressed : (tabMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent")
-                                border.color: currentTab === index ? Theme.primary : "transparent"
-                                border.width: currentTab === index ? 1 : 0
-
-                                Row {
-                                    anchors.centerIn: parent
-                                    spacing: Theme.spacingXS
-
-                                    DankIcon {
-                                        name: {
-                                            const tabIcons = ["list_alt", "analytics", "settings"];
-                                            return tabIcons[index] || "tab";
-                                        }
-                                        size: Theme.iconSize - 2
-                                        color: currentTab === index ? Theme.primary : Theme.surfaceText
-                                        opacity: currentTab === index ? 1 : 0.7
-                                        anchors.verticalCenter: parent.verticalCenter
-
-                                        Behavior on color {
-                                            ColorAnimation {
-                                                duration: Theme.shortDuration
-                                            }
-
-                                        }
-
-                                    }
-
-                                    StyledText {
-                                        text: modelData
-                                        font.pixelSize: Theme.fontSizeLarge
-                                        font.weight: Font.Medium
-                                        color: currentTab === index ? Theme.primary : Theme.surfaceText
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        anchors.verticalCenterOffset: -1
-
-                                        Behavior on color {
-                                            ColorAnimation {
-                                                duration: Theme.shortDuration
-                                            }
-
-                                        }
-
-                                    }
-
-                                }
-
-                                MouseArea {
-                                    id: tabMouseArea
-
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-                                    onClicked: () => {
-                                        currentTab = index;
-                                    }
-                                }
-
-                                Behavior on color {
-                                    ColorAnimation {
-                                        duration: Theme.shortDuration
-                                    }
-
-                                }
-
-                                Behavior on border.color {
-                                    ColorAnimation {
-                                        duration: Theme.shortDuration
-                                    }
-
-                                }
-
-                            }
-
-                        }
-
-                    }
-
-                }
-
-                Rectangle {
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceContainerHigh
-                    border.color: Theme.outlineLight
-                    border.width: 1
-
-                    Loader {
-                        id: processesTab
-
-                        anchors.fill: parent
-                        anchors.margins: Theme.spacingS
-                        active: processListModal.visible && currentTab === 0
-                        visible: currentTab === 0
-                        opacity: currentTab === 0 ? 1 : 0
-                        sourceComponent: processesTabComponent
-
-                        Behavior on opacity {
-                            NumberAnimation {
-                                duration: Theme.mediumDuration
-                                easing.type: Theme.emphasizedEasing
-                            }
-
-                        }
-
-                    }
-
-                    Loader {
-                        id: performanceTab
-
-                        anchors.fill: parent
-                        anchors.margins: Theme.spacingS
-                        active: processListModal.visible && currentTab === 1
-                        visible: currentTab === 1
-                        opacity: currentTab === 1 ? 1 : 0
-                        sourceComponent: performanceTabComponent
-
-                        Behavior on opacity {
-                            NumberAnimation {
-                                duration: Theme.mediumDuration
-                                easing.type: Theme.emphasizedEasing
-                            }
-
-                        }
-
-                    }
-
-                    Loader {
-                        id: systemTab
-
-                        anchors.fill: parent
-                        anchors.margins: Theme.spacingS
-                        active: processListModal.visible && currentTab === 2
-                        visible: currentTab === 2
-                        opacity: currentTab === 2 ? 1 : 0
-                        sourceComponent: systemTabComponent
-
-                        Behavior on opacity {
-                            NumberAnimation {
-                                duration: Theme.mediumDuration
-                                easing.type: Theme.emphasizedEasing
-                            }
-
-                        }
-
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modals/Settings/SettingsModal.qml

@@ -1,195 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import Quickshell.Io
-import qs.Common
-import qs.Modals.Common
-import qs.Modals.FileBrowser
-import qs.Modules.Settings
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: settingsModal
-
-    property Component settingsContent
-    property alias profileBrowser: profileBrowser
-
-    signal closingModal()
-
-    function show() {
-        open();
-    }
-
-    function hide() {
-        close();
-    }
-
-    function toggle() {
-        if (shouldBeVisible) {
-            hide();
-        } else {
-            show();
-        }
-    }
-
-    objectName: "settingsModal"
-    width: 800
-    height: 800
-    visible: false
-    onBackgroundClicked: () => {
-        return hide();
-    }
-    content: settingsContent
-
-    IpcHandler {
-        function open(): string {
-            settingsModal.show();
-            return "SETTINGS_OPEN_SUCCESS";
-        }
-
-        function close(): string {
-            settingsModal.hide();
-            return "SETTINGS_CLOSE_SUCCESS";
-        }
-
-        function toggle(): string {
-            settingsModal.toggle();
-            return "SETTINGS_TOGGLE_SUCCESS";
-        }
-
-        target: "settings"
-    }
-
-    IpcHandler {
-        function browse(type: string) {
-            if (type === "wallpaper") {
-                wallpaperBrowser.allowStacking = false;
-                wallpaperBrowser.open();
-            } else if (type === "profile") {
-                profileBrowser.allowStacking = false;
-                profileBrowser.open();
-            }
-        }
-
-        target: "file"
-    }
-
-    FileBrowserModal {
-        id: profileBrowser
-
-        allowStacking: true
-        parentModal: settingsModal
-        browserTitle: "Select Profile Image"
-        browserIcon: "person"
-        browserType: "profile"
-        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-        onFileSelected: (path) => {
-            PortalService.setProfileImage(path);
-            close();
-        }
-        onDialogClosed: () => {
-            allowStacking = true;
-        }
-    }
-
-    FileBrowserModal {
-        id: wallpaperBrowser
-
-        allowStacking: true
-        parentModal: settingsModal
-        browserTitle: "Select Wallpaper"
-        browserIcon: "wallpaper"
-        browserType: "wallpaper"
-        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-        onFileSelected: (path) => {
-            SessionData.setWallpaper(path);
-            close();
-        }
-        onDialogClosed: () => {
-            allowStacking = true;
-        }
-    }
-
-    settingsContent: Component {
-        FocusScope {
-            anchors.fill: parent
-            focus: true
-
-            Column {
-                anchors.fill: parent
-                anchors.leftMargin: Theme.spacingL
-                anchors.rightMargin: Theme.spacingL
-                anchors.topMargin: Theme.spacingM
-                anchors.bottomMargin: Theme.spacingL
-                spacing: 0
-
-                Item {
-                    width: parent.width
-                    height: 35
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "settings"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Settings")
-                            font.pixelSize: Theme.fontSizeXLarge
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                    }
-
-                    DankActionButton {
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        circular: false
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: () => {
-                            return settingsModal.hide();
-                        }
-                    }
-
-                }
-
-                Row {
-                    width: parent.width
-                    height: parent.height - 35
-                    spacing: 0
-
-                    SettingsSidebar {
-                        id: sidebar
-
-                        parentModal: settingsModal
-                        onCurrentIndexChanged: content.currentIndex = currentIndex
-                    }
-
-                    SettingsContent {
-                        id: content
-
-                        width: parent.width - sidebar.width
-                        height: parent.height
-                        parentModal: settingsModal
-                        currentIndex: sidebar.currentIndex
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modals/Settings/SettingsSidebar.qml

@@ -1,136 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Settings
-import qs.Widgets
-
-Rectangle {
-    id: sidebarContainer
-
-    property int currentIndex: 0
-    property var parentModal: null
-    readonly property var sidebarItems: [{
-        "text": I18n.tr("Personalization"),
-        "icon": "person"
-    }, {
-        "text": I18n.tr("Time & Weather"),
-        "icon": "schedule"
-    }, {
-        "text": I18n.tr("Dank Bar"),
-        "icon": "toolbar"
-    }, {
-        "text": I18n.tr("Widgets"),
-        "icon": "widgets"
-    }, {
-        "text": I18n.tr("Dock"),
-        "icon": "dock_to_bottom"
-    }, {
-        "text": I18n.tr("Displays"),
-        "icon": "monitor"
-    }, {
-        "text": I18n.tr("Launcher"),
-        "icon": "apps"
-    }, {
-        "text": I18n.tr("Theme & Colors"),
-        "icon": "palette"
-    }, {
-        "text": I18n.tr("Power & Security"),
-        "icon": "power"
-    }, {
-        "text": I18n.tr("Plugins"),
-        "icon": "extension"
-    }, {
-        "text": I18n.tr("About"),
-        "icon": "info"
-    }]
-
-    width: 270
-    height: parent.height
-    color: Theme.surfaceContainer
-    radius: Theme.cornerRadius
-
-    Column {
-        anchors.fill: parent
-        anchors.leftMargin: Theme.spacingS
-        anchors.rightMargin: Theme.spacingS
-        anchors.bottomMargin: Theme.spacingS
-        anchors.topMargin: Theme.spacingM + 2
-        spacing: Theme.spacingXS
-
-        ProfileSection {
-            parentModal: sidebarContainer.parentModal
-        }
-
-        Rectangle {
-            width: parent.width - Theme.spacingS * 2
-            height: 1
-            color: Theme.outline
-            opacity: 0.2
-        }
-
-        Item {
-            width: parent.width
-            height: Theme.spacingL
-        }
-
-        Repeater {
-            id: sidebarRepeater
-
-            model: sidebarContainer.sidebarItems
-
-            Rectangle {
-                property bool isActive: sidebarContainer.currentIndex === index
-
-                width: parent.width - Theme.spacingS * 2
-                height: 44
-                radius: Theme.cornerRadius
-                color: isActive ? Theme.primary : tabMouseArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                Row {
-                    anchors.left: parent.left
-                    anchors.leftMargin: Theme.spacingM
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingM
-
-                    DankIcon {
-                        name: modelData.icon || ""
-                        size: Theme.iconSize - 2
-                        color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: modelData.text || ""
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
-                        font.weight: parent.parent.isActive ? Font.Medium : Font.Normal
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                }
-
-                MouseArea {
-                    id: tabMouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: () => {
-                        sidebarContainer.currentIndex = index;
-                    }
-                }
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modals/Spotlight/SpotlightContent.qml

@@ -1,244 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Modals.Spotlight
-import qs.Modules.AppDrawer
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: spotlightKeyHandler
-
-    property alias appLauncher: appLauncher
-    property alias searchField: searchField
-    property var parentModal: null
-
-    function resetScroll() {
-        resultsView.resetScroll()
-    }
-
-    anchors.fill: parent
-    focus: true
-    clip: false
-    Keys.onPressed: event => {
-                        if (event.key === Qt.Key_Escape) {
-                            if (parentModal)
-                            parentModal.hide()
-
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Down) {
-                            appLauncher.selectNext()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Up) {
-                            appLauncher.selectPrevious()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Right && appLauncher.viewMode === "grid") {
-                            appLauncher.selectNextInRow()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Left && appLauncher.viewMode === "grid") {
-                            appLauncher.selectPreviousInRow()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_J && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectNext()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_K && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectPrevious()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_L && event.modifiers & Qt.ControlModifier && appLauncher.viewMode === "grid") {
-                            appLauncher.selectNextInRow()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_H && event.modifiers & Qt.ControlModifier && appLauncher.viewMode === "grid") {
-                            appLauncher.selectPreviousInRow()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Tab) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectNextInRow()
-                            } else {
-                                appLauncher.selectNext()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Backtab) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectPreviousInRow()
-                            } else {
-                                appLauncher.selectPrevious()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectNextInRow()
-                            } else {
-                                appLauncher.selectNext()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectPreviousInRow()
-                            } else {
-                                appLauncher.selectPrevious()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                            appLauncher.launchSelected()
-                            event.accepted = true
-                        }
-                    }
-
-    AppLauncher {
-        id: appLauncher
-
-        viewMode: SettingsData.spotlightModalViewMode
-        gridColumns: 4
-        onAppLaunched: () => {
-                           if (parentModal)
-                           parentModal.hide()
-                       }
-        onViewModeSelected: mode => {
-                                SettingsData.setSpotlightModalViewMode(mode)
-                            }
-    }
-
-    Column {
-        anchors.fill: parent
-        anchors.margins: Theme.spacingM
-        spacing: Theme.spacingM
-        clip: false
-
-        Row {
-            width: parent.width
-            spacing: Theme.spacingM
-            leftPadding: Theme.spacingS
-
-            DankTextField {
-                id: searchField
-
-                width: parent.width - 80 - Theme.spacingL
-                height: 56
-                cornerRadius: Theme.cornerRadius
-                backgroundColor: Theme.surfaceContainerHigh
-                normalBorderColor: Theme.outlineMedium
-                focusedBorderColor: Theme.primary
-                leftIconName: "search"
-                leftIconSize: Theme.iconSize
-                leftIconColor: Theme.surfaceVariantText
-                leftIconFocusedColor: Theme.primary
-                showClearButton: true
-                textColor: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeLarge
-                enabled: parentModal ? parentModal.spotlightOpen : true
-                placeholderText: ""
-                ignoreLeftRightKeys: appLauncher.viewMode !== "list"
-                ignoreTabKeys: true
-                keyForwardTargets: [spotlightKeyHandler]
-                text: appLauncher.searchQuery
-                onTextEdited: () => {
-                                  appLauncher.searchQuery = text
-                              }
-                Keys.onPressed: event => {
-                                    if (event.key === Qt.Key_Escape) {
-                                        if (parentModal)
-                                        parentModal.hide()
-
-                                        event.accepted = true
-                                    } else if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length > 0) {
-                                        if (appLauncher.keyboardNavigationActive && appLauncher.model.count > 0)
-                                        appLauncher.launchSelected()
-                                        else if (appLauncher.model.count > 0)
-                                        appLauncher.launchApp(appLauncher.model.get(0))
-                                        event.accepted = true
-                                    } else if (event.key === Qt.Key_Down || event.key === Qt.Key_Up || event.key === Qt.Key_Left || event.key === Qt.Key_Right || event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab || ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length === 0)) {
-                                        event.accepted = false
-                                    }
-                                }
-            }
-
-            Row {
-                spacing: Theme.spacingXS
-                visible: appLauncher.model.count > 0
-                anchors.verticalCenter: parent.verticalCenter
-
-                Rectangle {
-                    width: 36
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: appLauncher.viewMode === "list" ? Theme.primaryHover : listViewArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: "view_list"
-                        size: 18
-                        color: appLauncher.viewMode === "list" ? Theme.primary : Theme.surfaceText
-                    }
-
-                    MouseArea {
-                        id: listViewArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: () => {
-                                       appLauncher.setViewMode("list")
-                                   }
-                    }
-                }
-
-                Rectangle {
-                    width: 36
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: appLauncher.viewMode === "grid" ? Theme.primaryHover : gridViewArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: "grid_view"
-                        size: 18
-                        color: appLauncher.viewMode === "grid" ? Theme.primary : Theme.surfaceText
-                    }
-
-                    MouseArea {
-                        id: gridViewArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: () => {
-                                       appLauncher.setViewMode("grid")
-                                   }
-                    }
-                }
-            }
-        }
-
-        SpotlightResults {
-            id: resultsView
-            appLauncher: spotlightKeyHandler.appLauncher
-            contextMenu: contextMenu
-        }
-    }
-
-    SpotlightContextMenu {
-        id: contextMenu
-
-        appLauncher: spotlightKeyHandler.appLauncher
-        parentHandler: spotlightKeyHandler
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        visible: contextMenu.visible
-        z: 999
-        onClicked: () => {
-                       contextMenu.hide()
-                   }
-
-        MouseArea {
-
-            // Prevent closing when clicking on the menu itself
-            x: contextMenu.x
-            y: contextMenu.y
-            width: contextMenu.width
-            height: contextMenu.height
-            onClicked: () => {}
-        }
-    }
-}

Modals/Spotlight/SpotlightModal.qml

@@ -1,153 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Io
-import Quickshell.Widgets
-import qs.Common
-import qs.Modals.Common
-import qs.Modules.AppDrawer
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: spotlightModal
-
-    property bool spotlightOpen: false
-    property alias spotlightContent: spotlightContentInstance
-
-    function show() {
-        spotlightOpen = true
-        open()
-
-        Qt.callLater(() => {
-            if (spotlightContent && spotlightContent.searchField) {
-                spotlightContent.searchField.forceActiveFocus()
-            }
-        })
-    }
-
-    function showWithQuery(query) {
-        if (spotlightContent) {
-            if (spotlightContent.appLauncher) {
-                spotlightContent.appLauncher.searchQuery = query
-            }
-            if (spotlightContent.searchField) {
-                spotlightContent.searchField.text = query
-            }
-        }
-
-        spotlightOpen = true
-        open()
-
-        Qt.callLater(() => {
-            if (spotlightContent && spotlightContent.searchField) {
-                spotlightContent.searchField.forceActiveFocus()
-            }
-        })
-    }
-
-    function hide() {
-        spotlightOpen = false
-        close()
-    }
-
-    onDialogClosed: {
-        if (spotlightContent) {
-            if (spotlightContent.appLauncher) {
-                spotlightContent.appLauncher.searchQuery = ""
-                spotlightContent.appLauncher.selectedIndex = 0
-                spotlightContent.appLauncher.setCategory(I18n.tr("All"))
-            }
-            if (spotlightContent.resetScroll) {
-                spotlightContent.resetScroll()
-            }
-            if (spotlightContent.searchField) {
-                spotlightContent.searchField.text = ""
-            }
-        }
-    }
-
-    function toggle() {
-        if (spotlightOpen) {
-            hide()
-        } else {
-            show()
-        }
-    }
-
-    shouldBeVisible: spotlightOpen
-    width: 550
-    height: 700
-    backgroundColor: Theme.popupBackground()
-    cornerRadius: Theme.cornerRadius
-    borderColor: Theme.outlineMedium
-    borderWidth: 1
-    enableShadow: true
-    keepContentLoaded: true
-    onVisibleChanged: () => {
-                          if (visible && !spotlightOpen) {
-                              show()
-                          }
-                          if (visible && spotlightContent) {
-                              Qt.callLater(() => {
-                                               if (spotlightContent.searchField) {
-                                                   spotlightContent.searchField.forceActiveFocus()
-                                               }
-                                           })
-                          }
-                      }
-    onBackgroundClicked: () => {
-                             return hide()
-                         }
-
-    Connections {
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== spotlightModal && !allowStacking && spotlightOpen) {
-                spotlightOpen = false
-            }
-        }
-
-        target: ModalManager
-    }
-
-    IpcHandler {
-        function open(): string  {
-            spotlightModal.show()
-            return "SPOTLIGHT_OPEN_SUCCESS"
-        }
-
-        function close(): string  {
-            spotlightModal.hide()
-            return "SPOTLIGHT_CLOSE_SUCCESS"
-        }
-
-        function toggle(): string  {
-            spotlightModal.toggle()
-            return "SPOTLIGHT_TOGGLE_SUCCESS"
-        }
-
-        function openQuery(query: string): string {
-            spotlightModal.showWithQuery(query)
-            return "SPOTLIGHT_OPEN_QUERY_SUCCESS"
-        }
-
-        function toggleQuery(query: string): string {
-            if (spotlightModal.spotlightOpen) {
-                spotlightModal.hide()
-            } else {
-                spotlightModal.showWithQuery(query)
-            }
-            return "SPOTLIGHT_TOGGLE_QUERY_SUCCESS"
-        }
-
-        target: "spotlight"
-    }
-
-    SpotlightContent {
-        id: spotlightContentInstance
-
-        parentModal: spotlightModal
-    }
-
-    directContent: spotlightContentInstance
-}

Modals/Spotlight/SpotlightResults.qml

@@ -1,328 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Widgets
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: resultsContainer
-
-    property var appLauncher: null
-    property var contextMenu: null
-
-    function resetScroll() {
-        resultsList.contentY = 0
-        resultsGrid.contentY = 0
-    }
-
-    width: parent.width
-    height: parent.height - y
-    radius: Theme.cornerRadius
-    color: "transparent"
-    clip: true
-
-    DankListView {
-        id: resultsList
-
-        property int itemHeight: 60
-        property int iconSize: 40
-        property bool showDescription: true
-        property int itemSpacing: Theme.spacingS
-        property bool hoverUpdatesSelection: false
-        property bool keyboardNavigationActive: appLauncher ? appLauncher.keyboardNavigationActive : false
-
-        signal keyboardNavigationReset
-        signal itemClicked(int index, var modelData)
-        signal itemRightClicked(int index, var modelData, real mouseX, real mouseY)
-
-        function ensureVisible(index) {
-            if (index < 0 || index >= count)
-                return
-
-            const itemY = index * (itemHeight + itemSpacing)
-            const itemBottom = itemY + itemHeight
-            if (itemY < contentY)
-                contentY = itemY
-            else if (itemBottom > contentY + height)
-                contentY = itemBottom - height
-        }
-
-        anchors.fill: parent
-        anchors.margins: Theme.spacingS
-        visible: appLauncher && appLauncher.viewMode === "list"
-        model: appLauncher ? appLauncher.model : null
-        currentIndex: appLauncher ? appLauncher.selectedIndex : -1
-        clip: true
-        spacing: itemSpacing
-        focus: true
-        interactive: true
-        cacheBuffer: Math.max(0, Math.min(height * 2, 1000))
-        reuseItems: true
-        onCurrentIndexChanged: {
-            if (keyboardNavigationActive)
-                ensureVisible(currentIndex)
-        }
-        onItemClicked: (index, modelData) => {
-                           if (appLauncher)
-                           appLauncher.launchApp(modelData)
-                       }
-        onItemRightClicked: (index, modelData, mouseX, mouseY) => {
-                                if (contextMenu)
-                                contextMenu.show(mouseX, mouseY, modelData)
-                            }
-        onKeyboardNavigationReset: () => {
-                                       if (appLauncher)
-                                       appLauncher.keyboardNavigationActive = false
-                                   }
-
-        delegate: Rectangle {
-            width: ListView.view.width
-            height: resultsList.itemHeight
-            radius: Theme.cornerRadius
-            color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-            Row {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingL
-
-                Item {
-                    width: resultsList.iconSize
-                    height: resultsList.iconSize
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    IconImage {
-                        id: listIconImg
-
-                        anchors.fill: parent
-                        source: Quickshell.iconPath(model.icon, true)
-                        asynchronous: true
-                        visible: status === Image.Ready
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: !listIconImg.visible
-                        color: Theme.surfaceLight
-                        radius: Theme.cornerRadius
-                        border.width: 1
-                        border.color: Theme.primarySelected
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                            font.pixelSize: resultsList.iconSize * 0.4
-                            color: Theme.primary
-                            font.weight: Font.Bold
-                        }
-                    }
-                }
-
-                Column {
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: parent.width - resultsList.iconSize - Theme.spacingL
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        width: parent.width
-                        text: model.name || ""
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        elide: Text.ElideRight
-                        wrapMode: Text.NoWrap
-                        maximumLineCount: 1
-                    }
-
-                    StyledText {
-                        width: parent.width
-                        text: model.comment || "Application"
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceVariantText
-                        elide: Text.ElideRight
-                        maximumLineCount: 1
-                        visible: resultsList.showDescription && model.comment && model.comment.length > 0
-                    }
-                }
-            }
-
-            MouseArea {
-                id: listMouseArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                z: 10
-                onEntered: () => {
-                               if (resultsList.hoverUpdatesSelection && !resultsList.keyboardNavigationActive)
-                               resultsList.currentIndex = index
-                           }
-                onPositionChanged: () => {
-                                       resultsList.keyboardNavigationReset()
-                                   }
-                onClicked: mouse => {
-                               if (mouse.button === Qt.LeftButton) {
-                                   resultsList.itemClicked(index, model)
-                               } else if (mouse.button === Qt.RightButton && !model.isPlugin) {
-                                   const globalPos = mapToItem(null, mouse.x, mouse.y)
-                                   const modalPos = resultsContainer.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                   resultsList.itemRightClicked(index, model, modalPos.x, modalPos.y)
-                               }
-                           }
-            }
-        }
-    }
-
-    DankGridView {
-        id: resultsGrid
-
-        property int currentIndex: appLauncher ? appLauncher.selectedIndex : -1
-        property int columns: 4
-        property bool adaptiveColumns: false
-        property int minCellWidth: 120
-        property int maxCellWidth: 160
-        property int cellPadding: 8
-        property real iconSizeRatio: 0.55
-        property int maxIconSize: 48
-        property int minIconSize: 32
-        property bool hoverUpdatesSelection: false
-        property bool keyboardNavigationActive: appLauncher ? appLauncher.keyboardNavigationActive : false
-        property int baseCellWidth: adaptiveColumns ? Math.max(minCellWidth, Math.min(maxCellWidth, width / columns)) : (width - Theme.spacingS * 2) / columns
-        property int baseCellHeight: baseCellWidth + 20
-        property int actualColumns: adaptiveColumns ? Math.floor(width / cellWidth) : columns
-        property int remainingSpace: width - (actualColumns * cellWidth)
-
-        signal keyboardNavigationReset
-        signal itemClicked(int index, var modelData)
-        signal itemRightClicked(int index, var modelData, real mouseX, real mouseY)
-
-        function ensureVisible(index) {
-            if (index < 0 || index >= count)
-                return
-
-            const itemY = Math.floor(index / actualColumns) * cellHeight
-            const itemBottom = itemY + cellHeight
-            if (itemY < contentY)
-                contentY = itemY
-            else if (itemBottom > contentY + height)
-                contentY = itemBottom - height
-        }
-
-        anchors.fill: parent
-        anchors.margins: Theme.spacingS
-        visible: appLauncher && appLauncher.viewMode === "grid"
-        model: appLauncher ? appLauncher.model : null
-        clip: true
-        cellWidth: baseCellWidth
-        cellHeight: baseCellHeight
-        leftMargin: Math.max(Theme.spacingS, remainingSpace / 2)
-        rightMargin: leftMargin
-        focus: true
-        interactive: true
-        cacheBuffer: Math.max(0, Math.min(height * 2, 1000))
-        reuseItems: true
-        onCurrentIndexChanged: {
-            if (keyboardNavigationActive)
-                ensureVisible(currentIndex)
-        }
-        onItemClicked: (index, modelData) => {
-                           if (appLauncher)
-                           appLauncher.launchApp(modelData)
-                       }
-        onItemRightClicked: (index, modelData, mouseX, mouseY) => {
-                                if (contextMenu)
-                                contextMenu.show(mouseX, mouseY, modelData)
-                            }
-        onKeyboardNavigationReset: () => {
-                                       if (appLauncher)
-                                       appLauncher.keyboardNavigationActive = false
-                                   }
-
-        delegate: Rectangle {
-            width: resultsGrid.cellWidth - resultsGrid.cellPadding
-            height: resultsGrid.cellHeight - resultsGrid.cellPadding
-            radius: Theme.cornerRadius
-            color: resultsGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-            Column {
-                anchors.centerIn: parent
-                spacing: Theme.spacingS
-
-                Item {
-                    property int iconSize: Math.min(resultsGrid.maxIconSize, Math.max(resultsGrid.minIconSize, resultsGrid.cellWidth * resultsGrid.iconSizeRatio))
-
-                    width: iconSize
-                    height: iconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    IconImage {
-                        id: gridIconImg
-
-                        anchors.fill: parent
-                        source: Quickshell.iconPath(model.icon, true)
-                        smooth: true
-                        asynchronous: true
-                        visible: status === Image.Ready
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: !gridIconImg.visible
-                        color: Theme.surfaceLight
-                        radius: Theme.cornerRadius
-                        border.width: 1
-                        border.color: Theme.primarySelected
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                            font.pixelSize: Math.min(28, parent.width * 0.5)
-                            color: Theme.primary
-                            font.weight: Font.Bold
-                        }
-                    }
-                }
-
-                StyledText {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    width: resultsGrid.cellWidth - 12
-                    text: model.name || ""
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    elide: Text.ElideRight
-                    horizontalAlignment: Text.AlignHCenter
-                    maximumLineCount: 1
-                    wrapMode: Text.NoWrap
-                }
-            }
-
-            MouseArea {
-                id: gridMouseArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                z: 10
-                onEntered: () => {
-                               if (resultsGrid.hoverUpdatesSelection && !resultsGrid.keyboardNavigationActive)
-                               resultsGrid.currentIndex = index
-                           }
-                onPositionChanged: () => {
-                                       resultsGrid.keyboardNavigationReset()
-                                   }
-                onClicked: mouse => {
-                               if (mouse.button === Qt.LeftButton) {
-                                   resultsGrid.itemClicked(index, model)
-                               } else if (mouse.button === Qt.RightButton && !model.isPlugin) {
-                                   const globalPos = mapToItem(null, mouse.x, mouse.y)
-                                   const modalPos = resultsContainer.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                   resultsGrid.itemRightClicked(index, model, modalPos.x, modalPos.y)
-                               }
-                           }
-            }
-        }
-    }
-}

Modals/WifiPasswordModal.qml

@@ -1,463 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    property string wifiPasswordSSID: ""
-    property string wifiPasswordInput: ""
-    property string wifiUsernameInput: ""
-    property bool requiresEnterprise: false
-
-    property string wifiAnonymousIdentityInput: ""
-    property string wifiDomainInput: ""
-
-    function show(ssid) {
-        wifiPasswordSSID = ssid
-        wifiPasswordInput = ""
-        wifiUsernameInput = ""
-        wifiAnonymousIdentityInput = ""
-        wifiDomainInput = ""
-
-        const network = NetworkService.wifiNetworks.find(n => n.ssid === ssid)
-        requiresEnterprise = network?.enterprise || false
-
-        open()
-        Qt.callLater(() => {
-                         if (contentLoader.item) {
-                             if (requiresEnterprise && contentLoader.item.usernameInput) {
-                                 contentLoader.item.usernameInput.forceActiveFocus()
-                             } else if (contentLoader.item.passwordInput) {
-                                 contentLoader.item.passwordInput.forceActiveFocus()
-                             }
-                         }
-                     })
-    }
-
-    shouldBeVisible: false
-    width: 420
-    height: requiresEnterprise ? 430 : 230
-    onShouldBeVisibleChanged: () => {
-                                  if (!shouldBeVisible) {
-                                      wifiPasswordInput = ""
-                                      wifiUsernameInput = ""
-                                      wifiAnonymousIdentityInput = ""
-                                      wifiDomainInput = ""
-                                  }
-                              }
-    onOpened: {
-        Qt.callLater(() => {
-                         if (contentLoader.item) {
-                             if (requiresEnterprise && contentLoader.item.usernameInput) {
-                                 contentLoader.item.usernameInput.forceActiveFocus()
-                             } else if (contentLoader.item.passwordInput) {
-                                 contentLoader.item.passwordInput.forceActiveFocus()
-                             }
-                         }
-                     })
-    }
-    onBackgroundClicked: () => {
-                             close()
-                             wifiPasswordInput = ""
-                             wifiUsernameInput = ""
-                             wifiAnonymousIdentityInput = ""
-                             wifiDomainInput = ""
-                         }
-
-    Connections {
-        target: NetworkService
-
-        function onPasswordDialogShouldReopenChanged() {
-            if (NetworkService.passwordDialogShouldReopen && NetworkService.connectingSSID !== "") {
-                wifiPasswordSSID = NetworkService.connectingSSID
-                wifiPasswordInput = ""
-                open()
-                NetworkService.passwordDialogShouldReopen = false
-            }
-        }
-    }
-
-    content: Component {
-        FocusScope {
-            id: wifiContent
-
-            property alias usernameInput: usernameInput
-            property alias passwordInput: passwordInput
-
-            anchors.fill: parent
-            focus: true
-            Keys.onEscapePressed: event => {
-                                      close()
-                                      wifiPasswordInput = ""
-                                      wifiUsernameInput = ""
-                                      wifiAnonymousIdentityInput = ""
-                                      wifiDomainInput = ""
-                                      event.accepted = true
-                                  }
-
-            Column {
-                anchors.centerIn: parent
-                width: parent.width - Theme.spacingM * 2
-                spacing: Theme.spacingM
-
-                Row {
-                    width: parent.width
-
-                    Column {
-                        width: parent.width - 40
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: I18n.tr("Connect to Wi-Fi")
-                            font.pixelSize: Theme.fontSizeLarge
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                        }
-
-                        StyledText {
-                            text: requiresEnterprise ? I18n.tr("Enter credentials for ") + wifiPasswordSSID : I18n.tr("Enter password for ") + wifiPasswordSSID
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceTextMedium
-                            width: parent.width
-                            elide: Text.ElideRight
-                        }
-                    }
-
-                    DankActionButton {
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: () => {
-                                       close()
-                                       wifiPasswordInput = ""
-                                       wifiUsernameInput = ""
-                                       wifiAnonymousIdentityInput = ""
-                                       wifiDomainInput = ""
-                                   }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: usernameInput.activeFocus ? Theme.primary : Theme.outlineStrong
-                    border.width: usernameInput.activeFocus ? 2 : 1
-                    visible: requiresEnterprise
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: () => {
-                                       usernameInput.forceActiveFocus()
-                                   }
-                    }
-
-                    DankTextField {
-                        id: usernameInput
-
-                        anchors.fill: parent
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: Theme.surfaceText
-                        text: wifiUsernameInput
-                        placeholderText: I18n.tr("Username")
-                        backgroundColor: "transparent"
-                        enabled: root.shouldBeVisible
-                        onTextEdited: () => {
-                                          wifiUsernameInput = text
-                                      }
-                        onAccepted: () => {
-                                        if (passwordInput) {
-                                            passwordInput.forceActiveFocus()
-                                        }
-                                    }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: passwordInput.activeFocus ? Theme.primary : Theme.outlineStrong
-                    border.width: passwordInput.activeFocus ? 2 : 1
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: () => {
-                                       passwordInput.forceActiveFocus()
-                                   }
-                    }
-
-                    DankTextField {
-                        id: passwordInput
-
-                        anchors.fill: parent
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: Theme.surfaceText
-                        text: wifiPasswordInput
-                        echoMode: showPasswordCheckbox.checked ? TextInput.Normal : TextInput.Password
-                        placeholderText: requiresEnterprise ? I18n.tr("Password") : ""
-                        backgroundColor: "transparent"
-                        focus: !requiresEnterprise
-                        enabled: root.shouldBeVisible
-                        onTextEdited: () => {
-                                          wifiPasswordInput = text
-                                      }
-                        onAccepted: () => {
-                                        const username = requiresEnterprise ? usernameInput.text : ""
-                                        NetworkService.connectToWifi(
-                                            wifiPasswordSSID,
-                                            passwordInput.text,
-                                            username,
-                                            wifiAnonymousIdentityInput,
-                                            wifiDomainInput
-                                        )
-                                        close()
-                                        wifiPasswordInput = ""
-                                        wifiUsernameInput = ""
-                                        wifiAnonymousIdentityInput = ""
-                                        wifiDomainInput = ""
-                                        passwordInput.text = ""
-                                        if (requiresEnterprise) usernameInput.text = ""
-                                    }
-                        Component.onCompleted: () => {
-                                                   if (root.shouldBeVisible && !requiresEnterprise)
-                                                   focusDelayTimer.start()
-                                               }
-
-                        Timer {
-                            id: focusDelayTimer
-
-                            interval: 100
-                            repeat: false
-                            onTriggered: () => {
-                                             if (root.shouldBeVisible) {
-                                                 if (requiresEnterprise && usernameInput) {
-                                                     usernameInput.forceActiveFocus()
-                                                 } else {
-                                                     passwordInput.forceActiveFocus()
-                                                 }
-                                             }
-                                         }
-                        }
-
-                        Connections {
-                            target: root
-
-                            function onShouldBeVisibleChanged() {
-                                if (root.shouldBeVisible)
-                                    focusDelayTimer.start()
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    visible: requiresEnterprise
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: anonInput.activeFocus ? Theme.primary : Theme.outlineStrong
-                    border.width: anonInput.activeFocus ? 2 : 1
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: () => {
-                                       anonInput.forceActiveFocus()
-                                   }
-                    }
-
-                    DankTextField {
-                        id: anonInput
-
-                        anchors.fill: parent
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: Theme.surfaceText
-                        text: wifiAnonymousIdentityInput
-                        placeholderText: I18n.tr("Anonymous Identity (optional)")
-                        backgroundColor: "transparent"
-                        enabled: root.shouldBeVisible
-                        onTextEdited: () => {
-                                          wifiAnonymousIdentityInput = text
-                                      }
-                    }
-                }
-
-                Rectangle {
-                    visible: requiresEnterprise
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: domainMatchInput.activeFocus ? Theme.primary : Theme.outlineStrong
-                    border.width: domainMatchInput.activeFocus ? 2 : 1
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: () => {
-                                       domainMatchInput.forceActiveFocus()
-                                   }
-                    }
-
-                    DankTextField {
-                        id: domainMatchInput
-
-                        anchors.fill: parent
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: Theme.surfaceText
-                        text: wifiDomainInput
-                        placeholderText: I18n.tr("Domain (optional)")
-                        backgroundColor: "transparent"
-                        enabled: root.shouldBeVisible
-                        onTextEdited: () => {
-                                          wifiDomainInput = text
-                                      }
-                    }
-                }
-
-                Row {
-                    spacing: Theme.spacingS
-
-                    Rectangle {
-                        id: showPasswordCheckbox
-
-                        property bool checked: false
-
-                        width: 20
-                        height: 20
-                        radius: 4
-                        color: checked ? Theme.primary : "transparent"
-                        border.color: checked ? Theme.primary : Theme.outlineButton
-                        border.width: 2
-
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: "check"
-                            size: 12
-                            color: Theme.background
-                            visible: parent.checked
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                           showPasswordCheckbox.checked = !showPasswordCheckbox.checked
-                                       }
-                        }
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Show password")
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                Item {
-                    width: parent.width
-                    height: 40
-
-                    Row {
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        Rectangle {
-                            width: Math.max(70, cancelText.contentWidth + Theme.spacingM * 2)
-                            height: 36
-                            radius: Theme.cornerRadius
-                            color: cancelArea.containsMouse ? Theme.surfaceTextHover : "transparent"
-                            border.color: Theme.surfaceVariantAlpha
-                            border.width: 1
-
-                            StyledText {
-                                id: cancelText
-
-                                anchors.centerIn: parent
-                                text: I18n.tr("Cancel")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                            }
-
-                            MouseArea {
-                                id: cancelArea
-
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: () => {
-                                               close()
-                                               wifiPasswordInput = ""
-                                               wifiUsernameInput = ""
-                                               wifiAnonymousIdentityInput = ""
-                                               wifiDomainInput = ""
-                                           }
-                            }
-                        }
-
-                        Rectangle {
-                            width: Math.max(80, connectText.contentWidth + Theme.spacingM * 2)
-                            height: 36
-                            radius: Theme.cornerRadius
-                            color: connectArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
-                            enabled: requiresEnterprise ? (usernameInput.text.length > 0 && passwordInput.text.length > 0) : passwordInput.text.length > 0
-                            opacity: enabled ? 1 : 0.5
-
-                            StyledText {
-                                id: connectText
-
-                                anchors.centerIn: parent
-                                text: I18n.tr("Connect")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.background
-                                font.weight: Font.Medium
-                            }
-
-                            MouseArea {
-                                id: connectArea
-
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                enabled: parent.enabled
-                                onClicked: () => {
-                                               const username = requiresEnterprise ? usernameInput.text : ""
-                                               NetworkService.connectToWifi(
-                                                   wifiPasswordSSID,
-                                                   passwordInput.text,
-                                                   username,
-                                                   wifiAnonymousIdentityInput,
-                                                   wifiDomainInput
-                                               )
-                                               close()
-                                               wifiPasswordInput = ""
-                                               wifiUsernameInput = ""
-                                               wifiAnonymousIdentityInput = ""
-                                               wifiDomainInput = ""
-                                               passwordInput.text = ""
-                                               if (requiresEnterprise) usernameInput.text = ""
-                                           }
-                            }
-
-                            Behavior on color {
-                                ColorAnimation {
-                                    duration: Theme.shortDuration
-                                    easing.type: Theme.standardEasing
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Modules/ControlCenter/Details/AudioOutputDetail.qml

@@ -1,208 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Services.Pipewire
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    property bool hasVolumeSliderInCC: {
-        const widgets = SettingsData.controlCenterWidgets || []
-        return widgets.some(widget => widget.id === "volumeSlider")
-    }
-
-    implicitHeight: headerRow.height + (!hasVolumeSliderInCC ? volumeSlider.height : 0) + audioContent.height + Theme.spacingM
-    radius: Theme.cornerRadius
-    color: Theme.surfaceContainerHigh
-    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
-    
-    Row {
-        id: headerRow
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.leftMargin: Theme.spacingM
-        anchors.rightMargin: Theme.spacingM
-        anchors.topMargin: Theme.spacingS
-        height: 40
-        
-        StyledText {
-            id: headerText
-            text: I18n.tr("Audio Devices")
-            font.pixelSize: Theme.fontSizeLarge
-            color: Theme.surfaceText
-            font.weight: Font.Medium
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
-
-    Row {
-        id: volumeSlider
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: headerRow.bottom
-        anchors.leftMargin: Theme.spacingM
-        anchors.rightMargin: Theme.spacingM
-        anchors.topMargin: Theme.spacingXS
-        height: 35
-        spacing: 0
-        visible: !hasVolumeSliderInCC
-
-        Rectangle {
-            width: Theme.iconSize + Theme.spacingS * 2
-            height: Theme.iconSize + Theme.spacingS * 2
-            anchors.verticalCenter: parent.verticalCenter
-            radius: (Theme.iconSize + Theme.spacingS * 2) / 2
-            color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-            MouseArea {
-                id: iconArea
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        AudioService.sink.audio.muted = !AudioService.sink.audio.muted
-                    }
-                }
-            }
-
-            DankIcon {
-                anchors.centerIn: parent
-                name: {
-                    if (!AudioService.sink || !AudioService.sink.audio) return "volume_off"
-                    let muted = AudioService.sink.audio.muted
-                    let volume = AudioService.sink.audio.volume
-                    if (muted || volume === 0.0) return "volume_off"
-                    if (volume <= 0.33) return "volume_down"
-                    if (volume <= 0.66) return "volume_up"
-                    return "volume_up"
-                }
-                size: Theme.iconSize
-                color: AudioService.sink && AudioService.sink.audio && !AudioService.sink.audio.muted && AudioService.sink.audio.volume > 0 ? Theme.primary : Theme.surfaceText
-            }
-        }
-
-        DankSlider {
-            readonly property real actualVolumePercent: AudioService.sink && AudioService.sink.audio ? Math.round(AudioService.sink.audio.volume * 100) : 0
-
-            anchors.verticalCenter: parent.verticalCenter
-            width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
-            enabled: AudioService.sink && AudioService.sink.audio
-            minimum: 0
-            maximum: 100
-            value: AudioService.sink && AudioService.sink.audio ? Math.min(100, Math.round(AudioService.sink.audio.volume * 100)) : 0
-            showValue: true
-            unit: "%"
-            valueOverride: actualVolumePercent
-            thumbOutlineColor: Theme.surfaceVariant
-
-            onSliderValueChanged: function(newValue) {
-                if (AudioService.sink && AudioService.sink.audio) {
-                    AudioService.sink.audio.volume = newValue / 100
-                    if (newValue > 0 && AudioService.sink.audio.muted) {
-                        AudioService.sink.audio.muted = false
-                    }
-                    AudioService.volumeChanged()
-                }
-            }
-        }
-    }
-
-    DankFlickable {
-        id: audioContent
-        anchors.top: volumeSlider.visible ? volumeSlider.bottom : headerRow.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        anchors.margins: Theme.spacingM
-        anchors.topMargin: volumeSlider.visible ? Theme.spacingS : Theme.spacingM
-        contentHeight: audioColumn.height
-        clip: true
-        
-        Column {
-            id: audioColumn
-            width: parent.width
-            spacing: Theme.spacingS
-            
-            Repeater {
-                model: Pipewire.nodes.values.filter(node => {
-                    return node.audio && node.isSink && !node.isStream
-                })
-                
-                delegate: Rectangle {
-                    required property var modelData
-                    required property int index
-                    
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
-                    border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: 0
-                    
-                    Row {
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.leftMargin: Theme.spacingM
-                        spacing: Theme.spacingS
-                        
-                        DankIcon {
-                            name: {
-                                if (modelData.name.includes("bluez"))
-                                    return "headset"
-                                else if (modelData.name.includes("hdmi"))
-                                    return "tv"
-                                else if (modelData.name.includes("usb"))
-                                    return "headset"
-                                else
-                                    return "speaker"
-                            }
-                            size: Theme.iconSize - 4
-                            color: modelData === AudioService.sink ? Theme.primary : Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                        
-                        Column {
-                            anchors.verticalCenter: parent.verticalCenter
-                            width: parent.parent.width - parent.parent.anchors.leftMargin - parent.spacing - Theme.iconSize - Theme.spacingM
-                            
-                            StyledText {
-                                text: AudioService.displayName(modelData)
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: modelData === AudioService.sink ? Font.Medium : Font.Normal
-                                elide: Text.ElideRight
-                                width: parent.width
-                                wrapMode: Text.NoWrap
-                            }
-                            
-                            StyledText {
-                                text: modelData === AudioService.sink ? "Active" : "Available"
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                elide: Text.ElideRight
-                                width: parent.width
-                                wrapMode: Text.NoWrap
-                            }
-                        }
-                    }
-                    
-                    MouseArea {
-                        id: deviceMouseArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            if (modelData) {
-                                Pipewire.preferredDefaultAudioSink = modelData
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

Modules/ControlCenter/Details/BrightnessDetail.qml

@@ -1,174 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property string currentDeviceName: ""
-    property string instanceId: ""
-
-    signal deviceNameChanged(string newDeviceName)
-
-    implicitHeight: brightnessContent.height + Theme.spacingM
-    radius: Theme.cornerRadius
-    color: Theme.surfaceContainerHigh
-    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
-
-    DankFlickable {
-        id: brightnessContent
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        anchors.margins: Theme.spacingM
-        anchors.topMargin: Theme.spacingM
-        contentHeight: brightnessColumn.height
-        clip: true
-
-        Column {
-            id: brightnessColumn
-            width: parent.width
-            spacing: Theme.spacingS
-
-            Item {
-                width: parent.width
-                height: 100
-                visible: !DisplayService.brightnessAvailable || !DisplayService.devices || DisplayService.devices.length === 0
-
-                Column {
-                    anchors.centerIn: parent
-                    spacing: Theme.spacingM
-
-                    DankIcon {
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        name: DisplayService.brightnessAvailable ? "brightness_6" : "error"
-                        size: 32
-                        color: DisplayService.brightnessAvailable ? Theme.primary : Theme.error
-                    }
-
-                    StyledText {
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        text: DisplayService.brightnessAvailable ? "No brightness devices available" : "Brightness control not available"
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceText
-                        horizontalAlignment: Text.AlignHCenter
-                    }
-                }
-            }
-
-            Repeater {
-                model: DisplayService.devices || []
-                delegate: Rectangle {
-                    required property var modelData
-                    required property int index
-
-                    width: parent.width
-                    height: 80
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceContainerHighest
-                    border.color: modelData.name === currentDeviceName ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: modelData.name === currentDeviceName ? 2 : 0
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.leftMargin: Theme.spacingM
-                        spacing: Theme.spacingM
-
-                        Column {
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: 2
-
-                            DankIcon {
-                                name: {
-                                    const deviceClass = modelData.class || ""
-                                    const deviceName = modelData.name || ""
-
-                                    if (deviceClass === "backlight" || deviceClass === "ddc") {
-                                        const brightness = modelData.percentage || 50
-                                        if (brightness <= 33) return "brightness_low"
-                                        if (brightness <= 66) return "brightness_medium"
-                                        return "brightness_high"
-                                    } else if (deviceName.includes("kbd")) {
-                                        return "keyboard"
-                                    } else {
-                                        return "lightbulb"
-                                    }
-                                }
-                                size: Theme.iconSize
-                                color: modelData.name === currentDeviceName ? Theme.primary : Theme.surfaceText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: (modelData.percentage || 50) + "%"
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-                        }
-
-                        Column {
-                            anchors.verticalCenter: parent.verticalCenter
-                            width: parent.parent.width - parent.parent.anchors.leftMargin - parent.spacing - 50 - Theme.spacingM
-
-                            StyledText {
-                                text: {
-                                    const name = modelData.name || ""
-                                    const deviceClass = modelData.class || ""
-                                    if (deviceClass === "backlight") {
-                                        return name.replace("_", " ").replace(/\b\w/g, c => c.toUpperCase())
-                                    }
-                                    return name
-                                }
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: modelData.name === currentDeviceName ? Font.Medium : Font.Normal
-                                elide: Text.ElideRight
-                                width: parent.width
-                            }
-
-                            StyledText {
-                                text: modelData.name
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                elide: Text.ElideRight
-                                width: parent.width
-                            }
-
-                            StyledText {
-                                text: {
-                                    const deviceClass = modelData.class || ""
-                                    if (deviceClass === "backlight") return "Backlight device"
-                                    if (deviceClass === "ddc") return "DDC/CI monitor"
-                                    if (deviceClass === "leds") return "LED device"
-                                    return deviceClass
-                                }
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                elide: Text.ElideRight
-                                width: parent.width
-                            }
-                        }
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            currentDeviceName = modelData.name
-                            deviceNameChanged(modelData.name)
-                        }
-                    }
-
-                }
-            }
-        }
-    }
-}

Modules/ControlCenter/PowerMenu.qml

@@ -1,316 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Io
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Widgets
-
-PanelWindow {
-    id: root
-
-    readonly property string powerOptionsText: I18n.tr("Power Options")
-    readonly property string logOutText: I18n.tr("Log Out")
-    readonly property string suspendText: I18n.tr("Suspend")
-    readonly property string rebootText: I18n.tr("Reboot")
-    readonly property string powerOffText: I18n.tr("Power Off")
-
-    property bool powerMenuVisible: false
-    signal powerActionRequested(string action, string title, string message)
-
-    visible: powerMenuVisible
-    implicitWidth: 400
-    implicitHeight: 320
-    WlrLayershell.layer: WlrLayershell.Overlay
-    WlrLayershell.exclusiveZone: -1
-    WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-    color: "transparent"
-
-    anchors {
-        top: true
-        left: true
-        right: true
-        bottom: true
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            powerMenuVisible = false
-        }
-    }
-
-    Rectangle {
-        width: Math.min(320, parent.width - Theme.spacingL * 2)
-        height: 320 // Fixed height to prevent cropping
-        x: Math.max(Theme.spacingL, parent.width - width - Theme.spacingL)
-        y: Theme.barHeight + Theme.spacingXS
-        color: Theme.popupBackground()
-        radius: Theme.cornerRadius
-        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
-                              Theme.outline.b, 0.08)
-        border.width: 0
-        opacity: powerMenuVisible ? 1 : 0
-        scale: powerMenuVisible ? 1 : 0.85
-
-        MouseArea {
-
-            anchors.fill: parent
-            onClicked: {
-
-            }
-        }
-
-        Column {
-            anchors.fill: parent
-            anchors.margins: Theme.spacingL
-            spacing: Theme.spacingM
-
-            Row {
-                width: parent.width
-
-                StyledText {
-                    text: root.powerOptionsText
-                    font.pixelSize: Theme.fontSizeLarge
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                Item {
-                    width: parent.width - 150
-                    height: 1
-                }
-
-                DankActionButton {
-                    iconName: "close"
-                    iconSize: Theme.iconSize - 4
-                    iconColor: Theme.surfaceText
-                    onClicked: {
-                        powerMenuVisible = false
-                    }
-                }
-            }
-
-            Column {
-                width: parent.width
-                spacing: Theme.spacingS
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: logoutArea.containsMouse ? Qt.rgba(Theme.primary.r,
-                                                              Theme.primary.g,
-                                                              Theme.primary.b,
-                                                              0.08) : Qt.rgba(
-                                                          Theme.surfaceVariant.r,
-                                                          Theme.surfaceVariant.g,
-                                                          Theme.surfaceVariant.b,
-                                                          0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "logout"
-                            size: Theme.iconSize
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.logOutText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: logoutArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "logout", "Log Out",
-                                        "Are you sure you want to log out?")
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: suspendArea.containsMouse ? Qt.rgba(Theme.primary.r,
-                                                               Theme.primary.g,
-                                                               Theme.primary.b,
-                                                               0.08) : Qt.rgba(
-                                                           Theme.surfaceVariant.r,
-                                                           Theme.surfaceVariant.g,
-                                                           Theme.surfaceVariant.b,
-                                                           0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "bedtime"
-                            size: Theme.iconSize
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.suspendText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: suspendArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "suspend", "Suspend",
-                                        "Are you sure you want to suspend the system?")
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: rebootArea.containsMouse ? Qt.rgba(Theme.warning.r,
-                                                              Theme.warning.g,
-                                                              Theme.warning.b,
-                                                              0.08) : Qt.rgba(
-                                                          Theme.surfaceVariant.r,
-                                                          Theme.surfaceVariant.g,
-                                                          Theme.surfaceVariant.b,
-                                                          0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "restart_alt"
-                            size: Theme.iconSize
-                            color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.rebootText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: rebootArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "reboot", "Reboot",
-                                        "Are you sure you want to reboot the system?")
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: powerOffArea.containsMouse ? Qt.rgba(Theme.error.r,
-                                                                Theme.error.g,
-                                                                Theme.error.b,
-                                                                0.08) : Qt.rgba(
-                                                            Theme.surfaceVariant.r,
-                                                            Theme.surfaceVariant.g,
-                                                            Theme.surfaceVariant.b,
-                                                            0.08)
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "power_settings_new"
-                            size: Theme.iconSize
-                            color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: root.powerOffText
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: powerOffArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            powerMenuVisible = false
-                            root.powerActionRequested(
-                                        "poweroff", "Power Off",
-                                        "Are you sure you want to power off the system?")
-                        }
-                    }
-                }
-            }
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: Theme.mediumDuration
-                easing.type: Theme.emphasizedEasing
-            }
-        }
-
-        Behavior on scale {
-            NumberAnimation {
-                duration: Theme.mediumDuration
-                easing.type: Theme.emphasizedEasing
-            }
-        }
-    }
-}

Modules/ControlCenter/Widgets/AudioInputPill.qml

@@ -1,63 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Services.Pipewire
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    property var defaultSource: AudioService.source
-
-    iconName: {
-        if (!defaultSource) return "mic_off"
-
-        let volume = defaultSource.audio.volume
-        let muted = defaultSource.audio.muted
-
-        if (muted || volume === 0.0) return "mic_off"
-        return "mic"
-    }
-
-    isActive: defaultSource && !defaultSource.audio.muted
-
-    primaryText: {
-        if (!defaultSource) {
-            return "No input device"
-        }
-        return defaultSource.description || "Audio Input"
-    }
-
-    secondaryText: {
-        if (!defaultSource) {
-            return "Select device"
-        }
-        if (defaultSource.audio.muted) {
-            return "Muted"
-        }
-        return Math.round(defaultSource.audio.volume * 100) + "%"
-    }
-
-    onToggled: {
-        if (defaultSource && defaultSource.audio) {
-            defaultSource.audio.muted = !defaultSource.audio.muted
-        }
-    }
-
-    onWheelEvent: function (wheelEvent) {
-        if (!defaultSource || !defaultSource.audio) return
-        let delta = wheelEvent.angleDelta.y
-        let currentVolume = defaultSource.audio.volume * 100
-        let newVolume
-        if (delta > 0)
-            newVolume = Math.min(100, currentVolume + 5)
-        else
-            newVolume = Math.max(0, currentVolume - 5)
-        defaultSource.audio.muted = false
-        defaultSource.audio.volume = newVolume / 100
-        wheelEvent.accepted = true
-    }
-}

Modules/ControlCenter/Widgets/AudioOutputPill.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Services.Pipewire
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    property var defaultSink: AudioService.sink
-
-    iconName: {
-        if (!defaultSink) return "volume_off"
-
-        let volume = defaultSink.audio.volume
-        let muted = defaultSink.audio.muted
-
-        if (muted || volume === 0.0) return "volume_off"
-        if (volume <= 0.33) return "volume_down"
-        if (volume <= 0.66) return "volume_up"
-        return "volume_up"
-    }
-
-    isActive: defaultSink && !defaultSink.audio.muted
-
-    primaryText: {
-        if (!defaultSink) {
-            return "No output device"
-        }
-        return defaultSink.description || "Audio Output"
-    }
-
-    secondaryText: {
-        if (!defaultSink) {
-            return "Select device"
-        }
-        if (defaultSink.audio.muted) {
-            return "Muted"
-        }
-        return Math.round(defaultSink.audio.volume * 100) + "%"
-    }
-
-    onToggled: {
-        if (defaultSink && defaultSink.audio) {
-            defaultSink.audio.muted = !defaultSink.audio.muted
-        }
-    }
-
-    onWheelEvent: function (wheelEvent) {
-        if (!defaultSink || !defaultSink.audio) return
-        let delta = wheelEvent.angleDelta.y
-        let currentVolume = defaultSink.audio.volume * 100
-        let newVolume
-        if (delta > 0)
-            newVolume = Math.min(100, currentVolume + 5)
-        else
-            newVolume = Math.max(0, currentVolume - 5)
-        defaultSink.audio.muted = false
-        defaultSink.audio.volume = newVolume / 100
-        AudioService.volumeChanged()
-        wheelEvent.accepted = true
-    }
-}

Modules/ControlCenter/Widgets/BluetoothPill.qml

@@ -1,70 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    property var primaryDevice: {
-        if (!BluetoothService.adapter || !BluetoothService.adapter.devices) {
-            return null
-        }
-
-        let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
-        for (let device of devices) {
-            if (device && device.connected) {
-                return device
-            }
-        }
-        return null
-    }
-
-    iconName: {
-        if (!BluetoothService.available) {
-            return "bluetooth_disabled"
-        }
-        if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
-            return "bluetooth_disabled"
-        }
-        return "bluetooth"
-    }
-
-    isActive: !!(BluetoothService.available && BluetoothService.adapter && BluetoothService.adapter.enabled)
-    showExpandArea: BluetoothService.available
-
-    primaryText: {
-        if (!BluetoothService.available) {
-            return "Bluetooth"
-        }
-        if (!BluetoothService.adapter) {
-            return "No adapter"
-        }
-        if (!BluetoothService.adapter.enabled) {
-            return "Disabled"
-        }
-        return "Enabled"
-    }
-
-    secondaryText: {
-        if (!BluetoothService.available) {
-            return "No adapters"
-        }
-        if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
-            return "Off"
-        }
-        if (primaryDevice) {
-            return primaryDevice.name || primaryDevice.alias || primaryDevice.deviceName || "Connected Device"
-        }
-        return "No devices"
-    }
-
-    onToggled: {
-        if (BluetoothService.available && BluetoothService.adapter) {
-            BluetoothService.adapter.enabled = !BluetoothService.adapter.enabled
-        }
-    }
-}

Modules/ControlCenter/Widgets/BrightnessSliderRow.qml

@@ -1,136 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Row {
-    id: root
-
-    property string deviceName: ""
-    property string instanceId: ""
-
-    signal iconClicked()
-
-    height: 40
-    spacing: 0
-
-    property string targetDeviceName: {
-        if (!DisplayService.brightnessAvailable || !DisplayService.devices || DisplayService.devices.length === 0) {
-            return ""
-        }
-
-        if (deviceName && deviceName.length > 0) {
-            const found = DisplayService.devices.find(dev => dev.name === deviceName)
-            return found ? found.name : ""
-        }
-
-        const currentDeviceName = DisplayService.currentDevice
-        if (currentDeviceName) {
-            const found = DisplayService.devices.find(dev => dev.name === currentDeviceName)
-            return found ? found.name : ""
-        }
-
-        return DisplayService.devices.length > 0 ? DisplayService.devices[0].name : ""
-    }
-
-    property var targetDevice: {
-        if (!targetDeviceName || !DisplayService.devices) {
-            return null
-        }
-
-        return DisplayService.devices.find(dev => dev.name === targetDeviceName) || null
-    }
-
-    property real targetBrightness: {
-        if (!targetDeviceName) {
-            return 0
-        }
-
-        return DisplayService.getDeviceBrightness(targetDeviceName)
-    }
-
-    Rectangle {
-        width: Theme.iconSize + Theme.spacingS * 2
-        height: Theme.iconSize + Theme.spacingS * 2
-        anchors.verticalCenter: parent.verticalCenter
-        radius: (Theme.iconSize + Theme.spacingS * 2) / 2
-        color: iconArea.containsMouse
-               ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-               : Theme.withAlpha(Theme.primary, 0)
-
-        MouseArea {
-            id: iconArea
-            anchors.fill: parent
-            hoverEnabled: true
-            cursorShape: DisplayService.devices && DisplayService.devices.length > 1 ? Qt.PointingHandCursor : Qt.ArrowCursor
-
-            onClicked: {
-                if (DisplayService.devices && DisplayService.devices.length > 1) {
-                    root.iconClicked()
-                }
-            }
-
-            onEntered: {
-                tooltipLoader.active = true
-                if (tooltipLoader.item) {
-                    const tooltipText = targetDevice ? "bl device: " + targetDevice.name : "Backlight Control"
-                    const p = iconArea.mapToItem(null, iconArea.width / 2, 0)
-                    tooltipLoader.item.show(tooltipText, p.x, p.y - 40, null)
-                }
-            }
-
-            onExited: {
-                if (tooltipLoader.item) {
-                    tooltipLoader.item.hide()
-                }
-                tooltipLoader.active = false
-            }
-
-            DankIcon {
-                anchors.centerIn: parent
-                name: {
-                    if (!DisplayService.brightnessAvailable || !targetDevice) {
-                        return "brightness_low"
-                    }
-
-                    if (targetDevice.class === "backlight" || targetDevice.class === "ddc") {
-                        const brightness = targetBrightness
-                        if (brightness <= 33) return "brightness_low"
-                        if (brightness <= 66) return "brightness_medium"
-                        return "brightness_high"
-                    } else if (targetDevice.name.includes("kbd")) {
-                        return "keyboard"
-                    } else {
-                        return "lightbulb"
-                    }
-                }
-                size: Theme.iconSize
-                color: DisplayService.brightnessAvailable && targetDevice && targetBrightness > 0 ? Theme.primary : Theme.surfaceText
-            }
-        }
-    }
-
-    DankSlider {
-        anchors.verticalCenter: parent.verticalCenter
-        width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
-        enabled: DisplayService.brightnessAvailable && targetDeviceName.length > 0
-        minimum: 1
-        maximum: 100
-        value: targetBrightness
-        onSliderValueChanged: function(newValue) {
-            if (DisplayService.brightnessAvailable && targetDeviceName) {
-                DisplayService.setBrightness(newValue, targetDeviceName)
-            }
-        }
-        thumbOutlineColor: Theme.surfaceContainer
-        trackColor: Theme.surfaceContainerHigh
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-}

Modules/DankBar/AutoHideManager.qml

@@ -1,179 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    required property var barWindow
-    required property var axis
-    required property var appDrawerLoader
-    required property var dankDashPopoutLoader
-    required property var processListPopoutLoader
-    required property var notificationCenterLoader
-    required property var batteryPopoutLoader
-    required property var vpnPopoutLoader
-    required property var controlCenterLoader
-    required property var clipboardHistoryModalPopup
-    required property var systemUpdateLoader
-    required property var notepadInstance
-
-    property alias reveal: core.reveal
-    property alias autoHide: core.autoHide
-    property alias backgroundTransparency: core.backgroundTransparency
-    property alias hasActivePopout: core.hasActivePopout
-    property alias mouseArea: topBarMouseArea
-
-    Item {
-        id: inputMask
-
-        readonly property int barThickness: barWindow.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing)
-
-        readonly property bool showing: SettingsData.dankBarVisible && (core.reveal
-                                 || (CompositorService.isNiri && NiriService.inOverview && SettingsData.dankBarOpenOnOverview)
-                                 || !core.autoHide)
-
-        readonly property int maskThickness: showing ? barThickness : 1
-
-        x: {
-            if (!axis.isVertical) {
-                return 0
-            } else {
-                switch (SettingsData.dankBarPosition) {
-                case SettingsData.Position.Left:  return 0
-                case SettingsData.Position.Right: return parent.width - maskThickness
-                default: return 0
-                }
-            }
-        }
-        y: {
-            if (axis.isVertical) {
-                return 0
-            } else {
-                switch (SettingsData.dankBarPosition) {
-                case SettingsData.Position.Top:    return 0
-                case SettingsData.Position.Bottom: return parent.height - maskThickness
-                default: return 0
-                }
-            }
-        }
-        width: axis.isVertical ? maskThickness : parent.width
-        height: axis.isVertical ? parent.height : maskThickness
-    }
-
-    Region {
-        id: mask
-        item: inputMask
-    }
-
-    property alias maskRegion: mask
-
-    QtObject {
-        id: core
-
-        property real backgroundTransparency: SettingsData.dankBarTransparency
-        property bool autoHide: SettingsData.dankBarAutoHide
-        property bool revealSticky: false
-
-        property bool notepadInstanceVisible: notepadInstance?.isVisible ?? false
-
-        readonly property bool hasActivePopout: {
-            const loaders = [{
-                                 "loader": appDrawerLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": dankDashPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": processListPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": notificationCenterLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": batteryPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": vpnPopoutLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": controlCenterLoader,
-                                 "prop": "shouldBeVisible"
-                             }, {
-                                 "loader": clipboardHistoryModalPopup,
-                                 "prop": "visible"
-                             }, {
-                                 "loader": systemUpdateLoader,
-                                 "prop": "shouldBeVisible"
-                             }]
-            return notepadInstanceVisible || loaders.some(item => {
-                if (item.loader) {
-                    return item.loader?.item?.[item.prop]
-                }
-                return false
-            })
-        }
-
-        property bool reveal: {
-            if (CompositorService.isNiri && NiriService.inOverview) {
-                return SettingsData.dankBarOpenOnOverview
-            }
-            return SettingsData.dankBarVisible && (!autoHide || topBarMouseArea.containsMouse || hasActivePopout || revealSticky)
-        }
-
-        onHasActivePopoutChanged: {
-            if (!hasActivePopout && autoHide && !topBarMouseArea.containsMouse) {
-                revealSticky = true
-                revealHold.restart()
-            }
-        }
-    }
-
-    Timer {
-        id: revealHold
-        interval: 250
-        repeat: false
-        onTriggered: core.revealSticky = false
-    }
-
-    Connections {
-        function onDankBarTransparencyChanged() {
-            core.backgroundTransparency = SettingsData.dankBarTransparency
-        }
-
-        target: SettingsData
-    }
-
-    Connections {
-        target: topBarMouseArea
-        function onContainsMouseChanged() {
-            if (topBarMouseArea.containsMouse) {
-                core.revealSticky = true
-                revealHold.stop()
-            } else {
-                if (core.autoHide && !core.hasActivePopout) {
-                    revealHold.restart()
-                }
-            }
-        }
-    }
-
-    MouseArea {
-        id: topBarMouseArea
-        y: !barWindow.isVertical ? (SettingsData.dankBarPosition === SettingsData.Position.Bottom ? parent.height - height : 0) : 0
-        x: barWindow.isVertical ? (SettingsData.dankBarPosition === SettingsData.Position.Right ? parent.width - width : 0) : 0
-        height: !barWindow.isVertical ? barWindow.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing) : undefined
-        width: barWindow.isVertical ? barWindow.px(barWindow.effectiveBarThickness + SettingsData.dankBarSpacing) : undefined
-        anchors {
-            left: !barWindow.isVertical ? parent.left : (SettingsData.dankBarPosition === SettingsData.Position.Left ? parent.left : undefined)
-            right: !barWindow.isVertical ? parent.right : (SettingsData.dankBarPosition === SettingsData.Position.Right ? parent.right : undefined)
-            top: barWindow.isVertical ? parent.top : undefined
-            bottom: barWindow.isVertical ? parent.bottom : undefined
-        }
-        hoverEnabled: SettingsData.dankBarAutoHide && !core.reveal
-        acceptedButtons: Qt.NoButton
-        enabled: SettingsData.dankBarAutoHide && !core.reveal
-    }
-}

Modules/DankBar/BarCanvas.qml

@@ -1,372 +0,0 @@
-import QtQuick
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    required property var barWindow
-    required property var axis
-
-    anchors.fill: parent
-
-    anchors.left: parent.left
-    anchors.top: parent.top
-    anchors.leftMargin: -(SettingsData.dankBarGothCornersEnabled && axis.isVertical && axis.edge === "right" ? barWindow._wingR : 0)
-    anchors.rightMargin: -(SettingsData.dankBarGothCornersEnabled && axis.isVertical && axis.edge === "left" ? barWindow._wingR : 0)
-    anchors.topMargin: -(SettingsData.dankBarGothCornersEnabled && !axis.isVertical && axis.edge === "bottom" ? barWindow._wingR : 0)
-    anchors.bottomMargin: -(SettingsData.dankBarGothCornersEnabled && !axis.isVertical && axis.edge === "top" ? barWindow._wingR : 0)
-
-    readonly property real dpr: {
-        if (CompositorService.isNiri && barWindow.screen) {
-            const niriScale = NiriService.displayScales[barWindow.screen.name]
-            if (niriScale !== undefined) return niriScale
-        }
-        if (CompositorService.isHyprland && barWindow.screen) {
-            const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === barWindow.screen.name)
-            if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
-        }
-        return barWindow.screen?.devicePixelRatio || 1
-    }
-
-    function requestRepaint() {
-        debounceTimer.restart()
-    }
-
-    Timer {
-        id: debounceTimer
-        interval: 50
-        repeat: false
-        onTriggered: {
-            barShape.requestPaint()
-            barTint.requestPaint()
-            barBorder.requestPaint()
-        }
-    }
-
-    Canvas {
-        id: barShape
-        anchors.fill: parent
-        antialiasing: true
-        renderTarget: Canvas.FramebufferObject
-        renderStrategy: Canvas.Cooperative
-
-        readonly property real correctWidth: Theme.px(root.width, dpr)
-        readonly property real correctHeight: Theme.px(root.height, dpr)
-        canvasSize: Qt.size(correctWidth, correctHeight)
-
-        property real wing: SettingsData.dankBarGothCornersEnabled ? Theme.px(barWindow._wingR, dpr) : 0
-        property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.px(Theme.cornerRadius, dpr)
-
-        onWingChanged: root.requestRepaint()
-        onRtChanged: root.requestRepaint()
-        onCorrectWidthChanged: root.requestRepaint()
-        onCorrectHeightChanged: root.requestRepaint()
-        onVisibleChanged: if (visible) root.requestRepaint()
-        Component.onCompleted: root.requestRepaint()
-
-        Connections {
-            target: root
-            function onDprChanged() { root.requestRepaint() }
-        }
-
-        Connections {
-            target: barWindow
-            function on_BgColorChanged() { root.requestRepaint() }
-        }
-
-        Connections {
-            target: Theme
-            function onIsLightModeChanged() { root.requestRepaint() }
-            function onSurfaceContainerChanged() { root.requestRepaint() }
-        }
-
-        onPaint: {
-            const ctx = getContext("2d")
-            const W = barWindow.isVertical ? correctHeight : correctWidth
-            const H_raw = barWindow.isVertical ? correctWidth : correctHeight
-            const R = wing
-            const RT = rt
-            const H = H_raw - (R > 0 ? R : 0)
-            const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
-            const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
-            const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
-            const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
-
-            function drawTopPath() {
-                ctx.beginPath()
-                ctx.moveTo(RT, 0)
-                ctx.lineTo(W - RT, 0)
-                ctx.arcTo(W, 0, W, RT, RT)
-                ctx.lineTo(W, H)
-
-                if (R > 0) {
-                    ctx.lineTo(W, H + R)
-                    ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
-                    ctx.lineTo(R, H)
-                    ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
-                    ctx.lineTo(0, H + R)
-                } else {
-                    ctx.lineTo(W, H - RT)
-                    ctx.arcTo(W, H, W - RT, H, RT)
-                    ctx.lineTo(RT, H)
-                    ctx.arcTo(0, H, 0, H - RT, RT)
-                }
-
-                ctx.lineTo(0, RT)
-                ctx.arcTo(0, 0, RT, 0, RT)
-                ctx.closePath()
-            }
-
-            ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
-
-            ctx.save()
-            if (isBottom) {
-                ctx.translate(W, H_raw)
-                ctx.rotate(Math.PI)
-            } else if (isLeft) {
-                ctx.translate(0, W)
-                ctx.rotate(-Math.PI / 2)
-            } else if (isRight) {
-                ctx.translate(H_raw, 0)
-                ctx.rotate(Math.PI / 2)
-            }
-
-            drawTopPath()
-            ctx.restore()
-
-            ctx.fillStyle = barWindow._bgColor
-            ctx.fill()
-        }
-    }
-
-    Canvas {
-        id: barTint
-        anchors.fill: parent
-        antialiasing: true
-        renderTarget: Canvas.FramebufferObject
-        renderStrategy: Canvas.Cooperative
-
-        readonly property real correctWidth: Theme.px(root.width, dpr)
-        readonly property real correctHeight: Theme.px(root.height, dpr)
-        canvasSize: Qt.size(correctWidth, correctHeight)
-
-        property real wing: SettingsData.dankBarGothCornersEnabled ? Theme.px(barWindow._wingR, dpr) : 0
-        property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.px(Theme.cornerRadius, dpr)
-        property real alphaTint: (barWindow._bgColor?.a ?? 1) < 0.99 ? (Theme.stateLayerOpacity ?? 0) : 0
-
-        onWingChanged: root.requestRepaint()
-        onRtChanged: root.requestRepaint()
-        onAlphaTintChanged: root.requestRepaint()
-        onCorrectWidthChanged: root.requestRepaint()
-        onCorrectHeightChanged: root.requestRepaint()
-        onVisibleChanged: if (visible) root.requestRepaint()
-        Component.onCompleted: root.requestRepaint()
-
-        Connections {
-            target: root
-            function onDprChanged() { root.requestRepaint() }
-        }
-
-        Connections {
-            target: barWindow
-            function on_BgColorChanged() { root.requestRepaint() }
-        }
-
-        Connections {
-            target: Theme
-            function onIsLightModeChanged() { root.requestRepaint() }
-            function onSurfaceChanged() { root.requestRepaint() }
-        }
-
-        onPaint: {
-            const ctx = getContext("2d")
-            const W = barWindow.isVertical ? correctHeight : correctWidth
-            const H_raw = barWindow.isVertical ? correctWidth : correctHeight
-            const R = wing
-            const RT = rt
-            const H = H_raw - (R > 0 ? R : 0)
-            const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
-            const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
-            const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
-            const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
-
-            function drawTopPath() {
-                ctx.beginPath()
-                ctx.moveTo(RT, 0)
-                ctx.lineTo(W - RT, 0)
-                ctx.arcTo(W, 0, W, RT, RT)
-                ctx.lineTo(W, H)
-
-                if (R > 0) {
-                    ctx.lineTo(W, H + R)
-                    ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
-                    ctx.lineTo(R, H)
-                    ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
-                    ctx.lineTo(0, H + R)
-                } else {
-                    ctx.lineTo(W, H - RT)
-                    ctx.arcTo(W, H, W - RT, H, RT)
-                    ctx.lineTo(RT, H)
-                    ctx.arcTo(0, H, 0, H - RT, RT)
-                }
-
-                ctx.lineTo(0, RT)
-                ctx.arcTo(0, 0, RT, 0, RT)
-                ctx.closePath()
-            }
-
-            ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
-
-            ctx.save()
-            if (isBottom) {
-                ctx.translate(W, H_raw)
-                ctx.rotate(Math.PI)
-            } else if (isLeft) {
-                ctx.translate(0, W)
-                ctx.rotate(-Math.PI / 2)
-            } else if (isRight) {
-                ctx.translate(H_raw, 0)
-                ctx.rotate(Math.PI / 2)
-            }
-
-            drawTopPath()
-            ctx.restore()
-
-            ctx.fillStyle = Qt.rgba(Theme.surface.r, Theme.surface.g, Theme.surface.b, alphaTint)
-            ctx.fill()
-        }
-    }
-
-    Canvas {
-        id: barBorder
-        anchors.fill: parent
-        antialiasing: false
-        visible: SettingsData.dankBarBorderEnabled
-        renderTarget: Canvas.FramebufferObject
-        renderStrategy: Canvas.Cooperative
-
-        readonly property real correctWidth: Theme.px(root.width, dpr)
-        readonly property real correctHeight: Theme.px(root.height, dpr)
-        canvasSize: Qt.size(correctWidth, correctHeight)
-
-        property real wing: SettingsData.dankBarGothCornersEnabled ? Theme.px(barWindow._wingR, dpr) : 0
-        property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.px(Theme.cornerRadius, dpr)
-        property bool borderEnabled: SettingsData.dankBarBorderEnabled
-
-        onWingChanged: root.requestRepaint()
-        onRtChanged: root.requestRepaint()
-        onBorderEnabledChanged: root.requestRepaint()
-        onCorrectWidthChanged: root.requestRepaint()
-        onCorrectHeightChanged: root.requestRepaint()
-        onVisibleChanged: if (visible) root.requestRepaint()
-        Component.onCompleted: root.requestRepaint()
-
-        Connections {
-            target: root
-            function onDprChanged() { root.requestRepaint() }
-        }
-
-        Connections {
-            target: Theme
-            function onIsLightModeChanged() { root.requestRepaint() }
-            function onSurfaceTextChanged() { root.requestRepaint() }
-            function onPrimaryChanged() { root.requestRepaint() }
-            function onSecondaryChanged() { root.requestRepaint() }
-            function onOutlineChanged() { root.requestRepaint() }
-        }
-
-        Connections {
-            target: SettingsData
-            function onDankBarBorderColorChanged() { root.requestRepaint() }
-            function onDankBarBorderOpacityChanged() { root.requestRepaint() }
-            function onDankBarBorderThicknessChanged() { root.requestRepaint() }
-            function onDankBarSpacingChanged() { root.requestRepaint() }
-            function onDankBarSquareCornersChanged() { root.requestRepaint() }
-            function onDankBarTransparencyChanged() { root.requestRepaint() }
-        }
-
-        onPaint: {
-            if (!borderEnabled) return
-
-            const ctx = getContext("2d")
-            const W = barWindow.isVertical ? correctHeight : correctWidth
-            const H_raw = barWindow.isVertical ? correctWidth : correctHeight
-            const R = wing
-            const RT = rt
-            const H = H_raw - (R > 0 ? R : 0)
-            const isTop = SettingsData.dankBarPosition === SettingsData.Position.Top
-            const isBottom = SettingsData.dankBarPosition === SettingsData.Position.Bottom
-            const isLeft = SettingsData.dankBarPosition === SettingsData.Position.Left
-            const isRight = SettingsData.dankBarPosition === SettingsData.Position.Right
-
-            const spacing = SettingsData.dankBarSpacing
-            const hasEdgeGap = spacing > 0 || RT > 0
-
-            function drawTopBorder() {
-                ctx.beginPath()
-
-                if (!hasEdgeGap) {
-                    ctx.moveTo(0, H)
-                    ctx.lineTo(W, H)
-                } else {
-                    ctx.moveTo(RT, 0)
-                    ctx.lineTo(W - RT, 0)
-                    ctx.arcTo(W, 0, W, RT, RT)
-                    ctx.lineTo(W, H)
-
-                    if (R > 0) {
-                        ctx.lineTo(W, H + R)
-                        ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
-                        ctx.lineTo(R, H)
-                        ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
-                        ctx.lineTo(0, H + R)
-                    } else {
-                        ctx.lineTo(W, H - RT)
-                        ctx.arcTo(W, H, W - RT, H, RT)
-                        ctx.lineTo(RT, H)
-                        ctx.arcTo(0, H, 0, H - RT, RT)
-                    }
-
-                    ctx.lineTo(0, RT)
-                    ctx.arcTo(0, 0, RT, 0, RT)
-                }
-
-                ctx.closePath()
-            }
-
-            ctx.reset()
-            ctx.clearRect(0, 0, W, H_raw)
-
-            ctx.save()
-            if (isBottom) {
-                ctx.translate(W, H_raw)
-                ctx.rotate(Math.PI)
-            } else if (isLeft) {
-                ctx.translate(0, W)
-                ctx.rotate(-Math.PI / 2)
-            } else if (isRight) {
-                ctx.translate(H_raw, 0)
-                ctx.rotate(Math.PI / 2)
-            }
-
-            drawTopBorder()
-            ctx.restore()
-
-            const key = SettingsData.dankBarBorderColor || "surfaceText"
-            const base = (key === "surfaceText") ? Theme.surfaceText
-                       : (key === "primary") ? Theme.primary
-                       : Theme.secondary
-            const color = Theme.withAlpha(base, SettingsData.dankBarBorderOpacity ?? 1.0)
-            const thickness = Math.max(1, SettingsData.dankBarBorderThickness ?? 1)
-
-            ctx.globalCompositeOperation = "source-over"
-            ctx.lineWidth = thickness
-            ctx.strokeStyle = color
-            ctx.stroke()
-        }
-    }
-}

Modules/DankBar/CenterSection.qml

@@ -1,460 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    property var widgetsModel: null
-    property var components: null
-    property bool noBackground: false
-    required property var axis
-    property string section: "center"
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-
-    readonly property bool isVertical: axis?.isVertical ?? false
-    readonly property real spacing: noBackground ? 2 : Theme.spacingXS
-
-    property var centerWidgets: []
-    property int totalWidgets: 0
-    property real totalSize: 0
-
-    function updateLayout() {
-        const containerSize = isVertical ? height : width
-        if (containerSize <= 0 || !visible) {
-            return
-        }
-
-        centerWidgets = []
-        totalWidgets = 0
-        totalSize = 0
-
-        let configuredWidgets = 0
-        for (var i = 0; i < centerRepeater.count; i++) {
-            const item = centerRepeater.itemAt(i)
-            if (item && getWidgetVisible(item.widgetId)) {
-                configuredWidgets++
-                if (item.active && item.item) {
-                    centerWidgets.push(item.item)
-                    totalWidgets++
-                    totalSize += isVertical ? item.item.height : item.item.width
-                }
-            }
-        }
-
-        if (totalWidgets > 1) {
-            totalSize += spacing * (totalWidgets - 1)
-        }
-
-        positionWidgets(configuredWidgets)
-    }
-
-    function positionWidgets(configuredWidgets) {
-        if (totalWidgets === 0 || (isVertical ? height : width) <= 0) {
-            return
-        }
-
-        const parentCenter = (isVertical ? height : width) / 2
-        const isOdd = configuredWidgets % 2 === 1
-
-        centerWidgets.forEach(widget => {
-            if (isVertical) {
-                widget.anchors.verticalCenter = undefined
-            } else {
-                widget.anchors.horizontalCenter = undefined
-            }
-        })
-
-        if (isOdd) {
-            const middleIndex = Math.floor(configuredWidgets / 2)
-            let currentActiveIndex = 0
-            let middleWidget = null
-
-            for (var i = 0; i < centerRepeater.count; i++) {
-                const item = centerRepeater.itemAt(i)
-                if (item && getWidgetVisible(item.widgetId)) {
-                    if (currentActiveIndex === middleIndex && item.active && item.item) {
-                        middleWidget = item.item
-                        break
-                    }
-                    currentActiveIndex++
-                }
-            }
-
-            if (middleWidget) {
-                const middleSize = isVertical ? middleWidget.height : middleWidget.width
-                if (isVertical) {
-                    middleWidget.y = parentCenter - (middleSize / 2)
-                } else {
-                    middleWidget.x = parentCenter - (middleSize / 2)
-                }
-
-                let leftWidgets = []
-                let rightWidgets = []
-                let foundMiddle = false
-
-                for (var i = 0; i < centerWidgets.length; i++) {
-                    if (centerWidgets[i] === middleWidget) {
-                        foundMiddle = true
-                        continue
-                    }
-                    if (!foundMiddle) {
-                        leftWidgets.push(centerWidgets[i])
-                    } else {
-                        rightWidgets.push(centerWidgets[i])
-                    }
-                }
-
-                let currentPos = isVertical ? middleWidget.y : middleWidget.x
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= (spacing + size)
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                }
-
-                currentPos = (isVertical ? middleWidget.y : middleWidget.x) + middleSize
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            }
-        } else {
-            let configuredLeftIndex = (configuredWidgets / 2) - 1
-            let configuredRightIndex = configuredWidgets / 2
-            const halfSpacing = spacing / 2
-
-            let leftWidget = null
-            let rightWidget = null
-            let leftWidgets = []
-            let rightWidgets = []
-
-            let currentConfigIndex = 0
-            for (var i = 0; i < centerRepeater.count; i++) {
-                const item = centerRepeater.itemAt(i)
-                if (item && getWidgetVisible(item.widgetId)) {
-                    if (item.active && item.item) {
-                        if (currentConfigIndex < configuredLeftIndex) {
-                            leftWidgets.push(item.item)
-                        } else if (currentConfigIndex === configuredLeftIndex) {
-                            leftWidget = item.item
-                        } else if (currentConfigIndex === configuredRightIndex) {
-                            rightWidget = item.item
-                        } else {
-                            rightWidgets.push(item.item)
-                        }
-                    }
-                    currentConfigIndex++
-                }
-            }
-
-            if (leftWidget && rightWidget) {
-                const leftSize = isVertical ? leftWidget.height : leftWidget.width
-                if (isVertical) {
-                    leftWidget.y = parentCenter - halfSpacing - leftSize
-                    rightWidget.y = parentCenter + halfSpacing
-                } else {
-                    leftWidget.x = parentCenter - halfSpacing - leftSize
-                    rightWidget.x = parentCenter + halfSpacing
-                }
-
-                let currentPos = isVertical ? leftWidget.y : leftWidget.x
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= (spacing + size)
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                }
-
-                currentPos = (isVertical ? rightWidget.y + rightWidget.height : rightWidget.x + rightWidget.width)
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            } else if (leftWidget && !rightWidget) {
-                const leftSize = isVertical ? leftWidget.height : leftWidget.width
-                if (isVertical) {
-                    leftWidget.y = parentCenter - halfSpacing - leftSize
-                } else {
-                    leftWidget.x = parentCenter - halfSpacing - leftSize
-                }
-
-                let currentPos = isVertical ? leftWidget.y : leftWidget.x
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= (spacing + size)
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                }
-
-                currentPos = (isVertical ? leftWidget.y + leftWidget.height : leftWidget.x + leftWidget.width) + spacing
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            } else if (!leftWidget && rightWidget) {
-                if (isVertical) {
-                    rightWidget.y = parentCenter + halfSpacing
-                } else {
-                    rightWidget.x = parentCenter + halfSpacing
-                }
-
-                let currentPos = (isVertical ? rightWidget.y : rightWidget.x) - spacing
-                for (var i = leftWidgets.length - 1; i >= 0; i--) {
-                    const size = isVertical ? leftWidgets[i].height : leftWidgets[i].width
-                    currentPos -= size
-                    if (isVertical) {
-                        leftWidgets[i].y = currentPos
-                    } else {
-                        leftWidgets[i].x = currentPos
-                    }
-                    currentPos -= spacing
-                }
-
-                currentPos = (isVertical ? rightWidget.y + rightWidget.height : rightWidget.x + rightWidget.width)
-                for (var i = 0; i < rightWidgets.length; i++) {
-                    currentPos += spacing
-                    if (isVertical) {
-                        rightWidgets[i].y = currentPos
-                    } else {
-                        rightWidgets[i].x = currentPos
-                    }
-                    currentPos += isVertical ? rightWidgets[i].height : rightWidgets[i].width
-                }
-            } else if (totalWidgets === 1 && centerWidgets[0]) {
-                const size = isVertical ? centerWidgets[0].height : centerWidgets[0].width
-                if (isVertical) {
-                    centerWidgets[0].y = parentCenter - (size / 2)
-                } else {
-                    centerWidgets[0].x = parentCenter - (size / 2)
-                }
-            }
-        }
-    }
-
-    function getWidgetVisible(widgetId) {
-        const widgetVisibility = {
-            "cpuUsage": DgopService.dgopAvailable,
-            "memUsage": DgopService.dgopAvailable,
-            "cpuTemp": DgopService.dgopAvailable,
-            "gpuTemp": DgopService.dgopAvailable,
-            "network_speed_monitor": DgopService.dgopAvailable
-        }
-        return widgetVisibility[widgetId] ?? true
-    }
-
-    function getWidgetComponent(widgetId) {
-        // Build dynamic component map including plugins
-        let baseMap = {
-            "launcherButton": "launcherButtonComponent",
-            "workspaceSwitcher": "workspaceSwitcherComponent",
-            "focusedWindow": "focusedWindowComponent",
-            "runningApps": "runningAppsComponent",
-            "clock": "clockComponent",
-            "music": "mediaComponent",
-            "weather": "weatherComponent",
-            "systemTray": "systemTrayComponent",
-            "privacyIndicator": "privacyIndicatorComponent",
-            "clipboard": "clipboardComponent",
-            "cpuUsage": "cpuUsageComponent",
-            "memUsage": "memUsageComponent",
-            "diskUsage": "diskUsageComponent",
-            "cpuTemp": "cpuTempComponent",
-            "gpuTemp": "gpuTempComponent",
-            "notificationButton": "notificationButtonComponent",
-            "battery": "batteryComponent",
-            "controlCenterButton": "controlCenterButtonComponent",
-            "idleInhibitor": "idleInhibitorComponent",
-            "spacer": "spacerComponent",
-            "separator": "separatorComponent",
-            "network_speed_monitor": "networkComponent",
-            "keyboard_layout_name": "keyboardLayoutNameComponent",
-            "vpn": "vpnComponent",
-            "notepadButton": "notepadButtonComponent",
-            "colorPicker": "colorPickerComponent",
-            "systemUpdate": "systemUpdateComponent"
-        }
-
-        // For built-in components, get from components property
-        const componentKey = baseMap[widgetId]
-        if (componentKey && root.components[componentKey]) {
-            return root.components[componentKey]
-        }
-
-        // For plugin components, get from PluginService
-        var parts = widgetId.split(":")
-        var pluginId = parts[0]
-        let pluginComponents = PluginService.getWidgetComponents()
-        return pluginComponents[pluginId] || null
-    }
-
-    height: parent.height
-    width: parent.width
-    anchors.centerIn: parent
-
-    Timer {
-        id: layoutTimer
-        interval: 0
-        repeat: false
-        onTriggered: root.updateLayout()
-    }
-
-    Component.onCompleted: {
-        layoutTimer.restart()
-    }
-
-    onWidthChanged: {
-        if (width > 0) {
-            layoutTimer.restart()
-        }
-    }
-
-    onHeightChanged: {
-        if (height > 0) {
-            layoutTimer.restart()
-        }
-    }
-
-    onVisibleChanged: {
-        if (visible && (isVertical ? height : width) > 0) {
-            layoutTimer.restart()
-        }
-    }
-
-    Repeater {
-        id: centerRepeater
-        model: root.widgetsModel
-
-
-        Loader {
-            property string widgetId: model.widgetId
-            property var widgetData: model
-            property int spacerSize: model.size || 20
-
-            anchors.verticalCenter: !root.isVertical ? parent.verticalCenter : undefined
-            anchors.horizontalCenter: root.isVertical ? parent.horizontalCenter : undefined
-            active: root.getWidgetVisible(model.widgetId) && (model.widgetId !== "music" || MprisController.activePlayer !== null)
-            sourceComponent: root.getWidgetComponent(model.widgetId)
-            opacity: (model.enabled !== false) ? 1 : 0
-            asynchronous: false
-
-            onLoaded: {
-                if (!item) {
-                    return
-                }
-                item.widthChanged.connect(() => layoutTimer.restart())
-                item.heightChanged.connect(() => layoutTimer.restart())
-                if (model.widgetId === "spacer") {
-                    item.spacerSize = Qt.binding(() => model.size || 20)
-                }
-                if (root.axis && "axis" in item) {
-                    item.axis = Qt.binding(() => root.axis)
-                }
-                if (root.axis && "isVertical" in item) {
-                    try {
-                        item.isVertical = Qt.binding(() => root.axis.isVertical)
-                    } catch (e) {
-                    }
-                }
-
-                // Inject properties for plugin widgets
-                if ("section" in item) {
-                    item.section = root.section
-                }
-                if ("parentScreen" in item) {
-                    item.parentScreen = Qt.binding(() => root.parentScreen)
-                }
-                if ("widgetThickness" in item) {
-                    item.widgetThickness = Qt.binding(() => root.widgetThickness)
-                }
-                if ("barThickness" in item) {
-                    item.barThickness = Qt.binding(() => root.barThickness)
-                }
-
-                // Inject PluginService for plugin widgets
-                if (item.pluginService !== undefined) {
-                    var parts = model.widgetId.split(":")
-                    var pluginId = parts[0]
-                    var variantId = parts.length > 1 ? parts[1] : null
-
-                    if (item.pluginId !== undefined) {
-                        item.pluginId = pluginId
-                    }
-                    if (item.variantId !== undefined) {
-                        item.variantId = variantId
-                    }
-                    if (item.variantData !== undefined && variantId) {
-                        item.variantData = PluginService.getPluginVariantData(pluginId, variantId)
-                    }
-                    item.pluginService = PluginService
-                }
-
-                if (item.popoutService !== undefined) {
-                    item.popoutService = PopoutService
-                }
-
-                layoutTimer.restart()
-            }
-
-            onActiveChanged: {
-                layoutTimer.restart()
-            }
-        }
-    }
-
-    Connections {
-        target: widgetsModel
-        function onCountChanged() {
-            layoutTimer.restart()
-        }
-    }
-
-    // Listen for plugin changes and refresh components
-    Connections {
-        target: PluginService
-        function onPluginLoaded(pluginId) {
-            // Force refresh of component lookups
-            for (var i = 0; i < centerRepeater.count; i++) {
-                var item = centerRepeater.itemAt(i)
-                if (item && item.widgetId.startsWith(pluginId)) {
-                    item.sourceComponent = root.getWidgetComponent(item.widgetId)
-                }
-            }
-        }
-        function onPluginUnloaded(pluginId) {
-            // Force refresh of component lookups
-            for (var i = 0; i < centerRepeater.count; i++) {
-                var item = centerRepeater.itemAt(i)
-                if (item && item.widgetId.startsWith(pluginId)) {
-                    item.sourceComponent = root.getWidgetComponent(item.widgetId)
-                }
-            }
-        }
-    }
-}

Modules/DankBar/LeftSection.qml

@@ -1,82 +0,0 @@
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var widgetsModel: null
-    property var components: null
-    property bool noBackground: false
-    required property var axis
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-
-    readonly property bool isVertical: axis?.isVertical ?? false
-
-    implicitHeight: layoutLoader.item ? (layoutLoader.item.implicitHeight || layoutLoader.item.height) : 0
-    implicitWidth: layoutLoader.item ? (layoutLoader.item.implicitWidth || layoutLoader.item.width) : 0
-
-    Loader {
-        id: layoutLoader
-        anchors.fill: parent
-        sourceComponent: root.isVertical ? columnComp : rowComp
-    }
-
-    Component {
-        id: rowComp
-        Row {
-            spacing: noBackground ? 2 : Theme.spacingXS
-            Repeater {
-                model: root.widgetsModel
-                Item {
-                    width: widgetLoader.item ? widgetLoader.item.width : 0
-                    height: widgetLoader.item ? widgetLoader.item.height : 0
-                    WidgetHost {
-                        id: widgetLoader
-                        anchors.verticalCenter: parent.verticalCenter
-                        widgetId: model.widgetId
-                        widgetData: model
-                        spacerSize: model.size || 20
-                        components: root.components
-                        isInColumn: false
-                        axis: root.axis
-                        section: "left"
-                        parentScreen: root.parentScreen
-                        widgetThickness: root.widgetThickness
-                        barThickness: root.barThickness
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: columnComp
-        Column {
-            width: Math.max(parent.width, 200)
-            spacing: noBackground ? 2 : Theme.spacingXS
-            Repeater {
-                model: root.widgetsModel
-                Item {
-                    width: parent.width
-                    height: widgetLoader.item ? widgetLoader.item.height : 0
-                    WidgetHost {
-                        id: widgetLoader
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        widgetId: model.widgetId
-                        widgetData: model
-                        spacerSize: model.size || 20
-                        components: root.components
-                        isInColumn: true
-                        axis: root.axis
-                        section: "left"
-                        parentScreen: root.parentScreen
-                        widgetThickness: root.widgetThickness
-                        barThickness: root.barThickness
-                    }
-                }
-            }
-        }
-    }
-}

Modules/DankBar/RightSection.qml

@@ -1,84 +0,0 @@
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var widgetsModel: null
-    property var components: null
-    property bool noBackground: false
-    required property var axis
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-
-    readonly property bool isVertical: axis?.isVertical ?? false
-
-    implicitHeight: layoutLoader.item ? layoutLoader.item.implicitHeight : 0
-    implicitWidth: layoutLoader.item ? layoutLoader.item.implicitWidth : 0
-
-    Loader {
-        id: layoutLoader
-        width: parent.width
-        height: parent.height
-        sourceComponent: root.isVertical ? columnComp : rowComp
-    }
-
-    Component {
-        id: rowComp
-        Row {
-            spacing: noBackground ? 2 : Theme.spacingXS
-            anchors.right: parent ? parent.right : undefined
-            Repeater {
-                model: root.widgetsModel
-                Item {
-                    width: widgetLoader.item ? widgetLoader.item.width : 0
-                    height: widgetLoader.item ? widgetLoader.item.height : 0
-                    WidgetHost {
-                        id: widgetLoader
-                        anchors.verticalCenter: parent.verticalCenter
-                        widgetId: model.widgetId
-                        widgetData: model
-                        spacerSize: model.size || 20
-                        components: root.components
-                        isInColumn: false
-                        axis: root.axis
-                        section: "right"
-                        parentScreen: root.parentScreen
-                        widgetThickness: root.widgetThickness
-                        barThickness: root.barThickness
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: columnComp
-        Column {
-            width: parent ? parent.width : 0
-            spacing: noBackground ? 2 : Theme.spacingXS
-            Repeater {
-                model: root.widgetsModel
-                Item {
-                    width: parent.width
-                    height: widgetLoader.item ? widgetLoader.item.height : 0
-                    WidgetHost {
-                        id: widgetLoader
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        widgetId: model.widgetId
-                        widgetData: model
-                        spacerSize: model.size || 20
-                        components: root.components
-                        isInColumn: true
-                        axis: root.axis
-                        section: "right"
-                        parentScreen: root.parentScreen
-                        widgetThickness: root.widgetThickness
-                        barThickness: root.barThickness
-                    }
-                }
-            }
-        }
-    }
-}

Modules/DankBar/WidgetHost.qml

@@ -1,166 +0,0 @@
-import QtQuick
-import Quickshell.Services.Mpris
-import qs.Services
-
-Loader {
-    id: root
-
-    property string widgetId: ""
-    property var widgetData: null
-    property int spacerSize: 20
-    property var components: null
-    property bool isInColumn: false
-    property var axis: null
-    property string section: "center"
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-
-    asynchronous: false
-
-    active: getWidgetVisible(widgetId, DgopService.dgopAvailable) &&
-            (widgetId !== "music" || MprisController.activePlayer !== null)
-    sourceComponent: getWidgetComponent(widgetId, components)
-    opacity: getWidgetEnabled(widgetData?.enabled) ? 1 : 0
-
-    signal contentItemReady(var item)
-
-    Binding {
-        target: root.item
-        when: root.item && "parentScreen" in root.item
-        property: "parentScreen"
-        value: root.parentScreen
-        restoreMode: Binding.RestoreNone
-    }
-
-    Binding {
-        target: root.item
-        when: root.item && "section" in root.item
-        property: "section"
-        value: root.section
-        restoreMode: Binding.RestoreNone
-    }
-
-    Binding {
-        target: root.item
-        when: root.item && "widgetThickness" in root.item
-        property: "widgetThickness"
-        value: root.widgetThickness
-        restoreMode: Binding.RestoreNone
-    }
-
-    Binding {
-        target: root.item
-        when: root.item && "barThickness" in root.item
-        property: "barThickness"
-        value: root.barThickness
-        restoreMode: Binding.RestoreNone
-    }
-
-    Binding {
-        target: root.item
-        when: root.item && "axis" in root.item
-        property: "axis"
-        value: root.axis
-        restoreMode: Binding.RestoreNone
-    }
-
-    Binding {
-        target: root.item
-        when: root.item && "widgetData" in root.item
-        property: "widgetData"
-        value: root.widgetData
-        restoreMode: Binding.RestoreNone
-    }
-
-    onLoaded: {
-        if (item) {
-            contentItemReady(item)            
-            if (axis && "isVertical" in item) {
-                try {
-                    item.isVertical = axis.isVertical
-                } catch (e) {
-                }
-            }
-
-            if (item.pluginService !== undefined) {
-                var parts = widgetId.split(":")
-                var pluginId = parts[0]
-                var variantId = parts.length > 1 ? parts[1] : null
-
-                if (item.pluginId !== undefined) {
-                    item.pluginId = pluginId
-                }
-                if (item.variantId !== undefined) {
-                    item.variantId = variantId
-                }
-                if (item.variantData !== undefined && variantId) {
-                    item.variantData = PluginService.getPluginVariantData(pluginId, variantId)
-                }
-                item.pluginService = PluginService
-            }
-
-            if (item.popoutService !== undefined) {
-                item.popoutService = PopoutService
-            }
-        }
-    }
-
-    function getWidgetComponent(widgetId, components) {
-        const componentMap = {
-            "launcherButton": components.launcherButtonComponent,
-            "workspaceSwitcher": components.workspaceSwitcherComponent,
-            "focusedWindow": components.focusedWindowComponent,
-            "runningApps": components.runningAppsComponent,
-            "clock": components.clockComponent,
-            "music": components.mediaComponent,
-            "weather": components.weatherComponent,
-            "systemTray": components.systemTrayComponent,
-            "privacyIndicator": components.privacyIndicatorComponent,
-            "clipboard": components.clipboardComponent,
-            "cpuUsage": components.cpuUsageComponent,
-            "memUsage": components.memUsageComponent,
-            "diskUsage": components.diskUsageComponent,
-            "cpuTemp": components.cpuTempComponent,
-            "gpuTemp": components.gpuTempComponent,
-            "notificationButton": components.notificationButtonComponent,
-            "battery": components.batteryComponent,
-            "controlCenterButton": components.controlCenterButtonComponent,
-            "idleInhibitor": components.idleInhibitorComponent,
-            "spacer": components.spacerComponent,
-            "separator": components.separatorComponent,
-            "network_speed_monitor": components.networkComponent,
-            "keyboard_layout_name": components.keyboardLayoutNameComponent,
-            "vpn": components.vpnComponent,
-            "notepadButton": components.notepadButtonComponent,
-            "colorPicker": components.colorPickerComponent,
-            "systemUpdate": components.systemUpdateComponent
-        }
-
-        if (componentMap[widgetId]) {
-            return componentMap[widgetId]
-        }
-
-        var parts = widgetId.split(":")
-        var pluginId = parts[0]
-
-        let pluginMap = PluginService.getWidgetComponents()
-        return pluginMap[pluginId] || null
-    }
-
-    function getWidgetVisible(widgetId, dgopAvailable) {
-        const widgetVisibility = {
-            "cpuUsage": dgopAvailable,
-            "memUsage": dgopAvailable,
-            "cpuTemp": dgopAvailable,
-            "gpuTemp": dgopAvailable,
-            "network_speed_monitor": dgopAvailable
-        }
-
-        return widgetVisibility[widgetId] ?? true
-    }
-
-    function getWidgetEnabled(enabled) {
-        return enabled !== false
-    }
-}

Modules/DankBar/Widgets/AudioVisualization.qml

@@ -1,77 +0,0 @@
-import QtQuick
-import Quickshell.Services.Mpris
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    readonly property MprisPlayer activePlayer: MprisController.activePlayer
-    readonly property bool hasActiveMedia: activePlayer !== null
-    readonly property bool isPlaying: hasActiveMedia && activePlayer && activePlayer.playbackState === MprisPlaybackState.Playing
-
-    width: 20
-    height: Theme.iconSize
-
-    Loader {
-        active: isPlaying
-
-        sourceComponent: Component {
-            Ref {
-                service: CavaService
-            }
-
-        }
-
-    }
-
-    Timer {
-        id: fallbackTimer
-
-        running: !CavaService.cavaAvailable && isPlaying
-        interval: 256
-        repeat: true
-        onTriggered: {
-            CavaService.values = [Math.random() * 40 + 10, Math.random() * 60 + 20, Math.random() * 50 + 15, Math.random() * 35 + 20, Math.random() * 45 + 15, Math.random() * 55 + 25];
-        }
-    }
-
-    Row {
-        anchors.centerIn: parent
-        spacing: 1.5
-
-        Repeater {
-            model: 6
-
-            Rectangle {
-                width: 2
-                height: {
-                    if (root.isPlaying && CavaService.values.length > index) {
-                        const rawLevel = CavaService.values[index] || 0;
-                        const scaledLevel = Math.sqrt(Math.min(Math.max(rawLevel, 0), 100) / 100) * 100;
-                        const maxHeight = Theme.iconSize - 2;
-                        const minHeight = 3;
-                        return minHeight + (scaledLevel / 100) * (maxHeight - minHeight);
-                    }
-                    return 3;
-                }
-                radius: 1.5
-                color: Theme.primary
-                anchors.verticalCenter: parent.verticalCenter
-
-                Behavior on height {
-                    NumberAnimation {
-                        duration: Anims.durShort
-                        easing.type: Easing.BezierSpline
-                        easing.bezierCurve: Anims.standardDecel
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/Battery.qml

@@ -1,126 +0,0 @@
-import QtQuick
-import Quickshell.Services.UPower
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: battery
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool batteryPopupVisible: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal toggleBatteryPopup()
-
-    width: isVertical ? widgetThickness : (batteryContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (batteryColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = batteryArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    visible: true
-
-    Column {
-        id: batteryColumn
-        visible: battery.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: BatteryService.getBatteryIcon()
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (!BatteryService.batteryAvailable) {
-                    return Theme.surfaceText
-                }
-
-                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
-                    return Theme.error
-                }
-
-                if (BatteryService.isCharging || BatteryService.isPluggedIn) {
-                    return Theme.primary
-                }
-
-                return Theme.surfaceText
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: BatteryService.batteryLevel.toString()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: BatteryService.batteryAvailable
-        }
-    }
-
-    Row {
-        id: batteryContent
-        visible: !battery.isVertical
-        anchors.centerIn: parent
-        spacing: SettingsData.dankBarNoBackground ? 1 : 2
-
-        DankIcon {
-            name: BatteryService.getBatteryIcon()
-            size: Theme.barIconSize(barThickness, -4)
-            color: {
-                if (!BatteryService.batteryAvailable) {
-                    return Theme.surfaceText;
-                }
-
-                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
-                    return Theme.error;
-                }
-
-                if (BatteryService.isCharging || BatteryService.isPluggedIn) {
-                    return Theme.primary;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: `${BatteryService.batteryLevel}%`
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: BatteryService.batteryAvailable
-        }
-
-    }
-
-    MouseArea {
-        id: batteryArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            toggleBatteryPopup();
-        }
-    }
-}

Modules/DankBar/Widgets/ClipboardButton.qml

@@ -1,57 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: root
-
-    property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var clipboardHistoryModal: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: clipboardArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
-            root.clicked()
-        }
-    }
-
-    Rectangle {
-        id: clipboardContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent"
-            }
-
-            const baseColor = clipboardArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-        }
-
-        DankIcon {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            name: "content_paste"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-        }
-    }
-}

Modules/DankBar/Widgets/Clock.qml

@@ -1,270 +0,0 @@
-import QtQuick
-import Quickshell
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool compactMode: false
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-
-    signal clockClicked
-
-    width: isVertical ? widgetThickness : (clockRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (clockColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = clockMouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Column {
-        id: clockColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: -2
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    if (SettingsData.use24HourClock) {
-                        return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(0)
-                    } else {
-                        const hours = systemClock?.date?.getHours()
-                        const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
-                        return String(display).padStart(2, '0').charAt(0)
-                    }
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    if (SettingsData.use24HourClock) {
-                        return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(1)
-                    } else {
-                        const hours = systemClock?.date?.getHours()
-                        const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
-                        return String(display).padStart(2, '0').charAt(1)
-                    }
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(0)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(1)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            visible: SettingsData.showSeconds
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(0)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(1)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Item {
-            width: 12
-            height: Theme.spacingM
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            Rectangle {
-                width: 12
-                height: 1
-                color: Theme.outlineButton
-                anchors.centerIn: parent
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0')
-                    return value.charAt(0)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0')
-                    return value.charAt(1)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0')
-                    return value.charAt(0)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0')
-                    return value.charAt(1)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-    }
-
-    Row {
-        id: clockRow
-
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-
-        StyledText {
-            text: {
-                return systemClock?.date?.toLocaleTimeString(Qt.locale(), SettingsData.getEffectiveTimeFormat())
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: "•"
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !SettingsData.clockCompactMode
-        }
-
-        StyledText {
-            text: {
-                if (SettingsData.clockDateFormat && SettingsData.clockDateFormat.length > 0) {
-                    return systemClock?.date?.toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat)
-                }
-
-                return systemClock?.date?.toLocaleDateString(Qt.locale(), "ddd d")
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !SettingsData.clockCompactMode
-        }
-    }
-
-    SystemClock {
-        id: systemClock
-        precision: SystemClock.Seconds
-    }
-
-    MouseArea {
-        id: clockMouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clockClicked()
-        }
-    }
-
-}

Modules/DankBar/Widgets/ColorPicker.qml

@@ -1,54 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: isVertical ? widgetThickness : (colorPickerIcon.width + horizontalPadding * 2)
-    height: isVertical ? (colorPickerIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = colorPickerArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: colorPickerIcon
-
-        anchors.centerIn: parent
-        name: "palette"
-        size: Theme.barIconSize(barThickness, -4)
-        color: colorPickerArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-    }
-
-    MouseArea {
-        id: colorPickerArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            root.colorPickerRequested();
-        }
-    }
-
-    signal colorPickerRequested()
-
-}

Modules/DankBar/Widgets/ControlCenterButton.qml

@@ -1,266 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property var widgetData: null
-    property bool showNetworkIcon: SettingsData.controlCenterShowNetworkIcon
-    property bool showBluetoothIcon: SettingsData.controlCenterShowBluetoothIcon
-    property bool showAudioIcon: SettingsData.controlCenterShowAudioIcon
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: isVertical ? widgetThickness : (controlIndicators.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (controlColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = controlCenterArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Column {
-        id: controlColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            name: {
-                if (NetworkService.wifiToggling) {
-                    return "sync"
-                }
-
-                if (NetworkService.networkStatus === "ethernet") {
-                    return "lan"
-                }
-
-                return NetworkService.wifiSignalIcon
-            }
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (NetworkService.wifiToggling) {
-                    return Theme.primary
-                }
-
-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showNetworkIcon && NetworkService.networkAvailable
-        }
-
-        DankIcon {
-            name: "bluetooth"
-            size: Theme.barIconSize(barThickness)
-            color: BluetoothService.enabled ? Theme.primary : Theme.outlineButton
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
-        }
-
-        Rectangle {
-            width: audioIconV.implicitWidth + 4
-            height: audioIconV.implicitHeight + 4
-            color: "transparent"
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showAudioIcon
-
-            DankIcon {
-                id: audioIconV
-
-                name: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
-                            return "volume_off"
-                        } else if (AudioService.sink.audio.volume * 100 < 33) {
-                            return "volume_down"
-                        } else {
-                            return "volume_up"
-                        }
-                    }
-                    return "volume_up"
-                }
-                size: Theme.barIconSize(barThickness)
-                color: Theme.surfaceText
-                anchors.centerIn: parent
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.NoButton
-                onWheel: function(wheelEvent) {
-                    let delta = wheelEvent.angleDelta.y
-                    let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0
-                    let newVolume
-                    if (delta > 0) {
-                        newVolume = Math.min(100, currentVolume + 5)
-                    } else {
-                        newVolume = Math.max(0, currentVolume - 5)
-                    }
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        AudioService.sink.audio.muted = false
-                        AudioService.sink.audio.volume = newVolume / 100
-                    }
-                    wheelEvent.accepted = true
-                }
-            }
-        }
-
-        DankIcon {
-            name: "settings"
-            size: Theme.barIconSize(barThickness)
-            color: controlCenterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
-        }
-    }
-
-    Row {
-        id: controlIndicators
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            id: networkIcon
-
-            name: {
-                if (NetworkService.wifiToggling) {
-                    return "sync";
-                }
-
-                if (NetworkService.networkStatus === "ethernet") {
-                    return "lan";
-                }
-
-                return NetworkService.wifiSignalIcon;
-            }
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (NetworkService.wifiToggling) {
-                    return Theme.primary;
-                }
-
-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showNetworkIcon && NetworkService.networkAvailable
-
-
-        }
-
-        DankIcon {
-            id: bluetoothIcon
-
-            name: "bluetooth"
-            size: Theme.barIconSize(barThickness)
-            color: BluetoothService.enabled ? Theme.primary : Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
-        }
-
-        Rectangle {
-            width: audioIcon.implicitWidth + 4
-            height: audioIcon.implicitHeight + 4
-            color: "transparent"
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showAudioIcon
-
-            DankIcon {
-                id: audioIcon
-
-                name: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
-                            return "volume_off";
-                        } else if (AudioService.sink.audio.volume * 100 < 33) {
-                            return "volume_down";
-                        } else {
-                            return "volume_up";
-                        }
-                    }
-                    return "volume_up";
-                }
-                size: Theme.barIconSize(barThickness)
-                color: Theme.surfaceText
-                anchors.centerIn: parent
-            }
-
-            MouseArea {
-                id: audioWheelArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.NoButton
-                onWheel: function(wheelEvent) {
-                    let delta = wheelEvent.angleDelta.y;
-                    let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0;
-                    let newVolume;
-                    if (delta > 0) {
-                        newVolume = Math.min(100, currentVolume + 5);
-                    } else {
-                        newVolume = Math.max(0, currentVolume - 5);
-                    }
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        AudioService.sink.audio.muted = false;
-                        AudioService.sink.audio.volume = newVolume / 100;
-                    }
-                    wheelEvent.accepted = true;
-                }
-            }
-
-        }
-
-        DankIcon {
-            name: "mic"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.primary
-            anchors.verticalCenter: parent.verticalCenter
-            visible: false // TODO: Add mic detection
-        }
-
-        // Fallback settings icon when all other icons are hidden
-        DankIcon {
-            name: "settings"
-            size: Theme.barIconSize(barThickness)
-            color: controlCenterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
-        }
-
-    }
-
-    MouseArea {
-        id: controlCenterArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked();
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/CpuMonitor.qml

@@ -1,158 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property var widgetData: null
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (cpuContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (cpuColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = cpuArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["cpu"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["cpu"]);
-    }
-
-    MouseArea {
-        id: cpuArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("cpu");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: cpuColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "memory"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuUsage > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuUsage > 60) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
-                    return "--";
-                }
-
-                return DgopService.cpuUsage.toFixed(0);
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: cpuContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "memory"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuUsage > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuUsage > 60) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
-                    return "--%";
-                }
-
-                return DgopService.cpuUsage.toFixed(0) + "%";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: cpuBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: root.minimumWidth ? Math.max(cpuBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/CpuTemperature.qml

@@ -1,159 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property var widgetData: null
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (cpuTempContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (cpuTempColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = cpuTempArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["cpu"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["cpu"]);
-    }
-
-    MouseArea {
-        id: cpuTempArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("cpu");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: cpuTempColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "device_thermostat"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuTemperature > 85) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuTemperature > 69) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
-                    return "--";
-                }
-
-                return Math.round(DgopService.cpuTemperature).toString();
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: cpuTempContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "device_thermostat"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuTemperature > 85) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuTemperature > 69) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
-                    return "--°";
-                }
-
-                return Math.round(DgopService.cpuTemperature) + "°";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: tempBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100°"
-            }
-
-            width: root.minimumWidth ? Math.max(tempBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-
-}

Modules/DankBar/Widgets/DiskUsage.qml

@@ -1,242 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property var widgetData: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    property string mountPath: (widgetData && widgetData.mountPath !== undefined) ? widgetData.mountPath : "/"
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    property var selectedMount: {
-        if (!DgopService.diskMounts || DgopService.diskMounts.length === 0) {
-            return null
-        }
-
-        // Force re-evaluation when mountPath changes
-        const currentMountPath = root.mountPath || "/"
-
-        // First try to find exact match
-        for (let i = 0; i < DgopService.diskMounts.length; i++) {
-            if (DgopService.diskMounts[i].mount === currentMountPath) {
-                return DgopService.diskMounts[i]
-            }
-        }
-
-        // Fallback to root
-        for (let i = 0; i < DgopService.diskMounts.length; i++) {
-            if (DgopService.diskMounts[i].mount === "/") {
-                return DgopService.diskMounts[i]
-            }
-        }
-
-        // Last resort - first mount
-        return DgopService.diskMounts[0] || null
-    }
-
-    property real diskUsagePercent: {
-        if (!selectedMount || !selectedMount.percent) {
-            return 0
-        }
-        const percentStr = selectedMount.percent.replace("%", "")
-        return parseFloat(percentStr) || 0
-    }
-
-    width: isVertical ? widgetThickness : (diskContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (diskColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent"
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["diskmounts"])
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["diskmounts"])
-    }
-
-    Connections {
-        function onWidgetDataChanged() {
-            // Force property re-evaluation by triggering change detection
-            root.mountPath = Qt.binding(() => {
-                return (root.widgetData && root.widgetData.mountPath !== undefined) ? root.widgetData.mountPath : "/"
-            })
-
-            root.selectedMount = Qt.binding(() => {
-                if (!DgopService.diskMounts || DgopService.diskMounts.length === 0) {
-                    return null
-                }
-
-                const currentMountPath = root.mountPath || "/"
-
-                // First try to find exact match
-                for (let i = 0; i < DgopService.diskMounts.length; i++) {
-                    if (DgopService.diskMounts[i].mount === currentMountPath) {
-                        return DgopService.diskMounts[i]
-                    }
-                }
-
-                // Fallback to root
-                for (let i = 0; i < DgopService.diskMounts.length; i++) {
-                    if (DgopService.diskMounts[i].mount === "/") {
-                        return DgopService.diskMounts[i]
-                    }
-                }
-
-                // Last resort - first mount
-                return DgopService.diskMounts[0] || null
-            })
-        }
-
-        target: SettingsData
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-
-    MouseArea {
-        id: diskArea
-        anchors.fill: parent
-        hoverEnabled: root.isVertical
-        onEntered: {
-            if (root.isVertical && root.selectedMount) {
-                tooltipLoader.active = true
-                if (tooltipLoader.item) {
-                    const globalPos = mapToGlobal(width / 2, height / 2)
-                    const currentScreen = root.parentScreen || Screen
-                    const screenX = currentScreen ? currentScreen.x : 0
-                    const screenY = currentScreen ? currentScreen.y : 0
-                    const relativeY = globalPos.y - screenY
-                    const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (currentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS)
-                    const isLeft = root.axis?.edge === "left"
-                    tooltipLoader.item.show(root.selectedMount.mount, screenX + tooltipX, relativeY, currentScreen, isLeft, !isLeft)
-                }
-            }
-        }
-        onExited: {
-            if (tooltipLoader.item) {
-                tooltipLoader.item.hide()
-            }
-            tooltipLoader.active = false
-        }
-    }
-
-    Column {
-        id: diskColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "storage"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.diskUsagePercent > 90) {
-                    return Theme.tempDanger
-                }
-                if (root.diskUsagePercent > 75) {
-                    return Theme.tempWarning
-                }
-                return Theme.surfaceText
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
-                    return "--"
-                }
-                return root.diskUsagePercent.toFixed(0)
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: diskContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "storage"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.diskUsagePercent > 90) {
-                    return Theme.tempDanger
-                }
-                if (root.diskUsagePercent > 75) {
-                    return Theme.tempWarning
-                }
-                return Theme.surfaceText
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (!root.selectedMount) {
-                    return "--"
-                }
-                return root.selectedMount.mount
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-        }
-
-        StyledText {
-            text: {
-                if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
-                    return "--%"
-                }
-                return root.diskUsagePercent.toFixed(0) + "%"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: diskBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: Math.max(diskBaseline.width, paintedWidth)
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-    }
-}

Modules/DankBar/Widgets/FocusedApp.qml

@@ -1,273 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property var parentScreen
-    property bool compactMode: SettingsData.focusedWindowCompactMode
-    property int availableWidth: 400
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property int baseWidth: contentRow.implicitWidth + horizontalPadding * 2
-    readonly property int maxNormalWidth: 456
-    readonly property int maxCompactWidth: 288
-    readonly property Toplevel activeWindow: ToplevelManager.activeToplevel
-    property var activeDesktopEntry: null
-
-    Component.onCompleted: {
-        updateDesktopEntry()
-    }
-
-    Connections {
-        target: DesktopEntries
-        function onApplicationsChanged() {
-            root.updateDesktopEntry()
-        }
-    }
-
-    Connections {
-        target: root
-        function onActiveWindowChanged() {
-            root.updateDesktopEntry()
-        }
-    }
-
-    function updateDesktopEntry() {
-        if (activeWindow && activeWindow.appId) {
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            activeDesktopEntry = DesktopEntries.heuristicLookup(moddedId)
-        } else {
-            activeDesktopEntry = null
-        }
-    }
-    readonly property bool hasWindowsOnCurrentWorkspace: {
-        if (CompositorService.isNiri) {
-            let currentWorkspaceId = null
-            for (var i = 0; i < NiriService.allWorkspaces.length; i++) {
-                const ws = NiriService.allWorkspaces[i]
-                if (ws.is_focused) {
-                    currentWorkspaceId = ws.id
-                    break
-                }
-            }
-
-            if (!currentWorkspaceId) {
-                return false
-            }
-
-            const workspaceWindows = NiriService.windows.filter(w => w.workspace_id === currentWorkspaceId)
-            return workspaceWindows.length > 0 && activeWindow && activeWindow.title
-        }
-
-        if (CompositorService.isHyprland) {
-            if (!Hyprland.focusedWorkspace || !activeWindow || !activeWindow.title) {
-                return false
-            }
-
-            const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-            const activeHyprToplevel = hyprlandToplevels.find(t => t.wayland === activeWindow)
-
-            if (!activeHyprToplevel || !activeHyprToplevel.workspace) {
-                return false
-            }
-
-            return activeHyprToplevel.workspace.id === Hyprland.focusedWorkspace.id
-        }
-
-        return activeWindow && activeWindow.title
-    }
-
-    width: !hasWindowsOnCurrentWorkspace ? 0 : (isVertical ? widgetThickness : (compactMode ? Math.min(baseWidth, maxCompactWidth) : Math.min(baseWidth, maxNormalWidth)))
-    height: !hasWindowsOnCurrentWorkspace ? 0 : (isVertical ? widgetThickness : widgetThickness)
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (!activeWindow || !activeWindow.title) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    clip: true
-    visible: hasWindowsOnCurrentWorkspace
-
-    IconImage {
-        id: appIcon
-        anchors.centerIn: parent
-        width: 18
-        height: 18
-        visible: root.isVertical && activeWindow && status === Image.Ready
-        source: {
-            if (!activeWindow || !activeWindow.appId) return ""
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            if (moddedId.toLowerCase().includes("steam_app")) return ""
-            return Quickshell.iconPath(activeDesktopEntry?.icon, true)
-        }
-        smooth: true
-        mipmap: true
-        asynchronous: true
-    }
-
-    DankIcon {
-        anchors.centerIn: parent
-        size: 18
-        name: "sports_esports"
-        color: Theme.surfaceText
-        visible: {
-            if (!root.isVertical || !activeWindow || !activeWindow.appId) return false
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            return moddedId.toLowerCase().includes("steam_app")
-        }
-    }
-
-    Text {
-        anchors.centerIn: parent
-        visible: {
-            if (!root.isVertical || !activeWindow || !activeWindow.appId) return false
-            if (appIcon.status === Image.Ready) return false
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            return !moddedId.toLowerCase().includes("steam_app")
-        }
-        text: {
-            if (!activeWindow || !activeWindow.appId) return "?"
-            if (activeDesktopEntry && activeDesktopEntry.name) {
-                return activeDesktopEntry.name.charAt(0).toUpperCase()
-            }
-            return activeWindow.appId.charAt(0).toUpperCase()
-        }
-        font.pixelSize: 10
-        color: Theme.surfaceText
-        font.weight: Font.Medium
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        StyledText {
-            id: appText
-
-            text: {
-                if (!activeWindow || !activeWindow.appId) {
-                    return "";
-                }
-
-                const desktopEntry = DesktopEntries.heuristicLookup(activeWindow.appId);
-                return desktopEntry && desktopEntry.name ? desktopEntry.name : activeWindow.appId;
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            elide: Text.ElideRight
-            maximumLineCount: 1
-            width: Math.min(implicitWidth, compactMode ? 80 : 180)
-            visible: !compactMode && text.length > 0
-        }
-
-        StyledText {
-            text: "•"
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !compactMode && appText.text && titleText.text
-        }
-
-        StyledText {
-            id: titleText
-
-            text: {
-                const title = activeWindow && activeWindow.title ? activeWindow.title : "";
-                const appName = appText.text;
-                if (!title || !appName) {
-                    return title;
-                }
-
-                if (title.endsWith(" - " + appName)) {
-                    return title.substring(0, title.length - (" - " + appName).length);
-                }
-
-                if (title.endsWith(appName)) {
-                    return title.substring(0, title.length - appName.length).replace(/ - $/, "");
-                }
-
-                return title;
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            elide: Text.ElideRight
-            maximumLineCount: 1
-            width: Math.min(implicitWidth, compactMode ? 280 : 250)
-            visible: text.length > 0
-        }
-
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: root.isVertical
-        onEntered: {
-            if (root.isVertical && activeWindow && activeWindow.appId && root.parentScreen) {
-                tooltipLoader.active = true
-                if (tooltipLoader.item) {
-                    const globalPos = mapToGlobal(width / 2, height / 2)
-                    const currentScreen = root.parentScreen
-                    const screenX = currentScreen ? currentScreen.x : 0
-                    const screenY = currentScreen ? currentScreen.y : 0
-                    const relativeY = globalPos.y - screenY
-                    const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (currentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS)
-
-                    const appName = activeDesktopEntry && activeDesktopEntry.name ? activeDesktopEntry.name : activeWindow.appId
-                    const title = activeWindow.title || ""
-                    const tooltipText = appName + (title ? " • " + title : "")
-
-                    const isLeft = root.axis?.edge === "left"
-                    tooltipLoader.item.show(tooltipText, screenX + tooltipX, relativeY, currentScreen, isLeft, !isLeft)
-                }
-            }
-        }
-        onExited: {
-            if (tooltipLoader.item) {
-                tooltipLoader.item.hide()
-            }
-            tooltipLoader.active = false
-        }
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/GpuTemperature.qml

@@ -1,243 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property var widgetData: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property int selectedGpuIndex: (widgetData && widgetData.selectedGpuIndex !== undefined) ? widgetData.selectedGpuIndex : 0
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-    property real displayTemp: {
-        if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
-            return 0;
-        }
-
-        if (selectedGpuIndex >= 0 && selectedGpuIndex < DgopService.availableGpus.length) {
-            return DgopService.availableGpus[selectedGpuIndex].temperature || 0;
-        }
-
-        return 0;
-    }
-
-    function updateWidgetPciId(pciId) {
-        // Find and update this widget's pciId in the settings
-        const sections = ["left", "center", "right"];
-        for (let s = 0; s < sections.length; s++) {
-            const sectionId = sections[s];
-            let widgets = [];
-            if (sectionId === "left") {
-                widgets = SettingsData.dankBarLeftWidgets.slice();
-            } else if (sectionId === "center") {
-                widgets = SettingsData.dankBarCenterWidgets.slice();
-            } else if (sectionId === "right") {
-                widgets = SettingsData.dankBarRightWidgets.slice();
-            }
-            for (let i = 0; i < widgets.length; i++) {
-                const widget = widgets[i];
-                if (typeof widget === "object" && widget.id === "gpuTemp" && (!widget.pciId || widget.pciId === "")) {
-                    widgets[i] = {
-                        "id": widget.id,
-                        "enabled": widget.enabled !== undefined ? widget.enabled : true,
-                        "selectedGpuIndex": 0,
-                        "pciId": pciId
-                    };
-                    if (sectionId === "left") {
-                        SettingsData.setDankBarLeftWidgets(widgets);
-                    } else if (sectionId === "center") {
-                        SettingsData.setDankBarCenterWidgets(widgets);
-                    } else if (sectionId === "right") {
-                        SettingsData.setDankBarRightWidgets(widgets);
-                    }
-                    return ;
-                }
-            }
-        }
-    }
-
-    width: isVertical ? widgetThickness : (gpuTempContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (gpuTempColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = gpuArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["gpu"]);
-        if (widgetData && widgetData.pciId) {
-            DgopService.addGpuPciId(widgetData.pciId);
-        } else {
-            autoSaveTimer.running = true;
-        }
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["gpu"]);
-        if (widgetData && widgetData.pciId) {
-            DgopService.removeGpuPciId(widgetData.pciId);
-        }
-
-    }
-
-    Connections {
-        function onWidgetDataChanged() {
-            // Force property re-evaluation by triggering change detection
-            root.selectedGpuIndex = Qt.binding(() => {
-                return (root.widgetData && root.widgetData.selectedGpuIndex !== undefined) ? root.widgetData.selectedGpuIndex : 0;
-            });
-        }
-
-        target: SettingsData
-    }
-
-    MouseArea {
-        id: gpuArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("cpu");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: gpuTempColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "auto_awesome_mosaic"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.displayTemp > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (root.displayTemp > 65) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
-                    return "--";
-                }
-
-                return Math.round(root.displayTemp).toString();
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: gpuTempContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "auto_awesome_mosaic"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.displayTemp > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (root.displayTemp > 65) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
-                    return "--°";
-                }
-
-                return Math.round(root.displayTemp) + "°";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: gpuTempBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100°"
-            }
-
-            width: root.minimumWidth ? Math.max(gpuTempBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-    Timer {
-        id: autoSaveTimer
-
-        interval: 100
-        running: false
-        onTriggered: {
-            if (DgopService.availableGpus && DgopService.availableGpus.length > 0) {
-                const firstGpu = DgopService.availableGpus[0];
-                if (firstGpu && firstGpu.pciId) {
-                    // Save the first GPU's PCI ID to this widget's settings
-                    updateWidgetPciId(firstGpu.pciId);
-                    DgopService.addGpuPciId(firstGpu.pciId);
-                }
-            }
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/IdleInhibitor.qml

@@ -1,52 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (idleIcon.width + horizontalPadding * 2)
-    height: isVertical ? (idleIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: idleIcon
-
-        anchors.centerIn: parent
-        name: SessionService.idleInhibited ? "motion_sensor_active" : "motion_sensor_idle"
-        size: Theme.barIconSize(barThickness, -4)
-        color: Theme.surfaceText
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            SessionService.toggleIdleInhibit();
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/KeyboardLayoutName.qml

@@ -1,139 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Modules.ProcessList
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-    property string currentLayout: ""
-    property string hyprlandKeyboard: ""
-
-    width: isVertical ? widgetThickness : (contentRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (contentColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            if (CompositorService.isNiri) {
-                NiriService.cycleKeyboardLayout()
-            } else if (CompositorService.isHyprland) {
-                Quickshell.execDetached([
-                    "hyprctl",
-                    "switchxkblayout",
-                    root.hyprlandKeyboard,
-                    "next"
-                ])
-                updateLayout()
-            }
-        }
-    }
-
-    Column {
-        id: contentColumn
-
-        anchors.centerIn: parent
-        spacing: 1
-        visible: root.isVertical
-
-        DankIcon {
-            name: "keyboard"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (!currentLayout) return ""
-                const parts = currentLayout.split(" ")
-                if (parts.length > 0) {
-                    return parts[0].substring(0, 2).toUpperCase()
-                }
-                return currentLayout.substring(0, 2).toUpperCase()
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        StyledText {
-            text: currentLayout
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-    }
-
-
-    Timer {
-        id: updateTimer
-        interval: 1000
-        running: true
-        repeat: true
-        onTriggered: {
-            updateLayout()
-        }
-    }
-
-    Component.onCompleted: {
-        updateLayout()
-    }
-
-    function updateLayout() {
-        if (CompositorService.isNiri) {
-            root.currentLayout = NiriService.getCurrentKeyboardLayoutName()
-        } else if (CompositorService.isHyprland) {
-            Proc.runCommand(null, ["hyprctl", "-j", "devices"], (output, exitCode) => {
-                if (exitCode !== 0) {
-                    root.currentLayout = "Unknown"
-                    return
-                }
-                try {
-                    const data = JSON.parse(output)
-                    const mainKeyboard = data.keyboards.find(kb => kb.main === true)
-                    root.hyprlandKeyboard = mainKeyboard.name
-                    if (mainKeyboard && mainKeyboard.active_keymap) {
-                        root.currentLayout = mainKeyboard.active_keymap
-                    } else {
-                        root.currentLayout = "Unknown"
-                    }
-                } catch (e) {
-                    root.currentLayout = "Unknown"
-                }
-            })
-        }
-    }
-}

Modules/DankBar/Widgets/LauncherButton.qml

@@ -1,127 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import Quickshell
-import Quickshell.Widgets
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "left"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: launcherArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onPressed: function (mouse){
-            if (mouse.button === Qt.RightButton) {
-                if (CompositorService.isNiri) {
-                    NiriService.toggleOverview()
-                }
-                return
-            }
-            
-            root.clicked();
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0);
-                const currentScreen = parentScreen || Screen;
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width);
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen);
-            }
-        }
-    }
-
-    Rectangle {
-        id: launcherContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent";
-            }
-
-            const baseColor = launcherArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-        }
-
-        DankIcon {
-            visible: SettingsData.launcherLogoMode === "apps"
-            anchors.centerIn: parent
-            name: "apps"
-            size: Theme.barIconSize(barThickness, -4)
-            color: Theme.surfaceText
-        }
-
-        SystemLogo {
-            visible: SettingsData.launcherLogoMode === "os"
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            colorOverride: Theme.effectiveLogoColor
-            brightnessOverride: SettingsData.launcherLogoBrightness
-            contrastOverride: SettingsData.launcherLogoContrast
-        }
-
-        IconImage {
-            visible: SettingsData.launcherLogoMode === "compositor"
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            smooth: true
-            asynchronous: true
-            source: {
-                if (CompositorService.isNiri) {
-                    return "file://" + Theme.shellDir + "/assets/niri.svg"
-                } else if (CompositorService.isHyprland) {
-                    return "file://" + Theme.shellDir + "/assets/hyprland.svg"
-                }
-                return ""
-            }
-            layer.enabled: Theme.effectiveLogoColor !== ""
-            layer.effect: MultiEffect {
-                saturation: 0
-                colorization: 1
-                colorizationColor: Theme.effectiveLogoColor
-                brightness: SettingsData.launcherLogoBrightness
-                contrast: SettingsData.launcherLogoContrast
-            }
-        }
-
-        IconImage {
-            visible: SettingsData.launcherLogoMode === "custom" && SettingsData.launcherLogoCustomPath !== ""
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            smooth: true
-            asynchronous: true
-            source: SettingsData.launcherLogoCustomPath ? "file://" + SettingsData.launcherLogoCustomPath.replace("file://", "") : ""
-            layer.enabled: Theme.effectiveLogoColor !== ""
-            layer.effect: MultiEffect {
-                saturation: 0
-                colorization: 1
-                colorizationColor: Theme.effectiveLogoColor
-                brightness: SettingsData.launcherLogoBrightness
-                contrast: SettingsData.launcherLogoContrast
-            }
-        }
-    }
-}

Modules/DankBar/Widgets/Media.qml

@@ -1,412 +0,0 @@
-import QtQuick
-import Quickshell.Services.Mpris
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    readonly property MprisPlayer activePlayer: MprisController.activePlayer
-    readonly property bool playerAvailable: activePlayer !== null
-    property bool compactMode: false
-    readonly property int textWidth: {
-        switch (SettingsData.mediaSize) {
-        case 0:
-            return 0; // No text in small mode
-        case 2:
-            return 180; // Large text area
-        default:
-            return 120; // Medium text area
-        }
-    }
-    readonly property int currentContentWidth: {
-        if (isVertical) {
-            return widgetThickness;
-        }
-        const controlsWidth = 20 + Theme.spacingXS + 24 + Theme.spacingXS + 20;
-        const audioVizWidth = 20;
-        const contentWidth = audioVizWidth + Theme.spacingXS + controlsWidth;
-        return contentWidth + (textWidth > 0 ? textWidth + Theme.spacingXS : 0) + horizontalPadding * 2;
-    }
-    readonly property int currentContentHeight: {
-        if (!isVertical) {
-            return widgetThickness;
-        }
-        const audioVizHeight = 20;
-        const playButtonHeight = 24;
-        return audioVizHeight + Theme.spacingXS + playButtonHeight + horizontalPadding * 2;
-    }
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: currentContentWidth
-    height: currentContentHeight
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    states: [
-        State {
-            name: "shown"
-            when: playerAvailable
-
-            PropertyChanges {
-                target: root
-                opacity: 1
-                width: currentContentWidth
-                height: currentContentHeight
-            }
-
-        },
-        State {
-            name: "hidden"
-            when: !playerAvailable
-
-            PropertyChanges {
-                target: root
-                opacity: 0
-                width: isVertical ? widgetThickness : 0
-                height: isVertical ? 0 : widgetThickness
-            }
-
-        }
-    ]
-    transitions: [
-        Transition {
-            from: "shown"
-            to: "hidden"
-
-            SequentialAnimation {
-                PauseAnimation {
-                    duration: 500
-                }
-
-                NumberAnimation {
-                    properties: isVertical ? "opacity,height" : "opacity,width"
-                    duration: Theme.shortDuration
-                    easing.type: Theme.standardEasing
-                }
-
-            }
-
-        },
-        Transition {
-            from: "hidden"
-            to: "shown"
-
-            NumberAnimation {
-                properties: isVertical ? "opacity,height" : "opacity,width"
-                duration: Theme.shortDuration
-                easing.type: Theme.standardEasing
-            }
-
-        }
-    ]
-
-    Column {
-        id: verticalLayout
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        AudioVisualization {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            MouseArea {
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    if (root.popupTarget && root.popupTarget.setTriggerPosition) {
-                        const globalPos = parent.mapToGlobal(0, 0)
-                        const currentScreen = root.parentScreen || Screen
-                        const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, parent.width)
-                        root.popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
-                    }
-                    root.clicked()
-                }
-            }
-        }
-
-        Rectangle {
-            width: 24
-            height: 24
-            radius: 12
-            anchors.horizontalCenter: parent.horizontalCenter
-            color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
-            visible: root.playerAvailable
-            opacity: activePlayer ? 1 : 0.3
-
-            DankIcon {
-                anchors.centerIn: parent
-                name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
-                size: 14
-                color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                enabled: root.playerAvailable
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-                onClicked: (mouse) => {
-                    if (!activePlayer) return
-                    if (mouse.button === Qt.LeftButton) {
-                        activePlayer.togglePlaying()
-                    } else if (mouse.button === Qt.MiddleButton) {
-                        activePlayer.previous()
-                    } else if (mouse.button === Qt.RightButton) {
-                        activePlayer.next()
-                    }
-                }
-            }
-        }
-    }
-
-    Row {
-        id: mediaRow
-
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        Row {
-            id: mediaInfo
-
-            spacing: Theme.spacingXS
-
-            AudioVisualization {
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            Rectangle {
-                id: textContainer
-
-                property string displayText: {
-                    if (!activePlayer || !activePlayer.trackTitle) {
-                        return "";
-                    }
-
-                    let identity = activePlayer.identity || "";
-                    let isWebMedia = identity.toLowerCase().includes("firefox") || identity.toLowerCase().includes("chrome") || identity.toLowerCase().includes("chromium") || identity.toLowerCase().includes("edge") || identity.toLowerCase().includes("safari");
-                    let title = "";
-                    let subtitle = "";
-                    if (isWebMedia && activePlayer.trackTitle) {
-                        title = activePlayer.trackTitle;
-                        subtitle = activePlayer.trackArtist || identity;
-                    } else {
-                        title = activePlayer.trackTitle || "Unknown Track";
-                        subtitle = activePlayer.trackArtist || "";
-                    }
-                    return subtitle.length > 0 ? title + " • " + subtitle : title;
-                }
-
-                anchors.verticalCenter: parent.verticalCenter
-                width: textWidth
-                height: 20
-                visible: SettingsData.mediaSize > 0
-                clip: true
-                color: "transparent"
-
-                StyledText {
-                    id: mediaText
-
-                    property bool needsScrolling: implicitWidth > textContainer.width
-                    property real scrollOffset: 0
-
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: textContainer.displayText
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    wrapMode: Text.NoWrap
-                    x: needsScrolling ? -scrollOffset : 0
-                    onTextChanged: {
-                        scrollOffset = 0;
-                        scrollAnimation.restart();
-                    }
-
-                    SequentialAnimation {
-                        id: scrollAnimation
-
-                        running: mediaText.needsScrolling && textContainer.visible
-                        loops: Animation.Infinite
-
-                        PauseAnimation {
-                            duration: 2000
-                        }
-
-                        NumberAnimation {
-                            target: mediaText
-                            property: "scrollOffset"
-                            from: 0
-                            to: mediaText.implicitWidth - textContainer.width + 5
-                            duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                            easing.type: Easing.Linear
-                        }
-
-                        PauseAnimation {
-                            duration: 2000
-                        }
-
-                        NumberAnimation {
-                            target: mediaText
-                            property: "scrollOffset"
-                            to: 0
-                            duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                            easing.type: Easing.Linear
-                        }
-
-                    }
-
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    cursorShape: Qt.PointingHandCursor
-                    onPressed: {
-                        if (root.popupTarget && root.popupTarget.setTriggerPosition) {
-                            const globalPos = mapToGlobal(0, 0)
-                            const currentScreen = root.parentScreen || Screen
-                            const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.width)
-                            root.popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
-                        }
-                        root.clicked()
-                    }
-                }
-
-            }
-
-        }
-
-        Row {
-            spacing: Theme.spacingXS
-            anchors.verticalCenter: parent.verticalCenter
-
-            Rectangle {
-                width: 20
-                height: 20
-                radius: 10
-                anchors.verticalCenter: parent.verticalCenter
-                color: prevArea.containsMouse ? Theme.primaryHover : "transparent"
-                visible: root.playerAvailable
-                opacity: (activePlayer && activePlayer.canGoPrevious) ? 1 : 0.3
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "skip_previous"
-                    size: 12
-                    color: Theme.surfaceText
-                }
-
-                MouseArea {
-                    id: prevArea
-
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.previous();
-                        }
-                    }
-                }
-
-            }
-
-            Rectangle {
-                width: 24
-                height: 24
-                radius: 12
-                anchors.verticalCenter: parent.verticalCenter
-                color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
-                visible: root.playerAvailable
-                opacity: activePlayer ? 1 : 0.3
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
-                    size: 14
-                    color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.togglePlaying();
-                        }
-                    }
-                }
-
-            }
-
-            Rectangle {
-                width: 20
-                height: 20
-                radius: 10
-                anchors.verticalCenter: parent.verticalCenter
-                color: nextArea.containsMouse ? Theme.primaryHover : "transparent"
-                visible: playerAvailable
-                opacity: (activePlayer && activePlayer.canGoNext) ? 1 : 0.3
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "skip_next"
-                    size: 12
-                    color: Theme.surfaceText
-                }
-
-                MouseArea {
-                    id: nextArea
-
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.next();
-                        }
-                    }
-                }
-
-            }
-
-        }
-
-    }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
-    Behavior on height {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
-}

Modules/DankBar/Widgets/NetworkMonitor.qml

@@ -1,194 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Modules.ProcessList
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property int availableWidth: 400
-    readonly property int baseWidth: contentRow.implicitWidth + Theme.spacingS * 2
-    readonly property int maxNormalWidth: 456
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    function formatNetworkSpeed(bytesPerSec) {
-        if (bytesPerSec < 1024) {
-            return bytesPerSec.toFixed(0) + " B/s";
-        } else if (bytesPerSec < 1024 * 1024) {
-            return (bytesPerSec / 1024).toFixed(1) + " KB/s";
-        } else if (bytesPerSec < 1024 * 1024 * 1024) {
-            return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s";
-        } else {
-            return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(1) + " GB/s";
-        }
-    }
-
-    width: isVertical ? widgetThickness : (contentRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (contentColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = networkArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    Component.onCompleted: {
-        DgopService.addRef(["network"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["network"]);
-    }
-
-    MouseArea {
-        id: networkArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-    }
-
-    Column {
-        id: contentColumn
-
-        anchors.centerIn: parent
-        spacing: 2
-        visible: root.isVertical
-
-        DankIcon {
-            name: "network_check"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const rate = DgopService.networkRxRate
-                if (rate < 1024) return rate.toFixed(0)
-                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
-                return (rate / (1024 * 1024)).toFixed(0) + "M"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.info
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const rate = DgopService.networkTxRate
-                if (rate < 1024) return rate.toFixed(0)
-                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
-                return (rate / (1024 * 1024)).toFixed(0) + "M"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.error
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        DankIcon {
-            name: "network_check"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Row {
-            anchors.verticalCenter: parent.verticalCenter
-            spacing: 4
-
-            StyledText {
-                text: "↓"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.info
-            }
-
-            StyledText {
-                text: DgopService.networkRxRate > 0 ? formatNetworkSpeed(DgopService.networkRxRate) : "0 B/s"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                color: Theme.surfaceText
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignLeft
-                elide: Text.ElideNone
-                wrapMode: Text.NoWrap
-
-                StyledTextMetrics {
-                    id: rxBaseline
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    font.weight: Font.Medium
-                    text: "88.8 MB/s"
-                }
-
-                width: Math.max(rxBaseline.width, paintedWidth)
-
-                Behavior on width {
-                    NumberAnimation {
-                        duration: 120
-                        easing.type: Easing.OutCubic
-                    }
-                }
-            }
-
-        }
-
-        Row {
-            anchors.verticalCenter: parent.verticalCenter
-            spacing: 4
-
-            StyledText {
-                text: "↑"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.error
-            }
-
-            StyledText {
-                text: DgopService.networkTxRate > 0 ? formatNetworkSpeed(DgopService.networkTxRate) : "0 B/s"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                color: Theme.surfaceText
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignLeft
-                elide: Text.ElideNone
-                wrapMode: Text.NoWrap
-
-                StyledTextMetrics {
-                    id: txBaseline
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    font.weight: Font.Medium
-                    text: "88.8 MB/s"
-                }
-
-                width: Math.max(txBaseline.width, paintedWidth)
-
-                Behavior on width {
-                    NumberAnimation {
-                        duration: 120
-                        easing.type: Easing.OutCubic
-                    }
-                }
-            }
-
-        }
-
-    }
-
-
-}

Modules/DankBar/Widgets/NotepadButton.qml

@@ -1,96 +0,0 @@
-import QtQuick
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    readonly property string focusedScreenName: (
-        CompositorService.isHyprland && typeof Hyprland !== "undefined" && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor ? (Hyprland.focusedWorkspace.monitor.name || "") :
-        CompositorService.isNiri && typeof NiriService !== "undefined" && NiriService.currentOutput ? NiriService.currentOutput : ""
-    )
-
-    function resolveNotepadInstance() {
-        if (typeof notepadSlideoutVariants === "undefined" || !notepadSlideoutVariants || !notepadSlideoutVariants.instances) {
-            return null
-        }
-
-        const targetScreen = focusedScreenName
-        if (targetScreen) {
-            for (var i = 0; i < notepadSlideoutVariants.instances.length; i++) {
-                var slideout = notepadSlideoutVariants.instances[i]
-                if (slideout.modelData && slideout.modelData.name === targetScreen) {
-                    return slideout
-                }
-            }
-        }
-
-        return notepadSlideoutVariants.instances.length > 0 ? notepadSlideoutVariants.instances[0] : null
-    }
-
-    readonly property var notepadInstance: resolveNotepadInstance()
-    readonly property bool isActive: notepadInstance?.isVisible ?? false
-
-    width: isVertical ? widgetThickness : (notepadIcon.width + horizontalPadding * 2)
-    height: isVertical ? (notepadIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = notepadArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: notepadIcon
-
-        anchors.centerIn: parent
-        name: "assignment"
-        size: Theme.barIconSize(barThickness, -4)
-        color: notepadArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-    }
-
-    Rectangle {
-        width: 6
-        height: 6
-        radius: 3
-        color: Theme.primary
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 4
-        anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 4
-        visible: NotepadStorageService.tabs && NotepadStorageService.tabs.length > 0
-        opacity: 0.8
-    }
-
-    MouseArea {
-        id: notepadArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            const inst = root.notepadInstance
-            if (inst) {
-                inst.toggle()
-            }
-            root.clicked()
-        }
-    }
-
-
-}

Modules/DankBar/Widgets/NotificationCenterButton.qml

@@ -1,76 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: root
-
-    property bool hasUnread: false
-    property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: notificationArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked()
-        }
-    }
-
-    Rectangle {
-        id: notificationContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent"
-            }
-
-            const baseColor = notificationArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-        }
-
-        DankIcon {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            name: SessionData.doNotDisturb ? "notifications_off" : "notifications"
-            size: Theme.barIconSize(barThickness, -4)
-            color: SessionData.doNotDisturb ? Theme.error : (notificationArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText)
-        }
-
-        Rectangle {
-            width: 8
-            height: 8
-            radius: 4
-            color: Theme.error
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 6
-            anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 6
-            visible: root.hasUnread
-        }
-    }
-}

Modules/DankBar/Widgets/PrivacyIndicator.qml

@@ -1,250 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property bool hasActivePrivacy: PrivacyService.anyPrivacyActive
-    readonly property int activeCount: PrivacyService.microphoneActive + PrivacyService.cameraActive + PrivacyService.screensharingActive
-    readonly property real contentWidth: hasActivePrivacy ? (activeCount * 18 + (activeCount - 1) * Theme.spacingXS) : 0
-    readonly property real contentHeight: hasActivePrivacy ? (activeCount * 18 + (activeCount - 1) * Theme.spacingXS) : 0
-
-    width: isVertical ? widgetThickness : (hasActivePrivacy ? (contentWidth + horizontalPadding * 2) : 0)
-    height: isVertical ? (hasActivePrivacy ? (contentHeight + horizontalPadding * 2) : 0) : (hasActivePrivacy ? widgetThickness : 0)
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    visible: hasActivePrivacy
-    opacity: hasActivePrivacy ? 1 : 0
-    enabled: hasActivePrivacy
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        return Qt.rgba(privacyArea.containsMouse ? Theme.errorPressed.r : Theme.errorHover.r, privacyArea.containsMouse ? Theme.errorPressed.g : Theme.errorHover.g, privacyArea.containsMouse ? Theme.errorPressed.b : Theme.errorHover.b, (privacyArea.containsMouse ? Theme.errorPressed.a : Theme.errorHover.a) * Theme.widgetTransparency);
-    }
-
-    MouseArea {
-        // Privacy indicator click handler
-
-        id: privacyArea
-
-        anchors.fill: parent
-        hoverEnabled: hasActivePrivacy
-        enabled: hasActivePrivacy
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-        }
-    }
-
-    Column {
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: root.isVertical && hasActivePrivacy
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.microphoneActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "mic"
-                size: Theme.iconSizeSmall
-                color: Theme.error
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.cameraActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "camera_video"
-                size: Theme.iconSizeSmall
-                color: Theme.surfaceText
-                filled: true
-                anchors.centerIn: parent
-            }
-
-            Rectangle {
-                width: 6
-                height: 6
-                radius: 3
-                color: Theme.error
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.rightMargin: -2
-                anchors.topMargin: -1
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.screensharingActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "screen_share"
-                size: Theme.iconSizeSmall
-                color: Theme.warning
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-    }
-
-    Row {
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: !root.isVertical && hasActivePrivacy
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.microphoneActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "mic"
-                size: Theme.iconSizeSmall
-                color: Theme.error
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.cameraActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "camera_video"
-                size: Theme.iconSizeSmall
-                color: Theme.surfaceText
-                filled: true
-                anchors.centerIn: parent
-            }
-
-            Rectangle {
-                width: 6
-                height: 6
-                radius: 3
-                color: Theme.error
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.rightMargin: -2
-                anchors.topMargin: -1
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.screensharingActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "screen_share"
-                size: Theme.iconSizeSmall
-                color: Theme.warning
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-    }
-
-    Rectangle {
-        id: tooltip
-
-        width: tooltipText.contentWidth + Theme.spacingM * 2
-        height: tooltipText.contentHeight + Theme.spacingS * 2
-        radius: Theme.cornerRadius
-        color: Theme.popupBackground()
-        border.color: Theme.outlineMedium
-        border.width: 1
-        visible: false
-        opacity: privacyArea.containsMouse && hasActivePrivacy ? 1 : 0
-        z: 100
-        x: (parent.width - width) / 2
-        y: -height - Theme.spacingXS
-
-        StyledText {
-            id: tooltipText
-
-            anchors.centerIn: parent
-            text: PrivacyService.getPrivacySummary()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-        }
-
-        Rectangle {
-            width: 8
-            height: 8
-            color: parent.color
-            border.color: parent.border.color
-            border.width: parent.border.width
-            rotation: 45
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: parent.bottom
-            anchors.topMargin: -4
-        }
-
-        Behavior on opacity {
-            enabled: hasActivePrivacy && root.visible
-
-            NumberAnimation {
-                duration: Theme.shortDuration
-                easing.type: Theme.standardEasing
-            }
-
-        }
-
-    }
-
-    Behavior on width {
-        enabled: hasActivePrivacy && visible && !isVertical
-
-        NumberAnimation {
-            duration: Theme.mediumDuration
-            easing.type: Theme.emphasizedEasing
-        }
-
-    }
-
-    Behavior on height {
-        enabled: hasActivePrivacy && visible && isVertical
-
-        NumberAnimation {
-            duration: Theme.mediumDuration
-            easing.type: Theme.emphasizedEasing
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/RamMonitor.qml

@@ -1,159 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool showPercentage: true
-    property bool showIcon: true
-    property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    property var widgetData: null
-    property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (ramContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (ramColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = ramArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Component.onCompleted: {
-        DgopService.addRef(["memory"]);
-    }
-    Component.onDestruction: {
-        DgopService.removeRef(["memory"]);
-    }
-
-    MouseArea {
-        id: ramArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            DgopService.setSortBy("memory");
-            if (root.toggleProcessList) {
-                root.toggleProcessList();
-            }
-
-        }
-    }
-
-    Column {
-        id: ramColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "developer_board"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.memoryUsage > 90) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.memoryUsage > 75) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
-                    return "--";
-                }
-
-                return DgopService.memoryUsage.toFixed(0);
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: ramContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "developer_board"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.memoryUsage > 90) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.memoryUsage > 75) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
-                    return "--%";
-                }
-
-                return DgopService.memoryUsage.toFixed(0) + "%";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: ramBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: root.minimumWidth ? Math.max(ramBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/RunningApps.qml

@@ -1,635 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "left"
-    property var parentScreen
-    property var hoveredItem: null
-    property var topBar: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    property Item windowRoot: (Window.window ? Window.window.contentItem : null)
-    readonly property var sortedToplevels: {
-        if (SettingsData.runningAppsCurrentWorkspace) {
-            return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, parentScreen?.name);
-        }
-        return CompositorService.sortedToplevels;
-    }
-    readonly property int windowCount: sortedToplevels.length
-    readonly property int calculatedSize: {
-        if (windowCount === 0) {
-            return 0;
-        }
-        if (SettingsData.runningAppsCompactMode) {
-            return windowCount * 24 + (windowCount - 1) * Theme.spacingXS + horizontalPadding * 2;
-        } else {
-            return windowCount * (24 + Theme.spacingXS + 120)
-                    + (windowCount - 1) * Theme.spacingXS + horizontalPadding * 2;
-        }
-    }
-
-    width: isVertical ? widgetThickness : calculatedSize
-    height: isVertical ? calculatedSize : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    visible: windowCount > 0
-    clip: false
-    color: {
-        if (windowCount === 0) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        acceptedButtons: Qt.NoButton
-        
-        property real scrollAccumulator: 0
-        property real touchpadThreshold: 500
-        
-        onWheel: (wheel) => {
-            const deltaY = wheel.angleDelta.y;
-            const isMouseWheel = Math.abs(deltaY) >= 120
-                && (Math.abs(deltaY) % 120) === 0;
-            
-            const windows = root.sortedToplevels;
-            if (windows.length < 2) {
-                return;
-            }
-            
-            if (isMouseWheel) {
-                // Direct mouse wheel action
-                let currentIndex = -1;
-                for (let i = 0; i < windows.length; i++) {
-                    if (windows[i].activated) {
-                        currentIndex = i;
-                        break;
-                    }
-                }
-
-                let nextIndex;
-                if (deltaY < 0) {
-                    if (currentIndex === -1) {
-                        nextIndex = 0;
-                    } else {
-                        nextIndex = (currentIndex + 1) % windows.length;
-                    }
-                } else {
-                    if (currentIndex === -1) {
-                        nextIndex = windows.length - 1;
-                    } else {
-                        nextIndex = (currentIndex - 1 + windows.length) % windows.length;
-                    }
-                }
-
-                const nextWindow = windows[nextIndex];
-                if (nextWindow) {
-                    nextWindow.activate();
-                }
-            } else {
-                // Touchpad - accumulate small deltas
-                scrollAccumulator += deltaY;
-                
-                if (Math.abs(scrollAccumulator) >= touchpadThreshold) {
-                    let currentIndex = -1;
-                    for (let i = 0; i < windows.length; i++) {
-                        if (windows[i].activated) {
-                            currentIndex = i;
-                            break;
-                        }
-                    }
-
-                    let nextIndex;
-                    if (scrollAccumulator < 0) {
-                        if (currentIndex === -1) {
-                            nextIndex = 0;
-                        } else {
-                            nextIndex = (currentIndex + 1) % windows.length;
-                        }
-                    } else {
-                        if (currentIndex === -1) {
-                            nextIndex = windows.length - 1;
-                        } else {
-                            nextIndex = (currentIndex - 1 + windows.length) % windows.length;
-                        }
-                    }
-
-                    const nextWindow = windows[nextIndex];
-                    if (nextWindow) {
-                        nextWindow.activate();
-                    }
-                    
-                    scrollAccumulator = 0;
-                }
-            }
-            
-            wheel.accepted = true;
-        }
-    }
-
-    Loader {
-        id: layoutLoader
-        anchors.centerIn: parent
-        sourceComponent: root.isVertical ? columnLayout : rowLayout
-    }
-
-    Component {
-        id: rowLayout
-        Row {
-            spacing: Theme.spacingXS
-
-            Repeater {
-                id: windowRepeater
-                model: sortedToplevels
-
-                delegate: Item {
-                id: delegateItem
-
-                property bool isFocused: modelData.activated
-                property string appId: modelData.appId || ""
-                property string windowTitle: modelData.title || "(Unnamed)"
-                property var toplevelObject: modelData
-                property string tooltipText: {
-                    let appName = "Unknown";
-                    if (appId) {
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        appName = desktopEntry
-                                && desktopEntry.name ? desktopEntry.name : appId;
-                    }
-                    return appName + (windowTitle ? " • " + windowTitle : "")
-                }
-
-                width: SettingsData.runningAppsCompactMode ? 24 : (24 + Theme.spacingXS + 120)
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: {
-                        if (isFocused) {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.3) : Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.2);
-                        } else {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primaryHover.r,
-                                                                 Theme.primaryHover.g,
-                                                                 Theme.primaryHover.b,
-                                                                 0.1) : "transparent";
-                        }
-                    }
-
-                }
-
-                // App icon
-                IconImage {
-                    id: iconImg
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 18
-                    height: 18
-                    source: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        if (moddedId.toLowerCase().includes("steam_app")) {
-                            return ""
-                        }
-                        return Quickshell.iconPath(DesktopEntries.heuristicLookup(moddedId)?.icon, true)
-                    }
-                    smooth: true
-                    mipmap: true
-                    asynchronous: true
-                    visible: status === Image.Ready
-                }
-
-                DankIcon {
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    size: 18
-                    name: "sports_esports"
-                    color: Theme.surfaceText
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        return moddedId.toLowerCase().includes("steam_app")
-                    }
-                }
-
-                // Fallback text if no icon found
-                Text {
-                    anchors.centerIn: parent
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        const isSteamApp = moddedId.toLowerCase().includes("steam_app")
-                        return !iconImg.visible && !isSteamApp
-                    }
-                    text: {
-                        if (!appId) {
-                            return "?";
-                        }
-
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        if (desktopEntry && desktopEntry.name) {
-                            return desktopEntry.name.charAt(0).toUpperCase();
-                        }
-
-                        return appId.charAt(0).toUpperCase();
-                    }
-                    font.pixelSize: 10
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                }
-
-                // Window title text (only visible in expanded mode)
-                StyledText {
-                    anchors.left: iconImg.right
-                    anchors.leftMargin: Theme.spacingXS
-                    anchors.right: parent.right
-                    anchors.rightMargin: Theme.spacingS
-                    anchors.verticalCenter: parent.verticalCenter
-                    visible: !SettingsData.runningAppsCompactMode
-                    text: windowTitle
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    elide: Text.ElideRight
-                    maximumLineCount: 1
-                }
-
-                MouseArea {
-                    id: mouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    onClicked: (mouse) => {
-                        if (mouse.button === Qt.LeftButton) {
-                            if (toplevelObject) {
-                                toplevelObject.activate();
-                            }
-                        } else if (mouse.button === Qt.RightButton) {
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-                            tooltipLoader.active = false;
-
-                            windowContextMenuLoader.active = true;
-                            if (windowContextMenuLoader.item) {
-                                windowContextMenuLoader.item.currentWindow = toplevelObject;
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeX = globalPos.x - screenX;
-                                const yPos = root.isVertical ? delegateItem.height / 2 : (Theme.barHeight + SettingsData.dankBarSpacing - 7);
-                                windowContextMenuLoader.item.showAt(relativeX, yPos);
-                            }
-                        }
-                    }
-                    onEntered: {
-                        root.hoveredItem = delegateItem;
-                        tooltipLoader.active = true;
-                        if (tooltipLoader.item) {
-                            if (root.isVertical) {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height / 2);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeY = globalPos.y - screenY;
-                                const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (root.parentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS);
-                                const isLeft = root.axis?.edge === "left";
-                                tooltipLoader.item.show(delegateItem.tooltipText, screenX + tooltipX, relativeY, root.parentScreen, isLeft, !isLeft);
-                            } else {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height);
-                                const tooltipY = Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS;
-                                tooltipLoader.item.show(delegateItem.tooltipText, globalPos.x, tooltipY, root.parentScreen, false, false);
-                            }
-                        }
-                    }
-                    onExited: {
-                        if (root.hoveredItem === delegateItem) {
-                            root.hoveredItem = null;
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-
-                            tooltipLoader.active = false;
-                        }
-                    }
-                }
-            }
-        }
-        }
-    }
-
-    Component {
-        id: columnLayout
-        Column {
-            spacing: Theme.spacingXS
-
-            Repeater {
-                id: windowRepeater
-                model: sortedToplevels
-
-                delegate: Item {
-                id: delegateItem
-
-                property bool isFocused: modelData.activated
-                property string appId: modelData.appId || ""
-                property string windowTitle: modelData.title || "(Unnamed)"
-                property var toplevelObject: modelData
-                property string tooltipText: {
-                    let appName = "Unknown";
-                    if (appId) {
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        appName = desktopEntry
-                                && desktopEntry.name ? desktopEntry.name : appId;
-                    }
-                    return appName + (windowTitle ? " • " + windowTitle : "")
-                }
-
-                width: SettingsData.runningAppsCompactMode ? 24 : (24 + Theme.spacingXS + 120)
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: {
-                        if (isFocused) {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.3) : Qt.rgba(
-                                                                 Theme.primary.r,
-                                                                 Theme.primary.g,
-                                                                 Theme.primary.b,
-                                                                 0.2);
-                        } else {
-                            return mouseArea.containsMouse ? Qt.rgba(
-                                                                 Theme.primaryHover.r,
-                                                                 Theme.primaryHover.g,
-                                                                 Theme.primaryHover.b,
-                                                                 0.1) : "transparent";
-                        }
-                    }
-
-                }
-
-                IconImage {
-                    id: iconImg
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 18
-                    height: 18
-                    source: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        if (moddedId.toLowerCase().includes("steam_app")) {
-                            return ""
-                        }
-                        return Quickshell.iconPath(DesktopEntries.heuristicLookup(moddedId)?.icon, true)
-                    }
-                    smooth: true
-                    mipmap: true
-                    asynchronous: true
-                    visible: status === Image.Ready
-                }
-
-                DankIcon {
-                    anchors.left: parent.left
-                    anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    size: 18
-                    name: "sports_esports"
-                    color: Theme.surfaceText
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        return moddedId.toLowerCase().includes("steam_app")
-                    }
-                }
-
-                Text {
-                    anchors.centerIn: parent
-                    visible: {
-                        const moddedId = Paths.moddedAppId(appId)
-                        const isSteamApp = moddedId.toLowerCase().includes("steam_app")
-                        return !iconImg.visible && !isSteamApp
-                    }
-                    text: {
-                        if (!appId) {
-                            return "?";
-                        }
-
-                        const desktopEntry = DesktopEntries.heuristicLookup(appId);
-                        if (desktopEntry && desktopEntry.name) {
-                            return desktopEntry.name.charAt(0).toUpperCase();
-                        }
-
-                        return appId.charAt(0).toUpperCase();
-                    }
-                    font.pixelSize: 10
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                }
-
-                StyledText {
-                    anchors.left: iconImg.right
-                    anchors.leftMargin: Theme.spacingXS
-                    anchors.right: parent.right
-                    anchors.rightMargin: Theme.spacingS
-                    anchors.verticalCenter: parent.verticalCenter
-                    visible: !SettingsData.runningAppsCompactMode
-                    text: windowTitle
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    elide: Text.ElideRight
-                    maximumLineCount: 1
-                }
-
-                MouseArea {
-                    id: mouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    onClicked: (mouse) => {
-                        if (mouse.button === Qt.LeftButton) {
-                            if (toplevelObject) {
-                                toplevelObject.activate();
-                            }
-                        } else if (mouse.button === Qt.RightButton) {
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-                            tooltipLoader.active = false;
-
-                            windowContextMenuLoader.active = true;
-                            if (windowContextMenuLoader.item) {
-                                windowContextMenuLoader.item.currentWindow = toplevelObject;
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeX = globalPos.x - screenX;
-                                const yPos = root.isVertical ? delegateItem.height / 2 : (Theme.barHeight + SettingsData.dankBarSpacing - 7);
-                                windowContextMenuLoader.item.showAt(relativeX, yPos);
-                            }
-                        }
-                    }
-                    onEntered: {
-                        root.hoveredItem = delegateItem;
-                        tooltipLoader.active = true;
-                        if (tooltipLoader.item) {
-                            if (root.isVertical) {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height / 2);
-                                const screenX = root.parentScreen ? root.parentScreen.x : 0;
-                                const screenY = root.parentScreen ? root.parentScreen.y : 0;
-                                const relativeY = globalPos.y - screenY;
-                                const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (root.parentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS);
-                                const isLeft = root.axis?.edge === "left";
-                                tooltipLoader.item.show(delegateItem.tooltipText, screenX + tooltipX, relativeY, root.parentScreen, isLeft, !isLeft);
-                            } else {
-                                const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, delegateItem.height);
-                                const tooltipY = Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS;
-                                tooltipLoader.item.show(delegateItem.tooltipText, globalPos.x, tooltipY, root.parentScreen, false, false);
-                            }
-                        }
-                    }
-                    onExited: {
-                        if (root.hoveredItem === delegateItem) {
-                            root.hoveredItem = null;
-                            if (tooltipLoader.item) {
-                                tooltipLoader.item.hide();
-                            }
-
-                            tooltipLoader.active = false;
-                        }
-                    }
-                }
-            }
-        }
-        }
-    }
-
-    Loader {
-        id: tooltipLoader
-
-        active: false
-
-        sourceComponent: DankTooltip {}
-    }
-    
-    Loader {
-        id: windowContextMenuLoader
-        active: false
-        sourceComponent: PanelWindow {
-            id: contextMenuWindow
-            
-            property var currentWindow: null
-            property bool isVisible: false
-            property point anchorPos: Qt.point(0, 0)
-            
-            function showAt(x, y) {
-                screen = root.parentScreen;
-                anchorPos = Qt.point(x, y);
-                isVisible = true;
-                visible = true;
-            }
-            
-            function close() {
-                isVisible = false;
-                visible = false;
-                windowContextMenuLoader.active = false;
-            }
-            
-            implicitWidth: 100
-            implicitHeight: 40
-            visible: false
-            color: "transparent"
-            
-            WlrLayershell.layer: WlrLayershell.Overlay
-            WlrLayershell.exclusiveZone: -1
-            WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-            
-            anchors {
-                top: true
-                left: true
-                right: true
-                bottom: true
-            }
-            
-            MouseArea {
-                anchors.fill: parent
-                onClicked: contextMenuWindow.close();
-            }
-            
-            Rectangle {
-                x: {
-                    const left = 10;
-                    const right = contextMenuWindow.width - width - 10;
-                    const want = contextMenuWindow.anchorPos.x - width / 2;
-                    return Math.max(left, Math.min(right, want));
-                }
-                y: contextMenuWindow.anchorPos.y
-                width: 100
-                height: 32
-                color: Theme.popupBackground()
-                radius: Theme.cornerRadius
-                border.width: 1
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                
-                Rectangle {
-                    anchors.fill: parent
-                    radius: parent.radius
-                    color: closeMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
-                }
-                
-                StyledText {
-                    anchors.centerIn: parent
-                    text: I18n.tr("Close")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Normal
-                }
-                
-                MouseArea {
-                    id: closeMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (contextMenuWindow.currentWindow) {
-                            contextMenuWindow.currentWindow.close();
-                        }
-                        contextMenuWindow.close();
-                    }
-                }
-            }
-        }
-    }
-}

Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -1,636 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Services.SystemTray
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property var parentWindow: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property bool isAtBottom: false
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property int calculatedSize: SystemTray.items.values.length > 0 ? SystemTray.items.values.length * 24 + horizontalPadding * 2 : 0
-
-    width: isVertical ? widgetThickness : calculatedSize
-    height: isVertical ? calculatedSize : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SystemTray.items.values.length === 0) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    visible: SystemTray.items.values.length > 0
-
-    Loader {
-        id: layoutLoader
-        anchors.centerIn: parent
-        sourceComponent: root.isVertical ? columnComp : rowComp
-    }
-
-    Component {
-        id: rowComp
-        Row {
-            spacing: 0
-
-            Repeater {
-                model: SystemTray.items.values
-
-                delegate: Item {
-                property var trayItem: modelData
-                property string iconSource: {
-                    let icon = trayItem && trayItem.icon;
-                    if (typeof icon === 'string' || icon instanceof String) {
-                        if (icon === "") {
-                            return "";
-                        }
-                        if (icon.includes("?path=")) {
-                            const split = icon.split("?path=");
-                            if (split.length !== 2) {
-                                return icon;
-                            }
-
-                            const name = split[0];
-                            const path = split[1];
-                            let fileName = name.substring(name.lastIndexOf("/") + 1);
-                            if (fileName.startsWith("dropboxstatus")) {
-                                fileName = `hicolor/16x16/status/${fileName}`;
-                            }
-                            return `file://${path}/${fileName}`;
-                        }
-                        if (icon.startsWith("/") && !icon.startsWith("file://")) {
-                            return `file://${icon}`;
-                        }
-                        return icon;
-                    }
-                    return "";
-                }
-
-                width: 24
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
-
-
-                }
-
-                IconImage {
-                    anchors.centerIn: parent
-                    width: 16
-                    height: 16
-                    source: parent.iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                }
-
-                MouseArea {
-                    id: trayItemArea
-
-                    anchors.fill: parent
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: (mouse) => {
-                        if (!trayItem) {
-                            return;
-                        }
-
-                        if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                            trayItem.activate();
-                            return ;
-                        }
-                        if (trayItem.hasMenu) {
-                            root.showForTrayItem(trayItem, parent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
-                        }
-                    }
-                }
-
-            }
-
-        }
-        }
-    }
-
-    Component {
-        id: columnComp
-        Column {
-            spacing: 0
-
-            Repeater {
-                model: SystemTray.items.values
-
-                delegate: Item {
-                property var trayItem: modelData
-                property string iconSource: {
-                    let icon = trayItem && trayItem.icon;
-                    if (typeof icon === 'string' || icon instanceof String) {
-                        if (icon === "") {
-                            return "";
-                        }
-                        if (icon.includes("?path=")) {
-                            const split = icon.split("?path=");
-                            if (split.length !== 2) {
-                                return icon;
-                            }
-
-                            const name = split[0];
-                            const path = split[1];
-                            let fileName = name.substring(name.lastIndexOf("/") + 1);
-                            if (fileName.startsWith("dropboxstatus")) {
-                                fileName = `hicolor/16x16/status/${fileName}`;
-                            }
-                            return `file://${path}/${fileName}`;
-                        }
-                        if (icon.startsWith("/") && !icon.startsWith("file://")) {
-                            return `file://${icon}`;
-                        }
-                        return icon;
-                    }
-                    return "";
-                }
-
-                width: 24
-                height: 24
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
-                }
-
-                IconImage {
-                    anchors.centerIn: parent
-                    width: 16
-                    height: 16
-                    source: parent.iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                }
-
-                MouseArea {
-                    id: trayItemArea
-
-                    anchors.fill: parent
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: (mouse) => {
-                        if (!trayItem) {
-                            return;
-                        }
-
-                        if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                            trayItem.activate();
-                            return ;
-                        }
-                        if (trayItem.hasMenu) {
-                            root.showForTrayItem(trayItem, parent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
-                        }
-                    }
-                }
-
-            }
-
-        }
-        }
-    }
-
-    Component {
-        id: trayMenuComponent
-
-        Rectangle {
-            id: menuRoot
-
-            property var trayItem: null
-            property var anchorItem: null
-            property var parentScreen: null
-            property bool isAtBottom: false
-            property bool isVertical: false
-            property var axis: null
-            property bool showMenu: false
-            property var menuHandle: null
-
-            ListModel { id: entryStack }
-            function topEntry() {
-                return entryStack.count ? entryStack.get(entryStack.count - 1).handle : null
-            }
-
-            function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
-                trayItem = item
-                anchorItem = anchor
-                parentScreen = screen
-                isAtBottom = atBottom
-                isVertical = vertical
-                axis = axisObj
-                menuHandle = item?.menu
-
-                if (parentScreen) {
-                    for (var i = 0; i < Quickshell.screens.length; i++) {
-                        const s = Quickshell.screens[i]
-                        if (s === parentScreen) {
-                            menuWindow.screen = s
-                            break
-                        }
-                    }
-                }
-
-                showMenu = true
-            }
-
-            function close() {
-                showMenu = false
-            }
-
-            function showSubMenu(entry) {
-                if (!entry || !entry.hasChildren) return;
-
-                entryStack.append({ handle: entry });
-
-                const h = entry.menu || entry;
-                if (h && typeof h.updateLayout === "function") h.updateLayout();
-
-                submenuHydrator.menu = h;
-                submenuHydrator.open();
-                Qt.callLater(() => submenuHydrator.close());
-            }
-
-            function goBack() {
-                if (!entryStack.count) return;
-                entryStack.remove(entryStack.count - 1);
-            }
-
-            width: 0
-            height: 0
-            color: "transparent"
-
-            PanelWindow {
-                id: menuWindow
-                visible: menuRoot.showMenu && (menuRoot.trayItem?.hasMenu ?? false)
-                WlrLayershell.layer: WlrLayershell.Overlay
-                WlrLayershell.exclusiveZone: -1
-                WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-                color: "transparent"
-
-                anchors {
-                    top: true
-                    left: true
-                    right: true
-                    bottom: true
-                }
-
-                property point anchorPos: Qt.point(screen.width / 2, screen.height / 2)
-
-                onVisibleChanged: {
-                    if (visible) {
-                        updatePosition()
-                    }
-                }
-
-                function updatePosition() {
-                    if (!menuRoot.anchorItem || !menuRoot.trayItem) {
-                        anchorPos = Qt.point(screen.width / 2, screen.height / 2)
-                        return
-                    }
-
-                    const globalPos = menuRoot.anchorItem.mapToGlobal(0, 0)
-                    const screenX = screen.x || 0
-                    const screenY = screen.y || 0
-                    const relativeX = globalPos.x - screenX
-                    const relativeY = globalPos.y - screenY
-
-                    const widgetThickness = Math.max(20, 26 + SettingsData.dankBarInnerPadding * 0.6)
-                    const effectiveBarThickness = Math.max(widgetThickness + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding))
-
-                    if (menuRoot.isVertical) {
-                        const edge = menuRoot.axis?.edge
-                        let targetX
-                        if (edge === "left") {
-                            targetX = effectiveBarThickness + SettingsData.dankBarSpacing + Theme.popupDistance
-                        } else {
-                            const popupX = effectiveBarThickness + SettingsData.dankBarSpacing + Theme.popupDistance
-                            targetX = screen.width - popupX
-                        }
-                        anchorPos = Qt.point(targetX, relativeY + menuRoot.anchorItem.height / 2)
-                    } else {
-                        let targetY
-                        if (menuRoot.isAtBottom) {
-                            const popupY = effectiveBarThickness + SettingsData.dankBarSpacing + SettingsData.dankBarBottomGap + Theme.popupDistance
-                            targetY = screen.height - popupY
-                        } else {
-                            targetY = effectiveBarThickness + SettingsData.dankBarSpacing + SettingsData.dankBarBottomGap + Theme.popupDistance
-                        }
-                        anchorPos = Qt.point(relativeX + menuRoot.anchorItem.width / 2, targetY)
-                    }
-                }
-
-                Rectangle {
-                    id: menuContainer
-
-                    width: Math.min(500, Math.max(250, menuColumn.implicitWidth + Theme.spacingS * 2))
-                    height: Math.max(40, menuColumn.implicitHeight + Theme.spacingS * 2)
-
-                    x: {
-                        if (menuRoot.isVertical) {
-                            const edge = menuRoot.axis?.edge
-                            if (edge === "left") {
-                                const targetX = menuWindow.anchorPos.x
-                                return Math.min(menuWindow.screen.width - width - 10, targetX)
-                            } else {
-                                const targetX = menuWindow.anchorPos.x - width
-                                return Math.max(10, targetX)
-                            }
-                        } else {
-                            const left = 10
-                            const right = menuWindow.width - width - 10
-                            const want = menuWindow.anchorPos.x - width / 2
-                            return Math.max(left, Math.min(right, want))
-                        }
-                    }
-
-                    y: {
-                        if (menuRoot.isVertical) {
-                            const top = 10
-                            const bottom = menuWindow.height - height - 10
-                            const want = menuWindow.anchorPos.y - height / 2
-                            return Math.max(top, Math.min(bottom, want))
-                        } else {
-                            if (menuRoot.isAtBottom) {
-                                const targetY = menuWindow.anchorPos.y - height
-                                return Math.max(10, targetY)
-                            } else {
-                                const targetY = menuWindow.anchorPos.y
-                                return Math.min(menuWindow.screen.height - height - 10, targetY)
-                            }
-                        }
-                    }
-
-                    color: Theme.popupBackground()
-                    radius: Theme.cornerRadius
-                    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-                    border.width: 1
-
-                    opacity: menuRoot.showMenu ? 1 : 0
-                    scale: menuRoot.showMenu ? 1 : 0.85
-
-                    Rectangle {
-                        anchors.fill: parent
-                        anchors.topMargin: 4
-                        anchors.leftMargin: 2
-                        anchors.rightMargin: -2
-                        anchors.bottomMargin: -4
-                        radius: parent.radius
-                        color: Qt.rgba(0, 0, 0, 0.15)
-                        z: parent.z - 1
-                    }
-
-                    QsMenuAnchor {
-                        id: submenuHydrator
-                        anchor.window: menuWindow
-                    }
-
-                    QsMenuOpener {
-                        id: rootOpener
-                        menu: menuRoot.menuHandle
-                    }
-
-                    QsMenuOpener {
-                        id: subOpener
-                        menu: {
-                            const e = menuRoot.topEntry();
-                            return e ? (e.menu || e) : null;
-                        }
-                    }
-
-
-                    Column {
-                        id: menuColumn
-
-                        width: parent.width - Theme.spacingS * 2
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.top: parent.top
-                        anchors.topMargin: Theme.spacingS
-                        spacing: 1
-
-                        Rectangle {
-                            visible: entryStack.count > 0
-                            width: parent.width
-                            height: 28
-                            radius: Theme.cornerRadius
-                            color: backArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                            Row {
-                                anchors.left: parent.left
-                                anchors.leftMargin: Theme.spacingS
-                                anchors.verticalCenter: parent.verticalCenter
-                                spacing: Theme.spacingXS
-
-                                DankIcon {
-                                    name: "arrow_back"
-                                    size: 16
-                                    color: Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-
-                                StyledText {
-                                    text: I18n.tr("Back")
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-                            }
-
-                            MouseArea {
-                                id: backArea
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: menuRoot.goBack()
-                            }
-                        }
-
-                        Rectangle {
-                            visible: entryStack.count > 0
-                            width: parent.width
-                            height: 1
-                            color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                        }
-
-                        Repeater {
-                            model: entryStack.count
-                                   ? (subOpener.children ? subOpener.children
-                                                         : (menuRoot.topEntry()?.children || []))
-                                   : rootOpener.children
-
-                            Rectangle {
-                                property var menuEntry: modelData
-
-                                width: menuColumn.width
-                                height: menuEntry?.isSeparator ? 1 : 28
-                                radius: menuEntry?.isSeparator ? 0 : Theme.cornerRadius
-                                color: {
-                                    if (menuEntry?.isSeparator) {
-                                        return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                                    }
-                                    return itemArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-                                }
-
-                                MouseArea {
-                                    id: itemArea
-                                    anchors.fill: parent
-                                    enabled: !menuEntry?.isSeparator && (menuEntry?.enabled !== false)
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-
-                                    onClicked: {
-                                        if (!menuEntry || menuEntry.isSeparator) return;
-
-                                        if (menuEntry.hasChildren) {
-                                            menuRoot.showSubMenu(menuEntry);
-                                        } else {
-                                            if (typeof menuEntry.activate === "function") {
-                                                menuEntry.activate();
-                                            } else if (typeof menuEntry.triggered === "function") {
-                                                menuEntry.triggered();
-                                            }
-                                            Qt.createQmlObject('import QtQuick; Timer { interval: 80; running: true; repeat: false; onTriggered: menuRoot.close() }', menuRoot);
-                                        }
-                                    }
-                                }
-
-                                Row {
-                                    anchors.left: parent.left
-                                    anchors.leftMargin: Theme.spacingS
-                                    anchors.right: parent.right
-                                    anchors.rightMargin: Theme.spacingS
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    spacing: Theme.spacingXS
-                                    visible: !menuEntry?.isSeparator
-
-                                    Rectangle {
-                                        width: 16
-                                        height: 16
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        visible: menuEntry?.buttonType !== undefined && menuEntry.buttonType !== 0
-                                        radius: menuEntry?.buttonType === 2 ? 8 : 2
-                                        border.width: 1
-                                        border.color: Theme.outline
-                                        color: "transparent"
-
-                                        Rectangle {
-                                            anchors.centerIn: parent
-                                            width: parent.width - 6
-                                            height: parent.height - 6
-                                            radius: parent.radius - 3
-                                            color: Theme.primary
-                                            visible: menuEntry?.checkState === 2
-                                        }
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            name: "check"
-                                            size: 10
-                                            color: Theme.primaryText
-                                            visible: menuEntry?.buttonType === 1 && menuEntry?.checkState === 2
-                                        }
-                                    }
-
-                                    Item {
-                                        width: 16
-                                        height: 16
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        visible: menuEntry?.icon && menuEntry.icon !== ""
-
-                                        Image {
-                                            anchors.fill: parent
-                                            source: menuEntry?.icon || ""
-                                            sourceSize.width: 16
-                                            sourceSize.height: 16
-                                            fillMode: Image.PreserveAspectFit
-                                            smooth: true
-                                        }
-                                    }
-
-                                    StyledText {
-                                        text: menuEntry?.text || ""
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: (menuEntry?.enabled !== false) ? Theme.surfaceText : Theme.surfaceTextMedium
-                                        elide: Text.ElideRight
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        width: Math.max(150, parent.width - 64)
-                                        wrapMode: Text.NoWrap
-                                    }
-
-                                    Item {
-                                        width: 16
-                                        height: 16
-                                        anchors.verticalCenter: parent.verticalCenter
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            name: "chevron_right"
-                                            size: 14
-                                            color: Theme.surfaceText
-                                            visible: menuEntry?.hasChildren ?? false
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    Behavior on opacity {
-                        NumberAnimation {
-                            duration: Theme.mediumDuration
-                            easing.type: Theme.emphasizedEasing
-                        }
-                    }
-
-                    Behavior on scale {
-                        NumberAnimation {
-                            duration: Theme.mediumDuration
-                            easing.type: Theme.emphasizedEasing
-                        }
-                    }
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    z: -1
-                    onClicked: menuRoot.close()
-                }
-            }
-        }
-    }
-
-    property var currentTrayMenu: null
-
-    function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
-        if (currentTrayMenu) {
-            currentTrayMenu.destroy()
-        }
-        currentTrayMenu = trayMenuComponent.createObject(null)
-        if (currentTrayMenu) {
-            currentTrayMenu.showForTrayItem(item, anchor, screen, atBottom, vertical ?? false, axisObj)
-        }
-    }
-
-}

Modules/DankBar/Widgets/SystemUpdate.qml

@@ -1,158 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-    readonly property bool hasUpdates: SystemUpdateService.updateCount > 0
-    readonly property bool isChecking: SystemUpdateService.isChecking
-
-    signal clicked()
-
-    Ref {
-        service: SystemUpdateService
-    }
-
-    width: isVertical ? widgetThickness : (updaterIcon.width + horizontalPadding * 2)
-    height: isVertical ? widgetThickness : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = updaterArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: statusIcon
-
-        anchors.centerIn: parent
-        visible: root.isVertical
-        name: {
-            if (isChecking) return "refresh";
-            if (SystemUpdateService.hasError) return "error";
-            if (hasUpdates) return "system_update_alt";
-            return "check_circle";
-        }
-        size: Theme.barIconSize(barThickness, -4)
-        color: {
-            if (SystemUpdateService.hasError) return Theme.error;
-            if (hasUpdates) return Theme.primary;
-            return (updaterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText);
-        }
-
-        RotationAnimation {
-            id: rotationAnimation
-            target: statusIcon
-            property: "rotation"
-            from: 0
-            to: 360
-            duration: 1000
-            running: isChecking
-            loops: Animation.Infinite
-
-            onRunningChanged: {
-                if (!running) {
-                    statusIcon.rotation = 0
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        width: 8
-        height: 8
-        radius: 4
-        color: Theme.error
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 6
-        anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 6
-        visible: root.isVertical && root.hasUpdates && !root.isChecking
-    }
-
-    Row {
-        id: updaterIcon
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: !root.isVertical
-
-        DankIcon {
-            id: statusIconHorizontal
-
-            anchors.verticalCenter: parent.verticalCenter
-            name: {
-                if (isChecking) return "refresh";
-                if (SystemUpdateService.hasError) return "error";
-                if (hasUpdates) return "system_update_alt";
-                return "check_circle";
-            }
-            size: Theme.barIconSize(barThickness, -4)
-            color: {
-                if (SystemUpdateService.hasError) return Theme.error;
-                if (hasUpdates) return Theme.primary;
-                return (updaterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText);
-            }
-
-            RotationAnimation {
-                id: rotationAnimationHorizontal
-                target: statusIconHorizontal
-                property: "rotation"
-                from: 0
-                to: 360
-                duration: 1000
-                running: isChecking
-                loops: Animation.Infinite
-
-                onRunningChanged: {
-                    if (!running) {
-                        statusIconHorizontal.rotation = 0
-                    }
-                }
-            }
-        }
-
-        StyledText {
-            id: countText
-
-            anchors.verticalCenter: parent.verticalCenter
-            text: SystemUpdateService.updateCount.toString()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            visible: hasUpdates && !isChecking
-        }
-    }
-
-    MouseArea {
-        id: updaterArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked();
-        }
-    }
-
-}

Modules/DankBar/Widgets/Vpn.qml

@@ -1,107 +0,0 @@
-import QtQuick
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    Ref {
-        service: VpnService
-    }
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property int widgetThickness: 28
-    property int barThickness: 32
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal toggleVpnPopup()
-
-    width: isVertical ? widgetThickness : (Theme.iconSize + horizontalPadding * 2)
-    height: isVertical ? (Theme.iconSize + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = clickArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: icon
-
-        name: VpnService.isBusy ? "sync" : (VpnService.connected ? "vpn_lock" : "vpn_key_off")
-        size: Theme.barIconSize(barThickness, -4)
-        color: VpnService.connected ? Theme.primary : Theme.surfaceText
-        anchors.centerIn: parent
-    }
-
-    Loader {
-        id: tooltipLoader
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-
-    MouseArea {
-        id: clickArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.toggleVpnPopup();
-        }
-        onEntered: {
-            if (root.parentScreen && !(popupTarget && popupTarget.shouldBeVisible)) {
-                tooltipLoader.active = true
-                if (tooltipLoader.item) {
-                    let tooltipText = ""
-                    if (!VpnService.connected) {
-                        tooltipText = "VPN Disconnected"
-                    } else {
-                        const names = VpnService.activeNames || []
-                        if (names.length <= 1) {
-                            tooltipText = "VPN Connected • " + (names[0] || "")
-                        } else {
-                            tooltipText = "VPN Connected • " + names[0] + " +" + (names.length - 1)
-                        }
-                    }
-
-                    if (root.isVertical) {
-                        const globalPos = mapToGlobal(width / 2, height / 2)
-                        const screenX = root.parentScreen ? root.parentScreen.x : 0
-                        const screenY = root.parentScreen ? root.parentScreen.y : 0
-                        const relativeY = globalPos.y - screenY
-                        const tooltipX = root.axis?.edge === "left" ? (Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS) : (root.parentScreen.width - Theme.barHeight - SettingsData.dankBarSpacing - Theme.spacingXS)
-                        const isLeft = root.axis?.edge === "left"
-                        tooltipLoader.item.show(tooltipText, screenX + tooltipX, relativeY, root.parentScreen, isLeft, !isLeft)
-                    } else {
-                        const globalPos = mapToGlobal(width / 2, height)
-                        const tooltipY = Theme.barHeight + SettingsData.dankBarSpacing + Theme.spacingXS
-                        tooltipLoader.item.show(tooltipText, globalPos.x, tooltipY, root.parentScreen, false, false)
-                    }
-                }
-            }
-        }
-        onExited: {
-            if (tooltipLoader.item) {
-                tooltipLoader.item.hide()
-            }
-            tooltipLoader.active = false
-        }
-    }
-
-}

Modules/DankBar/Widgets/Weather.qml

@@ -1,120 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-
-    signal clicked()
-
-    visible: SettingsData.weatherEnabled
-    width: isVertical ? widgetThickness : (visible ? Math.min(100, weatherRow.implicitWidth + horizontalPadding * 2) : 0)
-    height: isVertical ? (weatherColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = weatherArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Ref {
-        service: WeatherService
-    }
-
-    Column {
-        id: weatherColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
-            size: Theme.barIconSize(barThickness, -6)
-            color: Theme.primary
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
-                if (temp === undefined || temp === null || temp === 0) {
-                    return "--";
-                }
-                return temp;
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: weatherRow
-
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
-            size: Theme.barIconSize(barThickness, -6)
-            color: Theme.primary
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
-                if (temp === undefined || temp === null || temp === 0) {
-                    return "--°" + (SettingsData.useFahrenheit ? "F" : "C");
-                }
-
-                return temp + "°" + (SettingsData.useFahrenheit ? "F" : "C");
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-    }
-
-    MouseArea {
-        id: weatherArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked();
-        }
-    }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-
-    }
-
-}

Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -1,734 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string screenName: ""
-    property real widgetHeight: 30
-    property real barThickness: 48
-    readonly property var sortedToplevels: {
-        return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, parentScreen?.name);
-    }
-    property int currentWorkspace: {
-        if (CompositorService.isNiri) {
-            return getNiriActiveWorkspace()
-        } else if (CompositorService.isHyprland) {
-            return getHyprlandActiveWorkspace()
-        }
-        return 1
-    }
-    property var workspaceList: {
-        if (CompositorService.isNiri) {
-            const baseList = getNiriWorkspaces()
-            return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList
-        }
-        if (CompositorService.isHyprland) {
-            const baseList = getHyprlandWorkspaces()
-            // Filter out special workspaces
-			const filteredList = baseList.filter(ws => ws.id > -1)
-            return SettingsData.showWorkspacePadding ? padWorkspaces(filteredList) : filteredList
-        }
-        return [1]
-    }
-
-    function getWorkspaceIcons(ws) {
-        if (!SettingsData.showWorkspaceApps || !ws) {
-            return []
-        }
-
-        let targetWorkspaceId
-        if (CompositorService.isNiri) {
-            const wsNumber = typeof ws === "number" ? ws : -1
-            if (wsNumber <= 0) {
-                return []
-            }
-            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNumber && w.output === root.screenName)
-            if (!workspace) {
-                return []
-            }
-            targetWorkspaceId = workspace.id
-        } else if (CompositorService.isHyprland) {
-            targetWorkspaceId = ws.id !== undefined ? ws.id : ws
-        } else {
-            return []
-        }
-
-        const wins = CompositorService.isNiri ? (NiriService.windows || []) : CompositorService.sortedToplevels
-
-
-        const byApp = {}
-        const isActiveWs = CompositorService.isNiri ? NiriService.allWorkspaces.some(ws => ws.id === targetWorkspaceId && ws.is_active) : targetWorkspaceId === root.currentWorkspace
-
-        wins.forEach((w, i) => {
-                         if (!w) {
-                             return
-                         }
-
-                         let winWs = null
-                         if (CompositorService.isNiri) {
-                             winWs = w.workspace_id
-                         } else {
-                             // For Hyprland, we need to find the corresponding Hyprland toplevel to get workspace
-                             const hyprlandToplevels = Array.from(Hyprland.toplevels?.values || [])
-                             const hyprToplevel = hyprlandToplevels.find(ht => ht.wayland === w)
-                             winWs = hyprToplevel?.workspace?.id
-                         }
-
-
-                         if (winWs === undefined || winWs === null || winWs !== targetWorkspaceId) {
-                             return
-                         }
-
-                         const keyBase = (w.app_id || w.appId || w.class || w.windowClass || "unknown").toLowerCase()
-                         const key = isActiveWs ? `${keyBase}_${i}` : keyBase
-
-                         if (!byApp[key]) {
-                             const moddedId = Paths.moddedAppId(keyBase)
-                             const isSteamApp = moddedId.toLowerCase().includes("steam_app")
-                             const icon = isSteamApp ? "" : Quickshell.iconPath(DesktopEntries.heuristicLookup(moddedId)?.icon, true)
-                             byApp[key] = {
-                                 "type": "icon",
-                                 "icon": icon,
-                                 "isSteamApp": isSteamApp,
-                                 "active": !!(w.activated || (CompositorService.isNiri && w.is_focused)),
-                                 "count": 1,
-                                 "windowId": w.address || w.id,
-                                 "fallbackText": w.appId || w.class || w.title || ""
-                             }
-                         } else {
-                             byApp[key].count++
-                             if (w.activated || (CompositorService.isNiri && w.is_focused)) {
-                                 byApp[key].active = true
-                             }
-                         }
-                     })
-
-        return Object.values(byApp)
-    }
-
-    function padWorkspaces(list) {
-        const padded = list.slice()
-        const placeholder = CompositorService.isHyprland ? {
-                                                               "id": -1,
-                                                               "name": ""
-                                                           } : -1
-        while (padded.length < 3) {
-            padded.push(placeholder)
-        }
-        return padded
-    }
-
-    function getNiriWorkspaces() {
-        if (NiriService.allWorkspaces.length === 0) {
-            return [1, 2]
-        }
-
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            return NiriService.getCurrentOutputWorkspaceNumbers()
-        }
-
-        const displayWorkspaces = NiriService.allWorkspaces.filter(ws => ws.output === root.screenName).map(ws => ws.idx + 1)
-        return displayWorkspaces.length > 0 ? displayWorkspaces : [1, 2]
-    }
-
-    function getNiriActiveWorkspace() {
-        if (NiriService.allWorkspaces.length === 0) {
-            return 1
-        }
-
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            return NiriService.getCurrentWorkspaceNumber()
-        }
-
-        const activeWs = NiriService.allWorkspaces.find(ws => ws.output === root.screenName && ws.is_active)
-        return activeWs ? activeWs.idx + 1 : 1
-    }
-
-    function getHyprlandWorkspaces() {
-        const workspaces = Hyprland.workspaces?.values || []
-
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            // Show all workspaces on all monitors if per-monitor filtering is disabled
-            const sorted = workspaces.slice().sort((a, b) => a.id - b.id)
-            return sorted.length > 0 ? sorted : [{
-                        "id": 1,
-                        "name": "1"
-                    }]
-        }
-
-        // Filter workspaces for this specific monitor using lastIpcObject.monitor
-        // This matches the approach from the original kyle-config
-        const monitorWorkspaces = workspaces.filter(ws => {
-            return ws.lastIpcObject && ws.lastIpcObject.monitor === root.screenName
-        })
-
-        if (monitorWorkspaces.length === 0) {
-            // Fallback if no workspaces exist for this monitor
-            return [{
-                        "id": 1,
-                        "name": "1"
-                    }]
-        }
-
-        // Return all workspaces for this monitor, sorted by ID
-        return monitorWorkspaces.sort((a, b) => a.id - b.id)
-    }
-
-    function getHyprlandActiveWorkspace() {
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
-            return Hyprland.focusedWorkspace ? Hyprland.focusedWorkspace.id : 1
-        }
-
-        // Find the monitor object for this screen
-        const monitors = Hyprland.monitors?.values || []
-        const currentMonitor = monitors.find(monitor => monitor.name === root.screenName)
-
-        if (!currentMonitor) {
-            return 1
-        }
-
-        // Use the monitor's active workspace ID (like original config)
-        return currentMonitor.activeWorkspace?.id ?? 1
-    }
-
-    readonly property real padding: isVertical
-        ? Math.max(Theme.spacingXS, Theme.spacingS * (widgetHeight / 30))
-        : (widgetHeight - workspaceRow.implicitHeight) / 2
-
-    function getRealWorkspaces() {
-        return root.workspaceList.filter(ws => {
-                                             if (CompositorService.isHyprland) {
-                                                 return ws && ws.id !== -1
-                                             }
-                                             return ws !== -1
-                                         })
-    }
-
-    function switchWorkspace(direction) {
-        if (CompositorService.isNiri) {
-            const realWorkspaces = getRealWorkspaces()
-            if (realWorkspaces.length < 2) {
-                return
-            }
-
-            const currentIndex = realWorkspaces.findIndex(ws => ws === root.currentWorkspace)
-            const validIndex = currentIndex === -1 ? 0 : currentIndex
-            const nextIndex = direction > 0 ? (validIndex + 1) % realWorkspaces.length : (validIndex - 1 + realWorkspaces.length) % realWorkspaces.length
-
-            NiriService.switchToWorkspace(realWorkspaces[nextIndex] - 1)
-        } else if (CompositorService.isHyprland) {
-            const command = direction > 0 ? "workspace r+1" : "workspace r-1"
-            Hyprland.dispatch(command)
-        }
-    }
-
-    width: isVertical ? widgetHeight : (workspaceRow.implicitWidth + padding * 2)
-    height: isVertical ? (workspaceRow.implicitHeight + padding * 2) : widgetHeight
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground)
-            return "transparent"
-        const baseColor = Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
-    visible: CompositorService.isNiri || CompositorService.isHyprland
-
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.NoButton
-
-        property real scrollAccumulator: 0
-        property real touchpadThreshold: 500
-
-        onWheel: wheel => {
-                     const deltaY = wheel.angleDelta.y
-                     const isMouseWheel = Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0
-                     const direction = deltaY < 0 ? 1 : -1
-
-                     if (isMouseWheel) {
-                        if (!SettingsData.workspaceScrolling || !CompositorService.isNiri) {
-                            switchWorkspace(direction)
-                        }
-                        else {
-                            const windows = root.sortedToplevels;
-                            if (windows.length < 2) {
-                                return;
-                            }
-                         let currentIndex = -1;
-                         for (let i = 0; i < windows.length; i++) {
-                            if (windows[i].activated) {
-                                currentIndex = i;
-                                break;
-                            }
-
-                         }
-                         let nextIndex;
-                         if (deltaY < 0) {
-                            if (currentIndex === -1) {
-                                nextIndex = 0;
-                            } else {
-                                nextIndex = currentIndex +1;
-                            }
-                         } else {
-                            if (currentIndex === -1) {
-                                nextIndex = windows.length -1;
-                            } else {
-                                nextIndex = currentIndex - 1
-                            }
-                         }
-                         const nextWindow = windows[nextIndex];
-                         if (nextWindow) {
-                            nextWindow.activate();
-                         }
-                        }
-                         
-                     } else {
-                         scrollAccumulator += deltaY
-
-                         if (Math.abs(scrollAccumulator) >= touchpadThreshold) {
-                             const touchDirection = scrollAccumulator < 0 ? 1 : -1
-                             if (!SettingsData.workspaceScrolling || !CompositorService.isNiri) {
-                                switchWorkspace(touchDirection)
-                             }
-                             else {
-                                const windows = root.sortedToplevels;
-                                if (windows.length < 2) {
-                                    return;
-                                }
-                                let currentIndex = -1;
-                                for (let i = 0; i < windows.length; i++) {
-                                    if (windows[i].activated) {
-                                        currentIndex = i;
-                                        break;
-                                    }
-
-                                }
-                                let nextIndex;
-                                if (deltaY < 0) {
-                                    if (currentIndex === -1) {
-                                    nextIndex = 0;
-                                } else {
-                                    nextIndex = currentIndex +1;
-                                }
-                            } else {
-                                if (currentIndex === -1) {
-                                    nextIndex = windows.length -1;
-                                } else {
-                                    nextIndex = currentIndex - 1
-                                }
-                            }
-                            const nextWindow = windows[nextIndex];
-                            if (nextWindow) {
-                                nextWindow.activate();
-                            }
-                        }
-                             
-                            scrollAccumulator = 0
-                         }
-                     }
-
-                     wheel.accepted = true
-                 }
-    }
-
-    Flow {
-        id: workspaceRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        flow: isVertical ? Flow.TopToBottom : Flow.LeftToRight
-
-        Repeater {
-            model: root.workspaceList
-
-            Rectangle {
-                id: delegateRoot
-
-                property bool isActive: {
-                    if (CompositorService.isHyprland) {
-                        return modelData && modelData.id === root.currentWorkspace
-                    }
-                    return modelData === root.currentWorkspace
-                }
-                property bool isPlaceholder: {
-                    if (CompositorService.isHyprland) {
-                        return modelData && modelData.id === -1
-                    }
-                    return modelData === -1
-                }
-                property bool isHovered: mouseArea.containsMouse
-
-                property var loadedWorkspaceData: null
-                property bool loadedIsUrgent: false
-                property bool isUrgent: {
-                    if (CompositorService.isHyprland) {
-                        return modelData?.urgent ?? false
-                    }
-                    if (CompositorService.isNiri) {
-                        return loadedIsUrgent
-                    }
-                    return false
-                }
-                property var loadedIconData: null
-                property bool loadedHasIcon: false
-                property var loadedIcons: []
-
-                Timer {
-                    id: dataUpdateTimer
-                    interval: 50
-                    onTriggered: {
-                        if (isPlaceholder) {
-                            delegateRoot.loadedWorkspaceData = null
-                            delegateRoot.loadedIconData = null
-                            delegateRoot.loadedHasIcon = false
-                            delegateRoot.loadedIcons = []
-                            delegateRoot.loadedIsUrgent = false
-                            return
-                        }
-
-                        var wsData = null;
-                        if (CompositorService.isNiri) {
-                            wsData = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.screenName) || null;
-                        } else if (CompositorService.isHyprland) {
-                            wsData = modelData;
-                        }
-                        delegateRoot.loadedWorkspaceData = wsData;
-                        delegateRoot.loadedIsUrgent = wsData?.is_urgent ?? false;
-
-                        var icData = null;
-                        if (wsData?.name) {
-                            icData = SettingsData.getWorkspaceNameIcon(wsData.name);
-                        }
-                        delegateRoot.loadedIconData = icData;
-                        delegateRoot.loadedHasIcon = icData !== null;
-
-                        if (SettingsData.showWorkspaceApps) {
-                            delegateRoot.loadedIcons = root.getWorkspaceIcons(CompositorService.isHyprland ? modelData : (modelData === -1 ? null : modelData));
-                        } else {
-                            delegateRoot.loadedIcons = [];
-                        }
-                    }
-                }
-
-                function updateAllData() {
-                    dataUpdateTimer.restart()
-                }
-
-                width: {
-                    if (root.isVertical) {
-                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5;
-                    } else {
-                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
-                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                            const iconsWidth = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0);
-                            const baseWidth = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7;
-                            return baseWidth + iconsWidth;
-                        }
-                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7;
-                    }
-                }
-                height: {
-                    if (root.isVertical) {
-                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
-                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                            const iconsHeight = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0);
-                            const baseHeight = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7;
-                            return baseHeight + iconsHeight;
-                        }
-                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7;
-                    } else {
-                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5;
-                    }
-                }
-                radius: Theme.cornerRadius
-                color: isActive ? Theme.primary : isUrgent ? Theme.error : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.outlineButton : Theme.surfaceTextAlpha
-
-                border.width: isUrgent && !isActive ? 2 : 0
-                border.color: isUrgent && !isActive ? Theme.error : Theme.withAlpha(Theme.error, 0)
-
-                Behavior on width {
-                    enabled: (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on height {
-                    enabled: root.isVertical && (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on border.width {
-                    NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                MouseArea {
-                    id: mouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: !isPlaceholder
-                    cursorShape: isPlaceholder ? Qt.ArrowCursor : Qt.PointingHandCursor
-                    enabled: !isPlaceholder
-                    onClicked: {
-                        if (isPlaceholder) {
-                            return
-                        }
-
-                        if (CompositorService.isNiri) {
-                            NiriService.switchToWorkspace(modelData - 1)
-                        } else if (CompositorService.isHyprland && modelData?.id) {
-                            Hyprland.dispatch(`workspace ${modelData.id}`)
-                        }
-                    }
-                }
-
-                Loader {
-                    id: appIconsLoader
-                    anchors.fill: parent
-                    active: SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        Loader {
-                            id: contentRow
-                            anchors.centerIn: parent
-                            sourceComponent: root.isVertical ? columnLayout : rowLayout
-                        }
-
-                        Component {
-                            id: rowLayout
-                            Row {
-                                spacing: 4
-                                visible: loadedIcons.length > 0
-
-                                Repeater {
-                                    model: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
-                                    delegate: Item {
-                                        width: 18
-                                        height: 18
-
-                                        IconImage {
-                                            id: appIcon
-                                            property var windowId: modelData.windowId
-                                            anchors.fill: parent
-                                            source: modelData.icon
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: !modelData.isSteamApp
-                                        }
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            size: 18
-                                            name: "sports_esports"
-                                            color: Theme.surfaceText
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: modelData.isSteamApp
-                                        }
-
-                                        MouseArea {
-                                            id: appMouseArea
-                                            hoverEnabled: true
-                                            anchors.fill: parent
-                                            enabled: isActive
-                                            cursorShape: Qt.PointingHandCursor
-                                            onClicked: {
-                                                if (CompositorService.isHyprland) {
-                                                    Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`)
-                                                } else if (CompositorService.isNiri) {
-                                                    NiriService.focusWindow(appIcon.windowId)
-                                                }
-                                            }
-                                        }
-
-                                        Rectangle {
-                                            visible: modelData.count > 1 && !isActive
-                                            width: 12
-                                            height: 12
-                                            radius: 6
-                                            color: "black"
-                                            border.color: "white"
-                                            border.width: 1
-                                            anchors.right: parent.right
-                                            anchors.bottom: parent.bottom
-                                            z: 2
-
-                                            Text {
-                                                anchors.centerIn: parent
-                                                text: modelData.count
-                                                font.pixelSize: 8
-                                                color: "white"
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        Component {
-                            id: columnLayout
-                            Column {
-                                spacing: 4
-                                visible: loadedIcons.length > 0
-
-                                Repeater {
-                                    model: loadedIcons.slice(0, SettingsData.maxWorkspaceIcons)
-                                    delegate: Item {
-                                        width: 18
-                                        height: 18
-
-                                        IconImage {
-                                            id: appIcon
-                                            property var windowId: modelData.windowId
-                                            anchors.fill: parent
-                                            source: modelData.icon
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: !modelData.isSteamApp
-                                        }
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            size: 18
-                                            name: "sports_esports"
-                                            color: Theme.surfaceText
-                                            opacity: modelData.active ? 1.0 : appMouseArea.containsMouse ? 0.8 : 0.6
-                                            visible: modelData.isSteamApp
-                                        }
-
-                                        MouseArea {
-                                            id: appMouseArea
-                                            hoverEnabled: true
-                                            anchors.fill: parent
-                                            enabled: isActive
-                                            cursorShape: Qt.PointingHandCursor
-                                            onClicked: {
-                                                if (CompositorService.isHyprland) {
-                                                    Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`)
-                                                } else if (CompositorService.isNiri) {
-                                                    NiriService.focusWindow(appIcon.windowId)
-                                                }
-                                            }
-                                        }
-
-                                        Rectangle {
-                                            visible: modelData.count > 1 && !isActive
-                                            width: 12
-                                            height: 12
-                                            radius: 6
-                                            color: "black"
-                                            border.color: "white"
-                                            border.width: 1
-                                            anchors.right: parent.right
-                                            anchors.bottom: parent.bottom
-                                            z: 2
-
-                                            Text {
-                                                anchors.centerIn: parent
-                                                text: modelData.count
-                                                font.pixelSize: 8
-                                                color: "white"
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // Loader for Custom Name Icon
-                Loader {
-                    id: customIconLoader
-                    anchors.fill: parent
-                    active: !isPlaceholder && loadedHasIcon && loadedIconData.type === "icon" && !SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: loadedIconData ? loadedIconData.value : "" // NULL CHECK
-                            size: Theme.fontSizeSmall
-                            color: isActive ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : Theme.surfaceTextMedium
-                            weight: isActive && !isPlaceholder ? 500 : 400
-                        }
-                    }
-                }
-
-                // Loader for Custom Name Text
-                Loader {
-                    id: customTextLoader
-                    anchors.fill: parent
-                    active: !isPlaceholder && loadedHasIcon && loadedIconData.type === "text" && !SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: loadedIconData ? loadedIconData.value : "" // NULL CHECK
-                            color: isActive ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : Theme.surfaceTextMedium
-                            font.pixelSize: Theme.barTextSize(barThickness)
-                            font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
-                        }
-                    }
-                }
-
-                // Loader for Workspace Index
-                Loader {
-                    id: indexLoader
-                    anchors.fill: parent
-                    active: !isPlaceholder && SettingsData.showWorkspaceIndex && !loadedHasIcon && !SettingsData.showWorkspaceApps
-                    sourceComponent: Item {
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: {
-                                const isPlaceholder = CompositorService.isHyprland ? (modelData?.id === -1) : (modelData === -1)
-                                if (isPlaceholder) {
-                                    return index + 1
-                                }
-                                return CompositorService.isHyprland ? (modelData?.id || "") : (modelData - 1);
-                            }
-                            color: (isActive || isUrgent) ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
-                            font.pixelSize: Theme.barTextSize(barThickness)
-                            font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
-                        }
-                    }
-                }
-
-                // --- LOGIC / TRIGGERS ---
-                Component.onCompleted: updateAllData()
-
-                Connections {
-                    target: CompositorService
-                    function onSortedToplevelsChanged() { delegateRoot.updateAllData() }
-                }
-                Connections {
-                    target: NiriService
-                    enabled: CompositorService.isNiri
-                    function onAllWorkspacesChanged() { delegateRoot.updateAllData() }
-                    function onWindowUrgentChanged() { delegateRoot.updateAllData() }
-                }
-                Connections {
-                    target: SettingsData
-                    function onShowWorkspaceAppsChanged() { delegateRoot.updateAllData() }
-                    function onWorkspaceNameIconsChanged() { delegateRoot.updateAllData() }
-                }
-            }
-        }
-    }
-}

Modules/DankDash/DankDashPopout.qml

@@ -1,204 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Effects
-import QtQuick.Layouts
-import Quickshell
-import Quickshell.Services.Mpris
-import Quickshell.Wayland
-import qs.Common
-import qs.Widgets
-import qs.Modules.DankDash
-
-DankPopout {
-    id: root
-
-    property bool dashVisible: false
-    property var triggerScreen: null
-    property int currentTabIndex: 0
-
-    function setTriggerPosition(x, y, width, section, screen) {
-        triggerSection = section
-        triggerScreen = screen
-        triggerY = y
-
-        if (section === "center" && (SettingsData.dankBarPosition === SettingsData.Position.Top || SettingsData.dankBarPosition === SettingsData.Position.Bottom)) {
-            const screenWidth = screen ? screen.width : Screen.width
-            triggerX = (screenWidth - popupWidth) / 2
-            triggerWidth = popupWidth
-        } else if (section === "center" && (SettingsData.dankBarPosition === SettingsData.Position.Left || SettingsData.dankBarPosition === SettingsData.Position.Right)) {
-            const screenHeight = screen ? screen.height : Screen.height
-            triggerX = (screenHeight - popupHeight) / 2
-            triggerWidth = popupHeight
-        } else {
-            triggerX = x
-            triggerWidth = width
-        }
-    }
-
-    popupWidth: 700
-    popupHeight: contentLoader.item ? contentLoader.item.implicitHeight : 500
-    triggerX: Screen.width - 620 - Theme.spacingL
-    triggerY: Math.max(26 + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding)) + SettingsData.dankBarSpacing + SettingsData.dankBarBottomGap - 2
-    triggerWidth: 80
-    shouldBeVisible: dashVisible
-    visible: shouldBeVisible
-
-
-    onDashVisibleChanged: {
-        if (dashVisible) {
-            open()
-        } else {
-            close()
-        }
-    }
-
-    onBackgroundClicked: {
-        dashVisible = false
-    }
-
-    content: Component {
-        Rectangle {
-            id: mainContainer
-
-            implicitHeight: contentColumn.height + Theme.spacingM * 2
-            color: Theme.surfaceContainer
-            radius: Theme.cornerRadius
-            focus: true
-
-            Component.onCompleted: {
-                if (root.shouldBeVisible) {
-                    forceActiveFocus()
-                }
-            }
-
-            Keys.onPressed: function(event) {
-                if (event.key === Qt.Key_Escape) {
-                    root.dashVisible = false
-                    event.accepted = true
-                }
-            }
-
-            Connections {
-                function onShouldBeVisibleChanged() {
-                    if (root.shouldBeVisible) {
-                        Qt.callLater(function() {
-                            mainContainer.forceActiveFocus()
-                        })
-                    }
-                }
-                target: root
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                color: Qt.rgba(Theme.surfaceTint.r, Theme.surfaceTint.g, Theme.surfaceTint.b, 0.04)
-                radius: parent.radius
-
-                SequentialAnimation on opacity {
-                    running: root.shouldBeVisible
-                    loops: Animation.Infinite
-
-                    NumberAnimation {
-                        to: 0.08
-                        duration: Theme.extraLongDuration
-                        easing.type: Theme.standardEasing
-                    }
-
-                    NumberAnimation {
-                        to: 0.02
-                        duration: Theme.extraLongDuration
-                        easing.type: Theme.standardEasing
-                    }
-                }
-            }
-
-            Column {
-                id: contentColumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingS
-
-                DankTabBar {
-                    id: tabBar
-
-                    width: parent.width
-                    height: 48
-                    currentIndex: root.currentTabIndex
-                    spacing: Theme.spacingS
-                    equalWidthTabs: true
-
-                    model: {
-                        let tabs = [
-                            { icon: "dashboard", text: I18n.tr("Overview") },
-                            { icon: "music_note", text: I18n.tr("Media") }
-                        ]
-                        
-                        if (SettingsData.weatherEnabled) {
-                            tabs.push({ icon: "wb_sunny", text: I18n.tr("Weather") })
-                        }
-                        
-                        tabs.push({ icon: "settings", text: I18n.tr("Settings"), isAction: true })
-                        return tabs
-                    }
-
-                    onTabClicked: function(index) {
-                        root.currentTabIndex = index
-                    }
-
-                    onActionTriggered: function(index) {
-                        let settingsIndex = SettingsData.weatherEnabled ? 3 : 2
-                        if (index === settingsIndex) {
-                            dashVisible = false
-                            settingsModal.show()
-                        }
-                    }
-
-                }
-
-                Item {
-                    width: parent.width
-                    height: Theme.spacingXS
-                }
-
-                StackLayout {
-                    id: pages
-                    width: parent.width
-                    implicitHeight: {
-                        if (currentIndex === 0) return overviewTab.implicitHeight
-                        if (currentIndex === 1) return mediaTab.implicitHeight
-                        if (SettingsData.weatherEnabled && currentIndex === 2) return weatherTab.implicitHeight
-                        return overviewTab.implicitHeight
-                    }
-                    currentIndex: root.currentTabIndex
-
-                    OverviewTab {
-                        id: overviewTab
-
-                        onSwitchToWeatherTab: {
-                            if (SettingsData.weatherEnabled) {
-                                tabBar.currentIndex = 2
-                                tabBar.tabClicked(2)
-                            }
-                        }
-
-                        onSwitchToMediaTab: {
-                            tabBar.currentIndex = 1
-                            tabBar.tabClicked(1)
-                        }
-                    }
-
-                    MediaPlayerTab {
-                        id: mediaTab
-                    }
-
-                    WeatherTab {
-                        id: weatherTab
-                        visible: SettingsData.weatherEnabled && root.currentTabIndex === 2
-                    }
-                }
-            }
-        }
-    }
-}

Modules/Dock/DockAppButton.qml

@@ -1,564 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Widgets
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    clip: false
-    property var appData
-    property var contextMenu: null
-    property var dockApps: null
-    property int index: -1
-    property var parentDockScreen: null
-    property bool longPressing: false
-    property bool dragging: false
-    property point dragStartPos: Qt.point(0, 0)
-    property point dragOffset: Qt.point(0, 0)
-    property int targetIndex: -1
-    property int originalIndex: -1
-    property bool showWindowTitle: false
-    property string windowTitle: ""
-    property bool isHovered: mouseArea.containsMouse && !dragging
-    property bool showTooltip: mouseArea.containsMouse && !dragging
-    property var cachedDesktopEntry: null
-    property real actualIconSize: 40
-
-    function updateDesktopEntry() {
-        if (!appData || appData.appId === "__SEPARATOR__") {
-            cachedDesktopEntry = null
-            return
-        }
-        const moddedId = Paths.moddedAppId(appData.appId)
-        cachedDesktopEntry = DesktopEntries.heuristicLookup(moddedId)
-    }
-
-    Component.onCompleted: updateDesktopEntry()
-
-    onAppDataChanged: updateDesktopEntry()
-
-    Connections {
-        target: DesktopEntries
-        function onApplicationsChanged() {
-            updateDesktopEntry()
-        }
-    }
-    property bool isWindowFocused: {
-        if (!appData) {
-            return false
-        }
-
-        if (appData.type === "window") {
-            const toplevel = getToplevelObject()
-            if (!toplevel) {
-                return false
-            }
-            return toplevel.activated
-        } else if (appData.type === "grouped") {
-            // For grouped apps, check if any window is focused
-            const allToplevels = ToplevelManager.toplevels.values
-            for (let i = 0; i < allToplevels.length; i++) {
-                const toplevel = allToplevels[i]
-                if (toplevel.appId === appData.appId && toplevel.activated) {
-                    return true
-                }
-            }
-        }
-
-        return false
-    }
-    property string tooltipText: {
-        if (!appData) {
-            return ""
-        }
-
-        if ((appData.type === "window" && showWindowTitle) || (appData.type === "grouped" && appData.windowTitle)) {
-            const appName = cachedDesktopEntry && cachedDesktopEntry.name ? cachedDesktopEntry.name : appData.appId
-            const title = appData.type === "window" ? windowTitle : appData.windowTitle
-            return appName + (title ? " • " + title : "")
-        }
-
-        if (!appData.appId) {
-            return ""
-        }
-
-        return cachedDesktopEntry && cachedDesktopEntry.name ? cachedDesktopEntry.name : appData.appId
-    }
-
-    function getToplevelObject() {
-        if (!appData) {
-            return null
-        }
-
-        const sortedToplevels = CompositorService.sortedToplevels
-        if (!sortedToplevels) {
-            return null
-        }
-
-        if (appData.type === "window") {
-            if (appData.uniqueId) {
-                for (var i = 0; i < sortedToplevels.length; i++) {
-                    const toplevel = sortedToplevels[i]
-                    const checkId = toplevel.title + "|" + (toplevel.appId || "") + "|" + i
-                    if (checkId === appData.uniqueId) {
-                        return toplevel
-                    }
-                }
-            }
-
-            if (appData.windowId !== undefined && appData.windowId !== null && appData.windowId >= 0) {
-                if (appData.windowId < sortedToplevels.length) {
-                    return sortedToplevels[appData.windowId]
-                }
-            }
-        } else if (appData.type === "grouped") {
-            if (appData.windowId !== undefined && appData.windowId !== null && appData.windowId >= 0) {
-                if (appData.windowId < sortedToplevels.length) {
-                    return sortedToplevels[appData.windowId]
-                }
-            }
-        }
-
-        return null
-    }
-
-    function getGroupedToplevels() {
-        if (!appData || appData.type !== "grouped") {
-            return []
-        }
-
-        const toplevels = []
-        const allToplevels = ToplevelManager.toplevels.values
-        for (let i = 0; i < allToplevels.length; i++) {
-            const toplevel = allToplevels[i]
-            if (toplevel.appId === appData.appId) {
-                toplevels.push(toplevel)
-            }
-        }
-        return toplevels
-    }
-    onIsHoveredChanged: {
-        if (mouseArea.pressed) return
-
-        if (isHovered) {
-            exitAnimation.stop()
-            if (!bounceAnimation.running) {
-                bounceAnimation.restart()
-            }
-        } else {
-            bounceAnimation.stop()
-            exitAnimation.restart()
-        }
-    }
-
-    readonly property bool animateX: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right
-    readonly property real animationDistance: actualIconSize
-    readonly property real animationDirection: {
-        if (SettingsData.dockPosition === SettingsData.Position.Bottom) return -1
-        if (SettingsData.dockPosition === SettingsData.Position.Top) return 1
-        if (SettingsData.dockPosition === SettingsData.Position.Right) return -1
-        if (SettingsData.dockPosition === SettingsData.Position.Left) return 1
-        return -1
-    }
-
-    SequentialAnimation {
-        id: bounceAnimation
-
-        running: false
-
-        NumberAnimation {
-            target: iconTransform
-            property: animateX ? "x" : "y"
-            to: animationDirection * animationDistance * 0.25
-            duration: Anims.durShort
-            easing.type: Easing.BezierSpline
-            easing.bezierCurve: Anims.emphasizedAccel
-        }
-
-        NumberAnimation {
-            target: iconTransform
-            property: animateX ? "x" : "y"
-            to: animationDirection * animationDistance * 0.2
-            duration: Anims.durShort
-            easing.type: Easing.BezierSpline
-            easing.bezierCurve: Anims.emphasizedDecel
-        }
-    }
-
-    NumberAnimation {
-        id: exitAnimation
-
-        running: false
-        target: iconTransform
-        property: animateX ? "x" : "y"
-        to: 0
-        duration: Anims.durShort
-        easing.type: Easing.BezierSpline
-        easing.bezierCurve: Anims.emphasizedDecel
-    }
-
-    Timer {
-        id: longPressTimer
-
-        interval: 500
-        repeat: false
-        onTriggered: {
-            if (appData && appData.isPinned) {
-                longPressing = true
-            }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: longPressing ? Qt.DragMoveCursor : Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
-        onPressed: mouse => {
-                       if (mouse.button === Qt.LeftButton && appData && appData.isPinned) {
-                           dragStartPos = Qt.point(mouse.x, mouse.y)
-                           longPressTimer.start()
-                       }
-                   }
-        onReleased: mouse => {
-                        longPressTimer.stop()
-                        if (longPressing) {
-                            if (dragging && targetIndex >= 0 && targetIndex !== originalIndex && dockApps) {
-                                dockApps.movePinnedApp(originalIndex, targetIndex)
-                            }
-
-                            longPressing = false
-                            dragging = false
-                            dragOffset = Qt.point(0, 0)
-                            targetIndex = -1
-                            originalIndex = -1
-                        }
-                    }
-        onPositionChanged: mouse => {
-                               if (longPressing && !dragging) {
-                                   const distance = Math.sqrt(Math.pow(mouse.x - dragStartPos.x, 2) + Math.pow(mouse.y - dragStartPos.y, 2))
-                                   if (distance > 5) {
-                                       dragging = true
-                                       targetIndex = index
-                                       originalIndex = index
-                                   }
-                               }
-                               if (dragging) {
-                                   dragOffset = Qt.point(mouse.x - dragStartPos.x, mouse.y - dragStartPos.y)
-                                   if (dockApps) {
-                                       const threshold = actualIconSize
-                                       let newTargetIndex = targetIndex
-                                       if (dragOffset.x > threshold && targetIndex < dockApps.pinnedAppCount - 1) {
-                                           newTargetIndex = targetIndex + 1
-                                       } else if (dragOffset.x < -threshold && targetIndex > 0) {
-                                           newTargetIndex = targetIndex - 1
-                                       }
-                                       if (newTargetIndex !== targetIndex) {
-                                           targetIndex = newTargetIndex
-                                           dragStartPos = Qt.point(mouse.x, mouse.y)
-                                       }
-                                   }
-                               }
-                           }
-        onClicked: mouse => {
-                       if (!appData || longPressing) {
-                           return
-                       }
-
-                       if (mouse.button === Qt.LeftButton) {
-                           if (appData.type === "pinned") {
-                               if (appData && appData.appId) {
-                                   const desktopEntry = cachedDesktopEntry
-                                   if (desktopEntry) {
-                                       AppUsageHistoryData.addAppUsage({
-                                                                           "id": appData.appId,
-                                                                           "name": desktopEntry.name || appData.appId,
-                                                                           "icon": desktopEntry.icon || "",
-                                                                           "exec": desktopEntry.exec || "",
-                                                                           "comment": desktopEntry.comment || ""
-                                                                       })
-                                   }
-                                   SessionService.launchDesktopEntry(desktopEntry)
-                               }
-                           } else if (appData.type === "window") {
-                               const toplevel = getToplevelObject()
-                               if (toplevel) {
-                                   toplevel.activate()
-                               }
-                           } else if (appData.type === "grouped") {
-                               if (appData.windowCount === 0) {
-                                   if (appData && appData.appId) {
-                                       const desktopEntry = cachedDesktopEntry
-                                       if (desktopEntry) {
-                                           AppUsageHistoryData.addAppUsage({
-                                                                               "id": appData.appId,
-                                                                               "name": desktopEntry.name || appData.appId,
-                                                                               "icon": desktopEntry.icon || "",
-                                                                               "exec": desktopEntry.exec || "",
-                                                                               "comment": desktopEntry.comment || ""
-                                                                           })
-                                       }
-                                       SessionService.launchDesktopEntry(desktopEntry)
-                                   }
-                               } else if (appData.windowCount === 1) {
-                                   // For single window, activate directly
-                                   const toplevel = getToplevelObject()
-                                   if (toplevel) {
-                                       console.log("Activating grouped app window:", appData.windowTitle)
-                                       toplevel.activate()
-                                   } else {
-                                       console.warn("No toplevel found for grouped app")
-                                   }
-                               } else {
-                                   if (contextMenu) {
-                                       contextMenu.showForButton(root, appData, root.height + 25, true, cachedDesktopEntry, parentDockScreen)
-                                   }
-                               }
-                           }
-                       } else if (mouse.button === Qt.MiddleButton) {
-                           if (appData && appData.type === "window") {
-                               const sortedToplevels = CompositorService.sortedToplevels
-                               for (var i = 0; i < sortedToplevels.length; i++) {
-                                   const toplevel = sortedToplevels[i]
-                                   const checkId = toplevel.title + "|" + (toplevel.appId || "") + "|" + i
-                                   if (checkId === appData.uniqueId) {
-                                       toplevel.close()
-                                       break
-                                   }
-                               }
-                           } else if (appData && appData.type === "grouped") {
-                               if (contextMenu) {
-                                   contextMenu.showForButton(root, appData, root.height, false, cachedDesktopEntry, parentDockScreen)
-                               }
-                           } else if (appData && appData.appId) {
-                               const desktopEntry = cachedDesktopEntry
-                               if (desktopEntry) {
-                                   AppUsageHistoryData.addAppUsage({
-                                                                       "id": appData.appId,
-                                                                       "name": desktopEntry.name || appData.appId,
-                                                                       "icon": desktopEntry.icon || "",
-                                                                       "exec": desktopEntry.exec || "",
-                                                                       "comment": desktopEntry.comment || ""
-                                                                   })
-                               }
-                               SessionService.launchDesktopEntry(desktopEntry)
-                           }
-                       } else if (mouse.button === Qt.RightButton) {
-                           if (contextMenu && appData) {
-                               contextMenu.showForButton(root, appData, root.height, false, cachedDesktopEntry, parentDockScreen)
-                           } else {
-                               console.warn("No context menu or appData available")
-                           }
-                       }
-                   }
-    }
-
-    Item {
-        id: visualContent
-        anchors.fill: parent
-
-        transform: Translate {
-            id: iconTransform
-            x: 0
-            y: 0
-        }
-
-        Rectangle {
-            anchors.fill: parent
-            radius: Theme.cornerRadius
-            color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3)
-            border.width: 2
-            border.color: Theme.primary
-            visible: dragging
-            z: -1
-        }
-
-        IconImage {
-            id: iconImg
-
-            anchors.centerIn: parent
-            implicitSize: actualIconSize
-            source: {
-                if (appData.appId === "__SEPARATOR__") {
-                    return ""
-                }
-                const moddedId = Paths.moddedAppId(appData.appId)
-                if (moddedId.toLowerCase().includes("steam_app")) {
-                    return ""
-                }
-                return cachedDesktopEntry && cachedDesktopEntry.icon ? Quickshell.iconPath(cachedDesktopEntry.icon, true) : ""
-            }
-            mipmap: true
-            smooth: true
-            asynchronous: true
-            visible: status === Image.Ready
-        }
-
-        DankIcon {
-            anchors.centerIn: parent
-            size: actualIconSize
-            name: "sports_esports"
-            color: Theme.surfaceText
-            visible: {
-                if (!appData || !appData.appId || appData.appId === "__SEPARATOR__") {
-                    return false
-                }
-                const moddedId = Paths.moddedAppId(appData.appId)
-                return moddedId.toLowerCase().includes("steam_app")
-            }
-        }
-
-        Rectangle {
-            width: actualIconSize
-            height: actualIconSize
-            anchors.centerIn: parent
-            visible: iconImg.status !== Image.Ready
-            color: Theme.surfaceLight
-            radius: Theme.cornerRadius
-            border.width: 1
-            border.color: Theme.primarySelected
-
-            Text {
-                anchors.centerIn: parent
-                text: {
-                    if (!appData || !appData.appId) {
-                        return "?"
-                    }
-
-                    const desktopEntry = cachedDesktopEntry
-                    if (desktopEntry && desktopEntry.name) {
-                        return desktopEntry.name.charAt(0).toUpperCase()
-                    }
-
-                    return appData.appId.charAt(0).toUpperCase()
-                }
-                font.pixelSize: Math.max(8, parent.width * 0.35)
-                color: Theme.primary
-                font.weight: Font.Bold
-            }
-        }
-
-        Loader {
-            anchors.horizontalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.horizontalCenter
-            anchors.verticalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? parent.verticalCenter : undefined
-            anchors.bottom: SettingsData.dockPosition === SettingsData.Position.Bottom ? parent.bottom : undefined
-            anchors.top: SettingsData.dockPosition === SettingsData.Position.Top ? parent.top : undefined
-            anchors.left: SettingsData.dockPosition === SettingsData.Position.Left ? parent.left : undefined
-            anchors.right: SettingsData.dockPosition === SettingsData.Position.Right ? parent.right : undefined
-            anchors.bottomMargin: SettingsData.dockPosition === SettingsData.Position.Bottom ? -2 : 0
-            anchors.topMargin: SettingsData.dockPosition === SettingsData.Position.Top ? -2 : 0
-            anchors.leftMargin: SettingsData.dockPosition === SettingsData.Position.Left ? -2 : 0
-            anchors.rightMargin: SettingsData.dockPosition === SettingsData.Position.Right ? -2 : 0
-
-            sourceComponent: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? columnIndicator : rowIndicator
-
-            visible: {
-                if (!appData) return false
-                if (appData.type === "window") return true
-                if (appData.type === "grouped") return appData.windowCount > 0
-                return appData.isRunning
-            }
-        }
-    }
-
-    Component {
-        id: rowIndicator
-
-        Row {
-            spacing: 2
-
-            Repeater {
-                model: {
-                    if (!appData) return 0
-                    if (appData.type === "grouped") {
-                        return Math.min(appData.windowCount, 4)
-                    } else if (appData.type === "window" || appData.isRunning) {
-                        return 1
-                    }
-                    return 0
-                }
-
-                Rectangle {
-                    width: appData && appData.type === "grouped" && appData.windowCount > 1 ? Math.max(3, actualIconSize * 0.1) : Math.max(6, actualIconSize * 0.2)
-                    height: Math.max(2, actualIconSize * 0.05)
-                    radius: Theme.cornerRadius
-                    color: {
-                        if (!appData) {
-                            return "transparent"
-                        }
-
-                        if (appData.type !== "grouped" || appData.windowCount === 1) {
-                            if (isWindowFocused) {
-                                return Theme.primary
-                            }
-                            return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                        }
-
-                        if (appData.type === "grouped" && appData.windowCount > 1) {
-                            const groupToplevels = getGroupedToplevels()
-                            if (index < groupToplevels.length && groupToplevels[index].activated) {
-                                return Theme.primary
-                            }
-                        }
-
-                        return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: columnIndicator
-
-        Column {
-            spacing: 2
-
-            Repeater {
-                model: {
-                    if (!appData) return 0
-                    if (appData.type === "grouped") {
-                        return Math.min(appData.windowCount, 4)
-                    } else if (appData.type === "window" || appData.isRunning) {
-                        return 1
-                    }
-                    return 0
-                }
-
-                Rectangle {
-                    width: Math.max(2, actualIconSize * 0.05)
-                    height: appData && appData.type === "grouped" && appData.windowCount > 1 ? Math.max(3, actualIconSize * 0.1) : Math.max(6, actualIconSize * 0.2)
-                    radius: Theme.cornerRadius
-                    color: {
-                        if (!appData) {
-                            return "transparent"
-                        }
-
-                        if (appData.type !== "grouped" || appData.windowCount === 1) {
-                            if (isWindowFocused) {
-                                return Theme.primary
-                            }
-                            return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                        }
-
-                        if (appData.type === "grouped" && appData.windowCount > 1) {
-                            const groupToplevels = getGroupedToplevels()
-                            if (index < groupToplevels.length && groupToplevels[index].activated) {
-                                return Theme.primary
-                            }
-                        }
-
-                        return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                    }
-                }
-            }
-        }
-    }
-}

Modules/Dock/DockApps.qml

@@ -1,263 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    property var contextMenu: null
-    property bool requestDockShow: false
-    property int pinnedAppCount: 0
-    property bool groupByApp: false
-    property bool isVertical: false
-    property var dockScreen: null
-    property real iconSize: 40
-
-    clip: false
-    implicitWidth: isVertical ? appLayout.height : appLayout.width
-    implicitHeight: isVertical ? appLayout.width : appLayout.height
-
-    function movePinnedApp(fromIndex, toIndex) {
-        if (fromIndex === toIndex) {
-            return
-        }
-
-        const currentPinned = [...(SessionData.pinnedApps || [])]
-        if (fromIndex < 0 || fromIndex >= currentPinned.length || toIndex < 0 || toIndex >= currentPinned.length) {
-            return
-        }
-
-        const movedApp = currentPinned.splice(fromIndex, 1)[0]
-        currentPinned.splice(toIndex, 0, movedApp)
-
-        SessionData.setPinnedApps(currentPinned)
-    }
-
-    Item {
-        id: appLayout
-        width: layoutFlow.width
-        height: layoutFlow.height
-        anchors.horizontalCenter: root.isVertical ? undefined : parent.horizontalCenter
-        anchors.verticalCenter: root.isVertical ? parent.verticalCenter : undefined
-        anchors.left: root.isVertical && SettingsData.dockPosition === SettingsData.Position.Left ? parent.left : undefined
-        anchors.right: root.isVertical && SettingsData.dockPosition === SettingsData.Position.Right ? parent.right : undefined
-        anchors.top: root.isVertical ? undefined : parent.top
-
-        Flow {
-            id: layoutFlow
-            flow: root.isVertical ? Flow.TopToBottom : Flow.LeftToRight
-            spacing: Math.min(8, Math.max(4, root.iconSize * 0.08))
-
-        Repeater {
-            id: repeater
-            model: ListModel {
-                id: dockModel
-
-                Component.onCompleted: updateModel()
-
-                function updateModel() {
-                    clear()
-
-                    const items = []
-                    const pinnedApps = [...(SessionData.pinnedApps || [])]
-                    const sortedToplevels = CompositorService.sortedToplevels
-
-                    if (root.groupByApp) {
-                        // Group windows by appId
-                        const appGroups = new Map()
-
-                        // Add pinned apps first (even if they have no windows)
-                        pinnedApps.forEach(appId => {
-                            appGroups.set(appId, {
-                                appId: appId,
-                                isPinned: true,
-                                windows: []
-                            })
-                        })
-
-                        // Group all running windows by appId
-                        sortedToplevels.forEach((toplevel, index) => {
-                            const appId = toplevel.appId || "unknown"
-                            if (!appGroups.has(appId)) {
-                                appGroups.set(appId, {
-                                    appId: appId,
-                                    isPinned: false,
-                                    windows: []
-                                })
-                            }
-                            const title = toplevel.title || "(Unnamed)"
-                            const truncatedTitle = title.length > 50 ? title.substring(0, 47) + "..." : title
-                            const uniqueId = toplevel.title + "|" + (toplevel.appId || "") + "|" + index
-
-                            appGroups.get(appId).windows.push({
-                                windowId: index,
-                                windowTitle: truncatedTitle,
-                                uniqueId: uniqueId
-                            })
-                        })
-
-                        // Sort groups: pinned first, then unpinned
-                        const pinnedGroups = []
-                        const unpinnedGroups = []
-
-                        Array.from(appGroups.entries()).forEach(([appId, group]) => {
-                            // For grouped apps, just show the first window info but track all windows
-                            const firstWindow = group.windows.length > 0 ? group.windows[0] : null
-
-                            const item = {
-                                "type": "grouped",
-                                "appId": appId,
-                                "windowId": firstWindow ? firstWindow.windowId : -1,
-                                "windowTitle": firstWindow ? firstWindow.windowTitle : "",
-                                "workspaceId": -1,
-                                "isPinned": group.isPinned,
-                                "isRunning": group.windows.length > 0,
-                                "windowCount": group.windows.length,
-                                "uniqueId": firstWindow ? firstWindow.uniqueId : "",
-                                "allWindows": group.windows
-                            }
-
-                            if (group.isPinned) {
-                                pinnedGroups.push(item)
-                            } else {
-                                unpinnedGroups.push(item)
-                            }
-                        })
-
-                        // Add items in order
-                        pinnedGroups.forEach(item => items.push(item))
-
-                        // Add separator if needed
-                        if (pinnedGroups.length > 0 && unpinnedGroups.length > 0) {
-                            items.push({
-                                "type": "separator",
-                                "appId": "__SEPARATOR__",
-                                "windowId": -1,
-                                "windowTitle": "",
-                                "workspaceId": -1,
-                                "isPinned": false,
-                                "isRunning": false
-                            })
-                        }
-
-                        unpinnedGroups.forEach(item => items.push(item))
-                        root.pinnedAppCount = pinnedGroups.length
-                    } else {
-                        pinnedApps.forEach(appId => {
-                            items.push({
-                                "type": "pinned",
-                                "appId": appId,
-                                "windowId": -1,
-                                "windowTitle": "",
-                                "workspaceId": -1,
-                                "isPinned": true,
-                                "isRunning": false
-                            })
-                        })
-
-                        root.pinnedAppCount = pinnedApps.length
-
-                        if (pinnedApps.length > 0 && sortedToplevels.length > 0) {
-                            items.push({
-                                "type": "separator",
-                                "appId": "__SEPARATOR__",
-                                "windowId": -1,
-                                "windowTitle": "",
-                                "workspaceId": -1,
-                                "isPinned": false,
-                                "isRunning": false,
-                                "isFocused": false
-                            })
-                        }
-
-                        sortedToplevels.forEach((toplevel, index) => {
-                            const title = toplevel.title || "(Unnamed)"
-                            const truncatedTitle = title.length > 50 ? title.substring(0, 47) + "..." : title
-                            const uniqueId = toplevel.title + "|" + (toplevel.appId || "") + "|" + index
-
-                            items.push({
-                                "type": "window",
-                                "appId": toplevel.appId,
-                                "windowId": index,
-                                "windowTitle": truncatedTitle,
-                                "workspaceId": -1,
-                                "isPinned": false,
-                                "isRunning": true,
-                                "uniqueId": uniqueId
-                            })
-                        })
-                    }
-
-                    items.forEach(item => append(item))
-                }
-            }
-
-            delegate: Item {
-                id: delegateItem
-                property alias dockButton: button
-                clip: false
-
-                width: model.type === "separator" ? (root.isVertical ? root.iconSize : 8) : (root.isVertical ? root.iconSize : root.iconSize * 1.2)
-                height: model.type === "separator" ? (root.isVertical ? 8 : root.iconSize) : (root.isVertical ? root.iconSize * 1.2 : root.iconSize)
-
-                Rectangle {
-                    visible: model.type === "separator"
-                    width: root.isVertical ? root.iconSize * 0.5 : 2
-                    height: root.isVertical ? 2 : root.iconSize * 0.5
-                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)
-                    radius: 1
-                    anchors.centerIn: parent
-                }
-
-                MouseArea {
-                    visible: model.type === "separator"
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    acceptedButtons: Qt.NoButton
-                }
-
-                DockAppButton {
-                    id: button
-                    visible: model.type !== "separator"
-                    anchors.centerIn: parent
-
-                    width: delegateItem.width
-                    height: delegateItem.height
-                    actualIconSize: root.iconSize
-
-                    appData: model
-                    contextMenu: root.contextMenu
-                    dockApps: root
-                    index: model.index
-                    parentDockScreen: root.dockScreen
-
-                    showWindowTitle: model.type === "window" || model.type === "grouped"
-                    windowTitle: model.windowTitle || ""
-                }
-            }
-        }
-        }
-    }
-
-    Connections {
-        target: CompositorService
-        function onSortedToplevelsChanged() {
-            dockModel.updateModel()
-        }
-    }
-
-    Connections {
-        target: SessionData
-        function onPinnedAppsChanged() {
-            dockModel.updateModel()
-        }
-    }
-
-    onGroupByAppChanged: {
-        dockModel.updateModel()
-    }
-}

Modules/Greetd/GreeterSurface.qml

@@ -1,18 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Services.Greetd
-
-WlSessionLockSurface {
-    id: root
-
-    required property WlSessionLock lock
-
-    color: "transparent"
-
-    GreeterContent {
-        anchors.fill: parent
-        screenName: root.screen?.name ?? ""
-        sessionLock: root.lock
-    }
-}

Modules/Lock/CustomButtonKeyboard.qml

@@ -1,25 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-DankActionButton {
-    id: customButtonKeyboard
-    circular: false
-    property string text: ""
-    width: 40
-    height: 40
-    property bool isShift: false
-    color: Theme.surface
-
-    StyledText {
-        id: contentItem
-        anchors.centerIn: parent
-        text: parent.text
-        color: Theme.surfaceText
-        font.pixelSize: Theme.fontSizeXLarge
-        font.weight: Font.Normal
-    }
-}

Modules/Lock/Keyboard.qml

@@ -1,361 +0,0 @@
-import QtQuick
-import qs.Common
-
-Rectangle {
-    id: root
-    property Item target
-    height: 60 * 5
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    color: Theme.widgetBackground
-
-    property double rowSpacing: 0.01 * width  // horizontal spacing between keyboard
-    property double columnSpacing: 0.02 * height // vertical   spacing between keyboard
-    property bool shift: false //Boolean for the shift state
-    property bool symbols: false //Boolean for the symbol state
-    property double columns: 10 // Number of column
-    property double rows: 4 // Number of row
-
-    property string strShift: '\u2191' // UPWARDS ARROW unicode
-    property string strBackspace: "Backspace"
-
-    property var modelKeyboard: {
-        "row_1": [
-            {
-                text: 'q',
-                symbol: '1',
-                width: 1
-            },
-            {
-                text: 'w',
-                symbol: '2',
-                width: 1
-            },
-            {
-                text: 'e',
-                symbol: '3',
-                width: 1
-            },
-            {
-                text: 'r',
-                symbol: '4',
-                width: 1
-            },
-            {
-                text: 't',
-                symbol: '5',
-                width: 1
-            },
-            {
-                text: 'y',
-                symbol: '6',
-                width: 1
-            },
-            {
-                text: 'u',
-                symbol: '7',
-                width: 1
-            },
-            {
-                text: 'i',
-                symbol: '8',
-                width: 1
-            },
-            {
-                text: 'o',
-                symbol: '9',
-                width: 1
-            },
-            {
-                text: 'p',
-                symbol: '0',
-                width: 1
-            },
-        ],
-        "row_2": [
-            {
-                text: 'a',
-                symbol: '-',
-                width: 1
-            },
-            {
-                text: 's',
-                symbol: '/',
-                width: 1
-            },
-            {
-                text: 'd',
-                symbol: ':',
-                width: 1
-            },
-            {
-                text: 'f',
-                symbol: ';',
-                width: 1
-            },
-            {
-                text: 'g',
-                symbol: '(',
-                width: 1
-            },
-            {
-                text: 'h',
-                symbol: ')',
-                width: 1
-            },
-            {
-                text: 'j',
-                symbol: '€',
-                width: 1
-            },
-            {
-                text: 'k',
-                symbol: '&',
-                width: 1
-            },
-            {
-                text: 'l',
-                symbol: '@',
-                width: 1
-            }
-        ],
-        "row_3": [
-            {
-                text: strShift,
-                symbol: strShift,
-                width: 1.5
-            },
-            {
-                text: 'z',
-                symbol: '.',
-                width: 1
-            },
-            {
-                text: 'x',
-                symbol: ',',
-                width: 1
-            },
-            {
-                text: 'c',
-                symbol: '?',
-                width: 1
-            },
-            {
-                text: 'v',
-                symbol: '!',
-                width: 1
-            },
-            {
-                text: 'b',
-                symbol: "'",
-                width: 1
-            },
-            {
-                text: 'n',
-                symbol: "%",
-                width: 1
-            },
-            {
-                text: 'm',
-                symbol: '"',
-                width: 1
-            },
-            {
-                text: "'",
-                symbol: "*",
-                width: 1.5
-            }
-        ],
-        "row_4": [
-            {
-                text: "123",
-                symbol: 'ABC',
-                width: 1.5
-            },
-            {
-                text: ' ',
-                symbol: ' ',
-                width: 6
-            },
-            {
-                text: '.',
-                symbol: '.',
-                width: 1
-            },
-            {
-                text: strBackspace,
-                symbol: strBackspace,
-                width: 1.5
-            }
-        ]
-    }
-
-    //Here is the corresponding table between the ascii and the key event
-    property var tableKeyEvent: {
-        "_0": Qt.Key_0,
-        "_1": Qt.Key_1,
-        "_2": Qt.Key_2,
-        "_3": Qt.Key_3,
-        "_4": Qt.Key_4,
-        "_5": Qt.Key_5,
-        "_6": Qt.Key_6,
-        "_7": Qt.Key_7,
-        "_8": Qt.Key_8,
-        "_9": Qt.Key_9,
-        "_a": Qt.Key_A,
-        "_b": Qt.Key_B,
-        "_c": Qt.Key_C,
-        "_d": Qt.Key_D,
-        "_e": Qt.Key_E,
-        "_f": Qt.Key_F,
-        "_g": Qt.Key_G,
-        "_h": Qt.Key_H,
-        "_i": Qt.Key_I,
-        "_j": Qt.Key_J,
-        "_k": Qt.Key_K,
-        "_l": Qt.Key_L,
-        "_m": Qt.Key_M,
-        "_n": Qt.Key_N,
-        "_o": Qt.Key_O,
-        "_p": Qt.Key_P,
-        "_q": Qt.Key_Q,
-        "_r": Qt.Key_R,
-        "_s": Qt.Key_S,
-        "_t": Qt.Key_T,
-        "_u": Qt.Key_U,
-        "_v": Qt.Key_V,
-        "_w": Qt.Key_W,
-        "_x": Qt.Key_X,
-        "_y": Qt.Key_Y,
-        "_z": Qt.Key_Z,
-        "_\u2190": Qt.Key_Backspace,
-        "_return": Qt.Key_Return,
-        "_ ": Qt.Key_Space,
-        "_-": Qt.Key_Minus,
-        "_/": Qt.Key_Slash,
-        "_:": Qt.Key_Colon,
-        "_;": Qt.Key_Semicolon,
-        "_(": Qt.Key_BracketLeft,
-        "_)": Qt.Key_BracketRight,
-        "_€": parseInt("20ac", 16) // I didn't find the appropriate Qt event so I used the hex format
-        ,
-        "_&": Qt.Key_Ampersand,
-        "_@": Qt.Key_At,
-        '_"': Qt.Key_QuoteDbl,
-        "_.": Qt.Key_Period,
-        "_,": Qt.Key_Comma,
-        "_?": Qt.Key_Question,
-        "_!": Qt.Key_Exclam,
-        "_'": Qt.Key_Apostrophe,
-        "_%": Qt.Key_Percent,
-        "_*": Qt.Key_Asterisk
-    }
-
-    Item {
-        id: keyboard_container
-        anchors.left: parent.left
-        anchors.leftMargin: 5
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.topMargin: 5
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 5
-
-        //One column which contains 5 rows
-        Column {
-            spacing: columnSpacing
-
-            Row {
-                id: row_1
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_1"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-            Row {
-                id: row_2
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_2"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-            Row {
-                id: row_3
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_3"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-                        isShift: shift && text === strShift
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-            Row {
-                id: row_4
-                spacing: rowSpacing
-                Repeater {
-                    model: modelKeyboard["row_4"]
-                    delegate: CustomButtonKeyboard {
-                        text: symbols ? modelData.symbol : shift ? modelData.text.toUpperCase() : modelData.text
-                        width: modelData.width * keyboard_container.width / columns - rowSpacing
-                        height: keyboard_container.height / rows - columnSpacing
-
-                        onClicked: root.clicked(text)
-                    }
-                }
-            }
-        }
-    }
-    signal clicked(string text)
-
-    Connections {
-        target: root
-        function onClicked(text) {
-            if (!keyboard_controller.target)
-                return;
-            if (text === strShift) {
-                root.shift = !root.shift; // toggle shift
-            } else if (text === '123') {
-                root.symbols = true;
-            } else if (text === 'ABC') {
-                root.symbols = false;
-            } else {
-                // insert text into target
-                if (text === strBackspace) {
-                    var current = keyboard_controller.target.text;
-                    keyboard_controller.target.text = current.slice(0, current.length - 1);
-                } else {
-                    // normal character
-                    var charToInsert = root.symbols ? text : (root.shift ? text.toUpperCase() : text);
-                    var current = keyboard_controller.target.text;
-                    var cursorPos = keyboard_controller.target.cursorPosition;
-                    keyboard_controller.target.text = current.slice(0, cursorPos) + charToInsert + current.slice(cursorPos);
-                    keyboard_controller.target.cursorPosition = cursorPos + 1;
-                }
-
-                // shift is momentary
-                if (root.shift && text !== strShift)
-                    root.shift = false;
-            }
-        }
-    }
-}

Modules/Lock/LockPowerMenu.qml

@@ -1,459 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property bool isVisible: false
-    property bool showLogout: true
-    property int selectedIndex: 0
-    property int optionCount: {
-        let count = 0
-        if (showLogout) count++
-        count++
-        if (SessionService.hibernateSupported) count++
-        count += 2
-        return count
-    }
-
-    signal closed()
-
-    function show() {
-        isVisible = true
-        selectedIndex = 0
-        Qt.callLater(() => {
-            if (powerMenuFocusScope && powerMenuFocusScope.forceActiveFocus) {
-                powerMenuFocusScope.forceActiveFocus()
-            }
-        })
-    }
-
-    function hide() {
-        isVisible = false
-        closed()
-    }
-
-    anchors.fill: parent
-    color: Qt.rgba(0, 0, 0, 0.5)
-    visible: isVisible
-    z: 1000
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: root.hide()
-    }
-
-    FocusScope {
-        id: powerMenuFocusScope
-        anchors.fill: parent
-        focus: root.isVisible
-
-        onVisibleChanged: {
-            if (visible) {
-                Qt.callLater(() => forceActiveFocus())
-            }
-        }
-
-        Keys.onEscapePressed: {
-            root.hide()
-        }
-
-        Keys.onPressed: event => {
-            switch (event.key) {
-            case Qt.Key_Up:
-            case Qt.Key_Backtab:
-                selectedIndex = (selectedIndex - 1 + optionCount) % optionCount
-                event.accepted = true
-                break
-            case Qt.Key_Down:
-            case Qt.Key_Tab:
-                selectedIndex = (selectedIndex + 1) % optionCount
-                event.accepted = true
-                break
-            case Qt.Key_Return:
-            case Qt.Key_Enter:
-                const actions = []
-                if (showLogout) actions.push("logout")
-                actions.push("suspend")
-                if (SessionService.hibernateSupported) actions.push("hibernate")
-                actions.push("reboot", "poweroff")
-                if (selectedIndex < actions.length) {
-                    const action = actions[selectedIndex]
-                    hide()
-                    switch (action) {
-                    case "logout":
-                        SessionService.logout()
-                        break
-                    case "suspend":
-                        SessionService.suspend()
-                        break
-                    case "hibernate":
-                        SessionService.hibernate()
-                        break
-                    case "reboot":
-                        SessionService.reboot()
-                        break
-                    case "poweroff":
-                        SessionService.poweroff()
-                        break
-                    }
-                }
-                event.accepted = true
-                break
-            case Qt.Key_N:
-                if (event.modifiers & Qt.ControlModifier) {
-                    selectedIndex = (selectedIndex + 1) % optionCount
-                    event.accepted = true
-                }
-                break
-            case Qt.Key_P:
-                if (event.modifiers & Qt.ControlModifier) {
-                    selectedIndex = (selectedIndex - 1 + optionCount) % optionCount
-                    event.accepted = true
-                }
-                break
-            case Qt.Key_J:
-                if (event.modifiers & Qt.ControlModifier) {
-                    selectedIndex = (selectedIndex + 1) % optionCount
-                    event.accepted = true
-                }
-                break
-            case Qt.Key_K:
-                if (event.modifiers & Qt.ControlModifier) {
-                    selectedIndex = (selectedIndex - 1 + optionCount) % optionCount
-                    event.accepted = true
-                }
-                break
-            }
-        }
-
-        Rectangle {
-            anchors.centerIn: parent
-            width: 320
-            implicitHeight: mainColumn.implicitHeight + Theme.spacingL * 2
-            height: implicitHeight
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainer
-            border.color: Theme.outlineMedium
-            border.width: 1
-
-            Column {
-                id: mainColumn
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingM
-
-                Row {
-                    width: parent.width
-
-                    StyledText {
-                        text: I18n.tr("Power Options")
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    Item {
-                        width: parent.width - 150
-                        height: 1
-                    }
-
-                    DankActionButton {
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: root.hide()
-                    }
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        visible: showLogout
-                        color: {
-                            if (selectedIndex === 0) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (logoutArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: selectedIndex === 0 ? Theme.primary : "transparent"
-                        border.width: selectedIndex === 0 ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "logout"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Log Out")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        MouseArea {
-                            id: logoutArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                root.hide()
-                                SessionService.logout()
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            const suspendIdx = showLogout ? 1 : 0
-                            if (selectedIndex === suspendIdx) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (suspendArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: selectedIndex === (showLogout ? 1 : 0) ? Theme.primary : "transparent"
-                        border.width: selectedIndex === (showLogout ? 1 : 0) ? 1 : 0
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "bedtime"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Suspend")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        MouseArea {
-                            id: suspendArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                root.hide()
-                                SessionService.suspend()
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            const hibernateIdx = showLogout ? 2 : 1
-                            if (selectedIndex === hibernateIdx) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (hibernateArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: selectedIndex === (showLogout ? 2 : 1) ? Theme.primary : "transparent"
-                        border.width: selectedIndex === (showLogout ? 2 : 1) ? 1 : 0
-                        visible: SessionService.hibernateSupported
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "ac_unit"
-                                size: Theme.iconSize
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Hibernate")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        MouseArea {
-                            id: hibernateArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                root.hide()
-                                SessionService.hibernate()
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            let rebootIdx = showLogout ? 3 : 2
-                            if (!SessionService.hibernateSupported) rebootIdx--
-                            if (selectedIndex === rebootIdx) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (rebootArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: {
-                            let rebootIdx = showLogout ? 3 : 2
-                            if (!SessionService.hibernateSupported) rebootIdx--
-                            return selectedIndex === rebootIdx ? Theme.primary : "transparent"
-                        }
-                        border.width: {
-                            let rebootIdx = showLogout ? 3 : 2
-                            if (!SessionService.hibernateSupported) rebootIdx--
-                            return selectedIndex === rebootIdx ? 1 : 0
-                        }
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "restart_alt"
-                                size: Theme.iconSize
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Reboot")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        MouseArea {
-                            id: rebootArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                root.hide()
-                                SessionService.reboot()
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 50
-                        radius: Theme.cornerRadius
-                        color: {
-                            let powerOffIdx = showLogout ? 4 : 3
-                            if (!SessionService.hibernateSupported) powerOffIdx--
-                            if (selectedIndex === powerOffIdx) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (powerOffArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: {
-                            let powerOffIdx = showLogout ? 4 : 3
-                            if (!SessionService.hibernateSupported) powerOffIdx--
-                            return selectedIndex === powerOffIdx ? Theme.primary : "transparent"
-                        }
-                        border.width: {
-                            let powerOffIdx = showLogout ? 4 : 3
-                            if (!SessionService.hibernateSupported) powerOffIdx--
-                            return selectedIndex === powerOffIdx ? 1 : 0
-                        }
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingM
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingM
-
-                            DankIcon {
-                                name: "power_settings_new"
-                                size: Theme.iconSize
-                                color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Power Off")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        MouseArea {
-                            id: powerOffArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                root.hide()
-                                SessionService.poweroff()
-                            }
-                        }
-                    }
-                }
-
-                Item {
-                    height: Theme.spacingS
-                }
-            }
-        }
-    }
-}

Modules/OSD/BrightnessOSD.qml

@@ -1,136 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-DankOSD {
-    id: root
-
-    osdWidth: Math.min(260, Screen.width - Theme.spacingM * 2)
-    osdHeight: 40 + Theme.spacingS * 2
-    autoHideInterval: 3000
-    enableMouseInteraction: true
-
-    property var brightnessDebounceTimer: Timer {
-        property int pendingValue: 0
-
-        interval: {
-            const deviceInfo = DisplayService.getCurrentDeviceInfo()
-            return (deviceInfo && deviceInfo.class === "ddc") ? 200 : 50
-        }
-        repeat: false
-        onTriggered: {
-            DisplayService.setBrightnessInternal(pendingValue, DisplayService.lastIpcDevice)
-        }
-    }
-
-    Connections {
-        target: DisplayService
-        function onBrightnessChanged() {
-            root.show()
-        }
-    }
-
-    content: Item {
-        anchors.fill: parent
-
-        Item {
-            property int gap: Theme.spacingS
-
-            anchors.centerIn: parent
-            width: parent.width - Theme.spacingS * 2
-            height: 40
-
-            Rectangle {
-                width: Theme.iconSize
-                height: Theme.iconSize
-                radius: Theme.iconSize / 2
-                color: "transparent"
-                x: parent.gap
-                anchors.verticalCenter: parent.verticalCenter
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: {
-                        const deviceInfo = DisplayService.getCurrentDeviceInfo()
-                        if (!deviceInfo || deviceInfo.class === "backlight" || deviceInfo.class === "ddc") {
-                            return "brightness_medium"
-                        } else if (deviceInfo.name.includes("kbd")) {
-                            return "keyboard"
-                        } else {
-                            return "lightbulb"
-                        }
-                    }
-                    size: Theme.iconSize
-                    color: Theme.primary
-                }
-            }
-
-            DankSlider {
-                id: brightnessSlider
-
-                width: parent.width - Theme.iconSize - parent.gap * 3
-                height: 40
-                x: parent.gap * 2 + Theme.iconSize
-                anchors.verticalCenter: parent.verticalCenter
-                minimum: 1
-                maximum: 100
-                enabled: DisplayService.brightnessAvailable
-                showValue: true
-                unit: "%"
-                thumbOutlineColor: Theme.surfaceContainer
-                alwaysShowValue: SettingsData.osdAlwaysShowValue
-
-                Component.onCompleted: {
-                    if (DisplayService.brightnessAvailable) {
-                        value = DisplayService.brightnessLevel
-                    }
-                }
-
-                onSliderValueChanged: newValue => {
-                                          if (DisplayService.brightnessAvailable) {
-                                              root.brightnessDebounceTimer.pendingValue = newValue
-                                              root.brightnessDebounceTimer.restart()
-                                              resetHideTimer()
-                                          }
-                                      }
-
-                onContainsMouseChanged: {
-                    setChildHovered(containsMouse)
-                }
-
-                onSliderDragFinished: finalValue => {
-                                          if (DisplayService.brightnessAvailable) {
-                                              root.brightnessDebounceTimer.stop()
-                                              DisplayService.setBrightnessInternal(finalValue, DisplayService.lastIpcDevice)
-                                          }
-                                      }
-
-                Connections {
-                    target: DisplayService
-
-                    function onBrightnessChanged() {
-                        if (!brightnessSlider.pressed) {
-                            brightnessSlider.value = DisplayService.brightnessLevel
-                        }
-                    }
-
-                    function onDeviceSwitched() {
-                        if (!brightnessSlider.pressed) {
-                            brightnessSlider.value = DisplayService.brightnessLevel
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    onOsdShown: {
-        if (DisplayService.brightnessAvailable && contentLoader.item) {
-            const slider = contentLoader.item.children[0].children[1]
-            if (slider) {
-                slider.value = DisplayService.brightnessLevel
-            }
-        }
-    }
-}

Modules/OSD/VolumeOSD.qml

@@ -1,139 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-DankOSD {
-    id: root
-
-    osdWidth: Math.min(260, Screen.width - Theme.spacingM * 2)
-    osdHeight: 40 + Theme.spacingS * 2
-    autoHideInterval: 3000
-    enableMouseInteraction: true
-
-    Connections {
-        target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
-
-        function onVolumeChanged() {
-            if (!AudioService.suppressOSD) {
-                root.show()
-            }
-        }
-
-        function onMutedChanged() {
-            if (!AudioService.suppressOSD) {
-                root.show()
-            }
-        }
-    }
-
-    Connections {
-        target: AudioService
-
-        function onSinkChanged() {
-            if (root.shouldBeVisible) {
-                root.show()
-            }
-        }
-    }
-
-    content: Item {
-        anchors.fill: parent
-
-        Item {
-            property int gap: Theme.spacingS
-
-            anchors.centerIn: parent
-            width: parent.width - Theme.spacingS * 2
-            height: 40
-
-            Rectangle {
-                width: Theme.iconSize
-                height: Theme.iconSize
-                radius: Theme.iconSize / 2
-                color: "transparent"
-                x: parent.gap
-                anchors.verticalCenter: parent.verticalCenter
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.muted ? "volume_off" : "volume_up"
-                    size: Theme.iconSize
-                    color: muteButton.containsMouse ? Theme.primary : Theme.surfaceText
-                }
-
-                MouseArea {
-                    id: muteButton
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        AudioService.toggleMute()
-                    }
-                    onContainsMouseChanged: {
-                        setChildHovered(containsMouse || volumeSlider.containsMouse)
-                    }
-                }
-            }
-
-            DankSlider {
-                id: volumeSlider
-
-                readonly property real actualVolumePercent: AudioService.sink && AudioService.sink.audio ? Math.round(AudioService.sink.audio.volume * 100) : 0
-                readonly property real displayPercent: actualVolumePercent
-
-                width: parent.width - Theme.iconSize - parent.gap * 3
-                height: 40
-                x: parent.gap * 2 + Theme.iconSize
-                anchors.verticalCenter: parent.verticalCenter
-                minimum: 0
-                maximum: 100
-                enabled: AudioService.sink && AudioService.sink.audio
-                showValue: true
-                unit: "%"
-                thumbOutlineColor: Theme.surfaceContainer
-                valueOverride: displayPercent
-                alwaysShowValue: SettingsData.osdAlwaysShowValue
-
-                Component.onCompleted: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100))
-                    }
-                }
-
-                onSliderValueChanged: newValue => {
-                                          if (AudioService.sink && AudioService.sink.audio) {
-                                              AudioService.suppressOSD = true
-                                              AudioService.sink.audio.volume = newValue / 100
-                                              AudioService.suppressOSD = false
-                                              resetHideTimer()
-                                          }
-                                      }
-
-                onContainsMouseChanged: {
-                    setChildHovered(containsMouse || muteButton.containsMouse)
-                }
-
-                Connections {
-                    target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
-
-                    function onVolumeChanged() {
-                        if (volumeSlider && !volumeSlider.pressed) {
-                            volumeSlider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    onOsdShown: {
-        if (AudioService.sink && AudioService.sink.audio && contentLoader.item) {
-            const slider = contentLoader.item.children[0].children[1]
-            if (slider) {
-                slider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100))
-            }
-        }
-    }
-}

Modules/Plugins/BasePill.qml

@@ -1,55 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property var axis: null
-    property string section: "center"
-    property var popoutTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    property bool isVerticalOrientation: false
-    property alias content: contentLoader.sourceComponent
-
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: isVerticalOrientation ? widgetThickness : contentLoader.item ? (contentLoader.item.implicitWidth + horizontalPadding * 2) : 0
-    height: isVerticalOrientation ? (contentLoader.item ? (contentLoader.item.implicitHeight + horizontalPadding * 2) : 0) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent"
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
-
-    Loader {
-        id: contentLoader
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popoutTarget && popoutTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked()
-        }
-    }
-}

Modules/Settings/WidgetSelectionPopup.qml

@@ -1,346 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Modals.Common
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    property var allWidgets: []
-    property string targetSection: ""
-    property string searchQuery: ""
-    property var filteredWidgets: []
-    property int selectedIndex: -1
-    property bool keyboardNavigationActive: false
-    property Component widgetSelectionContent
-    property var parentModal: null
-
-    signal widgetSelected(string widgetId, string targetSection)
-
-    function updateFilteredWidgets() {
-        if (!searchQuery || searchQuery.length === 0) {
-            filteredWidgets = allWidgets.slice()
-            return
-        }
-
-        var filtered = []
-        var query = searchQuery.toLowerCase()
-
-        for (var i = 0; i < allWidgets.length; i++) {
-            var widget = allWidgets[i]
-            var text = widget.text ? widget.text.toLowerCase() : ""
-            var description = widget.description ? widget.description.toLowerCase() : ""
-            var id = widget.id ? widget.id.toLowerCase() : ""
-
-            if (text.indexOf(query) !== -1 ||
-                description.indexOf(query) !== -1 ||
-                id.indexOf(query) !== -1) {
-                filtered.push(widget)
-            }
-        }
-
-        filteredWidgets = filtered
-        selectedIndex = -1
-        keyboardNavigationActive = false
-    }
-
-    onAllWidgetsChanged: {
-        updateFilteredWidgets()
-    }
-
-    function selectNext() {
-        if (filteredWidgets.length === 0) return
-        keyboardNavigationActive = true
-        selectedIndex = Math.min(selectedIndex + 1, filteredWidgets.length - 1)
-    }
-
-    function selectPrevious() {
-        if (filteredWidgets.length === 0) return
-        keyboardNavigationActive = true
-        selectedIndex = Math.max(selectedIndex - 1, -1)
-        if (selectedIndex === -1) {
-            keyboardNavigationActive = false
-        }
-    }
-
-    function selectWidget() {
-        if (selectedIndex >= 0 && selectedIndex < filteredWidgets.length) {
-            var widget = filteredWidgets[selectedIndex]
-            root.widgetSelected(widget.id, root.targetSection)
-            root.close()
-        }
-    }
-
-    function show() {
-        if (parentModal) {
-            parentModal.shouldHaveFocus = false
-        }
-        open()
-        Qt.callLater(() => {
-            if (contentLoader.item && contentLoader.item.searchField) {
-                contentLoader.item.searchField.forceActiveFocus()
-            }
-        })
-    }
-
-    function hide() {
-        close()
-        if (parentModal) {
-            parentModal.shouldHaveFocus = Qt.binding(() => {
-                return parentModal.shouldBeVisible
-            })
-            Qt.callLater(() => {
-                if (parentModal && parentModal.modalFocusScope) {
-                    parentModal.modalFocusScope.forceActiveFocus()
-                }
-            })
-        }
-    }
-
-    width: 500
-    height: 550
-    allowStacking: true
-    backgroundOpacity: 0
-    closeOnEscapeKey: false
-    onDialogClosed: () => {
-        allWidgets = []
-        targetSection = ""
-        searchQuery = ""
-        filteredWidgets = []
-        selectedIndex = -1
-        keyboardNavigationActive = false
-        if (parentModal) {
-            parentModal.shouldHaveFocus = Qt.binding(() => {
-                return parentModal.shouldBeVisible
-            })
-            Qt.callLater(() => {
-                if (parentModal && parentModal.modalFocusScope) {
-                    parentModal.modalFocusScope.forceActiveFocus()
-                }
-            })
-        }
-    }
-    onBackgroundClicked: () => {
-        return hide()
-    }
-    content: widgetSelectionContent
-
-    widgetSelectionContent: Component {
-        FocusScope {
-        id: widgetKeyHandler
-        property alias searchField: searchField
-
-        anchors.fill: parent
-        focus: true
-
-        Keys.onPressed: event => {
-            if (event.key === Qt.Key_Escape) {
-                root.close()
-                event.accepted = true
-            } else if (event.key === Qt.Key_Down) {
-                root.selectNext()
-                event.accepted = true
-            } else if (event.key === Qt.Key_Up) {
-                root.selectPrevious()
-                event.accepted = true
-            } else if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
-                root.selectNext()
-                event.accepted = true
-            } else if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
-                root.selectPrevious()
-                event.accepted = true
-            } else if (event.key === Qt.Key_J && event.modifiers & Qt.ControlModifier) {
-                root.selectNext()
-                event.accepted = true
-            } else if (event.key === Qt.Key_K && event.modifiers & Qt.ControlModifier) {
-                root.selectPrevious()
-                event.accepted = true
-            } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                if (root.keyboardNavigationActive) {
-                    root.selectWidget()
-                } else if (root.filteredWidgets.length > 0) {
-                    var firstWidget = root.filteredWidgets[0]
-                    root.widgetSelected(firstWidget.id, root.targetSection)
-                    root.close()
-                }
-                event.accepted = true
-            }
-        }
-
-        DankActionButton {
-            iconName: "close"
-            iconSize: Theme.iconSize - 2
-            iconColor: Theme.outline
-            anchors.top: parent.top
-            anchors.topMargin: Theme.spacingM
-            anchors.right: parent.right
-            anchors.rightMargin: Theme.spacingM
-            onClicked: root.close()
-        }
-
-        Column {
-            id: contentColumn
-
-            spacing: Theme.spacingM
-            anchors.fill: parent
-            anchors.margins: Theme.spacingL
-            anchors.topMargin: Theme.spacingL + 30 // Space for close button
-
-            Row {
-                width: parent.width
-                spacing: Theme.spacingM
-
-                DankIcon {
-                    name: "add_circle"
-                    size: Theme.iconSize
-                    color: Theme.primary
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                StyledText {
-                    text: I18n.tr("Add Widget to ") + root.targetSection + " Section"
-                    font.pixelSize: Theme.fontSizeLarge
-                    font.weight: Font.Medium
-                    color: Theme.surfaceText
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-            }
-
-            StyledText {
-                text: I18n.tr("Select a widget to add to the ") + root.targetSection.toLowerCase(
-                          ) + " section of the top bar. You can add multiple instances of the same widget if needed."
-                font.pixelSize: Theme.fontSizeSmall
-                color: Theme.outline
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-
-            DankTextField {
-                id: searchField
-                width: parent.width
-                height: 48
-                cornerRadius: Theme.cornerRadius
-                backgroundColor: Theme.surfaceContainerHigh
-                normalBorderColor: Theme.outlineMedium
-                focusedBorderColor: Theme.primary
-                leftIconName: "search"
-                leftIconSize: Theme.iconSize
-                leftIconColor: Theme.surfaceVariantText
-                leftIconFocusedColor: Theme.primary
-                showClearButton: true
-                textColor: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeMedium
-                placeholderText: ""
-                text: root.searchQuery
-                focus: true
-                ignoreLeftRightKeys: true
-                keyForwardTargets: [widgetKeyHandler]
-                onTextEdited: {
-                    root.searchQuery = text
-                    updateFilteredWidgets()
-                }
-                Keys.onPressed: event => {
-                    if (event.key === Qt.Key_Escape) {
-                        root.close()
-                        event.accepted = true
-                    } else if (event.key === Qt.Key_Down || event.key === Qt.Key_Up ||
-                               ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length === 0)) {
-                        event.accepted = false
-                    }
-                }
-            }
-
-            DankListView {
-                id: widgetList
-
-                width: parent.width
-                height: parent.height - y
-                spacing: Theme.spacingS
-                model: root.filteredWidgets
-                clip: true
-
-                delegate: Rectangle {
-                    width: widgetList.width
-                    height: 60
-                    radius: Theme.cornerRadius
-                    property bool isSelected: root.keyboardNavigationActive && index === root.selectedIndex
-                    color: isSelected ? Theme.primarySelected : 
-                           widgetArea.containsMouse ? Theme.primaryHover : Qt.rgba(
-                                                            Theme.surfaceVariant.r,
-                                                            Theme.surfaceVariant.g,
-                                                            Theme.surfaceVariant.b,
-                                                            0.3)
-                    border.color: isSelected ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g,
-                                            Theme.outline.b, 0.2)
-                    border.width: isSelected ? 2 : 1
-
-                    Row {
-                        anchors.fill: parent
-                        anchors.margins: Theme.spacingM
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: modelData.icon
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: 2
-                            width: parent.width - Theme.iconSize - Theme.spacingM * 3
-
-                            StyledText {
-                                text: modelData.text
-                                font.pixelSize: Theme.fontSizeMedium
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                                elide: Text.ElideRight
-                                width: parent.width
-                            }
-
-                            StyledText {
-                                text: modelData.description
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.outline
-                                elide: Text.ElideRight
-                                width: parent.width
-                                wrapMode: Text.WordWrap
-                            }
-                        }
-
-                        DankIcon {
-                            name: "add"
-                            size: Theme.iconSize - 4
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: widgetArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            root.widgetSelected(modelData.id,
-                                                root.targetSection)
-                            root.close()
-                        }
-                    }
-
-                    Behavior on color {
-                        ColorAnimation {
-                            duration: Theme.shortDuration
-                            easing.type: Theme.standardEasing
-                        }
-                    }
-                }
-            }
-        }
-        }
-    }
-}

Modules/WallpaperEngineProc.qml

@@ -1,63 +0,0 @@
-import QtCore
-import QtQuick
-import Quickshell.Io
-import Quickshell
-import qs.Common
-
-Item {
-    id: root
-    property string monitor: ""
-    property string sceneId: ""
-    property string pendingSceneId: ""
-
-    Process {
-        id: weProcess
-        running: false
-        command: []
-    }
-
-    Process {
-        id: killer
-        running: false
-        command: []
-        onExited: (code) => {
-            if (pendingSceneId !== "") {
-                const cacheHome = StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()
-                const baseDir = Paths.strip(cacheHome)
-                const outDir = baseDir + "/DankMaterialShell/we_screenshots" 
-                const outPath = outDir + "/" + pendingSceneId + ".jpg"
-
-                Quickshell.execDetached(["mkdir", "-p", outDir])
-                weProcess.command = [
-                    "linux-wallpaperengine",
-                    "--screen-root", monitor,
-                    "--screenshot", outPath,
-                    "--bg", pendingSceneId,
-                    "--silent"
-                ]
-                weProcess.running = true
-                sceneId = pendingSceneId
-                pendingSceneId = ""
-            }
-        }
-    }
-
-    function start(newSceneId) {
-        if (sceneId === newSceneId && weProcess.running) {
-            return
-        }
-        pendingSceneId = newSceneId
-        stop()
-    }
-
-    function stop() {
-        if (weProcess.running) {
-            weProcess.running = false
-        }
-        killer.command = [
-            "pkill", "-f",
-            "linux-wallpaperengine --screen-root " + monitor
-        ]
-        killer.running = true
-    }
-}

README.md

@@ -1,803 +1,192 @@
-# DankMaterialShell (dms)
+# DankMaterialShell
 
-<div align=center>
+<div align="center">
+  <a href="https://danklinux.com">
+    <img src="assets/danklogo.svg" alt="DankMaterialShell" width="200">
+  </a>
 
+  ### A modern desktop shell for Wayland
+
+  Built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/)
+
+[![Documentation](https://img.shields.io/badge/docs-danklinux.com-9ccbfb?style=for-the-badge&labelColor=101418)](https://danklinux.com/docs)
 [![GitHub stars](https://img.shields.io/github/stars/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=ffd700)](https://github.com/AvengeMedia/DankMaterialShell/stargazers)
 [![GitHub License](https://img.shields.io/github/license/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=b9c8da)](https://github.com/AvengeMedia/DankMaterialShell/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/v/release/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/releases)
-[![GitHub last commit](https://img.shields.io/github/last-commit/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/commits/master)
 [![AUR version](https://img.shields.io/aur/version/dms-shell-bin?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://aur.archlinux.org/packages/dms-shell-bin)
 [![AUR version (git)](https://img.shields.io/aur/version/dms-shell-git?style=for-the-badge&labelColor=101418&color=9ccbfb&label=AUR%20(git))](https://aur.archlinux.org/packages/dms-shell-git)
-[![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Favengemediallc)](https://ko-fi.com/avengemediallc)
+[![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Fdanklinux)](https://ko-fi.com/danklinux)
 
 </div>
 
-A modern Wayland desktop shell built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/). Optimized for the [niri](https://github.com/YaLTeR/niri) and [Hyprland](https://hyprland.org/) compositors.
+DankMaterialShell is a complete desktop shell for [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [Sway](https://swaywm.org),  [labwc](https://labwc.github.io/), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop.
 
-Features notifications, app launcher, wallpaper customization, and fully customizable with [plugins](https://github.com/AvengeMedia/dms-plugin-registry).
+## Repository Structure
 
-## Screenshots
+This is a monorepo containing both the shell interface and the core backend services:
 
-<div align="center">
-<div style="max-width: 700px; margin: 0 auto;">
+```
+DankMaterialShell/
+├── quickshell/         # QML-based shell interface
+│   ├── Modules/        # UI components (panels, widgets, overlays)
+│   ├── Services/       # System integration (audio, network, bluetooth)
+│   ├── Widgets/        # Reusable UI controls
+│   └── Common/         # Shared resources and themes
+├── core/               # Go backend and CLI
+│   ├── cmd/            # dms CLI and dankinstall binaries
+│   ├── internal/       # System integration, IPC, distro support
+│   └── pkg/            # Shared packages
+├── distro/             # Distribution packaging
+│   ├── fedora/         # Fedora RPM specs
+│   ├── debian/         # Debian packaging
+│   └── nix/            # NixOS/home-manager modules
+└── flake.nix           # Nix flake for declarative installation
+```
 
-https://github.com/user-attachments/assets/40d2c56e-c1c9-4671-b04f-8f8b7b83b9ec
-
-</div>
-</div>
-
-<details><summary><strong>View More Screenshots</strong></summary>
-
-<br>
+## See it in Action
 
 <div align="center">
 
-### Desktop Overview
+https://github.com/user-attachments/assets/1200a739-7770-4601-8b85-695ca527819a
 
-<img src="https://github.com/user-attachments/assets/203a9678-c3b7-4720-bb97-853a511ac5c8" width="600" alt="DankMaterialShell Desktop" />
+</div>
 
-### Dashboard
+<details><summary><strong>More Screenshots</strong></summary>
 
-<img width="600" alt="DankDash" src="https://github.com/user-attachments/assets/a937cf35-a43b-4558-8c39-5694ff5fcac4" />
+<div align="center">
 
-### Application Launcher
+<img src="https://github.com/user-attachments/assets/203a9678-c3b7-4720-bb97-853a511ac5c8" width="600" alt="Desktop" />
 
-<img src="https://github.com/user-attachments/assets/2da00ea1-8921-4473-a2a9-44a44535a822" width="450" alt="Spotlight Launcher" />
+<img src="https://github.com/user-attachments/assets/a937cf35-a43b-4558-8c39-5694ff5fcac4" width="600" alt="Dashboard" />
 
-### Control Center
+<img src="https://github.com/user-attachments/assets/2da00ea1-8921-4473-a2a9-44a44535a822" width="450" alt="Launcher" />
 
-<img width="600" alt="Control Center" src="https://github.com/user-attachments/assets/732c30de-5f4a-4a2b-a995-c8ab656cecd5" />
-
-### System Monitor
-
-<img src="https://github.com/user-attachments/assets/b3c817ec-734d-4974-929f-2d11a1065349" width="600" alt="System Monitor" />
-
-### Widget Customization
-
-<img src="https://github.com/user-attachments/assets/903f7c60-146f-4fb3-a75d-a4823828f298" width="500" alt="Widget Customization" />
-
-### Lock Screen
-
-<img src="https://github.com/user-attachments/assets/3fa07de2-c1b0-4e57-8f25-3830ac6baf4f" width="600" alt="Lock Screen" />
-
-### Dynamic Theming
-
-<img src="https://github.com/user-attachments/assets/a81a68e3-4f7e-4246-8199-0fef1013d4cf" width="700" alt="Auto Theme" />
-
-### Notification Center
-
-<img src="https://github.com/user-attachments/assets/07cbde9a-0242-4989-9f97-5765c6458c85" width="350" alt="Notification Center" />
-
-### Dock
-
-<img src="https://github.com/user-attachments/assets/e6999daf-f7bf-4329-98fa-0ce4f0e7219c" width="400" alt="Dock" />
+<img src="https://github.com/user-attachments/assets/732c30de-5f4a-4a2b-a995-c8ab656cecd5" width="600" alt="Control Center" />
 
 </div>
 
 </details>
 
-## Quick start (full dotfiles, most distros)
+## Installation
 
 ```bash
 curl -fsSL https://install.danklinux.com | sh
 ```
-*Or skip to [Installation](https://github.com/AvengeMedia/DankMaterialShell?tab=readme-ov-file#installation)*
 
-<details><summary><strong>Features</strong></summary>
+One command installs DMS and all dependencies on Arch, Fedora, Debian, Ubuntu, openSUSE, or Gentoo.
 
-**Core Widgets:**
-- **TopBar**: fully customizable bar where widgets can be added, removed, and re-arranged.
-  - **App Launcher** with fuzzy search, categories, and auto-sorting by most used apps.
-  - **Workspace Switcher** Configurable workspace switcher.
-  - **Focused Window** Displays the currently focused window app name and title.
-  - **Running Apps** A view of all running apps, sorted by monitor, workspace, then position on workspace.
-  - **Media Player** Short form media player with equalizer, song title, and controls.
-  - **Clock** Clock and date widget
-  - **Weather** Weather widget with customizable location
-  - **System Tray** System tray applets with context menus.
-  - **Process Monitor** CPU, RAM, and GPU usage percentages, temperatures. (requires [dgop](https://github.com/AvengeMedia/dgop))
-  - **Power/Battery** Power/Battery widget for battery metrics and power profile changing.
-  - **Notifications** Notification bell with a notification center popup
-  - **Control Center** High-level view of network, bluetooth, and audio status
-  - **Privacy Indicator** Attempts to reveal if a microphone or screen recording session is active, relying on Pipewire data sources
-  - **Idle Inhibitor** Creates a systemd idle inhibitor to prevent sleep/locking from occuring.
-- **Spotlight Launcher** A central app launcher/search that can be triggered via an IPC keybinding.
-- **Central Command** A combined music, weather, calendar, and events PopUp.
-- **Process List** A process list, with system metrics and information. More detailed modal available via IPC.
-- **Notification Center** A center for notifications that has support for grouping.
-- **Dock** A dock with pinned apps support, recent apps support, and currently running application support.
-- **Control Center** A full control center with user profile information, network, bluetooth, audio input/output, display controls, and night mode automation.
-- **Lock Screen** Using quickshell's WlSessionLock with embedded virtual keyboard for Niri (Niri doesn't support placing virtual keyboard above lockscreen natively: [issue](https://github.com/YaLTeR/niri/issues/2201))
-- **Notepad** A simple text notepad/scratchpad with auto-save to session data and file export/import functionality.
+**[Manual installation guide](https://danklinux.com/docs/dankmaterialshell/installation)**
 
-</details>
+## Features
 
-## Highlights
+**Dynamic Theming**
+Wallpaper-based color schemes that automatically theme GTK, Qt, terminals, editors (vscode, vscodium), and more using [matugen](https://github.com/InioX/matugen) and dank16.
 
-- Auto-theming GTK, QT, Terminal apps, and more with [matugen](https://github.com/InioX/matugen) + optional theme generation from wallpaper.
-- 20+ widgets that can be added and re-arranged on the bar.
-- Process list, temperature monitoring, and resource monitoring with [dgop](https://github.com/AvengeMedia/dgop)
-- Notification service with support for grouping and richtext
-- App launcher + Spotlighht launcher with fuzzy search
-- Control center with mpris player, weather, and calendar integration.
-- Clipboard history view with image previews.
-- A dock for running apps + pinned apps
-- Configure bluetooth, wifi, and audio input+output devices.
-- A lock screen
-- Idle monitoring - configure auto lock, screen off, suspend, and hibernate with different knobs for battery + AC power.
-- A greeter
-- A comprehensive plugin system for endless customization possibilities.
+**System Monitoring**
+Real-time CPU, RAM, GPU metrics and temperatures with [dgop](https://github.com/AvengeMedia/dgop). Process list with search and management.
 
-**TL;DR** *dms replaces your waybar, swaylock, swayidle, hypridle, hyprlock, fuzzels, walker, mako, and basically everything you use to stitch a desktop together*
+**Powerful Launcher**
+Spotlight-style search for applications, files ([dsearch](https://github.com/AvengeMedia/danksearch)), emojis, running windows, calculator, and commands. Extensible with plugins.
 
-## Installation
+**Control Center**
+Unified interface for network, Bluetooth, audio devices, display settings, and night mode.
 
-### Compositor Setup
+**Smart Notifications**
+Notification center with grouping, rich text support, and keyboard navigation.
 
-DankMaterialShell particularly aims at supporting the **niri** and **Hyprland** compositors, but it does support more wayland compositors with a diminished feature set (no monitor off, workspace switcher, overview integration, etc.):
+**Media Integration**
+MPRIS player controls, calendar sync, weather widgets, and clipboard history with image previews.
 
-**Niri**:
-```bash
-# Arch Linux
-sudo pacman -S niri
+**Session Management**
+Lock screen, idle detection, auto-lock/suspend with separate AC/battery settings, and greeter support.
 
-# Fedora  
-sudo dnf copr enable yalter/niri && sudo dnf install niri
-```
+**Plugin System**
+Extend functionality with the [plugin registry](https://plugins.danklinux.com).
 
-For detailed niri installation instructions, see the [niri Getting Started guide](https://yalter.github.io/niri/Getting-Started.html).
+## Supported Compositors
 
-**Hyprland**:
-```bash
-# Arch Linux
-sudo pacman -S hyprland
+Works best with [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [Sway](https://swaywm.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), and [labwc](https://labwc.github.io/) with full workspace switching, overview integration, and monitor management. Other Wayland compositors work with reduced features.
 
-# Or from AUR for latest
-paru -S hyprland-git
+[Compositor configuration guide](https://danklinux.com/docs/dankmaterialshell/compositors)
 
-# Fedora
-sudo dnf install hyprland
+## Command Line Interface
 
-# Or use Copr for latest builds
-sudo dnf copr enable solopasha/hyprland && sudo dnf install hyprland
-```
-
-For detailed Hyprland installation instructions, see the [Hyprland wiki](https://wiki.hypr.land/Getting-Started/Installation/).
-
-### Dank Shell Installation
-
-*feel free to contribute steps for other distributions*
-
-#### Arch Linux - via AUR
+Control the shell from the command line or keybinds:
 
 ```bash
-# Stable release
-paru -S dms-shell-bin
-# Latest -git
-paru -S dms-shell-git
-```
-
-#### Fedora - via COPR
-
-```bash
-# Stable release
-sudo dnf copr enable avengemedia/dms && sudo dnf install dms
-# Latest -git
-sudo dnf copr enable avengemedia/dms-git && sudo dnf install dms
-```
-
-#### NixOS - via flake
-
-```bash
-nix profile install github:AvengeMedia/DankMaterialShell
-```
-
-#### NixOS - via home-manager
-
-To install using home-manager, you need to add this repo into your flake inputs:
-
-``` nix
-dgop = {
-  url = "github:AvengeMedia/dgop";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-dms-cli = {
-  url = "github:AvengeMedia/danklinux";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-dankMaterialShell = {
-  url = "github:AvengeMedia/DankMaterialShell";
-  inputs.nixpkgs.follows = "nixpkgs";
-  inputs.dgop.follows = "dgop";
-  inputs.dms-cli.follows = "dms-cli";
-};
-```
-
-Then somewhere in your home-manager config, add this to the imports:
-
-``` nix
-imports = [
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-];
-```
-
-If you use Niri, the `niri` homeModule provides additional options for Niri integration, such as key bindings and spawn:
-
-``` nix
-imports = [
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
-];
-```
-
-> [!IMPORTANT]
-> To use the `niri` homeModule, you must have `sobidoo/niri-flake` in your inputs:
-
-``` nix
-niri = {
-  url = "github:sodiboo/niri-flake";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-```
-
-And import it in home-manager:
-
-``` nix
-imports = [
-  inputs.niri.homeModules.niri
-];
-```
-
-Now you can enable it with:
-
-``` nix
-programs.dankMaterialShell.enable = true;
-```
-
-There are a lot of possible configurations that you can enable/disable in the flake, check [nix/default.nix](nix/default.nix) and [nix/niri.nix](nix/niri.nix) to see them all.
-
-#### Other Distributions - via manual installation
-
-**1. Install Quickshell (Varies by Distribution)**
-```bash
-# Arch
-paru -S quickshell-git
-# Fedora
-sudo dnf copr enable avengemedia/danklinux && sudo dnf install quickshell-git
-# ! TODO - document other distros
-```
-
-**2. Install fonts**
-*Inter Variable* and *Fira Code* are not strictly required, but they are the default fonts of dms.
-
-**2.1 Install Material Symbols**
-```bash
-sudo curl -L "https://github.com/google/material-design-icons/raw/master/variablefont/MaterialSymbolsRounded%5BFILL%2CGRAD%2Copsz%2Cwght%5D.ttf" -o /usr/share/fonts/MaterialSymbolsRounded.ttf
-```
-**2.2 Install Inter Variable**
-```bash
-sudo curl -L "https://github.com/rsms/inter/raw/refs/tags/v4.1/docs/font-files/InterVariable.ttf" -o /usr/share/fonts/InterVariable.ttf
-```
-
-**2.3 Install Fira Code (monospace font)**
-```bash
-sudo curl -L "https://github.com/tonsky/FiraCode/releases/latest/download/FiraCode-Regular.ttf" -o /usr/share/fonts/FiraCode-Regular.ttf
-```
-
-**2.4 Refresh font cache**
-```bash
-fc-cache -fv
-```
-
-**3. Install the shell**
-
-**3.1. Clone latest master**
-```bash
-mkdir ~/.config/quickshell && git clone https://github.com/AvengeMedia/DankMaterialShell.git ~/.config/quickshell/dms
-```
-
-**3.2. Install latest dms CLI**
-```bash
-sudo sh -c "curl -L https://github.com/AvengeMedia/danklinux/releases/latest/download/dms-$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').gz | gunzip | tee /usr/local/bin/dms > /dev/null && chmod +x /usr/local/bin/dms"
-```
-
-**4. Optional Features (system monitoring, clipboard history, brightness controls, etc.)**
-
-**4.1 Core optional dependencies**
-```bash
-# Arch Linux
-sudo pacman -S cava wl-clipboard cliphist brightnessctl qt6-multimedia
-paru -S matugen-bin dgop
-
-# Fedora
-sudo dnf install cava wl-clipboard brightnessctl qt6-qtmultimedia 
-sudo dnf copr enable avengemedia/danklinux && sudo dnf install cliphist ghostty hyprpicker material-symbols-fonts matugen 
-```
-Note: by enabling and installing the avengemedia/dms copr above, these core dependencies will automatically be available for use. 
-
-*Other distros will just need to find sources for the above packages*
-
-**4.2 - dgop manual installation**
-
-`dgop` is available via AUR and a nix flake, other distributions can install it manually.
-
-```bash
-sudo sh -c "curl -L https://github.com/AvengeMedia/dgop/releases/latest/download/dgop-linux-$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').gz | gunzip | tee /usr/local/bin/dgop > /dev/null && chmod +x /usr/local/bin/dgop"
-```
-
-**Optional Requirement Overview**
-
-- `dgop`: Ability to have system resource widgets, process list modal, and temperature monitoring.
-- `matugen`: Wallpaper-based dynamic theming
-- `brightnessctl`: Backlight and LED brightness control
-- `wl-clipboard`: Required for copying various elements to clipboard.
-- `cava`: Audio visualizer
-- `cliphist`: Clipboard history
-- `gammastep`: Night mode support
-- `qt6-multimedia`: System sound support
-
-## Compositor Configuration
-
-A lot of options are subject to personal preference, but the below sets a good starting point for most features.
-
-### niri Integration
-
-Add to your niri config
-
-```kdl
-// Required for clipboard history integration
-spawn-at-startup "bash" "-c" "wl-paste --watch cliphist store &"
-
-// Recommended (must install polkit-mate before hand) for elevation prompts
-spawn-at-startup "/usr/lib/mate-polkit/polkit-mate-authentication-agent-1"
-// This may be a different path on different distributions, the above is for the arch linux mate-polkit package
-
-// Starts DankShell
-spawn-at-startup "dms" "run"
-
-// If using niri newer than 271534e115e5915231c99df287bbfe396185924d (~aug 17 2025)
-// you can add this to disable built in config load errors since dank shell provides this
-config-notification {
-    disable-failed
-}
-
-// Dank keybinds
-// 1. These should not be in conflict with any pre-existing keybindings
-// 2. You need to merge them with your existing config if you want to use these
-// 3. You can change the keys to whatever you want, if you prefer something different
-// 4. For the increment/decrement ones you can change the steps to whatever you like too
-binds {
-   Mod+Space hotkey-overlay-title="Application Launcher" {
-      spawn "dms" "ipc" "call" "spotlight" "toggle";
-   }
-   Mod+V hotkey-overlay-title="Clipboard Manager" {
-      spawn "dms" "ipc" "call" "clipboard" "toggle";
-   }
-   Mod+M hotkey-overlay-title="Task Manager" {
-      spawn "dms" "ipc" "call" "processlist" "toggle";
-   }
-   Mod+N hotkey-overlay-title="Notification Center" {
-      spawn "dms" "ipc" "call" "notifications" "toggle";
-   }
-   Mod+Comma hotkey-overlay-title="Settings" {
-      spawn "dms" "ipc" "call" "settings" "toggle";
-   }
-   Mod+P hotkey-overlay-title="Notepad" {
-      spawn "dms" "ipc" "call" "notepad" "toggle";
-   }
-   Super+Alt+L hotkey-overlay-title="Lock Screen" {
-      spawn "dms" "ipc" "call" "lock" "lock";
-   }
-   Mod+X hotkey-overlay-title="Power Menu" {
-      spawn "dms" "ipc" "call" "powermenu" "toggle";
-   }
-   Mod+C hotkey-overlay-title="Control Center" {
-      spawn "dms" "ipc" "call" "control-center" "toggle";
-   }
-   XF86AudioRaiseVolume allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "increment" "3";
-   }
-   XF86AudioLowerVolume allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "decrement" "3";
-   }
-   XF86AudioMute allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "mute";
-   }
-   XF86AudioMicMute allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "micmute";
-   }
-   XF86MonBrightnessUp allow-when-locked=true {
-      spawn "dms" "ipc" "call" "brightness" "increment" "5" "";
-   }
-   // You can override the default device for e.g. keyboards by adding the device name to the last param
-   XF86MonBrightnessDown allow-when-locked=true {
-      spawn "dms" "ipc" "call" "brightness" "decrement" "5" "";
-   }
-   // Night mode toggle
-   Mod+Shift+N allow-when-locked=true {
-      spawn "dms" "ipc" "call" "night" "toggle";
-   }
-}
-```
-
-#### niri theming
-
-If using a niri build newer than [3933903](https://github.com/YaLTeR/niri/commit/39339032cee3453faa54c361a38db6d83756f750), you can synchronize colors and gaps with the shell settings by adding the following to your niri config.
-
-```bash
-# For colors
-echo -e 'include "dms/colors.kdl"' >> ~/.config/niri/config.kdl
-# For gaps, border widths, certain window rules
-echo -e 'include "dms/layout.kdl"' >> ~/.config/niri/config.kdl
-```
-
-### Hyprland Integration
-
-Add to your Hyprland config (`~/.config/hypr/hyprland.conf`):
-
-```bash
-# Required for clipboard history integration
-exec-once = bash -c "wl-paste --watch cliphist store &"
-
-# Recommended (must install polkit-mate beforehand) for elevation prompts  
-exec-once = /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
-# This may be a different path on different distributions, the above is for the arch linux mate-polkit package
-
-# Starts DankShell
-exec-once = dms run
-
-# Dank keybinds
-# 1. These should not be in conflict with any pre-existing keybindings
-# 2. You need to merge them with your existing config if you want to use these
-# 3. You can change the keys to whatever you want, if you prefer something different
-# 4. For the increment/decrement ones you can change the steps to whatever you like too
-
-# Application and system controls
-bind = SUPER, Space, exec, dms ipc call spotlight toggle
-bind = SUPER, V, exec, dms ipc call clipboard toggle
-bind = SUPER, M, exec, dms ipc call processlist toggle
-bind = SUPER, N, exec, dms ipc call notifications toggle
-bind = SUPER, comma, exec, dms ipc call settings toggle
-bind = SUPER, P, exec, dms ipc call notepad toggle
-bind = SUPERALT, L, exec, dms ipc call lock lock
-bind = SUPER, X, exec, dms ipc call powermenu toggle
-bind = SUPER, C, exec, dms ipc call control-center toggle 
-
-# Audio controls (function keys)
-bindl = , XF86AudioRaiseVolume, exec, dms ipc call audio increment 3
-bindl = , XF86AudioLowerVolume, exec, dms ipc call audio decrement 3
-bindl = , XF86AudioMute, exec, dms ipc call audio mute
-bindl = , XF86AudioMicMute, exec, dms ipc call audio micmute
-
-# Brightness controls (function keys)
-bindl = , XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 ""
-# You can override the default device for e.g. keyboards by adding the device name to the last param
-bindl = , XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5 ""
-
-# Night mode toggle
-bind = SUPERSHIFT, N, exec, dms ipc call night toggle
-```
-
-## Greeter
-
-You can install a matching [greetd](https://github.com/kennylevinsen/greetd) greeter, that will give you a greeter that matches the lock screen.
-
-It's as simple as running `dms greeter install` in most cases, but more information is in the [Greetd module](Modules/Greetd/README.md)
-
-## IPC Commands
-
-Control everything from the command line, or via keybinds. For comprehensive documentation of all available IPC commands, see [docs/IPC.md](docs/IPC.md).
-
-### Audio control
-```bash
-dms ipc call audio setvolume 50
-dms ipc call audio mute
-```
-### Launch applications
-```bash
+dms run              # Start the shell
 dms ipc call spotlight toggle
-dms ipc call notepad toggle
-dms ipc call processlist toggle
-dms ipc call powermenu toggle
-```
-### System control
-```
+dms ipc call audio setvolume 50
 dms ipc call wallpaper set /path/to/image.jpg
-dms ipc call theme toggle
-dms ipc call night toggle
-dms ipc call lock lock
-```
-### Media control
-```
-dms ipc call mpris playPause
-dms ipc call mpris next
+dms brightness list  # List available displays
+dms plugins search   # Browse plugin registry
 ```
 
-## Theming
+[Full CLI and IPC documentation](https://danklinux.com/docs/dankmaterialshell/keybinds-ipc)
 
-dms will spawn a matugen process on theme changes to generate color palettes for installed and supported apps. If you do not want these files generated, you can set the env variable `DMS_DISABLE_MATUGEN=1` to disable it entirely.
+## Documentation
 
-### Custom Themes
+- **Website:** [danklinux.com](https://danklinux.com)
+- **Docs:** [danklinux.com/docs](https://danklinux.com/docs)
+- **Theming:** [Application themes](https://danklinux.com/docs/dankmaterialshell/application-themes) | [Custom themes](https://danklinux.com/docs/dankmaterialshell/custom-themes)
+- **Plugins:** [Development guide](https://danklinux.com/docs/dankmaterialshell/plugins-overview)
+- **Support:** [Ko-fi](https://ko-fi.com/avengemediallc)
 
-DankMaterialShell supports custom color themes! You can create your own Material Design 3 color schemes or use pre-made themes like Cyberpunk Electric, Hotline Miami, and Miami Vice.
+## Development
 
-For detailed instructions on creating and using custom themes, see [docs/CUSTOM_THEMES.md](docs/CUSTOM_THEMES.md).
+See component-specific documentation:
 
-### System App Integration
+- **[quickshell/](quickshell/)** - QML shell development, widgets, and modules
+- **[core/](core/)** - Go backend, CLI tools, and system integration
+- **[distro/](distro/)** - Distribution packaging (Fedora, Debian, NixOS)
 
-There's two toggles in the appearance section of settings, for GTK and QT apps.
-
-These settings will override some local GTK and QT configuration files, you can still integrate auto-theming if you do not wish DankShell to mess with your QTCT/GTK files.
-
-No matter what when matugen is enabled the files will be created on wallpaper changes:
-
-- ~/.config/gtk-3.0/dank-colors.css
-- ~/.config/gtk-4.0/dank-colors.css
-- ~/.config/qt6ct/colors/matugen.conf
-- ~/.config/qt5ct/colors/matugen.conf
-
-If you do not like our theme path, you can integrate this with other GTK themes, matugen themes, etc.
-
-#### GTK Apps
-
-1. Install [Colloid](https://github.com/vinceliuice/Colloid-gtk-theme)
-
-Colloid is a hard requirement for the auto-theming because of how it integrates with colloid css files, however you can integrate auto-theming with other themes, you just have to do it manually (so leave the toggle OFF in settings)
-
-It will still create `~/.config/gtk-3.0/4.0/dank-colors.css` on theme updates, these you can import into other compatible GTK themes.
+### Building from Source
 
+**Core + Dankinstall:**
 ```bash
-# Some default install settings for colloid
-./install.sh -s standard -l --tweaks normal
+cd core
+make              # Build dms CLI
+make dankinstall  # Build installer
 ```
 
-Configure in `~/.config/gtk-3.0/settings.ini` and `~/.config/gtk-4.0/settings.ini`:
-
-```ini
-[Settings]
-gtk-theme-name=Colloid
+**Shell:**
+```bash
+quickshell -p quickshell/
 ```
 
-#### QT: basic gtk3 based theme (Option 1)
+**NixOS:**
+```nix
+{
+  inputs.dms.url = "github:AvengeMedia/DankMaterialShell";
 
-If you mostly use gtk apps, you'll probably be happy to just set the QT platform theme to gtk3.
-
-```kdl
-environment {
-  // Add to existing environment block
-  QT_QPA_PLATFORMTHEME "gtk3"
-  QT_QPA_PLATFORMTHEME_QT6 "gtk3"
+  # Use in home-manager or NixOS configuration
+  imports = [ inputs.dms.homeModules.dankMaterialShell.default ];
 }
 ```
 
-#### QT: better theming (Option 2)
-
-1. Install qt6ct-kde
-
-```bash
-# Arch
-paru -S qt6ct-kde
-```
-
-*I'm not sure what it is on other distros, but you can manually install via instructions provides on [qt6ct-kde github](https://www.opencode.net/trialuser/qt6ct)
-
-2. **Configure Environment in niri**
-
-```kdl
-  // Add to existing environment block
-  QT_QPA_PLATFORMTHEME "qt6ct"
-  QT_QPA_PLATFORMTHEME_QT6 "qt6ct"
-```
-
-You'll have to restart your session for themes to take effect.
-
-Nevigate to dms settings -> themes & colors -> and click "Apply QT Themes"
-
-#### Firefox
-
-There are two theme paths for Firefox, using with [pywalfox](https://github.com/Frewacom/pywalfox) or [material fox](https://github.com/edelvarden/material-fox-updated)
-
-**(Option 1) - pywalfox**
-
-1. **Install [pywalfox](https://github.com/Frewacom/pywalfox)** on system.
-- Available in AUR via `paru -S python-pywalfox`
-
-2. **Install [pywalfox extension](https://addons.mozilla.org/firefox/addon/pywalfox/)** in firefox.
-
-3. **Restart dms and create symlink** to generate palette and then enable dank colors.
-- Run `ln -sf ~/.cache/wal/dank-pywalfox.json ~/.cache/wal/colors.json`
-
-
-**(Option 2) - Chrome-like theme with dynamic colors**
-
-Firefox does use the GTK3 theme, but it doesn't look that good on the stock theme IMO. A separate matugen css is generated for the [material fox](https://github.com/edelvarden/material-fox-updated) theme, you can configure that theme with dynamic colors by following the steps below.
-
-1. **In firefox, navigate to `about:config`**
-- set `toolkit.legacyuserprofilecustomizations.stylesheets` to `true`
-- set `svg.context-properties.content.enabled` to `true`
-- Create a new property called `userChrome.theme-material` and type `boolean`
-  - set to `true`
-
-<details><summary><strong>Expand for firefox screenshots</strong></summary>
-<img width="1262" height="104" alt="image" src="https://github.com/user-attachments/assets/4bca43d1-5735-4401-9b91-5ee4f0b1e357" />
-<img width="1262" height="104" alt="image" src="https://github.com/user-attachments/assets/348d37e0-5c6c-4db8-b7c9-89cabf282c25" />
-<img width="1244" height="106" alt="image" src="https://github.com/user-attachments/assets/75fd4972-bc4a-4657-b756-b31ef8061b3b" />
-</details>
-
-2. **Install material fox theme**
-```bash
-# Find Firefox profile directory
-export PROFILE_DIR=$(find ~/.mozilla/firefox -maxdepth 1 -type d -name "*.default-release" | head -n 1)
-
-# Download, extract to profile dir, and cleanup
-curl -L -o "$PROFILE_DIR/chrome.zip" https://github.com/edelvarden/material-fox-updated/releases/download/v2.0.0/chrome.zip
-unzip -o "$PROFILE_DIR/chrome.zip" -d "$PROFILE_DIR"
-rm "$PROFILE_DIR/chrome.zip"
-```
-
-3. **Configure dynamic colors for material fox theme**
-```bash
-export PROFILE_DIR=$(find ~/.mozilla/firefox -maxdepth 1 -type d -name "*.default-release" | head -n 1)
-rm -f "$PROFILE_DIR/chrome/theme-material-blue.css"
-ln -sf ~/.config/DankMaterialShell/firefox.css "$PROFILE_DIR/chrome/theme-material-blue.css"
-```
-
-### Terminal Integration
-
-The matugen integration will automatically generate new colors for certain apps only if they are installed.
-
-You can enable the dynamic color schemes in supported terminal apps by modifying their configurations:
-
-**Ghostty**:
-
-```bash
-echo "config-file = ./config-dankcolors" >> ~/.config/ghostty/config
-```
-
-If you want to disable excessive config reloaded popup sin ghostty, you may wish to also add this:
-
-```bash
-# These are the default danklinux options, if you still want config reloaded and copied to clipboard popups you can skip it.
-echo "app-notifications = no-clipboard-copy,no-config-reload" >> ~/.config/ghostty/config
-```
-
-**kitty**:
-
-```bash
-echo "include dank-theme.conf" >> ~/.config/kitty/kitty.conf
-```
-
-## Plugins
-
-[Plugin registry](https://github.com/AvengeMedia/dms-plugin-registry) - collection of available dms plugins.
-
-dms features a plugin system - meaning you can create your own widgets and load other user widgets.
-
-More comprehensive details available in the [PLUGINS](PLUGINS/README.md) - and examples [Emoji Plugin](PLUGINS/ExampleEmojiPlugin) and [Wallpaper Change Hook](PLUGINS/WallpaperWatcherDaemon) are available for reference.
-
-Install an example plugin by:
-
-```bash
-mkdir ~/.config/DankMaterialShell/plugins
-cp -R ./PLUGINS/ExampleEmojiPlugin ~/.config/DankMaterialShell/plugins
-```
-
-**Only install plugins from TRUSTED sources.** Plugins execute QML and javascript at runtime, plugins from third parties should be reviewed before enabling them in dms.
-
-### NixOS - via home-manager
-
-Add the following to your home-manager config to install a plugin:
-
-```nix
-programs.dankMaterialShell.plugins = {
-    ExampleEmojiPlugin.src = "${inputs.dankMaterialShell}/PLUGINS/ExampleEmojiPlugin";
-};
-```
-
-### Calendar Setup
-
-Sync your caldev compatible calendar (Google, Office365, etc.) for dashboard integration:
-
-<details><summary>Configuration Steps</summary>
-
-**Install dependencies:**
-
-#### Arch
-```bash
-sudo pacman -S vdirsyncer khal python-aiohttp-oauthlib
-```
-
-#### Fedora
-```bash
-sudo dnf install python3-vdirsyncer khal python3-aiohttp-oauthlib
-```
-
-**Configure vdirsyncer** (`~/.vdirsyncer/config`):
-
-```ini
-[general]
-status_path = "~/.calendars/status"
-
-[pair personal_sync]
-a = "personal"
-b = "personallocal"
-collections = ["from a", "from b"]
-conflict_resolution = "a wins"
-metadata = ["color"]
-
-[storage personal]
-type = "google_calendar"
-token_file = "~/.vdirsyncer/google_calendar_token"
-client_id = "your_client_id"
-client_secret = "your_client_secret"
-
-[storage personallocal]
-type = "filesystem"
-path = "~/.calendars/Personal"
-fileext = ".ics"
-```
-
-**Setup sync:**
-
-```bash
-vdirsyncer sync
-khal configure
-```
-
-#### Auto-sync every 5 minutes
-```bash
-crontab -e
-# Add: */5 * * * * /usr/bin/vdirsyncer sync
-```
-
-</details>
-
-## Configuration
-
-All settings are configurable in
-```
-~/.config/DankMaterialShell/settings.json`, or more intuitively the built-in settings modal.
-```
-
-**Key configuration areas:**
-
-- Widget positioning and behavior
-- Theme and color preferences
-- Time format, weather units and location
-- Light/Dark modes
-- Wallpaper and Profile picture
-- Dock enable/disable and various tunes.
-
-## Troubleshooting
-
-**Common issues:**
-
-- **Missing icons:** Verify Material Symbols font installation with `fc-list | grep Material`
-- **No dynamic theming:** Install matugen and enable in settings
-- **Qt apps not themed:** Configure qt5ct/qt6ct and set QT_QPA_PLATFORMTHEME
-- **Calendar not syncing:** Check vdirsyncer credentials and network connectivity
-
-**Getting help:**
-
-- Check the [issues](https://github.com/AvengeMedia/DankMaterialShell/issues) for known problems
-- Re-run the shell with `dms kill && dms run` to capture logs.
-- Join the niri community for compositor-specific questions
-
 ## Contributing
 
-DankMaterialShell welcomes contributions! Whether it's bug fixes, new widgets, theme improvements, or documentation updates - all help is appreciated.
+Contributions welcome. Bug fixes, widgets, features, documentation, and plugins all help.
 
-**Areas that need attention:**
+1. Fork the repository
+2. Make your changes
+3. Test thoroughly
+4. Open a pull request
 
-- More widget options and customization
-- Additional compositor compatibility
-- Performance optimizations
-- Documentation and examples
+For documentation contributions, see [DankLinux-Docs](https://github.com/AvengeMedia/DankLinux-Docs).
 
 ## Credits
 
-- [quickshell](https://quickshell.org/) the core of what makes a shell like this possible.
-- [niri](https://github.com/YaLTeR/niri) for the awesome scrolling compositor.
-- [Ly-sec](http://github.com/ly-sec) for awesome wallpaper effects among other things from [Noctalia](https://github.com/noctalia-dev/noctalia-shell)
-- [soramanew](https://github.com/soramanew) who built [caelestia](https://github.com/caelestia-dots/shell) which served as inspiration and guidance for many dank widgets.
-- [end-4](https://github.com/end-4) for [dots-hyprland](https://github.com/end-4/dots-hyprland) which also served as inspiration and guidance for many dank widgets.
+- [quickshell](https://quickshell.org/) - Shell framework
+- [niri](https://github.com/YaLTeR/niri) - Scrolling window manager
+- [Ly-sec](http://github.com/ly-sec) - Wallpaper effects from [Noctalia](https://github.com/noctalia-dev/noctalia-shell)
+- [soramanew](https://github.com/soramanew) - [Caelestia](https://github.com/caelestia-dots/shell) inspiration
+- [end-4](https://github.com/end-4) - [dots-hyprland](https://github.com/end-4/dots-hyprland) inspiration
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=AvengeMedia/DankMaterialShell&type=date&legend=top-left)](https://www.star-history.com/#AvengeMedia/DankMaterialShell&type=date&legend=top-left)
+
+## License
+
+MIT License - See [LICENSE](LICENSE) for details.

Services/CavaService.qml

@@ -1,58 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    property list<int> values: Array(6)
-    property int refCount: 0
-    property bool cavaAvailable: false
-
-    Process {
-        id: cavaCheck
-
-        command: ["which", "cava"]
-        running: false
-        onExited: exitCode => {
-            root.cavaAvailable = exitCode === 0
-        }
-    }
-
-    Component.onCompleted: {
-        cavaCheck.running = true
-    }
-
-    Process {
-        id: cavaProcess
-
-        running: root.cavaAvailable && root.refCount > 0
-        command: ["sh", "-c", `printf '[general]\\nmode=normal\\nframerate=25\\nautosens=0\\nsensitivity=30\\nbars=6\\nlower_cutoff_freq=50\\nhigher_cutoff_freq=12000\\n[output]\\nmethod=raw\\nraw_target=/dev/stdout\\ndata_format=ascii\\nchannels=mono\\nmono_option=average\\n[smoothing]\\nnoise_reduction=35\\nintegral=90\\ngravity=95\\nignore=2\\nmonstercat=1.5' | cava -p /dev/stdin`]
-
-        onRunningChanged: {
-            if (!running) {
-                root.values = Array(6).fill(0)
-            }
-        }
-
-        stdout: SplitParser {
-            splitMarker: "\n"
-            onRead: data => {
-                if (root.refCount > 0 && data.trim()) {
-                    let points = data.split(";").map(p => {
-                                                         return parseInt(p.trim(), 10)
-                                                     }).filter(p => {
-                                                                   return !isNaN(p)
-                                                               })
-                    if (points.length >= 6) {
-                        root.values = points.slice(0, 6)
-                    }
-                }
-            }
-        }
-    }
-}

Services/CompositorService.qml

@@ -1,204 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Hyprland
-import qs.Common
-
-Singleton {
-    id: root
-
-    property bool isHyprland: false
-    property bool isNiri: false
-    property string compositor: "unknown"
-
-    readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
-    readonly property string niriSocket: Quickshell.env("NIRI_SOCKET")
-
-    property bool useNiriSorting: isNiri && NiriService
-
-    property var sortedToplevels: {
-        if (!ToplevelManager.toplevels || !ToplevelManager.toplevels.values) {
-            return []
-        }
-
-        if (useNiriSorting) {
-            return NiriService.sortToplevels(ToplevelManager.toplevels.values)
-        }
-
-        if (isHyprland) {
-            const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-
-            const sortedHyprland = hyprlandToplevels.sort((a, b) => {
-                                                              if (a.monitor && b.monitor) {
-                                                                  const monitorCompare = a.monitor.name.localeCompare(b.monitor.name)
-                                                                  if (monitorCompare !== 0) {
-                                                                      return monitorCompare
-                                                                  }
-                                                              }
-
-                                                              if (a.workspace && b.workspace) {
-                                                                  const workspaceCompare = a.workspace.id - b.workspace.id
-                                                                  if (workspaceCompare !== 0) {
-                                                                      return workspaceCompare
-                                                                  }
-                                                              }
-
-                                                              if (a.lastIpcObject && b.lastIpcObject && a.lastIpcObject.at && b.lastIpcObject.at) {
-                                                                  const aX = a.lastIpcObject.at[0]
-                                                                  const bX = b.lastIpcObject.at[0]
-                                                                  const aY = a.lastIpcObject.at[1]
-                                                                  const bY = b.lastIpcObject.at[1]
-
-                                                                  const xCompare = aX - bX
-                                                                  if (Math.abs(xCompare) > 10) {
-                                                                      return xCompare
-                                                                  }
-                                                                  return aY - bY
-                                                              }
-
-                                                              if (a.lastIpcObject && !b.lastIpcObject) {
-                                                                  return -1
-                                                              }
-                                                              if (!a.lastIpcObject && b.lastIpcObject) {
-                                                                  return 1
-                                                              }
-
-                                                              if (a.title && b.title) {
-                                                                  return a.title.localeCompare(b.title)
-                                                              }
-
-                                                              return 0
-                                                          })
-
-            return sortedHyprland.map(hyprToplevel => hyprToplevel.wayland).filter(wayland => wayland !== null)
-        }
-
-        return ToplevelManager.toplevels.values
-    }
-
-    Timer {
-        id: compositorInitTimer
-        interval: 100
-        running: true
-        repeat: false
-        onTriggered: {
-            detectCompositor()
-            Qt.callLater(() => NiriService.generateNiriLayoutConfig())
-        }
-    }
-
-    function filterCurrentWorkspace(toplevels, screen) {
-        if (useNiriSorting) {
-            return NiriService.filterCurrentWorkspace(toplevels, screen)
-        }
-        if (isHyprland) {
-            return filterHyprlandCurrentWorkspace(toplevels, screen)
-        }
-        return toplevels
-    }
-
-    function filterHyprlandCurrentWorkspace(toplevels, screenName) {
-        if (!toplevels || toplevels.length === 0 || !Hyprland.toplevels) {
-            return toplevels
-        }
-
-        let currentWorkspaceId = null
-        const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-
-        for (const hyprToplevel of hyprlandToplevels) {
-            if (hyprToplevel.monitor && hyprToplevel.monitor.name === screenName && hyprToplevel.workspace) {
-                if (hyprToplevel.activated) {
-                    currentWorkspaceId = hyprToplevel.workspace.id
-                    break
-                }
-                if (currentWorkspaceId === null) {
-                    currentWorkspaceId = hyprToplevel.workspace.id
-                }
-            }
-        }
-
-        if (currentWorkspaceId === null && Hyprland.workspaces) {
-            const workspaces = Array.from(Hyprland.workspaces.values)
-            for (const workspace of workspaces) {
-                if (workspace.monitor && workspace.monitor === screenName) {
-                    if (Hyprland.focusedWorkspace && workspace.id === Hyprland.focusedWorkspace.id) {
-                        currentWorkspaceId = workspace.id
-                        break
-                    }
-                    if (currentWorkspaceId === null) {
-                        currentWorkspaceId = workspace.id
-                    }
-                }
-            }
-        }
-
-        if (currentWorkspaceId === null) {
-            return toplevels
-        }
-
-        return toplevels.filter(toplevel => {
-                                    for (const hyprToplevel of hyprlandToplevels) {
-                                        if (hyprToplevel.wayland === toplevel) {
-                                            return hyprToplevel.workspace && hyprToplevel.workspace.id === currentWorkspaceId
-                                        }
-                                    }
-                                    return false
-                                })
-    }
-
-    function detectCompositor() {
-        if (hyprlandSignature && hyprlandSignature.length > 0) {
-            isHyprland = true
-            isNiri = false
-            compositor = "hyprland"
-            console.log("CompositorService: Detected Hyprland")
-            return
-        }
-
-        if (niriSocket && niriSocket.length > 0) {
-            Proc.runCommand("niriSocketCheck", ["test", "-S", root.niriSocket], (output, exitCode) => {
-                if (exitCode === 0) {
-                    root.isNiri = true
-                    root.isHyprland = false
-                    root.compositor = "niri"
-                    console.log("CompositorService: Detected Niri with socket:", root.niriSocket)
-                    NiriService.generateNiriBinds()
-                } else {
-                    root.isHyprland = false
-                    root.isNiri = true
-                    root.compositor = "niri"
-                    console.warn("CompositorService: Niri socket check failed, defaulting to Niri anyway")
-                }
-            }, 0)
-        } else {
-            isHyprland = false
-            isNiri = false
-            compositor = "unknown"
-            console.warn("CompositorService: No compositor detected")
-        }
-    }
-
-    function powerOffMonitors() {
-        if (isNiri) {
-            return NiriService.powerOffMonitors()
-        }
-        if (isHyprland) {
-            return Hyprland.dispatch("dpms off")
-        }
-        console.warn("CompositorService: Cannot power off monitors, unknown compositor")
-    }
-
-    function powerOnMonitors() {
-        if (isNiri) {
-            return NiriService.powerOnMonitors()
-        }
-        if (isHyprland) {
-            return Hyprland.dispatch("dpms on")
-        }
-        console.warn("CompositorService: Cannot power on monitors, unknown compositor")
-    }
-}

Services/DisplayService.qml

@@ -1,978 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property bool brightnessAvailable: devices.length > 0
-    property var devices: []
-    property var ddcDevices: []
-    property var deviceBrightness: ({})
-    property var ddcPendingInit: ({})
-    property string currentDevice: ""
-    property string lastIpcDevice: ""
-    property bool ddcAvailable: false
-    property var ddcInitQueue: []
-    property bool skipDdcRead: false
-    property int brightnessLevel: {
-        const deviceToUse = lastIpcDevice === "" ? getDefaultDevice() : (lastIpcDevice || currentDevice)
-        if (!deviceToUse) {
-            return 50
-        }
-
-        return getDeviceBrightness(deviceToUse)
-    }
-    property int maxBrightness: 100
-    property bool brightnessInitialized: false
-
-    signal brightnessChanged
-    signal deviceSwitched
-
-    property bool nightModeActive: nightModeEnabled
-
-    property bool nightModeEnabled: false
-    property bool automationAvailable: false
-    property bool geoclueAvailable: false
-    property bool isAutomaticNightTime: false
-
-    function buildGammastepCommand(gammastepArgs) {
-        const commandStr = "pkill gammastep; " + ["gammastep"].concat(gammastepArgs).join(" ")
-        return ["sh", "-c", commandStr]
-    }
-
-    function setBrightnessInternal(percentage, device) {
-        const clampedValue = Math.max(1, Math.min(100, percentage))
-        const actualDevice = device === "" ? getDefaultDevice() : (device || currentDevice || getDefaultDevice())
-
-        if (actualDevice) {
-            const newBrightness = Object.assign({}, deviceBrightness)
-            newBrightness[actualDevice] = clampedValue
-            deviceBrightness = newBrightness
-        }
-
-        const deviceInfo = getCurrentDeviceInfoByName(actualDevice)
-
-        if (deviceInfo && deviceInfo.class === "ddc") {
-            ddcBrightnessSetProcess.command = ["ddcutil", "setvcp", "-d", String(deviceInfo.ddcDisplay), "10", String(clampedValue)]
-            ddcBrightnessSetProcess.running = true
-        } else {
-            if (device) {
-                brightnessSetProcess.command = ["brightnessctl", "-d", device, "set", `${clampedValue}%`]
-            } else {
-                brightnessSetProcess.command = ["brightnessctl", "set", `${clampedValue}%`]
-            }
-            brightnessSetProcess.running = true
-        }
-    }
-
-    function setBrightness(percentage, device) {
-        setBrightnessInternal(percentage, device)
-        brightnessChanged()
-    }
-
-    function setCurrentDevice(deviceName, saveToSession = false) {
-        if (currentDevice === deviceName) {
-            return
-        }
-
-        currentDevice = deviceName
-        lastIpcDevice = deviceName
-
-        if (saveToSession) {
-            SessionData.setLastBrightnessDevice(deviceName)
-        }
-
-        deviceSwitched()
-
-        const deviceInfo = getCurrentDeviceInfoByName(deviceName)
-        if (deviceInfo && deviceInfo.class === "ddc") {
-            return
-        } else {
-            brightnessGetProcess.command = ["brightnessctl", "-m", "-d", deviceName, "get"]
-            brightnessGetProcess.running = true
-        }
-    }
-
-    function refreshDevices() {
-        deviceListProcess.running = true
-    }
-
-    function refreshDevicesInternal() {
-        const allDevices = [...devices, ...ddcDevices]
-
-        allDevices.sort((a, b) => {
-                            if (a.class === "backlight" && b.class !== "backlight") {
-                                return -1
-                            }
-                            if (a.class !== "backlight" && b.class === "backlight") {
-                                return 1
-                            }
-
-                            if (a.class === "ddc" && b.class !== "ddc" && b.class !== "backlight") {
-                                return -1
-                            }
-                            if (a.class !== "ddc" && b.class === "ddc" && a.class !== "backlight") {
-                                return 1
-                            }
-
-                            return a.name.localeCompare(b.name)
-                        })
-
-        devices = allDevices
-
-        if (devices.length > 0 && !currentDevice) {
-            const lastDevice = SessionData.lastBrightnessDevice || ""
-            const deviceExists = devices.some(d => d.name === lastDevice)
-            if (deviceExists) {
-                setCurrentDevice(lastDevice, false)
-            } else {
-                const nonKbdDevice = devices.find(d => !d.name.includes("kbd")) || devices[0]
-                setCurrentDevice(nonKbdDevice.name, false)
-            }
-        }
-    }
-
-    function getDeviceBrightness(deviceName) {
-        if (!deviceName) {
-            return
-        } 50
-
-        const deviceInfo = getCurrentDeviceInfoByName(deviceName)
-        if (!deviceInfo) {
-            return 50
-        }
-
-        if (deviceInfo.class === "ddc") {
-            return deviceBrightness[deviceName] || 50
-        }
-
-        return deviceBrightness[deviceName] || deviceInfo.percentage || 50
-    }
-
-    function getDefaultDevice() {
-        for (const device of devices) {
-            if (device.class === "backlight") {
-                return device.name
-            }
-        }
-        return devices.length > 0 ? devices[0].name : ""
-    }
-
-    function getCurrentDeviceInfo() {
-        const deviceToUse = lastIpcDevice === "" ? getDefaultDevice() : (lastIpcDevice || currentDevice)
-        if (!deviceToUse) {
-            return null
-        }
-
-        for (const device of devices) {
-            if (device.name === deviceToUse) {
-                return device
-            }
-        }
-        return null
-    }
-
-    function isCurrentDeviceReady() {
-        const deviceToUse = lastIpcDevice === "" ? getDefaultDevice() : (lastIpcDevice || currentDevice)
-        if (!deviceToUse) {
-            return false
-        }
-
-        if (ddcPendingInit[deviceToUse]) {
-            return false
-        }
-
-        return true
-    }
-
-    function getCurrentDeviceInfoByName(deviceName) {
-        if (!deviceName) {
-            return null
-        }
-
-        for (const device of devices) {
-            if (device.name === deviceName) {
-                return device
-            }
-        }
-        return null
-    }
-
-    function processNextDdcInit() {
-        if (ddcInitQueue.length === 0 || ddcInitialBrightnessProcess.running) {
-            return
-        }
-
-        const displayId = ddcInitQueue.shift()
-        ddcInitialBrightnessProcess.command = ["ddcutil", "getvcp", "-d", String(displayId), "10", "--brief"]
-        ddcInitialBrightnessProcess.running = true
-    }
-
-    // Night Mode Functions - Simplified
-    function enableNightMode() {
-        if (!automationAvailable) {
-            gammaStepTestProcess.running = true
-            return
-        }
-
-        nightModeEnabled = true
-        SessionData.setNightModeEnabled(true)
-
-        // Apply immediately or start automation
-        if (SessionData.nightModeAutoEnabled) {
-            startAutomation()
-        } else {
-            applyNightModeDirectly()
-        }
-    }
-
-    function disableNightMode() {
-        nightModeEnabled = false
-        SessionData.setNightModeEnabled(false)
-        stopAutomation()
-        // Nuclear approach - kill ALL gammastep processes multiple times
-        Quickshell.execDetached(["pkill", "-f", "gammastep"])
-        Quickshell.execDetached(["pkill", "-9", "gammastep"])
-        Quickshell.execDetached(["killall", "gammastep"])
-        // Also stop all related processes
-        gammaStepProcess.running = false
-        automationProcess.running = false
-        gammaStepTestProcess.running = false
-    }
-
-    function toggleNightMode() {
-        if (nightModeEnabled) {
-            disableNightMode()
-        } else {
-            enableNightMode()
-        }
-    }
-
-    function applyNightModeDirectly() {
-        const temperature = SessionData.nightModeTemperature || 4500
-        gammaStepProcess.command = buildGammastepCommand(["-m", "wayland", "-O", String(temperature)])
-        gammaStepProcess.running = true
-    }
-
-    function resetToNormalMode() {
-        // Just kill gammastep to return to normal display temperature
-        Quickshell.execDetached(["pkill", "gammastep"])
-    }
-
-    function startAutomation() {
-        if (!automationAvailable) {
-            return
-        }
-
-        const mode = SessionData.nightModeAutoMode || "time"
-
-        switch (mode) {
-        case "time":
-            startTimeBasedMode()
-            break
-        case "location":
-            startLocationBasedMode()
-            break
-        }
-    }
-
-    function stopAutomation() {
-        automationProcess.running = false
-        gammaStepProcess.running = false
-        isAutomaticNightTime = false
-        // Nuclear approach - kill ALL gammastep processes multiple times
-        Quickshell.execDetached(["pkill", "-f", "gammastep"])
-        Quickshell.execDetached(["pkill", "-9", "gammastep"])
-        Quickshell.execDetached(["killall", "gammastep"])
-    }
-
-    function startTimeBasedMode() {
-        checkTimeBasedMode()
-    }
-
-    function startLocationBasedMode() {
-        const temperature = SessionData.nightModeTemperature || 4500
-        const dayTemp = 6500
-
-        if (SessionData.latitude !== 0.0 && SessionData.longitude !== 0.0) {
-            automationProcess.command = buildGammastepCommand(["-m", "wayland", "-l", `${SessionData.latitude.toFixed(6)}:${SessionData.longitude.toFixed(6)}`, "-t", `${dayTemp}:${temperature}`, "-v"])
-            automationProcess.running = true
-            return
-        }
-
-        if (SessionData.nightModeLocationProvider === "geoclue2") {
-            automationProcess.command = buildGammastepCommand(["-m", "wayland", "-l", "geoclue2", "-t", `${dayTemp}:${temperature}`, "-v"])
-            automationProcess.running = true
-            return
-        }
-
-        console.warn("DisplayService: Location mode selected but no coordinates or geoclue provider set")
-    }
-
-    function checkTimeBasedMode() {
-        if (!nightModeEnabled || !SessionData.nightModeAutoEnabled || SessionData.nightModeAutoMode !== "time") {
-            return
-        }
-
-        const currentTime = systemClock.hours * 60 + systemClock.minutes
-
-        const startMinutes = SessionData.nightModeStartHour * 60 + SessionData.nightModeStartMinute
-        const endMinutes = SessionData.nightModeEndHour * 60 + SessionData.nightModeEndMinute
-
-        let shouldBeNight = false
-
-        if (startMinutes > endMinutes) {
-            shouldBeNight = (currentTime >= startMinutes) || (currentTime < endMinutes)
-        } else {
-            shouldBeNight = (currentTime >= startMinutes) && (currentTime < endMinutes)
-        }
-
-        if (shouldBeNight !== isAutomaticNightTime) {
-            isAutomaticNightTime = shouldBeNight
-
-            if (shouldBeNight) {
-                applyNightModeDirectly()
-            } else {
-                resetToNormalMode()
-            }
-        }
-    }
-
-    function detectLocationProviders() {
-        geoclueDetectionProcess.running = true
-    }
-
-    function setNightModeAutomationMode(mode) {
-        SessionData.setNightModeAutoMode(mode)
-    }
-
-    function evaluateNightMode() {
-        // Always stop all processes first to clean slate
-        stopAutomation()
-
-        if (!nightModeEnabled) {
-            return
-        }
-
-        if (SessionData.nightModeAutoEnabled) {
-            restartTimer.nextAction = "automation"
-            restartTimer.start()
-        } else {
-            restartTimer.nextAction = "direct"
-            restartTimer.start()
-        }
-    }
-
-    function checkNightModeAvailability() {
-        gammastepAvailabilityProcess.running = true
-    }
-
-    Timer {
-        id: restartTimer
-        property string nextAction: ""
-        interval: 100
-        repeat: false
-
-        onTriggered: {
-            if (nextAction === "automation") {
-                startAutomation()
-            } else if (nextAction === "direct") {
-                applyNightModeDirectly()
-            }
-            nextAction = ""
-        }
-    }
-
-    Component.onCompleted: {
-        ddcDetectionProcess.running = true
-        refreshDevices()
-        checkNightModeAvailability()
-
-        // Initialize night mode state from session
-        nightModeEnabled = SessionData.nightModeEnabled
-    }
-
-    Component.onDestruction: {
-        gammaStepProcess.running = false
-        automationProcess.running = false
-    }
-
-    SystemClock {
-        id: systemClock
-        precision: SystemClock.Minutes
-        onDateChanged: {
-            if (nightModeEnabled && SessionData.nightModeAutoEnabled && SessionData.nightModeAutoMode === "time") {
-                checkTimeBasedMode()
-            }
-        }
-    }
-
-    Process {
-        id: ddcDetectionProcess
-
-        command: ["which", "ddcutil"]
-        running: false
-
-        onExited: function (exitCode) {
-            ddcAvailable = (exitCode === 0)
-            if (ddcAvailable) {
-                ddcDisplayDetectionProcess.running = true
-            } else {
-                console.log("DisplayService: ddcutil not available")
-            }
-        }
-    }
-
-    Process {
-        id: ddcDisplayDetectionProcess
-
-        command: ["bash", "-c", "ddcutil detect --brief 2>/dev/null | grep '^Display [0-9]' | awk '{print \"{\\\"display\\\":\" $2 \",\\\"name\\\":\\\"ddc-\" $2 \"\\\",\\\"class\\\":\\\"ddc\\\"}\"}' | tr '\\n' ',' | sed 's/,$//' | sed 's/^/[/' | sed 's/$/]/' || echo '[]'"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim()) {
-                    ddcDevices = []
-                    return
-                }
-
-                try {
-                    const parsedDevices = JSON.parse(text.trim())
-                    const newDdcDevices = []
-
-                    for (const device of parsedDevices) {
-                        if (device.display && device.class === "ddc") {
-                            newDdcDevices.push({
-                                                   "name": device.name,
-                                                   "class": "ddc",
-                                                   "current": 50,
-                                                   "percentage": 50,
-                                                   "max": 100,
-                                                   "ddcDisplay": device.display
-                                               })
-                        }
-                    }
-
-                    ddcDevices = newDdcDevices
-                    console.log("DisplayService: Found", ddcDevices.length, "DDC displays")
-
-                    // Queue initial brightness readings for DDC devices
-                    ddcInitQueue = []
-                    for (const device of ddcDevices) {
-                        ddcInitQueue.push(device.ddcDisplay)
-                        // Mark DDC device as pending initialization
-                        ddcPendingInit[device.name] = true
-                    }
-
-                    // Start processing the queue
-                    processNextDdcInit()
-
-                    // Refresh device list to include DDC devices
-                    refreshDevicesInternal()
-
-                    // Retry setting last device now that DDC devices are available
-                    const lastDevice = SessionData.lastBrightnessDevice || ""
-                    if (lastDevice) {
-                        const deviceExists = devices.some(d => d.name === lastDevice)
-                        if (deviceExists && (!currentDevice || currentDevice !== lastDevice)) {
-                            setCurrentDevice(lastDevice, false)
-                        }
-                    }
-                } catch (error) {
-                    console.warn("DisplayService: Failed to parse DDC devices:", error)
-                    ddcDevices = []
-                }
-            }
-        }
-
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to detect DDC displays:", exitCode)
-                ddcDevices = []
-            }
-        }
-    }
-
-    Process {
-        id: deviceListProcess
-
-        command: ["brightnessctl", "-m", "-l"]
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to list devices:", exitCode)
-                brightnessAvailable = false
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim()) {
-                    console.warn("DisplayService: No devices found")
-                    return
-                }
-                const lines = text.trim().split("\n")
-                const newDevices = []
-                for (const line of lines) {
-                    const parts = line.split(",")
-                    if (parts.length >= 5) {
-                        newDevices.push({
-                                            "name": parts[0],
-                                            "class": parts[1],
-                                            "current": parseInt(parts[2]),
-                                            "percentage": parseInt(parts[3]),
-                                            "max": parseInt(parts[4])
-                                        })
-                    }
-                }
-                // Store brightnessctl devices separately
-                devices = newDevices
-
-                // Always refresh to combine with DDC devices and set up device selection
-                refreshDevicesInternal()
-            }
-        }
-    }
-
-    Process {
-        id: brightnessSetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to set brightness:", exitCode)
-            }
-        }
-    }
-
-    Process {
-        id: ddcBrightnessSetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to set DDC brightness:", exitCode)
-            }
-        }
-    }
-
-    Process {
-        id: ddcInitialBrightnessProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to get initial DDC brightness:", exitCode)
-            }
-
-            processNextDdcInit()
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim())
-                return
-
-                const parts = text.trim().split(" ")
-                if (parts.length >= 5) {
-                    const current = parseInt(parts[3]) || 50
-                    const max = parseInt(parts[4]) || 100
-                    const brightness = Math.round((current / max) * 100)
-
-                    const commandParts = ddcInitialBrightnessProcess.command
-                    if (commandParts && commandParts.length >= 4) {
-                        const displayId = commandParts[3]
-                        const deviceName = "ddc-" + displayId
-
-                        var newBrightness = Object.assign({}, deviceBrightness)
-                        newBrightness[deviceName] = brightness
-                        deviceBrightness = newBrightness
-
-                        var newPending = Object.assign({}, ddcPendingInit)
-                        delete newPending[deviceName]
-                        ddcPendingInit = newPending
-
-                        console.log("DisplayService: Initial DDC Device", deviceName, "brightness:", brightness + "%")
-                    }
-                }
-            }
-        }
-    }
-
-    Process {
-        id: brightnessGetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to get brightness:", exitCode)
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim())
-                return
-
-                const parts = text.trim().split(",")
-                if (parts.length >= 5) {
-                    const current = parseInt(parts[2])
-                    const max = parseInt(parts[4])
-                    maxBrightness = max
-                    const brightness = Math.round((current / max) * 100)
-
-                    // Update the device brightness cache
-                    if (currentDevice) {
-                        var newBrightness = Object.assign({}, deviceBrightness)
-                        newBrightness[currentDevice] = brightness
-                        deviceBrightness = newBrightness
-                    }
-
-                    brightnessInitialized = true
-                    console.log("DisplayService: Device", currentDevice, "brightness:", brightness + "%")
-                    brightnessChanged()
-                }
-            }
-        }
-    }
-
-    Process {
-        id: ddcBrightnessGetProcess
-
-        running: false
-        onExited: function (exitCode) {
-            if (exitCode !== 0) {
-                console.warn("DisplayService: Failed to get DDC brightness:", exitCode)
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!text.trim())
-                return
-
-                // Parse ddcutil getvcp output format: "VCP 10 C 50 100"
-                const parts = text.trim().split(" ")
-                if (parts.length >= 5) {
-                    const current = parseInt(parts[3]) || 50
-                    const max = parseInt(parts[4]) || 100
-                    maxBrightness = max
-                    const brightness = Math.round((current / max) * 100)
-
-                    // Update the device brightness cache
-                    if (currentDevice) {
-                        var newBrightness = Object.assign({}, deviceBrightness)
-                        newBrightness[currentDevice] = brightness
-                        deviceBrightness = newBrightness
-                    }
-
-                    brightnessInitialized = true
-                    console.log("DisplayService: DDC Device", currentDevice, "brightness:", brightness + "%")
-                    brightnessChanged()
-                }
-            }
-        }
-    }
-
-    Process {
-        id: gammastepAvailabilityProcess
-        command: ["which", "gammastep"]
-        running: false
-
-        onExited: function (exitCode) {
-            automationAvailable = (exitCode === 0)
-            if (automationAvailable) {
-                detectLocationProviders()
-
-                // If night mode should be enabled on startup
-                if (nightModeEnabled && SessionData.nightModeAutoEnabled) {
-                    startAutomation()
-                } else if (nightModeEnabled) {
-                    applyNightModeDirectly()
-                }
-            } else {
-                console.log("DisplayService: gammastep not available")
-            }
-        }
-    }
-
-    Process {
-        id: geoclueDetectionProcess
-        command: ["sh", "-c", "busctl --system list | grep -qF org.freedesktop.GeoClue2"]
-        running: false
-
-        onExited: function (exitCode) {
-            geoclueAvailable = (exitCode === 0)
-        }
-    }
-
-    Process {
-        id: gammaStepTestProcess
-        command: ["which", "gammastep"]
-        running: false
-
-        onExited: function (exitCode) {
-            if (exitCode === 0) {
-                automationAvailable = true
-                nightModeEnabled = true
-                SessionData.setNightModeEnabled(true)
-
-                if (SessionData.nightModeAutoEnabled) {
-                    startAutomation()
-                } else {
-                    applyNightModeDirectly()
-                }
-            } else {
-                console.warn("DisplayService: gammastep not found")
-                ToastService.showWarning("Night mode failed: gammastep not found")
-            }
-        }
-    }
-
-    Process {
-        id: gammaStepProcess
-        running: false
-
-        onExited: function (exitCode) {
-            if (nightModeEnabled && exitCode !== 0 && exitCode !== 15) {
-                console.warn("DisplayService: Night mode process failed:", exitCode)
-            }
-        }
-    }
-
-    Process {
-        id: automationProcess
-        running: false
-        property string processType: "automation"
-
-        onExited: function (exitCode) {
-            if (nightModeEnabled && SessionData.nightModeAutoEnabled && exitCode !== 0 && exitCode !== 15) {
-                console.warn("DisplayService: Night mode automation failed:", exitCode)
-                // Location mode failed
-                console.warn("DisplayService: Location-based night mode failed")
-            }
-        }
-    }
-
-    // Session Data Connections
-    Connections {
-        target: SessionData
-
-        function onNightModeEnabledChanged() {
-            nightModeEnabled = SessionData.nightModeEnabled
-            evaluateNightMode()
-        }
-
-        function onNightModeAutoEnabledChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeAutoModeChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeStartHourChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeStartMinuteChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeEndHourChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeEndMinuteChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeTemperatureChanged() {
-            evaluateNightMode()
-        }
-        function onLatitudeChanged() {
-            evaluateNightMode()
-        }
-        function onLongitudeChanged() {
-            evaluateNightMode()
-        }
-        function onNightModeLocationProviderChanged() {
-            evaluateNightMode()
-        }
-    }
-
-    // IPC Handler for external control
-    IpcHandler {
-        function set(percentage: string, device: string): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            const value = parseInt(percentage)
-            if (isNaN(value)) {
-                return "Invalid brightness value: " + percentage
-            }
-
-            const clampedValue = Math.max(1, Math.min(100, value))
-            const targetDevice = device || ""
-
-            // Ensure device exists if specified
-            if (targetDevice && !root.devices.some(d => d.name === targetDevice)) {
-                return "Device not found: " + targetDevice
-            }
-
-            root.lastIpcDevice = targetDevice
-            if (targetDevice && targetDevice !== root.currentDevice) {
-                root.setCurrentDevice(targetDevice, false)
-            }
-            root.setBrightness(clampedValue, targetDevice)
-
-            if (targetDevice) {
-                return "Brightness set to " + clampedValue + "% on " + targetDevice
-            } else {
-                return "Brightness set to " + clampedValue + "%"
-            }
-        }
-
-        function increment(step: string, device: string): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            const targetDevice = device || ""
-            const actualDevice = targetDevice === "" ? root.getDefaultDevice() : targetDevice
-
-            // Ensure device exists
-            if (actualDevice && !root.devices.some(d => d.name === actualDevice)) {
-                return "Device not found: " + actualDevice
-            }
-
-            const currentLevel = actualDevice ? root.getDeviceBrightness(actualDevice) : root.brightnessLevel
-            const stepValue = parseInt(step || "10")
-            const newLevel = Math.max(1, Math.min(100, currentLevel + stepValue))
-
-            root.lastIpcDevice = targetDevice
-            if (targetDevice && targetDevice !== root.currentDevice) {
-                root.setCurrentDevice(targetDevice, false)
-            }
-            root.setBrightness(newLevel, targetDevice)
-
-            if (targetDevice) {
-                return "Brightness increased to " + newLevel + "% on " + targetDevice
-            } else {
-                return "Brightness increased to " + newLevel + "%"
-            }
-        }
-
-        function decrement(step: string, device: string): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            const targetDevice = device || ""
-            const actualDevice = targetDevice === "" ? root.getDefaultDevice() : targetDevice
-
-            // Ensure device exists
-            if (actualDevice && !root.devices.some(d => d.name === actualDevice)) {
-                return "Device not found: " + actualDevice
-            }
-
-            const currentLevel = actualDevice ? root.getDeviceBrightness(actualDevice) : root.brightnessLevel
-            const stepValue = parseInt(step || "10")
-            const newLevel = Math.max(1, Math.min(100, currentLevel - stepValue))
-
-            root.lastIpcDevice = targetDevice
-            if (targetDevice && targetDevice !== root.currentDevice) {
-                root.setCurrentDevice(targetDevice, false)
-            }
-            root.setBrightness(newLevel, targetDevice)
-
-            if (targetDevice) {
-                return "Brightness decreased to " + newLevel + "% on " + targetDevice
-            } else {
-                return "Brightness decreased to " + newLevel + "%"
-            }
-        }
-
-        function status(): string {
-            if (!root.brightnessAvailable) {
-                return "Brightness control not available"
-            }
-
-            return "Device: " + root.currentDevice + " - Brightness: " + root.brightnessLevel + "%"
-        }
-
-        function list(): string {
-            if (!root.brightnessAvailable) {
-                return "No brightness devices available"
-            }
-
-            let result = "Available devices:\\n"
-            for (const device of root.devices) {
-                result += device.name + " (" + device.class + ")\\n"
-            }
-            return result
-        }
-
-        target: "brightness"
-    }
-
-    // IPC Handler for night mode control
-    IpcHandler {
-        function toggle(): string {
-            root.toggleNightMode()
-            return root.nightModeEnabled ? "Night mode enabled" : "Night mode disabled"
-        }
-
-        function enable(): string {
-            root.enableNightMode()
-            return "Night mode enabled"
-        }
-
-        function disable(): string {
-            root.disableNightMode()
-            return "Night mode disabled"
-        }
-
-        function status(): string {
-            return root.nightModeEnabled ? "Night mode is enabled" : "Night mode is disabled"
-        }
-
-        function temperature(value: string): string {
-            if (!value) {
-                return "Current temperature: " + SessionData.nightModeTemperature + "K"
-            }
-
-            const temp = parseInt(value)
-            if (isNaN(temp)) {
-                return "Invalid temperature. Use a value between 2500 and 6000 (in steps of 500)"
-            }
-
-            // Validate temperature is in valid range and steps
-            if (temp < 2500 || temp > 6000) {
-                return "Temperature must be between 2500K and 6000K"
-            }
-
-            // Round to nearest 500
-            const rounded = Math.round(temp / 500) * 500
-
-            SessionData.setNightModeTemperature(rounded)
-
-            // Restart night mode with new temperature if active
-            if (root.nightModeEnabled) {
-                if (SessionData.nightModeAutoEnabled) {
-                    root.startAutomation()
-                } else {
-                    root.applyNightModeDirectly()
-                }
-            }
-
-            if (rounded !== temp) {
-                return "Night mode temperature set to " + rounded + "K (rounded from " + temp + "K)"
-            } else {
-                return "Night mode temperature set to " + rounded + "K"
-            }
-        }
-
-        target: "night"
-    }
-}

Services/HyprKeybindsService.qml

@@ -1,39 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtCore
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    readonly property string shellDir: Paths.strip(Qt.resolvedUrl(".").toString()).replace("/Services/", "")
-    property string scriptPath: `${shellDir}/scripts/hyprland_keybinds.py`
-    readonly property string _configUrl: StandardPaths.writableLocation(StandardPaths.ConfigLocation)
-    readonly property string _configDir: Paths.strip(_configUrl)
-    property string hyprConfigPath: `${_configDir}/hypr`
-    property var keybinds: ({"children": [], "keybinds": []})
-
-    Process {
-        id: getKeybinds
-        running: true
-        command: [root.scriptPath, "--path", root.hyprConfigPath]
-
-        stdout: SplitParser {
-            onRead: data => {
-                try {
-                    root.keybinds = JSON.parse(data)
-                } catch (e) {
-                    console.error("[HyprKeybindsService] Error parsing keybinds:", e)
-                }
-            }
-        }
-    }
-
-    function reload() {
-        getKeybinds.running = true
-    }
-}

Services/IdleService.qml

@@ -1,156 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-
-Singleton {
-    id: root
-
-    readonly property bool idleMonitorAvailable: {
-        try {
-            return typeof IdleMonitor !== "undefined"
-        } catch (e) {
-            return false
-        }
-    }
-
-    property bool enabled: true
-    property bool respectInhibitors: true
-    property bool _enableGate: true
-
-    readonly property bool isOnBattery: BatteryService.batteryAvailable && !BatteryService.isPluggedIn
-    readonly property int monitorTimeout: isOnBattery ? SettingsData.batteryMonitorTimeout : SettingsData.acMonitorTimeout
-    readonly property int lockTimeout: isOnBattery ? SettingsData.batteryLockTimeout : SettingsData.acLockTimeout
-    readonly property int suspendTimeout: isOnBattery ? SettingsData.batterySuspendTimeout : SettingsData.acSuspendTimeout
-    readonly property int hibernateTimeout: isOnBattery ? SettingsData.batteryHibernateTimeout : SettingsData.acHibernateTimeout
-
-    onMonitorTimeoutChanged: _rearmIdleMonitors()
-    onLockTimeoutChanged: _rearmIdleMonitors()
-    onSuspendTimeoutChanged: _rearmIdleMonitors()
-    onHibernateTimeoutChanged: _rearmIdleMonitors()
-
-    function _rearmIdleMonitors() {
-        _enableGate = false
-        Qt.callLater(() => { _enableGate = true })
-    }
-
-    signal lockRequested()
-    signal requestMonitorOff()
-    signal requestMonitorOn()
-    signal requestSuspend()
-    signal requestHibernate()
-
-    property var monitorOffMonitor: null
-    property var lockMonitor: null
-    property var suspendMonitor: null
-    property var hibernateMonitor: null
-
-    function wake() {
-        requestMonitorOn()
-    }
-
-    function createIdleMonitors() {
-        if (!idleMonitorAvailable) {
-            console.log("IdleService: IdleMonitor not available, skipping creation")
-            return
-        }
-
-        try {
-            const qmlString = `
-                import QtQuick
-                import Quickshell.Wayland
-
-                IdleMonitor {
-                    enabled: false
-                    respectInhibitors: true
-                    timeout: 0
-                }
-            `
-
-            monitorOffMonitor = Qt.createQmlObject(qmlString, root, "IdleService.MonitorOffMonitor")
-            monitorOffMonitor.enabled = Qt.binding(() => root._enableGate && root.enabled && root.idleMonitorAvailable && root.monitorTimeout > 0)
-            monitorOffMonitor.respectInhibitors = Qt.binding(() => root.respectInhibitors)
-            monitorOffMonitor.timeout = Qt.binding(() => root.monitorTimeout)
-            monitorOffMonitor.isIdleChanged.connect(function() {
-                if (monitorOffMonitor.isIdle) {
-                    root.requestMonitorOff()
-                } else {
-                    root.requestMonitorOn()
-                }
-            })
-
-            lockMonitor = Qt.createQmlObject(qmlString, root, "IdleService.LockMonitor")
-            lockMonitor.enabled = Qt.binding(() => root._enableGate && root.enabled && root.idleMonitorAvailable && root.lockTimeout > 0)
-            lockMonitor.respectInhibitors = Qt.binding(() => root.respectInhibitors)
-            lockMonitor.timeout = Qt.binding(() => root.lockTimeout)
-            lockMonitor.isIdleChanged.connect(function() {
-                if (lockMonitor.isIdle) {
-                    root.lockRequested()
-                }
-            })
-
-            suspendMonitor = Qt.createQmlObject(qmlString, root, "IdleService.SuspendMonitor")
-            suspendMonitor.enabled = Qt.binding(() => root._enableGate && root.enabled && root.idleMonitorAvailable && root.suspendTimeout > 0)
-            suspendMonitor.respectInhibitors = Qt.binding(() => root.respectInhibitors)
-            suspendMonitor.timeout = Qt.binding(() => root.suspendTimeout)
-            suspendMonitor.isIdleChanged.connect(function() {
-                if (suspendMonitor.isIdle) {
-                    root.requestSuspend()
-                }
-            })
-
-            hibernateMonitor = Qt.createQmlObject(qmlString, root, "IdleService.HibernateMonitor")
-            hibernateMonitor.enabled = Qt.binding(() => root._enableGate && root.enabled && root.idleMonitorAvailable && root.hibernateTimeout > 0)
-            hibernateMonitor.respectInhibitors = Qt.binding(() => root.respectInhibitors)
-            hibernateMonitor.timeout = Qt.binding(() => root.hibernateTimeout)
-            hibernateMonitor.isIdleChanged.connect(function() {
-                if (hibernateMonitor.isIdle) {
-                    root.requestHibernate()
-                }
-            })
-        } catch (e) {
-            console.warn("IdleService: Error creating IdleMonitors:", e)
-        }
-    }
-
-    Connections {
-        target: root
-        function onRequestMonitorOff() {
-            CompositorService.powerOffMonitors()
-        }
-
-        function onRequestMonitorOn() {
-            CompositorService.powerOnMonitors()
-        }
-
-        function onRequestSuspend() {
-            SessionService.suspend()
-        }
-
-        function onRequestHibernate() {
-            SessionService.hibernate()
-        }
-    }
-
-    Connections {
-        target: SessionService
-        function onPrepareForSleep() {
-            if (SettingsData.lockBeforeSuspend) {
-                root.lockRequested()
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        if (!idleMonitorAvailable) {
-            console.warn("IdleService: IdleMonitor not available - power management disabled. This requires a newer version of Quickshell.")
-        } else {
-            console.log("IdleService: Initialized with idle monitoring support")
-            createIdleMonitors()
-        }
-    }
-}

Services/NetworkManagerService.qml

@@ -1,612 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property bool networkAvailable: false
-
-    property string networkStatus: "disconnected"
-    property string primaryConnection: ""
-
-    property string ethernetIP: ""
-    property string ethernetInterface: ""
-    property bool ethernetConnected: false
-    property string ethernetConnectionUuid: ""
-
-    property var wiredConnections: []
-
-    property string wifiIP: ""
-    property string wifiInterface: ""
-    property bool wifiConnected: false
-    property bool wifiEnabled: true
-    property string wifiConnectionUuid: ""
-    property string wifiDevicePath: ""
-    property string activeAccessPointPath: ""
-
-    property string currentWifiSSID: ""
-    property int wifiSignalStrength: 0
-    property var wifiNetworks: []
-    property var savedConnections: []
-    property var ssidToConnectionName: ({})
-    property var wifiSignalIcon: {
-        if (!wifiConnected || networkStatus !== "wifi") {
-            return "wifi_off"
-        }
-        if (wifiSignalStrength >= 50) {
-            return "wifi"
-        }
-        if (wifiSignalStrength >= 25) {
-            return "wifi_2_bar"
-        }
-        return "wifi_1_bar"
-    }
-
-    property string userPreference: "auto"
-    property bool isConnecting: false
-    property string connectingSSID: ""
-    property string connectionError: ""
-
-    property bool isScanning: false
-    property bool autoScan: false
-
-    property bool wifiAvailable: true
-    property bool wifiToggling: false
-    property bool changingPreference: false
-    property string targetPreference: ""
-    property var savedWifiNetworks: []
-    property string connectionStatus: ""
-    property string lastConnectionError: ""
-    property bool passwordDialogShouldReopen: false
-    property bool autoRefreshEnabled: false
-    property string wifiPassword: ""
-    property string forgetSSID: ""
-
-    property string networkInfoSSID: ""
-    property string networkInfoDetails: ""
-    property bool networkInfoLoading: false
-    
-    property string networkWiredInfoUUID: ""
-    property string networkWiredInfoDetails: ""
-    property bool networkWiredInfoLoading: false
-
-    property int refCount: 0
-    property bool stateInitialized: false
-
-    signal networksUpdated
-    signal connectionChanged
-
-    readonly property string socketPath: Quickshell.env("DMS_SOCKET")
-
-    Component.onCompleted: {
-        root.userPreference = SettingsData.networkPreference
-        if (socketPath && socketPath.length > 0) {
-            checkDMSCapabilities()
-        }
-    }
-
-    Connections {
-        target: DMSService
-
-        function onNetworkStateUpdate(data) {
-            if (DMSService.verboseLogs) {
-                const networksCount = data.wifiNetworks?.length ?? "null"
-                console.log("NetworkManagerService: Subscription update received, networks:", networksCount)
-            }
-            updateState(data)
-        }
-    }
-
-    Connections {
-        target: DMSService
-
-        function onConnectionStateChanged() {
-            if (DMSService.isConnected) {
-                checkDMSCapabilities()
-            }
-        }
-    }
-
-    Connections {
-        target: DMSService
-        enabled: DMSService.isConnected
-
-        function onCapabilitiesChanged() {
-            checkDMSCapabilities()
-        }
-    }
-
-    function checkDMSCapabilities() {
-        if (!DMSService.isConnected) {
-            return
-        }
-
-        if (DMSService.capabilities.length === 0) {
-            return
-        }
-
-        networkAvailable = DMSService.capabilities.includes("network")
-
-        if (DMSService.verboseLogs) {
-            console.log("NetworkManagerService: Network available:", networkAvailable)
-        }
-
-        if (networkAvailable && !stateInitialized) {
-            stateInitialized = true
-            getState()
-        }
-    }
-
-    function addRef() {
-        refCount++
-        if (refCount === 1 && networkAvailable) {
-            startAutoScan()
-        }
-    }
-
-    function removeRef() {
-        refCount = Math.max(0, refCount - 1)
-        if (refCount === 0) {
-            stopAutoScan()
-        }
-    }
-
-    property bool initialStateFetched: false
-
-    function getState() {
-        if (!networkAvailable) return
-
-        DMSService.sendRequest("network.getState", null, response => {
-            if (response.result) {
-                updateState(response.result)
-                if (!initialStateFetched && response.result.wifiEnabled && (!response.result.wifiNetworks || response.result.wifiNetworks.length === 0)) {
-                    if (DMSService.verboseLogs) {
-                        console.log("NetworkManagerService: Initial state has no networks, triggering scan")
-                    }
-                    initialStateFetched = true
-                    Qt.callLater(() => scanWifi())
-                }
-            }
-        })
-    }
-
-    function updateState(state) {
-        networkStatus = state.networkStatus || "disconnected"
-        primaryConnection = state.primaryConnection || ""
-
-        ethernetIP = state.ethernetIP || ""
-        ethernetInterface = state.ethernetDevice || ""
-        ethernetConnected = state.ethernetConnected || false
-        ethernetConnectionUuid = state.ethernetConnectionUuid || ""
-
-        wiredConnections = state.wiredConnections || []
-
-        wifiIP = state.wifiIP || ""
-        wifiInterface = state.wifiDevice || ""
-        wifiConnected = state.wifiConnected || false
-        wifiEnabled = state.wifiEnabled !== undefined ? state.wifiEnabled : true
-        wifiConnectionUuid = state.wifiConnectionUuid || ""
-        wifiDevicePath = state.wifiDevicePath || ""
-        activeAccessPointPath = state.activeAccessPointPath || ""
-
-        currentWifiSSID = state.wifiSSID || ""
-        wifiSignalStrength = state.wifiSignal || 0
-
-        if (state.wifiNetworks) {
-            wifiNetworks = state.wifiNetworks
-
-            const saved = []
-            const mapping = {}
-            for (const network of state.wifiNetworks) {
-                if (network.saved) {
-                    saved.push({
-                        ssid: network.ssid,
-                        saved: true
-                    })
-                    mapping[network.ssid] = network.ssid
-                }
-            }
-            savedConnections = saved
-            savedWifiNetworks = saved
-            ssidToConnectionName = mapping
-
-            networksUpdated()
-        }
-
-        userPreference = state.preference || "auto"
-        isConnecting = state.isConnecting || false
-        connectingSSID = state.connectingSSID || ""
-        connectionError = state.lastError || ""
-        lastConnectionError = state.lastError || ""
-
-        connectionChanged()
-    }
-    
-    function connectToSpecificWiredConfig(uuid) {
-        if (!networkAvailable || isConnecting) return
-
-        isConnecting = true
-        connectionError = ""
-        connectionStatus = "connecting"
-
-        const params = { uuid: uuid }
-
-        DMSService.sendRequest("network.ethernet.connect.config", params, response => {
-            if (response.error) {
-                connectionError = response.error
-                lastConnectionError = response.error
-                connectionStatus = "failed"
-                ToastService.showError(`Failed to activate configuration`)
-            } else {
-                connectionError = ""
-                connectionStatus = "connected"
-                ToastService.showInfo(`Configuration activated`)
-            }
-
-            isConnecting = false
-        })
-    }
-
-    function scanWifi() {
-        if (!networkAvailable || isScanning || !wifiEnabled) return
-
-        if (DMSService.verboseLogs) {
-            console.log("NetworkManagerService: Starting WiFi scan...")
-        }
-        isScanning = true
-        DMSService.sendRequest("network.wifi.scan", null, response => {
-            isScanning = false
-            if (response.error) {
-                console.warn("NetworkManagerService: WiFi scan failed:", response.error)
-            } else {
-                if (DMSService.verboseLogs) {
-                    console.log("NetworkManagerService: Scan completed")
-                }
-                Qt.callLater(() => getState())
-            }
-        })
-    }
-
-    function scanWifiNetworks() {
-        scanWifi()
-    }
-
-    function connectToWifi(ssid, password = "", username = "", anonymousIdentity = "", domainSuffixMatch = "") {
-        if (!networkAvailable || isConnecting) return
-
-        connectingSSID = ssid
-        connectionError = ""
-        connectionStatus = "connecting"
-
-        const params = { ssid: ssid }
-        if (password) params.password = password
-        if (username) params.username = username
-        if (anonymousIdentity) params.anonymousIdentity = anonymousIdentity
-        if (domainSuffixMatch) params.domainSuffixMatch = domainSuffixMatch
-
-        DMSService.sendRequest("network.wifi.connect", params, response => {
-            if (response.error) {
-                connectionError = response.error
-                lastConnectionError = response.error
-                connectionStatus = response.error.includes("password") || response.error.includes("authentication")
-                    ? "invalid_password"
-                    : "failed"
-
-                if (connectionStatus === "invalid_password") {
-                    passwordDialogShouldReopen = true
-                    ToastService.showError(`Invalid password for ${ssid}`)
-                } else {
-                    ToastService.showError(`Failed to connect to ${ssid}`)
-                }
-            } else {
-                connectionError = ""
-                connectionStatus = "connected"
-                ToastService.showInfo(`Connected to ${ssid}`)
-
-                if (userPreference === "wifi" || userPreference === "auto") {
-                    setConnectionPriority("wifi")
-                }
-            }
-
-            isConnecting = false
-            connectingSSID = ""
-        })
-    }
-
-    function disconnectWifi() {
-        if (!networkAvailable || !wifiInterface) return
-
-        DMSService.sendRequest("network.wifi.disconnect", null, response => {
-            if (response.error) {
-                ToastService.showError("Failed to disconnect WiFi")
-            } else {
-                ToastService.showInfo("Disconnected from WiFi")
-                currentWifiSSID = ""
-                connectionStatus = ""
-            }
-        })
-    }
-
-    function forgetWifiNetwork(ssid) {
-        if (!networkAvailable) return
-
-        forgetSSID = ssid
-        DMSService.sendRequest("network.wifi.forget", { ssid: ssid }, response => {
-            if (response.error) {
-                console.warn("Failed to forget network:", response.error)
-            } else {
-                ToastService.showInfo(`Forgot network ${ssid}`)
-
-                savedConnections = savedConnections.filter(s => s.ssid !== ssid)
-                savedWifiNetworks = savedWifiNetworks.filter(s => s.ssid !== ssid)
-
-                const updated = [...wifiNetworks]
-                for (const network of updated) {
-                    if (network.ssid === ssid) {
-                        network.saved = false
-                        if (network.connected) {
-                            network.connected = false
-                            currentWifiSSID = ""
-                        }
-                    }
-                }
-                wifiNetworks = updated
-                networksUpdated()
-            }
-            forgetSSID = ""
-        })
-    }
-
-    function toggleWifiRadio() {
-        if (!networkAvailable || wifiToggling) return
-
-        wifiToggling = true
-        DMSService.sendRequest("network.wifi.toggle", null, response => {
-            wifiToggling = false
-
-            if (response.error) {
-                console.warn("Failed to toggle WiFi:", response.error)
-            } else if (response.result) {
-                wifiEnabled = response.result.enabled
-                ToastService.showInfo(wifiEnabled ? "WiFi enabled" : "WiFi disabled")
-            }
-        })
-    }
-
-    function enableWifiDevice() {
-        if (!networkAvailable) return
-
-        DMSService.sendRequest("network.wifi.enable", null, response => {
-            if (response.error) {
-                ToastService.showError("Failed to enable WiFi")
-            } else {
-                ToastService.showInfo("WiFi enabled")
-            }
-        })
-    }
-
-    function setNetworkPreference(preference) {
-        if (!networkAvailable) return
-
-        userPreference = preference
-        changingPreference = true
-        targetPreference = preference
-        SettingsData.setNetworkPreference(preference)
-
-        DMSService.sendRequest("network.preference.set", { preference: preference }, response => {
-            changingPreference = false
-            targetPreference = ""
-
-            if (response.error) {
-                console.warn("Failed to set network preference:", response.error)
-            }
-        })
-    }
-
-    function setConnectionPriority(type) {
-        if (type === "wifi") {
-            setNetworkPreference("wifi")
-        } else if (type === "ethernet") {
-            setNetworkPreference("ethernet")
-        }
-    }
-
-    function connectToWifiAndSetPreference(ssid, password, username = "", anonymousIdentity = "", domainSuffixMatch = "") {
-        connectToWifi(ssid, password, username, anonymousIdentity, domainSuffixMatch)
-        setNetworkPreference("wifi")
-    }
-
-    function toggleNetworkConnection(type) {
-        if (!networkAvailable) return
-
-        if (type === "ethernet") {
-            if (networkStatus === "ethernet") {
-                DMSService.sendRequest("network.ethernet.disconnect", null, null)
-            } else {
-                DMSService.sendRequest("network.ethernet.connect", null, null)
-            }
-        }
-    }
-
-    function startAutoScan() {
-        autoScan = true
-        autoRefreshEnabled = true
-        if (networkAvailable && wifiEnabled) {
-            scanWifi()
-        }
-    }
-
-    function stopAutoScan() {
-        autoScan = false
-        autoRefreshEnabled = false
-    }
-    
-    function fetchWiredNetworkInfo(uuid) {
-        if (!networkAvailable) return
-
-        networkWiredInfoUUID = uuid
-        networkWiredInfoLoading = true
-        networkWiredInfoDetails = "Loading network information..."
-
-        DMSService.sendRequest("network.ethernet.info", { uuid: uuid }, response => {
-            networkWiredInfoLoading = false
-
-            if (response.error) {
-                networkWiredInfoDetails = "Failed to fetch network information"
-            } else if (response.result) {
-                formatWiredNetworkInfo(response.result)
-            }
-        })
-    }
-
-    function formatWiredNetworkInfo(info) {
-        let details = ""
-
-        if (!info) {
-            details = "Network information not found or network not available."
-        } else {
-            details += "Inteface: " + info.iface + "\\n"
-            details += "Driver: " + info.driver + "\\n"
-            details += "MAC Addr: " + info.hwAddr + "\\n"
-            details += "Speed: " + info.speed + " Mb/s\\n\\n"
-            
-            details += "IPv4 informations:\\n"
-            
-            for (const ip4 of info.IPv4s.ips) {
-                details += "    IPv4 address: " + ip4 + "\\n"
-            }
-            details += "    Gateway: " + info.IPv4s.gateway + "\\n"
-            details += "    DNS: " + info.IPv4s.dns + "\\n"
-            
-            if (info.IPv6s.ips) {
-                details += "\\nIPv6 informations:\\n"
-                
-                for (const ip6 of info.IPv6s.ips) {
-                    details += "    IPv6 address: " + ip6 + "\\n"
-                }
-                if (info.IPv6s.gateway.length > 0) {
-                    details += "    Gateway: " + info.IPv6s.gateway + "\\n"
-                }
-                if (info.IPv6s.dns.length > 0) {
-                    details += "    DNS: " + info.IPv6s.dns + "\\n"
-                }
-            }
-        }
-
-        networkWiredInfoDetails = details
-    }
-
-    function fetchNetworkInfo(ssid) {
-        if (!networkAvailable) return
-
-        networkInfoSSID = ssid
-        networkInfoLoading = true
-        networkInfoDetails = "Loading network information..."
-
-        DMSService.sendRequest("network.info", { ssid: ssid }, response => {
-            networkInfoLoading = false
-
-            if (response.error) {
-                networkInfoDetails = "Failed to fetch network information"
-            } else if (response.result) {
-                formatNetworkInfo(response.result)
-            }
-        })
-    }
-
-    function formatNetworkInfo(info) {
-        let details = ""
-
-        if (!info || !info.bands || info.bands.length === 0) {
-            details = "Network information not found or network not available."
-        } else {
-            for (const band of info.bands) {
-                const freqGHz = band.frequency / 1000
-                let bandName = "Unknown"
-                if (band.frequency >= 2400 && band.frequency <= 2500) {
-                    bandName = "2.4 GHz"
-                } else if (band.frequency >= 5000 && band.frequency <= 6000) {
-                    bandName = "5 GHz"
-                } else if (band.frequency >= 6000) {
-                    bandName = "6 GHz"
-                }
-
-                const statusPrefix = band.connected ? "● " : "  "
-                const statusSuffix = band.connected ? " (Connected)" : ""
-
-                details += statusPrefix + bandName + statusSuffix + " - " + band.signal + "%\\n"
-                details += "  Channel " + band.channel + " (" + freqGHz.toFixed(1) + " GHz) • " + band.rate + " Mbit/s\\n"
-                details += "  BSSID: " + band.bssid + "\\n"
-                details += "  Mode: " + band.mode + "\\n"
-                details += "  Security: " + (band.secured ? "Secured" : "Open") + "\\n"
-                if (band.saved) {
-                    details += "  Status: Saved network\\n"
-                }
-                details += "\\n"
-            }
-        }
-
-        networkInfoDetails = details
-    }
-
-    function getNetworkInfo(ssid) {
-        const network = wifiNetworks.find(n => n.ssid === ssid)
-        if (!network) {
-            return null
-        }
-
-        return {
-            "ssid": network.ssid,
-            "signal": network.signal,
-            "secured": network.secured,
-            "saved": network.saved,
-            "connected": network.connected,
-            "bssid": network.bssid
-        }
-    }
-
-    function getWiredNetworkInfo(uuid) {
-        const network = wiredConnections.find(n => n.uuid === uuid)
-        if (!network) {
-            return null
-        }
-
-        return {
-            "uuid": uuid,
-        }
-    }
-
-    function refreshNetworkState() {
-        if (networkAvailable) {
-            getState()
-        }
-    }
-
-    function splitNmcliFields(line) {
-        const parts = []
-        let cur = ""
-        let escape = false
-        for (var i = 0; i < line.length; i++) {
-            const ch = line[i]
-            if (escape) {
-                cur += ch
-                escape = false
-            } else if (ch === '\\') {
-                escape = true
-            } else if (ch === ':') {
-                parts.push(cur)
-                cur = ""
-            } else {
-                cur += ch
-            }
-        }
-        parts.push(cur)
-        return parts
-    }
-}

Services/PluginService.qml

@@ -1,612 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtCore
-import QtQuick
-import Qt.labs.folderlistmodel
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property var availablePlugins: ({})
-    property var loadedPlugins: ({})
-    property var pluginWidgetComponents: ({})
-    property var pluginDaemonComponents: ({})
-    property var pluginLauncherComponents: ({})
-    property string pluginDirectory: {
-        var configDir = StandardPaths.writableLocation(StandardPaths.ConfigLocation)
-        var configDirStr = configDir.toString()
-        if (configDirStr.startsWith("file://")) {
-            configDirStr = configDirStr.substring(7)
-        }
-        return configDirStr + "/DankMaterialShell/plugins"
-    }
-    property string systemPluginDirectory: "/etc/xdg/quickshell/dms-plugins"
-
-    property var knownManifests: ({})
-    property var pathToPluginId: ({})
-    property var pluginInstances: ({})
-    property var globalVars: ({})
-
-    signal pluginLoaded(string pluginId)
-    signal pluginUnloaded(string pluginId)
-    signal pluginLoadFailed(string pluginId, string error)
-    signal pluginDataChanged(string pluginId)
-    signal pluginListUpdated()
-    signal globalVarChanged(string pluginId, string varName)
-
-    Timer {
-        id: resyncDebounce
-        interval: 120
-        repeat: false
-        onTriggered: resyncAll()
-    }
-
-    Component.onCompleted: {
-        userWatcher.folder = Paths.toFileUrl(root.pluginDirectory)
-        systemWatcher.folder = Paths.toFileUrl(root.systemPluginDirectory)
-        Qt.callLater(resyncAll)
-    }
-
-    FolderListModel {
-        id: userWatcher
-        showDirs: true
-        showFiles: false
-        showDotAndDotDot: false
-        nameFilters: ["plugin.json"]
-
-        onCountChanged: resyncDebounce.restart()
-        onStatusChanged: if (status === FolderListModel.Ready) resyncDebounce.restart()
-    }
-
-    FolderListModel {
-        id: systemWatcher
-        showDirs: true
-        showFiles: false
-        showDotAndDotDot: false
-        nameFilters: ["plugin.json"]
-
-        onCountChanged: resyncDebounce.restart()
-        onStatusChanged: if (status === FolderListModel.Ready) resyncDebounce.restart()
-    }
-
-    function snapshotModel(model, sourceTag) {
-        const out = []
-        const n = model.count
-        const baseDir = sourceTag === "user" ? pluginDirectory : systemPluginDirectory
-        for (let i = 0; i < n; i++) {
-            let dirPath = model.get(i, "filePath")
-            if (dirPath.startsWith("file://")) {
-                dirPath = dirPath.substring(7)
-            }
-            if (!dirPath.startsWith(baseDir)) {
-                continue
-            }
-            const manifestPath = dirPath + "/plugin.json"
-            out.push({ path: manifestPath, source: sourceTag })
-        }
-        return out
-    }
-
-    function resyncAll() {
-        const userList = snapshotModel(userWatcher, "user")
-        const sysList  = snapshotModel(systemWatcher, "system")
-        const seenPaths = {}
-
-        function consider(entry) {
-            const key = entry.path
-            seenPaths[key] = true
-            const prev = knownManifests[key]
-            if (!prev) {
-                loadPluginManifestFile(entry.path, entry.source, Date.now())
-            }
-        }
-        for (let i=0;i<userList.length;i++) consider(userList[i])
-        for (let i=0;i<sysList.length;i++)  consider(sysList[i])
-
-        const removed = []
-        for (const path in knownManifests) {
-            if (!seenPaths[path]) removed.push(path)
-        }
-        if (removed.length) {
-            removed.forEach(function(path) {
-                const pid = pathToPluginId[path]
-                if (pid) {
-                    unregisterPluginByPath(path, pid)
-                }
-                delete knownManifests[path]
-                delete pathToPluginId[path]
-            })
-            pluginListUpdated()
-        }
-    }
-
-    function loadPluginManifestFile(manifestPathNoScheme, sourceTag, mtimeEpochMs) {
-        const manifestId = "m_" + Math.random().toString(36).slice(2)
-        const qml = `
-            import QtQuick
-            import Quickshell.Io
-            FileView {
-                id: fv
-                property string absPath: ""
-                onLoaded: {
-                    try {
-                        let raw = text()
-                        if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1)
-                        const manifest = JSON.parse(raw)
-                        root._onManifestParsed(absPath, manifest, "${sourceTag}", ${mtimeEpochMs})
-                    } catch (e) {
-                        console.error("PluginService: bad manifest", absPath, e.message)
-                        knownManifests[absPath] = { mtime: ${mtimeEpochMs}, source: "${sourceTag}", bad: true }
-                    }
-                    fv.destroy()
-                }
-                onLoadFailed: (err) => {
-                    console.warn("PluginService: manifest load failed", absPath, err)
-                    fv.destroy()
-                }
-            }
-        `
-        const loader = Qt.createQmlObject(qml, root, "mf_" + manifestId)
-        loader.absPath = manifestPathNoScheme
-        loader.path = manifestPathNoScheme
-    }
-
-    function _onManifestParsed(absPath, manifest, sourceTag, mtimeEpochMs) {
-        if (!manifest || !manifest.id || !manifest.name || !manifest.component) {
-            console.error("PluginService: invalid manifest fields:", absPath)
-            knownManifests[absPath] = { mtime: mtimeEpochMs, source: sourceTag, bad: true }
-            return
-        }
-
-        const dir = absPath.substring(0, absPath.lastIndexOf('/'))
-        let comp = manifest.component
-        if (comp.startsWith("./")) comp = comp.slice(2)
-        let settings = manifest.settings
-        if (settings && settings.startsWith("./")) settings = settings.slice(2)
-
-        const info = {}
-        for (const k in manifest) info[k] = manifest[k]
-
-        let perms = manifest.permissions
-        if (typeof perms === "string") {
-            perms = perms.split(/\s*,\s*/)
-        }
-        if (!Array.isArray(perms)) {
-            perms = []
-        }
-        info.permissions = perms.map(p => String(p).trim())
-
-        info.manifestPath = absPath
-        info.pluginDirectory = dir
-        info.componentPath = dir + "/" + comp
-        info.settingsPath  = settings ? (dir + "/" + settings) : null
-        info.loaded = isPluginLoaded(manifest.id)
-        info.type = manifest.type || "widget"
-        info.source = sourceTag
-
-        const existing = availablePlugins[manifest.id]
-        const shouldReplace =
-            (!existing) ||
-            (existing && existing.source === "system" && sourceTag === "user")
-
-        if (shouldReplace) {
-            if (existing && existing.loaded && existing.source !== sourceTag) {
-                unloadPlugin(manifest.id)
-            }
-            const newMap = Object.assign({}, availablePlugins)
-            newMap[manifest.id] = info
-            availablePlugins = newMap
-            pathToPluginId[absPath] = manifest.id
-            knownManifests[absPath] = { mtime: mtimeEpochMs, source: sourceTag }
-            pluginListUpdated()
-            const enabled = SettingsData.getPluginSetting(manifest.id, "enabled", false)
-            if (enabled && !info.loaded) loadPlugin(manifest.id)
-        } else {
-            knownManifests[absPath] = { mtime: mtimeEpochMs, source: sourceTag, shadowedBy: existing.source }
-            pathToPluginId[absPath] = manifest.id
-        }
-    }
-
-    function unregisterPluginByPath(absPath, pluginId) {
-        const current = availablePlugins[pluginId]
-        if (current && current.manifestPath === absPath) {
-            if (current.loaded) unloadPlugin(pluginId)
-            const newMap = Object.assign({}, availablePlugins)
-            delete newMap[pluginId]
-            availablePlugins = newMap
-        }
-    }
-
-    function loadPlugin(pluginId) {
-        const plugin = availablePlugins[pluginId]
-        if (!plugin) {
-            console.error("PluginService: Plugin not found:", pluginId)
-            pluginLoadFailed(pluginId, "Plugin not found")
-            return false
-        }
-
-        if (plugin.loaded) {
-            return true
-        }
-
-        const isDaemon = plugin.type === "daemon"
-        const isLauncher = plugin.type === "launcher" || (plugin.capabilities && plugin.capabilities.includes("launcher"))
-        const map = isDaemon ? pluginDaemonComponents : isLauncher ? pluginLauncherComponents : pluginWidgetComponents
-
-        const prevInstance = pluginInstances[pluginId]
-        if (prevInstance) {
-            prevInstance.destroy()
-            const newInstances = Object.assign({}, pluginInstances)
-            delete newInstances[pluginId]
-            pluginInstances = newInstances
-        }
-
-        try {
-            const url = "file://" + plugin.componentPath
-            const comp = Qt.createComponent(url, Component.PreferSynchronous)
-            if (comp.status === Component.Error) {
-                console.error("PluginService: component error", pluginId, comp.errorString())
-                pluginLoadFailed(pluginId, comp.errorString())
-                return false
-            }
-
-            if (isDaemon) {
-                const instance = comp.createObject(root, { "pluginId": pluginId })
-                if (!instance) {
-                    console.error("PluginService: failed to instantiate daemon:", pluginId, comp.errorString())
-                    pluginLoadFailed(pluginId, comp.errorString())
-                    return false
-                }
-                const newInstances = Object.assign({}, pluginInstances)
-                newInstances[pluginId] = instance
-                pluginInstances = newInstances
-
-                const newDaemons = Object.assign({}, pluginDaemonComponents)
-                newDaemons[pluginId] = comp
-                pluginDaemonComponents = newDaemons
-            } else if (isLauncher) {
-                const newLaunchers = Object.assign({}, pluginLauncherComponents)
-                newLaunchers[pluginId] = comp
-                pluginLauncherComponents = newLaunchers
-            } else {
-                const newComponents = Object.assign({}, pluginWidgetComponents)
-                newComponents[pluginId] = comp
-                pluginWidgetComponents = newComponents
-            }
-
-            plugin.loaded = true
-            loadedPlugins[pluginId] = plugin
-
-            pluginLoaded(pluginId)
-            return true
-
-        } catch (e) {
-            console.error("PluginService: Error loading plugin:", pluginId, e.message)
-            pluginLoadFailed(pluginId, e.message)
-            return false
-        }
-    }
-
-    function unloadPlugin(pluginId) {
-        const plugin = loadedPlugins[pluginId]
-        if (!plugin) {
-            console.warn("PluginService: Plugin not loaded:", pluginId)
-            return false
-        }
-
-        try {
-            const isDaemon = plugin.type === "daemon"
-            const isLauncher = plugin.type === "launcher" || (plugin.capabilities && plugin.capabilities.includes("launcher"))
-
-            const instance = pluginInstances[pluginId]
-            if (instance) {
-                instance.destroy()
-                const newInstances = Object.assign({}, pluginInstances)
-                delete newInstances[pluginId]
-                pluginInstances = newInstances
-            }
-
-            if (isDaemon && pluginDaemonComponents[pluginId]) {
-                const newDaemons = Object.assign({}, pluginDaemonComponents)
-                delete newDaemons[pluginId]
-                pluginDaemonComponents = newDaemons
-            } else if (isLauncher && pluginLauncherComponents[pluginId]) {
-                const newLaunchers = Object.assign({}, pluginLauncherComponents)
-                delete newLaunchers[pluginId]
-                pluginLauncherComponents = newLaunchers
-            } else if (pluginWidgetComponents[pluginId]) {
-                const newComponents = Object.assign({}, pluginWidgetComponents)
-                delete newComponents[pluginId]
-                pluginWidgetComponents = newComponents
-            }
-
-            plugin.loaded = false
-            delete loadedPlugins[pluginId]
-
-            pluginUnloaded(pluginId)
-            return true
-
-        } catch (error) {
-            console.error("PluginService: Error unloading plugin:", pluginId, "Error:", error.message)
-            return false
-        }
-    }
-
-    function getWidgetComponents() {
-        return pluginWidgetComponents
-    }
-
-    function getDaemonComponents() {
-        return pluginDaemonComponents
-    }
-
-    function getAvailablePlugins() {
-        const result = []
-        for (const key in availablePlugins) {
-            result.push(availablePlugins[key])
-        }
-        return result
-    }
-
-    function getPluginVariants(pluginId) {
-        const plugin = availablePlugins[pluginId]
-        if (!plugin) {
-            return []
-        }
-        const variants = SettingsData.getPluginSetting(pluginId, "variants", [])
-        return variants
-    }
-
-    function getAllPluginVariants() {
-        const result = []
-        for (const pluginId in availablePlugins) {
-            const plugin = availablePlugins[pluginId]
-            if (plugin.type !== "widget") {
-                continue
-            }
-            const variants = getPluginVariants(pluginId)
-            if (variants.length === 0) {
-                result.push({
-                    pluginId: pluginId,
-                    variantId: null,
-                    fullId: pluginId,
-                    name: plugin.name,
-                    icon: plugin.icon || "extension",
-                    description: plugin.description || "Plugin widget",
-                    loaded: plugin.loaded
-                })
-            } else {
-                for (let i = 0; i < variants.length; i++) {
-                    const variant = variants[i]
-                    result.push({
-                        pluginId: pluginId,
-                        variantId: variant.id,
-                        fullId: pluginId + ":" + variant.id,
-                        name: plugin.name + " - " + variant.name,
-                        icon: variant.icon || plugin.icon || "extension",
-                        description: variant.description || plugin.description || "Plugin widget variant",
-                        loaded: plugin.loaded
-                    })
-                }
-            }
-        }
-        return result
-    }
-
-    function createPluginVariant(pluginId, variantName, variantConfig) {
-        const variants = getPluginVariants(pluginId)
-        const variantId = "variant_" + Date.now()
-        const newVariant = Object.assign({}, variantConfig, {
-            id: variantId,
-            name: variantName
-        })
-        variants.push(newVariant)
-        SettingsData.setPluginSetting(pluginId, "variants", variants)
-        pluginDataChanged(pluginId)
-        return variantId
-    }
-
-    function removePluginVariant(pluginId, variantId) {
-        const variants = getPluginVariants(pluginId)
-        const newVariants = variants.filter(function(v) { return v.id !== variantId })
-        SettingsData.setPluginSetting(pluginId, "variants", newVariants)
-
-        const fullId = pluginId + ":" + variantId
-        removeWidgetFromDankBar(fullId)
-
-        pluginDataChanged(pluginId)
-    }
-
-    function removeWidgetFromDankBar(widgetId) {
-        function filterWidget(widget) {
-            const id = typeof widget === "string" ? widget : widget.id
-            return id !== widgetId
-        }
-
-        const leftWidgets = SettingsData.dankBarLeftWidgets
-        const centerWidgets = SettingsData.dankBarCenterWidgets
-        const rightWidgets = SettingsData.dankBarRightWidgets
-
-        const newLeft = leftWidgets.filter(filterWidget)
-        const newCenter = centerWidgets.filter(filterWidget)
-        const newRight = rightWidgets.filter(filterWidget)
-
-        if (newLeft.length !== leftWidgets.length) {
-            SettingsData.setDankBarLeftWidgets(newLeft)
-        }
-        if (newCenter.length !== centerWidgets.length) {
-            SettingsData.setDankBarCenterWidgets(newCenter)
-        }
-        if (newRight.length !== rightWidgets.length) {
-            SettingsData.setDankBarRightWidgets(newRight)
-        }
-    }
-
-    function updatePluginVariant(pluginId, variantId, variantConfig) {
-        const variants = getPluginVariants(pluginId)
-        for (let i = 0; i < variants.length; i++) {
-            if (variants[i].id === variantId) {
-                variants[i] = Object.assign({}, variants[i], variantConfig)
-                break
-            }
-        }
-        SettingsData.setPluginSetting(pluginId, "variants", variants)
-        pluginDataChanged(pluginId)
-    }
-
-    function getPluginVariantData(pluginId, variantId) {
-        const variants = getPluginVariants(pluginId)
-        for (let i = 0; i < variants.length; i++) {
-            if (variants[i].id === variantId) {
-                return variants[i]
-            }
-        }
-        return null
-    }
-
-    function getLoadedPlugins() {
-        const result = []
-        for (const key in loadedPlugins) {
-            result.push(loadedPlugins[key])
-        }
-        return result
-    }
-
-    function isPluginLoaded(pluginId) {
-        return loadedPlugins[pluginId] !== undefined
-    }
-
-    function enablePlugin(pluginId) {
-        SettingsData.setPluginSetting(pluginId, "enabled", true)
-        return loadPlugin(pluginId)
-    }
-
-    function disablePlugin(pluginId) {
-        SettingsData.setPluginSetting(pluginId, "enabled", false)
-        return unloadPlugin(pluginId)
-    }
-
-    function reloadPlugin(pluginId) {
-        if (isPluginLoaded(pluginId)) {
-            unloadPlugin(pluginId)
-        }
-        return loadPlugin(pluginId)
-    }
-
-    function savePluginData(pluginId, key, value) {
-        SettingsData.setPluginSetting(pluginId, key, value)
-        pluginDataChanged(pluginId)
-        return true
-    }
-
-    function loadPluginData(pluginId, key, defaultValue) {
-        return SettingsData.getPluginSetting(pluginId, key, defaultValue)
-    }
-
-    function saveAllPluginSettings() {
-        SettingsData.savePluginSettings()
-    }
-
-    function scanPlugins() {
-        resyncDebounce.restart()
-    }
-
-    function createPluginDirectory() {
-        const mkdirProcess = Qt.createComponent("data:text/plain,import Quickshell.Io; Process { }")
-        if (mkdirProcess.status === Component.Ready) {
-            const process = mkdirProcess.createObject(root)
-            process.command = ["mkdir", "-p", pluginDirectory]
-            process.exited.connect(function(exitCode) {
-                if (exitCode !== 0) {
-                    console.error("PluginService: Failed to create plugin directory, exit code:", exitCode)
-                }
-                process.destroy()
-            })
-            process.running = true
-            return true
-        } else {
-            console.error("PluginService: Failed to create mkdir process")
-            return false
-        }
-    }
-
-    // Launcher plugin helper functions
-    function getLauncherPlugins() {
-        const launchers = {}
-        
-        // Check plugins that have launcher components
-        for (const pluginId in pluginLauncherComponents) {
-            const plugin = availablePlugins[pluginId]
-            if (plugin && plugin.loaded) {
-                launchers[pluginId] = plugin
-            }
-        }
-        return launchers
-    }
-
-    function getLauncherPlugin(pluginId) {
-        const plugin = availablePlugins[pluginId]
-        if (plugin && plugin.loaded && pluginLauncherComponents[pluginId]) {
-            return plugin
-        }
-        return null
-    }
-
-    function getPluginTrigger(pluginId) {
-        const plugin = getLauncherPlugin(pluginId)
-        if (plugin) {
-            const customTrigger = SettingsData.getPluginSetting(pluginId, "trigger", plugin.trigger || "!")
-            return customTrigger
-        }
-        return null
-    }
-
-    function getAllPluginTriggers() {
-        const triggers = {}
-        const launchers = getLauncherPlugins()
-
-        for (const pluginId in launchers) {
-            const trigger = getPluginTrigger(pluginId)
-            if (trigger && trigger.trim() !== "") {
-                triggers[trigger] = pluginId
-            }
-        }
-        return triggers
-    }
-
-    function getPluginsWithEmptyTrigger() {
-        const plugins = []
-        const launchers = getLauncherPlugins()
-
-        for (const pluginId in launchers) {
-            const trigger = getPluginTrigger(pluginId)
-            if (!trigger || trigger.trim() === "") {
-                plugins.push(pluginId)
-            }
-        }
-        return plugins
-    }
-
-    function getGlobalVar(pluginId, varName, defaultValue) {
-        if (globalVars[pluginId] && varName in globalVars[pluginId]) {
-            return globalVars[pluginId][varName]
-        }
-        return defaultValue
-    }
-
-    function setGlobalVar(pluginId, varName, value) {
-        const newGlobals = Object.assign({}, globalVars)
-        if (!newGlobals[pluginId]) {
-            newGlobals[pluginId] = {}
-        }
-        newGlobals[pluginId] = Object.assign({}, newGlobals[pluginId])
-        newGlobals[pluginId][varName] = value
-        globalVars = newGlobals
-        globalVarChanged(pluginId, varName)
-    }
-}

Services/PortalService.qml

@@ -1,293 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-
-Singleton {
-    id: root
-
-    property bool accountsServiceAvailable: false
-    property string systemProfileImage: ""
-    property string profileImage: ""
-    property bool settingsPortalAvailable: false
-    property int systemColorScheme: 0
-
-    property bool freedeskAvailable: false
-    property string colorSchemeCommand: ""
-
-    readonly property string socketPath: Quickshell.env("DMS_SOCKET")
-
-    function init() {}
-
-    function getSystemProfileImage() {
-        if (!freedeskAvailable) return
-
-        const username = Quickshell.env("USER")
-        if (!username) return
-
-        DMSService.sendRequest("freedesktop.accounts.getUserIconFile", { username: username }, response => {
-            if (response.result && response.result.success) {
-                const iconFile = response.result.value || ""
-                if (iconFile && iconFile !== "" && iconFile !== "/var/lib/AccountsService/icons/") {
-                    systemProfileImage = iconFile
-                    if (!profileImage || profileImage === "") {
-                        profileImage = iconFile
-                    }
-                }
-            }
-        })
-    }
-
-    function getUserProfileImage(username) {
-        if (!username) {
-            profileImage = ""
-            return
-        }
-        if (Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true") {
-            profileImage = ""
-            return
-        }
-
-        if (!freedeskAvailable) {
-            profileImage = ""
-            return
-        }
-
-        DMSService.sendRequest("freedesktop.accounts.getUserIconFile", { username: username }, response => {
-            if (response.result && response.result.success) {
-                const icon = response.result.value || ""
-                if (icon && icon !== "" && icon !== "/var/lib/AccountsService/icons/") {
-                    profileImage = icon
-                } else {
-                    profileImage = ""
-                }
-            } else {
-                profileImage = ""
-            }
-        })
-    }
-
-    function setProfileImage(imagePath) {
-        profileImage = imagePath
-        if (accountsServiceAvailable) {
-            if (imagePath) {
-                setSystemProfileImage(imagePath)
-            } else {
-                setSystemProfileImage("")
-            }
-        }
-    }
-
-    function getSystemColorScheme() {
-        if (typeof SettingsData !== "undefined" && SettingsData.syncModeWithPortal === false) {
-            return
-        }
-        if (!freedeskAvailable) return
-
-        DMSService.sendRequest("freedesktop.settings.getColorScheme", null, response => {
-            if (response.result) {
-                systemColorScheme = response.result.value || 0
-            }
-        })
-    }
-
-    function setLightMode(isLightMode) {
-        if (typeof SettingsData !== "undefined" && SettingsData.syncModeWithPortal === false) {
-            return
-        }
-        setSystemColorScheme(isLightMode)
-    }
-
-    function setSystemColorScheme(isLightMode) {
-        if (typeof SettingsData !== "undefined" && SettingsData.syncModeWithPortal === false) {
-            return
-        }
-
-        const targetScheme = isLightMode ? "default": "prefer-dark"
-
-        if (colorSchemeCommand === "gsettings") {
-            Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", targetScheme])
-        }
-        if (colorSchemeCommand === "dconf") {
-            Quickshell.execDetached(["dconf", "write", "/org/gnome/desktop/interface/color-scheme", `'${targetScheme}'`])
-        }
-    }
-
-    function setSystemIconTheme(themeName) {
-        if (!settingsPortalAvailable || !freedeskAvailable) return
-
-        DMSService.sendRequest("freedesktop.settings.setIconTheme", { iconTheme: themeName }, response => {
-            if (response.error) {
-                console.warn("PortalService: Failed to set icon theme:", response.error)
-            }
-        })
-    }
-
-    function setSystemProfileImage(imagePath) {
-        if (!accountsServiceAvailable || !freedeskAvailable) return
-
-        DMSService.sendRequest("freedesktop.accounts.setIconFile", { path: imagePath || "" }, response => {
-            if (response.error) {
-                console.warn("PortalService: Failed to set icon file:", response.error)
-            } else {
-                Qt.callLater(() => getSystemProfileImage())
-            }
-        })
-    }
-
-    Component.onCompleted: {
-        if (socketPath && socketPath.length > 0) {
-            checkDMSCapabilities()
-        } else {
-            console.log("PortalService: DMS_SOCKET not set")
-        }
-        colorSchemeDetector.running = true
-    }
-
-    Connections {
-        target: DMSService
-
-        function onConnectionStateChanged() {
-            if (DMSService.isConnected) {
-                checkDMSCapabilities()
-            }
-        }
-    }
-
-    Connections {
-        target: DMSService
-        enabled: DMSService.isConnected
-
-        function onCapabilitiesChanged() {
-            checkDMSCapabilities()
-        }
-    }
-
-    function checkDMSCapabilities() {
-        if (!DMSService.isConnected) {
-            return
-        }
-
-        if (DMSService.capabilities.length === 0) {
-            return
-        }
-
-        freedeskAvailable = DMSService.capabilities.includes("freedesktop")
-        if (freedeskAvailable) {
-            checkAccountsService()
-            checkSettingsPortal()
-        } else {
-            console.log("PortalService: freedesktop capability not available in DMS")
-        }
-    }
-
-    function checkAccountsService() {
-        if (!freedeskAvailable) return
-
-        DMSService.sendRequest("freedesktop.getState", null, response => {
-            if (response.result && response.result.accounts) {
-                accountsServiceAvailable = response.result.accounts.available || false
-                if (accountsServiceAvailable) {
-                    getSystemProfileImage()
-                }
-            }
-        })
-    }
-
-    function checkSettingsPortal() {
-        if (!freedeskAvailable) return
-
-        DMSService.sendRequest("freedesktop.getState", null, response => {
-            if (response.result && response.result.settings) {
-                settingsPortalAvailable = response.result.settings.available || false
-                if (settingsPortalAvailable && SettingsData.syncModeWithPortal) {
-                    getSystemColorScheme()
-                }
-            }
-        })
-    }
-
-    function getGreeterUserProfileImage(username) {
-        if (!username) {
-            profileImage = ""
-            return
-        }
-        userProfileCheckProcess.command = [
-            "bash", "-c",
-            `uid=$(id -u ${username} 2>/dev/null) && [ -n "$uid" ] && dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$uid org.freedesktop.DBus.Properties.Get string:org.freedesktop.Accounts.User string:IconFile 2>/dev/null | grep -oP 'string "\\K[^"]+' || echo ""`
-        ]
-        userProfileCheckProcess.running = true
-    }
-
-    Process {
-        id: userProfileCheckProcess
-        command: []
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const trimmed = text.trim()
-                if (trimmed && trimmed !== "" && !trimmed.includes("Error") && trimmed !== "/var/lib/AccountsService/icons/") {
-                    root.profileImage = trimmed
-                } else {
-                    root.profileImage = ""
-                }
-            }
-        }
-
-        onExited: exitCode => {
-            if (exitCode !== 0) {
-                root.profileImage = ""
-            }
-        }
-    }
-
-    Process {
-        id: colorSchemeDetector
-        command: ["bash", "-c", "command -v gsettings || command -v dconf"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const cmd = text.trim()
-                if (cmd.includes("gsettings")) {
-                    root.colorSchemeCommand = "gsettings"
-                } else if (cmd.includes("dconf")) {
-                    root.colorSchemeCommand = "dconf"
-                }
-            }
-        }
-    }
-
-    IpcHandler {
-        target: "profile"
-
-        function getImage(): string {
-            return root.profileImage
-        }
-
-        function setImage(path: string): string {
-            if (!path) {
-                return "ERROR: No path provided"
-            }
-
-            const absolutePath = path.startsWith("/") ? path : `${StandardPaths.writableLocation(StandardPaths.HomeLocation)}/${path}`
-
-            try {
-                root.setProfileImage(absolutePath)
-                return "SUCCESS: Profile image set to " + absolutePath
-            } catch (e) {
-                return "ERROR: Failed to set profile image: " + e.toString()
-            }
-        }
-
-        function clearImage(): string {
-            root.setProfileImage("")
-            return "SUCCESS: Profile image cleared"
-        }
-    }
-}