Surface color overhaul

2026-01-25 05:52:50 -05:00 · 2025-09-25 11:35:43 -04:00
500 changed files with 31707 additions and 99838 deletions
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-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
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,15 +0,0 @@
-# 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']
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,18 +24,8 @@ assignees: ""

 - [ ] niri
 - [ ] Hyprland
- [ ] dwl (MangoWC)
- [ ] sway
 - [ ] Other (specify)

-## Distribution
-
-<!-- Arch, Fedora, Debian, etc. -->
-
-## dms version
-
-<!-- Output of dms version command -->
-
 ## Description

 <!-- Brief description of the issue -->
@@ -55,14 +45,6 @@ assignees: ""
 ## Error Messages/Logs

 <!-- Please include any error messages, stack traces, or relevant logs -->
-<!-- you can get a log file with the following steps:
-dms kill
-mkdir ~/dms_logs
-nohup dms run > ~/dms_logs/dms-$(date +%s).txt 2>&1 &
-
-Then trigger your issue, and share the contents of ~/dms_logs/dms-<timestamp>.txt
-
-->

 ```
 Paste error messages or logs here
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -21,8 +21,6 @@ Is this feature specific to one compositor?
 - [ ] All compositors
 - [ ] niri
 - [ ] Hyprland
- [ ] dwl (MangoWC)
- [ ] sway

 ## Proposed Solution

--- a/.github/ISSUE_TEMPLATE/support_request.md
+++ b/.github/ISSUE_TEMPLATE/support_request.md
@@ -10,18 +10,8 @@ assignees: ""

 - [ ] niri
 - [ ] Hyprland
- [ ] dwl (MangoWC)
- [ ] sway
 - [ ] other

-## Distribution
-
-<!-- Arch, Fedora, Debian, etc. -->
-
-## dms version
-
-<!-- Output of dms version command -->
-
 ## Description

 <!-- Brief description of the support needed -->
--- a/.github/workflows/copr-release.yml
+++ b/.github/workflows/copr-release.yml
@@ -1,310 +0,0 @@
-name: DMS Copr Stable Release
-
-on:
-  workflow_run:
-    workflows: ["Create Release from DMS"]
-    types: [completed]
-    branches: [master]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Versioning (e.g., 0.1.14, leave empty for latest release)'
-        required: false
-        default: ''
-
-jobs:
-  build-and-upload:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      
-      - name: Determine version
-        id: version
-        run: |
-          if [ -n "${{ github.event.inputs.version }}" ]; then
-            VERSION="${{ github.event.inputs.version }}"
-            echo "Using manual version: $VERSION"
-          elif [ "${{ github.event_name }}" = "workflow_run" ]; then
-            VERSION=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r '.tag_name' | sed 's/^v//')
-            echo "Using latest release version from workflow_run: $VERSION"
-          else
-            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
-
-          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}
-          echo "✅ RPM build environment ready"
-      
-      - name: Download release assets
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          cd ~/rpmbuild/SOURCES
-          
-          echo "📦 Downloading DMS QML source for v${VERSION}..."
-          
-          # Download DMS QML source
-          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
-          }
-          
-          echo "✅ Source downloaded"
-          echo "Note: dms-cli and dgop binaries will be downloaded during build based on target architecture"
-          ls -lh
-      
-      - 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/danklinux
-
-          %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
-          # This ensures the correct architecture is used for each build target
-          case "%{_arch}" in
-            x86_64)
-              ARCH_SUFFIX="amd64"
-              ;;
-            aarch64)
-              ARCH_SUFFIX="arm64"
-              ;;
-            *)
-              echo "Unsupported architecture: %{_arch}"
-              exit 1
-              ;;
-          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" || {
-            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
-
-          # Download dgop for target architecture
-          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
-
-          # 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 || :
-
-          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 -f %{buildroot}%{_datadir}/quickshell/dms/*.spec
-
-          %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
-          %{_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
-          
-          echo "✅ Spec file generated for v${VERSION}"
-          echo ""
-          echo "=== Spec file preview ==="
-          head -40 ~/rpmbuild/SPECS/dms.spec
-      
-      - name: Build SRPM
-        id: build
-        run: |
-          cd ~/rpmbuild/SPECS
-          
-          echo "🔨 Building SRPM..."
-          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"
-          echo ""
-          echo "=== SRPM Info ==="
-          rpm -qpi "$SRPM"
-      
-      - 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
-          
-          echo "✅ Copr CLI configured"
-      
-      - name: Upload to Copr
-        run: |
-          SRPM="${{ steps.build.outputs.srpm_path }}"
-          VERSION="${{ steps.version.outputs.version }}"
-          
-          echo "🚀 Uploading SRPM to avengemedia/dms..."
-          echo "   SRPM: $(basename $SRPM)"
-          echo "   Version: $VERSION"
-          
-          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 successfully!"
-            echo "🔗 https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
-          else
-            echo "⚠️  Could not extract build ID, but upload may have succeeded"
-          fi
-      
-      - name: Build summary
-        if: always()
-        run: |
-          echo "### 🎉 DMS Stable Build Summary" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- **Version:** ${{ steps.version.outputs.version }}" >> $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
-          echo "Stable release has been built and uploaded to Copr!" >> $GITHUB_STEP_SUMMARY
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,229 +1,59 @@
-# Release from a dispatch event from the danklinux repo
-name: Create Release from DMS
-
+name: Create Release
 on:
-  repository_dispatch:
-    types: [dms_release]
-
-permissions:
-  contents: write
-  actions: write
+  push:
+    tags:
+      - 'v*'

 concurrency:
-  group: release-${{ github.event.client_payload.tag }}
+  group: release-${{ github.ref_name }}
  cancel-in-progress: true

 jobs:
-  create_release_from_dms:
+  create_release:
+    name: 📦 Create GitHub Release
    runs-on: ubuntu-24.04
-    env:
-      TAG: ${{ github.event.client_payload.tag }}
-      DMS_REPO: ${{ github.event.client_payload.dms_repo }}
    steps:
      - uses: actions/checkout@v4
        with:
-          fetch-depth: 0
-
-      - name: Ensure VERSION and tag
-        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)"
-          fi
-
-          git tag -f "${TAG}"
-
-          git push origin HEAD
-          git push -f origin "${TAG}"
+          fetch-depth: 0 # Fetch full history for changelog generation

+      # Generate changelog
      - name: Generate Changelog
        id: changelog
        run: |
-          set -e
-          PREVIOUS_TAG=$(git describe --tags --abbrev=0 "${TAG}^" 2>/dev/null || echo "")
+          # Get the previous tag
+          PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
+
          if [ -z "$PREVIOUS_TAG" ]; then
-            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /' | head -50)
+            echo "No previous tag found, using all commits"
+            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" | head -50)
          else
-            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" "${PREVIOUS_TAG}..${TAG}" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /')
+            echo "Generating changelog from $PREVIOUS_TAG to HEAD"
+            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" $PREVIOUS_TAG..HEAD)
          fi

-          cat > RELEASE_BODY.md << 'EOF'
-          ## Assets
-
-          ### Complete Packages
-          - **`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
-          - **`dms-qml.tar.gz`** - QML source code only
-
-          ### Checksums
-          - **`*.sha256`** - SHA256 checksums for verifying download integrity
-
-          **Installation:** Extract the `dms-full-*.tar.gz` package for your architecture and follow the `INSTALL.md` instructions inside.
-
-          ---
-
-          EOF
-
-          cat >> RELEASE_BODY.md << EOF
+          # Create the changelog with proper formatting
+          cat > CHANGELOG.md << EOF
          ## What's Changed

          $CHANGELOG

-          **Full Changelog**: https://github.com/${{ github.repository }}/compare/${PREVIOUS_TAG}...${TAG}
+          **Full Changelog**: https://github.com/${{ github.repository }}/compare/${PREVIOUS_TAG}...${{ github.ref_name }}
          EOF

+          # Set output for use in release step
          echo "changelog<<EOF" >> $GITHUB_OUTPUT
-          cat RELEASE_BODY.md >> $GITHUB_OUTPUT
+          cat CHANGELOG.md >> $GITHUB_OUTPUT
          echo "EOF" >> $GITHUB_OUTPUT

-      - name: Create/Update DankMaterialShell Release
-        uses: softprops/action-gh-release@v2
+      # Create GitHub Release
+      - name: Create GitHub Release
+        uses: comnoco/create-release-action@v2.0.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          tag_name: ${{ env.TAG }}
-          name: Release ${{ env.TAG }}
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
          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 }}
-        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
-            if [ -f "$file" ]; then
-              basename=$(basename "$file")
-              if [[ "$basename" == dms-distropkg-* ]]; then
-                cp "$file" "_release_assets/$basename"
-              else
-                newname=$(echo "$basename" | sed 's/^dms-/dms-cli-/')
-                cp "$file" "_release_assets/$newname"
-              fi
-            fi
-          done
-
-          # Create QML source package (exclude .git, .github, build artifacts)
-          tar --exclude='.git' \
-              --exclude='.github' \
-              --exclude='_dms_assets' \
-              --exclude='_release_assets' \
-              --exclude='*.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)
-
-          for arch in amd64 arm64; do
-            mkdir -p _temp_full/dms
-            mkdir -p _temp_full/bin
-            mkdir -p _temp_full/completions
-
-            tar -xzf _release_assets/dms-qml.tar.gz -C _temp_full/dms
-
-            if [ -f "_dms_assets/dms-${arch}.gz" ]; then
-              gunzip -c "_dms_assets/dms-${arch}.gz" > _temp_full/bin/dms
-              chmod +x _temp_full/bin/dms
-            fi
-
-            if [ -f "_dms_assets/dms-distropkg-${arch}.gz" ]; then
-              gunzip -c "_dms_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg
-              chmod +x _temp_full/bin/dms-distropkg
-            fi
-
-            for completion in _dms_assets/completion.*; do
-              if [ -f "$completion" ]; then
-                cp "$completion" _temp_full/completions/
-              fi
-            done
-            cat > _temp_full/INSTALL.md << 'EOF'
-          # DankMaterialShell Installation
-
-          ## Requirements
-
-          - Wayland compositor (niri or Hyprland recommended)
-          - Quickshell framework
-          - Qt6
-
-          ## Installation Steps
-
-          1. **Install quickshell assets:**
-             ```bash
-             mkdir -p ~/.config/quickshell
-             cp -r dms ~/.config/quickshell/
-             ```
-
-          2. **Install the DMS CLI binaries:**
-             ```bash
-             sudo install -m 755 bin/dms /usr/local/bin/dms
-             ```
-
-          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
-             ```
-
-          ## Configuration
-
-          - Settings are stored in `~/.config/DankMaterialShell/settings.json`
-          - Plugins go in `~/.config/DankMaterialShell/plugins/`
-          - See the documentation in the `dms/` directory for more details
-
-          ## Troubleshooting
-
-          - Run with verbose output: `quickshell -v -p ~/.config/quickshell/dms`
-          - Check logs in `~/.local/state/DankMaterialShell/`
-          - Ensure all dependencies are installed
-          EOF
-
-            # Create the full package
-            (cd _temp_full && tar -czf "../_release_assets/dms-full-${arch}.tar.gz" .)
-
-            # Generate checksum
-            (cd _release_assets && sha256sum "dms-full-${arch}.tar.gz" > "dms-full-${arch}.tar.gz.sha256")
-
-            # Cleanup
-            rm -rf _temp_full
-          done
-
-      - name: Attach all assets to release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ env.TAG }}
-          files: _release_assets/**
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+          prerelease: ${{ contains(github.ref_name, '-') }}
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -63,9 +63,6 @@ quickshell -p shell.qml
 # Or use the shorthand
 qs -p .

-# Run with verbose output for debugging
-qs -v -p shell.qml
-
 # Code formatting and linting
 qmlfmt -t 4 -i 4 -b 250 -w /path/to/file.qml    # Format a QML file (requires qmlfmt, do not use qmlformat)
 qmllint **/*.qml         # Lint all QML files for syntax errors
@@ -92,7 +89,6 @@ shell.qml           # Main entry point (minimal orchestration)
 │   ├── DisplayService.qml
 │   ├── NotificationService.qml
 │   ├── WeatherService.qml
-│   ├── PluginService.qml
 │   └── [14 more services]
 ├── Modules/        # UI components (93 files)
 │   ├── TopBar/     # Panel components (13 files)
@@ -108,21 +104,15 @@ shell.qml           # Main entry point (minimal orchestration)
 │   ├── SettingsModal.qml
 │   ├── ClipboardHistoryModal.qml
 │   ├── ProcessListModal.qml
-│   ├── PluginSettingsModal.qml
 │   └── [7 more modals]
-├── Widgets/        # Reusable UI controls (19 files)
-│   ├── DankIcon.qml
-│   ├── DankSlider.qml
-│   ├── DankToggle.qml
-│   ├── DankTabBar.qml
-│   ├── DankGridView.qml
-│   ├── DankListView.qml
-│   └── [13 more widgets]
-└── plugins/        # External plugins directory ($CONFIGPATH/DankMaterialShell/plugins/)
-    └── PluginName/ # Example Plugin structure
-        ├── plugin.json            # Plugin manifest
-        ├── PluginNameWidget.qml   # Widget component
-        └── PluginNameSettings.qml # Settings UI
+└── Widgets/        # Reusable UI controls (19 files)
+    ├── DankIcon.qml
+    ├── DankSlider.qml
+    ├── DankToggle.qml
+    ├── DankTabBar.qml
+    ├── DankGridView.qml
+    ├── DankListView.qml
+    └── [13 more widgets]
 ```

 ### Component Organization
@@ -173,12 +163,6 @@ shell.qml           # Main entry point (minimal orchestration)
   - **DankLocationSearch**: Location picker with search
   - **SystemLogo**: Animated system branding component

-7. **Plugins/** - External plugin system (`$CONFIGPATH/DankMaterialShell/plugins/`)
-   - **PluginService**: Discovers, loads, and manages plugin lifecycle
-   - **Dynamic Loading**: Plugins loaded at runtime from external directory
-   - **DankBar Integration**: Plugin widgets rendered alongside built-in widgets
-   - **Settings System**: Per-plugin settings with persistence
-
 ### Key Architectural Patterns

 1. **Singleton Services Pattern**:
@@ -191,9 +175,9 @@ shell.qml           # Main entry point (minimal orchestration)

   Singleton {
       id: root
-
+       
       property type value: defaultValue
-
+       
       function performAction() { /* implementation */ }
   }
   ```
@@ -251,23 +235,23 @@ shell.qml           # Main entry point (minimal orchestration)
   // For regular components
   Item {
       id: root
-
+       
       property type name: value
-
+       
       signal customSignal(type param)
-
+       
       onSignal: { /* handler */ }
-
+       
       Component { /* children */ }
   }
-
+   
   // For services (singletons)
   Singleton {
       id: root
-
+       
       property bool featureAvailable: false
       property type currentValue: defaultValue
-
+       
       function performAction(param) { /* implementation */ }
   }
   ```
@@ -305,7 +289,7 @@ shell.qml           # Main entry point (minimal orchestration)
   ```qml
   // In services - detect capabilities
   property bool brightnessAvailable: false
-
+   
   // In modules - adapt UI accordingly
   DankSlider {
       visible: DisplayService.brightnessAvailable
@@ -335,7 +319,7 @@ shell.qml           # Main entry point (minimal orchestration)
   console.log("Info message")           // General info
   console.warn("Warning message")       // Warnings
   console.error("Error message")        // Errors
-
+   
   // Include context in service operations
   onExited: (exitCode) => {
       if (exitCode !== 0) {
@@ -424,10 +408,10 @@ When modifying the shell:

   Singleton {
       id: root
-
+       
       property bool featureAvailable: false
       property type currentValue: defaultValue
-
+       
       function performAction(param) {
           // Implementation
       }
@@ -438,7 +422,7 @@ When modifying the shell:
   ```qml
   // In module files
   property alias serviceValue: NewService.currentValue
-
+   
   SomeControl {
       visible: NewService.featureAvailable
       enabled: NewService.featureAvailable
@@ -446,200 +430,6 @@ When modifying the shell:
   }
   ```

-### Creating Plugins
-
-Plugins are external, dynamically-loaded components that extend DankMaterialShell functionality. Plugins are stored in `~/.config/DankMaterialShell/plugins/` and have their settings isolated from core DMS settings.
-
-**Plugin Types:**
- **Widget plugins** (`"type": "widget"` or omit type field): Display UI components in DankBar
- **Daemon plugins** (`"type": "daemon"`): Run invisibly in the background without UI
-
-#### Widget Plugins
-
-1. **Create plugin directory**:
-   ```bash
-   mkdir -p ~/.config/DankMaterialShell/plugins/YourPlugin
-   ```
-
-2. **Create manifest** (`plugin.json`):
-   ```json
-   {
-       "id": "yourPlugin",
-       "name": "Your Plugin",
-       "description": "Widget description",
-       "version": "1.0.0",
-       "author": "Your Name",
-       "icon": "extension",
-       "type": "widget",
-       "component": "./YourWidget.qml",
-       "settings": "./YourSettings.qml",
-       "permissions": ["settings_read", "settings_write"]
-   }
-   ```
-
-3. **Create widget component** (`YourWidget.qml`):
-   ```qml
-   import QtQuick
-   import qs.Services
-
-   Rectangle {
-       id: root
-
-       property bool compactMode: false
-       property string section: "center"
-       property real widgetHeight: 30
-       property var pluginService: null
-
-       width: content.implicitWidth + 16
-       height: widgetHeight
-       radius: 8
-       color: "#20FFFFFF"
-
-       Component.onCompleted: {
-           if (pluginService) {
-               var data = pluginService.loadPluginData("yourPlugin", "key", defaultValue)
-           }
-       }
-   }
-   ```
-
-4. **Create settings component** (`YourSettings.qml`):
-   ```qml
-   import QtQuick
-   import QtQuick.Controls
-
-   FocusScope {
-       id: root
-
-       property var pluginService: null
-
-       implicitHeight: settingsColumn.implicitHeight
-       height: implicitHeight
-
-       Column {
-           id: settingsColumn
-           anchors.fill: parent
-           anchors.margins: 16
-           spacing: 12
-
-           Text {
-               text: "Your Plugin Settings"
-               font.pixelSize: 18
-               font.weight: Font.Bold
-           }
-
-           // Your settings UI here
-       }
-
-       function saveSettings(key, value) {
-           if (pluginService) {
-               pluginService.savePluginData("yourPlugin", key, value)
-           }
-       }
-
-       function loadSettings(key, defaultValue) {
-           if (pluginService) {
-               return pluginService.loadPluginData("yourPlugin", key, defaultValue)
-           }
-           return defaultValue
-       }
-   }
-   ```
-
-5. **Enable plugin**:
-   - Open Settings → Plugins
-   - Click "Scan for Plugins"
-   - Toggle plugin to enable
-   - Add plugin ID to DankBar widget list
-
-#### Daemon Plugins
-
-Daemon plugins run invisibly in the background without any UI components. They're useful for monitoring system events, background tasks, or data synchronization.
-
-1. **Create plugin directory**:
-   ```bash
-   mkdir -p ~/.config/DankMaterialShell/plugins/YourDaemon
-   ```
-
-2. **Create manifest** (`plugin.json`):
-   ```json
-   {
-       "id": "yourDaemon",
-       "name": "Your Daemon",
-       "description": "Background daemon description",
-       "version": "1.0.0",
-       "author": "Your Name",
-       "icon": "settings_applications",
-       "type": "daemon",
-       "component": "./YourDaemon.qml",
-       "permissions": ["settings_read", "settings_write"]
-   }
-   ```
-
-3. **Create daemon component** (`YourDaemon.qml`):
-   ```qml
-   import QtQuick
-   import qs.Common
-   import qs.Services
-
-   Item {
-       id: root
-
-       property var pluginService: null
-
-       Connections {
-           target: SessionData
-           function onWallpaperPathChanged() {
-               console.log("Wallpaper changed:", SessionData.wallpaperPath)
-               if (pluginService) {
-                   pluginService.savePluginData("yourDaemon", "lastEvent", Date.now())
-               }
-           }
-       }
-
-       Component.onCompleted: {
-           console.log("Daemon started")
-       }
-   }
-   ```
-
-4. **Enable daemon**:
-   - Open Settings → Plugins
-   - Click "Scan for Plugins"
-   - Toggle daemon to enable
-   - Daemon runs automatically in background
-
-**Example**: See `PLUGINS/WallpaperWatcherDaemon/` for a complete daemon plugin that monitors wallpaper changes
-
-**Plugin Directory Structure:**
-```
-~/.config/DankMaterialShell/
-├── settings.json                    # Core DMS settings + plugin settings
-│   └── pluginSettings: {
-│       └── yourPlugin: {
-│           ├── enabled: true,
-│           └── customData: {...}
-│       }
-│   }
-└── plugins/                         # Plugin files directory
-    └── YourPlugin/                  # Plugin directory (matches manifest ID)
-        ├── plugin.json              # Plugin manifest
-        ├── YourWidget.qml           # Widget component
-        └── YourSettings.qml         # Settings UI (optional)
-```
-
-**Key Plugin APIs:**
- `pluginService.loadPluginData(pluginId, key, default)` - Load persistent data
- `pluginService.savePluginData(pluginId, key, value)` - Save persistent data
- `PluginService.enablePlugin(pluginId)` - Load plugin
- `PluginService.disablePlugin(pluginId)` - Unload plugin
-
-**Important Notes:**
- Plugin settings are automatically injected by the PluginService via `item.pluginService = PluginService`
- Settings are stored in the main settings.json but namespaced under `pluginSettings.{pluginId}`
- Plugin directories must match the plugin ID in the manifest
- Use the injected `pluginService` property in both widget and settings components
-
 ### Debugging Common Issues

 1. **Import errors**: Check import paths
@@ -664,7 +454,6 @@ Daemon plugins run invisibly in the background without any UI components. They'r
 - **Function Discovery**: Use grep/search tools to find existing utility functions before implementing new ones
 - **Modern QML Patterns**: Leverage new widgets like DankTextField, DankDropdown, CachingImage
 - **Structured Organization**: Follow the established Services/Modules/Widgets/Modals separation
- **Plugin System**: For user extensions, create plugins instead of modifying core modules - see docs/PLUGINS.md

 ### Common Widget Patterns

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing

-Contributions are welcome and encouraged.
+Contributions are welcome and encourages.

 ## Formatting

@@ -27,4 +27,4 @@ Sometimes it just breaks code though. Like turning `"_\""` into `"_""`, so you m

 ## Pull request

-Include screenshots/video if applicable in your pull request if applicable, to visualize what your change is affecting.
+Include screenshots/video if applicable in your pull request if applicable, to visualize what your change is affecting.
--- a/Common/AppUsageHistoryData.qml
+++ b/Common/AppUsageHistoryData.qml
@@ -72,6 +72,10 @@ Singleton {
        saveSettings()
    }

+    function getAppUsageRanking() {
+        return appUsageRanking
+    }
+
    function getRankedApps() {
        var apps = []
        for (var appId in appUsageRanking) {
--- a/Common/CacheData.qml
+++ b/Common/CacheData.qml
@@ -1,206 +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: ""
-
-    property var fileBrowserSettings: ({
-        "wallpaper": {
-            "lastPath": "",
-            "viewMode": "grid",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "profile": {
-            "lastPath": "",
-            "viewMode": "grid",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "notepad_save": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "notepad_load": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "generic": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        },
-        "default": {
-            "lastPath": "",
-            "viewMode": "list",
-            "sortBy": "name",
-            "sortAscending": true,
-            "iconSizeIndex": 1,
-            "showSidebar": true
-        }
-    })
-
-    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.fileBrowserSettings !== undefined) {
-                    fileBrowserSettings = cache.fileBrowserSettings
-                } else if (cache.fileBrowserViewMode !== undefined) {
-                    fileBrowserSettings = {
-                        "wallpaper": {
-                            "lastPath": cache.wallpaperLastPath || "",
-                            "viewMode": cache.fileBrowserViewMode || "grid",
-                            "sortBy": cache.fileBrowserSortBy || "name",
-                            "sortAscending": cache.fileBrowserSortAscending !== undefined ? cache.fileBrowserSortAscending : true,
-                            "iconSizeIndex": cache.fileBrowserIconSizeIndex !== undefined ? cache.fileBrowserIconSizeIndex : 1,
-                            "showSidebar": cache.fileBrowserShowSidebar !== undefined ? cache.fileBrowserShowSidebar : true
-                        },
-                        "profile": {
-                            "lastPath": cache.profileLastPath || "",
-                            "viewMode": cache.fileBrowserViewMode || "grid",
-                            "sortBy": cache.fileBrowserSortBy || "name",
-                            "sortAscending": cache.fileBrowserSortAscending !== undefined ? cache.fileBrowserSortAscending : true,
-                            "iconSizeIndex": cache.fileBrowserIconSizeIndex !== undefined ? cache.fileBrowserIconSizeIndex : 1,
-                            "showSidebar": cache.fileBrowserShowSidebar !== undefined ? cache.fileBrowserShowSidebar : true
-                        },
-                        "file": {
-                            "lastPath": "",
-                            "viewMode": "list",
-                            "sortBy": "name",
-                            "sortAscending": true,
-                            "iconSizeIndex": 1,
-                            "showSidebar": true
-                        }
-                    }
-                }
-
-                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,
-                                             "fileBrowserSettings": fileBrowserSettings,
-                                             "configVersion": cacheConfigVersion
-                                         }, null, 2))
-    }
-
-    function migrateFromUndefinedToV1(cache) {
-        console.info("CacheData: Migrating configuration from undefined to version 1")
-    }
-
-    function cleanupUnusedKeys() {
-        const validKeys = [
-            "wallpaperLastPath",
-            "profileLastPath",
-            "fileBrowserSettings",
-            "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.info("CacheData: No cache file found, starting fresh")
-            }
-        }
-    }
-}
--- a/Common/DankSocket.qml
+++ b/Common/DankSocket.qml
@@ -1,62 +0,0 @@
-import QtQuick
-import Quickshell.Io
-
-Item {
-    id: root
-
-    property alias path: socket.path
-    property alias parser: socket.parser
-    property bool connected: false
-
-    property int reconnectBaseMs: 400
-    property int reconnectMaxMs: 15000
-
-    property int _reconnectAttempt: 0
-
-    signal connectionStateChanged()
-
-    onConnectedChanged: {
-        socket.connected = connected
-    }
-
-    Socket {
-        id: socket
-
-        onConnectionStateChanged: {
-            root.connectionStateChanged()
-            if (connected) {
-                root._reconnectAttempt = 0
-                return
-            }
-            if (root.connected) {
-                root._scheduleReconnect()
-            }
-        }
-    }
-
-    Timer {
-        id: reconnectTimer
-        interval: 0
-        repeat: false
-        onTriggered: {
-            socket.connected = false
-            Qt.callLater(() => socket.connected = true)
-        }
-    }
-
-    function send(data) {
-        const json = typeof data === "string" ? data : JSON.stringify(data)
-        const message = json.endsWith("\n") ? json : json + "\n"
-        socket.write(message)
-        socket.flush()
-    }
-
-    function _scheduleReconnect() {
-        const pow = Math.min(_reconnectAttempt, 10)
-        const base = Math.min(reconnectBaseMs * Math.pow(2, pow), reconnectMaxMs)
-        const jitter = Math.floor(Math.random() * Math.floor(base / 4))
-        reconnectTimer.interval = base + jitter
-        reconnectTimer.restart()
-        _reconnectAttempt++
-    }
-}
--- a/Common/Facts.qml
+++ b/Common/Facts.qml
@@ -1,53 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-
-Singleton {
-    id: root
-
-    readonly property var facts: [
-        "A photon takes 100,000 to 200,000 years bouncing through the Sun's dense core, then races to Earth in just 8 minutes 20 seconds.",
-        "A teaspoon of neutron star matter would weigh a billion metric tons here on Earth.",
-        "Right now, 100 trillion solar neutrinos are passing through your body every second.",
-        "The Sun converts 4 million metric tons of matter into pure energy every second—enough to power Earth for 500,000 years.",
-        "The universe still glows with leftover heat from the Big Bang—just 2.7 degrees above absolute zero.",
-        "There's a nebula out there that's actually colder than empty space itself.",
-        "We've detected black holes crashing together by measuring spacetime stretch by less than 1/10,000th the width of a proton.",
-        "Fast radio bursts can release more energy in 5 milliseconds than our Sun produces in 3 days.",
-        "Our galaxy might be crawling with billions of rogue planets drifting alone in the dark.",
-        "Distant galaxies can move away from us faster than light because space itself is stretching.",
-        "The edge of what we can see is 46.5 billion light-years away, even though the universe is only 13.8 billion years old.",
-        "The universe is mostly invisible: 5% regular matter, 27% dark matter, 68% dark energy.",
-        "A day on Venus lasts longer than its entire year around the Sun.",
-        "On Mercury, the time between sunrises is 176 Earth days long.",
-        "In about 4.5 billion years, our galaxy will smash into Andromeda.",
-        "Most of the gold in your jewelry was forged when neutron stars collided somewhere in space.",
-        "PSR J1748-2446ad, the fastest spinning star, rotates 716 times per second—its equator moves at 24% the speed of light.",
-        "Cosmic rays create particles that shouldn't make it to Earth's surface, but time dilation lets them sneak through.",
-        "Jupiter's magnetic field is so huge that if we could see it, it would look bigger than the Moon in our sky.",
-        "Interstellar space is so empty it's like a cube 32 kilometers wide containing just a single grain of sand.",
-        "Voyager 1 is 24 billion kilometers away but won't leave the Sun's gravitational influence for another 30,000 years.",
-        "Counting to a billion at one number per second would take over 31 years.",
-        "Space is so vast, even speeding at light-speed, you'd never return past the cosmic horizon.",
-        "Astronauts on the ISS age about 0.01 seconds less each year than people on Earth.",
-        "Sagittarius B2, a dust cloud near our galaxy's center, contains ethyl formate—the compound that gives raspberries their flavor and rum its smell.",
-        "Beyond 16 billion light-years, the cosmic event horizon marks where space expands too fast for light to ever reach us again.",
-        "Even at light-speed, you'd never catch up to most galaxies—space expands faster.",
-        "Only around 5% of galaxies are ever reachable—even at light-speed.",
-        "If the Sun vanished, we'd still orbit it for 8 minutes before drifting away.",
-        "If a planet 65 million light-years away looked at Earth now, it'd see dinosaurs.",
-        "Our oldest radio signals will reach the Milky Way's center in 26,000 years.",
-        "Every atom in your body heavier than hydrogen was forged in the nuclear furnace of a dying star.",
-        "The Moon moves 3.8 centimeters farther from Earth every year.",
-        "The universe creates 275 million new stars every single day.",
-        "Jupiter's Great Red Spot is a storm twice the size of Earth that has been raging for at least 350 years.",
-        "If you watched someone fall into a black hole, they'd appear frozen at the event horizon forever—time effectively stops from your perspective.",
-        "The Boötes Supervoid is a cosmic desert 1.8 billion light-years across with 60% fewer galaxies than it should have."
-    ]
-
-    function getRandomFact() {
-        return facts[Math.floor(Math.random() * facts.length)]
-    }
-}
--- a/Common/I18n.qml
+++ b/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.info(`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.info(`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
-    }
-}
--- a/Common/Paths.qml
+++ b/Common/Paths.qml
@@ -38,10 +38,6 @@ Singleton {
        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)])
    }
@@ -53,7 +49,7 @@ Singleton {
    // ! 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"
+            return "spotify-launcher"
        if (appId === "beepertexts")
            return "beeper"
        if (appId === "home assistant desktop")
--- a/Common/Proc.qml
+++ b/Common/Proc.qml
@@ -1,110 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    property int defaultDebounceMs: 50
-    property int defaultTimeoutMs: 10000
-    property var _procDebouncers: ({})
-
-    function runCommand(id, command, callback, debounceMs, timeoutMs) {
-        const wait = (typeof debounceMs === "number" && debounceMs >= 0) ? debounceMs : defaultDebounceMs
-        const timeout = (typeof timeoutMs === "number" && timeoutMs > 0) ? timeoutMs : defaultTimeoutMs
-        let procId = id ? id : Math.random()
-        const isRandomId = !id
-
-        if (!_procDebouncers[procId]) {
-            const t = Qt.createQmlObject('import QtQuick; Timer { repeat: false }', root)
-            t.triggered.connect(function() { _launchProc(procId, isRandomId) })
-            _procDebouncers[procId] = { timer: t, command: command, callback: callback, waitMs: wait, timeoutMs: timeout, isRandomId: isRandomId }
-        } else {
-            _procDebouncers[procId].command = command
-            _procDebouncers[procId].callback = callback
-            _procDebouncers[procId].waitMs = wait
-            _procDebouncers[procId].timeoutMs = timeout
-        }
-
-        const entry = _procDebouncers[procId]
-        entry.timer.interval = entry.waitMs
-        entry.timer.restart()
-    }
-
-    function _launchProc(id, isRandomId) {
-        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)
-        const timeoutTimer = Qt.createQmlObject('import QtQuick; Timer { repeat: false }', root)
-
-        proc.stdout = out
-        proc.stderr = err
-        proc.command = entry.command
-
-        let capturedOut = ""
-        let capturedErr = ""
-        let exitSeen = false
-        let exitCodeValue = -1
-        let outSeen = false
-        let errSeen = false
-        let timedOut = false
-
-        timeoutTimer.interval = entry.timeoutMs
-        timeoutTimer.triggered.connect(function() {
-            if (!exitSeen) {
-                timedOut = true
-                proc.running = false
-                exitSeen = true
-                exitCodeValue = 124
-                maybeComplete()
-            }
-        })
-
-        out.streamFinished.connect(function() {
-            capturedOut = out.text || ""
-            outSeen = true
-            maybeComplete()
-        })
-
-        err.streamFinished.connect(function() {
-            capturedErr = err.text || ""
-            errSeen = true
-            maybeComplete()
-        })
-
-        proc.exited.connect(function(code) {
-            timeoutTimer.stop()
-            exitSeen = true
-            exitCodeValue = code
-            maybeComplete()
-        })
-
-        function maybeComplete() {
-            if (!exitSeen || !outSeen || !errSeen) return
-            timeoutTimer.stop()
-            if (typeof entry.callback === "function") {
-                try { entry.callback(capturedOut, exitCodeValue) } catch (e) { console.warn("runCommand callback error:", e) }
-            }
-            try { proc.destroy() } catch (_) {}
-            try { timeoutTimer.destroy() } catch (_) {}
-
-            if (isRandomId || entry.isRandomId) {
-                Qt.callLater(function() {
-                    if (_procDebouncers[id]) {
-                        try { _procDebouncers[id].timer.destroy() } catch (_) {}
-                        delete _procDebouncers[id]
-                    }
-                })
-            }
-        }
-
-        proc.running = true
-        timeoutTimer.start()
-    }
-}
--- a/Common/SessionData.qml
+++ b/Common/SessionData.qml
--- a/Common/SettingsData.qml
+++ b/Common/SettingsData.qml
--- a/Common/StockThemes.js
+++ b/Common/StockThemes.js
@@ -2,101 +2,101 @@
 // Separated from Theme.qml to keep that file clean

 const CatppuccinMocha = {
-    surface: "#313244",
+    surface: "#45475a",
    surfaceText: "#cdd6f4",
-    surfaceVariant: "#313244",
+    surfaceVariant: "#45475a",
    surfaceVariantText: "#a6adc8",
    background: "#1e1e2e",
    backgroundText: "#cdd6f4",
    outline: "#6c7086",
-    surfaceContainer: "#45475a",
+    surfaceContainer: "#313244",
    surfaceContainerHigh: "#585b70",
-    surfaceContainerHighest: "#6c7086"
+    surfaceContainerHighest: "#7f849c"
 }

 const CatppuccinLatte = {
-    surface: "#e6e9ef",
+    surface: "#bcc0cc",
    surfaceText: "#4c4f69",
-    surfaceVariant: "#e6e9ef",
+    surfaceVariant: "#bcc0cc",
    surfaceVariantText: "#6c6f85",
    background: "#eff1f5",
    backgroundText: "#4c4f69",
    outline: "#9ca0b0",
-    surfaceContainer: "#dce0e8",
-    surfaceContainerHigh: "#ccd0da",
-    surfaceContainerHighest: "#bcc0cc"
+    surfaceContainer: "#ccd0da",
+    surfaceContainerHigh: "#acb0be",
+    surfaceContainerHighest: "#8c8fa1"
 }

 const CatppuccinVariants = {
    "cat-rosewater": {
        name: "Rosewater",
-        dark: { primary: "#f5e0dc", secondary: "#f2cdcd", primaryText: "#1e1e2e", primaryContainer: "#7d5d56", surfaceTint: "#f5e0dc" },
-        light: { primary: "#dc8a78", secondary: "#dd7878", primaryText: "#ffffff", primaryContainer: "#f6e7e3", surfaceTint: "#dc8a78" }
+        dark: { primary: "#f5e0dc", secondary: "#f2cdcd", primaryText: "#1e1e2e", primaryContainer: "#8b6b5e", surfaceTint: "#f5e0dc" },
+        light: { primary: "#dc8a78", secondary: "#dd7878", primaryText: "#ffffff", primaryContainer: "#f4d2ca", surfaceTint: "#dc8a78" }
    },
    "cat-flamingo": {
        name: "Flamingo",
-        dark: { primary: "#f2cdcd", secondary: "#f5e0dc", primaryText: "#1e1e2e", primaryContainer: "#7a555a", surfaceTint: "#f2cdcd" },
-        light: { primary: "#dd7878", secondary: "#dc8a78", primaryText: "#ffffff", primaryContainer: "#f6e5e5", surfaceTint: "#dd7878" }
+        dark: { primary: "#f2cdcd", secondary: "#f5e0dc", primaryText: "#1e1e2e", primaryContainer: "#885d62", surfaceTint: "#f2cdcd" },
+        light: { primary: "#dd7878", secondary: "#dc8a78", primaryText: "#ffffff", primaryContainer: "#f4caca", surfaceTint: "#dd7878" }
    },
    "cat-pink": {
        name: "Pink",
-        dark: { primary: "#f5c2e7", secondary: "#cba6f7", primaryText: "#1e1e2e", primaryContainer: "#7a3f69", surfaceTint: "#f5c2e7" },
-        light: { primary: "#ea76cb", secondary: "#8839ef", primaryText: "#ffffff", primaryContainer: "#f7d7ee", surfaceTint: "#ea76cb" }
+        dark: { primary: "#f5c2e7", secondary: "#cba6f7", primaryText: "#1e1e2e", primaryContainer: "#8b537a", surfaceTint: "#f5c2e7" },
+        light: { primary: "#ea76cb", secondary: "#8839ef", primaryText: "#ffffff", primaryContainer: "#f7c9e7", surfaceTint: "#ea76cb" }
    },
    "cat-mauve": {
        name: "Mauve",
-        dark: { primary: "#cba6f7", secondary: "#b4befe", primaryText: "#1e1e2e", primaryContainer: "#55307f", surfaceTint: "#cba6f7" },
-        light: { primary: "#8839ef", secondary: "#7287fd", primaryText: "#ffffff", primaryContainer: "#eadcff", surfaceTint: "#8839ef" }
+        dark: { primary: "#cba6f7", secondary: "#b4befe", primaryText: "#1e1e2e", primaryContainer: "#61378a", surfaceTint: "#cba6f7" },
+        light: { primary: "#8839ef", secondary: "#7287fd", primaryText: "#ffffff", primaryContainer: "#e4d3ff", surfaceTint: "#8839ef" }
    },
    "cat-red": {
        name: "Red",
-        dark: { primary: "#f38ba8", secondary: "#eba0ac", primaryText: "#1e1e2e", primaryContainer: "#6f2438", surfaceTint: "#f38ba8" },
-        light: { primary: "#d20f39", secondary: "#e64553", primaryText: "#ffffff", primaryContainer: "#f6d0d6", surfaceTint: "#d20f39" }
+        dark: { primary: "#f38ba8", secondary: "#eba0ac", primaryText: "#1e1e2e", primaryContainer: "#891c3b", surfaceTint: "#f38ba8" },
+        light: { primary: "#d20f39", secondary: "#e64553", primaryText: "#ffffff", primaryContainer: "#f1b8c4", surfaceTint: "#d20f39" }
    },
    "cat-maroon": {
        name: "Maroon",
-        dark: { primary: "#eba0ac", secondary: "#f38ba8", primaryText: "#1e1e2e", primaryContainer: "#6d3641", surfaceTint: "#eba0ac" },
-        light: { primary: "#e64553", secondary: "#d20f39", primaryText: "#ffffff", primaryContainer: "#f7d8dc", surfaceTint: "#e64553" }
+        dark: { primary: "#eba0ac", secondary: "#f38ba8", primaryText: "#1e1e2e", primaryContainer: "#81313f", surfaceTint: "#eba0ac" },
+        light: { primary: "#e64553", secondary: "#d20f39", primaryText: "#ffffff", primaryContainer: "#f4c3c8", surfaceTint: "#e64553" }
    },
    "cat-peach": {
        name: "Peach",
-        dark: { primary: "#fab387", secondary: "#f9e2af", primaryText: "#1e1e2e", primaryContainer: "#734226", surfaceTint: "#fab387" },
-        light: { primary: "#fe640b", secondary: "#df8e1d", primaryText: "#ffffff", primaryContainer: "#ffe4d5", surfaceTint: "#fe640b" }
+        dark: { primary: "#fab387", secondary: "#f9e2af", primaryText: "#1e1e2e", primaryContainer: "#90441a", surfaceTint: "#fab387" },
+        light: { primary: "#fe640b", secondary: "#df8e1d", primaryText: "#ffffff", primaryContainer: "#ffddcc", surfaceTint: "#fe640b" }
    },
    "cat-yellow": {
        name: "Yellow",
-        dark: { primary: "#f9e2af", secondary: "#a6e3a1", primaryText: "#1e1e2e", primaryContainer: "#6e5a2f", surfaceTint: "#f9e2af" },
-        light: { primary: "#df8e1d", secondary: "#40a02b", primaryText: "#ffffff", primaryContainer: "#fff6d6", surfaceTint: "#df8e1d" }
+        dark: { primary: "#f9e2af", secondary: "#a6e3a1", primaryText: "#1e1e2e", primaryContainer: "#8f7342", surfaceTint: "#f9e2af" },
+        light: { primary: "#df8e1d", secondary: "#40a02b", primaryText: "#ffffff", primaryContainer: "#fff3cc", surfaceTint: "#df8e1d" }
    },
    "cat-green": {
        name: "Green",
-        dark: { primary: "#a6e3a1", secondary: "#94e2d5", primaryText: "#1e1e2e", primaryContainer: "#2f5f36", surfaceTint: "#a6e3a1" },
-        light: { primary: "#40a02b", secondary: "#179299", primaryText: "#ffffff", primaryContainer: "#dff4e0", surfaceTint: "#40a02b" }
+        dark: { primary: "#a6e3a1", secondary: "#94e2d5", primaryText: "#1e1e2e", primaryContainer: "#3c7534", surfaceTint: "#a6e3a1" },
+        light: { primary: "#40a02b", secondary: "#179299", primaryText: "#ffffff", primaryContainer: "#d4f5d4", surfaceTint: "#40a02b" }
    },
    "cat-teal": {
        name: "Teal",
-        dark: { primary: "#94e2d5", secondary: "#89dceb", primaryText: "#1e1e2e", primaryContainer: "#2e5e59", surfaceTint: "#94e2d5" },
-        light: { primary: "#179299", secondary: "#04a5e5", primaryText: "#ffffff", primaryContainer: "#daf3f1", surfaceTint: "#179299" }
+        dark: { primary: "#94e2d5", secondary: "#89dceb", primaryText: "#1e1e2e", primaryContainer: "#2a7468", surfaceTint: "#94e2d5" },
+        light: { primary: "#179299", secondary: "#04a5e5", primaryText: "#ffffff", primaryContainer: "#ccf2f2", surfaceTint: "#179299" }
    },
    "cat-sky": {
        name: "Sky",
-        dark: { primary: "#89dceb", secondary: "#74c7ec", primaryText: "#1e1e2e", primaryContainer: "#24586a", surfaceTint: "#89dceb" },
-        light: { primary: "#04a5e5", secondary: "#209fb5", primaryText: "#ffffff", primaryContainer: "#dbf1fb", surfaceTint: "#04a5e5" }
+        dark: { primary: "#89dceb", secondary: "#74c7ec", primaryText: "#1e1e2e", primaryContainer: "#196e7e", surfaceTint: "#89dceb" },
+        light: { primary: "#04a5e5", secondary: "#209fb5", primaryText: "#ffffff", primaryContainer: "#ccebff", surfaceTint: "#04a5e5" }
    },
    "cat-sapphire": {
        name: "Sapphire",
-        dark: { primary: "#74c7ec", secondary: "#89b4fa", primaryText: "#1e1e2e", primaryContainer: "#1f4d6f", surfaceTint: "#74c7ec" },
-        light: { primary: "#209fb5", secondary: "#1e66f5", primaryText: "#ffffff", primaryContainer: "#def3f8", surfaceTint: "#209fb5" }
+        dark: { primary: "#74c7ec", secondary: "#89b4fa", primaryText: "#1e1e2e", primaryContainer: "#0a597f", surfaceTint: "#74c7ec" },
+        light: { primary: "#209fb5", secondary: "#1e66f5", primaryText: "#ffffff", primaryContainer: "#d0f0f5", surfaceTint: "#209fb5" }
    },
    "cat-blue": {
        name: "Blue",
-        dark: { primary: "#89b4fa", secondary: "#b4befe", primaryText: "#1e1e2e", primaryContainer: "#243f75", surfaceTint: "#89b4fa" },
-        light: { primary: "#1e66f5", secondary: "#7287fd", primaryText: "#ffffff", primaryContainer: "#e0e9ff", surfaceTint: "#1e66f5" }
+        dark: { primary: "#89b4fa", secondary: "#b4befe", primaryText: "#1e1e2e", primaryContainer: "#19468d", surfaceTint: "#89b4fa" },
+        light: { primary: "#1e66f5", secondary: "#7287fd", primaryText: "#ffffff", primaryContainer: "#ccd9ff", surfaceTint: "#1e66f5" }
    },
    "cat-lavender": {
        name: "Lavender",
-        dark: { primary: "#b4befe", secondary: "#cba6f7", primaryText: "#1e1e2e", primaryContainer: "#3f4481", surfaceTint: "#b4befe" },
-        light: { primary: "#7287fd", secondary: "#8839ef", primaryText: "#ffffff", primaryContainer: "#e5e8ff", surfaceTint: "#7287fd" }
+        dark: { primary: "#b4befe", secondary: "#cba6f7", primaryText: "#1e1e2e", primaryContainer: "#4a5091", surfaceTint: "#b4befe" },
+        light: { primary: "#7287fd", secondary: "#8839ef", primaryText: "#ffffff", primaryContainer: "#dde1ff", surfaceTint: "#7287fd" }
    }
 }

@@ -120,17 +120,17 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#0d47a1",
            secondary: "#8ab4f8",
-            surface: "#101418",
-            surfaceText: "#e0e2e8",
-            surfaceVariant: "#42474e",
-            surfaceVariantText: "#c2c7cf",
+            surface: "#1a1c1e",
+            surfaceText: "#e3e8ef",
+            surfaceVariant: "#44464f",
+            surfaceVariantText: "#c4c7c5",
            surfaceTint: "#8ab4f8",
-            background: "#101418",
-            backgroundText: "#e0e2e8",
-            outline: "#8c9199",
-            surfaceContainer: "#1d2024",
-            surfaceContainerHigh: "#272a2f",
-            surfaceContainerHighest: "#32353a"
+            background: "#1a1c1e",
+            backgroundText: "#e3e8ef",
+            outline: "#8e918f",
+            surfaceContainer: "#1e2023",
+            surfaceContainerHigh: "#292b2f",
+            surfaceContainerHighest: "#343740"
        },
        purple: {
            name: "Purple",
@@ -138,17 +138,17 @@ const StockThemes = {
            primaryText: "#381E72",
            primaryContainer: "#4F378B",
            secondary: "#CCC2DC",
-            surface: "#141218",
-            surfaceText: "#e6e0e9",
-            surfaceVariant: "#49454e",
-            surfaceVariantText: "#cac4cf",
+            surface: "#10121E",
+            surfaceText: "#E6E0E9",
+            surfaceVariant: "#49454F",
+            surfaceVariantText: "#CAC4D0",
            surfaceTint: "#D0BCFF",
-            background: "#141218",
-            backgroundText: "#e6e0e9",
-            outline: "#948f99",
-            surfaceContainer: "#211f24",
-            surfaceContainerHigh: "#2b292f",
-            surfaceContainerHighest: "#36343a"
+            background: "#10121E",
+            backgroundText: "#E6E0E9",
+            outline: "#938F99",
+            surfaceContainer: "#1D1B20",
+            surfaceContainerHigh: "#2B2930",
+            surfaceContainerHighest: "#36343B"
        },
        green: {
            name: "Green",
@@ -156,17 +156,17 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#1b5e20",
            secondary: "#81c995",
-            surface: "#10140f",
-            surfaceText: "#e0e4db",
-            surfaceVariant: "#424940",
-            surfaceVariantText: "#c2c9bd",
+            surface: "#0f1411",
+            surfaceText: "#e1f5e3",
+            surfaceVariant: "#404943",
+            surfaceVariantText: "#c1cbc4",
            surfaceTint: "#81c995",
-            background: "#10140f",
-            backgroundText: "#e0e4db",
-            outline: "#8c9388",
-            surfaceContainer: "#1d211b",
-            surfaceContainerHigh: "#272b25",
-            surfaceContainerHighest: "#323630"
+            background: "#0f1411",
+            backgroundText: "#e1f5e3",
+            outline: "#8b938c",
+            surfaceContainer: "#1a1f1b",
+            surfaceContainerHigh: "#252a26",
+            surfaceContainerHighest: "#30352f"
        },
        orange: {
            name: "Orange",
@@ -174,17 +174,17 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#3e2723",
            secondary: "#ffb74d",
-            surface: "#1a120e",
-            surfaceText: "#f0dfd8",
-            surfaceVariant: "#52443d",
-            surfaceVariantText: "#d7c2b9",
+            surface: "#1c1410",
+            surfaceText: "#f5f1ea",
+            surfaceVariant: "#4a453a",
+            surfaceVariantText: "#cbc5b8",
            surfaceTint: "#ffb74d",
-            background: "#1a120e",
-            backgroundText: "#f0dfd8",
-            outline: "#a08d85",
-            surfaceContainer: "#271e1a",
-            surfaceContainerHigh: "#322824",
-            surfaceContainerHighest: "#3d332e"
+            background: "#1c1410",
+            backgroundText: "#f5f1ea",
+            outline: "#958f84",
+            surfaceContainer: "#211e17",
+            surfaceContainerHigh: "#2c291f",
+            surfaceContainerHighest: "#373427"
        },
        red: {
            name: "Red",
@@ -192,17 +192,17 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#4a0e0e",
            secondary: "#f28b82",
-            surface: "#1a1110",
-            surfaceText: "#f1dedc",
-            surfaceVariant: "#534341",
-            surfaceVariantText: "#d8c2be",
+            surface: "#1c1011",
+            surfaceText: "#f5e8ea",
+            surfaceVariant: "#4a3f41",
+            surfaceVariantText: "#cbc2c4",
            surfaceTint: "#f28b82",
-            background: "#1a1110",
-            backgroundText: "#f1dedc",
-            outline: "#a08c89",
-            surfaceContainer: "#271d1c",
-            surfaceContainerHigh: "#322826",
-            surfaceContainerHighest: "#3d3231"
+            background: "#1c1011",
+            backgroundText: "#f5e8ea",
+            outline: "#958b8d",
+            surfaceContainer: "#211b1c",
+            surfaceContainerHigh: "#2c2426",
+            surfaceContainerHighest: "#372f30"
        },
        cyan: {
            name: "Cyan",
@@ -210,15 +210,15 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#004d5c",
            secondary: "#4dd0e1",
-            surface: "#0e1416",
-            surfaceText: "#dee3e5",
-            surfaceVariant: "#3f484a",
-            surfaceVariantText: "#bfc8ca",
+            surface: "#0f1617",
+            surfaceText: "#e8f4f5",
+            surfaceVariant: "#3f474a",
+            surfaceVariantText: "#c2c9cb",
            surfaceTint: "#4dd0e1",
-            background: "#0e1416",
-            backgroundText: "#dee3e5",
-            outline: "#899295",
-            surfaceContainer: "#1b2122",
+            background: "#0f1617",
+            backgroundText: "#e8f4f5",
+            outline: "#8c9194",
+            surfaceContainer: "#1a1f20",
            surfaceContainerHigh: "#252b2c",
            surfaceContainerHighest: "#303637"
        },
@@ -228,17 +228,17 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#4a0e2f",
            secondary: "#f8bbd9",
-            surface: "#191112",
-            surfaceText: "#f0dee0",
-            surfaceVariant: "#524345",
-            surfaceVariantText: "#d6c2c3",
+            surface: "#1a1014",
+            surfaceText: "#f3e8ee",
+            surfaceVariant: "#483f45",
+            surfaceVariantText: "#c9c2c7",
            surfaceTint: "#f8bbd9",
-            background: "#191112",
-            backgroundText: "#f0dee0",
-            outline: "#9f8c8e",
-            surfaceContainer: "#261d1e",
-            surfaceContainerHigh: "#312829",
-            surfaceContainerHighest: "#3c3233"
+            background: "#1a1014",
+            backgroundText: "#f3e8ee",
+            outline: "#938a90",
+            surfaceContainer: "#1f1b1e",
+            surfaceContainerHigh: "#2a2428",
+            surfaceContainerHighest: "#352f32"
        },
        amber: {
            name: "Amber",
@@ -246,17 +246,17 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#4a3c00",
            secondary: "#ffd54f",
-            surface: "#17130b",
-            surfaceText: "#ebe1d4",
-            surfaceVariant: "#4d4639",
-            surfaceVariantText: "#d0c5b4",
+            surface: "#1a1710",
+            surfaceText: "#f3f0e8",
+            surfaceVariant: "#49453a",
+            surfaceVariantText: "#cac5b8",
            surfaceTint: "#ffd54f",
-            background: "#17130b",
-            backgroundText: "#ebe1d4",
-            outline: "#998f80",
-            surfaceContainer: "#231f17",
-            surfaceContainerHigh: "#2e2921",
-            surfaceContainerHighest: "#39342b"
+            background: "#1a1710",
+            backgroundText: "#f3f0e8",
+            outline: "#949084",
+            surfaceContainer: "#1f1e17",
+            surfaceContainerHigh: "#2a281f",
+            surfaceContainerHighest: "#353327"
        },
        coral: {
            name: "Coral",
@@ -265,16 +265,16 @@ const StockThemes = {
            primaryContainer: "#8c1d18",
            secondary: "#f9dedc",
            surface: "#1a1110",
-            surfaceText: "#f1dedc",
-            surfaceVariant: "#534341",
-            surfaceVariantText: "#d8c2bf",
+            surfaceText: "#f1e8e7",
+            surfaceVariant: "#4a4142",
+            surfaceVariantText: "#cdc2c1",
            surfaceTint: "#ffb4ab",
            background: "#1a1110",
-            backgroundText: "#f1dedc",
-            outline: "#a08c8a",
-            surfaceContainer: "#271d1c",
-            surfaceContainerHigh: "#322826",
-            surfaceContainerHighest: "#3d3231"
+            backgroundText: "#f1e8e7",
+            outline: "#968b8a",
+            surfaceContainer: "#201a19",
+            surfaceContainerHigh: "#2b2221",
+            surfaceContainerHighest: "#362d29"
        },
        monochrome: {
            name: "Monochrome",
@@ -290,9 +290,9 @@ const StockThemes = {
            background: "#131315",
            backgroundText: "#e4e2e3",
            outline: "#929092",
-            surfaceContainer: "#353535",
-            surfaceContainerHigh: "#424242",
-            surfaceContainerHighest: "#505050",
+            surfaceContainer: "#2a2a2a",
+            surfaceContainerHigh: "#2a2a2b",
+            surfaceContainerHighest: "#353535",
            error: "#ffb4ab",
            warning: "#3f4759",
            info: "#595e6c",
@@ -306,17 +306,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#e3f2fd",
            secondary: "#42a5f5",
-            surface: "#f7f9ff",
-            surfaceText: "#181c20",
-            surfaceVariant: "#dee3eb",
-            surfaceVariantText: "#42474e",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#1976d2",
-            background: "#f7f9ff",
-            backgroundText: "#181c20",
-            outline: "#72777f",
-            surfaceContainer: "#eceef4",
-            surfaceContainerHigh: "#e6e8ee",
-            surfaceContainerHighest: "#e0e2e8"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        purple: {
            name: "Purple Light",
@@ -324,17 +324,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#EADDFF",
            secondary: "#625B71",
-            surface: "#fef7ff",
-            surfaceText: "#1d1b20",
-            surfaceVariant: "#e7e0eb",
-            surfaceVariantText: "#49454e",
+            surface: "#FFFBFE",
+            surfaceText: "#1C1B1F",
+            surfaceVariant: "#E7E0EC",
+            surfaceVariantText: "#49454F",
            surfaceTint: "#6750A4",
-            background: "#fef7ff",
-            backgroundText: "#1d1b20",
-            outline: "#7a757f",
-            surfaceContainer: "#f2ecf4",
-            surfaceContainerHigh: "#ece6ee",
-            surfaceContainerHighest: "#e6e0e9"
+            background: "#FFFBFE",
+            backgroundText: "#1C1B1F",
+            outline: "#79747E",
+            surfaceContainer: "#F3EDF7",
+            surfaceContainerHigh: "#ECE6F0",
+            surfaceContainerHighest: "#E6DFE9"
        },
        green: {
            name: "Green Light",
@@ -342,17 +342,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#e8f5e8",
            secondary: "#4caf50",
-            surface: "#f7fbf1",
-            surfaceText: "#191d17",
-            surfaceVariant: "#dee5d8",
-            surfaceVariantText: "#424940",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#2e7d32",
-            background: "#f7fbf1",
-            backgroundText: "#191d17",
-            outline: "#72796f",
-            surfaceContainer: "#ecefe6",
-            surfaceContainerHigh: "#e6e9e0",
-            surfaceContainerHighest: "#e0e4db"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        orange: {
            name: "Orange Light",
@@ -360,17 +360,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#ffecb3",
            secondary: "#ff9800",
-            surface: "#fff8f6",
-            surfaceText: "#221a16",
-            surfaceVariant: "#f4ded5",
-            surfaceVariantText: "#52443d",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#e65100",
-            background: "#fff8f6",
-            backgroundText: "#221a16",
-            outline: "#85736c",
-            surfaceContainer: "#fceae3",
-            surfaceContainerHigh: "#f6e5de",
-            surfaceContainerHighest: "#f0dfd8"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        red: {
            name: "Red Light",
@@ -378,17 +378,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#ffebee",
            secondary: "#f44336",
-            surface: "#fff8f7",
-            surfaceText: "#231918",
-            surfaceVariant: "#f5ddda",
-            surfaceVariantText: "#534341",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#d32f2f",
-            background: "#fff8f7",
-            backgroundText: "#231918",
-            outline: "#857370",
-            surfaceContainer: "#fceae7",
-            surfaceContainerHigh: "#f7e4e1",
-            surfaceContainerHighest: "#f1dedc"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        cyan: {
            name: "Cyan Light",
@@ -396,17 +396,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#e0f2f1",
            secondary: "#00bcd4",
-            surface: "#f5fafc",
-            surfaceText: "#171d1e",
-            surfaceVariant: "#dbe4e6",
-            surfaceVariantText: "#3f484a",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#0097a7",
-            background: "#f5fafc",
-            backgroundText: "#171d1e",
-            outline: "#6f797b",
-            surfaceContainer: "#e9eff0",
-            surfaceContainerHigh: "#e3e9eb",
-            surfaceContainerHighest: "#dee3e5"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        pink: {
            name: "Pink Light",
@@ -414,17 +414,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#fce4ec",
            secondary: "#e91e63",
-            surface: "#fff8f7",
-            surfaceText: "#22191a",
-            surfaceVariant: "#f3dddf",
-            surfaceVariantText: "#524345",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#c2185b",
-            background: "#fff8f7",
-            backgroundText: "#22191a",
-            outline: "#847375",
-            surfaceContainer: "#fbeaeb",
-            surfaceContainerHigh: "#f5e4e5",
-            surfaceContainerHighest: "#f0dee0"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        amber: {
            name: "Amber Light",
@@ -432,17 +432,17 @@ const StockThemes = {
            primaryText: "#000000",
            primaryContainer: "#fff8e1",
            secondary: "#ffc107",
-            surface: "#fff8f2",
-            surfaceText: "#1f1b13",
-            surfaceVariant: "#ede1cf",
-            surfaceVariantText: "#4d4639",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#ff8f00",
-            background: "#fff8f2",
-            backgroundText: "#1f1b13",
-            outline: "#7f7667",
-            surfaceContainer: "#f6ecdf",
-            surfaceContainerHigh: "#f1e7d9",
-            surfaceContainerHighest: "#ebe1d4"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        coral: {
            name: "Coral Light",
@@ -450,17 +450,17 @@ const StockThemes = {
            primaryText: "#ffffff",
            primaryContainer: "#ffdad6",
            secondary: "#ff5449",
-            surface: "#fff8f7",
-            surfaceText: "#231918",
-            surfaceVariant: "#f5ddda",
-            surfaceVariantText: "#534341",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
            surfaceTint: "#8c1d18",
-            background: "#fff8f7",
-            backgroundText: "#231918",
-            outline: "#857371",
-            surfaceContainer: "#fceae7",
-            surfaceContainerHigh: "#f6e4e2",
-            surfaceContainerHighest: "#f1dedc"
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec",
+            surfaceContainerHighest: "#e6e6e6"
        },
        monochrome: {
            name: "Monochrome Light",
@@ -476,9 +476,8 @@ const StockThemes = {
            background: "#ffffff",
            backgroundText: "#1a1a1a",
            outline: "#757577",
-            surfaceContainer: "#e8e8ea",
-            surfaceContainerHigh: "#dcdcde",
-            surfaceContainerHighest: "#d0d0d2",
+            surfaceContainer: "#f5f5f6",
+            surfaceContainerHigh: "#eaeaeb",
            error: "#ba1a1a",
            warning: "#f9e79f",
            info: "#5d6475",
--- a/Common/Theme.qml
+++ b/Common/Theme.qml
--- a/Common/settings/Lists.qml
+++ b/Common/settings/Lists.qml
@@ -1,56 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import Quickshell
-import QtQuick
-
-Singleton {
-    id: root
-
-    function init(leftModel, centerModel, rightModel, left, center, right) {
-        const dummy = {
-            widgetId: "dummy",
-            enabled: true,
-            size: 20,
-            selectedGpuIndex: 0,
-            pciId: "",
-            mountPath: "/",
-            minimumWidth: true,
-            showSwap: false
-        }
-        leftModel.append(dummy)
-        centerModel.append(dummy)
-        rightModel.append(dummy)
-
-        update(leftModel, left)
-        update(centerModel, center)
-        update(rightModel, right)
-    }
-
-    function update(model, order) {
-        model.clear()
-        for (var i = 0; i < order.length; i++) {
-            var widgetId = typeof order[i] === "string" ? order[i] : order[i].id
-            var enabled = typeof order[i] === "string" ? true : order[i].enabled
-            var size = typeof order[i] === "string" ? undefined : order[i].size
-            var selectedGpuIndex = typeof order[i] === "string" ? undefined : order[i].selectedGpuIndex
-            var pciId = typeof order[i] === "string" ? undefined : order[i].pciId
-            var mountPath = typeof order[i] === "string" ? undefined : order[i].mountPath
-            var minimumWidth = typeof order[i] === "string" ? undefined : order[i].minimumWidth
-            var showSwap = typeof order[i] === "string" ? undefined : order[i].showSwap
-            var item = {
-                widgetId: widgetId,
-                enabled: enabled
-            }
-            if (size !== undefined) item.size = size
-            if (selectedGpuIndex !== undefined) item.selectedGpuIndex = selectedGpuIndex
-            if (pciId !== undefined) item.pciId = pciId
-            if (mountPath !== undefined) item.mountPath = mountPath
-            if (minimumWidth !== undefined) item.minimumWidth = minimumWidth
-            if (showSwap !== undefined) item.showSwap = showSwap
-
-            model.append(item)
-        }
-    }
-}
--- a/Common/settings/Processes.qml
+++ b/Common/settings/Processes.qml
@@ -1,131 +0,0 @@
-pragma Singleton
-
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-Singleton {
-    id: root
-
-    property var settingsRoot: null
-
-    function detectIcons() {
-        systemDefaultDetectionProcess.running = true
-    }
-
-    function detectQtTools() {
-        qtToolsDetectionProcess.running = true
-    }
-
-    function detectFprintd() {
-        fprintdDetectionProcess.running = true
-    }
-
-    function checkPluginSettings() {
-        pluginSettingsCheckProcess.running = true
-    }
-
-    function checkDefaultSettings() {
-        defaultSettingsCheckProcess.running = true
-    }
-
-    property var systemDefaultDetectionProcess: Process {
-        command: ["sh", "-c", "gsettings get org.gnome.desktop.interface icon-theme 2>/dev/null | sed \"s/'//g\" || echo ''"]
-        running: false
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
-            if (exitCode === 0 && stdout && stdout.length > 0) {
-                settingsRoot.systemDefaultIconTheme = stdout.trim();
-            } else {
-                settingsRoot.systemDefaultIconTheme = "";
-            }
-            iconThemeDetectionProcess.running = true;
-        }
-    }
-
-    property var iconThemeDetectionProcess: Process {
-
-        command: ["sh", "-c", "find /usr/share/icons ~/.local/share/icons ~/.icons -maxdepth 1 -type d 2>/dev/null | sed 's|.*/||' | grep -v '^icons$' | sort -u"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!settingsRoot) return
-                var detectedThemes = ["System Default"]
-                if (text && text.trim()) {
-                    var themes = text.trim().split('\n')
-                    for (var i = 0; i < themes.length; i++) {
-                        var theme = themes[i].trim()
-                        if (theme && theme !== "" && theme !== "default" && theme !== "hicolor" && theme !== "locolor") {
-                            detectedThemes.push(theme)
-                        }
-                    }
-                }
-                settingsRoot.availableIconThemes = detectedThemes
-            }
-        }
-    }
-
-    property var qtToolsDetectionProcess: Process {
-        command: ["sh", "-c", "echo -n 'qt5ct:'; command -v qt5ct >/dev/null && echo 'true' || echo 'false'; echo -n 'qt6ct:'; command -v qt6ct >/dev/null && echo 'true' || echo 'false'; echo -n 'gtk:'; (command -v gsettings >/dev/null || command -v dconf >/dev/null) && echo 'true' || echo 'false'"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (!settingsRoot) return;
-                if (text && text.trim()) {
-                    var lines = text.trim().split('\n');
-                    for (var i = 0; i < lines.length; i++) {
-                        var line = lines[i];
-                        if (line.startsWith('qt5ct:')) {
-                            settingsRoot.qt5ctAvailable = line.split(':')[1] === 'true';
-                        } else if (line.startsWith('qt6ct:')) {
-                            settingsRoot.qt6ctAvailable = line.split(':')[1] === 'true';
-                        } else if (line.startsWith('gtk:')) {
-                            settingsRoot.gtkAvailable = line.split(':')[1] === 'true';
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    property var defaultSettingsCheckProcess: Process {
-        command: ["sh", "-c", "CONFIG_DIR=\"" + (settingsRoot?._configDir || "") + "/DankMaterialShell\"; if [ -f \"$CONFIG_DIR/default-settings.json\" ] && [ ! -f \"$CONFIG_DIR/settings.json\" ]; then cp --no-preserve=mode \"$CONFIG_DIR/default-settings.json\" \"$CONFIG_DIR/settings.json\" && echo 'copied'; else echo 'not_found'; fi"]
-        running: false
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
-            if (exitCode === 0) {
-                console.info("Copied default-settings.json to settings.json");
-                if (settingsRoot.settingsFile) {
-                    settingsRoot.settingsFile.reload();
-                }
-            } else {
-                if (typeof ThemeApplier !== "undefined") {
-                    ThemeApplier.applyStoredTheme(settingsRoot);
-                }
-            }
-        }
-    }
-
-    property var fprintdDetectionProcess: Process {
-        command: ["sh", "-c", "command -v fprintd-list >/dev/null 2>&1"]
-        running: false
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
-            settingsRoot.fprintdAvailable = (exitCode === 0);
-        }
-    }
-
-    property var pluginSettingsCheckProcess: Process {
-        command: ["test", "-f", settingsRoot?.pluginSettingsPath || ""]
-        running: false
-
-        onExited: function(exitCode) {
-            if (!settingsRoot) return;
-            settingsRoot.pluginSettingsFileExists = (exitCode === 0);
-        }
-    }
-}
--- a/Common/settings/SettingsSpec.js
+++ b/Common/settings/SettingsSpec.js
@@ -1,235 +0,0 @@
-.pragma library
-
-function percentToUnit(v) {
-    if (v === undefined || v === null) return undefined;
-    return v > 1 ? v / 100 : v;
-}
-
-var SPEC = {
-    currentThemeName: { def: "blue", onChange: "applyStoredTheme" },
-    customThemeFile: { def: "" },
-    matugenScheme: { def: "scheme-tonal-spot", onChange: "regenSystemThemes" },
-    runUserMatugenTemplates: { def: true, onChange: "regenSystemThemes" },
-    matugenTargetMonitor: { def: "", onChange: "regenSystemThemes" },
-
-    dankBarTransparency: { def: 1.0, coerce: percentToUnit, migrate: ["topBarTransparency"] },
-    dankBarWidgetTransparency: { def: 1.0, coerce: percentToUnit, migrate: ["topBarWidgetTransparency"] },
-    popupTransparency: { def: 1.0, coerce: percentToUnit },
-    dockTransparency: { def: 1.0, coerce: percentToUnit },
-
-    widgetBackgroundColor: { def: "sch" },
-    cornerRadius: { def: 12, onChange: "updateNiriLayout" },
-
-    use24HourClock: { def: true },
-    showSeconds: { def: false },
-    useFahrenheit: { def: false },
-    nightModeEnabled: { def: false },
-    animationSpeed: { def: 1 },
-    customAnimationDuration: { def: 500 },
-    wallpaperFillMode: { def: "Fill" },
-    blurredWallpaperLayer: { def: false },
-    blurWallpaperOnOverview: { def: false },
-
-    showLauncherButton: { def: true },
-    showWorkspaceSwitcher: { def: true },
-    showFocusedWindow: { def: true },
-    showWeather: { def: true },
-    showMusic: { def: true },
-    showClipboard: { def: true },
-    showCpuUsage: { def: true },
-    showMemUsage: { def: true },
-    showCpuTemp: { def: true },
-    showGpuTemp: { def: true },
-    selectedGpuIndex: { def: 0 },
-    enabledGpuPciIds: { def: [] },
-    showSystemTray: { def: true },
-    showClock: { def: true },
-    showNotificationButton: { def: true },
-    showBattery: { def: true },
-    showControlCenterButton: { def: true },
-
-    controlCenterShowNetworkIcon: { def: true },
-    controlCenterShowBluetoothIcon: { def: true },
-    controlCenterShowAudioIcon: { def: true },
-    controlCenterWidgets: { def: [
-        { id: "volumeSlider", enabled: true, width: 50 },
-        { id: "brightnessSlider", enabled: true, width: 50 },
-        { id: "wifi", enabled: true, width: 50 },
-        { id: "bluetooth", enabled: true, width: 50 },
-        { id: "audioOutput", enabled: true, width: 50 },
-        { id: "audioInput", enabled: true, width: 50 },
-        { id: "nightMode", enabled: true, width: 50 },
-        { id: "darkMode", enabled: true, width: 50 }
-    ]},
-
-    showWorkspaceIndex: { def: false },
-    showWorkspacePadding: { def: false },
-    workspaceScrolling: { def: false },
-    showWorkspaceApps: { def: false },
-    maxWorkspaceIcons: { def: 3 },
-    workspacesPerMonitor: { def: true },
-    dwlShowAllTags: { def: false },
-    workspaceNameIcons: { def: {} },
-    waveProgressEnabled: { def: true },
-    clockCompactMode: { def: false },
-    focusedWindowCompactMode: { def: false },
-    runningAppsCompactMode: { def: true },
-    keyboardLayoutNameCompactMode: { def: false },
-    runningAppsCurrentWorkspace: { def: false },
-    runningAppsGroupByApp: { def: false },
-    clockDateFormat: { def: "" },
-    lockDateFormat: { def: "" },
-    mediaSize: { def: 1 },
-
-    dankBarLeftWidgets: { def: ["launcherButton", "workspaceSwitcher", "focusedWindow"], migrate: ["topBarLeftWidgets"] },
-    dankBarCenterWidgets: { def: ["music", "clock", "weather"], migrate: ["topBarCenterWidgets"] },
-    dankBarRightWidgets: { def: ["systemTray", "clipboard", "cpuUsage", "memUsage", "notificationButton", "battery", "controlCenterButton"], migrate: ["topBarRightWidgets"] },
-    dankBarWidgetOrder: { def: [] },
-
-    appLauncherViewMode: { def: "list" },
-    spotlightModalViewMode: { def: "list" },
-    sortAppsAlphabetically: { def: false },
-
-    weatherLocation: { def: "New York, NY" },
-    weatherCoordinates: { def: "40.7128,-74.0060" },
-    useAutoLocation: { def: false },
-    weatherEnabled: { def: true },
-
-    networkPreference: { def: "auto" },
-    vpnLastConnected: { def: "" },
-
-    iconTheme: { def: "System Default", onChange: "applyStoredIconTheme" },
-    availableIconThemes: { def: ["System Default"], persist: false },
-    systemDefaultIconTheme: { def: "", persist: false },
-    qt5ctAvailable: { def: false, persist: false },
-    qt6ctAvailable: { def: false, persist: false },
-    gtkAvailable: { def: false, persist: false },
-
-    launcherLogoMode: { def: "apps" },
-    launcherLogoCustomPath: { def: "" },
-    launcherLogoColorOverride: { def: "" },
-    launcherLogoColorInvertOnMode: { def: false },
-    launcherLogoBrightness: { def: 0.5 },
-    launcherLogoContrast: { def: 1 },
-    launcherLogoSizeOffset: { def: 0 },
-
-    fontFamily: { def: "Inter Variable" },
-    monoFontFamily: { def: "Fira Code" },
-    fontWeight: { def: 400 },
-    fontScale: { def: 1.0 },
-    dankBarFontScale: { def: 1.0 },
-
-    notepadUseMonospace: { def: true },
-    notepadFontFamily: { def: "" },
-    notepadFontSize: { def: 14 },
-    notepadShowLineNumbers: { def: false },
-    notepadTransparencyOverride: { def: -1 },
-    notepadLastCustomTransparency: { def: 0.7 },
-
-    soundsEnabled: { def: true },
-    useSystemSoundTheme: { def: false },
-    soundNewNotification: { def: true },
-    soundVolumeChanged: { def: true },
-    soundPluggedIn: { def: true },
-
-    acMonitorTimeout: { def: 0 },
-    acLockTimeout: { def: 0 },
-    acSuspendTimeout: { def: 0 },
-    acSuspendBehavior: { def: 0 },
-    batteryMonitorTimeout: { def: 0 },
-    batteryLockTimeout: { def: 0 },
-    batterySuspendTimeout: { def: 0 },
-    batterySuspendBehavior: { def: 0 },
-    lockBeforeSuspend: { def: false },
-    preventIdleForMedia: { def: false },
-    loginctlLockIntegration: { def: true },
-    launchPrefix: { def: "" },
-    brightnessDevicePins: { def: {} },
-
-    gtkThemingEnabled: { def: false, onChange: "regenSystemThemes" },
-    qtThemingEnabled: { def: false, onChange: "regenSystemThemes" },
-    syncModeWithPortal: { def: true },
-
-    showDock: { def: false },
-    dockAutoHide: { def: false },
-    dockGroupByApp: { def: false },
-    dockOpenOnOverview: { def: false },
-    dockPosition: { def: 1 },
-    dockSpacing: { def: 4 },
-    dockBottomGap: { def: 0 },
-    dockMargin: { def: 0 },
-    dockIconSize: { def: 40 },
-    dockIndicatorStyle: { def: "circle" },
-
-    notificationOverlayEnabled: { def: false },
-    dankBarAutoHide: { def: false, migrate: ["topBarAutoHide"] },
-    dankBarOpenOnOverview: { def: false, migrate: ["topBarOpenOnOverview"] },
-    dankBarVisible: { def: true, migrate: ["topBarVisible"] },
-    overviewRows: { def: 2, persist: false },
-    overviewColumns: { def: 5, persist: false },
-    overviewScale: { def: 0.16, persist: false },
-    dankBarSpacing: { def: 4, migrate: ["topBarSpacing"], onChange: "updateNiriLayout" },
-    dankBarBottomGap: { def: 0, migrate: ["topBarBottomGap"] },
-    dankBarInnerPadding: { def: 4, migrate: ["topBarInnerPadding"] },
-    dankBarPosition: { def: 0, migrate: ["dankBarAtBottom", "topBarAtBottom"] },
-    dankBarIsVertical: { def: false, persist: false },
-
-    dankBarSquareCorners: { def: false, migrate: ["topBarSquareCorners"] },
-    dankBarNoBackground: { def: false, migrate: ["topBarNoBackground"] },
-    dankBarGothCornersEnabled: { def: false, migrate: ["topBarGothCornersEnabled"] },
-    dankBarGothCornerRadiusOverride: { def: false },
-    dankBarGothCornerRadiusValue: { def: 12 },
-    dankBarBorderEnabled: { def: false },
-    dankBarBorderColor: { def: "surfaceText" },
-    dankBarBorderOpacity: { def: 1.0 },
-    dankBarBorderThickness: { def: 1 },
-
-    popupGapsAuto: { def: true },
-    popupGapsManual: { def: 4 },
-
-    modalDarkenBackground: { def: true },
-
-    lockScreenShowPowerActions: { def: true },
-    enableFprint: { def: false },
-    maxFprintTries: { def: 3 },
-    fprintdAvailable: { def: false, persist: false },
-    hideBrightnessSlider: { def: false },
-
-    notificationTimeoutLow: { def: 5000 },
-    notificationTimeoutNormal: { def: 5000 },
-    notificationTimeoutCritical: { def: 0 },
-    notificationPopupPosition: { def: 0 },
-
-    osdAlwaysShowValue: { def: false },
-
-    powerActionConfirm: { def: true },
-    powerMenuActions: { def: ["reboot", "logout", "poweroff", "lock", "suspend", "restart"] },
-    powerMenuDefaultAction: { def: "logout" },
-    customPowerActionLock: { def: "" },
-    customPowerActionLogout: { def: "" },
-    customPowerActionSuspend: { def: "" },
-    customPowerActionHibernate: { def: "" },
-    customPowerActionReboot: { def: "" },
-    customPowerActionPowerOff: { def: "" },
-
-    updaterUseCustomCommand: { def: false },
-    updaterCustomCommand: { def: "" },
-    updaterTerminalAdditionalParams: { def: "" },
-
-    screenPreferences: { def: {} },
-    showOnLastDisplay: { def: {} }
-};
-
-function getValidKeys() {
-    return Object.keys(SPEC).filter(function(k) { return SPEC[k].persist !== false; }).concat(["configVersion"]);
-}
-
-function set(root, key, value, saveFn, hooks) {
-    if (!(key in SPEC)) return;
-    root[key] = value;
-    var hookName = SPEC[key].onChange;
-    if (hookName && hooks && hooks[hookName]) {
-        hooks[hookName](root);
-    }
-    saveFn();
-}
--- a/Common/settings/SettingsStore.js
+++ b/Common/settings/SettingsStore.js
@@ -1,118 +0,0 @@
-.pragma library
-
-.import "./SettingsSpec.js" as SpecModule
-
-function parse(root, jsonObj) {
-    var SPEC = SpecModule.SPEC;
-    for (var k in SPEC) {
-        var spec = SPEC[k];
-        root[k] = spec.def;
-    }
-
-    if (!jsonObj) return;
-
-    for (var k in jsonObj) {
-        if (!SPEC[k]) continue;
-        var raw = jsonObj[k];
-        var spec = SPEC[k];
-        var coerce = spec.coerce;
-        root[k] = coerce ? (coerce(raw) !== undefined ? coerce(raw) : root[k]) : raw;
-    }
-}
-
-function toJson(root) {
-    var SPEC = SpecModule.SPEC;
-    var out = {};
-    for (var k in SPEC) {
-        if (SPEC[k].persist === false) continue;
-        out[k] = root[k];
-    }
-    out.configVersion = root.settingsConfigVersion;
-    return out;
-}
-
-function migrate(root, jsonObj) {
-    var SPEC = SpecModule.SPEC;
-    if (!jsonObj) return;
-
-    if (jsonObj.themeIndex !== undefined || jsonObj.themeIsDynamic !== undefined) {
-        var themeNames = ["blue", "deepBlue", "purple", "green", "orange", "red", "cyan", "pink", "amber", "coral"];
-        if (jsonObj.themeIsDynamic) {
-            root.currentThemeName = "dynamic";
-        } else if (jsonObj.themeIndex >= 0 && jsonObj.themeIndex < themeNames.length) {
-            root.currentThemeName = themeNames[jsonObj.themeIndex];
-        }
-        console.info("Auto-migrated theme from index", jsonObj.themeIndex, "to", root.currentThemeName);
-    }
-
-    if ((jsonObj.dankBarWidgetOrder && jsonObj.dankBarWidgetOrder.length > 0) ||
-        (jsonObj.topBarWidgetOrder && jsonObj.topBarWidgetOrder.length > 0)) {
-        if (jsonObj.dankBarLeftWidgets === undefined && jsonObj.dankBarCenterWidgets === undefined && jsonObj.dankBarRightWidgets === undefined) {
-            var widgetOrder = jsonObj.dankBarWidgetOrder || jsonObj.topBarWidgetOrder;
-            root.dankBarLeftWidgets = widgetOrder.filter(function(w) { return ["launcherButton", "workspaceSwitcher", "focusedWindow"].indexOf(w) >= 0; });
-            root.dankBarCenterWidgets = widgetOrder.filter(function(w) { return ["clock", "music", "weather"].indexOf(w) >= 0; });
-            root.dankBarRightWidgets = widgetOrder.filter(function(w) { return ["systemTray", "clipboard", "systemResources", "notificationButton", "battery", "controlCenterButton"].indexOf(w) >= 0; });
-        }
-    }
-
-    if (jsonObj.useOSLogo !== undefined) {
-        root.launcherLogoMode = jsonObj.useOSLogo ? "os" : "apps";
-        root.launcherLogoColorOverride = jsonObj.osLogoColorOverride !== undefined ? jsonObj.osLogoColorOverride : "";
-        root.launcherLogoBrightness = jsonObj.osLogoBrightness !== undefined ? jsonObj.osLogoBrightness : 0.5;
-        root.launcherLogoContrast = jsonObj.osLogoContrast !== undefined ? jsonObj.osLogoContrast : 1;
-    }
-
-    if (jsonObj.mediaCompactMode !== undefined && jsonObj.mediaSize === undefined) {
-        root.mediaSize = jsonObj.mediaCompactMode ? 0 : 1;
-    }
-
-    for (var k in SPEC) {
-        var spec = SPEC[k];
-        if (!spec.migrate) continue;
-        for (var i = 0; i < spec.migrate.length; i++) {
-            var oldKey = spec.migrate[i];
-            if (jsonObj[oldKey] !== undefined && jsonObj[k] === undefined) {
-                var raw = jsonObj[oldKey];
-                var coerce = spec.coerce;
-                root[k] = coerce ? (coerce(raw) !== undefined ? coerce(raw) : root[k]) : raw;
-                break;
-            }
-        }
-    }
-
-    if (jsonObj.dankBarAtBottom !== undefined || jsonObj.topBarAtBottom !== undefined) {
-        var atBottom = jsonObj.dankBarAtBottom !== undefined ? jsonObj.dankBarAtBottom : jsonObj.topBarAtBottom;
-        root.dankBarPosition = atBottom ? 1 : 0;
-    }
-
-    if (jsonObj.pluginSettings !== undefined) {
-        root.pluginSettings = jsonObj.pluginSettings;
-        return true;
-    }
-
-    return false;
-}
-
-function cleanup(fileText) {
-    var getValidKeys = SpecModule.getValidKeys;
-    if (!fileText || !fileText.trim()) return;
-
-    try {
-        var settings = JSON.parse(fileText);
-        var validKeys = getValidKeys();
-        var needsSave = false;
-
-        for (var key in settings) {
-            if (validKeys.indexOf(key) < 0) {
-                console.log("SettingsData: Removing unused key:", key);
-                delete settings[key];
-                needsSave = true;
-            }
-        }
-
-        return needsSave ? JSON.stringify(settings, null, 2) : null;
-    } catch (e) {
-        console.warn("SettingsData: Failed to cleanup unused keys:", e.message);
-        return null;
-    }
-}
--- a/DMSGreeter.qml
+++ b/DMSGreeter.qml
@@ -1,11 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Services.Greetd
-import qs.Common
-import qs.Modules.Greetd
-
-Scope {
-    id: root
-
-    GreeterSurface {}
-}
--- a/DMSShell.qml
+++ b/DMSShell.qml
@@ -1,588 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Modals
-import qs.Modals.Clipboard
-import qs.Modals.Common
-import qs.Modals.Settings
-import qs.Modals.Spotlight
-import qs.Modules
-import qs.Modules.AppDrawer
-import qs.Modules.DankDash
-import qs.Modules.ControlCenter
-import qs.Modules.Dock
-import qs.Modules.Lock
-import qs.Modules.Notepad
-import qs.Modules.Notifications.Center
-import qs.Widgets
-import qs.Modules.Notifications.Popup
-import qs.Modules.OSD
-import qs.Modules.ProcessList
-import qs.Modules.Settings
-import qs.Modules.DankBar
-import qs.Modules.DankBar.Popouts
-import qs.Modules.HyprWorkspaces
-import qs.Modules.Plugins
-import qs.Services
-
-Item {
-    id: root
-
-    Instantiator {
-        id: daemonPluginInstantiator
-        asynchronous: true
-        model: Object.keys(PluginService.pluginDaemonComponents)
-
-        delegate: Loader {
-            id: daemonLoader
-            property string pluginId: modelData
-            sourceComponent: PluginService.pluginDaemonComponents[pluginId]
-
-            onLoaded: {
-                if (item) {
-                    item.pluginService = PluginService
-                    if (item.popoutService !== undefined) {
-                        item.popoutService = PopoutService
-                    }
-                    item.pluginId = pluginId
-                    console.info("Daemon plugin loaded:", pluginId)
-                }
-            }
-        }
-    }
-
-    Loader {
-        id: blurredWallpaperBackgroundLoader
-        active: SettingsData.blurredWallpaperLayer && CompositorService.isNiri
-        asynchronous: false
-
-        sourceComponent: BlurredWallpaperBackground {}
-    }
-
-    WallpaperBackground {}
-
-    Lock {
-        id: lock
-    }
-
-    Loader {
-        id: dankBarLoader
-        asynchronous: false
-
-        property var currentPosition: SettingsData.dankBarPosition
-        property bool initialized: false
-        property var hyprlandOverviewLoaderRef: hyprlandOverviewLoader
-
-        sourceComponent: DankBar {
-            hyprlandOverviewLoader: dankBarLoader.hyprlandOverviewLoaderRef
-
-            onColorPickerRequested: {
-                if (colorPickerModal.shouldBeVisible) {
-                    colorPickerModal.close()
-                } else {
-                    colorPickerModal.show()
-                }
-            }
-        }
-
-        Component.onCompleted: {
-            initialized = true
-        }
-
-        onCurrentPositionChanged: {
-            if (!initialized)
-                return
-
-            const component = sourceComponent
-            sourceComponent = null
-            sourceComponent = component
-        }
-    }
-
-    Loader {
-        id: dockLoader
-        active: true
-        asynchronous: false
-
-        property var currentPosition: SettingsData.dockPosition
-        property bool initialized: false
-
-        sourceComponent: Dock {
-            contextMenu: dockContextMenuLoader.item ? dockContextMenuLoader.item : null
-        }
-
-        onLoaded: {
-            if (item) {
-                dockContextMenuLoader.active = true
-            }
-        }
-
-        Component.onCompleted: {
-            initialized = true
-        }
-
-        onCurrentPositionChanged: {
-            if (!initialized)
-                return
-
-            console.log("DEBUG: Dock position changed to:", currentPosition, "- recreating dock")
-            const comp = sourceComponent
-            sourceComponent = null
-            sourceComponent = comp
-        }
-    }
-
-    Loader {
-        id: dankDashPopoutLoader
-
-        active: false
-        asynchronous: true
-
-        sourceComponent: Component {
-            DankDashPopout {
-                id: dankDashPopout
-
-                Component.onCompleted: {
-                    PopoutService.dankDashPopout = dankDashPopout
-                }
-            }
-        }
-    }
-
-    LazyLoader {
-        id: dockContextMenuLoader
-
-        active: false
-
-        DockContextMenu {
-            id: dockContextMenu
-        }
-    }
-
-    LazyLoader {
-        id: notificationCenterLoader
-
-        active: false
-
-        NotificationCenterPopout {
-            id: notificationCenter
-
-            Component.onCompleted: {
-                PopoutService.notificationCenterPopout = notificationCenter
-            }
-        }
-    }
-
-    Variants {
-        model: SettingsData.getFilteredScreens("notifications")
-
-        delegate: NotificationPopupManager {
-            modelData: item
-        }
-    }
-
-    LazyLoader {
-        id: controlCenterLoader
-
-        active: false
-
-        property var modalRef: colorPickerModal
-        property LazyLoader powerModalLoaderRef: powerMenuModalLoader
-
-        ControlCenterPopout {
-            id: controlCenterPopout
-            colorPickerModal: controlCenterLoader.modalRef
-            powerMenuModalLoader: controlCenterLoader.powerModalLoaderRef
-
-            onLockRequested: {
-                lock.activate()
-            }
-
-            Component.onCompleted: {
-                PopoutService.controlCenterPopout = controlCenterPopout
-            }
-        }
-    }
-
-    WifiPasswordModal {
-        id: wifiPasswordModal
-
-        Component.onCompleted: {
-            PopoutService.wifiPasswordModal = wifiPasswordModal
-        }
-    }
-
-    PolkitAuthModal {
-        id: polkitAuthModal
-    }
-
-    property string lastCredentialsToken: ""
-    property var lastCredentialsTime: 0
-
-    Connections {
-        target: NetworkService
-
-        function onCredentialsNeeded(token, ssid, setting, fields, hints, reason, connType, connName, vpnService) {
-            const now = Date.now()
-            const timeSinceLastPrompt = now - lastCredentialsTime
-
-            if (wifiPasswordModal.shouldBeVisible && timeSinceLastPrompt < 1000) {
-                NetworkService.cancelCredentials(lastCredentialsToken)
-                lastCredentialsToken = token
-                lastCredentialsTime = now
-                wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService)
-                return
-            }
-
-            lastCredentialsToken = token
-            lastCredentialsTime = now
-            wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService)
-        }
-    }
-
-    LazyLoader {
-        id: networkInfoModalLoader
-
-        active: false
-
-        NetworkInfoModal {
-            id: networkInfoModal
-
-            Component.onCompleted: {
-                PopoutService.networkInfoModal = networkInfoModal
-            }
-        }
-    }
-
-    LazyLoader {
-        id: batteryPopoutLoader
-
-        active: false
-
-        BatteryPopout {
-            id: batteryPopout
-
-            Component.onCompleted: {
-                PopoutService.batteryPopout = batteryPopout
-            }
-        }
-    }
-
-    LazyLoader {
-        id: vpnPopoutLoader
-
-        active: false
-
-        VpnPopout {
-            id: vpnPopout
-
-            Component.onCompleted: {
-                PopoutService.vpnPopout = vpnPopout
-            }
-        }
-    }
-
-    LazyLoader {
-        id: powerMenuLoader
-
-        active: false
-
-        PowerMenu {
-            id: powerMenu
-
-            onPowerActionRequested: (action, title, message) => {
-                                        if (SettingsData.powerActionConfirm) {
-                                            powerConfirmModalLoader.active = true
-                                            if (powerConfirmModalLoader.item) {
-                                                powerConfirmModalLoader.item.confirmButtonColor = action === "poweroff" ? Theme.error : action === "reboot" ? Theme.warning : Theme.primary
-                                                powerConfirmModalLoader.item.show(title, message, () => actionApply(action), function () {})
-                                            }
-                                        } else {
-                                            actionApply(action)
-                                        }
-                                    }
-
-            function actionApply(action) {
-                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
-                }
-            }
-        }
-    }
-
-    LazyLoader {
-        id: powerConfirmModalLoader
-
-        active: false
-
-        ConfirmModal {
-            id: powerConfirmModal
-        }
-    }
-
-    LazyLoader {
-        id: processListPopoutLoader
-
-        active: false
-
-        ProcessListPopout {
-            id: processListPopout
-
-            Component.onCompleted: {
-                PopoutService.processListPopout = processListPopout
-            }
-        }
-    }
-
-    SettingsModal {
-        id: settingsModal
-
-        Component.onCompleted: {
-            PopoutService.settingsModal = settingsModal
-        }
-    }
-
-    LazyLoader {
-        id: appDrawerLoader
-
-        active: false
-
-        AppDrawerPopout {
-            id: appDrawerPopout
-
-            Component.onCompleted: {
-                PopoutService.appDrawerPopout = appDrawerPopout
-            }
-        }
-    }
-
-    SpotlightModal {
-        id: spotlightModal
-
-        Component.onCompleted: {
-            PopoutService.spotlightModal = spotlightModal
-        }
-    }
-
-    ClipboardHistoryModal {
-        id: clipboardHistoryModalPopup
-
-        Component.onCompleted: {
-            PopoutService.clipboardHistoryModal = clipboardHistoryModalPopup
-        }
-    }
-
-    NotificationModal {
-        id: notificationModal
-
-        Component.onCompleted: {
-            PopoutService.notificationModal = notificationModal
-        }
-    }
-
-    DankColorPickerModal {
-        id: colorPickerModal
-
-        Component.onCompleted: {
-            PopoutService.colorPickerModal = colorPickerModal
-        }
-    }
-
-    LazyLoader {
-        id: processListModalLoader
-
-        active: false
-
-        ProcessListModal {
-            id: processListModal
-
-            Component.onCompleted: {
-                PopoutService.processListModal = processListModal
-            }
-        }
-    }
-
-    LazyLoader {
-        id: systemUpdateLoader
-
-        active: false
-
-        SystemUpdatePopout {
-            id: systemUpdatePopout
-
-            Component.onCompleted: {
-                PopoutService.systemUpdatePopout = systemUpdatePopout
-            }
-        }
-    }
-
-    Variants {
-        id: notepadSlideoutVariants
-        model: SettingsData.getFilteredScreens("notepad")
-
-        delegate: DankSlideout {
-            id: notepadSlideout
-            modelData: item
-            title: I18n.tr("Notepad")
-            slideoutWidth: 480
-            expandable: true
-            expandedWidthValue: 960
-            customTransparency: SettingsData.notepadTransparencyOverride
-
-            content: Component {
-                Notepad {
-                    onHideRequested: {
-                        notepadSlideout.hide()
-                    }
-                }
-            }
-
-            function toggle() {
-                if (isVisible) {
-                    hide()
-                } else {
-                    show()
-                }
-            }
-        }
-    }
-
-    LazyLoader {
-        id: powerMenuModalLoader
-
-        active: false
-
-        PowerMenuModal {
-            id: powerMenuModal
-
-            onPowerActionRequested: (action, title, message) => {
-                                        if (SettingsData.powerActionConfirm) {
-                                            powerConfirmModalLoader.active = true
-                                            if (powerConfirmModalLoader.item) {
-                                                powerConfirmModalLoader.item.confirmButtonColor = action === "poweroff" ? Theme.error : action === "reboot" ? Theme.warning : Theme.primary
-                                                powerConfirmModalLoader.item.show(title, message, () => actionApply(action), function () {})
-                                            }
-                                        } else {
-                                            actionApply(action)
-                                        }
-                                    }
-
-            onLockRequested: {
-                lock.activate()
-            }
-
-            function actionApply(action) {
-                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
-                }
-            }
-
-            Component.onCompleted: {
-                PopoutService.powerMenuModal = powerMenuModal
-            }
-        }
-    }
-
-    LazyLoader {
-        id: hyprKeybindsModalLoader
-
-        active: false
-
-        KeybindsModal {
-            id: keybindsModal
-
-            Component.onCompleted: {
-                PopoutService.hyprKeybindsModal = keybindsModal
-            }
-        }
-    }
-
-    DMSShellIPC {
-        powerMenuModalLoader: powerMenuModalLoader
-        processListModalLoader: processListModalLoader
-        controlCenterLoader: controlCenterLoader
-        dankDashPopoutLoader: dankDashPopoutLoader
-        notepadSlideoutVariants: notepadSlideoutVariants
-        hyprKeybindsModalLoader: hyprKeybindsModalLoader
-        dankBarLoader: dankBarLoader
-        hyprlandOverviewLoader: hyprlandOverviewLoader
-    }
-
-    Variants {
-        model: SettingsData.getFilteredScreens("toast")
-
-        delegate: Toast {
-            modelData: item
-            visible: ToastService.toastVisible
-        }
-    }
-
-    Variants {
-        model: SettingsData.getFilteredScreens("osd")
-
-        delegate: VolumeOSD {
-            modelData: item
-        }
-    }
-
-    Variants {
-        model: SettingsData.getFilteredScreens("osd")
-
-        delegate: MicMuteOSD {
-            modelData: item
-        }
-    }
-
-    Variants {
-        model: SettingsData.getFilteredScreens("osd")
-
-        delegate: BrightnessOSD {
-            modelData: item
-        }
-    }
-
-    Variants {
-        model: SettingsData.getFilteredScreens("osd")
-
-        delegate: IdleInhibitorOSD {
-            modelData: item
-        }
-    }
-
-    LazyLoader {
-        id: hyprlandOverviewLoader
-        active: CompositorService.isHyprland
-        component: HyprlandOverview {
-            id: hyprlandOverview
-        }
-    }
-}
--- a/DMSShellIPC.qml
+++ b/DMSShellIPC.qml
@@ -1,434 +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
-    required property var hyprlandOverviewLoader
-
-    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 {
-            if (root.dankBarLoader.item && root.dankBarLoader.item.triggerWallpaperBrowserOnFocusedScreen()) {
-                if (root.dankDashPopoutLoader.item) {
-                    switch (tab.toLowerCase()) {
-                    case "media":
-                        root.dankDashPopoutLoader.item.currentTabIndex = 1
-                        break
-                    case "wallpaper":
-                        root.dankDashPopoutLoader.item.currentTabIndex = 2
-                        break
-                    case "weather":
-                        root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 3 : 0
-                        break
-                    default:
-                        root.dankDashPopoutLoader.item.currentTabIndex = 0
-                        break
-                    }
-                }
-                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 toggle(provider: string): string {
-            if (!provider) {
-                return "ERROR: No provider specified"
-            }
-
-            KeybindsService.loadProvider(provider)
-            root.hyprKeybindsModalLoader.active = true
-
-            if (root.hyprKeybindsModalLoader.item) {
-                if (root.hyprKeybindsModalLoader.item.shouldBeVisible) {
-                    root.hyprKeybindsModalLoader.item.close()
-                } else {
-                    root.hyprKeybindsModalLoader.item.open()
-                }
-                return `KEYBINDS_TOGGLE_SUCCESS: ${provider}`
-            }
-            return `KEYBINDS_TOGGLE_FAILED: ${provider}`
-        }
-
-        function open(provider: string): string {
-            if (!provider) {
-                return "ERROR: No provider specified"
-            }
-
-            KeybindsService.loadProvider(provider)
-            root.hyprKeybindsModalLoader.active = true
-
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.open()
-                return `KEYBINDS_OPEN_SUCCESS: ${provider}`
-            }
-            return `KEYBINDS_OPEN_FAILED: ${provider}`
-        }
-
-        function close(): string {
-            if (root.hyprKeybindsModalLoader.item) {
-                root.hyprKeybindsModalLoader.item.close()
-                return "KEYBINDS_CLOSE_SUCCESS"
-            }
-            return "KEYBINDS_CLOSE_FAILED"
-        }
-
-        target: "keybinds"
-    }
-
-    IpcHandler {
-        function openBinds(): string {
-            if (!CompositorService.isHyprland) {
-                return "HYPR_NOT_AVAILABLE"
-            }
-            KeybindsService.loadProvider("hyprland")
-            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"
-            }
-            KeybindsService.loadProvider("hyprland")
-            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"
-        }
-
-        function toggleOverview(): string {
-            if (!CompositorService.isHyprland || !root.hyprlandOverviewLoader.item) {
-                return "HYPR_NOT_AVAILABLE"
-            }
-            root.hyprlandOverviewLoader.item.overviewOpen = !root.hyprlandOverviewLoader.item.overviewOpen
-            return root.hyprlandOverviewLoader.item.overviewOpen ? "OVERVIEW_OPEN_SUCCESS" : "OVERVIEW_CLOSE_SUCCESS"
-        }
-
-        function closeOverview(): string {
-            if (!CompositorService.isHyprland || !root.hyprlandOverviewLoader.item) {
-                return "HYPR_NOT_AVAILABLE"
-            }
-            root.hyprlandOverviewLoader.item.overviewOpen = false
-            return "OVERVIEW_CLOSE_SUCCESS"
-        }
-
-        function openOverview(): string {
-            if (!CompositorService.isHyprland || !root.hyprlandOverviewLoader.item) {
-                return "HYPR_NOT_AVAILABLE"
-            }
-            root.hyprlandOverviewLoader.item.overviewOpen = true
-            return "OVERVIEW_OPEN_SUCCESS"
-        }
-
-        target: "hypr"
-    }
-
-    IpcHandler {
-        function wallpaper(): string {
-            if (root.dankBarLoader.item && root.dankBarLoader.item.triggerWallpaperBrowserOnFocusedScreen()) {
-                return "SUCCESS: Toggled wallpaper browser"
-            }
-            return "ERROR: Failed to toggle wallpaper browser"
-        }
-
-        target: "dankdash"
-    }
-}
--- a/686
+++ b/686
@@ -1,20 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007

-Copyright (c) 2025 Avenge Media LLC
+ 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.

-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:
+                            Preamble

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.

-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 
+  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>.
--- a/LICENSE_CHANGE_12_11_2025.md
+++ b/LICENSE_CHANGE_12_11_2025.md
@@ -1,23 +0,0 @@
-# DankMaterialShell License Change
-
-Relicensing from GPL-3.0 to MIT.
-
-Consent and documentation is available in [pull request #686](https://github.com/AvengeMedia/DankMaterialShell/pull/686) and is summarized below.
-
-## Contributors
-
-The project has 21 contributors requiring consent:
- 2 primary authors (10k+ lines each)
- 7 major contributors (1k+ lines or 10+ commits)
- 12 significant contributors (100+ lines)
- 2 derivative works (code adapted from other projects)
-
-Contributors with <50 lines are excluded as they don't meet copyright thresholds. Automated bots don't hold copyright.
-
-## Consent Status
-
-All 21 contributors have provided consent. Three contributions were sufficiently reverted or rewritten by maintainers, making them eligible without original author consent.
-
-## Reasoning
-
-GPL-3.0 may require plugins to also be GPL-3.0 licensed. MIT allows plugin authors to choose their own licenses.
--- a/Modals/BluetoothPairingModal.qml
+++ b/Modals/BluetoothPairingModal.qml
@@ -1,364 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    layerNamespace: "dms:bluetooth-pairing"
-
-    property string deviceName: ""
-    property string deviceAddress: ""
-    property string requestType: ""
-    property string token: ""
-    property int passkey: 0
-    property string pinInput: ""
-    property string passkeyInput: ""
-
-    function show(pairingData) {
-        token = pairingData.token || ""
-        deviceName = pairingData.deviceName || ""
-        deviceAddress = pairingData.deviceAddr || ""
-        requestType = pairingData.requestType || ""
-        passkey = pairingData.passkey || 0
-        pinInput = ""
-        passkeyInput = ""
-
-        open()
-        Qt.callLater(() => {
-            if (contentLoader.item) {
-                if (requestType === "pin" && contentLoader.item.pinInputField) {
-                    contentLoader.item.pinInputField.forceActiveFocus()
-                } else if (requestType === "passkey" && contentLoader.item.passkeyInputField) {
-                    contentLoader.item.passkeyInputField.forceActiveFocus()
-                }
-            }
-        })
-    }
-
-    shouldBeVisible: false
-    width: 420
-    height: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 240
-
-    onShouldBeVisibleChanged: () => {
-        if (!shouldBeVisible) {
-            pinInput = ""
-            passkeyInput = ""
-        }
-    }
-
-    onOpened: {
-        Qt.callLater(() => {
-            if (contentLoader.item) {
-                if (requestType === "pin" && contentLoader.item.pinInputField) {
-                    contentLoader.item.pinInputField.forceActiveFocus()
-                } else if (requestType === "passkey" && contentLoader.item.passkeyInputField) {
-                    contentLoader.item.passkeyInputField.forceActiveFocus()
-                }
-            }
-        })
-    }
-
-    onBackgroundClicked: () => {
-        DMSService.bluetoothCancelPairing(token)
-        close()
-        pinInput = ""
-        passkeyInput = ""
-    }
-
-    content: Component {
-        FocusScope {
-            id: pairingContent
-
-            property alias pinInputField: pinInputField
-            property alias passkeyInputField: passkeyInputField
-
-            anchors.fill: parent
-            focus: true
-            implicitHeight: mainColumn.implicitHeight
-
-            Keys.onEscapePressed: event => {
-                DMSService.bluetoothCancelPairing(token)
-                close()
-                pinInput = ""
-                passkeyInput = ""
-                event.accepted = true
-            }
-
-            Column {
-                id: mainColumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.leftMargin: Theme.spacingM
-                anchors.rightMargin: Theme.spacingM
-                anchors.topMargin: Theme.spacingM
-                spacing: requestType === "pin" || requestType === "passkey" ? Theme.spacingM : Theme.spacingS
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        text: I18n.tr("Pair Bluetooth Device")
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                    }
-
-                    StyledText {
-                        text: {
-                            if (requestType === "confirm")
-                                return I18n.tr("Confirm passkey for ") + deviceName
-                            if (requestType === "authorize")
-                                return I18n.tr("Authorize pairing with ") + deviceName
-                            if (requestType.startsWith("authorize-service"))
-                                return I18n.tr("Authorize service for ") + deviceName
-                            if (requestType === "pin")
-                                return I18n.tr("Enter PIN for ") + deviceName
-                            if (requestType === "passkey")
-                                return I18n.tr("Enter passkey for ") + deviceName
-                            return deviceName
-                        }
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceTextMedium
-                        width: parent.width - 40
-                        elide: Text.ElideRight
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: pinInputField.activeFocus ? Theme.primary : Theme.outlineStrong
-                    border.width: pinInputField.activeFocus ? 2 : 1
-                    visible: requestType === "pin"
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: () => {
-                            pinInputField.forceActiveFocus()
-                        }
-                    }
-
-                    DankTextField {
-                        id: pinInputField
-
-                        anchors.fill: parent
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: Theme.surfaceText
-                        text: pinInput
-                        placeholderText: I18n.tr("Enter PIN")
-                        backgroundColor: "transparent"
-                        enabled: root.shouldBeVisible
-                        onTextEdited: () => {
-                            pinInput = text
-                        }
-                        onAccepted: () => {
-                            submitPairing()
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: passkeyInputField.activeFocus ? Theme.primary : Theme.outlineStrong
-                    border.width: passkeyInputField.activeFocus ? 2 : 1
-                    visible: requestType === "passkey"
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: () => {
-                            passkeyInputField.forceActiveFocus()
-                        }
-                    }
-
-                    DankTextField {
-                        id: passkeyInputField
-
-                        anchors.fill: parent
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: Theme.surfaceText
-                        text: passkeyInput
-                        placeholderText: I18n.tr("Enter 6-digit passkey")
-                        backgroundColor: "transparent"
-                        enabled: root.shouldBeVisible
-                        onTextEdited: () => {
-                            passkeyInput = text
-                        }
-                        onAccepted: () => {
-                            submitPairing()
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 56
-                    radius: Theme.cornerRadius
-                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                    visible: requestType === "confirm"
-
-                    Column {
-                        anchors.centerIn: parent
-                        spacing: 2
-
-                        StyledText {
-                            text: I18n.tr("Passkey:")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceTextMedium
-                            anchors.horizontalCenter: parent.horizontalCenter
-                        }
-
-                        StyledText {
-                            text: String(passkey).padStart(6, "0")
-                            font.pixelSize: Theme.fontSizeXLarge
-                            color: Theme.surfaceText
-                            font.weight: Font.Bold
-                            anchors.horizontalCenter: parent.horizontalCenter
-                        }
-                    }
-                }
-
-                Item {
-                    width: parent.width
-                    height: 36
-
-                    Row {
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        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: () => {
-                                    DMSService.bluetoothCancelPairing(token)
-                                    close()
-                                    pinInput = ""
-                                    passkeyInput = ""
-                                }
-                            }
-                        }
-
-                        Rectangle {
-                            width: Math.max(80, pairText.contentWidth + Theme.spacingM * 2)
-                            height: 36
-                            radius: Theme.cornerRadius
-                            color: pairArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
-                            enabled: {
-                                if (requestType === "pin")
-                                    return pinInput.length > 0
-                                if (requestType === "passkey")
-                                    return passkeyInput.length === 6
-                                return true
-                            }
-                            opacity: enabled ? 1 : 0.5
-
-                            StyledText {
-                                id: pairText
-
-                                anchors.centerIn: parent
-                                text: {
-                                    if (requestType === "confirm")
-                                        return I18n.tr("Confirm")
-                                    if (requestType === "authorize" || requestType.startsWith("authorize-service"))
-                                        return I18n.tr("Authorize")
-                                    return I18n.tr("Pair")
-                                }
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.background
-                                font.weight: Font.Medium
-                            }
-
-                            MouseArea {
-                                id: pairArea
-
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                enabled: parent.enabled
-                                onClicked: () => {
-                                    submitPairing()
-                                }
-                            }
-
-                            Behavior on color {
-                                ColorAnimation {
-                                    duration: Theme.shortDuration
-                                    easing.type: Theme.standardEasing
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            DankActionButton {
-                anchors.top: parent.top
-                anchors.right: parent.right
-                anchors.topMargin: Theme.spacingM
-                anchors.rightMargin: Theme.spacingM
-                iconName: "close"
-                iconSize: Theme.iconSize - 4
-                iconColor: Theme.surfaceText
-                onClicked: () => {
-                    DMSService.bluetoothCancelPairing(token)
-                    close()
-                    pinInput = ""
-                    passkeyInput = ""
-                }
-            }
-        }
-    }
-
-    function submitPairing() {
-        const secrets = {}
-
-        if (requestType === "pin") {
-            secrets["pin"] = pinInput
-        } else if (requestType === "passkey") {
-            secrets["passkey"] = passkeyInput
-        } else if (requestType === "confirm" || requestType === "authorize" || requestType.startsWith("authorize-service")) {
-            secrets["decision"] = "yes"
-        }
-
-        DMSService.bluetoothSubmitPairing(token, secrets, true, response => {
-            if (response.error) {
-                ToastService.showError(I18n.tr("Pairing failed"), response.error)
-            }
-        })
-
-        close()
-        pinInput = ""
-        passkeyInput = ""
-    }
-}
--- a/Modals/Clipboard/ClipboardContent.qml
+++ b/Modals/Clipboard/ClipboardContent.qml
@@ -30,7 +30,7 @@ Item {
            showKeyboardHints: modal.showKeyboardHints
            onKeyboardHintsToggled: modal.showKeyboardHints = !modal.showKeyboardHints
            onClearAllClicked: {
-                clearConfirmDialog.show(I18n.tr("Clear All History?"), I18n.tr("This will permanently delete all clipboard history."), function () {
+                clearConfirmDialog.show("Clear All History?", "This will permanently delete all clipboard history.", function () {
                    modal.clearAll()
                    modal.hide()
                }, function () {})
@@ -46,7 +46,7 @@ Item {
            leftIconName: "search"
            showClearButton: true
            focus: true
-            ignoreTabKeys: true
+            ignoreLeftRightKeys: true
            keyForwardTargets: [modal.modalFocusScope]
            onTextChanged: {
                modal.searchText = text
@@ -77,14 +77,17 @@ Item {
            width: parent.width
            height: parent.height - ClipboardConstants.headerHeight - 70
            radius: Theme.cornerRadius
-            color: "transparent"
+            color: Theme.surfaceLight
+            border.color: Theme.outlineLight
+            border.width: 1
            clip: true

            DankListView {
                id: clipboardListView
                anchors.fill: parent
+                anchors.margins: Theme.spacingS
                model: filteredModel
-
+                
                currentIndex: clipboardContent.modal ? clipboardContent.modal.selectedIndex : 0
                spacing: Theme.spacingXS
                interactive: true
@@ -94,7 +97,7 @@ Item {
                boundsMovement: Flickable.FollowBoundsBehavior
                pressDelay: 0
                flickableDirection: Flickable.VerticalFlick
-
+                
                function ensureVisible(index) {
                    if (index < 0 || index >= count) {
                        return
@@ -108,25 +111,25 @@ Item {
                        contentY = itemBottom - height
                    }
                }
-
+                
                onCurrentIndexChanged: {
                    if (clipboardContent.modal && clipboardContent.modal.keyboardNavigationActive && currentIndex >= 0) {
                        ensureVisible(currentIndex)
                    }
                }
-
+                
                StyledText {
-                    text: I18n.tr("No clipboard entries found")
+                    text: "No clipboard entries found"
                    anchors.centerIn: parent
                    font.pixelSize: Theme.fontSizeMedium
                    color: Theme.surfaceVariantText
                    visible: filteredModel.count === 0
                }
-
+                
                delegate: ClipboardEntry {
                    required property int index
                    required property var model
-
+                    
                    width: clipboardListView.width
                    height: ClipboardConstants.itemHeight
                    entryData: model.entry
--- a/Modals/Clipboard/ClipboardEntry.qml
+++ b/Modals/Clipboard/ClipboardEntry.qml
@@ -24,10 +24,17 @@ Rectangle {
    radius: Theme.cornerRadius
    color: {
        if (isSelected) {
-            return Theme.primaryPressed
+            return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2)
        }
-        return mouseArea.containsMouse ? Theme.primaryHoverLight : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+        return mouseArea.containsMouse ? Theme.primaryHover : Theme.primaryBackground
    }
+    border.color: {
+        if (isSelected) {
+            return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5)
+        }
+        return Theme.outlineStrong
+    }
+    border.width: isSelected ? 1.5 : 1

    Row {
        anchors.fill: parent
@@ -80,11 +87,11 @@ Rectangle {
                    text: {
                        switch (entryType) {
                        case "image":
-                            return I18n.tr("Image") + " • " + entryPreview
+                            return "Image • " + entryPreview
                        case "long_text":
-                            return I18n.tr("Long Text")
+                            return "Long Text"
                        default:
-                            return I18n.tr("Text")
+                            return "Text"
                        }
                    }
                    font.pixelSize: Theme.fontSizeSmall
--- a/Modals/Clipboard/ClipboardHeader.qml
+++ b/Modals/Clipboard/ClipboardHeader.qml
@@ -28,7 +28,7 @@ Item {
        }

        StyledText {
-            text: I18n.tr("Clipboard History") + ` (${totalCount})`
+            text: `Clipboard History (${totalCount})`
            font.pixelSize: Theme.fontSizeLarge
            color: Theme.surfaceText
            font.weight: Font.Medium
--- a/Modals/Clipboard/ClipboardHistoryModal.qml
+++ b/Modals/Clipboard/ClipboardHistoryModal.qml
@@ -12,8 +12,6 @@ import qs.Widgets
 DankModal {
    id: clipboardHistoryModal

-    layerNamespace: "dms:clipboard"
-
    property int totalCount: 0
    property var clipboardEntries: []
    property string searchText: ""
@@ -62,7 +60,6 @@ DankModal {
        open()
        clipboardHistoryModal.searchText = ""
        clipboardHistoryModal.activeImageLoads = 0
-        clipboardHistoryModal.shouldHaveFocus = true
        refreshClipboard()
        keyboardController.reset()

@@ -94,7 +91,7 @@ DankModal {
    function copyEntry(entry) {
        const entryId = entry.split('\t')[0]
        Quickshell.execDetached(["sh", "-c", `cliphist decode ${entryId} | wl-copy`])
-        ToastService.showInfo(I18n.tr("Copied to clipboard"))
+        ToastService.showInfo("Copied to clipboard")
        hide()
    }

@@ -138,7 +135,7 @@ DankModal {
    visible: false
    width: ClipboardConstants.modalWidth
    height: ClipboardConstants.modalHeight
-    backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    backgroundColor: Theme.popupBackground()
    cornerRadius: Theme.cornerRadius
    borderColor: Theme.outlineMedium
    borderWidth: 1
@@ -156,7 +153,7 @@ DankModal {

    ConfirmModal {
        id: clearConfirmDialog
-        confirmButtonText: I18n.tr("Clear All")
+        confirmButtonText: "Clear All"
        confirmButtonColor: Theme.primary
        onVisibleChanged: {
            if (visible) {
--- a/Modals/Clipboard/ClipboardKeyboardController.qml
+++ b/Modals/Clipboard/ClipboardKeyboardController.qml
@@ -53,7 +53,7 @@ QtObject {
                modal.hide()
                event.accepted = true
            }
-        } else if (event.key === Qt.Key_Down || event.key === Qt.Key_Tab) {
+        } else if (event.key === Qt.Key_Down) {
            if (!modal.keyboardNavigationActive) {
                modal.keyboardNavigationActive = true
                modal.selectedIndex = 0
@@ -62,7 +62,7 @@ QtObject {
                selectNext()
                event.accepted = true
            }
-        } else if (event.key === Qt.Key_Up || event.key === Qt.Key_Backtab) {
+        } else if (event.key === Qt.Key_Up) {
            if (!modal.keyboardNavigationActive) {
                modal.keyboardNavigationActive = true
                modal.selectedIndex = 0
@@ -74,42 +74,6 @@ QtObject {
                selectPrevious()
                event.accepted = true
            }
-        } else if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
-            if (!modal.keyboardNavigationActive) {
-                modal.keyboardNavigationActive = true
-                modal.selectedIndex = 0
-            } else {
-                selectNext()
-            }
-            event.accepted = true
-        } else if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
-            if (!modal.keyboardNavigationActive) {
-                modal.keyboardNavigationActive = true
-                modal.selectedIndex = 0
-            } else if (modal.selectedIndex === 0) {
-                modal.keyboardNavigationActive = false
-            } else {
-                selectPrevious()
-            }
-            event.accepted = true
-        } else if (event.key === Qt.Key_J && event.modifiers & Qt.ControlModifier) {
-            if (!modal.keyboardNavigationActive) {
-                modal.keyboardNavigationActive = true
-                modal.selectedIndex = 0
-            } else {
-                selectNext()
-            }
-            event.accepted = true
-        } else if (event.key === Qt.Key_K && event.modifiers & Qt.ControlModifier) {
-            if (!modal.keyboardNavigationActive) {
-                modal.keyboardNavigationActive = true
-                modal.selectedIndex = 0
-            } else if (modal.selectedIndex === 0) {
-                modal.keyboardNavigationActive = false
-            } else {
-                selectPrevious()
-            }
-            event.accepted = true
        } else if (event.key === Qt.Key_Delete && (event.modifiers & Qt.ShiftModifier)) {
            modal.clearAll()
            modal.hide()
--- a/Modals/Clipboard/ClipboardKeyboardHints.qml
+++ b/Modals/Clipboard/ClipboardKeyboardHints.qml
@@ -6,8 +6,6 @@ import qs.Modals.Clipboard
 Rectangle {
    id: keyboardHints

-    readonly property string hintsText: I18n.tr("Shift+Del: Clear All • Esc: Close")
-
    height: ClipboardConstants.keyboardHintsHeight
    radius: Theme.cornerRadius
    color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95)
@@ -28,7 +26,7 @@ Rectangle {
        }

        StyledText {
-            text: keyboardHints.hintsText
+            text: "Shift+Del: Clear All • Esc: Close"
            font.pixelSize: Theme.fontSizeSmall
            color: Theme.surfaceText
            anchors.horizontalCenter: parent.horizontalCenter
--- a/Modals/ColorPickerModal.qml
+++ b/Modals/ColorPickerModal.qml
@@ -0,0 +1,37 @@
+import QtQuick
+import Qt.labs.platform
+import Quickshell
+import qs.Common
+import qs.Services
+
+Item {
+    id: colorPickerModal
+
+    signal colorSelected(color selectedColor)
+
+    function show() {
+        colorDialog.open()
+    }
+
+    function hide() {
+        colorDialog.close()
+    }
+
+    function copyColorToClipboard(colorValue) {
+        Quickshell.execDetached(["sh", "-c", `echo "${colorValue}" | wl-copy`])
+        ToastService.showInfo(`Color ${colorValue} copied to clipboard`)
+        console.log("Copied color to clipboard:", colorValue)
+    }
+
+    ColorDialog {
+        id: colorDialog
+        title: "Color Picker - Select and copy color"
+        color: Theme.primary
+
+        onAccepted: {
+            const colorString = color.toString()
+            copyColorToClipboard(colorString)
+            colorSelected(color)
+        }
+    }
+}
--- a/Modals/Common/ConfirmModal.qml
+++ b/Modals/Common/ConfirmModal.qml
@@ -58,7 +58,7 @@ DankModal {
    shouldBeVisible: false
    allowStacking: true
    width: 350
-    height: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 160
+    height: 160
    enableShadow: true
    shouldHaveFocus: true
    onBackgroundClicked: {
@@ -68,11 +68,9 @@ DankModal {
        }
    }
    onOpened: {
-        Qt.callLater(function () {
-            modalFocusScope.forceActiveFocus()
-            modalFocusScope.focus = true
-            shouldHaveFocus = true
-        })
+        modalFocusScope.forceActiveFocus()
+        modalFocusScope.focus = true
+        shouldHaveFocus = true
    }
    modalFocusScope.Keys.onPressed: function (event) {
        switch (event.key) {
@@ -95,48 +93,6 @@ DankModal {
            selectedButton = 1
            event.accepted = true
            break
-        case Qt.Key_N:
-            if (event.modifiers & Qt.ControlModifier) {
-                keyboardNavigation = true
-                selectedButton = (selectedButton + 1) % 2
-                event.accepted = true
-            }
-            break
-        case Qt.Key_P:
-            if (event.modifiers & Qt.ControlModifier) {
-                keyboardNavigation = true
-                selectedButton = selectedButton === -1 ? 1 : (selectedButton - 1 + 2) % 2
-                event.accepted = true
-            }
-            break
-        case Qt.Key_J:
-            if (event.modifiers & Qt.ControlModifier) {
-                keyboardNavigation = true
-                selectedButton = 1
-                event.accepted = true
-            }
-            break
-        case Qt.Key_K:
-            if (event.modifiers & Qt.ControlModifier) {
-                keyboardNavigation = true
-                selectedButton = 0
-                event.accepted = true
-            }
-            break
-        case Qt.Key_H:
-            if (event.modifiers & Qt.ControlModifier) {
-                keyboardNavigation = true
-                selectedButton = 0
-                event.accepted = true
-            }
-            break
-        case Qt.Key_L:
-            if (event.modifiers & Qt.ControlModifier) {
-                keyboardNavigation = true
-                selectedButton = 1
-                event.accepted = true
-            }
-            break
        case Qt.Key_Tab:
            keyboardNavigation = true
            selectedButton = selectedButton === -1 ? 0 : (selectedButton + 1) % 2
@@ -158,17 +114,11 @@ DankModal {
    content: Component {
        Item {
            anchors.fill: parent
-            implicitHeight: mainColumn.implicitHeight

            Column {
-                id: mainColumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.leftMargin: Theme.spacingL
-                anchors.rightMargin: Theme.spacingL
-                anchors.topMargin: Theme.spacingL
-                spacing: 0
+                anchors.centerIn: parent
+                width: parent.width - Theme.spacingM * 2
+                spacing: Theme.spacingM

                StyledText {
                    text: confirmTitle
@@ -179,11 +129,6 @@ DankModal {
                    horizontalAlignment: Text.AlignHCenter
                }

-                Item {
-                    width: 1
-                    height: Theme.spacingL
-                }
-
                StyledText {
                    text: confirmMessage
                    font.pixelSize: Theme.fontSizeMedium
@@ -194,8 +139,7 @@ DankModal {
                }

                Item {
-                    width: 1
-                    height: Theme.spacingL * 1.5
+                    height: Theme.spacingS
                }

                Row {
@@ -277,11 +221,6 @@ DankModal {
                        }
                    }
                }
-
-                Item {
-                    width: 1
-                    height: Theme.spacingL
-                }
            }
        }
    }
--- a/Modals/Common/DankModal.qml
+++ b/Modals/Common/DankModal.qml
@@ -1,25 +1,20 @@
 import QtQuick
+import QtQuick.Effects
 import Quickshell
-import Quickshell.Hyprland
 import Quickshell.Wayland
 import qs.Common
-import qs.Services
-import qs.Widgets

 PanelWindow {
    id: root

-    property string layerNamespace: "dms:modal"
-    WlrLayershell.namespace: layerNamespace
+    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: CompositorService.getScreenScale(screen)
    property bool showBackground: true
    property real backgroundOpacity: 0.5
    property string positioning: "center"
@@ -27,11 +22,8 @@ PanelWindow {
    property bool closeOnEscapeKey: true
    property bool closeOnBackgroundClick: true
    property string animationType: "scale"
-    property int animationDuration: Theme.expressiveDurations.expressiveDefaultSpatial
-    property real animationScaleCollapsed: 0.96
-    property real animationOffset: Theme.spacingL
-    property list<real> animationEnterCurve: Theme.expressiveCurves.expressiveDefaultSpatial
-    property list<real> animationExitCurve: Theme.expressiveCurves.emphasized
+    property int animationDuration: Theme.shorterDuration
+    property var animationEasing: Theme.emphasizedEasing
    property color backgroundColor: Theme.surfaceContainer
    property color borderColor: Theme.outlineMedium
    property real borderWidth: 1
@@ -42,7 +34,6 @@ PanelWindow {
    property bool shouldHaveFocus: shouldBeVisible
    property bool allowFocusOverride: false
    property bool allowStacking: false
-    property bool keepContentLoaded: false

    signal opened
    signal dialogClosed
@@ -53,15 +44,11 @@ PanelWindow {
        closeTimer.stop()
        shouldBeVisible = true
        visible = true
-        shouldHaveFocus = false
-        Qt.callLater(() => {
-            shouldHaveFocus = Qt.binding(() => shouldBeVisible)
-        })
+        focusScope.forceActiveFocus()
    }

    function close() {
        shouldBeVisible = false
-        shouldHaveFocus = false
        closeTimer.restart()
    }

@@ -75,18 +62,7 @@ PanelWindow {

    visible: shouldBeVisible
    color: "transparent"
-    WlrLayershell.layer: {
-        switch (Quickshell.env("DMS_MODAL_LAYER")) {
-        case "bottom":
-            return WlrLayershell.Bottom
-        case "overlay":
-            return WlrLayershell.Overlay
-        case "background":
-            return WlrLayershell.Background
-        default:
-            return WlrLayershell.Top
-        }
-    }
+    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: {
@@ -114,7 +90,7 @@ PanelWindow {
    Timer {
        id: closeTimer

-        interval: animationDuration + 120
+        interval: animationDuration + 50
        onTriggered: {
            visible = false
        }
@@ -127,186 +103,102 @@ PanelWindow {
        bottom: true
    }

-    MouseArea {
-        anchors.fill: parent
-        enabled: root.closeOnBackgroundClick && root.shouldBeVisible
-        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()
-                       }
-                   }
-    }
-
    Rectangle {
        id: background

        anchors.fill: parent
        color: "black"
-        opacity: root.showBackground && SettingsData.modalDarkenBackground ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-        visible: root.showBackground && SettingsData.modalDarkenBackground
+        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: Easing.BezierSpline
-                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                easing.type: root.animationEasing
            }
        }
    }

-    Item {
-        id: modalContainer
+    Rectangle {
+        id: contentContainer

-        width: Theme.px(root.width, dpr)
-        height: Theme.px(root.height, dpr)
+        width: root.width
+        height: root.height
+        anchors.centerIn: positioning === "center" ? parent : 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)
+            if (positioning === "top-right") {
+                return Math.max(Theme.spacingL, root.screenWidth - width - Theme.spacingL)
            } else if (positioning === "custom") {
-                return Theme.snap(root.customPosition.x, dpr)
+                return root.customPosition.x
            }
            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)
+            if (positioning === "top-right") {
+                return Theme.barHeight + Theme.spacingXS
            } else if (positioning === "custom") {
-                return Theme.snap(root.customPosition.y, dpr)
+                return root.customPosition.y
            }
            return 0
        }
+        color: root.backgroundColor
+        radius: root.cornerRadius
+        border.color: root.borderColor
+        border.width: root.borderWidth
+        layer.enabled: root.enableShadow
+        opacity: root.shouldBeVisible ? 1 : 0
+        scale: root.animationType === "scale" ? (root.shouldBeVisible ? 1 : 0.9) : 1
+        transform: root.animationType === "slide" ? slideTransform : null

-        readonly property bool slide: root.animationType === "slide"
-        readonly property real offsetX: slide ? 15 : 0
-        readonly property real offsetY: slide ? -30 : root.animationOffset
+        Translate {
+            id: slideTransform

-        property real animX: 0
-        property real animY: 0
-        property real scaleValue: root.animationScaleCollapsed
-
-        onOffsetXChanged: animX = Theme.snap(root.shouldBeVisible ? 0 : offsetX, root.dpr)
-        onOffsetYChanged: animY = Theme.snap(root.shouldBeVisible ? 0 : offsetY, root.dpr)
-
-        Connections {
-            target: root
-            function onShouldBeVisibleChanged() {
-                modalContainer.animX = Theme.snap(root.shouldBeVisible ? 0 : modalContainer.offsetX, root.dpr)
-                modalContainer.animY = Theme.snap(root.shouldBeVisible ? 0 : modalContainer.offsetY, root.dpr)
-                modalContainer.scaleValue = root.shouldBeVisible ? 1.0 : root.animationScaleCollapsed
-            }
+            x: root.shouldBeVisible ? 0 : 15
+            y: root.shouldBeVisible ? 0 : -30
        }

-        Behavior on animX {
+        Loader {
+            id: contentLoader
+
+            anchors.fill: parent
+            active: root.visible
+            asynchronous: false
+        }
+
+        Behavior on opacity {
            NumberAnimation {
                duration: root.animationDuration
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                easing.type: root.animationEasing
            }
        }

-        Behavior on animY {
+        Behavior on scale {
+            enabled: root.animationType === "scale"
+
            NumberAnimation {
                duration: root.animationDuration
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                easing.type: root.animationEasing
            }
        }

-        Behavior on scaleValue {
-            NumberAnimation {
-                duration: root.animationDuration
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-            }
-        }
-
-        Item {
-            id: contentContainer
-
-            anchors.centerIn: parent
-            width: parent.width
-            height: parent.height
-            clip: false
-            layer.enabled: true
-            layer.smooth: false
-            layer.textureSize: Qt.size(width * root.dpr, height * root.dpr)
-            opacity: root.shouldBeVisible ? 1 : 0
-            scale: modalContainer.scaleValue
-            x: Theme.snap(modalContainer.animX + (parent.width - width) * (1 - modalContainer.scaleValue) * 0.5, root.dpr)
-            y: Theme.snap(modalContainer.animY + (parent.height - height) * (1 - modalContainer.scaleValue) * 0.5, root.dpr)
-
-            Behavior on opacity {
-                NumberAnimation {
-                    duration: animationDuration
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                }
-            }
-
-            DankRectangle {
-                anchors.fill: parent
-                color: root.backgroundColor
-                borderColor: root.borderColor
-                borderWidth: root.borderWidth
-                radius: root.cornerRadius
-            }
-
-            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())
-                        }
-                    }
-                }
-            }
+        layer.effect: MultiEffect {
+            shadowEnabled: true
+            shadowHorizontalOffset: 0
+            shadowVerticalOffset: 8
+            shadowBlur: 1
+            shadowColor: Theme.shadowStrong
+            shadowOpacity: 0.3
        }
    }

@@ -315,13 +207,28 @@ PanelWindow {

        objectName: "modalFocusScope"
        anchors.fill: parent
-        visible: root.shouldBeVisible || root.visible
-        focus: root.shouldBeVisible
+        visible: root.visible // Only active when the modal is visible
+        focus: root.visible
        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 && visible) {
+                    Qt.callLater(() => focusScope.forceActiveFocus())
+                }
+            }
+
+            target: root
+        }
    }
 }
--- a/Modals/DankColorPickerModal.qml
+++ b/Modals/DankColorPickerModal.qml
@@ -1,664 +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
-
-    layerNamespace: "dms:color-picker"
-
-    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()
-    }
-
-    function hideInstant() {
-        onColorSelectedCallback = null
-        shouldBeVisible = false
-        visible = false
-    }
-
-    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() {
-        hideInstant()
-        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: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 680
-    backgroundColor: Theme.surfaceContainer
-    cornerRadius: Theme.cornerRadius
-    borderColor: Theme.outlineMedium
-    borderWidth: 1
-    keepContentLoaded: true
-    allowStacking: true
-
-    onBackgroundClicked: hide()
-
-    content: Component {
-        FocusScope {
-            id: colorContent
-
-            property alias hexInput: hexInput
-
-            anchors.fill: parent
-            implicitHeight: mainColumn.implicitHeight
-            focus: true
-
-            Keys.onEscapePressed: event => {
-                root.hide()
-                event.accepted = true
-            }
-
-            Column {
-                id: mainColumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                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.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-                                        }
-
-                                        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
-                        }
-                    }
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        Column {
-                            width: (parent.width - Theme.spacingM * 2) / 3
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Hex")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceTextMedium
-                                font.weight: Font.Medium
-                            }
-
-                            Row {
-                                width: parent.width
-                                spacing: Theme.spacingXS
-
-                                DankTextField {
-                                    id: hexInput
-                                    width: parent.width - 36
-                                    height: 36
-                                    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
-                                    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)
-                                        }
-                                    }
-                                }
-
-                                DankActionButton {
-                                    iconName: "content_copy"
-                                    iconSize: Theme.iconSize - 6
-                                    iconColor: Theme.surfaceText
-                                    buttonSize: 36
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    onClicked: () => {
-                                        root.copyColorToClipboard(hexInput.text)
-                                    }
-                                }
-                            }
-                        }
-
-                        Column {
-                            width: (parent.width - Theme.spacingM * 2) / 3
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("RGB")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceTextMedium
-                                font.weight: Font.Medium
-                            }
-
-                            Row {
-                                width: parent.width
-                                spacing: Theme.spacingXS
-
-                                Rectangle {
-                                    width: parent.width - 36
-                                    height: 36
-                                    radius: Theme.cornerRadius
-                                    color: Theme.surfaceHover
-                                    border.color: Theme.outline
-                                    border.width: 1
-
-                                    StyledText {
-                                        anchors.centerIn: parent
-                                        text: {
-                                            const r = Math.round(root.currentColor.r * 255)
-                                            const g = Math.round(root.currentColor.g * 255)
-                                            const b = Math.round(root.currentColor.b * 255)
-                                            if (root.alpha < 1) {
-                                                const a = Math.round(root.alpha * 255)
-                                                return `${r}, ${g}, ${b}, ${a}`
-                                            }
-                                            return `${r}, ${g}, ${b}`
-                                        }
-                                        font.pixelSize: Theme.fontSizeMedium
-                                        color: Theme.surfaceText
-                                    }
-                                }
-
-                                DankActionButton {
-                                    iconName: "content_copy"
-                                    iconSize: Theme.iconSize - 6
-                                    iconColor: Theme.surfaceText
-                                    buttonSize: 36
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    onClicked: () => {
-                                        const r = Math.round(root.currentColor.r * 255)
-                                        const g = Math.round(root.currentColor.g * 255)
-                                        const b = Math.round(root.currentColor.b * 255)
-                                        let rgbString
-                                        if (root.alpha < 1) {
-                                            const a = Math.round(root.alpha * 255)
-                                            rgbString = `rgba(${r}, ${g}, ${b}, ${a})`
-                                        } else {
-                                            rgbString = `rgb(${r}, ${g}, ${b})`
-                                        }
-                                        Quickshell.execDetached(["sh", "-c", `echo "${rgbString}" | wl-copy`])
-                                        ToastService.showInfo(`${rgbString} copied`)
-                                    }
-                                }
-                            }
-                        }
-
-                        Column {
-                            width: (parent.width - Theme.spacingM * 2) / 3
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("HSV")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceTextMedium
-                                font.weight: Font.Medium
-                            }
-
-                            Row {
-                                width: parent.width
-                                spacing: Theme.spacingXS
-
-                                Rectangle {
-                                    width: parent.width - 36
-                                    height: 36
-                                    radius: Theme.cornerRadius
-                                    color: Theme.surfaceHover
-                                    border.color: Theme.outline
-                                    border.width: 1
-
-                                    StyledText {
-                                        anchors.centerIn: parent
-                                        text: {
-                                            const h = Math.round(root.hue * 360)
-                                            const s = Math.round(root.saturation * 100)
-                                            const v = Math.round(root.value * 100)
-                                            if (root.alpha < 1) {
-                                                const a = Math.round(root.alpha * 100)
-                                                return `${h}°, ${s}%, ${v}%, ${a}%`
-                                            }
-                                            return `${h}°, ${s}%, ${v}%`
-                                        }
-                                        font.pixelSize: Theme.fontSizeMedium
-                                        color: Theme.surfaceText
-                                    }
-                                }
-
-                                DankActionButton {
-                                    iconName: "content_copy"
-                                    iconSize: Theme.iconSize - 6
-                                    iconColor: Theme.surfaceText
-                                    buttonSize: 36
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    onClicked: () => {
-                                        const h = Math.round(root.hue * 360)
-                                        const s = Math.round(root.saturation * 100)
-                                        const v = Math.round(root.value * 100)
-                                        let hsvString
-                                        if (root.alpha < 1) {
-                                            const a = Math.round(root.alpha * 100)
-                                            hsvString = `${h}, ${s}, ${v}, ${a}`
-                                        } else {
-                                            hsvString = `${h}, ${s}, ${v}`
-                                        }
-                                        Quickshell.execDetached(["sh", "-c", `echo "${hsvString}" | wl-copy`])
-                                        ToastService.showInfo(`HSV ${hsvString} copied`)
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    DankButton {
-                        visible: root.onColorSelectedCallback !== null && root.onColorSelectedCallback !== undefined
-                        width: 70
-                        buttonHeight: 36
-                        text: I18n.tr("Save")
-                        backgroundColor: Theme.primary
-                        textColor: Theme.background
-                        anchors.right: parent.right
-                        onClicked: {
-                            SessionData.addRecentColor(root.currentColor)
-                            root.colorSelected(root.currentColor)
-                            root.hide()
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Modals/DisplayConfirmationModal.qml
+++ b/Modals/DisplayConfirmationModal.qml
@@ -1,246 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    property string outputName: ""
-    property var position: undefined
-    property var mode: undefined
-    property var vrr: undefined
-    property int countdown: 15
-
-    shouldBeVisible: false
-    allowStacking: true
-    width: 420
-    height: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 200
-
-    Timer {
-        id: countdownTimer
-        interval: 1000
-        repeat: true
-        running: root.shouldBeVisible
-        onTriggered: {
-            countdown--
-            if (countdown <= 0) {
-                revert()
-            }
-        }
-    }
-
-    onOpened: {
-        countdown = 15
-        countdownTimer.start()
-    }
-
-    onClosed: {
-        countdownTimer.stop()
-    }
-
-    onBackgroundClicked: revert
-
-    content: Component {
-        FocusScope {
-            id: confirmContent
-
-            anchors.fill: parent
-            focus: true
-            implicitHeight: mainColumn.implicitHeight
-
-            Keys.onEscapePressed: event => {
-                revert()
-                event.accepted = true
-            }
-
-            Keys.onReturnPressed: event => {
-                confirm()
-                event.accepted = true
-            }
-
-            Column {
-                id: mainColumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.leftMargin: Theme.spacingM
-                anchors.rightMargin: Theme.spacingM
-                anchors.topMargin: Theme.spacingM
-                spacing: Theme.spacingM
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        text: I18n.tr("Confirm Display Changes")
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Display settings for ") + outputName
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceTextMedium
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 80
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceContainerHighest
-
-                    Column {
-                        anchors.centerIn: parent
-                        spacing: 4
-
-                        StyledText {
-                            text: I18n.tr("Reverting in:")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceTextMedium
-                            anchors.horizontalCenter: parent.horizontalCenter
-                        }
-
-                        StyledText {
-                            text: countdown + "s"
-                            font.pixelSize: Theme.fontSizeXLarge * 1.5
-                            color: Theme.primary
-                            font.weight: Font.Bold
-                            anchors.horizontalCenter: parent.horizontalCenter
-                        }
-                    }
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        text: I18n.tr("Changes:")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceTextMedium
-                        font.weight: Font.Medium
-                    }
-
-                    StyledText {
-                        visible: position !== undefined && position !== null
-                        text: I18n.tr("Position: ") + (position ? position.x + ", " + position.y : "")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceText
-                    }
-
-                    StyledText {
-                        visible: mode !== undefined && mode !== null && mode !== ""
-                        text: I18n.tr("Mode: ") + (mode || "")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceText
-                    }
-
-                    StyledText {
-                        visible: vrr !== undefined && vrr !== null
-                        text: I18n.tr("VRR: ") + (vrr ? I18n.tr("Enabled") : I18n.tr("Disabled"))
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceText
-                    }
-                }
-
-                Item {
-                    width: parent.width
-                    height: 36
-
-                    Row {
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        Rectangle {
-                            width: Math.max(70, revertText.contentWidth + Theme.spacingM * 2)
-                            height: 36
-                            radius: Theme.cornerRadius
-                            color: revertArea.containsMouse ? Theme.surfaceTextHover : "transparent"
-                            border.color: Theme.surfaceVariantAlpha
-                            border.width: 1
-
-                            StyledText {
-                                id: revertText
-
-                                anchors.centerIn: parent
-                                text: I18n.tr("Revert")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                            }
-
-                            MouseArea {
-                                id: revertArea
-
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: revert
-                            }
-                        }
-
-                        Rectangle {
-                            width: Math.max(80, confirmText.contentWidth + Theme.spacingM * 2)
-                            height: 36
-                            radius: Theme.cornerRadius
-                            color: confirmArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
-
-                            StyledText {
-                                id: confirmText
-
-                                anchors.centerIn: parent
-                                text: I18n.tr("Keep Changes")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.background
-                                font.weight: Font.Medium
-                            }
-
-                            MouseArea {
-                                id: confirmArea
-
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: confirm
-                            }
-
-                            Behavior on color {
-                                ColorAnimation {
-                                    duration: Theme.shortDuration
-                                    easing.type: Theme.standardEasing
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            DankActionButton {
-                anchors.top: parent.top
-                anchors.right: parent.right
-                anchors.topMargin: Theme.spacingM
-                anchors.rightMargin: Theme.spacingM
-                iconName: "close"
-                iconSize: Theme.iconSize - 4
-                iconColor: Theme.surfaceText
-                onClicked: revert
-            }
-        }
-    }
-
-    function confirm() {
-        displaysTab.confirmChanges()
-        close()
-    }
-
-    function revert() {
-        displaysTab.revertChanges()
-        close()
-    }
-}
--- a/Modals/FileBrowser/FileBrowserGridDelegate.qml
+++ b/Modals/FileBrowser/FileBrowserGridDelegate.qml
@@ -1,204 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import qs.Common
-import qs.Widgets
-
-StyledRect {
-    id: delegateRoot
-
-    required property bool fileIsDir
-    required property string filePath
-    required property string fileName
-    required property int index
-
-    property bool weMode: false
-    property var iconSizes: [80, 120, 160, 200]
-    property int iconSizeIndex: 1
-    property int selectedIndex: -1
-    property bool keyboardNavigationActive: false
-
-    signal itemClicked(int index, string path, string name, bool isDir)
-    signal itemSelected(int index, string path, string name, bool isDir)
-
-    function getFileExtension(fileName) {
-        const parts = fileName.split('.')
-        if (parts.length > 1) {
-            return parts[parts.length - 1].toLowerCase()
-        }
-        return ""
-    }
-
-    function determineFileType(fileName) {
-        const ext = getFileExtension(fileName)
-
-        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
-        if (imageExts.includes(ext)) {
-            return "image"
-        }
-
-        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
-        if (videoExts.includes(ext)) {
-            return "video"
-        }
-
-        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
-        if (audioExts.includes(ext)) {
-            return "audio"
-        }
-
-        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
-        if (codeExts.includes(ext)) {
-            return "code"
-        }
-
-        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
-        if (docExts.includes(ext)) {
-            return "document"
-        }
-
-        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
-        if (archiveExts.includes(ext)) {
-            return "archive"
-        }
-
-        if (!ext || fileName.indexOf('.') === -1) {
-            return "binary"
-        }
-
-        return "file"
-    }
-
-    function isImageFile(fileName) {
-        if (!fileName) {
-            return false
-        }
-        return determineFileType(fileName) === "image"
-    }
-
-    function getIconForFile(fileName) {
-        const lowerName = fileName.toLowerCase()
-        if (lowerName.startsWith("dockerfile")) {
-            return "docker"
-        }
-        const ext = fileName.split('.').pop()
-        return ext || ""
-    }
-
-    width: weMode ? 245 : iconSizes[iconSizeIndex] + 16
-    height: weMode ? 205 : iconSizes[iconSizeIndex] + 48
-    radius: Theme.cornerRadius
-    color: {
-        if (keyboardNavigationActive && delegateRoot.index === selectedIndex)
-            return Theme.surfacePressed
-
-        return mouseArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) : "transparent"
-    }
-    border.color: keyboardNavigationActive && delegateRoot.index === selectedIndex ? Theme.primary : "transparent"
-    border.width: (keyboardNavigationActive && delegateRoot.index === selectedIndex) ? 2 : 0
-
-    Component.onCompleted: {
-        if (keyboardNavigationActive && delegateRoot.index === selectedIndex)
-            itemSelected(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir)
-    }
-
-    onSelectedIndexChanged: {
-        if (keyboardNavigationActive && selectedIndex === delegateRoot.index)
-            itemSelected(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir)
-    }
-
-    Column {
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-
-        Item {
-            width: weMode ? 225 : (iconSizes[iconSizeIndex] - 8)
-            height: weMode ? 165 : (iconSizes[iconSizeIndex] - 8)
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            CachingImage {
-                id: gridPreviewImage
-                anchors.fill: parent
-                anchors.margins: 2
-                property var weExtensions: [".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tga"]
-                property int weExtIndex: 0
-                source: {
-                    if (weMode && delegateRoot.fileIsDir) {
-                        return "file://" + delegateRoot.filePath + "/preview" + weExtensions[weExtIndex]
-                    }
-                    return (!delegateRoot.fileIsDir && isImageFile(delegateRoot.fileName)) ? ("file://" + delegateRoot.filePath) : ""
-                }
-                onStatusChanged: {
-                    if (weMode && delegateRoot.fileIsDir && status === Image.Error) {
-                        if (weExtIndex < weExtensions.length - 1) {
-                            weExtIndex++
-                            source = "file://" + delegateRoot.filePath + "/preview" + weExtensions[weExtIndex]
-                        } else {
-                            source = ""
-                        }
-                    }
-                }
-                fillMode: Image.PreserveAspectCrop
-                maxCacheSize: weMode ? 225 : iconSizes[iconSizeIndex]
-                visible: false
-            }
-
-            MultiEffect {
-                anchors.fill: parent
-                anchors.margins: 2
-                source: gridPreviewImage
-                maskEnabled: true
-                maskSource: gridImageMask
-                visible: gridPreviewImage.status === Image.Ready && ((!delegateRoot.fileIsDir && isImageFile(delegateRoot.fileName)) || (weMode && delegateRoot.fileIsDir))
-                maskThresholdMin: 0.5
-                maskSpreadAtMin: 1
-            }
-
-            Item {
-                id: gridImageMask
-                anchors.fill: parent
-                anchors.margins: 2
-                layer.enabled: true
-                layer.smooth: true
-                visible: false
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: "black"
-                    antialiasing: true
-                }
-            }
-
-            DankNFIcon {
-                anchors.centerIn: parent
-                name: delegateRoot.fileIsDir ? "folder" : getIconForFile(delegateRoot.fileName)
-                size: iconSizes[iconSizeIndex] * 0.45
-                color: delegateRoot.fileIsDir ? Theme.primary : Theme.surfaceText
-                visible: (!delegateRoot.fileIsDir && !isImageFile(delegateRoot.fileName)) || (delegateRoot.fileIsDir && !weMode)
-            }
-        }
-
-        StyledText {
-            text: delegateRoot.fileName || ""
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.surfaceText
-            width: delegateRoot.width - Theme.spacingM
-            elide: Text.ElideRight
-            horizontalAlignment: Text.AlignHCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-            maximumLineCount: 2
-            wrapMode: Text.Wrap
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            itemClicked(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir)
-        }
-    }
-}
--- a/Modals/FileBrowser/FileBrowserListDelegate.qml
+++ b/Modals/FileBrowser/FileBrowserListDelegate.qml
@@ -1,209 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import qs.Common
-import qs.Widgets
-
-StyledRect {
-    id: listDelegateRoot
-
-    required property bool fileIsDir
-    required property string filePath
-    required property string fileName
-    required property int index
-    required property var fileModified
-    required property int fileSize
-
-    property int selectedIndex: -1
-    property bool keyboardNavigationActive: false
-
-    signal itemClicked(int index, string path, string name, bool isDir)
-    signal itemSelected(int index, string path, string name, bool isDir)
-
-    function getFileExtension(fileName) {
-        const parts = fileName.split('.')
-        if (parts.length > 1) {
-            return parts[parts.length - 1].toLowerCase()
-        }
-        return ""
-    }
-
-    function determineFileType(fileName) {
-        const ext = getFileExtension(fileName)
-
-        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
-        if (imageExts.includes(ext)) {
-            return "image"
-        }
-
-        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
-        if (videoExts.includes(ext)) {
-            return "video"
-        }
-
-        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
-        if (audioExts.includes(ext)) {
-            return "audio"
-        }
-
-        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
-        if (codeExts.includes(ext)) {
-            return "code"
-        }
-
-        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
-        if (docExts.includes(ext)) {
-            return "document"
-        }
-
-        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
-        if (archiveExts.includes(ext)) {
-            return "archive"
-        }
-
-        if (!ext || fileName.indexOf('.') === -1) {
-            return "binary"
-        }
-
-        return "file"
-    }
-
-    function isImageFile(fileName) {
-        if (!fileName) {
-            return false
-        }
-        return determineFileType(fileName) === "image"
-    }
-
-    function getIconForFile(fileName) {
-        const lowerName = fileName.toLowerCase()
-        if (lowerName.startsWith("dockerfile")) {
-            return "docker"
-        }
-        const ext = fileName.split('.').pop()
-        return ext || ""
-    }
-
-    function formatFileSize(size) {
-        if (size < 1024)
-            return size + " B"
-        if (size < 1024 * 1024)
-            return (size / 1024).toFixed(1) + " KB"
-        if (size < 1024 * 1024 * 1024)
-            return (size / (1024 * 1024)).toFixed(1) + " MB"
-        return (size / (1024 * 1024 * 1024)).toFixed(1) + " GB"
-    }
-
-    height: 44
-    radius: Theme.cornerRadius
-    color: {
-        if (keyboardNavigationActive && listDelegateRoot.index === selectedIndex)
-            return Theme.surfacePressed
-        return listMouseArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) : "transparent"
-    }
-    border.color: keyboardNavigationActive && listDelegateRoot.index === selectedIndex ? Theme.primary : "transparent"
-    border.width: (keyboardNavigationActive && listDelegateRoot.index === selectedIndex) ? 2 : 0
-
-    Component.onCompleted: {
-        if (keyboardNavigationActive && listDelegateRoot.index === selectedIndex)
-            itemSelected(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir)
-    }
-
-    onSelectedIndexChanged: {
-        if (keyboardNavigationActive && selectedIndex === listDelegateRoot.index)
-            itemSelected(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir)
-    }
-
-    Row {
-        anchors.fill: parent
-        anchors.leftMargin: Theme.spacingS
-        anchors.rightMargin: Theme.spacingS
-        spacing: Theme.spacingS
-
-        Item {
-            width: 28
-            height: 28
-            anchors.verticalCenter: parent.verticalCenter
-
-            CachingImage {
-                id: listPreviewImage
-                anchors.fill: parent
-                source: (!listDelegateRoot.fileIsDir && isImageFile(listDelegateRoot.fileName)) ? ("file://" + listDelegateRoot.filePath) : ""
-                fillMode: Image.PreserveAspectCrop
-                maxCacheSize: 32
-                visible: false
-            }
-
-            MultiEffect {
-                anchors.fill: parent
-                source: listPreviewImage
-                maskEnabled: true
-                maskSource: listImageMask
-                visible: listPreviewImage.status === Image.Ready && !listDelegateRoot.fileIsDir && isImageFile(listDelegateRoot.fileName)
-                maskThresholdMin: 0.5
-                maskSpreadAtMin: 1
-            }
-
-            Item {
-                id: listImageMask
-                anchors.fill: parent
-                layer.enabled: true
-                layer.smooth: true
-                visible: false
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: "black"
-                    antialiasing: true
-                }
-            }
-
-            DankNFIcon {
-                anchors.centerIn: parent
-                name: listDelegateRoot.fileIsDir ? "folder" : getIconForFile(listDelegateRoot.fileName)
-                size: Theme.iconSize - 2
-                color: listDelegateRoot.fileIsDir ? Theme.primary : Theme.surfaceText
-                visible: listDelegateRoot.fileIsDir || !isImageFile(listDelegateRoot.fileName)
-            }
-        }
-
-        StyledText {
-            text: listDelegateRoot.fileName || ""
-            font.pixelSize: Theme.fontSizeMedium
-            color: Theme.surfaceText
-            width: parent.width - 280
-            elide: Text.ElideRight
-            anchors.verticalCenter: parent.verticalCenter
-            maximumLineCount: 1
-            clip: true
-        }
-
-        StyledText {
-            text: listDelegateRoot.fileIsDir ? "" : formatFileSize(listDelegateRoot.fileSize)
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.surfaceTextMedium
-            width: 70
-            horizontalAlignment: Text.AlignRight
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: Qt.formatDateTime(listDelegateRoot.fileModified, "MMM d, yyyy h:mm AP")
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.surfaceTextMedium
-            width: 140
-            horizontalAlignment: Text.AlignRight
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
-
-    MouseArea {
-        id: listMouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            itemClicked(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir)
-        }
-    }
-}
--- a/Modals/FileBrowser/FileBrowserModal.qml
+++ b/Modals/FileBrowser/FileBrowserModal.qml
--- a/Modals/FileBrowser/FileBrowserNavigation.qml
+++ b/Modals/FileBrowser/FileBrowserNavigation.qml
@@ -1,130 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Row {
-    id: navigation
-
-    property string currentPath: ""
-    property string homeDir: ""
-    property bool backButtonFocused: false
-    property bool keyboardNavigationActive: false
-    property bool showSidebar: true
-    property bool pathEditMode: false
-    property bool pathInputHasFocus: false
-
-    signal navigateUp()
-    signal navigateTo(string path)
-    signal pathInputFocusChanged(bool hasFocus)
-
-    height: 40
-    leftPadding: Theme.spacingM
-    rightPadding: Theme.spacingM
-    spacing: Theme.spacingS
-
-    StyledRect {
-        width: 32
-        height: 32
-        radius: Theme.cornerRadius
-        color: (backButtonMouseArea.containsMouse || (backButtonFocused && keyboardNavigationActive)) && currentPath !== homeDir ? Theme.surfaceVariant : "transparent"
-        opacity: currentPath !== homeDir ? 1 : 0
-        anchors.verticalCenter: parent.verticalCenter
-
-        DankIcon {
-            anchors.centerIn: parent
-            name: "arrow_back"
-            size: Theme.iconSizeSmall
-            color: Theme.surfaceText
-        }
-
-        MouseArea {
-            id: backButtonMouseArea
-
-            anchors.fill: parent
-            hoverEnabled: currentPath !== homeDir
-            cursorShape: currentPath !== homeDir ? Qt.PointingHandCursor : Qt.ArrowCursor
-            enabled: currentPath !== homeDir
-            onClicked: navigation.navigateUp()
-        }
-    }
-
-    Item {
-        width: Math.max(0, (parent?.width ?? 0) - 40 - Theme.spacingS - (showSidebar ? 0 : 80))
-        height: 32
-        anchors.verticalCenter: parent.verticalCenter
-
-        StyledRect {
-            anchors.fill: parent
-            radius: Theme.cornerRadius
-            color: pathEditMode ? Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) : "transparent"
-            border.color: pathEditMode ? Theme.primary : "transparent"
-            border.width: pathEditMode ? 1 : 0
-            visible: !pathEditMode
-
-            StyledText {
-                id: pathDisplay
-                text: currentPath.replace("file://", "")
-                font.pixelSize: Theme.fontSizeMedium
-                color: Theme.surfaceText
-                font.weight: Font.Medium
-                anchors.fill: parent
-                anchors.leftMargin: Theme.spacingS
-                anchors.rightMargin: Theme.spacingS
-                elide: Text.ElideMiddle
-                verticalAlignment: Text.AlignVCenter
-                maximumLineCount: 1
-                wrapMode: Text.NoWrap
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                cursorShape: Qt.IBeamCursor
-                onClicked: {
-                    pathEditMode = true
-                    pathInput.text = currentPath.replace("file://", "")
-                    Qt.callLater(() => pathInput.forceActiveFocus())
-                }
-            }
-        }
-
-        DankTextField {
-            id: pathInput
-            anchors.fill: parent
-            visible: pathEditMode
-            topPadding: Theme.spacingXS
-            bottomPadding: Theme.spacingXS
-            onAccepted: {
-                const newPath = text.trim()
-                if (newPath !== "") {
-                    navigation.navigateTo(newPath)
-                }
-                pathEditMode = false
-            }
-            Keys.onEscapePressed: {
-                pathEditMode = false
-            }
-            Keys.onDownPressed: {
-                pathEditMode = false
-            }
-            onActiveFocusChanged: {
-                navigation.pathInputFocusChanged(activeFocus)
-                if (!activeFocus && pathEditMode) {
-                    pathEditMode = false
-                }
-            }
-        }
-    }
-
-    Row {
-        spacing: Theme.spacingXS
-        visible: !showSidebar
-        anchors.verticalCenter: parent.verticalCenter
-
-        DankActionButton {
-            circular: false
-            iconName: "sort"
-            iconSize: Theme.iconSize - 6
-            iconColor: Theme.surfaceText
-        }
-    }
-}
--- a/Modals/FileBrowser/FileBrowserOverwriteDialog.qml
+++ b/Modals/FileBrowser/FileBrowserOverwriteDialog.qml
@@ -1,127 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: overwriteDialog
-
-    property bool showDialog: false
-    property string pendingFilePath: ""
-
-    signal confirmed(string filePath)
-    signal cancelled()
-
-    visible: showDialog
-    focus: showDialog
-
-    Keys.onEscapePressed: {
-        cancelled()
-    }
-
-    Keys.onReturnPressed: {
-        confirmed(pendingFilePath)
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        color: Theme.shadowStrong
-        opacity: 0.8
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                cancelled()
-            }
-        }
-    }
-
-    StyledRect {
-        anchors.centerIn: parent
-        width: 400
-        height: 160
-        color: Theme.surfaceContainer
-        radius: Theme.cornerRadius
-        border.color: Theme.outlineMedium
-        border.width: 1
-
-        Column {
-            anchors.centerIn: parent
-            width: parent.width - Theme.spacingL * 2
-            spacing: Theme.spacingM
-
-            StyledText {
-                text: I18n.tr("File Already Exists")
-                font.pixelSize: Theme.fontSizeLarge
-                font.weight: Font.Medium
-                color: Theme.surfaceText
-                anchors.horizontalCenter: parent.horizontalCenter
-            }
-
-            StyledText {
-                text: I18n.tr("A file with this name already exists. Do you want to overwrite it?")
-                font.pixelSize: Theme.fontSizeMedium
-                color: Theme.surfaceTextMedium
-                width: parent.width
-                wrapMode: Text.WordWrap
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            Row {
-                anchors.horizontalCenter: parent.horizontalCenter
-                spacing: Theme.spacingM
-
-                StyledRect {
-                    width: 80
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: cancelArea.containsMouse ? Theme.surfaceVariantHover : Theme.surfaceVariant
-                    border.color: Theme.outline
-                    border.width: 1
-
-                    StyledText {
-                        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: {
-                            cancelled()
-                        }
-                    }
-                }
-
-                StyledRect {
-                    width: 90
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: overwriteArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
-
-                    StyledText {
-                        anchors.centerIn: parent
-                        text: I18n.tr("Overwrite")
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.background
-                        font.weight: Font.Medium
-                    }
-
-                    MouseArea {
-                        id: overwriteArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            confirmed(pendingFilePath)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Modals/FileBrowser/FileBrowserSaveRow.qml
+++ b/Modals/FileBrowser/FileBrowserSaveRow.qml
@@ -1,74 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Row {
-    id: saveRow
-
-    property bool saveMode: false
-    property string defaultFileName: ""
-    property string currentPath: ""
-
-    signal saveRequested(string filePath)
-
-    height: saveMode ? 40 : 0
-    visible: saveMode
-    spacing: Theme.spacingM
-
-    DankTextField {
-        id: fileNameInput
-
-        width: parent.width - saveButton.width - Theme.spacingM
-        height: 40
-        text: defaultFileName
-        placeholderText: I18n.tr("Enter filename...")
-        ignoreLeftRightKeys: false
-        focus: saveMode
-        topPadding: Theme.spacingS
-        bottomPadding: Theme.spacingS
-        Component.onCompleted: {
-            if (saveMode)
-                Qt.callLater(() => {
-                                 forceActiveFocus()
-                             })
-        }
-        onAccepted: {
-            if (text.trim() !== "") {
-                var basePath = currentPath.replace(/^file:\/\//, '')
-                var fullPath = basePath + "/" + text.trim()
-                fullPath = fullPath.replace(/\/+/g, '/')
-                saveRequested(fullPath)
-            }
-        }
-    }
-
-    StyledRect {
-        id: saveButton
-
-        width: 80
-        height: 40
-        color: fileNameInput.text.trim() !== "" ? Theme.primary : Theme.surfaceVariant
-        radius: Theme.cornerRadius
-
-        StyledText {
-            anchors.centerIn: parent
-            text: I18n.tr("Save")
-            color: fileNameInput.text.trim() !== "" ? Theme.primaryText : Theme.surfaceVariantText
-            font.pixelSize: Theme.fontSizeMedium
-        }
-
-        StateLayer {
-            stateColor: Theme.primary
-            cornerRadius: Theme.cornerRadius
-            enabled: fileNameInput.text.trim() !== ""
-            onClicked: {
-                if (fileNameInput.text.trim() !== "") {
-                    var basePath = currentPath.replace(/^file:\/\//, '')
-                    var fullPath = basePath + "/" + fileNameInput.text.trim()
-                    fullPath = fullPath.replace(/\/+/g, '/')
-                    saveRequested(fullPath)
-                }
-            }
-        }
-    }
-}
--- a/Modals/FileBrowser/FileBrowserSidebar.qml
+++ b/Modals/FileBrowser/FileBrowserSidebar.qml
@@ -1,70 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-StyledRect {
-    id: sidebar
-
-    property var quickAccessLocations: []
-    property string currentPath: ""
-    signal locationSelected(string path)
-
-    width: 200
-    color: Theme.surface
-    clip: true
-
-    Column {
-        anchors.fill: parent
-        anchors.margins: Theme.spacingS
-        spacing: 4
-
-        StyledText {
-            text: "Quick Access"
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.surfaceTextMedium
-            font.weight: Font.Medium
-            leftPadding: Theme.spacingS
-            bottomPadding: Theme.spacingXS
-        }
-
-        Repeater {
-            model: quickAccessLocations
-
-            StyledRect {
-                width: parent?.width ?? 0
-                height: 38
-                radius: Theme.cornerRadius
-                color: quickAccessMouseArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) : (currentPath === modelData?.path ? Theme.surfacePressed : "transparent")
-
-                Row {
-                    anchors.fill: parent
-                    anchors.leftMargin: Theme.spacingM
-                    spacing: Theme.spacingS
-
-                    DankIcon {
-                        name: modelData?.icon ?? ""
-                        size: Theme.iconSize - 2
-                        color: currentPath === modelData?.path ? Theme.primary : Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: modelData?.name ?? ""
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: currentPath === modelData?.path ? Theme.primary : Theme.surfaceText
-                        font.weight: currentPath === modelData?.path ? Font.Medium : Font.Normal
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                MouseArea {
-                    id: quickAccessMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: locationSelected(modelData?.path ?? "")
-                }
-            }
-        }
-    }
-}
--- a/Modals/FileBrowser/FileBrowserSortMenu.qml
+++ b/Modals/FileBrowser/FileBrowserSortMenu.qml
@@ -1,183 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-StyledRect {
-    id: sortMenu
-
-    property string sortBy: "name"
-    property bool sortAscending: true
-
-    signal sortBySelected(string value)
-    signal sortOrderSelected(bool ascending)
-
-    width: 200
-    height: sortColumn.height + Theme.spacingM * 2
-    color: Theme.surfaceContainer
-    radius: Theme.cornerRadius
-    border.color: Theme.outlineMedium
-    border.width: 1
-    visible: false
-    z: 100
-
-    Column {
-        id: sortColumn
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.margins: Theme.spacingM
-        spacing: Theme.spacingXS
-
-        StyledText {
-            text: "Sort By"
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.surfaceTextMedium
-            font.weight: Font.Medium
-        }
-
-        Repeater {
-            model: [{
-                    "name": "Name",
-                    "value": "name"
-                }, {
-                    "name": "Size",
-                    "value": "size"
-                }, {
-                    "name": "Modified",
-                    "value": "modified"
-                }, {
-                    "name": "Type",
-                    "value": "type"
-                }]
-
-            StyledRect {
-                width: sortColumn?.width ?? 0
-                height: 32
-                radius: Theme.cornerRadius
-                color: sortMouseArea.containsMouse ? Theme.surfaceVariant : (sortBy === modelData?.value ? Theme.surfacePressed : "transparent")
-
-                Row {
-                    anchors.fill: parent
-                    anchors.leftMargin: Theme.spacingS
-                    spacing: Theme.spacingS
-
-                    DankIcon {
-                        name: sortBy === modelData?.value ? "check" : ""
-                        size: Theme.iconSizeSmall
-                        color: Theme.primary
-                        anchors.verticalCenter: parent.verticalCenter
-                        visible: sortBy === modelData?.value
-                    }
-
-                    StyledText {
-                        text: modelData?.name ?? ""
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: sortBy === modelData?.value ? Theme.primary : Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                MouseArea {
-                    id: sortMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        sortMenu.sortBySelected(modelData?.value ?? "name")
-                        sortMenu.visible = false
-                    }
-                }
-            }
-        }
-
-        StyledRect {
-            width: sortColumn.width
-            height: 1
-            color: Theme.outline
-        }
-
-        StyledText {
-            text: "Order"
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.surfaceTextMedium
-            font.weight: Font.Medium
-            topPadding: Theme.spacingXS
-        }
-
-        StyledRect {
-            width: sortColumn?.width ?? 0
-            height: 32
-            radius: Theme.cornerRadius
-            color: ascMouseArea.containsMouse ? Theme.surfaceVariant : (sortAscending ? Theme.surfacePressed : "transparent")
-
-            Row {
-                anchors.fill: parent
-                anchors.leftMargin: Theme.spacingS
-                spacing: Theme.spacingS
-
-                DankIcon {
-                    name: "arrow_upward"
-                    size: Theme.iconSizeSmall
-                    color: sortAscending ? Theme.primary : Theme.surfaceText
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                StyledText {
-                    text: "Ascending"
-                    font.pixelSize: Theme.fontSizeMedium
-                    color: sortAscending ? Theme.primary : Theme.surfaceText
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-            }
-
-            MouseArea {
-                id: ascMouseArea
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    sortMenu.sortOrderSelected(true)
-                    sortMenu.visible = false
-                }
-            }
-        }
-
-        StyledRect {
-            width: sortColumn?.width ?? 0
-            height: 32
-            radius: Theme.cornerRadius
-            color: descMouseArea.containsMouse ? Theme.surfaceVariant : (!sortAscending ? Theme.surfacePressed : "transparent")
-
-            Row {
-                anchors.fill: parent
-                anchors.leftMargin: Theme.spacingS
-                spacing: Theme.spacingS
-
-                DankIcon {
-                    name: "arrow_downward"
-                    size: Theme.iconSizeSmall
-                    color: !sortAscending ? Theme.primary : Theme.surfaceText
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                StyledText {
-                    text: "Descending"
-                    font.pixelSize: Theme.fontSizeMedium
-                    color: !sortAscending ? Theme.primary : Theme.surfaceText
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-            }
-
-            MouseArea {
-                id: descMouseArea
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    sortMenu.sortOrderSelected(false)
-                    sortMenu.visible = false
-                }
-            }
-        }
-    }
-}
--- a/Modals/FileBrowser/FileInfo.qml
+++ b/Modals/FileBrowser/FileInfo.qml
@@ -134,7 +134,7 @@ Rectangle {
            }

            StyledText {
-                text: I18n.tr("File Information")
+                text: "File Information"
                font.pixelSize: Theme.fontSizeMedium
                color: Theme.surfaceText
                font.weight: Font.Medium
@@ -197,7 +197,7 @@ Rectangle {
    }

    StyledText {
-        text: I18n.tr("F1/I: Toggle • F10: Help")
+        text: "F1/I: Toggle • F10: Help"
        font.pixelSize: Theme.fontSizeSmall
        color: Theme.surfaceTextMedium
        anchors.bottom: parent.bottom
--- a/Modals/FileBrowser/KeyboardHints.qml
+++ b/Modals/FileBrowser/KeyboardHints.qml
@@ -23,7 +23,7 @@ Rectangle {
        spacing: 2

        StyledText {
-            text: I18n.tr("Tab/Shift+Tab: Nav • ←→↑↓: Grid Nav • Enter/Space: Select")
+            text: "Tab/Shift+Tab: Nav • ←→↑↓: Grid Nav • Enter/Space: Select"
            font.pixelSize: Theme.fontSizeSmall
            color: Theme.surfaceText
            width: parent.width
@@ -32,7 +32,7 @@ Rectangle {
        }

        StyledText {
-            text: I18n.tr("Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close")
+            text: "Alt+←/Backspace: Back • F1/I: File Info • F10: Help • Esc: Close"
            font.pixelSize: Theme.fontSizeSmall
            color: Theme.surfaceText
            width: parent.width
--- a/Modals/KeybindsModal.qml
+++ b/Modals/KeybindsModal.qml
@@ -1,232 +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
-
-    layerNamespace: "dms:keybinds"
-    property real scrollStep: 60
-    property var activeFlickable: null
-    property real _maxW: Math.min(Screen.width * 0.92, 1200)
-    property real _maxH: Math.min(Screen.height * 0.92, 900)
-    width: _maxW
-    height: _maxH
-    onBackgroundClicked: close()
-
-    function scrollDown() {
-        if (!root.activeFlickable) return
-        let newY = root.activeFlickable.contentY + scrollStep
-        newY = Math.min(newY, root.activeFlickable.contentHeight - root.activeFlickable.height)
-        root.activeFlickable.contentY = newY
-    }
-
-    function scrollUp() {
-        if (!root.activeFlickable) return
-        let newY = root.activeFlickable.contentY - root.scrollStep
-        newY = Math.max(0, newY)
-        root.activeFlickable.contentY = newY
-    }
-
-    Shortcut { sequence: "Ctrl+j"; onActivated: root.scrollDown() }
-    Shortcut { sequence: "Down";   onActivated: root.scrollDown() }
-    Shortcut { sequence: "Ctrl+k"; onActivated: root.scrollUp() }
-    Shortcut { sequence: "Up";     onActivated: root.scrollUp() }
-    Shortcut { sequence: "Esc"; onActivated: root.close() }
-
-    content: Component {
-        Item {
-            anchors.fill: parent
-
-            Column {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingL
-
-                StyledText {
-                    text: KeybindsService.keybinds.title || "Keybinds"
-                    font.pixelSize: Theme.fontSizeLarge
-                    font.weight: Font.Bold
-                    color: Theme.primary
-                }
-
-                DankFlickable {
-                    id: mainFlickable
-                    width: parent.width
-                    height: parent.height - parent.spacing - 40
-                    contentWidth: rowLayout.implicitWidth
-                    contentHeight: rowLayout.implicitHeight
-                    clip: true
-
-                    Component.onCompleted: root.activeFlickable = mainFlickable
-
-                    property var rawBinds: KeybindsService.keybinds.binds || {}
-                    property var categories: {
-                        const processed = {}
-                        for (const cat in rawBinds) {
-                            const binds = rawBinds[cat]
-                            const subcats = {}
-                            let hasSubcats = false
-
-                            for (let i = 0; i < binds.length; i++) {
-                                const bind = binds[i]
-                                if (bind.subcat) {
-                                    hasSubcats = true
-                                    if (!subcats[bind.subcat]) {
-                                        subcats[bind.subcat] = []
-                                    }
-                                    subcats[bind.subcat].push(bind)
-                                } else {
-                                    if (!subcats["_root"]) {
-                                        subcats["_root"] = []
-                                    }
-                                    subcats["_root"].push(bind)
-                                }
-                            }
-
-                            processed[cat] = {
-                                hasSubcats: hasSubcats,
-                                subcats: subcats,
-                                subcatKeys: Object.keys(subcats)
-                            }
-                        }
-                        return processed
-                    }
-                    property var categoryKeys: Object.keys(categories)
-
-                    function distributeCategories(cols) {
-                        const columns = []
-                        for (let i = 0; i < cols; i++) {
-                            columns.push([])
-                        }
-                        for (let i = 0; i < categoryKeys.length; i++) {
-                            columns[i % cols].push(categoryKeys[i])
-                        }
-                        return columns
-                    }
-
-                    Row {
-                        id: rowLayout
-                        width: mainFlickable.width
-                        spacing: Theme.spacingM
-
-                        property int numColumns: Math.max(1, Math.min(3, Math.floor(width / 350)))
-                        property var columnCategories: mainFlickable.distributeCategories(numColumns)
-
-                        Repeater {
-                            model: rowLayout.numColumns
-
-                            Column {
-                                id: masonryColumn
-                                width: (rowLayout.width - rowLayout.spacing * (rowLayout.numColumns - 1)) / rowLayout.numColumns
-                                spacing: Theme.spacingM
-
-                                Repeater {
-                                    model: rowLayout.columnCategories[index] || []
-
-                                    Column {
-                                        id: categoryColumn
-                                        width: parent.width
-                                        spacing: Theme.spacingXS
-
-                                        property string catName: modelData
-                                        property var catData: mainFlickable.categories[catName]
-
-                                StyledText {
-                                    text: categoryColumn.catName
-                                    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.spacingM
-
-                                    Repeater {
-                                        model: categoryColumn.catData?.subcatKeys || []
-
-                                        Column {
-                                            width: parent.width
-                                            spacing: Theme.spacingXS
-
-                                            property string subcatName: modelData
-                                            property var subcatBinds: categoryColumn.catData?.subcats?.[subcatName] || []
-
-                                            StyledText {
-                                                visible: parent.subcatName !== "_root"
-                                                text: parent.subcatName
-                                                font.pixelSize: Theme.fontSizeSmall
-                                                font.weight: Font.DemiBold
-                                                color: Theme.primary
-                                                opacity: 0.7
-                                            }
-
-                                            Column {
-                                                width: parent.width
-                                                spacing: Theme.spacingXS
-
-                                                Repeater {
-                                                    model: parent.parent.subcatBinds
-
-                                                    Row {
-                                                        width: parent.width
-                                                        spacing: Theme.spacingS
-
-                                                        StyledRect {
-                                                            width: Math.min(140, parent.width * 0.42)
-                                                            height: 22
-                                                            radius: 4
-                                                            opacity: 0.9
-
-                                                            StyledText {
-                                                                anchors.centerIn: parent
-                                                                anchors.margins: 2
-                                                                width: parent.width - 4
-                                                                color: Theme.secondary
-                                                                text: modelData.key || ""
-                                                                font.pixelSize: Theme.fontSizeSmall
-                                                                font.weight: Font.Medium
-                                                                isMonospace: true
-                                                                elide: Text.ElideRight
-                                                                horizontalAlignment: Text.AlignHCenter
-                                                            }
-                                                        }
-
-                                                        StyledText {
-                                                            width: parent.width - 150
-                                                            text: modelData.desc || ""
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            opacity: 0.9
-                                                            elide: Text.ElideRight
-                                                            anchors.verticalCenter: parent.verticalCenter
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Modals/NetworkInfoModal.qml
+++ b/Modals/NetworkInfoModal.qml
@@ -8,8 +8,6 @@ import qs.Widgets
 DankModal {
    id: root

-    layerNamespace: "dms:network-info"
-
    property bool networkInfoModalVisible: false
    property string networkSSID: ""
    property var networkData: null
@@ -58,7 +56,7 @@ DankModal {
                        spacing: Theme.spacingXS

                        StyledText {
-                            text: I18n.tr("Network Information")
+                            text: "Network Information"
                            font.pixelSize: Theme.fontSizeLarge
                            color: Theme.surfaceText
                            font.weight: Font.Medium
@@ -128,7 +126,7 @@ DankModal {
                            id: closeText

                            anchors.centerIn: parent
-                            text: I18n.tr("Close")
+                            text: "Close"
                            font.pixelSize: Theme.fontSizeMedium
                            color: Theme.background
                            font.weight: Font.Medium
--- a/Modals/NetworkWiredInfoModal.qml
+++ b/Modals/NetworkWiredInfoModal.qml
@@ -1,164 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    layerNamespace: "dms:network-info-wired"
-
-    property bool networkWiredInfoModalVisible: false
-    property string networkID: ""
-    property var networkData: null
-
-    function showNetworkInfo(id, data) {
-        networkID = id
-        networkData = data
-        networkWiredInfoModalVisible = true
-        open()
-        NetworkService.fetchWiredNetworkInfo(data.uuid)
-    }
-
-    function hideDialog() {
-        networkWiredInfoModalVisible = false
-        close()
-        networkID = ""
-        networkData = null
-    }
-
-    visible: networkWiredInfoModalVisible
-    width: 600
-    height: 500
-    enableShadow: true
-    onBackgroundClicked: hideDialog()
-    onVisibleChanged: {
-        if (!visible) {
-            networkID = ""
-            networkData = null
-        }
-    }
-
-    content: Component {
-        Item {
-            anchors.fill: parent
-
-            Column {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingL
-
-                Row {
-                    width: parent.width
-
-                    Column {
-                        width: parent.width - 40
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: I18n.tr("Network Information")
-                            font.pixelSize: Theme.fontSizeLarge
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                        }
-
-                        StyledText {
-                            text: `Details for "${networkID}"`
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceTextMedium
-                            width: parent.width
-                            elide: Text.ElideRight
-                        }
-
-                    }
-
-                    DankActionButton {
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: root.hideDialog()
-                    }
-
-                }
-
-                Rectangle {
-                    id: detailsRect
-
-                    width: parent.width
-                    height: parent.height - 140
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: Theme.outlineStrong
-                    border.width: 1
-                    clip: true
-
-                    DankFlickable {
-                        anchors.fill: parent
-                        anchors.margins: Theme.spacingM
-                        contentHeight: detailsText.contentHeight
-
-                        StyledText {
-                            id: detailsText
-
-                            width: parent.width
-                            text: NetworkService.networkWiredInfoDetails && NetworkService.networkWiredInfoDetails.replace(/\\n/g, '\n') || "No information available"
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            wrapMode: Text.WordWrap
-                        }
-                    }
-
-                }
-
-                Item {
-                    width: parent.width
-                    height: 40
-
-                    Rectangle {
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: Math.max(70, closeText.contentWidth + Theme.spacingM * 2)
-                        height: 36
-                        radius: Theme.cornerRadius
-                        color: closeArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
-
-                        StyledText {
-                            id: closeText
-
-                            anchors.centerIn: parent
-                            text: I18n.tr("Close")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.background
-                            font.weight: Font.Medium
-                        }
-
-                        MouseArea {
-                            id: closeArea
-
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: root.hideDialog()
-                        }
-
-                        Behavior on color {
-                            ColorAnimation {
-                                duration: Theme.shortDuration
-                                easing.type: Theme.standardEasing
-                            }
-
-                        }
-
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-}
--- a/Modals/NotificationModal.qml
+++ b/Modals/NotificationModal.qml
@@ -9,8 +9,6 @@ import qs.Widgets
 DankModal {
    id: notificationModal

-    layerNamespace: "dms:notification-center-modal"
-
    property bool notificationModalOpen: false
    property var notificationListRef: null

@@ -22,7 +20,7 @@ DankModal {
        if (modalKeyboardController && notificationListRef) {
            modalKeyboardController.listView = notificationListRef
            modalKeyboardController.rebuildFlatNavigation()
-
+            
            Qt.callLater(() => {
                modalKeyboardController.keyboardNavigationActive = true
                modalKeyboardController.selectedFlatIndex = 0
@@ -56,9 +54,6 @@ DankModal {
    height: 700
    visible: false
    onBackgroundClicked: hide()
-    onOpened: () => {
-        Qt.callLater(() => modalFocusScope.forceActiveFocus());
-    }
    onShouldBeVisibleChanged: (shouldBeVisible) => {
        if (!shouldBeVisible) {
            notificationModalOpen = false
--- a/Modals/PolkitAuthModal.qml
+++ b/Modals/PolkitAuthModal.qml
@@ -1,358 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-
-    layerNamespace: "dms:polkit"
-
-    property string passwordInput: ""
-    property var currentFlow: PolkitService.agent?.flow
-    property bool isLoading: false
-    property real minHeight: 240
-
-    function show() {
-        passwordInput = ""
-        isLoading = false
-        open()
-        Qt.callLater(() => {
-            if (contentLoader.item && contentLoader.item.passwordField) {
-                contentLoader.item.passwordField.forceActiveFocus()
-            }
-        })
-    }
-
-    shouldBeVisible: false
-    width: 420
-    height: Math.max(minHeight, contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 240)
-
-    Connections {
-        target: contentLoader.item
-        function onImplicitHeightChanged() {
-            if (shouldBeVisible && contentLoader.item) {
-                const newHeight = contentLoader.item.implicitHeight + Theme.spacingM * 2
-                if (newHeight > minHeight) {
-                    minHeight = newHeight
-                }
-            }
-        }
-    }
-
-    onOpened: {
-        Qt.callLater(() => {
-            if (contentLoader.item && contentLoader.item.passwordField) {
-                contentLoader.item.passwordField.forceActiveFocus()
-            }
-        })
-    }
-
-    onClosed: {
-        passwordInput = ""
-        isLoading = false
-    }
-
-    onBackgroundClicked: () => {
-        if (currentFlow && !isLoading) {
-            currentFlow.cancelAuthenticationRequest()
-        }
-    }
-
-    Connections {
-        target: PolkitService.agent
-        enabled: PolkitService.polkitAvailable
-
-        function onAuthenticationRequestStarted() {
-            show()
-        }
-
-        function onIsActiveChanged() {
-            if (!(PolkitService.agent?.isActive ?? false)) {
-                close()
-            }
-        }
-    }
-
-    Connections {
-        target: currentFlow
-        enabled: currentFlow !== null
-
-        function onIsResponseRequiredChanged() {
-            if (currentFlow.isResponseRequired) {
-                isLoading = false
-                passwordInput = ""
-                if (contentLoader.item && contentLoader.item.passwordField) {
-                    contentLoader.item.passwordField.forceActiveFocus()
-                }
-            }
-        }
-
-        function onAuthenticationSucceeded() {
-            close()
-        }
-
-        function onAuthenticationFailed() {
-            isLoading = false
-        }
-
-        function onAuthenticationRequestCancelled() {
-            close()
-        }
-    }
-
-    content: Component {
-        FocusScope {
-            id: authContent
-
-            property alias passwordField: passwordField
-
-            anchors.fill: parent
-            focus: true
-            implicitHeight: headerRow.implicitHeight + mainColumn.implicitHeight + Theme.spacingM
-
-            Keys.onEscapePressed: event => {
-                if (currentFlow && !isLoading) {
-                    currentFlow.cancelAuthenticationRequest()
-                }
-                event.accepted = true
-            }
-
-            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.spacingM
-
-                Column {
-                    width: parent.width - 40
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        text: I18n.tr("Authentication Required")
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: currentFlow?.message ?? ""
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceTextMedium
-                            width: parent.width
-                            wrapMode: Text.Wrap
-                        }
-
-                        StyledText {
-                            visible: (currentFlow?.supplementaryMessage ?? "") !== ""
-                            text: currentFlow?.supplementaryMessage ?? ""
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: (currentFlow?.supplementaryIsError ?? false) ? Theme.error : Theme.surfaceTextMedium
-                            width: parent.width
-                            wrapMode: Text.Wrap
-                            opacity: (currentFlow?.supplementaryIsError ?? false) ? 1 : 0.8
-                        }
-                    }
-                }
-
-                DankActionButton {
-                    iconName: "close"
-                    iconSize: Theme.iconSize - 4
-                    iconColor: Theme.surfaceText
-                    enabled: !isLoading
-                    opacity: enabled ? 1 : 0.5
-                    onClicked: () => {
-                        if (currentFlow) {
-                            currentFlow.cancelAuthenticationRequest()
-                        }
-                    }
-                }
-            }
-
-            Column {
-                id: mainColumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.leftMargin: Theme.spacingM
-                anchors.rightMargin: Theme.spacingM
-                anchors.bottomMargin: Theme.spacingM
-                spacing: Theme.spacingM
-
-                StyledText {
-                    text: currentFlow?.inputPrompt ?? ""
-                    font.pixelSize: Theme.fontSizeMedium
-                    color: Theme.surfaceText
-                    width: parent.width
-                    visible: (currentFlow?.inputPrompt ?? "") !== ""
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: Theme.surfaceHover
-                    border.color: passwordField.activeFocus ? Theme.primary : Theme.outlineStrong
-                    border.width: passwordField.activeFocus ? 2 : 1
-                    opacity: isLoading ? 0.5 : 1
-
-                    MouseArea {
-                        anchors.fill: parent
-                        enabled: !isLoading
-                        onClicked: () => {
-                            passwordField.forceActiveFocus()
-                        }
-                    }
-
-                    DankTextField {
-                        id: passwordField
-
-                        anchors.fill: parent
-                        font.pixelSize: Theme.fontSizeMedium
-                        textColor: Theme.surfaceText
-                        text: passwordInput
-                        echoMode: (currentFlow?.responseVisible ?? false) ? TextInput.Normal : TextInput.Password
-                        placeholderText: ""
-                        backgroundColor: "transparent"
-                        enabled: !isLoading
-                        onTextEdited: () => {
-                            passwordInput = text
-                        }
-                        onAccepted: () => {
-                            if (passwordInput.length > 0 && currentFlow && !isLoading) {
-                                isLoading = true
-                                currentFlow.submit(passwordInput)
-                                passwordInput = ""
-                            }
-                        }
-                    }
-                }
-
-                Item {
-                    width: parent.width
-                    height: (currentFlow?.failed ?? false) ? failedText.implicitHeight : 0
-                    visible: height > 0
-
-                    StyledText {
-                        id: failedText
-                        text: I18n.tr("Authentication failed, please try again")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.error
-                        width: parent.width
-                        opacity: (currentFlow?.failed ?? false) ? 1 : 0
-
-                        Behavior on opacity {
-                            NumberAnimation {
-                                duration: Theme.shortDuration
-                                easing.type: Theme.standardEasing
-                            }
-                        }
-                    }
-
-                    Behavior on height {
-                        NumberAnimation {
-                            duration: Theme.shortDuration
-                            easing.type: Theme.standardEasing
-                        }
-                    }
-                }
-
-                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
-                            enabled: !isLoading
-                            opacity: enabled ? 1 : 0.5
-
-                            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
-                                enabled: parent.enabled
-                                onClicked: () => {
-                                    if (currentFlow) {
-                                        currentFlow.cancelAuthenticationRequest()
-                                    }
-                                }
-                            }
-                        }
-
-                        Rectangle {
-                            width: Math.max(80, authText.contentWidth + Theme.spacingM * 2)
-                            height: 36
-                            radius: Theme.cornerRadius
-                            color: authArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
-                            enabled: !isLoading && (passwordInput.length > 0 || !(currentFlow?.isResponseRequired ?? true))
-                            opacity: enabled ? 1 : 0.5
-
-                            StyledText {
-                                id: authText
-
-                                anchors.centerIn: parent
-                                text: I18n.tr("Authenticate")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.background
-                                font.weight: Font.Medium
-                            }
-
-                            MouseArea {
-                                id: authArea
-
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                enabled: parent.enabled
-                                onClicked: () => {
-                                    if (currentFlow && !isLoading) {
-                                        isLoading = true
-                                        currentFlow.submit(passwordInput)
-                                        passwordInput = ""
-                                    }
-                                }
-                            }
-
-                            Behavior on color {
-                                ColorAnimation {
-                                    duration: Theme.shortDuration
-                                    easing.type: Theme.standardEasing
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Modals/PowerMenuModal.qml
+++ b/Modals/PowerMenuModal.qml
@@ -1,5 +1,4 @@
 import QtQuick
-import Quickshell
 import qs.Common
 import qs.Modals.Common
 import qs.Services
@@ -8,368 +7,400 @@ import qs.Widgets
 DankModal {
    id: root

-    layerNamespace: "dms:power-menu"
-
-    property int selectedRow: 0
-    property int selectedCol: 0
-    property int selectedIndex: selectedRow * gridColumns + selectedCol
-    property rect parentBounds: Qt.rect(0, 0, 0, 0)
-    property var parentScreen: null
-    property var visibleActions: []
-    property int gridColumns: 3
-    property int gridRows: 2
+    property int selectedIndex: 0
+    property int optionCount: SessionService.hibernateSupported ? 5 : 4

    signal powerActionRequested(string action, string title, string message)
-    signal lockRequested
-
-    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 updateVisibleActions() {
-        const allActions = SettingsData.powerMenuActions || ["reboot", "logout", "poweroff", "lock", "suspend", "restart"]
-        visibleActions = allActions.filter(action => {
-                                               if (action === "hibernate" && !SessionService.hibernateSupported)
-                                               return false
-                                               return true
-                                           })
-
-        const count = visibleActions.length
-        switch (count) {
-        case 0:
-            gridColumns = 1
-            gridRows = 1
-            break
-        case 1:
-        case 2:
-        case 3:
-            gridColumns = 1
-            gridRows = count
-            break
-        case 4:
-            gridColumns = 2
-            gridRows = 2
-            break
-        default:
-            gridColumns = 3
-            gridRows = Math.ceil(count / 3)
-            break
-        }
-    }
-
-    function getDefaultActionIndex() {
-        const defaultAction = SettingsData.powerMenuDefaultAction || "logout"
-        const index = visibleActions.indexOf(defaultAction)
-        return index >= 0 ? index : 0
-    }
-
-    function getActionAtIndex(index) {
-        if (index < 0 || index >= visibleActions.length)
-            return ""
-        return visibleActions[index]
-    }
-
-    function getActionData(action) {
-        switch (action) {
-        case "reboot":
-            return {
-                "icon": "restart_alt",
-                "label": I18n.tr("Reboot"),
-                "key": "R"
-            }
-        case "logout":
-            return {
-                "icon": "logout",
-                "label": I18n.tr("Log Out"),
-                "key": "X"
-            }
-        case "poweroff":
-            return {
-                "icon": "power_settings_new",
-                "label": I18n.tr("Power Off"),
-                "key": "P"
-            }
-        case "lock":
-            return {
-                "icon": "lock",
-                "label": I18n.tr("Lock"),
-                "key": "L"
-            }
-        case "suspend":
-            return {
-                "icon": "bedtime",
-                "label": I18n.tr("Suspend"),
-                "key": "S"
-            }
-        case "hibernate":
-            return {
-                "icon": "ac_unit",
-                "label": I18n.tr("Hibernate"),
-                "key": "H"
-            }
-        case "restart":
-            return {
-                "icon": "refresh",
-                "label": I18n.tr("Restart DMS"),
-                "key": "D"
-            }
-        default:
-            return {
-                "icon": "help",
-                "label": action,
-                "key": "?"
-            }
-        }
-    }

    function selectOption(action) {
-        if (action === "lock") {
-            close()
-            lockRequested()
-            return
-        }
-        if (action === "restart") {
-            close()
-            Quickshell.execDetached(["dms", "restart"])
-            return
-        }
-        close()
+        close();
        const actions = {
            "logout": {
-                "title": I18n.tr("Log Out"),
-                "message": I18n.tr("Are you sure you want to log out?")
+                "title": "Log Out",
+                "message": "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?")
+                "title": "Suspend",
+                "message": "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?")
+                "title": "Hibernate",
+                "message": "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?")
+                "title": "Reboot",
+                "message": "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?")
+                "title": "Power Off",
+                "message": "Are you sure you want to power off the system?"
            }
        }
        const selected = actions[action]
        if (selected) {
-            root.powerActionRequested(action, selected.title, selected.message)
+            root.powerActionRequested(action, selected.title, selected.message);
        }
+
    }

    shouldBeVisible: false
-    width: Math.min(550, gridColumns * 180 + Theme.spacingS * (gridColumns - 1) + Theme.spacingL * 2)
+    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();
    }
-    onBackgroundClicked: () => close()
    onOpened: () => {
-                  updateVisibleActions()
-                  const defaultIndex = getDefaultActionIndex()
-                  selectedRow = Math.floor(defaultIndex / gridColumns)
-                  selectedCol = defaultIndex % gridColumns
-                  Qt.callLater(() => modalFocusScope.forceActiveFocus())
-              }
-    Component.onCompleted: updateVisibleActions()
-    modalFocusScope.Keys.onPressed: event => {
-                                        switch (event.key) {
-                                            case Qt.Key_Left:
-                                            selectedCol = (selectedCol - 1 + gridColumns) % gridColumns
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_Right:
-                                            selectedCol = (selectedCol + 1) % gridColumns
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_Up:
-                                            case Qt.Key_Backtab:
-                                            selectedRow = (selectedRow - 1 + gridRows) % gridRows
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_Down:
-                                            case Qt.Key_Tab:
-                                            selectedRow = (selectedRow + 1) % gridRows
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_Return:
-                                            case Qt.Key_Enter:
-                                            selectOption(getActionAtIndex(selectedIndex))
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_N:
-                                            if (event.modifiers & Qt.ControlModifier) {
-                                                selectedCol = (selectedCol + 1) % gridColumns
-                                                event.accepted = true
-                                            }
-                                            break
-                                            case Qt.Key_P:
-                                            if (!(event.modifiers & Qt.ControlModifier)) {
-                                                selectOption("poweroff")
-                                                event.accepted = true
-                                            } else {
-                                                selectedCol = (selectedCol - 1 + gridColumns) % gridColumns
-                                                event.accepted = true
-                                            }
-                                            break
-                                            case Qt.Key_J:
-                                            if (event.modifiers & Qt.ControlModifier) {
-                                                selectedRow = (selectedRow + 1) % gridRows
-                                                event.accepted = true
-                                            }
-                                            break
-                                            case Qt.Key_K:
-                                            if (event.modifiers & Qt.ControlModifier) {
-                                                selectedRow = (selectedRow - 1 + gridRows) % gridRows
-                                                event.accepted = true
-                                            }
-                                            break
-                                            case Qt.Key_R:
-                                            selectOption("reboot")
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_X:
-                                            selectOption("logout")
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_L:
-                                            selectOption("lock")
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_S:
-                                            selectOption("suspend")
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_H:
-                                            selectOption("hibernate")
-                                            event.accepted = true
-                                            break
-                                            case Qt.Key_D:
-                                            selectOption("restart")
-                                            event.accepted = true
-                                            break
-                                        }
-                                    }
+        selectedIndex = 0;
+        modalFocusScope.forceActiveFocus();
+    }
+    modalFocusScope.Keys.onPressed: (event) => {
+        switch (event.key) {
+        case Qt.Key_Up:
+            selectedIndex = (selectedIndex - 1 + optionCount) % optionCount;
+            event.accepted = true;
+            break;
+        case Qt.Key_Down:
+            selectedIndex = (selectedIndex + 1) % optionCount;
+            event.accepted = true;
+            break;
+        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;
+        }
+    }

    content: Component {
        Item {
            anchors.fill: parent
-            implicitHeight: buttonGrid.implicitHeight + Theme.spacingL * 2
+            implicitHeight: mainColumn.implicitHeight + Theme.spacingL * 2

-            Grid {
-                id: buttonGrid
-                anchors.centerIn: parent
-                columns: root.gridColumns
-                columnSpacing: Theme.spacingS
-                rowSpacing: Theme.spacingS
+            Column {
+                id: mainColumn
+                anchors.fill: parent
+                anchors.margins: Theme.spacingL
+                spacing: Theme.spacingM

-                Repeater {
-                    model: root.visibleActions
+                Row {
+                    width: parent.width
+
+                    StyledText {
+                        text: "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 {
-                        required property int index
-                        required property string modelData
-
-                        readonly property var actionData: root.getActionData(modelData)
-                        readonly property bool isSelected: root.selectedIndex === index
-                        readonly property bool showWarning: modelData === "reboot" || modelData === "poweroff"
-
-                        width: (root.width - Theme.spacingL * 2 - Theme.spacingS * (root.gridColumns - 1)) / root.gridColumns
-                        height: 100
+                        width: parent.width
+                        height: 50
                        radius: Theme.cornerRadius
                        color: {
-                            if (isSelected)
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            if (mouseArea.containsMouse)
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
+                            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: isSelected ? Theme.primary : "transparent"
-                        border.width: isSelected ? 2 : 0
+                        border.color: selectedIndex === 0 ? Theme.primary : "transparent"
+                        border.width: selectedIndex === 0 ? 1 : 0

-                        Column {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingS
+                        Row {
+                            anchors.left: parent.left
+                            anchors.leftMargin: Theme.spacingM
+                            anchors.verticalCenter: parent.verticalCenter
+                            spacing: Theme.spacingM

                            DankIcon {
-                                name: parent.parent.actionData.icon
-                                size: Theme.iconSize + 8
-                                color: {
-                                    if (parent.parent.showWarning && mouseArea.containsMouse) {
-                                        return parent.parent.modelData === "poweroff" ? Theme.error : Theme.warning
-                                    }
-                                    return Theme.surfaceText
-                                }
-                                anchors.horizontalCenter: parent.horizontalCenter
+                                name: "logout"
+                                size: Theme.iconSize
+                                color: Theme.surfaceText
+                                anchors.verticalCenter: parent.verticalCenter
                            }

                            StyledText {
-                                text: parent.parent.actionData.label
+                                text: "Log Out"
                                font.pixelSize: Theme.fontSizeMedium
-                                color: {
-                                    if (parent.parent.showWarning && mouseArea.containsMouse) {
-                                        return parent.parent.modelData === "poweroff" ? Theme.error : Theme.warning
-                                    }
-                                    return Theme.surfaceText
-                                }
+                                color: Theme.surfaceText
                                font.weight: Font.Medium
-                                anchors.horizontalCenter: parent.horizontalCenter
+                                anchors.verticalCenter: parent.verticalCenter
                            }

-                            Rectangle {
-                                width: 20
-                                height: 16
-                                radius: 4
-                                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.1)
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                StyledText {
-                                    text: parent.parent.parent.actionData.key
-                                    font.pixelSize: Theme.fontSizeSmall - 1
-                                    color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                                    font.weight: Font.Medium
-                                    anchors.centerIn: parent
-                                }
-                            }
                        }

                        MouseArea {
-                            id: mouseArea
+                            id: logoutArea
+
                            anchors.fill: parent
                            hoverEnabled: true
                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                root.selectedRow = Math.floor(index / root.gridColumns)
-                                root.selectedCol = index % root.gridColumns
-                                root.selectOption(modelData)
+                            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: "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: "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: "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: "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
+                }
+
            }
+
        }
+
    }
+
 }
--- a/Modals/ProcessListModal.qml
+++ b/Modals/ProcessListModal.qml
@@ -9,8 +9,6 @@ import qs.Widgets
 DankModal {
    id: processListModal

-    layerNamespace: "dms:process-list-modal"
-
    property int currentTab: 0
    property var tabNames: ["Processes", "Performance", "System"]

@@ -46,7 +44,7 @@ DankModal {
    width: 900
    height: 680
    visible: false
-    backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    backgroundColor: Theme.popupBackground()
    cornerRadius: Theme.cornerRadius
    enableShadow: true
    onBackgroundClicked: () => {
@@ -125,7 +123,7 @@ DankModal {
                    }

                    StyledText {
-                        text: I18n.tr("System Monitor Unavailable")
+                        text: "System Monitor Unavailable"
                        font.pixelSize: Theme.fontSizeLarge
                        font.weight: Font.Bold
                        color: Theme.error
@@ -133,7 +131,7 @@ DankModal {
                    }

                    StyledText {
-                        text: I18n.tr("The 'dgop' tool is required for system monitoring.\nPlease install dgop to use this feature.")
+                        text: "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
@@ -156,7 +154,7 @@ DankModal {
                    height: 40

                    StyledText {
-                        text: I18n.tr("System Monitor")
+                        text: "System Monitor"
                        font.pixelSize: Theme.fontSizeLarge + 4
                        font.weight: Font.Bold
                        color: Theme.surfaceText
@@ -183,7 +181,7 @@ DankModal {
                Rectangle {
                    Layout.fillWidth: true
                    height: 52
-                    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                    color: Theme.surfaceContainerHigh
                    radius: Theme.cornerRadius
                    border.color: Theme.outlineLight
                    border.width: 1
@@ -283,7 +281,7 @@ DankModal {
                    Layout.fillWidth: true
                    Layout.fillHeight: true
                    radius: Theme.cornerRadius
-                    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                    color: Theme.surfaceContainerHigh
                    border.color: Theme.outlineLight
                    border.width: 1

--- a/Modals/Settings/PowerSettings.qml
+++ b/Modals/Settings/PowerSettings.qml
@@ -18,88 +18,11 @@ Item {
            width: parent.width
            spacing: Theme.spacingXL

-            StyledRect {
-                width: parent.width
-                height: lockScreenSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: lockScreenSection
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "lock"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Lock Screen")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Show Power Actions")
-                        description: I18n.tr("Show power, restart, and logout buttons on the lock screen")
-                        checked: SettingsData.lockScreenShowPowerActions
-                        onToggled: checked => SettingsData.set("lockScreenShowPowerActions", checked)
-                    }
-
-                    StyledText {
-                        text: I18n.tr("loginctl not available - lock integration requires DMS socket connection")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.warning
-                        visible: !SessionService.loginctlAvailable
-                        width: parent.width
-                        wrapMode: Text.Wrap
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Enable loginctl lock integration")
-                        description: I18n.tr("Bind lock screen to dbus signals from loginctl. Disable if using an external lock screen")
-                        checked: SessionService.loginctlAvailable && SettingsData.loginctlLockIntegration
-                        enabled: SessionService.loginctlAvailable
-                        onToggled: checked => {
-                                       if (SessionService.loginctlAvailable) {
-                                           SettingsData.set("loginctlLockIntegration", checked)
-                                       }
-                                   }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Lock before suspend")
-                        description: I18n.tr("Automatically lock the screen when the system prepares to suspend")
-                        checked: SettingsData.lockBeforeSuspend
-                        visible: SessionService.loginctlAvailable && SettingsData.loginctlLockIntegration
-                        onToggled: checked => SettingsData.set("lockBeforeSuspend", checked)
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Enable fingerprint authentication")
-                        description: I18n.tr("Use fingerprint reader for lock screen authentication (requires enrolled fingerprints)")
-                        checked: SettingsData.enableFprint
-                        visible: SettingsData.fprintdAvailable
-                        onToggled: checked => SettingsData.set("enableFprint", checked)
-                    }
-                }
+            StyledText {
+                text: "Battery not detected - only AC power settings available"
+                font.pixelSize: Theme.fontSizeMedium
+                color: Theme.surfaceVariantText
+                visible: !BatteryService.batteryAvailable
            }

            StyledRect {
@@ -128,7 +51,7 @@ Item {
                        }

                        StyledText {
-                            text: I18n.tr("Idle Settings")
+                            text: "Idle Settings"
                            font.pixelSize: Theme.fontSizeLarge
                            font.weight: Font.Medium
                            color: Theme.surfaceText
@@ -151,50 +74,41 @@ Item {
                        }
                    }

-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Prevent idle for media")
-                        description: I18n.tr("Inhibit idle timeout when audio or video is playing")
-                        checked: SettingsData.preventIdleForMedia
-                        visible: IdleService.idleMonitorAvailable
-                        onToggled: checked => SettingsData.set("preventIdleForMedia", checked)
-                    }
-
                    DankDropdown {
                        id: lockDropdown
                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]

-                        addHorizontalPadding: true
-                        text: I18n.tr("Automatically lock after")
+                        width: parent.width
+                        text: "Automatically lock after"
                        options: timeoutOptions

                        Connections {
                            target: powerCategory
                            function onCurrentIndexChanged() {
-                                const currentTimeout = powerCategory.currentIndex === 0 ? SettingsData.acLockTimeout : SettingsData.batteryLockTimeout
+                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acLockTimeout : SessionData.batteryLockTimeout
                                const index = lockDropdown.timeoutValues.indexOf(currentTimeout)
                                lockDropdown.currentValue = index >= 0 ? lockDropdown.timeoutOptions[index] : "Never"
                            }
                        }

                        Component.onCompleted: {
-                            const currentTimeout = powerCategory.currentIndex === 0 ? SettingsData.acLockTimeout : SettingsData.batteryLockTimeout
+                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acLockTimeout : SessionData.batteryLockTimeout
                            const index = timeoutValues.indexOf(currentTimeout)
                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
                        }

                        onValueChanged: value => {
-                                            const index = timeoutOptions.indexOf(value)
-                                            if (index >= 0) {
-                                                const timeout = timeoutValues[index]
-                                                if (powerCategory.currentIndex === 0) {
-                                                    SettingsData.set("acLockTimeout", timeout)
-                                                } else {
-                                                    SettingsData.set("batteryLockTimeout", timeout)
-                                                }
-                                            }
-                                        }
+                            const index = timeoutOptions.indexOf(value)
+                            if (index >= 0) {
+                                const timeout = timeoutValues[index]
+                                if (powerCategory.currentIndex === 0) {
+                                    SessionData.setAcLockTimeout(timeout)
+                                } else {
+                                    SessionData.setBatteryLockTimeout(timeout)
+                                }
+                            }
+                        }
                    }

                    DankDropdown {
@@ -202,36 +116,36 @@ Item {
                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]

-                        addHorizontalPadding: true
-                        text: I18n.tr("Turn off monitors after")
+                        width: parent.width
+                        text: "Turn off monitors after"
                        options: timeoutOptions

                        Connections {
                            target: powerCategory
                            function onCurrentIndexChanged() {
-                                const currentTimeout = powerCategory.currentIndex === 0 ? SettingsData.acMonitorTimeout : SettingsData.batteryMonitorTimeout
+                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acMonitorTimeout : SessionData.batteryMonitorTimeout
                                const index = monitorDropdown.timeoutValues.indexOf(currentTimeout)
                                monitorDropdown.currentValue = index >= 0 ? monitorDropdown.timeoutOptions[index] : "Never"
                            }
                        }

                        Component.onCompleted: {
-                            const currentTimeout = powerCategory.currentIndex === 0 ? SettingsData.acMonitorTimeout : SettingsData.batteryMonitorTimeout
+                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acMonitorTimeout : SessionData.batteryMonitorTimeout
                            const index = timeoutValues.indexOf(currentTimeout)
                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
                        }

                        onValueChanged: value => {
-                                            const index = timeoutOptions.indexOf(value)
-                                            if (index >= 0) {
-                                                const timeout = timeoutValues[index]
-                                                if (powerCategory.currentIndex === 0) {
-                                                    SettingsData.set("acMonitorTimeout", timeout)
-                                                } else {
-                                                    SettingsData.set("batteryMonitorTimeout", timeout)
-                                                }
-                                            }
-                                        }
+                            const index = timeoutOptions.indexOf(value)
+                            if (index >= 0) {
+                                const timeout = timeoutValues[index]
+                                if (powerCategory.currentIndex === 0) {
+                                    SessionData.setAcMonitorTimeout(timeout)
+                                } else {
+                                    SessionData.setBatteryMonitorTimeout(timeout)
+                                }
+                            }
+                        }
                    }

                    DankDropdown {
@@ -239,84 +153,86 @@ Item {
                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]

-                        addHorizontalPadding: true
-                        text: I18n.tr("Suspend system after")
+                        width: parent.width
+                        text: "Suspend system after"
                        options: timeoutOptions

                        Connections {
                            target: powerCategory
                            function onCurrentIndexChanged() {
-                                const currentTimeout = powerCategory.currentIndex === 0 ? SettingsData.acSuspendTimeout : SettingsData.batterySuspendTimeout
+                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acSuspendTimeout : SessionData.batterySuspendTimeout
                                const index = suspendDropdown.timeoutValues.indexOf(currentTimeout)
                                suspendDropdown.currentValue = index >= 0 ? suspendDropdown.timeoutOptions[index] : "Never"
                            }
                        }

                        Component.onCompleted: {
-                            const currentTimeout = powerCategory.currentIndex === 0 ? SettingsData.acSuspendTimeout : SettingsData.batterySuspendTimeout
+                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acSuspendTimeout : SessionData.batterySuspendTimeout
                            const index = timeoutValues.indexOf(currentTimeout)
                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
                        }

                        onValueChanged: value => {
-                                            const index = timeoutOptions.indexOf(value)
-                                            if (index >= 0) {
-                                                const timeout = timeoutValues[index]
-                                                if (powerCategory.currentIndex === 0) {
-                                                    SettingsData.set("acSuspendTimeout", timeout)
-                                                } else {
-                                                    SettingsData.set("batterySuspendTimeout", timeout)
-                                                }
-                                            }
-                                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingS
-                        visible: SessionService.hibernateSupported
-
-                        StyledText {
-                            text: I18n.tr("Suspend behavior")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            leftPadding: Theme.spacingM
-                        }
-
-                        DankButtonGroup {
-                            id: suspendBehaviorSelector
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            model: ["Suspend", "Hibernate", "Suspend then Hibernate"]
-                            selectionMode: "single"
-                            checkEnabled: false
-
-                            Connections {
-                                target: powerCategory
-                                function onCurrentIndexChanged() {
-                                    const behavior = powerCategory.currentIndex === 0 ? SettingsData.acSuspendBehavior : SettingsData.batterySuspendBehavior
-                                    suspendBehaviorSelector.currentIndex = behavior
+                            const index = timeoutOptions.indexOf(value)
+                            if (index >= 0) {
+                                const timeout = timeoutValues[index]
+                                if (powerCategory.currentIndex === 0) {
+                                    SessionData.setAcSuspendTimeout(timeout)
+                                } else {
+                                    SessionData.setBatterySuspendTimeout(timeout)
                                }
                            }
-
-                            Component.onCompleted: {
-                                const behavior = powerCategory.currentIndex === 0 ? SettingsData.acSuspendBehavior : SettingsData.batterySuspendBehavior
-                                currentIndex = behavior
-                            }
-
-                            onSelectionChanged: (index, selected) => {
-                                                    if (selected) {
-                                                        if (powerCategory.currentIndex === 0) {
-                                                            SettingsData.set("acSuspendBehavior", index)
-                                                        } else {
-                                                            SettingsData.set("batterySuspendBehavior", index)
-                                                        }
-                                                    }
-                                                }
                        }
                    }

+                    DankDropdown {
+                        id: hibernateDropdown
+                        property var timeoutOptions: ["Never", "1 minute", "2 minutes", "3 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes", "30 minutes", "1 hour", "1 hour 30 minutes", "2 hours", "3 hours"]
+                        property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800]
+
+                        width: parent.width
+                        text: "Hibernate system after"
+                        options: timeoutOptions
+                        visible: SessionService.hibernateSupported
+
+                        Connections {
+                            target: powerCategory
+                            function onCurrentIndexChanged() {
+                                const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acHibernateTimeout : SessionData.batteryHibernateTimeout
+                                const index = hibernateDropdown.timeoutValues.indexOf(currentTimeout)
+                                hibernateDropdown.currentValue = index >= 0 ? hibernateDropdown.timeoutOptions[index] : "Never"
+                            }
+                        }
+
+                        Component.onCompleted: {
+                            const currentTimeout = powerCategory.currentIndex === 0 ? SessionData.acHibernateTimeout : SessionData.batteryHibernateTimeout
+                            const index = timeoutValues.indexOf(currentTimeout)
+                            currentValue = index >= 0 ? timeoutOptions[index] : "Never"
+                        }
+
+                        onValueChanged: value => {
+                            const index = timeoutOptions.indexOf(value)
+                            if (index >= 0) {
+                                const timeout = timeoutValues[index]
+                                if (powerCategory.currentIndex === 0) {
+                                    SessionData.setAcHibernateTimeout(timeout)
+                                } else {
+                                    SessionData.setBatteryHibernateTimeout(timeout)
+                                }
+                            }
+                        }
+                    }
+
+                    DankToggle {
+                        width: parent.width
+                        text: "Lock before suspend"
+                        description: "Automatically lock the screen when the system prepares to suspend"
+                        checked: SessionData.lockBeforeSuspend
+                        onToggled: checked => SessionData.setLockBeforeSuspend(checked)
+                    }
+
                    StyledText {
-                        text: I18n.tr("Idle monitoring not supported - requires newer Quickshell version")
+                        text: "Idle monitoring not supported - requires newer Quickshell version"
                        font.pixelSize: Theme.fontSizeSmall
                        color: Theme.error
                        anchors.horizontalCenter: parent.horizontalCenter
@@ -325,456 +241,6 @@ Item {
                }
            }

-            StyledRect {
-                width: parent.width
-                height: powerMenuCustomSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: powerMenuCustomSection
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "tune"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Power Menu Customization")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Customize which actions appear in the power menu")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        width: parent.width
-                        wrapMode: Text.Wrap
-                    }
-
-                    DankDropdown {
-                        id: defaultActionDropdown
-                        width: parent.width
-                        addHorizontalPadding: true
-                        text: I18n.tr("Default selected action")
-                        options: ["Reboot", "Log Out", "Power Off", "Lock", "Suspend", "Restart DMS", "Hibernate"]
-                        property var actionValues: ["reboot", "logout", "poweroff", "lock", "suspend", "restart", "hibernate"]
-
-                        Component.onCompleted: {
-                            const currentAction = SettingsData.powerMenuDefaultAction || "logout"
-                            const index = actionValues.indexOf(currentAction)
-                            currentValue = index >= 0 ? options[index] : "Log Out"
-                        }
-
-                        onValueChanged: value => {
-                                            const index = options.indexOf(value)
-                                            if (index >= 0) {
-                                                SettingsData.set("powerMenuDefaultAction", actionValues[index])
-                                            }
-                                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingS
-
-                        DankToggle {
-                            width: parent.width
-                            text: I18n.tr("Show Reboot")
-                            checked: SettingsData.powerMenuActions.includes("reboot")
-                            onToggled: checked => {
-                                           let actions = [...SettingsData.powerMenuActions]
-                                           if (checked && !actions.includes("reboot")) {
-                                               actions.push("reboot")
-                                           } else if (!checked) {
-                                               actions = actions.filter(a => a !== "reboot")
-                                           }
-                                           SettingsData.set("powerMenuActions", actions)
-                                       }
-                        }
-
-                        DankToggle {
-                            width: parent.width
-                            text: I18n.tr("Show Log Out")
-                            checked: SettingsData.powerMenuActions.includes("logout")
-                            onToggled: checked => {
-                                           let actions = [...SettingsData.powerMenuActions]
-                                           if (checked && !actions.includes("logout")) {
-                                               actions.push("logout")
-                                           } else if (!checked) {
-                                               actions = actions.filter(a => a !== "logout")
-                                           }
-                                           SettingsData.set("powerMenuActions", actions)
-                                       }
-                        }
-
-                        DankToggle {
-                            width: parent.width
-                            text: I18n.tr("Show Power Off")
-                            checked: SettingsData.powerMenuActions.includes("poweroff")
-                            onToggled: checked => {
-                                           let actions = [...SettingsData.powerMenuActions]
-                                           if (checked && !actions.includes("poweroff")) {
-                                               actions.push("poweroff")
-                                           } else if (!checked) {
-                                               actions = actions.filter(a => a !== "poweroff")
-                                           }
-                                           SettingsData.set("powerMenuActions", actions)
-                                       }
-                        }
-
-                        DankToggle {
-                            width: parent.width
-                            text: I18n.tr("Show Lock")
-                            checked: SettingsData.powerMenuActions.includes("lock")
-                            onToggled: checked => {
-                                           let actions = [...SettingsData.powerMenuActions]
-                                           if (checked && !actions.includes("lock")) {
-                                               actions.push("lock")
-                                           } else if (!checked) {
-                                               actions = actions.filter(a => a !== "lock")
-                                           }
-                                           SettingsData.set("powerMenuActions", actions)
-                                       }
-                        }
-
-                        DankToggle {
-                            width: parent.width
-                            text: I18n.tr("Show Suspend")
-                            checked: SettingsData.powerMenuActions.includes("suspend")
-                            onToggled: checked => {
-                                           let actions = [...SettingsData.powerMenuActions]
-                                           if (checked && !actions.includes("suspend")) {
-                                               actions.push("suspend")
-                                           } else if (!checked) {
-                                               actions = actions.filter(a => a !== "suspend")
-                                           }
-                                           SettingsData.set("powerMenuActions", actions)
-                                       }
-                        }
-
-                        DankToggle {
-                            width: parent.width
-                            text: I18n.tr("Show Restart DMS")
-                            description: I18n.tr("Restart the DankMaterialShell")
-                            checked: SettingsData.powerMenuActions.includes("restart")
-                            onToggled: checked => {
-                                           let actions = [...SettingsData.powerMenuActions]
-                                           if (checked && !actions.includes("restart")) {
-                                               actions.push("restart")
-                                           } else if (!checked) {
-                                               actions = actions.filter(a => a !== "restart")
-                                           }
-                                           SettingsData.set("powerMenuActions", actions)
-                                       }
-                        }
-
-                        DankToggle {
-                            width: parent.width
-                            text: I18n.tr("Show Hibernate")
-                            description: I18n.tr("Only visible if hibernate is supported by your system")
-                            checked: SettingsData.powerMenuActions.includes("hibernate")
-                            visible: SessionService.hibernateSupported
-                            onToggled: checked => {
-                                           let actions = [...SettingsData.powerMenuActions]
-                                           if (checked && !actions.includes("hibernate")) {
-                                               actions.push("hibernate")
-                                           } else if (!checked) {
-                                               actions = actions.filter(a => a !== "hibernate")
-                                           }
-                                           SettingsData.set("powerMenuActions", actions)
-                                       }
-                        }
-                    }
-                }
-            }
-
-            StyledRect {
-                width: parent.width
-                height: powerCommandConfirmSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: powerCommandConfirmSection
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "check_circle"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Power Action Confirmation")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Show Confirmation on Power Actions")
-                        description: I18n.tr("Request confirmation on power off, restart, suspend, hibernate and logout actions")
-                        checked: SettingsData.powerActionConfirm
-                        onToggled: checked => SettingsData.set("powerActionConfirm", checked)
-                    }
-                }
-            }
-
-            StyledRect {
-                width: parent.width
-                height: powerCommandCustomization.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: powerCommandCustomization
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingL
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "developer_mode"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Custom Power Actions")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-                        anchors.left: parent.left
-
-                        StyledText {
-                            text: I18n.tr("Command or script to run instead of the standard lock procedure")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: customLockCommand
-                            width: parent.width
-                            height: 48
-                            placeholderText: "/usr/bin/myLock.sh"
-                            backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                            normalBorderColor: Theme.outlineMedium
-                            focusedBorderColor: Theme.primary
-
-                            Component.onCompleted: {
-                                if (SettingsData.customPowerActionLock) {
-                                    text = SettingsData.customPowerActionLock
-                                }
-                            }
-
-                            onTextEdited: {
-                                SettingsData.set("customPowerActionLock", text.trim())
-                            }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-                        anchors.left: parent.left
-
-                        StyledText {
-                            text: I18n.tr("Command or script to run instead of the standard logout procedure")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: customLogoutCommand
-                            width: parent.width
-                            height: 48
-                            placeholderText: "/usr/bin/myLogout.sh"
-                            backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                            normalBorderColor: Theme.outlineMedium
-                            focusedBorderColor: Theme.primary
-
-                            Component.onCompleted: {
-                                if (SettingsData.customPowerActionLogout) {
-                                    text = SettingsData.customPowerActionLogout
-                                }
-                            }
-
-                            onTextEdited: {
-                                SettingsData.set("customPowerActionLogout", text.trim())
-                            }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-                        anchors.left: parent.left
-
-                        StyledText {
-                            text: I18n.tr("Command or script to run instead of the standard suspend procedure")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: customSuspendCommand
-                            width: parent.width
-                            height: 48
-                            placeholderText: "/usr/bin/mySuspend.sh"
-                            backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                            normalBorderColor: Theme.outlineMedium
-                            focusedBorderColor: Theme.primary
-
-                            Component.onCompleted: {
-                                if (SettingsData.customPowerActionSuspend) {
-                                    text = SettingsData.customPowerActionSuspend
-                                }
-                            }
-
-                            onTextEdited: {
-                                SettingsData.set("customPowerActionSuspend", text.trim())
-                            }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-                        anchors.left: parent.left
-
-                        StyledText {
-                            text: I18n.tr("Command or script to run instead of the standard hibernate procedure")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: customHibernateCommand
-                            width: parent.width
-                            height: 48
-                            placeholderText: "/usr/bin/myHibernate.sh"
-                            backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                            normalBorderColor: Theme.outlineMedium
-                            focusedBorderColor: Theme.primary
-
-                            Component.onCompleted: {
-                                if (SettingsData.customPowerActionHibernate) {
-                                    text = SettingsData.customPowerActionHibernate
-                                }
-                            }
-
-                            onTextEdited: {
-                                SettingsData.set("customPowerActionHibernate", text.trim())
-                            }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-                        anchors.left: parent.left
-
-                        StyledText {
-                            text: I18n.tr("Command or script to run instead of the standard reboot procedure")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: customRebootCommand
-                            width: parent.width
-                            height: 48
-                            placeholderText: "/usr/bin/myReboot.sh"
-                            backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                            normalBorderColor: Theme.outlineMedium
-                            focusedBorderColor: Theme.primary
-
-                            Component.onCompleted: {
-                                if (SettingsData.customPowerActionReboot) {
-                                    text = SettingsData.customPowerActionReboot
-                                }
-                            }
-
-                            onTextEdited: {
-                                SettingsData.set("customPowerActionReboot", text.trim())
-                            }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingXS
-                        anchors.left: parent.left
-
-                        StyledText {
-                            text: I18n.tr("Command or script to run instead of the standard power off procedure")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: customPowerOffCommand
-                            width: parent.width
-                            height: 48
-                            placeholderText: "/usr/bin/myPowerOff.sh"
-                            backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                            normalBorderColor: Theme.outlineMedium
-                            focusedBorderColor: Theme.primary
-
-                            Component.onCompleted: {
-                                if (SettingsData.customPowerActionPowerOff) {
-                                    text = SettingsData.customPowerActionPowerOff
-                                }
-                            }
-
-                            onTextEdited: {
-                                SettingsData.set("customPowerActionPowerOff", text.trim())
-                            }
-                        }
-                    }
-                }
-            }
        }
    }
-}
+}
--- a/Modals/Settings/SettingsContent.qml
+++ b/Modals/Settings/SettingsContent.qml
@@ -2,14 +2,12 @@ import QtQuick
 import qs.Common
 import qs.Modules.Settings

-FocusScope {
+Item {
    id: root

    property int currentIndex: 0
    property var parentModal: null

-    focus: true
-
    Rectangle {
        anchors.fill: parent
        anchors.leftMargin: 0
@@ -24,7 +22,7 @@ FocusScope {
            anchors.fill: parent
            active: root.currentIndex === 0
            visible: active
-            focus: active
+            asynchronous: true

            sourceComponent: Component {
                PersonalizationTab {
@@ -33,29 +31,30 @@ FocusScope {

            }

-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
+        }
+
+        Loader {
+            id: timeLoader
+
+            anchors.fill: parent
+            active: root.currentIndex === 1
+            visible: active
+            asynchronous: true
+
+            sourceComponent: TimeTab {
            }

        }

        Loader {
-            id: timeWeatherLoader
+            id: weatherLoader

            anchors.fill: parent
-            active: root.currentIndex === 1
+            active: root.currentIndex === 2
            visible: active
-            focus: active
+            asynchronous: true

-            sourceComponent: TimeWeatherTab {
-            }
-
-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
+            sourceComponent: WeatherTab {
            }

        }
@@ -64,18 +63,11 @@ FocusScope {
            id: topBarLoader

            anchors.fill: parent
-            active: root.currentIndex === 2
+            active: root.currentIndex === 3
            visible: active
-            focus: active
+            asynchronous: true

-            sourceComponent: DankBarTab {
-                parentModal: root.parentModal
-            }
-
-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
+            sourceComponent: TopBarTab {
            }

        }
@@ -84,28 +76,22 @@ FocusScope {
            id: widgetsLoader

            anchors.fill: parent
-            active: root.currentIndex === 3
+            active: root.currentIndex === 4
            visible: active
-            focus: active
+            asynchronous: true

            sourceComponent: WidgetTweaksTab {
            }

-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
-            }
-
        }

        Loader {
            id: dockLoader

            anchors.fill: parent
-            active: root.currentIndex === 4
+            active: root.currentIndex === 5
            visible: active
-            focus: active
+            asynchronous: true

            sourceComponent: Component {
                DockTab {
@@ -113,106 +99,56 @@ FocusScope {

            }

-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
-            }
-
        }

        Loader {
            id: displaysLoader

            anchors.fill: parent
-            active: root.currentIndex === 5
+            active: root.currentIndex === 6
            visible: active
-            focus: active
+            asynchronous: true

            sourceComponent: DisplaysTab {
            }

-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
-            }
-
        }

        Loader {
            id: launcherLoader

            anchors.fill: parent
-            active: root.currentIndex === 6
+            active: root.currentIndex === 7
            visible: active
-            focus: active
+            asynchronous: true

            sourceComponent: LauncherTab {
            }

-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
-            }
-
        }

        Loader {
            id: themeColorsLoader

            anchors.fill: parent
-            active: root.currentIndex === 7
+            active: root.currentIndex === 8
            visible: active
-            focus: active
+            asynchronous: true

            sourceComponent: ThemeColorsTab {
            }

-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
-            }
-
        }

        Loader {
            id: powerLoader

-            anchors.fill: parent
-            active: root.currentIndex === 8
-            visible: active
-            focus: active
-
-            sourceComponent: PowerSettings {
-            }
-
-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
-            }
-
-        }
-
-        Loader {
-            id: pluginsLoader
-
            anchors.fill: parent
            active: root.currentIndex === 9
            visible: active
-            focus: active
+            asynchronous: true

-            sourceComponent: PluginsTab {
-                parentModal: root.parentModal
-            }
-
-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
+            sourceComponent: PowerSettings {
            }

        }
@@ -223,17 +159,11 @@ FocusScope {
            anchors.fill: parent
            active: root.currentIndex === 10
            visible: active
-            focus: active
+            asynchronous: true

            sourceComponent: AboutTab {
            }

-            onActiveChanged: {
-                if (active && item) {
-                    Qt.callLater(() => item.forceActiveFocus())
-                }
-            }
-
        }

    }
--- a/Modals/Settings/SettingsModal.qml
+++ b/Modals/Settings/SettingsModal.qml
@@ -11,11 +11,8 @@ import qs.Widgets
 DankModal {
    id: settingsModal

-    layerNamespace: "dms:settings"
-
    property Component settingsContent
    property alias profileBrowser: profileBrowser
-    property int currentTabIndex: 0

    signal closingModal()

@@ -36,49 +33,13 @@ DankModal {
    }

    objectName: "settingsModal"
-    width: Math.min(800, screenWidth * 0.9)
-    height: Math.min(800, screenHeight * 0.85)
-    backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    width: 800
+    height: 750
    visible: false
    onBackgroundClicked: () => {
        return hide();
    }
    content: settingsContent
-    onOpened: () => {
-        Qt.callLater(() => {
-            modalFocusScope.forceActiveFocus()
-            if (contentLoader.item) {
-                contentLoader.item.forceActiveFocus()
-            }
-        })
-    }
-
-    onVisibleChanged: {
-        if (visible && shouldBeVisible) {
-            Qt.callLater(() => {
-                modalFocusScope.forceActiveFocus()
-                if (contentLoader.item) {
-                    contentLoader.item.forceActiveFocus()
-                }
-            })
-        }
-    }
-    modalFocusScope.Keys.onPressed: event => {
-        const tabCount = 11
-        if (event.key === Qt.Key_Down) {
-            currentTabIndex = (currentTabIndex + 1) % tabCount
-            event.accepted = true
-        } else if (event.key === Qt.Key_Up) {
-            currentTabIndex = (currentTabIndex - 1 + tabCount) % tabCount
-            event.accepted = true
-        } else if (event.key === Qt.Key_Tab && !event.modifiers) {
-            currentTabIndex = (currentTabIndex + 1) % tabCount
-            event.accepted = true
-        } else if (event.key === Qt.Key_Backtab || (event.key === Qt.Key_Tab && event.modifiers & Qt.ShiftModifier)) {
-            currentTabIndex = (currentTabIndex - 1 + tabCount) % tabCount
-            event.accepted = true
-        }
-    }

    IpcHandler {
        function open(): string {
@@ -117,26 +78,22 @@ DankModal {
        id: profileBrowser

        allowStacking: true
-        parentModal: settingsModal
        browserTitle: "Select Profile Image"
        browserIcon: "person"
        browserType: "profile"
-        showHiddenFiles: true
        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
        onFileSelected: (path) => {
            PortalService.setProfileImage(path);
            close();
        }
        onDialogClosed: () => {
-            allowStacking = true;
-            if (settingsModal.shouldBeVisible) {
-                Qt.callLater(() => {
-                    settingsModal.modalFocusScope.forceActiveFocus()
-                    if (settingsModal.contentLoader.item) {
-                        settingsModal.contentLoader.item.forceActiveFocus()
-                    }
-                })
+            if (settingsModal) {
+                settingsModal.allowFocusOverride = false;
+                settingsModal.shouldHaveFocus = Qt.binding(() => {
+                    return settingsModal.shouldBeVisible;
+                });
            }
+            allowStacking = true;
        }
    }

@@ -144,11 +101,9 @@ DankModal {
        id: wallpaperBrowser

        allowStacking: true
-        parentModal: settingsModal
        browserTitle: "Select Wallpaper"
        browserIcon: "wallpaper"
        browserType: "wallpaper"
-        showHiddenFiles: true
        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
        onFileSelected: (path) => {
            SessionData.setWallpaper(path);
@@ -156,26 +111,13 @@ DankModal {
        }
        onDialogClosed: () => {
            allowStacking = true;
-            if (settingsModal.shouldBeVisible) {
-                Qt.callLater(() => {
-                    settingsModal.modalFocusScope.forceActiveFocus()
-                    if (settingsModal.contentLoader.item) {
-                        settingsModal.contentLoader.item.forceActiveFocus()
-                    }
-                })
-            }
        }
    }

    settingsContent: Component {
        Item {
-            id: rootScope
            anchors.fill: parent
-
-            Keys.onEscapePressed: event => {
-                settingsModal.hide()
-                event.accepted = true
-            }
+            focus: true

            Column {
                anchors.fill: parent
@@ -202,7 +144,7 @@ DankModal {
                        }

                        StyledText {
-                            text: I18n.tr("Settings")
+                            text: "Settings"
                            font.pixelSize: Theme.fontSizeXLarge
                            color: Theme.surfaceText
                            font.weight: Font.Medium
@@ -234,10 +176,7 @@ DankModal {
                        id: sidebar

                        parentModal: settingsModal
-                        currentIndex: settingsModal.currentTabIndex
-                        onCurrentIndexChanged: {
-                            settingsModal.currentTabIndex = currentIndex
-                        }
+                        onCurrentIndexChanged: content.currentIndex = currentIndex
                    }

                    SettingsContent {
@@ -246,7 +185,7 @@ DankModal {
                        width: parent.width - sidebar.width
                        height: parent.height
                        parentModal: settingsModal
-                        currentIndex: settingsModal.currentTabIndex
+                        currentIndex: sidebar.currentIndex
                    }

                }
--- a/Modals/Settings/SettingsSidebar.qml
+++ b/Modals/Settings/SettingsSidebar.qml
@@ -1,5 +1,3 @@
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import qs.Common
 import qs.Modals.Settings
@@ -11,140 +9,120 @@ Rectangle {
    property int currentIndex: 0
    property var parentModal: null
    readonly property var sidebarItems: [{
-        "text": I18n.tr("Personalization"),
+        "text": "Personalization",
        "icon": "person"
    }, {
-        "text": I18n.tr("Time & Weather"),
+        "text": "Time & Date",
        "icon": "schedule"
    }, {
-        "text": I18n.tr("Dank Bar"),
+        "text": "Weather",
+        "icon": "cloud"
+    }, {
+        "text": "Top Bar",
        "icon": "toolbar"
    }, {
-        "text": I18n.tr("Widgets"),
+        "text": "Widgets",
        "icon": "widgets"
    }, {
-        "text": I18n.tr("Dock"),
+        "text": "Dock",
        "icon": "dock_to_bottom"
    }, {
-        "text": I18n.tr("Displays"),
+        "text": "Displays",
        "icon": "monitor"
    }, {
-        "text": I18n.tr("Launcher"),
+        "text": "Launcher",
        "icon": "apps"
    }, {
-        "text": I18n.tr("Theme & Colors"),
+        "text": "Theme & Colors",
        "icon": "palette"
    }, {
-        "text": I18n.tr("Power & Security"),
-        "icon": "power"
+        "text": "Power",
+        "icon": "power_settings_new"
    }, {
-        "text": I18n.tr("Plugins"),
-        "icon": "extension"
-    }, {
-        "text": I18n.tr("About"),
+        "text": "About",
        "icon": "info"
    }]

-    function navigateNext() {
-        currentIndex = (currentIndex + 1) % sidebarItems.length
-    }
-
-    function navigatePrevious() {
-        currentIndex = (currentIndex - 1 + sidebarItems.length) % sidebarItems.length
-    }
-
    width: 270
    height: parent.height
-    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    color: Theme.surfaceContainer
    radius: Theme.cornerRadius

-    DankFlickable {
+    Column {
        anchors.fill: parent
-        clip: true
-        contentHeight: sidebarColumn.implicitHeight
+        anchors.leftMargin: Theme.spacingS
+        anchors.rightMargin: Theme.spacingS
+        anchors.bottomMargin: Theme.spacingS
+        anchors.topMargin: Theme.spacingM + 2
+        spacing: Theme.spacingXS

-        Column {
-            id: sidebarColumn
+        ProfileSection {
+            parentModal: sidebarContainer.parentModal
+        }

+        Rectangle {
+            width: parent.width - Theme.spacingS * 2
+            height: 1
+            color: Theme.outline
+            opacity: 0.2
+        }
+
+        Item {
            width: parent.width
-            anchors.leftMargin: Theme.spacingS
-            anchors.rightMargin: Theme.spacingS
-            anchors.bottomMargin: Theme.spacingS
-            anchors.topMargin: Theme.spacingM + 2
-            spacing: Theme.spacingXS
+            height: Theme.spacingL
+        }

-            ProfileSection {
-                parentModal: sidebarContainer.parentModal
-            }
+        Repeater {
+            id: sidebarRepeater
+
+            model: sidebarContainer.sidebarItems

            Rectangle {
+                property bool isActive: sidebarContainer.currentIndex === index
+
                width: parent.width - Theme.spacingS * 2
-                height: 1
-                color: Theme.outline
-                opacity: 0.2
-            }
+                height: 44
+                radius: Theme.cornerRadius
+                color: isActive ? Theme.primaryContainer : tabMouseArea.containsMouse ? Theme.surfaceHover : "transparent"

-            Item {
-                width: parent.width
-                height: Theme.spacingL
-            }
+                Row {
+                    anchors.left: parent.left
+                    anchors.leftMargin: Theme.spacingM
+                    anchors.verticalCenter: parent.verticalCenter
+                    spacing: Theme.spacingM

-            Repeater {
-                id: sidebarRepeater
-
-                model: sidebarContainer.sidebarItems
-
-                delegate: Rectangle {
-                    required property int index
-                    required property var modelData
-
-                    property bool isActive: sidebarContainer.currentIndex === index
-
-                    width: sidebarColumn.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
+                    DankIcon {
+                        name: modelData.icon || ""
+                        size: Theme.iconSize - 2
+                        color: parent.parent.isActive ? Theme.surfaceText : Theme.surfaceText
                        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;
-                        }
+                    StyledText {
+                        text: modelData.text || ""
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: parent.parent.isActive ? Theme.surfaceText : Theme.surfaceText
+                        font.weight: parent.parent.isActive ? Font.Medium : Font.Normal
+                        anchors.verticalCenter: parent.verticalCenter
                    }

-                    Behavior on color {
-                        ColorAnimation {
-                            duration: Theme.shortDuration
-                            easing.type: Theme.standardEasing
-                        }
+                }

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

                }
--- a/Modals/Spotlight/FileSearchController.qml
+++ b/Modals/Spotlight/FileSearchController.qml
@@ -1,237 +0,0 @@
-import QtQuick
-import Quickshell.Io
-import qs.Services
-
-Item {
-    id: controller
-
-    property string searchQuery: ""
-    property alias model: fileModel
-    property int selectedIndex: 0
-    property bool keyboardNavigationActive: false
-    property bool isSearching: false
-    property int totalResults: 0
-    property string searchField: "filename"
-
-    signal searchCompleted
-
-    ListModel {
-        id: fileModel
-    }
-
-    function performSearch() {
-        if (!DSearchService.dsearchAvailable) {
-            model.clear()
-            totalResults = 0
-            isSearching = false
-            return
-        }
-
-        if (searchQuery.length === 0) {
-            model.clear()
-            totalResults = 0
-            isSearching = false
-            return
-        }
-
-        isSearching = true
-        const params = {
-            "limit": 50,
-            "fuzzy": true,
-            "sort": "score",
-            "desc": true
-        }
-
-        if (searchField && searchField !== "all") {
-            params.field = searchField
-        }
-
-        DSearchService.search(searchQuery, params, response => {
-                                  if (response.error) {
-                                      model.clear()
-                                      totalResults = 0
-                                      isSearching = false
-                                      return
-                                  }
-
-                                  if (response.result) {
-                                      updateModel(response.result)
-                                  }
-
-                                  isSearching = false
-                                  searchCompleted()
-                              })
-    }
-
-    function updateModel(result) {
-        model.clear()
-        totalResults = result.total_hits || 0
-        selectedIndex = 0
-        keyboardNavigationActive = true
-
-        if (!result.hits || result.hits.length === 0) {
-            selectedIndex = -1
-            keyboardNavigationActive = false
-            return
-        }
-
-        for (var i = 0; i < result.hits.length; i++) {
-            const hit = result.hits[i]
-            const filePath = hit.id || ""
-            const fileName = getFileName(filePath)
-            const fileExt = getFileExtension(fileName)
-            const fileType = determineFileType(fileName, filePath)
-            const dirPath = getDirPath(filePath)
-
-            model.append({
-                             "filePath": filePath,
-                             "fileName": fileName,
-                             "fileExtension": fileExt,
-                             "fileType": fileType,
-                             "dirPath": dirPath,
-                             "score": hit.score || 0
-                         })
-        }
-    }
-
-    function getFileName(path) {
-        const parts = path.split('/')
-        return parts[parts.length - 1] || path
-    }
-
-    function getFileExtension(fileName) {
-        const parts = fileName.split('.')
-        if (parts.length > 1) {
-            return parts[parts.length - 1].toLowerCase()
-        }
-        return ""
-    }
-
-    function getDirPath(path) {
-        const lastSlash = path.lastIndexOf('/')
-        if (lastSlash > 0) {
-            return path.substring(0, lastSlash)
-        }
-        return ""
-    }
-
-    function determineFileType(fileName, filePath) {
-        const ext = getFileExtension(fileName)
-
-        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
-        if (imageExts.includes(ext)) {
-            return "image"
-        }
-
-        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
-        if (videoExts.includes(ext)) {
-            return "video"
-        }
-
-        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
-        if (audioExts.includes(ext)) {
-            return "audio"
-        }
-
-        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
-        if (codeExts.includes(ext)) {
-            return "code"
-        }
-
-        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
-        if (docExts.includes(ext)) {
-            return "document"
-        }
-
-        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
-        if (archiveExts.includes(ext)) {
-            return "archive"
-        }
-
-        if (!ext || fileName.indexOf('.') === -1) {
-            return "binary"
-        }
-
-        return "file"
-    }
-
-    function selectNext() {
-        if (model.count === 0) {
-            return
-        }
-        keyboardNavigationActive = true
-        selectedIndex = Math.min(selectedIndex + 1, model.count - 1)
-    }
-
-    function selectPrevious() {
-        if (model.count === 0) {
-            return
-        }
-        keyboardNavigationActive = true
-        selectedIndex = Math.max(selectedIndex - 1, 0)
-    }
-
-    signal fileOpened
-
-    function openFile(filePath) {
-        if (!filePath || filePath.length === 0) {
-            return
-        }
-
-        let url = filePath
-        if (!url.startsWith("file://")) {
-            url = "file://" + filePath
-        }
-
-        Qt.openUrlExternally(url)
-        fileOpened()
-    }
-
-    function openFolder(filePath) {
-        if (!filePath || filePath.length === 0) {
-            return
-        }
-
-        const lastSlash = filePath.lastIndexOf('/')
-        if (lastSlash <= 0) {
-            return
-        }
-
-        const dirPath = filePath.substring(0, lastSlash)
-        let url = dirPath
-        if (!url.startsWith("file://")) {
-            url = "file://" + dirPath
-        }
-
-        Qt.openUrlExternally(url)
-        fileOpened()
-    }
-
-    function openSelected() {
-        if (model.count === 0 || selectedIndex < 0 || selectedIndex >= model.count) {
-            return
-        }
-
-        const item = model.get(selectedIndex)
-        if (item && item.filePath) {
-            openFile(item.filePath)
-        }
-    }
-
-    function reset() {
-        searchQuery = ""
-        model.clear()
-        selectedIndex = -1
-        keyboardNavigationActive = false
-        isSearching = false
-        totalResults = 0
-    }
-
-    onSearchQueryChanged: {
-        performSearch()
-    }
-
-    onSearchFieldChanged: {
-        performSearch()
-    }
-}
--- a/Modals/Spotlight/FileSearchEntry.qml
+++ b/Modals/Spotlight/FileSearchEntry.qml
@@ -1,155 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import Quickshell
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: entry
-
-    required property string filePath
-    required property string fileName
-    required property string fileExtension
-    required property string fileType
-    required property string dirPath
-    required property bool isSelected
-    required property int itemIndex
-
-    signal clicked()
-
-    readonly property int iconSize: 40
-
-    radius: Theme.cornerRadius
-    color: isSelected ? Theme.primaryPressed : mouseArea.containsMouse ? Theme.primaryHoverLight : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-
-    Row {
-        anchors.fill: parent
-        anchors.margins: Theme.spacingM
-        spacing: Theme.spacingL
-
-        Item {
-            width: iconSize
-            height: iconSize
-            anchors.verticalCenter: parent.verticalCenter
-
-            Image {
-                id: imagePreview
-                anchors.fill: parent
-                source: fileType === "image" ? `file://${filePath}` : ""
-                fillMode: Image.PreserveAspectCrop
-                smooth: true
-                cache: true
-                asynchronous: true
-                visible: fileType === "image" && status === Image.Ready
-                sourceSize.width: 128
-                sourceSize.height: 128
-            }
-
-            MultiEffect {
-                anchors.fill: parent
-                source: imagePreview
-                maskEnabled: true
-                maskSource: imageMask
-                visible: fileType === "image" && imagePreview.status === Image.Ready
-                maskThresholdMin: 0.5
-                maskSpreadAtMin: 1
-            }
-
-            Item {
-                id: imageMask
-                width: iconSize
-                height: iconSize
-                layer.enabled: true
-                layer.smooth: true
-                visible: false
-
-                Rectangle {
-                    anchors.fill: parent
-                    radius: width / 2
-                    color: "black"
-                    antialiasing: true
-                }
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                radius: width / 2
-                color: getFileTypeColor()
-                visible: fileType !== "image" || imagePreview.status !== Image.Ready
-
-                StyledText {
-                    anchors.centerIn: parent
-                    text: getFileIconText()
-                    font.pixelSize: fileExtension.length > 0 ? (fileExtension.length > 3 ? Theme.fontSizeSmall - 2 : Theme.fontSizeSmall) : Theme.fontSizeMedium
-                    color: Theme.surfaceText
-                    font.weight: Font.Bold
-                }
-            }
-        }
-
-        Column {
-            anchors.verticalCenter: parent.verticalCenter
-            width: parent.width - iconSize - Theme.spacingL
-            spacing: Theme.spacingXS
-
-            StyledText {
-                width: parent.width
-                text: fileName
-                font.pixelSize: Theme.fontSizeLarge
-                color: Theme.surfaceText
-                font.weight: Font.Medium
-                elide: Text.ElideMiddle
-                wrapMode: Text.NoWrap
-                maximumLineCount: 1
-            }
-
-            StyledText {
-                width: parent.width
-                text: dirPath
-                font.pixelSize: Theme.fontSizeMedium
-                color: Theme.surfaceVariantText
-                elide: Text.ElideMiddle
-                maximumLineCount: 1
-            }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: entry.clicked()
-    }
-
-    function getFileTypeColor() {
-        switch (fileType) {
-        case "code":
-            return Theme.codeFileColor || Theme.primarySelected
-        case "document":
-            return Theme.docFileColor || Theme.secondarySelected
-        case "video":
-            return Theme.videoFileColor || Theme.tertiarySelected
-        case "audio":
-            return Theme.audioFileColor || Theme.errorSelected
-        case "archive":
-            return Theme.archiveFileColor || Theme.warningSelected
-        case "binary":
-            return Theme.binaryFileColor || Theme.surfaceDim
-        default:
-            return Theme.surfaceLight
-        }
-    }
-
-    function getFileIconText() {
-        if (fileType === "binary") {
-            return "bin"
-        }
-
-        if (fileExtension.length > 0) {
-            return fileExtension
-        }
-
-        return fileName.charAt(0).toUpperCase()
-    }
-}
--- a/Modals/Spotlight/FileSearchResults.qml
+++ b/Modals/Spotlight/FileSearchResults.qml
@@ -1,246 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: resultsContainer
-
-    property var fileSearchController: null
-
-    function resetScroll() {
-        filesList.contentY = 0
-    }
-
-    color: "transparent"
-    clip: true
-
-    DankListView {
-        id: filesList
-
-        property int itemHeight: 60
-        property int itemSpacing: Theme.spacingS
-        property bool hoverUpdatesSelection: false
-        property bool keyboardNavigationActive: fileSearchController ? fileSearchController.keyboardNavigationActive : false
-
-        signal keyboardNavigationReset
-        signal itemClicked(int index)
-        signal itemRightClicked(int index)
-
-        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
-        model: fileSearchController ? fileSearchController.model : null
-        currentIndex: fileSearchController ? fileSearchController.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: function (index) {
-            if (fileSearchController) {
-                const item = fileSearchController.model.get(index)
-                fileSearchController.openFile(item.filePath)
-            }
-        }
-
-        onItemRightClicked: function (index) {
-            if (fileSearchController) {
-                const item = fileSearchController.model.get(index)
-                fileSearchController.openFolder(item.filePath)
-            }
-        }
-
-        onKeyboardNavigationReset: {
-            if (fileSearchController)
-                fileSearchController.keyboardNavigationActive = false
-        }
-
-        delegate: Rectangle {
-            required property int index
-            required property string filePath
-            required property string fileName
-            required property string fileExtension
-            required property string fileType
-            required property string dirPath
-
-            width: ListView.view.width
-            height: filesList.itemHeight
-            radius: Theme.cornerRadius
-            color: ListView.isCurrentItem ? Theme.primaryPressed : fileMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-
-            Row {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingL
-
-                Item {
-                    width: 40
-                    height: 40
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    Rectangle {
-                        id: iconBackground
-                        anchors.fill: parent
-                        radius: width / 2
-                        color: Theme.surfaceLight
-                        visible: fileType !== "image"
-
-                        DankNFIcon {
-                            id: nerdIcon
-                            anchors.centerIn: parent
-                            name: {
-                                const lowerName = fileName.toLowerCase()
-                                if (lowerName.startsWith("dockerfile"))
-                                    return "docker"
-                                if (lowerName.startsWith("makefile"))
-                                    return "makefile"
-                                if (lowerName.startsWith("license"))
-                                    return "license"
-                                if (lowerName.startsWith("readme"))
-                                    return "readme"
-                                return fileExtension.toLowerCase()
-                            }
-                            size: Theme.fontSizeXLarge
-                            color: Theme.surfaceText
-                        }
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: fileExtension ? (fileExtension.length > 4 ? fileExtension.substring(0, 4) : fileExtension) : "?"
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Bold
-                            visible: !nerdIcon.visible
-                        }
-                    }
-
-                    Loader {
-                        anchors.fill: parent
-                        active: fileType === "image"
-                        sourceComponent: Image {
-                            anchors.fill: parent
-                            source: "file://" + filePath
-                            fillMode: Image.PreserveAspectCrop
-                            asynchronous: true
-                            cache: false
-                            layer.enabled: true
-                            layer.effect: MultiEffect {
-                                maskEnabled: true
-                                maskThresholdMin: 0.5
-                                maskSpreadAtMin: 1.0
-                                maskSource: ShaderEffectSource {
-                                    sourceItem: Rectangle {
-                                        width: 40
-                                        height: 40
-                                        radius: 20
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Column {
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: parent.width - 40 - Theme.spacingL
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        width: parent.width
-                        text: fileName || ""
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        elide: Text.ElideMiddle
-                        maximumLineCount: 1
-                    }
-
-                    StyledText {
-                        width: parent.width
-                        text: dirPath || ""
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceVariantText
-                        elide: Text.ElideMiddle
-                        maximumLineCount: 1
-                    }
-                }
-            }
-
-            MouseArea {
-                id: fileMouseArea
-
-                anchors.fill: parent
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                z: 10
-                onEntered: {
-                    if (filesList.hoverUpdatesSelection && !filesList.keyboardNavigationActive)
-                        filesList.currentIndex = index
-                }
-                onPositionChanged: {
-                    filesList.keyboardNavigationReset()
-                }
-                onClicked: mouse => {
-                               if (mouse.button === Qt.LeftButton) {
-                                   filesList.itemClicked(index)
-                               } else if (mouse.button === Qt.RightButton) {
-                                   filesList.itemRightClicked(index)
-                               }
-                           }
-            }
-        }
-    }
-
-    Item {
-        anchors.fill: parent
-        visible: !fileSearchController || !fileSearchController.model || fileSearchController.model.count === 0
-
-        StyledText {
-            property string displayText: {
-                if (!fileSearchController) {
-                    return ""
-                }
-                if (!DSearchService.dsearchAvailable) {
-                    return I18n.tr("DankSearch not available")
-                }
-                if (fileSearchController.isSearching) {
-                    return I18n.tr("Searching...")
-                }
-                if (fileSearchController.searchQuery.length === 0) {
-                    return I18n.tr("Enter a search query")
-                }
-                if (!fileSearchController.model || fileSearchController.model.count === 0) {
-                    return I18n.tr("No files found")
-                }
-                return ""
-            }
-
-            text: displayText
-            anchors.centerIn: parent
-            font.pixelSize: Theme.fontSizeMedium
-            color: Theme.surfaceVariantText
-            visible: displayText.length > 0
-        }
-    }
-}
--- a/Modals/Spotlight/SpotlightContent.qml
+++ b/Modals/Spotlight/SpotlightContent.qml
@@ -11,45 +11,10 @@ Item {

    property alias appLauncher: appLauncher
    property alias searchField: searchField
-    property alias fileSearchController: fileSearchController
    property var parentModal: null
-    property string searchMode: "apps"
-
-    function resetScroll() {
-        if (searchMode === "apps") {
-            resultsView.resetScroll()
-        } else {
-            fileSearchResults.resetScroll()
-        }
-    }
-
-    function updateSearchMode() {
-        if (searchField.text.startsWith("/")) {
-            if (searchMode !== "files") {
-                searchMode = "files"
-            }
-            const query = searchField.text.substring(1)
-            fileSearchController.searchQuery = query
-        } else {
-            if (searchMode !== "apps") {
-                searchMode = "apps"
-                fileSearchController.reset()
-                appLauncher.searchQuery = searchField.text
-            }
-        }
-    }
-
-    onSearchModeChanged: {
-        if (searchMode === "files") {
-            appLauncher.keyboardNavigationActive = false
-        } else {
-            fileSearchController.keyboardNavigationActive = false
-        }
-    }

    anchors.fill: parent
    focus: true
-    clip: false
    Keys.onPressed: event => {
                        if (event.key === Qt.Key_Escape) {
                            if (parentModal)
@@ -57,95 +22,23 @@ Item {

                            event.accepted = true
                        } else if (event.key === Qt.Key_Down) {
-                            if (searchMode === "apps") {
-                                appLauncher.selectNext()
-                            } else {
-                                fileSearchController.selectNext()
-                            }
+                            appLauncher.selectNext()
                            event.accepted = true
                        } else if (event.key === Qt.Key_Up) {
-                            if (searchMode === "apps") {
-                                appLauncher.selectPrevious()
-                            } else {
-                                fileSearchController.selectPrevious()
-                            }
+                            appLauncher.selectPrevious()
                            event.accepted = true
-                        } else if (event.key === Qt.Key_Right && searchMode === "apps" && appLauncher.viewMode === "grid") {
+                        } else if (event.key === Qt.Key_Right && appLauncher.viewMode === "grid") {
                            appLauncher.selectNextInRow()
                            event.accepted = true
-                        } else if (event.key === Qt.Key_Left && searchMode === "apps" && appLauncher.viewMode === "grid") {
+                        } 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) {
-                            if (searchMode === "apps") {
-                                appLauncher.selectNext()
-                            } else {
-                                fileSearchController.selectNext()
-                            }
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_K && event.modifiers & Qt.ControlModifier) {
-                            if (searchMode === "apps") {
-                                appLauncher.selectPrevious()
-                            } else {
-                                fileSearchController.selectPrevious()
-                            }
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_L && event.modifiers & Qt.ControlModifier && searchMode === "apps" && appLauncher.viewMode === "grid") {
-                            appLauncher.selectNextInRow()
-                            event.accepted = true
-                        } else if (event.key == Qt.Key_H && event.modifiers & Qt.ControlModifier && searchMode === "apps" && appLauncher.viewMode === "grid") {
-                            appLauncher.selectPreviousInRow()
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Tab) {
-                            if (searchMode === "apps") {
-                                if (appLauncher.viewMode === "grid") {
-                                    appLauncher.selectNextInRow()
-                                } else {
-                                    appLauncher.selectNext()
-                                }
-                            } else {
-                                fileSearchController.selectNext()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_Backtab) {
-                            if (searchMode === "apps") {
-                                if (appLauncher.viewMode === "grid") {
-                                    appLauncher.selectPreviousInRow()
-                                } else {
-                                    appLauncher.selectPrevious()
-                                }
-                            } else {
-                                fileSearchController.selectPrevious()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
-                            if (searchMode === "apps") {
-                                if (appLauncher.viewMode === "grid") {
-                                    appLauncher.selectNextInRow()
-                                } else {
-                                    appLauncher.selectNext()
-                                }
-                            } else {
-                                fileSearchController.selectNext()
-                            }
-                            event.accepted = true
-                        } else if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
-                            if (searchMode === "apps") {
-                                if (appLauncher.viewMode === "grid") {
-                                    appLauncher.selectPreviousInRow()
-                                } else {
-                                    appLauncher.selectPrevious()
-                                }
-                            } else {
-                                fileSearchController.selectPrevious()
-                            }
-                            event.accepted = true
                        } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                            if (searchMode === "apps") {
-                                appLauncher.launchSelected()
-                            } else if (searchMode === "files") {
-                                fileSearchController.openSelected()
-                            }
+                            appLauncher.launchSelected()
+                            event.accepted = true
+                        } else if (!searchField.activeFocus && event.text && event.text.length > 0 && event.text.match(/[a-zA-Z0-9\\s]/)) {
+                            searchField.forceActiveFocus()
+                            searchField.insertText(event.text)
                            event.accepted = true
                        }
                    }
@@ -160,41 +53,52 @@ Item {
                           parentModal.hide()
                       }
        onViewModeSelected: mode => {
-                                SettingsData.set("spotlightModalViewMode", mode)
+                                SettingsData.setSpotlightModalViewMode(mode)
                            }
    }

-    FileSearchController {
-        id: fileSearchController
-
-        onFileOpened: () => {
-                          if (parentModal)
-                          parentModal.hide()
-                      }
-    }
-
    Column {
        anchors.fill: parent
-        anchors.margins: Theme.spacingM
-        spacing: Theme.spacingM
-        clip: false
+        anchors.margins: Theme.spacingL
+        spacing: Theme.spacingL
+
+        Rectangle {
+            width: parent.width
+            height: categorySelector.height + Theme.spacingM * 2
+            radius: Theme.cornerRadius
+            color: Theme.surfaceVariantAlpha
+            border.color: Theme.outlineMedium
+            border.width: 1
+            visible: appLauncher.categories.length > 1 || appLauncher.model.count > 0
+
+            CategorySelector {
+                id: categorySelector
+
+                anchors.centerIn: parent
+                width: parent.width - Theme.spacingM * 2
+                categories: appLauncher.categories
+                selectedCategory: appLauncher.selectedCategory
+                compact: false
+                onCategorySelected: category => {
+                                        appLauncher.setCategory(category)
+                                    }
+            }
+        }

        Row {
            width: parent.width
            spacing: Theme.spacingM
-            leftPadding: Theme.spacingS
-            topPadding: Theme.spacingS

            DankTextField {
                id: searchField

-                width: parent.width - 80 - Theme.spacingL
+                width: parent.width - 80 - Theme.spacingM
                height: 56
                cornerRadius: Theme.cornerRadius
-                backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                backgroundColor: Theme.surfaceContainerHigh
                normalBorderColor: Theme.outlineMedium
                focusedBorderColor: Theme.primary
-                leftIconName: searchMode === "files" ? "folder" : "search"
+                leftIconName: "search"
                leftIconSize: Theme.iconSize
                leftIconColor: Theme.surfaceVariantText
                leftIconFocusedColor: Theme.primary
@@ -203,17 +107,12 @@ Item {
                font.pixelSize: Theme.fontSizeLarge
                enabled: parentModal ? parentModal.spotlightOpen : true
                placeholderText: ""
-                ignoreLeftRightKeys: appLauncher.viewMode !== "list"
-                ignoreTabKeys: true
+                ignoreLeftRightKeys: true
                keyForwardTargets: [spotlightKeyHandler]
-                onTextChanged: {
-                    if (searchMode === "apps") {
-                        appLauncher.searchQuery = text
-                    }
-                }
-                onTextEdited: {
-                    updateSearchMode()
-                }
+                text: appLauncher.searchQuery
+                onTextEdited: () => {
+                                  appLauncher.searchQuery = text
+                              }
                Keys.onPressed: event => {
                                    if (event.key === Qt.Key_Escape) {
                                        if (parentModal)
@@ -221,18 +120,12 @@ Item {

                                        event.accepted = true
                                    } else if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length > 0) {
-                                        if (searchMode === "apps") {
-                                            if (appLauncher.keyboardNavigationActive && appLauncher.model.count > 0)
-                                            appLauncher.launchSelected()
-                                            else if (appLauncher.model.count > 0)
-                                            appLauncher.launchApp(appLauncher.model.get(0))
-                                        } else if (searchMode === "files") {
-                                            if (fileSearchController.model.count > 0)
-                                            fileSearchController.openSelected()
-                                        }
+                                        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)) {
+                                    } 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_Return || event.key === Qt.Key_Enter) && text.length === 0)) {
                                        event.accepted = false
                                    }
                                }
@@ -240,7 +133,7 @@ Item {

            Row {
                spacing: Theme.spacingXS
-                visible: searchMode === "apps" && appLauncher.model.count > 0
+                visible: appLauncher.model.count > 0
                anchors.verticalCenter: parent.verticalCenter

                Rectangle {
@@ -248,6 +141,8 @@ Item {
                    height: 36
                    radius: Theme.cornerRadius
                    color: appLauncher.viewMode === "list" ? Theme.primaryHover : listViewArea.containsMouse ? Theme.surfaceHover : "transparent"
+                    border.color: appLauncher.viewMode === "list" ? Theme.primarySelected : "transparent"
+                    border.width: 1

                    DankIcon {
                        anchors.centerIn: parent
@@ -273,6 +168,8 @@ Item {
                    height: 36
                    radius: Theme.cornerRadius
                    color: appLauncher.viewMode === "grid" ? Theme.primaryHover : gridViewArea.containsMouse ? Theme.surfaceHover : "transparent"
+                    border.color: appLauncher.viewMode === "grid" ? Theme.primarySelected : "transparent"
+                    border.width: 1

                    DankIcon {
                        anchors.centerIn: parent
@@ -293,116 +190,11 @@ Item {
                    }
                }
            }
-
-            Row {
-                spacing: Theme.spacingXS
-                visible: searchMode === "files"
-                anchors.verticalCenter: parent.verticalCenter
-
-                Rectangle {
-                    id: filenameFilterButton
-
-                    width: 36
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: fileSearchController.searchField === "filename" ? Theme.primaryHover : filenameFilterArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: "title"
-                        size: 18
-                        color: fileSearchController.searchField === "filename" ? Theme.primary : Theme.surfaceText
-                    }
-
-                    MouseArea {
-                        id: filenameFilterArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: () => {
-                                       fileSearchController.searchField = "filename"
-                                   }
-                        onEntered: {
-                            filenameTooltipLoader.active = true
-                            Qt.callLater(() => {
-                                             if (filenameTooltipLoader.item) {
-                                                 const p = mapToItem(null, width / 2, height + Theme.spacingXS)
-                                                 filenameTooltipLoader.item.show(I18n.tr("Search filenames"), p.x, p.y, null)
-                                             }
-                                         })
-                        }
-                        onExited: {
-                            if (filenameTooltipLoader.item)
-                                filenameTooltipLoader.item.hide()
-
-                            filenameTooltipLoader.active = false
-                        }
-                    }
-                }
-
-                Rectangle {
-                    id: contentFilterButton
-
-                    width: 36
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: fileSearchController.searchField === "body" ? Theme.primaryHover : contentFilterArea.containsMouse ? Theme.surfaceHover : "transparent"
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: "description"
-                        size: 18
-                        color: fileSearchController.searchField === "body" ? Theme.primary : Theme.surfaceText
-                    }
-
-                    MouseArea {
-                        id: contentFilterArea
-
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: () => {
-                                       fileSearchController.searchField = "body"
-                                   }
-                        onEntered: {
-                            contentTooltipLoader.active = true
-                            Qt.callLater(() => {
-                                             if (contentTooltipLoader.item) {
-                                                 const p = mapToItem(null, width / 2, height + Theme.spacingXS)
-                                                 contentTooltipLoader.item.show(I18n.tr("Search file contents"), p.x, p.y, null)
-                                             }
-                                         })
-                        }
-                        onExited: {
-                            if (contentTooltipLoader.item)
-                                contentTooltipLoader.item.hide()
-
-                            contentTooltipLoader.active = false
-                        }
-                    }
-                }
-            }
        }

-        Item {
-            width: parent.width
-            height: parent.height - y
-
-            SpotlightResults {
-                id: resultsView
-                anchors.fill: parent
-                appLauncher: spotlightKeyHandler.appLauncher
-                contextMenu: contextMenu
-                visible: searchMode === "apps"
-            }
-
-            FileSearchResults {
-                id: fileSearchResults
-                anchors.fill: parent
-                fileSearchController: spotlightKeyHandler.fileSearchController
-                visible: searchMode === "files"
-            }
+        SpotlightResults {
+            appLauncher: spotlightKeyHandler.appLauncher
+            contextMenu: contextMenu
        }
    }

@@ -418,11 +210,12 @@ Item {
        visible: contextMenu.visible
        z: 999
        onClicked: () => {
-                       contextMenu.hide()
+                       contextMenu.close()
                   }

        MouseArea {

+            // Prevent closing when clicking on the menu itself
            x: contextMenu.x
            y: contextMenu.y
            width: contextMenu.width
@@ -430,18 +223,4 @@ Item {
            onClicked: () => {}
        }
    }
-
-    Loader {
-        id: filenameTooltipLoader
-
-        active: false
-        sourceComponent: DankTooltip {}
-    }
-
-    Loader {
-        id: contentTooltipLoader
-
-        active: false
-        sourceComponent: DankTooltip {}
-    }
 }
--- a/Modals/Spotlight/SpotlightContextMenu.qml
+++ b/Modals/Spotlight/SpotlightContextMenu.qml
@@ -1,73 +1,65 @@
 import QtQuick
-import QtQuick.Controls
-import Quickshell
-import Quickshell.Widgets
 import qs.Common
 import qs.Services
 import qs.Widgets

-Popup {
+Rectangle {
    id: contextMenu

    property var currentApp: null
+    property bool menuVisible: false
    property var appLauncher: null
    property var parentHandler: null
-    readonly property var desktopEntry: (currentApp && !currentApp.isPlugin && appLauncher && appLauncher._uniqueApps && currentApp.appIndex >= 0 && currentApp.appIndex < appLauncher._uniqueApps.length) ? appLauncher._uniqueApps[currentApp.appIndex] : null

    function show(x, y, app) {
        currentApp = app
-        contextMenu.x = x + 4
-        contextMenu.y = y + 4
-        contextMenu.open()
+        const menuWidth = 180
+        const menuHeight = menuColumn.implicitHeight + Theme.spacingS * 2
+        let finalX = x + 8
+        let finalY = y + 8
+        if (parentHandler) {
+            if (finalX + menuWidth > parentHandler.width)
+                finalX = x - menuWidth - 8
+
+            if (finalY + menuHeight > parentHandler.height)
+                finalY = y - menuHeight - 8
+
+            finalX = Math.max(8, Math.min(finalX, parentHandler.width - menuWidth - 8))
+            finalY = Math.max(8, Math.min(finalY, parentHandler.height - menuHeight - 8))
+        }
+        contextMenu.x = finalX
+        contextMenu.y = finalY
+        contextMenu.visible = true
+        contextMenu.menuVisible = true
    }

-    function hide() {
-        contextMenu.close()
+    function close() {
+        contextMenu.menuVisible = false
+        Qt.callLater(() => {
+                         contextMenu.visible = false
+                     })
    }

-    width: Math.max(180, menuColumn.implicitWidth + Theme.spacingS * 2)
+    visible: false
+    width: 180
    height: menuColumn.implicitHeight + Theme.spacingS * 2
-    padding: 0
-    closePolicy: Popup.CloseOnPressOutside
-    modal: false
-    dim: false
+    radius: Theme.cornerRadius
+    color: Theme.popupBackground()
+    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
+    border.width: 1
+    z: 1000
+    opacity: menuVisible ? 1 : 0
+    scale: menuVisible ? 1 : 0.85

-    background: Rectangle {
-        radius: Theme.cornerRadius
-        color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-        border.width: 1
-
-        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: -1
-        }
-    }
-
-    enter: Transition {
-        NumberAnimation {
-            property: "opacity"
-            from: 0
-            to: 1
-            duration: Theme.shortDuration
-            easing.type: Theme.emphasizedEasing
-        }
-    }
-
-    exit: Transition {
-        NumberAnimation {
-            property: "opacity"
-            from: 1
-            to: 0
-            duration: Theme.shortDuration
-            easing.type: Theme.emphasizedEasing
-        }
+    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
    }

    Column {
@@ -84,7 +76,6 @@ Popup {
            color: pinMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"

            Row {
-                id: pinRow
                anchors.left: parent.left
                anchors.leftMargin: Theme.spacingS
                anchors.verticalCenter: parent.verticalCenter
@@ -92,10 +83,10 @@ Popup {

                DankIcon {
                    name: {
-                        if (!desktopEntry)
+                        if (!contextMenu.currentApp || !contextMenu.currentApp.desktopEntry)
                            return "push_pin"

-                        const appId = desktopEntry.id || desktopEntry.execString || ""
+                        const appId = contextMenu.currentApp.desktopEntry.id || contextMenu.currentApp.desktopEntry.execString || ""
                        return SessionData.isPinnedApp(appId) ? "keep_off" : "push_pin"
                    }
                    size: Theme.iconSize - 2
@@ -106,11 +97,11 @@ Popup {

                StyledText {
                    text: {
-                        if (!desktopEntry)
-                            return I18n.tr("Pin to Dock")
+                        if (!contextMenu.currentApp || !contextMenu.currentApp.desktopEntry)
+                            return "Pin to Dock"

-                        const appId = desktopEntry.id || desktopEntry.execString || ""
-                        return SessionData.isPinnedApp(appId) ? I18n.tr("Unpin from Dock") : I18n.tr("Pin to Dock")
+                        const appId = contextMenu.currentApp.desktopEntry.id || contextMenu.currentApp.desktopEntry.execString || ""
+                        return SessionData.isPinnedApp(appId) ? "Unpin from Dock" : "Pin to Dock"
                    }
                    font.pixelSize: Theme.fontSizeSmall
                    color: Theme.surfaceText
@@ -126,15 +117,15 @@ Popup {
                hoverEnabled: true
                cursorShape: Qt.PointingHandCursor
                onClicked: () => {
-                               if (!desktopEntry)
+                               if (!contextMenu.currentApp || !contextMenu.currentApp.desktopEntry)
                               return

-                               const appId = desktopEntry.id || desktopEntry.execString || ""
+                               const appId = contextMenu.currentApp.desktopEntry.id || contextMenu.currentApp.desktopEntry.execString || ""
                               if (SessionData.isPinnedApp(appId))
                               SessionData.removePinnedApp(appId)
                               else
                               SessionData.addPinnedApp(appId)
-                               contextMenu.hide()
+                               contextMenu.close()
                           }
            }
        }
@@ -153,79 +144,6 @@ Popup {
            }
        }

-        Repeater {
-            model: desktopEntry && desktopEntry.actions ? desktopEntry.actions : []
-
-            Rectangle {
-                width: parent.width
-                height: 32
-                radius: Theme.cornerRadius
-                color: actionMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                Row {
-                    id: actionRow
-                    anchors.left: parent.left
-                    anchors.leftMargin: Theme.spacingS
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingS
-
-                    Item {
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: Theme.iconSize - 2
-                        height: Theme.iconSize - 2
-                        visible: modelData.icon && modelData.icon !== ""
-
-                        IconImage {
-                            anchors.fill: parent
-                            source: modelData.icon ? Quickshell.iconPath(modelData.icon, true) : ""
-                            smooth: true
-                            asynchronous: true
-                            visible: status === Image.Ready
-                        }
-                    }
-
-                    StyledText {
-                        text: modelData.name || ""
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceText
-                        font.weight: Font.Normal
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                MouseArea {
-                    id: actionMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (modelData && desktopEntry) {
-                            SessionService.launchDesktopAction(desktopEntry, modelData)
-                            if (appLauncher && contextMenu.currentApp) {
-                                appLauncher.appLaunched(contextMenu.currentApp)
-                            }
-                        }
-                        contextMenu.hide()
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            visible: desktopEntry && desktopEntry.actions && desktopEntry.actions.length > 0
-            width: parent.width - Theme.spacingS * 2
-            height: 5
-            anchors.horizontalCenter: parent.horizontalCenter
-            color: "transparent"
-
-            Rectangle {
-                anchors.centerIn: parent
-                width: parent.width
-                height: 1
-                color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-            }
-        }
-
        Rectangle {
            width: parent.width
            height: 32
@@ -233,7 +151,6 @@ Popup {
            color: launchMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"

            Row {
-                id: launchRow
                anchors.left: parent.left
                anchors.leftMargin: Theme.spacingS
                anchors.verticalCenter: parent.verticalCenter
@@ -248,7 +165,7 @@ Popup {
                }

                StyledText {
-                    text: I18n.tr("Launch")
+                    text: "Launch"
                    font.pixelSize: Theme.fontSizeSmall
                    color: Theme.surfaceText
                    font.weight: Font.Normal
@@ -266,73 +183,23 @@ Popup {
                               if (contextMenu.currentApp && appLauncher)
                               appLauncher.launchApp(contextMenu.currentApp)

-                               contextMenu.hide()
-                           }
-            }
-        }
-
-        Rectangle {
-            visible: SessionService.hasPrimeRun
-            width: parent.width - Theme.spacingS * 2
-            height: 5
-            anchors.horizontalCenter: parent.horizontalCenter
-            color: "transparent"
-
-            Rectangle {
-                anchors.centerIn: parent
-                width: parent.width
-                height: 1
-                color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-            }
-        }
-
-        Rectangle {
-            visible: SessionService.hasPrimeRun
-            width: parent.width
-            height: 32
-            radius: Theme.cornerRadius
-            color: primeRunMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-            Row {
-                id: primeRunRow
-                anchors.left: parent.left
-                anchors.leftMargin: Theme.spacingS
-                anchors.verticalCenter: parent.verticalCenter
-                spacing: Theme.spacingS
-
-                DankIcon {
-                    name: "memory"
-                    size: Theme.iconSize - 2
-                    color: Theme.surfaceText
-                    opacity: 0.7
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                StyledText {
-                    text: I18n.tr("Launch on dGPU")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Normal
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-            }
-
-            MouseArea {
-                id: primeRunMouseArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: () => {
-                               if (desktopEntry) {
-                                   SessionService.launchDesktopEntry(desktopEntry, true)
-                                   if (appLauncher && contextMenu.currentApp) {
-                                       appLauncher.appLaunched(contextMenu.currentApp)
-                                   }
-                               }
-                               contextMenu.hide()
+                               contextMenu.close()
                           }
            }
        }
    }
+
+    Behavior on opacity {
+        NumberAnimation {
+            duration: Theme.mediumDuration
+            easing.type: Theme.emphasizedEasing
+        }
+    }
+
+    Behavior on scale {
+        NumberAnimation {
+            duration: Theme.mediumDuration
+            easing.type: Theme.emphasizedEasing
+        }
+    }
 }
--- a/Modals/Spotlight/SpotlightModal.qml
+++ b/Modals/Spotlight/SpotlightModal.qml
@@ -12,38 +12,19 @@ import qs.Widgets
 DankModal {
    id: spotlightModal

-    layerNamespace: "dms:spotlight"
-
    property bool spotlightOpen: false
-    property alias spotlightContent: spotlightContentInstance
+    property Component spotlightContent

    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
-            }
+        if (contentLoader.item && contentLoader.item.appLauncher) {
+            contentLoader.item.appLauncher.searchQuery = ""
        }

-        spotlightOpen = true
-        open()
-
        Qt.callLater(() => {
-                         if (spotlightContent && spotlightContent.searchField) {
-                             spotlightContent.searchField.forceActiveFocus()
+                         if (contentLoader.item && contentLoader.item.searchField) {
+                             contentLoader.item.searchField.forceActiveFocus()
                         }
                     })
    }
@@ -51,24 +32,10 @@ DankModal {
    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.fileSearchController) {
-                spotlightContent.fileSearchController.reset()
-            }
-            if (spotlightContent.resetScroll) {
-                spotlightContent.resetScroll()
-            }
-            if (spotlightContent.searchField) {
-                spotlightContent.searchField.text = ""
-            }
+        if (contentLoader.item && contentLoader.item.appLauncher) {
+            contentLoader.item.appLauncher.searchQuery = ""
+            contentLoader.item.appLauncher.selectedIndex = 0
+            contentLoader.item.appLauncher.setCategory("All")
        }
    }

@@ -81,22 +48,21 @@ DankModal {
    }

    shouldBeVisible: spotlightOpen
-    width: 500
+    width: 550
    height: 600
-    backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    backgroundColor: Theme.popupBackground()
    cornerRadius: Theme.cornerRadius
    borderColor: Theme.outlineMedium
    borderWidth: 1
    enableShadow: true
-    keepContentLoaded: true
    onVisibleChanged: () => {
                          if (visible && !spotlightOpen) {
                              show()
                          }
-                          if (visible && spotlightContent) {
+                          if (visible && contentLoader.item) {
                              Qt.callLater(() => {
-                                               if (spotlightContent.searchField) {
-                                                   spotlightContent.searchField.forceActiveFocus()
+                                               if (contentLoader.item.searchField) {
+                                                   contentLoader.item.searchField.forceActiveFocus()
                                               }
                                           })
                          }
@@ -104,6 +70,7 @@ DankModal {
    onBackgroundClicked: () => {
                             return hide()
                         }
+    content: spotlightContent

    Connections {
        function onCloseAllModalsExcept(excludedModal) {
@@ -116,43 +83,27 @@ DankModal {
    }

    IpcHandler {
-        function open(): string {
+        function open(): string  {
            spotlightModal.show()
            return "SPOTLIGHT_OPEN_SUCCESS"
        }

-        function close(): string {
+        function close(): string  {
            spotlightModal.hide()
            return "SPOTLIGHT_CLOSE_SUCCESS"
        }

-        function toggle(): string {
+        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
+    spotlightContent: Component {
+        SpotlightContent {
+            parentModal: spotlightModal
+        }
    }
-
-    directContent: spotlightContentInstance
 }
--- a/Modals/Spotlight/SpotlightResults.qml
+++ b/Modals/Spotlight/SpotlightResults.qml
@@ -10,14 +10,12 @@ Rectangle {
    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
+    color: Theme.surfaceContainerHigh
+    border.color: Theme.outlineLight
+    border.width: 1

    DankListView {
        id: resultsList
@@ -73,22 +71,101 @@ Rectangle {
                                       appLauncher.keyboardNavigationActive = false
                                   }

-        delegate: AppLauncherListDelegate {
-            listView: resultsList
-            itemHeight: resultsList.itemHeight
-            iconSize: resultsList.iconSize
-            showDescription: resultsList.showDescription
-            hoverUpdatesSelection: resultsList.hoverUpdatesSelection
-            keyboardNavigationActive: resultsList.keyboardNavigationActive
-            isCurrentItem: ListView.isCurrentItem
-            iconMaterialSizeAdjustment: 0
-            iconUnicodeScale: 0.8
-            onItemClicked: (idx, modelData) => resultsList.itemClicked(idx, modelData)
-            onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
-                const modalPos = resultsContainer.parent.mapFromItem(null, mouseX, mouseY)
-                resultsList.itemRightClicked(idx, modelData, modalPos.x, modalPos.y)
+        delegate: Rectangle {
+            width: ListView.view.width
+            height: resultsList.itemHeight
+            radius: Theme.cornerRadius
+            color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent"
+            border.color: ListView.isCurrentItem ? Theme.primarySelected : Theme.outlineMedium
+            border.width: ListView.isCurrentItem ? 2 : 1
+
+            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
+                    }
+
+                    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) {
+                                   const modalPos = mapToItem(resultsContainer.parent, mouse.x, mouse.y)
+                                   resultsList.itemRightClicked(index, model, modalPos.x, modalPos.y)
+                               }
+                           }
            }
-            onKeyboardNavigationReset: resultsList.keyboardNavigationReset
        }
    }

@@ -157,23 +234,91 @@ Rectangle {
                                       appLauncher.keyboardNavigationActive = false
                                   }

-        delegate: AppLauncherGridDelegate {
-            gridView: resultsGrid
-            cellWidth: resultsGrid.cellWidth
-            cellHeight: resultsGrid.cellHeight
-            cellPadding: resultsGrid.cellPadding
-            minIconSize: resultsGrid.minIconSize
-            maxIconSize: resultsGrid.maxIconSize
-            iconSizeRatio: resultsGrid.iconSizeRatio
-            hoverUpdatesSelection: resultsGrid.hoverUpdatesSelection
-            keyboardNavigationActive: resultsGrid.keyboardNavigationActive
-            currentIndex: resultsGrid.currentIndex
-            onItemClicked: (idx, modelData) => resultsGrid.itemClicked(idx, modelData)
-            onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
-                const modalPos = resultsContainer.parent.mapFromItem(null, mouseX, mouseY)
-                resultsGrid.itemRightClicked(idx, modelData, modalPos.x, modalPos.y)
+        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 : "transparent"
+            border.color: resultsGrid.currentIndex === index ? Theme.primarySelected : Theme.outlineMedium
+            border.width: resultsGrid.currentIndex === index ? 2 : 1
+
+            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: 2
+                    wrapMode: Text.WordWrap
+                }
+            }
+
+            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) {
+                                   const modalPos = mapToItem(resultsContainer.parent, mouse.x, mouse.y)
+                                   resultsGrid.itemRightClicked(index, model, modalPos.x, modalPos.y)
+                               }
+                           }
            }
-            onKeyboardNavigationReset: resultsGrid.keyboardNavigationReset
        }
    }
 }
--- a/Modals/WifiPasswordModal.qml
+++ b/Modals/WifiPasswordModal.qml
@@ -7,129 +7,35 @@ import qs.Widgets
 DankModal {
    id: root

-    layerNamespace: "dms:wifi-password"
-
    property string wifiPasswordSSID: ""
    property string wifiPasswordInput: ""
-    property string wifiUsernameInput: ""
-    property bool requiresEnterprise: false
-
-    property string wifiAnonymousIdentityInput: ""
-    property string wifiDomainInput: ""
-
-    property bool isPromptMode: false
-    property string promptToken: ""
-    property string promptReason: ""
-    property var promptFields: []
-    property string promptSetting: ""
-
-    property bool isVpnPrompt: false
-    property string connectionName: ""
-    property string vpnServiceType: ""
-    property string connectionType: ""

    function show(ssid) {
        wifiPasswordSSID = ssid
        wifiPasswordInput = ""
-        wifiUsernameInput = ""
-        wifiAnonymousIdentityInput = ""
-        wifiDomainInput = ""
-        isPromptMode = false
-        promptToken = ""
-        promptReason = ""
-        promptFields = []
-        promptSetting = ""
-        isVpnPrompt = false
-        connectionName = ""
-        vpnServiceType = ""
-        connectionType = ""
-
-        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()
-                             }
-                         }
-                     })
-    }
-
-    function showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService) {
-        isPromptMode = true
-        promptToken = token
-        promptReason = reason
-        promptFields = fields || []
-        promptSetting = setting || "802-11-wireless-security"
-        connectionType = connType || "802-11-wireless"
-        connectionName = connName || ssid || ""
-        vpnServiceType = vpnService || ""
-
-        isVpnPrompt = (connectionType === "vpn" || connectionType === "wireguard")
-        wifiPasswordSSID = isVpnPrompt ? connectionName : ssid
-
-        requiresEnterprise = setting === "802-1x"
-
-        if (reason === "wrong-password") {
-            wifiPasswordInput = ""
-            wifiUsernameInput = ""
-        } else {
-            wifiPasswordInput = ""
-            wifiUsernameInput = ""
-            wifiAnonymousIdentityInput = ""
-            wifiDomainInput = ""
-        }
-
-        open()
-        Qt.callLater(() => {
-                         if (contentLoader.item) {
-                             if (reason === "wrong-password" && contentLoader.item.passwordInput) {
-                                 contentLoader.item.passwordInput.text = ""
-                                 contentLoader.item.passwordInput.forceActiveFocus()
-                             } else if (requiresEnterprise && contentLoader.item.usernameInput) {
-                                 contentLoader.item.usernameInput.forceActiveFocus()
-                             } else if (contentLoader.item.passwordInput) {
-                                 contentLoader.item.passwordInput.forceActiveFocus()
-                             }
-                         }
+                         if (contentLoader.item && contentLoader.item.passwordInput)
+                         contentLoader.item.passwordInput.forceActiveFocus()
                     })
    }

    shouldBeVisible: false
    width: 420
-    height: requiresEnterprise ? 430 : 230
+    height: 230
    onShouldBeVisibleChanged: () => {
-                                  if (!shouldBeVisible) {
-                                      wifiPasswordInput = ""
-                                      wifiUsernameInput = ""
-                                      wifiAnonymousIdentityInput = ""
-                                      wifiDomainInput = ""
-                                  }
+                                  if (!shouldBeVisible)
+                                  wifiPasswordInput = ""
                              }
    onOpened: {
        Qt.callLater(() => {
-                         if (contentLoader.item) {
-                             if (requiresEnterprise && contentLoader.item.usernameInput) {
-                                 contentLoader.item.usernameInput.forceActiveFocus()
-                             } else if (contentLoader.item.passwordInput) {
-                                 contentLoader.item.passwordInput.forceActiveFocus()
-                             }
-                         }
+                         if (contentLoader.item && contentLoader.item.passwordInput)
+                         contentLoader.item.passwordInput.forceActiveFocus()
                     })
    }
    onBackgroundClicked: () => {
-                             if (isPromptMode) {
-                                 NetworkService.cancelCredentials(promptToken)
-                             }
                             close()
                             wifiPasswordInput = ""
-                             wifiUsernameInput = ""
-                             wifiAnonymousIdentityInput = ""
-                             wifiDomainInput = ""
                         }

    Connections {
@@ -149,20 +55,13 @@ DankModal {
        FocusScope {
            id: wifiContent

-            property alias usernameInput: usernameInput
            property alias passwordInput: passwordInput

            anchors.fill: parent
            focus: true
            Keys.onEscapePressed: event => {
-                                      if (isPromptMode) {
-                                          NetworkService.cancelCredentials(promptToken)
-                                      }
                                      close()
                                      wifiPasswordInput = ""
-                                      wifiUsernameInput = ""
-                                      wifiAnonymousIdentityInput = ""
-                                      wifiDomainInput = ""
                                      event.accepted = true
                                  }

@@ -179,42 +78,18 @@ DankModal {
                        spacing: Theme.spacingXS

                        StyledText {
-                            text: {
-                                if (isVpnPrompt) {
-                                    return I18n.tr("Connect to VPN")
-                                }
-                                return I18n.tr("Connect to Wi-Fi")
-                            }
+                            text: "Connect to Wi-Fi"
                            font.pixelSize: Theme.fontSizeLarge
                            color: Theme.surfaceText
                            font.weight: Font.Medium
                        }

-                        Column {
+                        StyledText {
+                            text: `Enter password for "${wifiPasswordSSID}"`
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceTextMedium
                            width: parent.width
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: {
-                                    if (isVpnPrompt) {
-                                        return I18n.tr("Enter password for ") + wifiPasswordSSID
-                                    }
-                                    const prefix = requiresEnterprise ? I18n.tr("Enter credentials for ") : I18n.tr("Enter password for ")
-                                    return prefix + wifiPasswordSSID
-                                }
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceTextMedium
-                                width: parent.width
-                                elide: Text.ElideRight
-                            }
-
-                            StyledText {
-                                visible: isPromptMode && promptReason === "wrong-password"
-                                text: I18n.tr("Incorrect password")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.error
-                                width: parent.width
-                            }
+                            elide: Text.ElideRight
                        }
                    }

@@ -223,55 +98,12 @@ DankModal {
                        iconSize: Theme.iconSize - 4
                        iconColor: Theme.surfaceText
                        onClicked: () => {
-                                       if (isPromptMode) {
-                                           NetworkService.cancelCredentials(promptToken)
-                                       }
                                       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 && !isVpnPrompt
-
-                    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
@@ -295,46 +127,21 @@ DankModal {
                        textColor: Theme.surfaceText
                        text: wifiPasswordInput
                        echoMode: showPasswordCheckbox.checked ? TextInput.Normal : TextInput.Password
-                        placeholderText: (requiresEnterprise && !isVpnPrompt) ? I18n.tr("Password") : ""
+                        placeholderText: ""
                        backgroundColor: "transparent"
-                        focus: !requiresEnterprise
+                        focus: true
                        enabled: root.shouldBeVisible
                        onTextEdited: () => {
                                          wifiPasswordInput = text
                                      }
                        onAccepted: () => {
-                                        if (isPromptMode) {
-                                            const secrets = {}
-                                            if (isVpnPrompt) {
-                                                if (passwordInput.text) secrets["password"] = passwordInput.text
-                                            } else if (promptSetting === "802-11-wireless-security") {
-                                                secrets["psk"] = passwordInput.text
-                                            } else if (promptSetting === "802-1x") {
-                                                if (usernameInput.text) secrets["identity"] = usernameInput.text
-                                                if (passwordInput.text) secrets["password"] = passwordInput.text
-                                                if (wifiAnonymousIdentityInput) secrets["anonymous-identity"] = wifiAnonymousIdentityInput
-                                            }
-                                            NetworkService.submitCredentials(promptToken, secrets, true)
-                                        } else {
-                                            const username = requiresEnterprise ? usernameInput.text : ""
-                                            NetworkService.connectToWifi(
-                                                wifiPasswordSSID,
-                                                passwordInput.text,
-                                                username,
-                                                wifiAnonymousIdentityInput,
-                                                wifiDomainInput
-                                            )
-                                        }
+                                        NetworkService.connectToWifi(wifiPasswordSSID, passwordInput.text)
                                        close()
                                        wifiPasswordInput = ""
-                                        wifiUsernameInput = ""
-                                        wifiAnonymousIdentityInput = ""
-                                        wifiDomainInput = ""
                                        passwordInput.text = ""
-                                        if (requiresEnterprise) usernameInput.text = ""
                                    }
                        Component.onCompleted: () => {
-                                                   if (root.shouldBeVisible && !requiresEnterprise)
+                                                   if (root.shouldBeVisible)
                                                   focusDelayTimer.start()
                                               }

@@ -344,13 +151,8 @@ DankModal {
                            interval: 100
                            repeat: false
                            onTriggered: () => {
-                                             if (root.shouldBeVisible) {
-                                                 if (requiresEnterprise && usernameInput) {
-                                                     usernameInput.forceActiveFocus()
-                                                 } else {
-                                                     passwordInput.forceActiveFocus()
-                                                 }
-                                             }
+                                             if (root.shouldBeVisible)
+                                             passwordInput.forceActiveFocus()
                                         }
                        }

@@ -365,70 +167,6 @@ DankModal {
                    }
                }

-                Rectangle {
-                    visible: requiresEnterprise && !isVpnPrompt
-                    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 && !isVpnPrompt
-                    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

@@ -463,7 +201,7 @@ DankModal {
                    }

                    StyledText {
-                        text: I18n.tr("Show password")
+                        text: "Show password"
                        font.pixelSize: Theme.fontSizeMedium
                        color: Theme.surfaceText
                        anchors.verticalCenter: parent.verticalCenter
@@ -491,7 +229,7 @@ DankModal {
                                id: cancelText

                                anchors.centerIn: parent
-                                text: I18n.tr("Cancel")
+                                text: "Cancel"
                                font.pixelSize: Theme.fontSizeMedium
                                color: Theme.surfaceText
                                font.weight: Font.Medium
@@ -504,14 +242,8 @@ DankModal {
                                hoverEnabled: true
                                cursorShape: Qt.PointingHandCursor
                                onClicked: () => {
-                                               if (isPromptMode) {
-                                                   NetworkService.cancelCredentials(promptToken)
-                                               }
                                               close()
                                               wifiPasswordInput = ""
-                                               wifiUsernameInput = ""
-                                               wifiAnonymousIdentityInput = ""
-                                               wifiDomainInput = ""
                                           }
                            }
                        }
@@ -521,19 +253,14 @@ DankModal {
                            height: 36
                            radius: Theme.cornerRadius
                            color: connectArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
-                            enabled: {
-                                if (isVpnPrompt) {
-                                    return passwordInput.text.length > 0
-                                }
-                                return requiresEnterprise ? (usernameInput.text.length > 0 && passwordInput.text.length > 0) : passwordInput.text.length > 0
-                            }
+                            enabled: passwordInput.text.length > 0
                            opacity: enabled ? 1 : 0.5

                            StyledText {
                                id: connectText

                                anchors.centerIn: parent
-                                text: I18n.tr("Connect")
+                                text: "Connect"
                                font.pixelSize: Theme.fontSizeMedium
                                color: Theme.background
                                font.weight: Font.Medium
@@ -547,35 +274,10 @@ DankModal {
                                cursorShape: Qt.PointingHandCursor
                                enabled: parent.enabled
                                onClicked: () => {
-                                               if (isPromptMode) {
-                                                   const secrets = {}
-                                                   if (isVpnPrompt) {
-                                                       if (passwordInput.text) secrets["password"] = passwordInput.text
-                                                   } else if (promptSetting === "802-11-wireless-security") {
-                                                       secrets["psk"] = passwordInput.text
-                                                   } else if (promptSetting === "802-1x") {
-                                                       if (usernameInput.text) secrets["identity"] = usernameInput.text
-                                                       if (passwordInput.text) secrets["password"] = passwordInput.text
-                                                       if (wifiAnonymousIdentityInput) secrets["anonymous-identity"] = wifiAnonymousIdentityInput
-                                                   }
-                                                   NetworkService.submitCredentials(promptToken, secrets, true)
-                                               } else {
-                                                   const username = requiresEnterprise ? usernameInput.text : ""
-                                                   NetworkService.connectToWifi(
-                                                       wifiPasswordSSID,
-                                                       passwordInput.text,
-                                                       username,
-                                                       wifiAnonymousIdentityInput,
-                                                       wifiDomainInput
-                                                   )
-                                               }
+                                               NetworkService.connectToWifi(wifiPasswordSSID, passwordInput.text)
                                               close()
                                               wifiPasswordInput = ""
-                                               wifiUsernameInput = ""
-                                               wifiAnonymousIdentityInput = ""
-                                               wifiDomainInput = ""
                                               passwordInput.text = ""
-                                               if (requiresEnterprise) usernameInput.text = ""
                                           }
                            }

--- a/Modules/AppDrawer/AppDrawerPopout.qml
+++ b/Modules/AppDrawer/AppDrawerPopout.qml
@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Effects
 import Quickshell
 import Quickshell.Io
@@ -13,8 +12,7 @@ import qs.Widgets
 DankPopout {
    id: appDrawerPopout

-    layerNamespace: "dms:app-launcher"
-
+    property string triggerSection: "left"
    property var triggerScreen: null

    // Setting to Exclusive, so virtual keyboards can send input to app drawer
@@ -35,16 +33,16 @@ DankPopout {
    popupWidth: 520
    popupHeight: 600
    triggerX: Theme.spacingL
-    triggerY: Math.max(26 + SettingsData.dankBarInnerPadding + 4, Theme.barHeight - 4 - (8 - SettingsData.dankBarInnerPadding)) + SettingsData.dankBarSpacing + SettingsData.dankBarBottomGap - 2
+    triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
    triggerWidth: 40
-    positioning: ""
+    positioning: "center"
    screen: triggerScreen

    onShouldBeVisibleChanged: {
        if (shouldBeVisible) {
            appLauncher.searchQuery = ""
            appLauncher.selectedIndex = 0
-            appLauncher.setCategory(I18n.tr("All"))
+            appLauncher.setCategory("All")
            Qt.callLater(() => {
                             if (contentLoader.item && contentLoader.item.searchField) {
                                 contentLoader.item.searchField.text = ""
@@ -61,7 +59,7 @@ DankPopout {
        gridColumns: 4
        onAppLaunched: appDrawerPopout.close()
        onViewModeSelected: function (mode) {
-            SettingsData.set("appLauncherViewMode", mode)
+            SettingsData.setAppLauncherViewMode(mode)
        }
    }

@@ -71,7 +69,7 @@ DankPopout {

            property alias searchField: searchField

-            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+            color: Theme.popupBackground()
            radius: Theme.cornerRadius
            antialiasing: true
            smooth: true
@@ -97,7 +95,7 @@ DankPopout {
                    color: "transparent"
                    radius: parent.radius + Math.abs(modelData.margin)
                    border.color: modelData.color
-                    border.width: 0
+                    border.width: 1
                    z: modelData.z
                }
            }
@@ -114,8 +112,6 @@ DankPopout {
                    mappings[Qt.Key_Up] = () => appLauncher.selectPrevious()
                    mappings[Qt.Key_Return] = () => appLauncher.launchSelected()
                    mappings[Qt.Key_Enter] = () => appLauncher.launchSelected()
-                    mappings[Qt.Key_Tab] = () => appLauncher.viewMode === "grid" ? appLauncher.selectNextInRow() : appLauncher.selectNext()
-                    mappings[Qt.Key_Backtab] = () => appLauncher.viewMode === "grid" ? appLauncher.selectPreviousInRow() : appLauncher.selectPrevious()

                    if (appLauncher.viewMode === "grid") {
                        mappings[Qt.Key_Right] = () => appLauncher.selectNextInRow()
@@ -132,70 +128,38 @@ DankPopout {
                        return
                    }

-                    if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
-                        appLauncher.selectNext()
+                    if (!searchField.activeFocus && event.text && /[a-zA-Z0-9\s]/.test(event.text)) {
+                        searchField.forceActiveFocus()
+                        searchField.insertText(event.text)
                        event.accepted = true
-                        return
                    }
-
-                    if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
-                        appLauncher.selectPrevious()
-                        event.accepted = true
-                        return
-                    }
-
-                    if (event.key === Qt.Key_J && event.modifiers & Qt.ControlModifier) {
-                        appLauncher.selectNext()
-                        event.accepted = true
-                        return
-                    }
-
-                    if (event.key === Qt.Key_K && event.modifiers & Qt.ControlModifier) {
-                        appLauncher.selectPrevious()
-                        event.accepted = true
-                        return
-                    }
-
-                    if (appLauncher.viewMode === "grid") {
-                        if (event.key === Qt.Key_L && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectNextInRow()
-                            event.accepted = true
-                            return
-                        }
-
-                        if (event.key === Qt.Key_H && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectPreviousInRow()
-                            event.accepted = true
-                            return
-                        }
-                    }
-
                }

                Column {
-                    width: parent.width - Theme.spacingS * 2
-                    height: parent.height - Theme.spacingS * 2
-                    x: Theme.spacingS
-                    y: Theme.spacingS
-                    spacing: Theme.spacingS
+                    width: parent.width - Theme.spacingL * 2
+                    height: parent.height - Theme.spacingL * 2
+                    x: Theme.spacingL
+                    y: Theme.spacingL
+                    spacing: Theme.spacingL

-                    Item {
+                    Row {
                        width: parent.width
                        height: 40

                        StyledText {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingS
                            anchors.verticalCenter: parent.verticalCenter
-                            text: I18n.tr("Applications")
+                            text: "Applications"
                            font.pixelSize: Theme.fontSizeLarge + 4
                            font.weight: Font.Bold
                            color: Theme.surfaceText
                        }

+                        Item {
+                            width: parent.width - 200
+                            height: 1
+                        }
+
                        StyledText {
-                            anchors.right: parent.right
-                            anchors.rightMargin: Theme.spacingS
                            anchors.verticalCenter: parent.verticalCenter
                            text: appLauncher.model.count + " apps"
                            font.pixelSize: Theme.fontSizeMedium
@@ -206,12 +170,11 @@ DankPopout {
                    DankTextField {
                        id: searchField

-                        width: parent.width - Theme.spacingS * 2
-                        anchors.horizontalCenter: parent.horizontalCenter
+                        width: parent.width
                        height: 52
                        cornerRadius: Theme.cornerRadius
-                        backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-                        normalBorderColor: Theme.outlineMedium
+                        backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.7)
+                        normalBorderColor: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)
                        focusedBorderColor: Theme.primary
                        leftIconName: "search"
                        leftIconSize: Theme.iconSize
@@ -220,8 +183,7 @@ DankPopout {
                        showClearButton: true
                        font.pixelSize: Theme.fontSizeLarge
                        enabled: appDrawerPopout.shouldBeVisible
-                        ignoreLeftRightKeys: appLauncher.viewMode !== "list"
-                        ignoreTabKeys: true
+                        ignoreLeftRightKeys: true
                        keyForwardTargets: [keyHandler]
                        onTextEdited: {
                            appLauncher.searchQuery = text
@@ -246,7 +208,7 @@ DankPopout {
                                return
                            }

-                            const navigationKeys = [Qt.Key_Down, Qt.Key_Up, Qt.Key_Left, Qt.Key_Right, Qt.Key_Tab, Qt.Key_Backtab]
+                            const navigationKeys = [Qt.Key_Down, Qt.Key_Up, Qt.Key_Left, Qt.Key_Right]
                            const isNavigationKey = navigationKeys.includes(event.key)
                            const isEmptyEnter = isEnterKey && !hasText

@@ -269,18 +231,14 @@ DankPopout {
                        height: 40
                        spacing: Theme.spacingM
                        visible: searchField.text.length === 0
-                        leftPadding: Theme.spacingS

-                        Rectangle {
-                            width: 180
-                            height: 40
-                            radius: Theme.cornerRadius
-                            color: "transparent"
+                        Item {
+                            width: 200
+                            height: 36

                            DankDropdown {
                                anchors.fill: parent
                                text: ""
-                                dropdownWidth: 180
                                currentValue: appLauncher.selectedCategory
                                options: appLauncher.categories
                                optionIcons: appLauncher.categoryIcons
@@ -291,7 +249,7 @@ DankPopout {
                        }

                        Item {
-                            width: parent.width - 290
+                            width: parent.width - 300
                            height: 1
                        }

@@ -328,13 +286,15 @@ DankPopout {
                    Rectangle {
                        width: parent.width
                        height: {
-                            let usedHeight = 40 + Theme.spacingS
-                            usedHeight += 52 + Theme.spacingS
-                            usedHeight += (searchField.text.length === 0 ? 40 : 0)
+                            let usedHeight = 40 + Theme.spacingL
+                            usedHeight += 52 + Theme.spacingL
+                            usedHeight += (searchField.text.length === 0 ? 40 + Theme.spacingL : 0)
                            return parent.height - usedHeight
                        }
                        radius: Theme.cornerRadius
-                        color: "transparent"
+                        color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.1)
+                        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05)
+                        border.width: 1

                        DankListView {
                            id: appList
@@ -363,9 +323,7 @@ DankPopout {
                            }

                            anchors.fill: parent
-                            anchors.leftMargin: Theme.spacingS
-                            anchors.rightMargin: Theme.spacingS
-                            anchors.bottomMargin: Theme.spacingS
+                            anchors.margins: Theme.spacingS
                            visible: appLauncher.viewMode === "list"
                            model: appLauncher.model
                            currentIndex: appLauncher.selectedIndex
@@ -391,27 +349,102 @@ DankPopout {
                                appLauncher.keyboardNavigationActive = false
                            }

-                            delegate: AppLauncherListDelegate {
-                                listView: appList
-                                itemHeight: appList.itemHeight
-                                iconSize: appList.iconSize
-                                showDescription: appList.showDescription
-                                hoverUpdatesSelection: appList.hoverUpdatesSelection
-                                keyboardNavigationActive: appList.keyboardNavigationActive
-                                isCurrentItem: ListView.isCurrentItem
-                                mouseAreaLeftMargin: Theme.spacingS
-                                mouseAreaRightMargin: Theme.spacingS
-                                mouseAreaBottomMargin: Theme.spacingM
-                                iconMargins: Theme.spacingXS
-                                iconFallbackLeftMargin: Theme.spacingS
-                                iconFallbackRightMargin: Theme.spacingS
-                                iconFallbackBottomMargin: Theme.spacingM
-                                onItemClicked: (idx, modelData) => appList.itemClicked(idx, modelData)
-                                onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
-                                    const panelPos = contextMenu.parent.mapFromItem(null, mouseX, mouseY)
-                                    appList.itemRightClicked(idx, modelData, panelPos.x, panelPos.y)
+                            delegate: Rectangle {
+                                width: ListView.view.width
+                                height: appList.itemHeight
+                                radius: Theme.cornerRadius
+                                color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.03)
+                                border.color: ListView.isCurrentItem ? Theme.primarySelected : Theme.outlineMedium
+                                border.width: ListView.isCurrentItem ? 2 : 1
+
+                                Row {
+                                    anchors.fill: parent
+                                    anchors.margins: Theme.spacingM
+                                    spacing: Theme.spacingL
+
+                                    Item {
+                                        width: appList.iconSize
+                                        height: appList.iconSize
+                                        anchors.verticalCenter: parent.verticalCenter
+
+                                        IconImage {
+                                            id: listIconImg
+
+                                            anchors.fill: parent
+                                            source: Quickshell.iconPath(model.icon, true)
+                                            smooth: 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: appList.iconSize * 0.4
+                                                color: Theme.primary
+                                                font.weight: Font.Bold
+                                            }
+                                        }
+                                    }
+
+                                    Column {
+                                        anchors.verticalCenter: parent.verticalCenter
+                                        width: parent.width - appList.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
+                                        }
+
+                                        StyledText {
+                                            width: parent.width
+                                            text: model.comment || "Application"
+                                            font.pixelSize: Theme.fontSizeMedium
+                                            color: Theme.surfaceVariantText
+                                            elide: Text.ElideRight
+                                            maximumLineCount: 1
+                                            visible: appList.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 (appList.hoverUpdatesSelection && !appList.keyboardNavigationActive)
+                                            appList.currentIndex = index
+                                    }
+                                    onPositionChanged: {
+                                        appList.keyboardNavigationReset()
+                                    }
+                                    onClicked: mouse => {
+                                                   if (mouse.button === Qt.LeftButton) {
+                                                       appList.itemClicked(index, model)
+                                                   } else if (mouse.button === Qt.RightButton) {
+                                                       var panelPos = mapToItem(contextMenu.parent, mouse.x, mouse.y)
+                                                       appList.itemRightClicked(index, model, panelPos.x, panelPos.y)
+                                                   }
+                                               }
                                }
-                                onKeyboardNavigationReset: appList.keyboardNavigationReset
                            }
                        }

@@ -432,7 +465,6 @@ DankPopout {
                            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
@@ -452,9 +484,7 @@ DankPopout {
                            }

                            anchors.fill: parent
-                            anchors.leftMargin: Theme.spacingS
-                            anchors.rightMargin: Theme.spacingS
-                            anchors.bottomMargin: Theme.spacingS
+                            anchors.margins: Theme.spacingS
                            visible: appLauncher.viewMode === "grid"
                            model: appLauncher.model
                            clip: true
@@ -482,30 +512,91 @@ DankPopout {
                                appLauncher.keyboardNavigationActive = false
                            }

-                            delegate: AppLauncherGridDelegate {
-                                gridView: appGrid
-                                cellWidth: appGrid.cellWidth
-                                cellHeight: appGrid.cellHeight
-                                cellPadding: appGrid.cellPadding
-                                minIconSize: appGrid.minIconSize
-                                maxIconSize: appGrid.maxIconSize
-                                iconSizeRatio: appGrid.iconSizeRatio
-                                hoverUpdatesSelection: appGrid.hoverUpdatesSelection
-                                keyboardNavigationActive: appGrid.keyboardNavigationActive
-                                currentIndex: appGrid.currentIndex
-                                mouseAreaLeftMargin: Theme.spacingS
-                                mouseAreaRightMargin: Theme.spacingS
-                                mouseAreaBottomMargin: Theme.spacingS
-                                iconFallbackLeftMargin: Theme.spacingS
-                                iconFallbackRightMargin: Theme.spacingS
-                                iconFallbackBottomMargin: Theme.spacingS
-                                iconMaterialSizeAdjustment: Theme.spacingL
-                                onItemClicked: (idx, modelData) => appGrid.itemClicked(idx, modelData)
-                                onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
-                                    const panelPos = contextMenu.parent.mapFromItem(null, mouseX, mouseY)
-                                    appGrid.itemRightClicked(idx, modelData, panelPos.x, panelPos.y)
+                            delegate: Rectangle {
+                                width: appGrid.cellWidth - appGrid.cellPadding
+                                height: appGrid.cellHeight - appGrid.cellPadding
+                                radius: Theme.cornerRadius
+                                color: appGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.03)
+                                border.color: appGrid.currentIndex === index ? Theme.primarySelected : Theme.outlineMedium
+                                border.width: appGrid.currentIndex === index ? 2 : 1
+
+                                Column {
+                                    anchors.centerIn: parent
+                                    spacing: Theme.spacingS
+
+                                    Item {
+                                        property int iconSize: Math.min(appGrid.maxIconSize, Math.max(appGrid.minIconSize, appGrid.cellWidth * appGrid.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: appGrid.cellWidth - 12
+                                        text: model.name || ""
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceText
+                                        font.weight: Font.Medium
+                                        elide: Text.ElideRight
+                                        horizontalAlignment: Text.AlignHCenter
+                                        maximumLineCount: 2
+                                        wrapMode: Text.WordWrap
+                                    }
+                                }
+
+                                MouseArea {
+                                    id: gridMouseArea
+
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    cursorShape: Qt.PointingHandCursor
+                                    acceptedButtons: Qt.LeftButton | Qt.RightButton
+                                    z: 10
+                                    onEntered: {
+                                        if (appGrid.hoverUpdatesSelection && !appGrid.keyboardNavigationActive)
+                                            appGrid.currentIndex = index
+                                    }
+                                    onPositionChanged: {
+                                        appGrid.keyboardNavigationReset()
+                                    }
+                                    onClicked: mouse => {
+                                                   if (mouse.button === Qt.LeftButton) {
+                                                       appGrid.itemClicked(index, model)
+                                                   } else if (mouse.button === Qt.RightButton) {
+                                                       var panelPos = mapToItem(contextMenu.parent, mouse.x, mouse.y)
+                                                       appGrid.itemRightClicked(index, model, panelPos.x, panelPos.y)
+                                                   }
+                                               }
                                }
-                                onKeyboardNavigationReset: appGrid.keyboardNavigationReset
                            }
                        }
                    }
@@ -514,68 +605,68 @@ DankPopout {
        }
    }

-    Popup {
+    Rectangle {
        id: contextMenu

        property var currentApp: null
-        readonly property var desktopEntry: (currentApp && !currentApp.isPlugin && appLauncher && appLauncher._uniqueApps && currentApp.appIndex >= 0 && currentApp.appIndex < appLauncher._uniqueApps.length) ? appLauncher._uniqueApps[currentApp.appIndex] : null
-        readonly property string appId: desktopEntry ? (desktopEntry.id || desktopEntry.execString || "") : ""
+        property bool menuVisible: false
+
+        readonly property string appId: (currentApp && currentApp.desktopEntry) ? (currentApp.desktopEntry.id || currentApp.desktopEntry.execString || "") : ""
        readonly property bool isPinned: appId && SessionData.isPinnedApp(appId)

        function show(x, y, app) {
            currentApp = app
-            contextMenu.x = x + 4
-            contextMenu.y = y + 4
-            contextMenu.open()
+
+            const menuWidth = 180
+            const menuHeight = menuColumn.implicitHeight + Theme.spacingS * 2
+
+            let finalX = x + 8
+            let finalY = y + 8
+
+            if (finalX + menuWidth > appDrawerPopout.popupWidth) {
+                finalX = x - menuWidth - 8
+            }
+
+            if (finalY + menuHeight > appDrawerPopout.popupHeight) {
+                finalY = y - menuHeight - 8
+            }
+
+            finalX = Math.max(8, Math.min(finalX, appDrawerPopout.popupWidth - menuWidth - 8))
+            finalY = Math.max(8, Math.min(finalY, appDrawerPopout.popupHeight - menuHeight - 8))
+
+            contextMenu.x = finalX
+            contextMenu.y = finalY
+            contextMenu.visible = true
+            contextMenu.menuVisible = true
        }

-        function hide() {
-            contextMenu.close()
+        function close() {
+            contextMenu.menuVisible = false
+            Qt.callLater(() => {
+                             contextMenu.visible = false
+                         })
        }

-        width: Math.max(180, menuColumn.implicitWidth + Theme.spacingS * 2)
+        visible: false
+        width: 180
        height: menuColumn.implicitHeight + Theme.spacingS * 2
-        padding: 0
-        closePolicy: Popup.CloseOnPressOutside
-        modal: false
-        dim: false
+        radius: Theme.cornerRadius
+        color: Theme.popupBackground()
+        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
+        border.width: 1
+        z: 1000
+        opacity: menuVisible ? 1 : 0
+        scale: menuVisible ? 1 : 0.85

-        background: Rectangle {
-            radius: Theme.cornerRadius
-            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-            border.width: 1
-
-            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: -1
-            }
-        }
-
-        enter: Transition {
-            NumberAnimation {
-                property: "opacity"
-                from: 0
-                to: 1
-                duration: Theme.shortDuration
-                easing.type: Theme.emphasizedEasing
-            }
-        }
-
-        exit: Transition {
-            NumberAnimation {
-                property: "opacity"
-                from: 1
-                to: 0
-                duration: Theme.shortDuration
-                easing.type: Theme.emphasizedEasing
-            }
+        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
        }

        Column {
@@ -606,7 +697,7 @@ DankPopout {
                    }

                    StyledText {
-                        text: contextMenu.isPinned ? I18n.tr("Unpin from Dock") : I18n.tr("Pin to Dock")
+                        text: contextMenu.isPinned ? "Unpin from Dock" : "Pin to Dock"
                        font.pixelSize: Theme.fontSizeSmall
                        color: Theme.surfaceText
                        font.weight: Font.Normal
@@ -621,7 +712,7 @@ DankPopout {
                    hoverEnabled: true
                    cursorShape: Qt.PointingHandCursor
                    onClicked: {
-                        if (!contextMenu.desktopEntry) {
+                        if (!contextMenu.currentApp || !contextMenu.currentApp.desktopEntry) {
                            return
                        }

@@ -630,7 +721,7 @@ DankPopout {
                        } else {
                            SessionData.addPinnedApp(contextMenu.appId)
                        }
-                        contextMenu.hide()
+                        contextMenu.close()
                    }
                }
            }
@@ -649,79 +740,6 @@ DankPopout {
                }
            }

-            Repeater {
-                model: contextMenu.desktopEntry && contextMenu.desktopEntry.actions ? contextMenu.desktopEntry.actions : []
-
-                Rectangle {
-                    width: Math.max(parent.width, actionRow.implicitWidth + Theme.spacingS * 2)
-                    height: 32
-                    radius: Theme.cornerRadius
-                    color: actionMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                    Row {
-                        id: actionRow
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        Item {
-                            anchors.verticalCenter: parent.verticalCenter
-                            width: Theme.iconSize - 2
-                            height: Theme.iconSize - 2
-                            visible: modelData.icon && modelData.icon !== ""
-
-                            IconImage {
-                                anchors.fill: parent
-                                source: modelData.icon ? Quickshell.iconPath(modelData.icon, true) : ""
-                                smooth: true
-                                asynchronous: true
-                                visible: status === Image.Ready
-                            }
-                        }
-
-                        StyledText {
-                            text: modelData.name || ""
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Normal
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    MouseArea {
-                        id: actionMouseArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            if (modelData && contextMenu.desktopEntry) {
-                                SessionService.launchDesktopAction(contextMenu.desktopEntry, modelData)
-                                if (contextMenu.currentApp) {
-                                    appLauncher.appLaunched(contextMenu.currentApp)
-                                }
-                            }
-                            contextMenu.hide()
-                        }
-                    }
-                }
-            }
-
-            Rectangle {
-                visible: contextMenu.desktopEntry && contextMenu.desktopEntry.actions && contextMenu.desktopEntry.actions.length > 0
-                width: parent.width - Theme.spacingS * 2
-                height: 5
-                anchors.horizontalCenter: parent.horizontalCenter
-                color: "transparent"
-
-                Rectangle {
-                    anchors.centerIn: parent
-                    width: parent.width
-                    height: 1
-                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                }
-            }
-
            Rectangle {
                width: parent.width
                height: 32
@@ -743,7 +761,7 @@ DankPopout {
                    }

                    StyledText {
-                        text: I18n.tr("Launch")
+                        text: "Launch"
                        font.pixelSize: Theme.fontSizeSmall
                        color: Theme.surfaceText
                        font.weight: Font.Normal
@@ -761,72 +779,23 @@ DankPopout {
                        if (contextMenu.currentApp)
                            appLauncher.launchApp(contextMenu.currentApp)

-                        contextMenu.hide()
+                        contextMenu.close()
                    }
                }
            }
+        }

-            Rectangle {
-                visible: SessionService.hasPrimeRun
-                width: parent.width - Theme.spacingS * 2
-                height: 5
-                anchors.horizontalCenter: parent.horizontalCenter
-                color: "transparent"
-
-                Rectangle {
-                    anchors.centerIn: parent
-                    width: parent.width
-                    height: 1
-                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                }
+        Behavior on opacity {
+            NumberAnimation {
+                duration: Theme.mediumDuration
+                easing.type: Theme.emphasizedEasing
            }
+        }

-            Rectangle {
-                visible: SessionService.hasPrimeRun
-                width: parent.width
-                height: 32
-                radius: Theme.cornerRadius
-                color: primeRunMouseArea.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.spacingS
-
-                    DankIcon {
-                        name: "memory"
-                        size: Theme.iconSize - 2
-                        color: Theme.surfaceText
-                        opacity: 0.7
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Launch on dGPU")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceText
-                        font.weight: Font.Normal
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                MouseArea {
-                    id: primeRunMouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (contextMenu.desktopEntry) {
-                            SessionService.launchDesktopEntry(contextMenu.desktopEntry, true)
-                            if (contextMenu.currentApp) {
-                                appLauncher.appLaunched(contextMenu.currentApp)
-                            }
-                        }
-                        contextMenu.hide()
-                    }
-                }
+        Behavior on scale {
+            NumberAnimation {
+                duration: Theme.mediumDuration
+                easing.type: Theme.emphasizedEasing
            }
        }
    }
@@ -836,7 +805,7 @@ DankPopout {
        visible: contextMenu.visible
        z: 999
        onClicked: {
-            contextMenu.hide()
+            contextMenu.close()
        }

        MouseArea {
--- a/Modules/AppDrawer/AppLauncher.qml
+++ b/Modules/AppDrawer/AppLauncher.qml
@@ -8,12 +8,8 @@ import qs.Widgets
 Item {
    id: root

-    // DEVELOPER NOTE: This component manages the AppDrawer launcher (accessed via DankBar icon).
-    // Changes to launcher behavior, especially item rendering, filtering, or model structure,
-    // likely require corresponding updates in Modals/Spotlight/SpotlightResults.qml and vice versa.
-
    property string searchQuery: ""
-    property string selectedCategory: I18n.tr("All")
+    property string selectedCategory: "All"
    property string viewMode: "list" // "list" or "grid"
    property int selectedIndex: 0
    property int maxResults: 50
@@ -22,46 +18,20 @@ Item {
    property int debounceInterval: 50
    property bool keyboardNavigationActive: false
    property bool suppressUpdatesWhileLaunching: false
-    property var categories: {
+    readonly property var categories: {
        const allCategories = AppSearchService.getAllCategories().filter(cat => cat !== "Education" && cat !== "Science")
-        const result = [I18n.tr("All")]
-        return result.concat(allCategories.filter(cat => cat !== I18n.tr("All")))
+        const result = ["All"]
+        return result.concat(allCategories.filter(cat => cat !== "All"))
    }
    readonly property var categoryIcons: categories.map(category => AppSearchService.getCategoryIcon(category))
    property var appUsageRanking: AppUsageHistoryData.appUsageRanking || {}
    property alias model: filteredModel
    property var _watchApplications: AppSearchService.applications
-    property var _uniqueApps: []
-    property bool _isTriggered: false
-    property string _triggeredCategory: ""
-    property bool _updatingFromTrigger: false

    signal appLaunched(var app)
    signal categorySelected(string category)
    signal viewModeSelected(string mode)

-    function updateCategories() {
-        const allCategories = AppSearchService.getAllCategories().filter(cat => cat !== "Education" && cat !== "Science")
-        const result = [I18n.tr("All")]
-        categories = result.concat(allCategories.filter(cat => cat !== I18n.tr("All")))
-    }
-
-    Connections {
-        target: PluginService
-        function onPluginLoaded() { updateCategories() }
-        function onPluginUnloaded() { updateCategories() }
-        function onPluginListUpdated() { updateCategories() }
-    }
-
-    Connections {
-        target: SettingsData
-        function onSortAppsAlphabeticallyChanged() {
-            updateFilteredModel()
-        }
-    }
-
-
-
    function updateFilteredModel() {
        if (suppressUpdatesWhileLaunching) {
            suppressUpdatesWhileLaunching = false
@@ -71,112 +41,49 @@ Item {
        selectedIndex = 0
        keyboardNavigationActive = false

-        const triggerResult = checkPluginTriggers(searchQuery)
-        if (triggerResult.triggered) {
-            console.log("AppLauncher: Plugin trigger detected:", triggerResult.trigger, "for plugin:", triggerResult.pluginId)
-        }
-
        let apps = []
-        const allCategory = I18n.tr("All")
-        const emptyTriggerPlugins = typeof PluginService !== "undefined" ? PluginService.getPluginsWithEmptyTrigger() : []
-
-        if (triggerResult.triggered) {
-            _isTriggered = true
-            _triggeredCategory = triggerResult.pluginCategory
-            _updatingFromTrigger = true
-            selectedCategory = triggerResult.pluginCategory
-            _updatingFromTrigger = false
-            apps = AppSearchService.getPluginItems(triggerResult.pluginCategory, triggerResult.query)
+        if (searchQuery.length === 0) {
+            apps = selectedCategory === "All" ? AppSearchService.getAppsInCategory("All") : AppSearchService.getAppsInCategory(selectedCategory).slice(0, maxResults)
        } else {
-            if (_isTriggered) {
-                _updatingFromTrigger = true
-                selectedCategory = allCategory
-                _updatingFromTrigger = false
-                _isTriggered = false
-                _triggeredCategory = ""
-            }
-            if (searchQuery.length === 0) {
-                if (selectedCategory === allCategory) {
-                    let emptyTriggerItems = []
-                    emptyTriggerPlugins.forEach(pluginId => {
-                        const plugin = PluginService.getLauncherPlugin(pluginId)
-                        const pluginCategory = plugin.name || pluginId
-                        const items = AppSearchService.getPluginItems(pluginCategory, "")
-                        emptyTriggerItems = emptyTriggerItems.concat(items)
-                    })
-                    apps = AppSearchService.applications.concat(emptyTriggerItems)
-                } else {
-                    apps = AppSearchService.getAppsInCategory(selectedCategory).slice(0, maxResults)
-                }
+            if (selectedCategory === "All") {
+                apps = AppSearchService.searchApplications(searchQuery)
            } else {
-                if (selectedCategory === allCategory) {
-                    apps = AppSearchService.searchApplications(searchQuery)
-
-                    let emptyTriggerItems = []
-                    emptyTriggerPlugins.forEach(pluginId => {
-                        const plugin = PluginService.getLauncherPlugin(pluginId)
-                        const pluginCategory = plugin.name || pluginId
-                        const items = AppSearchService.getPluginItems(pluginCategory, searchQuery)
-                        emptyTriggerItems = emptyTriggerItems.concat(items)
-                    })
-                    apps = apps.concat(emptyTriggerItems)
+                const categoryApps = AppSearchService.getAppsInCategory(selectedCategory)
+                if (categoryApps.length > 0) {
+                    const allSearchResults = AppSearchService.searchApplications(searchQuery)
+                    const categoryNames = new Set(categoryApps.map(app => app.name))
+                    apps = allSearchResults.filter(searchApp => categoryNames.has(searchApp.name)).slice(0, maxResults)
                } else {
-                    const categoryApps = AppSearchService.getAppsInCategory(selectedCategory)
-                    if (categoryApps.length > 0) {
-                        const allSearchResults = AppSearchService.searchApplications(searchQuery)
-                        const categoryNames = new Set(categoryApps.map(app => app.name))
-                        apps = allSearchResults.filter(searchApp => categoryNames.has(searchApp.name)).slice(0, maxResults)
-                    } else {
-                        apps = []
-                    }
+                    apps = []
                }
            }
        }

        if (searchQuery.length === 0) {
-            if (SettingsData.sortAppsAlphabetically) {
-                apps = apps.sort((a, b) => {
-                                     return (a.name || "").localeCompare(b.name || "")
-                                 })
-            } else {
-                apps = apps.sort((a, b) => {
-                                     const aId = a.id || a.execString || a.exec || ""
-                                     const bId = b.id || b.execString || b.exec || ""
-                                     const aUsage = appUsageRanking[aId] ? appUsageRanking[aId].usageCount : 0
-                                     const bUsage = appUsageRanking[bId] ? appUsageRanking[bId].usageCount : 0
-                                     if (aUsage !== bUsage) {
-                                         return bUsage - aUsage
-                                     }
-                                     return (a.name || "").localeCompare(b.name || "")
-                                 })
-            }
+            apps = apps.sort((a, b) => {
+                                 const aId = a.id || a.execString || a.exec || ""
+                                 const bId = b.id || b.execString || b.exec || ""
+                                 const aUsage = appUsageRanking[aId] ? appUsageRanking[aId].usageCount : 0
+                                 const bUsage = appUsageRanking[bId] ? appUsageRanking[bId].usageCount : 0
+                                 if (aUsage !== bUsage) {
+                                     return bUsage - aUsage
+                                 }
+                                 return (a.name || "").localeCompare(b.name || "")
+                             })
        }

-        const seenNames = new Set()
-        const uniqueApps = []
        apps.forEach(app => {
                         if (app) {
-                             const itemKey = app.name + "|" + (app.execString || app.exec || app.action || "")
-                             if (seenNames.has(itemKey)) {
-                                 return
-                             }
-                             seenNames.add(itemKey)
-                             uniqueApps.push(app)
-
-                             const isPluginItem = app.action !== undefined
                             filteredModel.append({
                                                      "name": app.name || "",
-                                                      "exec": app.execString || app.exec || app.action || "",
-                                                      "icon": app.icon !== undefined ? app.icon : (isPluginItem ? "" : "application-x-executable"),
+                                                      "exec": app.execString || "",
+                                                      "icon": app.icon || "application-x-executable",
                                                      "comment": app.comment || "",
                                                      "categories": app.categories || [],
-                                                      "isPlugin": isPluginItem,
-                                                      "appIndex": uniqueApps.length - 1
+                                                      "desktopEntry": app
                                                  })
                         }
                     })
-
-        root._uniqueApps = uniqueApps
    }

    function selectNext() {
@@ -220,25 +127,13 @@ Item {
    }

    function launchApp(appData) {
-        if (!appData || typeof appData.appIndex === "undefined" || appData.appIndex < 0 || appData.appIndex >= _uniqueApps.length) {
+        if (!appData) {
            return
        }
        suppressUpdatesWhileLaunching = true
-
-        const actualApp = _uniqueApps[appData.appIndex]
-
-        if (appData.isPlugin) {
-            const pluginId = getPluginIdForItem(actualApp)
-            if (pluginId) {
-                AppSearchService.executePluginItem(actualApp, pluginId)
-                appLaunched(appData)
-                return
-            }
-        } else {
-            SessionService.launchDesktopEntry(actualApp)
-            appLaunched(appData)
-            AppUsageHistoryData.addAppUsage(actualApp)
-        }
+        SessionService.launchDesktopEntry(appData.desktopEntry)
+        appLaunched(appData)
+        AppUsageHistoryData.addAppUsage(appData.desktopEntry)
    }

    function setCategory(category) {
@@ -258,12 +153,7 @@ Item {
            updateFilteredModel()
        }
    }
-    onSelectedCategoryChanged: {
-        if (_updatingFromTrigger) {
-            return
-        }
-        updateFilteredModel()
-    }
+    onSelectedCategoryChanged: updateFilteredModel()
    onAppUsageRankingChanged: updateFilteredModel()
    on_WatchApplicationsChanged: updateFilteredModel()
    Component.onCompleted: {
@@ -281,63 +171,4 @@ Item {
        repeat: false
        onTriggered: updateFilteredModel()
    }
-
-    // Plugin trigger system functions
-    function checkPluginTriggers(query) {
-        if (!query || typeof PluginService === "undefined") {
-            return { triggered: false, pluginCategory: "", query: "" }
-        }
-
-        const triggers = PluginService.getAllPluginTriggers()
-
-        for (const trigger in triggers) {
-            if (query.startsWith(trigger)) {
-                const pluginId = triggers[trigger]
-                const plugin = PluginService.getLauncherPlugin(pluginId)
-
-                if (plugin) {
-                    const remainingQuery = query.substring(trigger.length).trim()
-                    const result = {
-                        triggered: true,
-                        pluginId: pluginId,
-                        pluginCategory: plugin.name || pluginId,
-                        query: remainingQuery,
-                        trigger: trigger
-                    }
-                    return result
-                }
-            }
-        }
-
-        return { triggered: false, pluginCategory: "", query: "" }
-    }
-
-    function getPluginIdForItem(item) {
-        if (!item || !item.categories || typeof PluginService === "undefined") {
-            return null
-        }
-
-        const launchers = PluginService.getLauncherPlugins()
-        for (const pluginId in launchers) {
-            const plugin = launchers[pluginId]
-            const pluginCategory = plugin.name || pluginId
-
-            let hasCategory = false
-            if (Array.isArray(item.categories)) {
-                hasCategory = item.categories.includes(pluginCategory)
-            } else if (item.categories && typeof item.categories.count !== "undefined") {
-                for (let i = 0; i < item.categories.count; i++) {
-                    if (item.categories.get(i) === pluginCategory) {
-                        hasCategory = true
-                        break
-                    }
-                }
-            }
-
-            if (hasCategory) {
-                return pluginId
-            }
-        }
-        return null
-    }
 }
--- a/Modules/AppDrawer/CategorySelector.qml
+++ b/Modules/AppDrawer/CategorySelector.qml
@@ -1,14 +1,13 @@
 import QtQuick
 import QtQuick.Controls
 import qs.Common
-import qs.Services
 import qs.Widgets

 Item {
    id: root

    property var categories: []
-    property string selectedCategory: I18n.tr("All")
+    property string selectedCategory: "All"
    property bool compact: false

    signal categorySelected(string category)
@@ -16,9 +15,10 @@ Item {
    readonly property int maxCompactItems: 8
    readonly property int itemHeight: 36
    readonly property color selectedBorderColor: "transparent"
-    readonly property color unselectedBorderColor: "transparent"
+    readonly property color unselectedBorderColor: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)

    function handleCategoryClick(category) {
+        selectedCategory = category
        categorySelected(category)
    }

@@ -42,7 +42,8 @@ Item {
                height: root.itemHeight
                width: root.getButtonWidth(itemCount, parent.width)
                radius: Theme.cornerRadius
-                color: selectedCategory === modelData ? Theme.primary : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                color: selectedCategory === modelData ? Theme.primary : "transparent"
+                border.color: selectedCategory === modelData ? selectedBorderColor : unselectedBorderColor

                StyledText {
                    anchors.centerIn: parent
@@ -81,7 +82,7 @@ Item {
                    height: root.itemHeight
                    width: root.getButtonWidth(itemCount, parent.width)
                    radius: Theme.cornerRadius
-                    color: selectedCategory === modelData ? Theme.primary : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                    color: selectedCategory === modelData ? Theme.primary : "transparent"
                    border.color: selectedCategory === modelData ? selectedBorderColor : unselectedBorderColor

                    StyledText {
@@ -117,7 +118,7 @@ Item {
                    height: root.itemHeight
                    width: root.getButtonWidth(itemCount, parent.width)
                    radius: Theme.cornerRadius
-                    color: selectedCategory === modelData ? Theme.primary : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                    color: selectedCategory === modelData ? Theme.primary : "transparent"
                    border.color: selectedCategory === modelData ? selectedBorderColor : unselectedBorderColor

                    StyledText {
--- a/Modules/BlurredWallpaperBackground.qml
+++ b/Modules/BlurredWallpaperBackground.qml
@@ -1,233 +0,0 @@
-import QtQuick
-import QtQuick.Effects
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Widgets
-import Quickshell.Io
-import qs.Common
-import qs.Widgets
-import qs.Modules
-import qs.Services
-
-Variants {
-    model: {
-        if (SessionData.isGreeterMode) {
-            return Quickshell.screens
-        }
-        return SettingsData.getFilteredScreens("wallpaper")
-    }
-
-    PanelWindow {
-        id: blurWallpaperWindow
-
-        required property var modelData
-
-        screen: modelData
-
-        WlrLayershell.layer: WlrLayer.Background
-        WlrLayershell.namespace: "dms:blurwallpaper"
-        WlrLayershell.exclusionMode: ExclusionMode.Ignore
-
-        anchors.top: true
-        anchors.bottom: true
-        anchors.left: true
-        anchors.right: true
-
-        color: "transparent"
-
-        Item {
-            id: root
-            anchors.fill: parent
-
-            property string source: SessionData.getMonitorWallpaper(modelData.name) || ""
-            property bool isColorSource: source.startsWith("#")
-
-            Connections {
-                target: SessionData
-                function onIsLightModeChanged() {
-                    if (SessionData.perModeWallpaper) {
-                        var newSource = SessionData.getMonitorWallpaper(modelData.name) || ""
-                        if (newSource !== root.source) {
-                            root.source = newSource
-                        }
-                    }
-                }
-            }
-
-            function getFillMode(modeName) {
-                switch (modeName) {
-                case "Stretch":
-                    return Image.Stretch
-                case "Fit":
-                case "PreserveAspectFit":
-                    return Image.PreserveAspectFit
-                case "Fill":
-                case "PreserveAspectCrop":
-                    return Image.PreserveAspectCrop
-                case "Tile":
-                    return Image.Tile
-                case "TileVertically":
-                    return Image.TileVertically
-                case "TileHorizontally":
-                    return Image.TileHorizontally
-                case "Pad":
-                    return Image.Pad
-                default:
-                    return Image.PreserveAspectCrop
-                }
-            }
-
-            Component.onCompleted: {
-                if (source) {
-                    const formattedSource = source.startsWith("file://") ? source : "file://" + source
-                    setWallpaperImmediate(formattedSource)
-                }
-                isInitialized = true
-            }
-
-            property bool isInitialized: false
-            property real transitionProgress: 0
-            readonly property bool transitioning: transitionAnimation.running
-
-            onSourceChanged: {
-                const isColor = source.startsWith("#")
-
-                if (!source) {
-                    setWallpaperImmediate("")
-                } else if (isColor) {
-                    setWallpaperImmediate("")
-                } else {
-                    if (!isInitialized || !currentWallpaper.source) {
-                        setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
-                        isInitialized = true
-                    } else if (CompositorService.isNiri && SessionData.isSwitchingMode) {
-                        setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
-                    } else {
-                        changeWallpaper(source.startsWith("file://") ? source : "file://" + source)
-                    }
-                }
-            }
-
-            function setWallpaperImmediate(newSource) {
-                transitionAnimation.stop()
-                root.transitionProgress = 0.0
-                currentWallpaper.source = newSource
-                nextWallpaper.source = ""
-                currentWallpaper.opacity = 1
-                nextWallpaper.opacity = 0
-            }
-
-            function changeWallpaper(newPath) {
-                if (newPath === currentWallpaper.source)
-                    return
-                if (!newPath || newPath.startsWith("#"))
-                    return
-
-                if (root.transitioning) {
-                    transitionAnimation.stop()
-                    root.transitionProgress = 0
-                    currentWallpaper.source = nextWallpaper.source
-                    nextWallpaper.source = ""
-                }
-
-                if (!currentWallpaper.source) {
-                    setWallpaperImmediate(newPath)
-                    return
-                }
-
-                nextWallpaper.source = newPath
-
-                if (nextWallpaper.status === Image.Ready) {
-                    transitionAnimation.start()
-                }
-            }
-
-            Loader {
-                anchors.fill: parent
-                active: !root.source || root.isColorSource
-                asynchronous: true
-
-                sourceComponent: DankBackdrop {
-                    screenName: modelData.name
-                }
-            }
-
-            Image {
-                id: currentWallpaper
-                anchors.fill: parent
-                visible: false
-                opacity: 1
-                asynchronous: true
-                smooth: true
-                cache: true
-                fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
-            }
-
-            Image {
-                id: nextWallpaper
-                anchors.fill: parent
-                visible: false
-                opacity: 0
-                asynchronous: true
-                smooth: true
-                cache: true
-                fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
-
-                onStatusChanged: {
-                    if (status !== Image.Ready)
-                        return
-
-                    if (!root.transitioning) {
-                        transitionAnimation.start()
-                    }
-                }
-            }
-
-            Item {
-                id: blurredLayer
-                anchors.fill: parent
-
-                MultiEffect {
-                    anchors.fill: parent
-                    source: currentWallpaper
-                    blurEnabled: true
-                    blur: 0.8
-                    blurMax: 75
-                    opacity: 1 - root.transitionProgress
-                    autoPaddingEnabled: false
-                }
-
-                MultiEffect {
-                    anchors.fill: parent
-                    source: nextWallpaper
-                    blurEnabled: true
-                    blur: 0.8
-                    blurMax: 75
-                    opacity: root.transitionProgress
-                    autoPaddingEnabled: false
-                }
-            }
-
-            NumberAnimation {
-                id: transitionAnimation
-                target: root
-                property: "transitionProgress"
-                from: 0.0
-                to: 1.0
-                duration: 1000
-                easing.type: Easing.InOutCubic
-                onFinished: {
-                    Qt.callLater(() => {
-                                     if (nextWallpaper.source && nextWallpaper.status === Image.Ready && !nextWallpaper.source.toString().startsWith("#")) {
-                                         currentWallpaper.source = nextWallpaper.source
-                                     }
-                                     nextWallpaper.source = ""
-                                     currentWallpaper.opacity = 1
-                                     nextWallpaper.opacity = 0
-                                     root.transitionProgress = 0.0
-                                 })
-                }
-            }
-        }
-    }
-}
--- a/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml
+++ b/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml
@@ -1,309 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-
-    Ref {
-        service: CupsService
-    }
-
-    ccWidgetIcon: CupsService.cupsAvailable && CupsService.getPrintersNum() > 0 ? "print" : "print_disabled"
-    ccWidgetPrimaryText: I18n.tr("Printers")
-    ccWidgetSecondaryText: {
-        if (CupsService.cupsAvailable && CupsService.getPrintersNum() > 0) {
-            return I18n.tr("Printers: ") + CupsService.getPrintersNum() + " - " + I18n.tr("Jobs: ") + CupsService.getTotalJobsNum()
-        } else {
-            if (!CupsService.cupsAvailable) {
-                return I18n.tr("Print Server not available")
-            } else {
-                return I18n.tr("No printer found")
-            }
-        }
-    }
-    ccWidgetIsActive: CupsService.cupsAvailable && CupsService.getTotalJobsNum() > 0
-
-    onCcWidgetToggled: {
-
-    }
-
-    ccDetailContent: Component {
-        Rectangle {
-            id: detailRoot
-            implicitHeight: detailColumn.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            Column {
-                visible: !CupsService.cupsAvailable || CupsService.getPrintersNum() == 0
-                anchors.centerIn: parent
-                spacing: Theme.spacingS
-
-                DankIcon {
-                    name: "print_disabled"
-                    size: 36
-                    color: Theme.surfaceVariantText
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-
-                StyledText {
-                    text: !CupsService.cupsAvailable ? I18n.tr("Print Server not available") : I18n.tr("No printer found")
-                    font.pixelSize: Theme.fontSizeMedium
-                    color: Theme.surfaceVariantText
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-            }
-            
-            Column {
-                id: detailColumn
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingS
-                visible: CupsService.cupsAvailable && CupsService.getPrintersNum() > 0
-                height: visible ? 120 : 0
-
-                RowLayout {
-                    spacing: Theme.spacingS
-                    width: parent.width
-
-                    DankDropdown {
-                        id: printerDropdown
-                        text: ""
-                        Layout.fillWidth: true
-                        Layout.maximumWidth: parent.width - 180
-                        description: ""
-                        currentValue: {
-                            CupsService.getSelectedPrinter()
-                        }
-                        options: CupsService.getPrintersNames()
-                        onValueChanged: value => {
-                                            CupsService.setSelectedPrinter(value)
-                                        }
-                    }
-
-                    Column {
-                        spacing: Theme.spacingS
-
-                        StyledText {
-                            text: CupsService.getCurrentPrinterStatePrettyShort()
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                            anchors.horizontalCenter: parent.horizontalCenter
-                        }
-
-                        Row {
-                            spacing: Theme.spacingM
-
-                            Rectangle {
-                                height: 24
-                                width: 80
-                                radius: 14
-                                color: printerStatusToggle.containsMouse ? Theme.errorHover : Theme.surfaceLight
-                                visible: true
-                                opacity: 1.0
-
-                                Row {
-                                    anchors.centerIn: parent
-                                    spacing: Theme.spacingXS
-
-                                    DankIcon {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        name: CupsService.getCurrentPrinterState() === "stopped" ? "play_arrow" : "pause"
-                                        size: Theme.fontSizeSmall + 4
-                                        color: Theme.surfaceText
-                                    }
-
-                                    StyledText {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        text: CupsService.getCurrentPrinterState() === "stopped" ? I18n.tr("Resume") : I18n.tr("Pause")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceText
-                                        font.weight: Font.Medium
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: printerStatusToggle
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-                                    enabled: true
-                                    onClicked: {
-                                        const selected = CupsService.getSelectedPrinter()
-                                        if (CupsService.getCurrentPrinterState() === "stopped") {
-                                            CupsService.resumePrinter(selected)
-                                        } else {
-                                            CupsService.pausePrinter(selected)
-                                        }
-                                    }
-                                }
-                            }
-
-                            Rectangle {
-                                height: 24
-                                width: 80
-                                radius: 14
-                                color: clearJobsToggle.containsMouse ? Theme.errorHover : Theme.surfaceLight
-                                visible: true
-                                opacity: 1.0
-
-                                Row {
-                                    anchors.centerIn: parent
-                                    spacing: Theme.spacingXS
-
-                                    DankIcon {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        name: "delete_forever"
-                                        size: Theme.fontSizeSmall + 4
-                                        color: Theme.surfaceText
-                                    }
-
-                                    StyledText {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        text: I18n.tr("Jobs")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceText
-                                        font.weight: Font.Medium
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: clearJobsToggle
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-                                    enabled: true
-                                    onClicked: {
-                                        const selected = CupsService.getSelectedPrinter()
-                                        CupsService.purgeJobs(selected)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    height: 1
-                    width: parent.width
-                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                }
-
-                DankFlickable {
-                    width: parent.width
-                    height: 160
-                    contentHeight: listCol.height
-                    clip: true
-
-                    Column {
-                        id: listCol
-                        width: parent.width
-                        spacing: Theme.spacingXS
-
-                        Item {
-                            width: parent.width
-                            height: 120
-                            visible: CupsService.getCurrentPrinterJobs().length === 0
-
-                            Column {
-                                anchors.centerIn: parent
-                                spacing: Theme.spacingS
-
-                                DankIcon {
-                                    name: "work"
-                                    size: 36
-                                    color: Theme.surfaceVariantText
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                }
-
-                                StyledText {
-                                    text: I18n.tr("The job queue of this printer is empty")
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: Theme.surfaceVariantText
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                }
-                            }
-                        }
-
-                        Repeater {
-                            model: CupsService.getCurrentPrinterJobs()
-
-                            delegate: Rectangle {
-                                required property var modelData
-
-                                width: parent ? parent.width : 300
-                                height: 50
-                                radius: Theme.cornerRadius
-                                color: Theme.surfaceContainerHighest
-                                border.width: 1
-                                border.color: Theme.outlineLight
-                                opacity: 1.0
-
-                                RowLayout {
-                                    anchors.left: parent.left
-                                    anchors.right: parent.right
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    anchors.margins: Theme.spacingM
-                                    spacing: Theme.spacingM
-
-                                    DankIcon {
-                                        name: "docs"
-                                        size: Theme.iconSize + 2
-                                        color: Theme.surfaceText
-                                        Layout.alignment: Qt.AlignVCenter
-                                    }
-
-                                    Column {
-                                        spacing: 2
-                                        Layout.alignment: Qt.AlignVCenter
-                                        Layout.fillWidth: true
-
-                                        StyledText {
-                                            text: "[" + modelData.id + "] " + modelData.state + " (" + (modelData.size / 1024) + "kb)"
-                                            font.pixelSize: Theme.fontSizeMedium
-                                            color: Theme.surfaceText
-                                            elide: Text.ElideRight
-                                            wrapMode: Text.NoWrap
-                                            width: parent.width
-                                        }
-
-                                        StyledText {
-                                            text: {
-                                                var date = new Date(modelData.timeCreated)
-                                                return date.toLocaleString(Qt.locale(), Locale.ShortFormat)
-                                            }
-                                            font.pixelSize: Theme.fontSizeSmall
-                                            color: Theme.surfaceTextMedium
-                                        }
-                                    }
-
-                                    Item {
-                                        Layout.fillWidth: true
-                                    }
-                                }
-
-                                DankActionButton {
-                                    id: cancelJobButton
-                                    anchors.right: parent.right
-                                    anchors.rightMargin: Theme.spacingM
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    iconName: "delete"
-                                    buttonSize: 36
-                                    onClicked: {
-                                        CupsService.cancelJob(CupsService.getSelectedPrinter(), modelData.id)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Modules/ControlCenter/BuiltinPlugins/VpnWidget.qml
+++ b/Modules/ControlCenter/BuiltinPlugins/VpnWidget.qml
@@ -1,251 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-
-    Ref {
-        service: DMSNetworkService
-    }
-
-
-    ccWidgetIcon: DMSNetworkService.isBusy ? "sync" : (DMSNetworkService.connected ? "vpn_lock" : "vpn_key_off")
-    ccWidgetPrimaryText: "VPN"
-    ccWidgetSecondaryText: {
-        if (!DMSNetworkService.connected)
-            return "Disconnected"
-        const names = DMSNetworkService.activeNames || []
-        if (names.length <= 1)
-            return names[0] || "Connected"
-        return names[0] + " +" + (names.length - 1)
-    }
-    ccWidgetIsActive: DMSNetworkService.connected
-
-    onCcWidgetToggled: {
-        DMSNetworkService.toggleVpn()
-    }
-
-    ccDetailContent: Component {
-        Rectangle {
-            id: detailRoot
-            implicitHeight: detailColumn.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-
-            Column {
-                id: detailColumn
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingS
-
-                RowLayout {
-                    spacing: Theme.spacingS
-                    width: parent.width
-
-                    StyledText {
-                        text: {
-                            if (!DMSNetworkService.connected)
-                                return "Active: None"
-                            const names = DMSNetworkService.activeNames || []
-                            if (names.length <= 1)
-                                return "Active: " + (names[0] || "VPN")
-                            return "Active: " + names[0] + " +" + (names.length - 1)
-                        }
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        elide: Text.ElideRight
-                        wrapMode: Text.NoWrap
-                        Layout.fillWidth: true
-                        Layout.maximumWidth: parent.width - 120
-                    }
-
-                    Rectangle {
-                        height: 28
-                        radius: 14
-                        color: discAllArea.containsMouse ? Theme.errorHover : Theme.surfaceLight
-                        visible: DMSNetworkService.connected
-                        width: 110
-                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-                        opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
-
-                        Row {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingXS
-
-                            DankIcon {
-                                name: "link_off"
-                                size: Theme.fontSizeSmall
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Disconnect")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                            }
-                        }
-
-                        MouseArea {
-                            id: discAllArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
-                            enabled: !DMSNetworkService.isBusy
-                            onClicked: DMSNetworkService.disconnectAllActive()
-                        }
-                    }
-                }
-
-                Rectangle {
-                    height: 1
-                    width: parent.width
-                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                }
-
-                DankFlickable {
-                    width: parent.width
-                    height: 160
-                    contentHeight: listCol.height
-                    clip: true
-
-                    Column {
-                        id: listCol
-                        width: parent.width
-                        spacing: Theme.spacingXS
-
-                        Item {
-                            width: parent.width
-                            height: DMSNetworkService.profiles.length === 0 ? 120 : 0
-                            visible: height > 0
-
-                            Column {
-                                anchors.centerIn: parent
-                                spacing: Theme.spacingS
-
-                                DankIcon {
-                                    name: "playlist_remove"
-                                    size: 36
-                                    color: Theme.surfaceVariantText
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                }
-
-                                StyledText {
-                                    text: I18n.tr("No VPN profiles found")
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: Theme.surfaceVariantText
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                }
-
-                                StyledText {
-                                    text: I18n.tr("Add a VPN in NetworkManager")
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.surfaceVariantText
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                }
-                            }
-                        }
-
-                        Repeater {
-                            model: DMSNetworkService.profiles
-
-                            delegate: Rectangle {
-                                required property var modelData
-
-                                width: parent ? parent.width : 300
-                                height: 50
-                                radius: Theme.cornerRadius
-                                color: rowArea.containsMouse ? Theme.primaryHoverLight : (DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primaryPressed : Theme.surfaceLight)
-                                border.width: DMSNetworkService.isActiveUuid(modelData.uuid) ? 2 : 1
-                                border.color: DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primary : Theme.outlineLight
-                                opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
-
-                                RowLayout {
-                                    anchors.left: parent.left
-                                    anchors.right: parent.right
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    anchors.margins: Theme.spacingM
-                                    spacing: Theme.spacingS
-
-                                    DankIcon {
-                                        name: DMSNetworkService.isActiveUuid(modelData.uuid) ? "vpn_lock" : "vpn_key_off"
-                                        size: Theme.iconSize - 4
-                                        color: DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primary : Theme.surfaceText
-                                        Layout.alignment: Qt.AlignVCenter
-                                    }
-
-                                    Column {
-                                        spacing: 2
-                                        Layout.alignment: Qt.AlignVCenter
-                                        Layout.fillWidth: true
-
-                                        StyledText {
-                                            text: modelData.name
-                                            font.pixelSize: Theme.fontSizeMedium
-                                            color: DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primary : Theme.surfaceText
-                                            elide: Text.ElideRight
-                                            wrapMode: Text.NoWrap
-                                            width: parent.width
-                                        }
-
-                                        StyledText {
-                                            text: {
-                                                if (modelData.type === "wireguard")
-                                                    return "WireGuard"
-                                                const svc = modelData.serviceType || ""
-                                                if (svc.indexOf("openvpn") !== -1)
-                                                    return "OpenVPN"
-                                                if (svc.indexOf("wireguard") !== -1)
-                                                    return "WireGuard (plugin)"
-                                                if (svc.indexOf("openconnect") !== -1)
-                                                    return "OpenConnect"
-                                                if (svc.indexOf("fortissl") !== -1 || svc.indexOf("forti") !== -1)
-                                                    return "Fortinet"
-                                                if (svc.indexOf("strongswan") !== -1)
-                                                    return "IPsec (strongSwan)"
-                                                if (svc.indexOf("libreswan") !== -1)
-                                                    return "IPsec (Libreswan)"
-                                                if (svc.indexOf("l2tp") !== -1)
-                                                    return "L2TP/IPsec"
-                                                if (svc.indexOf("pptp") !== -1)
-                                                    return "PPTP"
-                                                if (svc.indexOf("vpnc") !== -1)
-                                                    return "Cisco (vpnc)"
-                                                if (svc.indexOf("sstp") !== -1)
-                                                    return "SSTP"
-                                                if (svc)
-                                                    return svc.split('.').pop()
-                                                return "VPN"
-                                            }
-                                            font.pixelSize: Theme.fontSizeSmall
-                                            color: Theme.surfaceTextMedium
-                                        }
-                                    }
-
-                                    Item {
-                                        Layout.fillWidth: true
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: rowArea
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
-                                    enabled: !DMSNetworkService.isBusy
-                                    onClicked: DMSNetworkService.toggle(modelData.uuid)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Modules/ControlCenter/Components/ActionTile.qml
+++ b/Modules/ControlCenter/Components/ActionTile.qml
@@ -25,7 +25,7 @@ Rectangle {

    readonly property color _tileBgActive: Theme.primary
    readonly property color _tileBgInactive:
-        Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+        Theme.surfaceContainerHigh
    readonly property color _tileRingActive:
        Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22)

@@ -59,7 +59,7 @@ Rectangle {
        DankIcon {
            name: root.iconName
            size: Theme.iconSize
-            color: isActive ? Theme.primaryText : Theme.primary
+            color: isActive ? Theme.primaryContainer : Theme.primary
            anchors.verticalCenter: parent.verticalCenter
        }

@@ -77,7 +77,7 @@ Rectangle {
                    width: parent.width
                    text: root.text
                    style: Typography.Style.Body
-                    color: isActive ? Theme.primaryText : Theme.surfaceText
+                    color: isActive ? Theme.primaryContainer : Theme.surfaceText
                    elide: Text.ElideRight
                    wrapMode: Text.NoWrap
                }
@@ -86,7 +86,7 @@ Rectangle {
                    width: parent.width
                    text: root.secondaryText
                    style: Typography.Style.Caption
-                    color: isActive ? Theme.primaryText : Theme.surfaceVariantText
+                    color: isActive ? Theme.primaryContainer : Theme.surfaceVariantText
                    visible: text.length > 0
                    elide: Text.ElideRight
                    wrapMode: Text.NoWrap
--- a/Modules/ControlCenter/Components/DetailHost.qml
+++ b/Modules/ControlCenter/Components/DetailHost.qml
@@ -1,171 +1,40 @@
 import QtQuick
 import qs.Common
-import qs.Services
 import qs.Modules.ControlCenter.Details
-import qs.Modules.ControlCenter.Models

 Item {
    id: root

    property string expandedSection: ""
    property var expandedWidgetData: null
-    property var bluetoothCodecSelector: null
-    property string screenName: ""
-
-    property var pluginDetailInstance: null
-    property var widgetModel: null
-    property var collapseCallback: null

    Loader {
-        id: pluginDetailLoader
        width: parent.width
        height: 250
        y: Theme.spacingS
-        active: false
-        sourceComponent: null
-    }
-
-    Loader {
-        id: coreDetailLoader
-        width: parent.width
-        height: 250
-        y: Theme.spacingS
-        active: false
-        sourceComponent: null
-    }
-
-    Connections {
-        target: coreDetailLoader.item
-        enabled: root.expandedSection.startsWith("brightnessSlider_")
-        ignoreUnknownSignals: true
-
-        function onDeviceNameChanged(newDeviceName) {
-            if (root.expandedWidgetData && root.expandedWidgetData.id === "brightnessSlider") {
-                const widgets = SettingsData.controlCenterWidgets || []
-                const newWidgets = widgets.map(w => {
-                    if (w.id === "brightnessSlider" && w.instanceId === root.expandedWidgetData.instanceId) {
-                        const updatedWidget = Object.assign({}, w)
-                        updatedWidget.deviceName = newDeviceName
-                        return updatedWidget
-                    }
-                    return w
-                })
-                SettingsData.set("controlCenterWidgets", newWidgets)
-                if (root.collapseCallback) {
-                    root.collapseCallback()
+        active: parent.height > 0
+        property string sectionKey: root.expandedSection
+        sourceComponent: {
+            switch (root.expandedSection) {
+            case "network":
+            case "wifi": return networkDetailComponent
+            case "bluetooth": return bluetoothDetailComponent
+            case "audioOutput": return audioOutputDetailComponent
+            case "audioInput": return audioInputDetailComponent
+            case "battery": return batteryDetailComponent
+            default:
+                if (root.expandedSection.startsWith("diskUsage_")) {
+                    return diskUsageDetailComponent
                }
+                return null
            }
        }
-    }
-
-    Connections {
-        target: coreDetailLoader.item
-        enabled: root.expandedSection.startsWith("diskUsage_")
-        ignoreUnknownSignals: true
-
-        function onMountPathChanged(newMountPath) {
-            if (root.expandedWidgetData && root.expandedWidgetData.id === "diskUsage") {
-                const widgets = SettingsData.controlCenterWidgets || []
-                const newWidgets = widgets.map(w => {
-                    if (w.id === "diskUsage" && w.instanceId === root.expandedWidgetData.instanceId) {
-                        const updatedWidget = Object.assign({}, w)
-                        updatedWidget.mountPath = newMountPath
-                        return updatedWidget
-                    }
-                    return w
-                })
-                SettingsData.set("controlCenterWidgets", newWidgets)
-                if (root.collapseCallback) {
-                    root.collapseCallback()
-                }
-            }
+        onSectionKeyChanged: {
+            active = false
+            active = true
        }
    }

-    onExpandedSectionChanged: {
-        if (pluginDetailInstance) {
-            pluginDetailInstance.destroy()
-            pluginDetailInstance = null
-        }
-        pluginDetailLoader.active = false
-        coreDetailLoader.active = false
-
-        if (!root.expandedSection) {
-            return
-        }
-
-        if (root.expandedSection.startsWith("builtin_")) {
-            const builtinId = root.expandedSection
-            let builtinInstance = null
-
-            if (builtinId === "builtin_vpn") {
-                if (widgetModel?.vpnLoader) {
-                    widgetModel.vpnLoader.active = true
-                }
-                builtinInstance = widgetModel.vpnBuiltinInstance
-            }
-            if (builtinId === "builtin_cups") {
-                if (widgetModel?.cupsLoader) {
-                    widgetModel.cupsLoader.active = true
-                }
-                builtinInstance = widgetModel.cupsBuiltinInstance
-            }
-
-            if (!builtinInstance || !builtinInstance.ccDetailContent) {
-                return
-            }
-
-            pluginDetailLoader.sourceComponent = builtinInstance.ccDetailContent
-            pluginDetailLoader.active = parent.height > 0
-            return
-        }
-
-        if (root.expandedSection.startsWith("plugin_")) {
-            const pluginId = root.expandedSection.replace("plugin_", "")
-            const pluginComponent = PluginService.pluginWidgetComponents[pluginId]
-            if (!pluginComponent) {
-                return
-            }
-
-            pluginDetailInstance = pluginComponent.createObject(null)
-            if (!pluginDetailInstance || !pluginDetailInstance.ccDetailContent) {
-                if (pluginDetailInstance) {
-                    pluginDetailInstance.destroy()
-                    pluginDetailInstance = null
-                }
-                return
-            }
-
-            pluginDetailLoader.sourceComponent = pluginDetailInstance.ccDetailContent
-            pluginDetailLoader.active = parent.height > 0
-            return
-        }
-
-        if (root.expandedSection.startsWith("diskUsage_")) {
-            coreDetailLoader.sourceComponent = diskUsageDetailComponent
-            coreDetailLoader.active = parent.height > 0
-            return
-        }
-
-        if (root.expandedSection.startsWith("brightnessSlider_")) {
-            coreDetailLoader.sourceComponent = brightnessDetailComponent
-            coreDetailLoader.active = parent.height > 0
-            return
-        }
-
-        switch (root.expandedSection) {
-        case "network":
-        case "wifi": coreDetailLoader.sourceComponent = networkDetailComponent; break
-        case "bluetooth": coreDetailLoader.sourceComponent = bluetoothDetailComponent; break
-        case "audioOutput": coreDetailLoader.sourceComponent = audioOutputDetailComponent; break
-        case "audioInput": coreDetailLoader.sourceComponent = audioInputDetailComponent; break
-        case "battery": coreDetailLoader.sourceComponent = batteryDetailComponent; break
-        default: return
-        }
-
-        coreDetailLoader.active = parent.height > 0
-    }
-
    Component {
        id: networkDetailComponent
        NetworkDetail {}
@@ -173,17 +42,7 @@ Item {

    Component {
        id: bluetoothDetailComponent
-        BluetoothDetail {
-            id: bluetoothDetail
-            onShowCodecSelector: function(device) {
-                if (root.bluetoothCodecSelector) {
-                    root.bluetoothCodecSelector.show(device)
-                    root.bluetoothCodecSelector.codecSelected.connect(function(deviceAddress, codecName) {
-                        bluetoothDetail.updateDeviceCodecDisplay(deviceAddress, codecName)
-                    })
-                }
-            }
-        }
+        BluetoothDetail {}
    }

    Component {
@@ -206,15 +65,22 @@ Item {
        DiskUsageDetail {
            currentMountPath: root.expandedWidgetData?.mountPath || "/"
            instanceId: root.expandedWidgetData?.instanceId || ""
-        }
-    }

-    Component {
-        id: brightnessDetailComponent
-        BrightnessDetail {
-            initialDeviceName: root.expandedWidgetData?.deviceName || ""
-            instanceId: root.expandedWidgetData?.instanceId || ""
-            screenName: root.screenName
+
+            onMountPathChanged: (newMountPath) => {
+                if (root.expandedWidgetData && root.expandedWidgetData.id === "diskUsage") {
+                    const widgets = SettingsData.controlCenterWidgets || []
+                    const newWidgets = widgets.map(w => {
+                        if (w.id === "diskUsage" && w.instanceId === root.expandedWidgetData.instanceId) {
+                            const updatedWidget = Object.assign({}, w)
+                            updatedWidget.mountPath = newMountPath
+                            return updatedWidget
+                        }
+                        return w
+                    })
+                    SettingsData.setControlCenterWidgets(newWidgets)
+                }
+            }
        }
    }
 }
--- a/Modules/ControlCenter/Components/DragDropDetailHost.qml
+++ b/Modules/ControlCenter/Components/DragDropDetailHost.qml
@@ -1,91 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Modules.ControlCenter.Details
-
-Item {
-    id: root
-
-    property string expandedSection: ""
-    property var expandedWidgetData: null
-
-    height: active ? 250 : 0
-    visible: active
-
-    readonly property bool active: expandedSection !== ""
-
-    Behavior on height {
-        NumberAnimation {
-            duration: Theme.mediumDuration
-            easing.type: Easing.OutCubic
-        }
-    }
-
-    Loader {
-        anchors.fill: parent
-        anchors.topMargin: Theme.spacingS
-        sourceComponent: {
-            if (!root.active) return null
-
-            if (expandedSection.startsWith("diskUsage_")) {
-                return diskUsageDetailComponent
-            }
-
-            switch (expandedSection) {
-                case "wifi": return networkDetailComponent
-                case "bluetooth": return bluetoothDetailComponent
-                case "audioOutput": return audioOutputDetailComponent
-                case "audioInput": return audioInputDetailComponent
-                case "battery": return batteryDetailComponent
-                default: return null
-            }
-        }
-    }
-
-    Component {
-        id: networkDetailComponent
-        NetworkDetail {}
-    }
-
-    Component {
-        id: bluetoothDetailComponent
-        BluetoothDetail {}
-    }
-
-    Component {
-        id: audioOutputDetailComponent
-        AudioOutputDetail {}
-    }
-
-    Component {
-        id: audioInputDetailComponent
-        AudioInputDetail {}
-    }
-
-    Component {
-        id: batteryDetailComponent
-        BatteryDetail {}
-    }
-
-    Component {
-        id: diskUsageDetailComponent
-        DiskUsageDetail {
-            currentMountPath: root.expandedWidgetData?.mountPath || "/"
-            instanceId: root.expandedWidgetData?.instanceId || ""
-
-            onMountPathChanged: (newMountPath) => {
-                if (root.expandedWidgetData && root.expandedWidgetData.id === "diskUsage") {
-                    const widgets = SettingsData.controlCenterWidgets || []
-                    const newWidgets = widgets.map(w => {
-                        if (w.id === "diskUsage" && w.instanceId === root.expandedWidgetData.instanceId) {
-                            const updatedWidget = Object.assign({}, w)
-                            updatedWidget.mountPath = newMountPath
-                            return updatedWidget
-                        }
-                        return w
-                    })
-                    SettingsData.set("controlCenterWidgets", newWidgets)
-                }
-            }
-        }
-    }
-}
--- a/Modules/ControlCenter/Components/DragDropGrid.qml
+++ b/Modules/ControlCenter/Components/DragDropGrid.qml
--- a/Modules/ControlCenter/Components/DragDropWidgetWrapper.qml
+++ b/Modules/ControlCenter/Components/DragDropWidgetWrapper.qml
@@ -1,289 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    property bool editMode: false
-    property var widgetData: null
-    property int widgetIndex: -1
-    property bool isSlider: false
-    property Component widgetComponent: null
-    property real gridCellWidth: 100
-    property real gridCellHeight: 60
-    property int gridColumns: 4
-    property var gridLayout: null
-
-    z: dragArea.drag.active ? 10000 : 1
-
-    signal widgetMoved(int fromIndex, int toIndex)
-    signal removeWidget(int index)
-    signal toggleWidgetSize(int index)
-
-    width: {
-        const widgetWidth = widgetData?.width || 50
-        if (widgetWidth <= 25) return gridCellWidth
-        else if (widgetWidth <= 50) return gridCellWidth * 2
-        else if (widgetWidth <= 75) return gridCellWidth * 3
-        else return gridCellWidth * 4
-    }
-    height: isSlider ? 16 : gridCellHeight
-
-    Rectangle {
-        id: dragIndicator
-        anchors.fill: parent
-        color: "transparent"
-        border.color: Theme.primary
-        border.width: dragArea.drag.active ? 2 : 0
-        radius: Theme.cornerRadius
-        opacity: dragArea.drag.active ? 0.8 : 1.0
-        z: dragArea.drag.active ? 10000 : 1
-
-        Behavior on border.width {
-            NumberAnimation { duration: 150 }
-        }
-        Behavior on opacity {
-            NumberAnimation { duration: 150 }
-        }
-    }
-
-    Loader {
-        id: widgetLoader
-        anchors.fill: parent
-        sourceComponent: widgetComponent
-        property var widgetData: root.widgetData
-        property int widgetIndex: root.widgetIndex
-        property int globalWidgetIndex: root.widgetIndex
-        property int widgetWidth: root.widgetData?.width || 50
-
-
-        MouseArea {
-            id: editModeBlocker
-            anchors.fill: parent
-            enabled: root.editMode
-            acceptedButtons: Qt.AllButtons
-            onPressed: function(mouse) { mouse.accepted = true }
-            onWheel: function(wheel) { wheel.accepted = true }
-            z: 100
-        }
-    }
-
-    MouseArea {
-        id: dragArea
-        anchors.fill: parent
-        enabled: editMode
-        cursorShape: editMode ? Qt.OpenHandCursor : Qt.PointingHandCursor
-        drag.target: editMode ? root : null
-        drag.axis: Drag.XAndYAxis
-        drag.smoothed: true
-
-        onPressed: function(mouse) {
-            if (editMode) {
-                cursorShape = Qt.ClosedHandCursor
-                if (root.gridLayout && root.gridLayout.moveToTop) {
-                    root.gridLayout.moveToTop(root)
-                }
-            }
-        }
-
-        onReleased: function(mouse) {
-            if (editMode) {
-                cursorShape = Qt.OpenHandCursor
-                root.snapToGrid()
-            }
-        }
-    }
-
-    Drag.active: dragArea.drag.active
-    Drag.hotSpot.x: width / 2
-    Drag.hotSpot.y: height / 2
-
-    function swapIndices(i, j) {
-        if (i === j) return;
-        const arr = SettingsData.controlCenterWidgets;
-        if (!arr || i < 0 || j < 0 || i >= arr.length || j >= arr.length) return;
-
-        const copy = arr.slice();
-        const tmp = copy[i];
-        copy[i] = copy[j];
-        copy[j] = tmp;
-
-        SettingsData.set("controlCenterWidgets", copy);
-    }
-
-    function snapToGrid() {
-        if (!editMode || !gridLayout) return
-
-        const globalPos = root.mapToItem(gridLayout, 0, 0)
-        const cellWidth = gridLayout.width / gridColumns
-        const cellHeight = gridCellHeight + Theme.spacingS
-
-        const centerX = globalPos.x + (root.width / 2)
-        const centerY = globalPos.y + (root.height / 2)
-
-        let targetCol = Math.max(0, Math.floor(centerX / cellWidth))
-        let targetRow = Math.max(0, Math.floor(centerY / cellHeight))
-
-        targetCol = Math.min(targetCol, gridColumns - 1)
-
-        const newIndex = findBestInsertionIndex(targetRow, targetCol)
-
-        if (newIndex !== widgetIndex && newIndex >= 0 && newIndex < (SettingsData.controlCenterWidgets?.length || 0)) {
-            swapIndices(widgetIndex, newIndex)
-        }
-    }
-
-    function findBestInsertionIndex(targetRow, targetCol) {
-        const widgets = SettingsData.controlCenterWidgets || [];
-        const n = widgets.length;
-        if (!n || widgetIndex < 0 || widgetIndex >= n) return -1;
-
-        function spanFor(width) {
-            const w = width ?? 50;
-            if (w <= 25) return 1;
-            if (w <= 50) return 2;
-            if (w <= 75) return 3;
-            return 4;
-        }
-
-        const cols = gridColumns || 4;
-
-        let row = 0, col = 0;
-        let draggedOrigKey = null;
-
-        const pos = [];
-
-        for (let i = 0; i < n; i++) {
-            const span = Math.min(spanFor(widgets[i].width), cols);
-
-            if (col + span > cols) {
-                row++;
-                col = 0;
-            }
-
-            const startCol = col;
-            const centerKey = row * cols + (startCol + (span - 1) / 2);
-
-            if (i === widgetIndex) {
-                draggedOrigKey = centerKey;
-            } else {
-                pos.push({ index: i, row, startCol, span, centerKey });
-            }
-
-            col += span;
-            if (col >= cols) {
-                row++;
-                col = 0;
-            }
-        }
-
-        if (pos.length === 0) return -1;
-
-        const centerColCoord = targetCol + 0.5;
-        const targetKey = targetRow * cols + centerColCoord;
-
-        for (let k = 0; k < pos.length; k++) {
-            const p = pos[k];
-            if (p.row === targetRow && centerColCoord >= p.startCol && centerColCoord < (p.startCol + p.span)) {
-                return p.index;
-            }
-        }
-
-        let lo = 0, hi = pos.length - 1;
-        if (targetKey <= pos[0].centerKey) return pos[0].index;
-        if (targetKey >= pos[hi].centerKey) return pos[hi].index;
-
-        while (lo <= hi) {
-            const mid = (lo + hi) >> 1;
-            const mk = pos[mid].centerKey;
-            if (targetKey < mk) hi = mid - 1;
-            else if (targetKey > mk) lo = mid + 1;
-            else return pos[mid].index;
-        }
-        const movingUp = (draggedOrigKey != null) ? (targetKey < draggedOrigKey) : false;
-        return (movingUp ? pos[lo].index : pos[hi].index);
-    }
-
-    Rectangle {
-        width: 16
-        height: 16
-        radius: 8
-        color: Theme.error
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.margins: -4
-        visible: editMode
-        z: 10
-
-        DankIcon {
-            anchors.centerIn: parent
-            name: "close"
-            size: 12
-            color: Theme.primaryText
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            cursorShape: Qt.PointingHandCursor
-            onClicked: removeWidget(widgetIndex)
-        }
-    }
-
-    SizeControls {
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.margins: -6
-        visible: editMode
-        z: 10
-        currentSize: root.widgetData?.width || 50
-        isSlider: root.isSlider
-        widgetIndex: root.widgetIndex
-        onSizeChanged: (newSize) => {
-            var widgets = SettingsData.controlCenterWidgets.slice()
-            if (widgetIndex >= 0 && widgetIndex < widgets.length) {
-                widgets[widgetIndex].width = newSize
-                SettingsData.set("controlCenterWidgets", widgets)
-            }
-        }
-    }
-
-    Rectangle {
-        id: dragHandle
-        width: 16
-        height: 12
-        radius: 2
-        color: Theme.primary
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.margins: 4
-        visible: editMode
-        z: 15
-        opacity: dragArea.drag.active ? 1.0 : 0.7
-
-        DankIcon {
-            anchors.centerIn: parent
-            name: "drag_indicator"
-            size: 10
-            color: Theme.primaryText
-        }
-
-        Behavior on opacity {
-            NumberAnimation { duration: 150 }
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        color: editMode ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
-        radius: Theme.cornerRadius
-        border.color: "transparent"
-        border.width: 0
-        z: -1
-
-        Behavior on color {
-            ColorAnimation { duration: Theme.shortDuration }
-        }
-    }
-}
--- a/Modules/ControlCenter/Components/EditControls.qml
+++ b/Modules/ControlCenter/Components/EditControls.qml
@@ -7,7 +7,6 @@ Row {
    id: root

    property var availableWidgets: []
-    property Item popoutContent: null

    signal addWidget(string widgetId)
    signal resetToDefault()
@@ -20,9 +19,7 @@ Row {

    Popup {
        id: addWidgetPopup
-        parent: popoutContent
-        x: parent ? Math.round((parent.width - width) / 2) : 0
-        y: parent ? Math.round((parent.height - height) / 2) : 0
+        anchors.centerIn: parent
        width: 400
        height: 300
        modal: true
@@ -32,7 +29,7 @@ Row {
        background: Rectangle {
            color: Theme.surfaceContainer
            border.color: Theme.primarySelected
-            border.width: 0
+            border.width: 1
            radius: Theme.cornerRadius
        }

@@ -55,7 +52,7 @@ Row {
                }

                Typography {
-                    text: I18n.tr("Add Widget")
+                    text: "Add Widget"
                    style: Typography.Style.Subtitle
                    color: Theme.surfaceText
                    anchors.verticalCenter: parent.verticalCenter
@@ -69,16 +66,15 @@ Row {
                anchors.right: parent.right
                anchors.bottom: parent.bottom
                spacing: Theme.spacingS
-                clip: true
                model: root.availableWidgets

                delegate: Rectangle {
                    width: 400 - Theme.spacingL * 2
                    height: 50
                    radius: Theme.cornerRadius
-                    color: widgetMouseArea.containsMouse ? Theme.primaryHover : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                    color: widgetMouseArea.containsMouse ? Theme.primaryHover : Theme.surfaceContainerHigh
                    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                    border.width: 0
+                    border.width: 1

                    Row {
                        anchors.fill: parent
@@ -142,7 +138,7 @@ Row {
        radius: Theme.cornerRadius
        color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
        border.color: Theme.primary
-        border.width: 0
+        border.width: 1

        Row {
            anchors.centerIn: parent
@@ -156,7 +152,7 @@ Row {
            }

            Typography {
-                text: I18n.tr("Add Widget")
+                text: "Add Widget"
                style: Typography.Style.Button
                color: Theme.primary
                anchors.verticalCenter: parent.verticalCenter
@@ -176,7 +172,7 @@ Row {
        radius: Theme.cornerRadius
        color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
        border.color: Theme.warning
-        border.width: 0
+        border.width: 1

        Row {
            anchors.centerIn: parent
@@ -190,7 +186,7 @@ Row {
            }

            Typography {
-                text: I18n.tr("Defaults")
+                text: "Defaults"
                style: Typography.Style.Button
                color: Theme.warning
                anchors.verticalCenter: parent.verticalCenter
@@ -210,7 +206,7 @@ Row {
        radius: Theme.cornerRadius
        color: Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12)
        border.color: Theme.error
-        border.width: 0
+        border.width: 1

        Row {
            anchors.centerIn: parent
@@ -224,7 +220,7 @@ Row {
            }

            Typography {
-                text: I18n.tr("Reset")
+                text: "Reset"
                style: Typography.Style.Button
                color: Theme.error
                anchors.verticalCenter: parent.verticalCenter
--- a/Modules/ControlCenter/Components/EditModeOverlay.qml
+++ b/Modules/ControlCenter/Components/EditModeOverlay.qml
@@ -0,0 +1,241 @@
+import QtQuick
+import qs.Common
+import qs.Widgets
+
+Item {
+    id: root
+
+    property bool editMode: false
+    property var widgetData: null
+    property int widgetIndex: -1
+    property bool showSizeControls: true
+    property bool isSlider: false
+
+    signal removeWidget(int index)
+    signal toggleWidgetSize(int index)
+    signal moveWidget(int fromIndex, int toIndex)
+
+    // Delete button in top-right
+    Rectangle {
+        width: 16
+        height: 16
+        radius: 8
+        color: Theme.error
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.margins: -4
+        visible: editMode
+        z: 10
+
+        DankIcon {
+            anchors.centerIn: parent
+            name: "close"
+            size: 12
+            color: Theme.primaryText
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.removeWidget(widgetIndex)
+        }
+    }
+
+    // Size control buttons in bottom-right
+    Row {
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.margins: -8
+        spacing: 4
+        visible: editMode && showSizeControls
+        z: 10
+
+        Rectangle {
+            width: 24
+            height: 24
+            radius: 12
+            color: (widgetData?.width || 50) === 25 ? Theme.primary : Theme.primaryContainer
+            border.color: Theme.primary
+            border.width: 1
+            visible: !isSlider
+
+            StyledText {
+                anchors.centerIn: parent
+                text: "25"
+                font.pixelSize: 10
+                font.weight: Font.Medium
+                color: (widgetData?.width || 50) === 25 ? Theme.primaryText : Theme.primary
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    var widgets = SettingsData.controlCenterWidgets.slice()
+                    if (widgetIndex >= 0 && widgetIndex < widgets.length) {
+                        widgets[widgetIndex].width = 25
+                        SettingsData.setControlCenterWidgets(widgets)
+                    }
+                }
+            }
+        }
+
+        Rectangle {
+            width: 24
+            height: 24
+            radius: 12
+            color: (widgetData?.width || 50) === 50 ? Theme.primary : Theme.primaryContainer
+            border.color: Theme.primary
+            border.width: 1
+
+            StyledText {
+                anchors.centerIn: parent
+                text: "50"
+                font.pixelSize: 10
+                font.weight: Font.Medium
+                color: (widgetData?.width || 50) === 50 ? Theme.primaryText : Theme.primary
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    var widgets = SettingsData.controlCenterWidgets.slice()
+                    if (widgetIndex >= 0 && widgetIndex < widgets.length) {
+                        widgets[widgetIndex].width = 50
+                        SettingsData.setControlCenterWidgets(widgets)
+                    }
+                }
+            }
+        }
+
+        Rectangle {
+            width: 24
+            height: 24
+            radius: 12
+            color: (widgetData?.width || 50) === 75 ? Theme.primary : Theme.primaryContainer
+            border.color: Theme.primary
+            border.width: 1
+            visible: !isSlider
+
+            StyledText {
+                anchors.centerIn: parent
+                text: "75"
+                font.pixelSize: 10
+                font.weight: Font.Medium
+                color: (widgetData?.width || 50) === 75 ? Theme.primaryText : Theme.primary
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    var widgets = SettingsData.controlCenterWidgets.slice()
+                    if (widgetIndex >= 0 && widgetIndex < widgets.length) {
+                        widgets[widgetIndex].width = 75
+                        SettingsData.setControlCenterWidgets(widgets)
+                    }
+                }
+            }
+        }
+
+        Rectangle {
+            width: 24
+            height: 24
+            radius: 12
+            color: (widgetData?.width || 50) === 100 ? Theme.primary : Theme.primaryContainer
+            border.color: Theme.primary
+            border.width: 1
+
+            StyledText {
+                anchors.centerIn: parent
+                text: "100"
+                font.pixelSize: 9
+                font.weight: Font.Medium
+                color: (widgetData?.width || 50) === 100 ? Theme.primaryText : Theme.primary
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    var widgets = SettingsData.controlCenterWidgets.slice()
+                    if (widgetIndex >= 0 && widgetIndex < widgets.length) {
+                        widgets[widgetIndex].width = 100
+                        SettingsData.setControlCenterWidgets(widgets)
+                    }
+                }
+            }
+        }
+    }
+
+    // Arrow buttons for reordering in top-left
+    Row {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.margins: 4
+        spacing: 2
+        visible: editMode
+        z: 20
+
+        Rectangle {
+            width: 16
+            height: 16
+            radius: 8
+            color: Theme.surfaceContainer
+            border.color: Theme.outline
+            border.width: 1
+
+            DankIcon {
+                anchors.centerIn: parent
+                name: "keyboard_arrow_left"
+                size: 12
+                color: Theme.surfaceText
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                enabled: widgetIndex > 0
+                opacity: enabled ? 1.0 : 0.5
+                onClicked: root.moveWidget(widgetIndex, widgetIndex - 1)
+            }
+        }
+
+        Rectangle {
+            width: 16
+            height: 16
+            radius: 8
+            color: Theme.surfaceContainer
+            border.color: Theme.outline
+            border.width: 1
+
+            DankIcon {
+                anchors.centerIn: parent
+                name: "keyboard_arrow_right"
+                size: 12
+                color: Theme.surfaceText
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                enabled: widgetIndex < ((SettingsData.controlCenterWidgets?.length ?? 0) - 1)
+                opacity: enabled ? 1.0 : 0.5
+                onClicked: root.moveWidget(widgetIndex, widgetIndex + 1)
+            }
+        }
+    }
+
+    // Border highlight
+    Rectangle {
+        anchors.fill: parent
+        color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1)
+        radius: Theme.cornerRadius
+        border.color: Theme.primary
+        border.width: editMode ? 1 : 0
+        visible: editMode
+        z: -1
+
+        Behavior on border.width {
+            NumberAnimation { duration: Theme.shortDuration }
+        }
+    }
+}
--- a/Modules/ControlCenter/Components/HeaderPane.qml
+++ b/Modules/ControlCenter/Components/HeaderPane.qml
@@ -6,19 +6,19 @@ import qs.Widgets
 Rectangle {
    id: root

+    property bool powerOptionsExpanded: false
    property bool editMode: false

-    signal powerButtonClicked()
+    signal powerActionRequested(string action, string title, string message)
    signal lockRequested()
    signal editModeToggled()
-    signal settingsButtonClicked()

    implicitHeight: 70
    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
                          Theme.outline.b, 0.08)
-    border.width: 0
+    border.width: 1

    Row {
        anchors.left: parent.left
@@ -83,11 +83,13 @@ Rectangle {

        DankActionButton {
            buttonSize: 36
-            iconName: "power_settings_new"
+            iconName: root.powerOptionsExpanded ? "expand_less" : "power_settings_new"
            iconSize: Theme.iconSize - 4
-            iconColor: Theme.surfaceText
+            iconColor: root.powerOptionsExpanded ? Theme.primary : Theme.surfaceText
            backgroundColor: "transparent"
-            onClicked: root.powerButtonClicked()
+            onClicked: {
+                root.powerOptionsExpanded = !root.powerOptionsExpanded
+            }
        }

        DankActionButton {
@@ -97,7 +99,6 @@ Rectangle {
            iconColor: Theme.surfaceText
            backgroundColor: "transparent"
            onClicked: {
-                root.settingsButtonClicked()
                settingsModal.show()
            }
        }
--- a/Modules/ControlCenter/Components/PowerOptionsPane.qml
+++ b/Modules/ControlCenter/Components/PowerOptionsPane.qml
@@ -0,0 +1,70 @@
+import QtQuick
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: root
+
+    property bool expanded: false
+
+    signal powerActionRequested(string action, string title, string message)
+
+    implicitHeight: expanded ? 60 : 0
+    height: implicitHeight
+    clip: true
+
+    Rectangle {
+        width: parent.width
+        height: 60
+        radius: Theme.cornerRadius
+        color: Theme.surfaceContainerHigh
+        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
+                              Theme.outline.b, 0.08)
+        border.width: root.expanded ? 1 : 0
+        opacity: root.expanded ? 1 : 0
+        clip: true
+
+        Row {
+            anchors.centerIn: parent
+            spacing: SessionService.hibernateSupported ? Theme.spacingS : Theme.spacingL
+            visible: root.expanded
+
+            PowerButton {
+                width: SessionService.hibernateSupported ? 85 : 100
+                iconName: "logout"
+                text: "Logout"
+                onPressed: root.powerActionRequested("logout", "Logout", "Are you sure you want to logout?")
+            }
+
+            PowerButton {
+                width: SessionService.hibernateSupported ? 85 : 100
+                iconName: "restart_alt"
+                text: "Restart"
+                onPressed: root.powerActionRequested("reboot", "Restart", "Are you sure you want to restart?")
+            }
+
+            PowerButton {
+                width: SessionService.hibernateSupported ? 85 : 100
+                iconName: "bedtime"
+                text: "Suspend"
+                onPressed: root.powerActionRequested("suspend", "Suspend", "Are you sure you want to suspend?")
+            }
+
+            PowerButton {
+                width: SessionService.hibernateSupported ? 85 : 100
+                iconName: "ac_unit"
+                text: "Hibernate"
+                visible: SessionService.hibernateSupported
+                onPressed: root.powerActionRequested("hibernate", "Hibernate", "Are you sure you want to hibernate?")
+            }
+
+            PowerButton {
+                width: SessionService.hibernateSupported ? 85 : 100
+                iconName: "power_settings_new"
+                text: "Shutdown"
+                onPressed: root.powerActionRequested("poweroff", "Shutdown", "Are you sure you want to shutdown?")
+            }
+        }
+    }
+}
--- a/Modules/ControlCenter/Components/SizeControls.qml
+++ b/Modules/ControlCenter/Components/SizeControls.qml
@@ -1,52 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import qs.Common
-import qs.Widgets
-
-Row {
-    id: root
-
-    property int currentSize: 50
-    property bool isSlider: false
-    property int widgetIndex: -1
-
-    signal sizeChanged(int newSize)
-
-    readonly property var availableSizes: isSlider ? [50, 100] : [25, 50, 75, 100]
-
-    spacing: 2
-
-    Repeater {
-        model: root.availableSizes
-
-        Rectangle {
-            width: 16
-            height: 16
-            radius: 3
-            color: modelData === root.currentSize ? Theme.primary : Theme.surfaceContainer
-            border.color: modelData === root.currentSize ? Theme.primary : Theme.outline
-            border.width: 1
-
-            StyledText {
-                anchors.centerIn: parent
-                text: modelData.toString()
-                font.pixelSize: 8
-                font.weight: Font.Medium
-                color: modelData === root.currentSize ? Theme.primaryText : Theme.surfaceText
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    root.currentSize = modelData
-                    root.sizeChanged(modelData)
-                }
-            }
-
-            Behavior on color {
-                ColorAnimation { duration: Theme.shortDuration }
-            }
-        }
-    }
-}
--- a/Modules/ControlCenter/Components/WidgetGrid.qml
+++ b/Modules/ControlCenter/Components/WidgetGrid.qml
@@ -0,0 +1,734 @@
+import QtQuick
+import qs.Common
+import qs.Services
+import qs.Modules.ControlCenter.Widgets
+import qs.Modules.ControlCenter.Components
+import "../utils/layout.js" as LayoutUtils
+
+Column {
+    id: root
+
+    property bool editMode: false
+    property string expandedSection: ""
+    property int expandedWidgetIndex: -1
+    property var model: null
+    property var expandedWidgetData: null
+
+    signal expandClicked(var widgetData, int globalIndex)
+    signal removeWidget(int index)
+    signal moveWidget(int fromIndex, int toIndex)
+    signal toggleWidgetSize(int index)
+
+    spacing: editMode ? Theme.spacingL : Theme.spacingS
+
+    property var currentRowWidgets: []
+    property real currentRowWidth: 0
+    property int expandedRowIndex: -1
+
+    function calculateRowsAndWidgets() {
+        return LayoutUtils.calculateRowsAndWidgets(root, expandedSection, expandedWidgetIndex)
+    }
+
+    property var layoutResult: {
+        const dummy = [expandedSection, expandedWidgetIndex, model?.controlCenterWidgets]
+        return calculateRowsAndWidgets()
+    }
+
+    onLayoutResultChanged: {
+        expandedRowIndex = layoutResult.expandedRowIndex
+    }
+
+    Repeater {
+        model: root.layoutResult.rows
+
+        Column {
+            width: root.width
+            spacing: 0
+            property int rowIndex: index
+            property var rowWidgets: modelData
+            property bool isSliderOnlyRow: {
+                const widgets = rowWidgets || []
+                if (widgets.length === 0) return false
+                return widgets.every(w => w.id === "volumeSlider" || w.id === "brightnessSlider" || w.id === "inputVolumeSlider")
+            }
+            topPadding: isSliderOnlyRow ? (root.editMode ? 4 : -12) : 0
+            bottomPadding: isSliderOnlyRow ? (root.editMode ? 4 : -12) : 0
+
+            Flow {
+                width: parent.width
+                spacing: Theme.spacingS
+
+                Repeater {
+                    model: rowWidgets || []
+
+                    Item {
+                        property var widgetData: modelData
+                        property int globalWidgetIndex: {
+                            const widgets = SettingsData.controlCenterWidgets || []
+                            for (var i = 0; i < widgets.length; i++) {
+                                if (widgets[i].id === modelData.id) {
+                                    if (modelData.id === "diskUsage") {
+                                        if (widgets[i].instanceId === modelData.instanceId) {
+                                            return i
+                                        }
+                                    } else {
+                                        return i
+                                    }
+                                }
+                            }
+                            return -1
+                        }
+                        property int widgetWidth: modelData.width || 50
+                        width: {
+                            const baseWidth = root.width
+                            const spacing = Theme.spacingS
+                            if (widgetWidth <= 25) {
+                                return (baseWidth - spacing * 3) / 4
+                            } else if (widgetWidth <= 50) {
+                                return (baseWidth - spacing) / 2
+                            } else if (widgetWidth <= 75) {
+                                return (baseWidth - spacing * 2) * 0.75
+                            } else {
+                                return baseWidth
+                            }
+                        }
+                        height: 60
+
+                        Loader {
+                            id: widgetLoader
+                            anchors.fill: parent
+                            property var widgetData: parent.widgetData
+                            property int widgetIndex: parent.globalWidgetIndex
+                            property int globalWidgetIndex: parent.globalWidgetIndex
+                            property int widgetWidth: parent.widgetWidth
+
+                            sourceComponent: {
+                                const id = modelData.id || ""
+                                if (id === "wifi" || id === "bluetooth" || id === "audioOutput" || id === "audioInput") {
+                                    return compoundPillComponent
+                                } else if (id === "volumeSlider") {
+                                    return audioSliderComponent
+                                } else if (id === "brightnessSlider") {
+                                    return brightnessSliderComponent
+                                } else if (id === "inputVolumeSlider") {
+                                    return inputAudioSliderComponent
+                                } else if (id === "battery") {
+                                    return widgetWidth <= 25 ? smallBatteryComponent : batteryPillComponent
+                                } else if (id === "diskUsage") {
+                                    return diskUsagePillComponent
+                                } else {
+                                    return widgetWidth <= 25 ? smallToggleComponent : toggleButtonComponent
+                                }
+                            }
+
+                        }
+                    }
+                }
+            }
+
+            DetailHost {
+                width: parent.width
+                height: active ? (250 + Theme.spacingS) : 0
+                property bool active: {
+                    if (root.expandedSection === "") return false
+
+                    if (root.expandedSection.startsWith("diskUsage_") && root.expandedWidgetData) {
+                        const expandedInstanceId = root.expandedWidgetData.instanceId
+                        return rowWidgets.some(w => w.id === "diskUsage" && w.instanceId === expandedInstanceId)
+                    }
+
+                    return rowIndex === root.expandedRowIndex
+                }
+                visible: active
+                expandedSection: root.expandedSection
+                expandedWidgetData: root.expandedWidgetData
+            }
+        }
+    }
+
+    Component {
+        id: compoundPillComponent
+        CompoundPill {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            property var widgetDef: root.model?.getWidgetForId(widgetData.id || "")
+            width: parent.width
+            height: 60
+            iconName: {
+                switch (widgetData.id || "") {
+                case "wifi": {
+                    if (NetworkService.wifiToggling) {
+                        return "sync"
+                    }
+                    if (NetworkService.networkStatus === "ethernet") {
+                        return "settings_ethernet"
+                    }
+                    if (NetworkService.networkStatus === "wifi") {
+                        return NetworkService.wifiSignalIcon
+                    }
+                    if (NetworkService.wifiEnabled) {
+                        return "wifi_off"
+                    }
+                    return "wifi_off"
+                }
+                case "bluetooth": {
+                    if (!BluetoothService.available) {
+                        return "bluetooth_disabled"
+                    }
+                    if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
+                        return "bluetooth_disabled"
+                    }
+                    const 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
+                    })()
+                    if (primaryDevice) {
+                        return BluetoothService.getDeviceIcon(primaryDevice)
+                    }
+                    return "bluetooth"
+                }
+                case "audioOutput": {
+                    if (!AudioService.sink) return "volume_off"
+                    let volume = AudioService.sink.audio.volume
+                    let muted = AudioService.sink.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"
+                }
+                case "audioInput": {
+                    if (!AudioService.source) return "mic_off"
+                    let muted = AudioService.source.audio.muted
+                    return muted ? "mic_off" : "mic"
+                }
+                default: return widgetDef?.icon || "help"
+                }
+            }
+            primaryText: {
+                switch (widgetData.id || "") {
+                case "wifi": {
+                    if (NetworkService.wifiToggling) {
+                        return NetworkService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
+                    }
+                    if (NetworkService.networkStatus === "ethernet") {
+                        return "Ethernet"
+                    }
+                    if (NetworkService.networkStatus === "wifi" && NetworkService.currentWifiSSID) {
+                        return NetworkService.currentWifiSSID
+                    }
+                    if (NetworkService.wifiEnabled) {
+                        return "Not connected"
+                    }
+                    return "WiFi off"
+                }
+                case "bluetooth": {
+                    if (!BluetoothService.available) {
+                        return "Bluetooth"
+                    }
+                    if (!BluetoothService.adapter) {
+                        return "No adapter"
+                    }
+                    if (!BluetoothService.adapter.enabled) {
+                        return "Disabled"
+                    }
+                    return "Enabled"
+                }
+                case "audioOutput": return AudioService.sink?.description || "No output device"
+                case "audioInput": return AudioService.source?.description || "No input device"
+                default: return widgetDef?.text || "Unknown"
+                }
+            }
+            secondaryText: {
+                switch (widgetData.id || "") {
+                case "wifi": {
+                    if (NetworkService.wifiToggling) {
+                        return "Please wait..."
+                    }
+                    if (NetworkService.networkStatus === "ethernet") {
+                        return "Connected"
+                    }
+                    if (NetworkService.networkStatus === "wifi") {
+                        return NetworkService.wifiSignalStrength > 0 ? NetworkService.wifiSignalStrength + "%" : "Connected"
+                    }
+                    if (NetworkService.wifiEnabled) {
+                        return "Select network"
+                    }
+                    return ""
+                }
+                case "bluetooth": {
+                    if (!BluetoothService.available) {
+                        return "No adapters"
+                    }
+                    if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
+                        return "Off"
+                    }
+                    const 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
+                    })()
+                    if (primaryDevice) {
+                        return primaryDevice.name || primaryDevice.alias || primaryDevice.deviceName || "Connected Device"
+                    }
+                    return "No devices"
+                }
+                case "audioOutput": {
+                    if (!AudioService.sink) {
+                        return "Select device"
+                    }
+                    if (AudioService.sink.audio.muted) {
+                        return "Muted"
+                    }
+                    return Math.round(AudioService.sink.audio.volume * 100) + "%"
+                }
+                case "audioInput": {
+                    if (!AudioService.source) {
+                        return "Select device"
+                    }
+                    if (AudioService.source.audio.muted) {
+                        return "Muted"
+                    }
+                    return Math.round(AudioService.source.audio.volume * 100) + "%"
+                }
+                default: return widgetDef?.description || ""
+                }
+            }
+            isActive: {
+                switch (widgetData.id || "") {
+                case "wifi": {
+                    if (NetworkService.wifiToggling) {
+                        return false
+                    }
+                    if (NetworkService.networkStatus === "ethernet") {
+                        return true
+                    }
+                    if (NetworkService.networkStatus === "wifi") {
+                        return true
+                    }
+                    return NetworkService.wifiEnabled
+                }
+                case "bluetooth": return !!(BluetoothService.available && BluetoothService.adapter && BluetoothService.adapter.enabled)
+                case "audioOutput": return !!(AudioService.sink && !AudioService.sink.audio.muted)
+                case "audioInput": return !!(AudioService.source && !AudioService.source.audio.muted)
+                default: return false
+                }
+            }
+            enabled: (widgetDef?.enabled ?? true)
+            onToggled: {
+                if (root.editMode) return
+                switch (widgetData.id || "") {
+                case "wifi": {
+                    if (NetworkService.networkStatus !== "ethernet" && !NetworkService.wifiToggling) {
+                        NetworkService.toggleWifiRadio()
+                    }
+                    break
+                }
+                case "bluetooth": {
+                    if (BluetoothService.available && BluetoothService.adapter) {
+                        BluetoothService.adapter.enabled = !BluetoothService.adapter.enabled
+                    }
+                    break
+                }
+                case "audioOutput": {
+                    if (AudioService.sink && AudioService.sink.audio) {
+                        AudioService.sink.audio.muted = !AudioService.sink.audio.muted
+                    }
+                    break
+                }
+                case "audioInput": {
+                    if (AudioService.source && AudioService.source.audio) {
+                        AudioService.source.audio.muted = !AudioService.source.audio.muted
+                    }
+                    break
+                }
+                }
+            }
+            onExpandClicked: {
+                if (root.editMode) return
+                root.expandClicked(widgetData, widgetIndex)
+            }
+            onWheelEvent: function (wheelEvent) {
+                const id = widgetData.id || ""
+                if (id === "audioOutput") {
+                    if (!AudioService.sink || !AudioService.sink.audio) return
+                    let delta = wheelEvent.angleDelta.y
+                    let currentVolume = AudioService.sink.audio.volume * 100
+                    let newVolume
+                    if (delta > 0)
+                        newVolume = Math.min(100, currentVolume + 5)
+                    else
+                        newVolume = Math.max(0, currentVolume - 5)
+                    AudioService.sink.audio.muted = false
+                    AudioService.sink.audio.volume = newVolume / 100
+                    wheelEvent.accepted = true
+                } else if (id === "audioInput") {
+                    if (!AudioService.source || !AudioService.source.audio) return
+                    let delta = wheelEvent.angleDelta.y
+                    let currentVolume = AudioService.source.audio.volume * 100
+                    let newVolume
+                    if (delta > 0)
+                        newVolume = Math.min(100, currentVolume + 5)
+                    else
+                        newVolume = Math.max(0, currentVolume - 5)
+                    AudioService.source.audio.muted = false
+                    AudioService.source.audio.volume = newVolume / 100
+                    wheelEvent.accepted = true
+                }
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: false
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: audioSliderComponent
+        Item {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            property var widgetDef: root.model?.getWidgetForId(widgetData.id || "")
+            width: parent.width
+            height: 16
+
+            AudioSliderRow {
+                anchors.centerIn: parent
+                width: parent.width
+                height: 14
+                property color sliderTrackColor: Theme.surfaceContainerHigh
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: true
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: brightnessSliderComponent
+        Item {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            width: parent.width
+            height: 16
+
+            BrightnessSliderRow {
+                anchors.centerIn: parent
+                width: parent.width
+                height: 14
+                property color sliderTrackColor: Theme.surfaceContainerHigh
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: true
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: inputAudioSliderComponent
+        Item {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            width: parent.width
+            height: 16
+
+            InputAudioSliderRow {
+                anchors.centerIn: parent
+                width: parent.width
+                height: 14
+                property color sliderTrackColor: Theme.surfaceContainerHigh
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: true
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: batteryPillComponent
+        BatteryPill {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            width: parent.width
+            height: 60
+
+            onExpandClicked: {
+                if (!root.editMode) {
+                    root.expandClicked(widgetData, widgetIndex)
+                }
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: false
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: smallBatteryComponent
+        SmallBatteryButton {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            width: parent.width
+            height: 48
+
+            onClicked: {
+                if (!root.editMode) {
+                    root.expandClicked(widgetData, widgetIndex)
+                }
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: false
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: toggleButtonComponent
+        ToggleButton {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            property var widgetDef: root.model?.getWidgetForId(widgetData.id || "")
+            width: parent.width
+            height: 60
+
+            iconName: {
+                switch (widgetData.id || "") {
+                case "nightMode": return DisplayService.nightModeEnabled ? "nightlight" : "dark_mode"
+                case "darkMode": return "contrast"
+                case "doNotDisturb": return SessionData.doNotDisturb ? "do_not_disturb_on" : "do_not_disturb_off"
+                case "idleInhibitor": return SessionService.idleInhibited ? "motion_sensor_active" : "motion_sensor_idle"
+                default: return widgetDef?.icon || "help"
+                }
+            }
+
+            text: {
+                switch (widgetData.id || "") {
+                case "nightMode": return "Night Mode"
+                case "darkMode": return SessionData.isLightMode ? "Light Mode" : "Dark Mode"
+                case "doNotDisturb": return "Do Not Disturb"
+                case "idleInhibitor": return SessionService.idleInhibited ? "Keeping Awake" : "Keep Awake"
+                default: return widgetDef?.text || "Unknown"
+                }
+            }
+
+            secondaryText: ""
+
+            iconRotation: widgetData.id === "darkMode" && SessionData.isLightMode ? 180 : 0
+
+            isActive: {
+                switch (widgetData.id || "") {
+                case "nightMode": return DisplayService.nightModeEnabled || false
+                case "darkMode": return !SessionData.isLightMode
+                case "doNotDisturb": return SessionData.doNotDisturb || false
+                case "idleInhibitor": return SessionService.idleInhibited || false
+                default: return false
+                }
+            }
+
+            enabled: (widgetDef?.enabled ?? true) && !root.editMode
+
+            onClicked: {
+                switch (widgetData.id || "") {
+                case "nightMode": {
+                    if (DisplayService.automationAvailable) {
+                        DisplayService.toggleNightMode()
+                    }
+                    break
+                }
+                case "darkMode": {
+                    Theme.toggleLightMode()
+                    break
+                }
+                case "doNotDisturb": {
+                    SessionData.setDoNotDisturb(!SessionData.doNotDisturb)
+                    break
+                }
+                case "idleInhibitor": {
+                    SessionService.toggleIdleInhibit()
+                    break
+                }
+                }
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: false
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: smallToggleComponent
+        SmallToggleButton {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            property var widgetDef: root.model?.getWidgetForId(widgetData.id || "")
+            width: parent.width
+            height: 48
+
+            iconName: {
+                switch (widgetData.id || "") {
+                case "nightMode": return DisplayService.nightModeEnabled ? "nightlight" : "dark_mode"
+                case "darkMode": return "contrast"
+                case "doNotDisturb": return SessionData.doNotDisturb ? "do_not_disturb_on" : "do_not_disturb_off"
+                case "idleInhibitor": return SessionService.idleInhibited ? "motion_sensor_active" : "motion_sensor_idle"
+                default: return widgetDef?.icon || "help"
+                }
+            }
+
+            iconRotation: widgetData.id === "darkMode" && SessionData.isLightMode ? 180 : 0
+
+            isActive: {
+                switch (widgetData.id || "") {
+                case "nightMode": return DisplayService.nightModeEnabled || false
+                case "darkMode": return !SessionData.isLightMode
+                case "doNotDisturb": return SessionData.doNotDisturb || false
+                case "idleInhibitor": return SessionService.idleInhibited || false
+                default: return false
+                }
+            }
+
+            enabled: (widgetDef?.enabled ?? true) && !root.editMode
+
+            onClicked: {
+                switch (widgetData.id || "") {
+                case "nightMode": {
+                    if (DisplayService.automationAvailable) {
+                        DisplayService.toggleNightMode()
+                    }
+                    break
+                }
+                case "darkMode": {
+                    Theme.toggleLightMode()
+                    break
+                }
+                case "doNotDisturb": {
+                    SessionData.setDoNotDisturb(!SessionData.doNotDisturb)
+                    break
+                }
+                case "idleInhibitor": {
+                    SessionService.toggleIdleInhibit()
+                    break
+                }
+                }
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: false
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+
+    Component {
+        id: diskUsagePillComponent
+        DiskUsagePill {
+            property var widgetData: parent.widgetData || {}
+            property int widgetIndex: parent.widgetIndex || 0
+            width: parent.width
+            height: 60
+
+            mountPath: widgetData.mountPath || "/"
+            instanceId: widgetData.instanceId || ""
+
+            onExpandClicked: {
+                if (!root.editMode) {
+                    root.expandClicked(widgetData, widgetIndex)
+                }
+            }
+
+            EditModeOverlay {
+                anchors.fill: parent
+                editMode: root.editMode
+                widgetData: parent.widgetData
+                widgetIndex: parent.widgetIndex
+                showSizeControls: true
+                isSlider: false
+                onRemoveWidget: (index) => root.removeWidget(index)
+                onToggleWidgetSize: (index) => root.toggleWidgetSize(index)
+                onMoveWidget: (fromIndex, toIndex) => root.moveWidget(fromIndex, toIndex)
+            }
+        }
+    }
+}
--- a/Modules/ControlCenter/ControlCenterPopout.qml
+++ b/Modules/ControlCenter/ControlCenterPopout.qml
@@ -10,7 +10,7 @@ import qs.Common
 import qs.Modules.ControlCenter
 import qs.Modules.ControlCenter.Widgets
 import qs.Modules.ControlCenter.Details
-import qs.Modules.DankBar
+import qs.Modules.TopBar
 import qs.Services
 import qs.Widgets
 import qs.Modules.ControlCenter.Components
@@ -20,15 +20,15 @@ import "./utils/state.js" as StateUtils
 DankPopout {
    id: root

-    layerNamespace: "dms:control-center"
-
    property string expandedSection: ""
+    property bool powerOptionsExpanded: false
+    property string triggerSection: "right"
    property var triggerScreen: null
    property bool editMode: false
    property int expandedWidgetIndex: -1
    property var expandedWidgetData: null
-    property bool powerMenuOpen: powerMenuModalLoader?.item?.shouldBeVisible ?? false

+    signal powerActionRequested(string action, string title, string message)
    signal lockRequested

    function collapseAll() {
@@ -49,7 +49,7 @@ DankPopout {
        }
    }

-    readonly property color _containerBg: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    readonly property color _containerBg: Theme.surfaceContainerHigh

    function setTriggerPosition(x, y, width, section, screen) {
        StateUtils.setTriggerPosition(root, x, y, width, section, screen)
@@ -66,9 +66,9 @@ DankPopout {
    popupWidth: 550
    popupHeight: Math.min((triggerScreen?.height ?? 1080) - 100, contentLoader.item && contentLoader.item.implicitHeight > 0 ? contentLoader.item.implicitHeight + 20 : 400)
    triggerX: (triggerScreen?.width ?? 1920) - 600 - Theme.spacingL
-    triggerY: Theme.barHeight - 4 + SettingsData.dankBarSpacing
+    triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
    triggerWidth: 80
-    positioning: ""
+    positioning: "center"
    screen: triggerScreen
    shouldBeVisible: false
    visible: shouldBeVisible
@@ -76,21 +76,17 @@ DankPopout {
    onShouldBeVisibleChanged: {
        if (shouldBeVisible) {
            Qt.callLater(() => {
-                             if (NetworkService.activeService) {
-                                 NetworkService.activeService.autoRefreshEnabled = NetworkService.wifiEnabled
-                             }
-                             if (UserInfoService)
-                             UserInfoService.getUptime()
-                         })
+                NetworkService.autoRefreshEnabled = NetworkService.wifiEnabled
+                if (UserInfoService)
+                    UserInfoService.getUptime()
+            })
        } else {
            Qt.callLater(() => {
-                             if (NetworkService.activeService) {
-                                 NetworkService.activeService.autoRefreshEnabled = false
-                             }
-                             if (BluetoothService.adapter && BluetoothService.adapter.discovering)
-                             BluetoothService.adapter.discovering = false
-                             editMode = false
-                         })
+                NetworkService.autoRefreshEnabled = false
+                if (BluetoothService.adapter && BluetoothService.adapter.discovering)
+                    BluetoothService.adapter.discovering = false
+                editMode = false
+            })
        }
    }

@@ -106,31 +102,17 @@ DankPopout {
            property alias bluetoothCodecSelector: bluetoothCodecSelector

            color: {
-                const transparency = Theme.popupTransparency
+                const transparency = Theme.popupTransparency || 0.92
                const surface = Theme.surfaceContainer || Qt.rgba(0.1, 0.1, 0.1, 1)
                return Qt.rgba(surface.r, surface.g, surface.b, transparency)
            }
            radius: Theme.cornerRadius
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-            border.width: 0
+            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
+                                  Theme.outline.b, 0.08)
+            border.width: 1
            antialiasing: true
            smooth: true

-            Rectangle {
-                anchors.fill: parent
-                color: Qt.rgba(0, 0, 0, 0.6)
-                radius: parent.radius
-                visible: root.powerMenuOpen
-                z: 5000
-
-                Behavior on opacity {
-                    NumberAnimation {
-                        duration: 200
-                        easing.type: Easing.OutCubic
-                    }
-                }
-            }
-
            Column {
                id: mainColumn
                width: parent.width - Theme.spacingL * 2
@@ -141,28 +123,29 @@ DankPopout {
                HeaderPane {
                    id: headerPane
                    width: parent.width
+                    powerOptionsExpanded: root.powerOptionsExpanded
                    editMode: root.editMode
+                    onPowerOptionsExpandedChanged: root.powerOptionsExpanded = powerOptionsExpanded
                    onEditModeToggled: root.editMode = !root.editMode
-                    onPowerButtonClicked: {
-                        if (powerMenuModalLoader) {
-                            powerMenuModalLoader.active = true
-                            if (powerMenuModalLoader.item) {
-                                const popoutPos = controlContent.mapToItem(null, 0, 0)
-                                const bounds = Qt.rect(popoutPos.x, popoutPos.y, controlContent.width, controlContent.height)
-                                powerMenuModalLoader.item.openFromControlCenter(bounds, root.triggerScreen)
-                            }
-                        }
-                    }
+                    onPowerActionRequested: (action, title, message) => root.powerActionRequested(action, title, message)
                    onLockRequested: {
                        root.close()
                        root.lockRequested()
                    }
-                    onSettingsButtonClicked: {
+                }
+
+                PowerOptionsPane {
+                    id: powerOptionsPane
+                    width: parent.width
+                    expanded: root.powerOptionsExpanded
+                    onPowerActionRequested: (action, title, message) => {
+                        root.powerOptionsExpanded = false
                        root.close()
+                        root.powerActionRequested(action, title, message)
                    }
                }

-                DragDropGrid {
+                WidgetGrid {
                    id: widgetGrid
                    width: parent.width
                    editMode: root.editMode
@@ -170,39 +153,28 @@ DankPopout {
                    expandedWidgetIndex: root.expandedWidgetIndex
                    expandedWidgetData: root.expandedWidgetData
                    model: widgetModel
-                    bluetoothCodecSelector: bluetoothCodecSelector
-                    colorPickerModal: root.colorPickerModal
-                    screenName: root.triggerScreen?.name || ""
-                    parentScreen: root.triggerScreen
                    onExpandClicked: (widgetData, globalIndex) => {
-                                         root.expandedWidgetIndex = globalIndex
-                                         root.expandedWidgetData = widgetData
-                                         if (widgetData.id === "diskUsage") {
-                                             root.toggleSection("diskUsage_" + (widgetData.instanceId || "default"))
-                                         } else if (widgetData.id === "brightnessSlider") {
-                                             root.toggleSection("brightnessSlider_" + (widgetData.instanceId || "default"))
-                                         } else {
-                                             root.toggleSection(widgetData.id)
-                                         }
-                                     }
-                    onRemoveWidget: index => widgetModel.removeWidget(index)
+                        root.expandedWidgetIndex = globalIndex
+                        root.expandedWidgetData = widgetData
+                        if (widgetData.id === "diskUsage") {
+                            root.toggleSection("diskUsage_" + (widgetData.instanceId || "default"))
+                        } else {
+                            root.toggleSection(widgetData.id)
+                        }
+                    }
+                    onRemoveWidget: (index) => widgetModel.removeWidget(index)
                    onMoveWidget: (fromIndex, toIndex) => widgetModel.moveWidget(fromIndex, toIndex)
-                    onToggleWidgetSize: index => widgetModel.toggleWidgetSize(index)
-                    onCollapseRequested: root.collapseAll()
+                    onToggleWidgetSize: (index) => widgetModel.toggleWidgetSize(index)
                }

                EditControls {
                    width: parent.width
                    visible: editMode
-                    popoutContent: controlContent
                    availableWidgets: {
-                        if (!editMode)
-                            return []
                        const existingIds = (SettingsData.controlCenterWidgets || []).map(w => w.id)
-                        const allWidgets = widgetModel.baseWidgetDefinitions.concat(widgetModel.getPluginWidgets())
-                        return allWidgets.filter(w => w.allowMultiple || !existingIds.includes(w.id))
+                        return widgetModel.baseWidgetDefinitions.filter(w => w.allowMultiple || !existingIds.includes(w.id))
                    }
-                    onAddWidget: widgetId => widgetModel.addWidget(widgetId)
+                    onAddWidget: (widgetId) => widgetModel.addWidget(widgetId)
                    onResetToDefault: () => widgetModel.resetToDefault()
                    onClearAll: () => widgetModel.clearAll()
                }
@@ -225,10 +197,10 @@ DankPopout {
        id: bluetoothDetailComponent
        BluetoothDetail {
            id: bluetoothDetail
-            onShowCodecSelector: function (device) {
+            onShowCodecSelector: function(device) {
                if (contentLoader.item && contentLoader.item.bluetoothCodecSelector) {
                    contentLoader.item.bluetoothCodecSelector.show(device)
-                    contentLoader.item.bluetoothCodecSelector.codecSelected.connect(function (deviceAddress, codecName) {
+                    contentLoader.item.bluetoothCodecSelector.codecSelected.connect(function(deviceAddress, codecName) {
                        bluetoothDetail.updateDeviceCodecDisplay(deviceAddress, codecName)
                    })
                }
@@ -250,7 +222,4 @@ DankPopout {
        id: batteryDetailComponent
        BatteryDetail {}
    }
-
-    property var colorPickerModal: null
-    property var powerMenuModalLoader: null
-}
+}
--- a/Modules/ControlCenter/Details/AudioInputDetail.qml
+++ b/Modules/ControlCenter/Details/AudioInputDetail.qml
@@ -14,10 +14,10 @@ Rectangle {

    implicitHeight: headerRow.height + (hasInputVolumeSliderInCC ? 0 : volumeSlider.height) + audioContent.height + Theme.spacingM
    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
-
+    border.width: 1
+    
    Row {
        id: headerRow
        anchors.left: parent.left
@@ -27,17 +27,17 @@ Rectangle {
        anchors.rightMargin: Theme.spacingM
        anchors.topMargin: Theme.spacingS
        height: 40
-
+        
        StyledText {
            id: headerText
-            text: I18n.tr("Input Devices")
+            text: "Input Devices"
            font.pixelSize: Theme.fontSizeLarge
            color: Theme.surfaceText
            font.weight: Font.Medium
            anchors.verticalCenter: parent.verticalCenter
        }
    }
-
+    
    Row {
        id: volumeSlider
        anchors.left: parent.left
@@ -57,6 +57,10 @@ Rectangle {
            radius: (Theme.iconSize + Theme.spacingS * 2) / 2
            color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"

+            Behavior on color {
+                ColorAnimation { duration: Theme.shortDuration }
+            }
+
            MouseArea {
                id: iconArea
                anchors.fill: parent
@@ -105,7 +109,7 @@ Rectangle {
            }
        }
    }
-
+    
    DankFlickable {
        id: audioContent
        anchors.top: hasInputVolumeSliderInCC ? headerRow.bottom : volumeSlider.bottom
@@ -116,36 +120,34 @@ Rectangle {
        anchors.topMargin: hasInputVolumeSliderInCC ? Theme.spacingM : Theme.spacingS
        contentHeight: audioColumn.height
        clip: true
-
+        
        Column {
            id: audioColumn
            width: parent.width
            spacing: Theme.spacingS
-
+            
            Repeater {
-                model: ScriptModel {
-                    values: Pipewire.nodes.values.filter(node => {
-                        return node.audio && !node.isSink && !node.isStream
-                    })
-                }
-
+                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.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
                    border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: 0
-
+                    border.width: modelData === AudioService.source ? 2 : 1
+                    
                    Row {
                        anchors.left: parent.left
                        anchors.verticalCenter: parent.verticalCenter
                        anchors.leftMargin: Theme.spacingM
                        spacing: Theme.spacingS
-
+                        
                        DankIcon {
                            name: {
                                if (modelData.name.includes("bluez"))
@@ -159,11 +161,11 @@ Rectangle {
                            color: modelData === AudioService.source ? 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
@@ -173,7 +175,7 @@ Rectangle {
                                width: parent.width
                                wrapMode: Text.NoWrap
                            }
-
+                            
                            StyledText {
                                text: modelData === AudioService.source ? "Active" : "Available"
                                font.pixelSize: Theme.fontSizeSmall
@@ -184,7 +186,7 @@ Rectangle {
                            }
                        }
                    }
-
+                    
                    MouseArea {
                        id: deviceMouseArea
                        anchors.fill: parent
@@ -196,6 +198,14 @@ Rectangle {
                            }
                        }
                    }
+                    
+                    Behavior on color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
+                    
+                    Behavior on border.color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
                }
            }
        }
--- a/Modules/ControlCenter/Details/AudioOutputDetail.qml
+++ b/Modules/ControlCenter/Details/AudioOutputDetail.qml
@@ -14,10 +14,10 @@ Rectangle {

    implicitHeight: headerRow.height + (!hasVolumeSliderInCC ? volumeSlider.height : 0) + audioContent.height + Theme.spacingM
    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
-
+    border.width: 1
+    
    Row {
        id: headerRow
        anchors.left: parent.left
@@ -27,10 +27,10 @@ Rectangle {
        anchors.rightMargin: Theme.spacingM
        anchors.topMargin: Theme.spacingS
        height: 40
-
+        
        StyledText {
            id: headerText
-            text: I18n.tr("Audio Devices")
+            text: "Audio Devices"
            font.pixelSize: Theme.fontSizeLarge
            color: Theme.surfaceText
            font.weight: Font.Medium
@@ -57,6 +57,10 @@ Rectangle {
            radius: (Theme.iconSize + Theme.spacingS * 2) / 2
            color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"

+            Behavior on color {
+                ColorAnimation { duration: Theme.shortDuration }
+            }
+
            MouseArea {
                id: iconArea
                anchors.fill: parent
@@ -121,36 +125,34 @@ Rectangle {
        anchors.topMargin: volumeSlider.visible ? Theme.spacingS : Theme.spacingM
        contentHeight: audioColumn.height
        clip: true
-
+        
        Column {
            id: audioColumn
            width: parent.width
            spacing: Theme.spacingS
-
+            
            Repeater {
-                model: ScriptModel {
-                    values: Pipewire.nodes.values.filter(node => {
-                        return node.audio && node.isSink && !node.isStream
-                    })
-                }
-
+                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.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
                    border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: 0
-
+                    border.width: modelData === AudioService.sink ? 2 : 1
+                    
                    Row {
                        anchors.left: parent.left
                        anchors.verticalCenter: parent.verticalCenter
                        anchors.leftMargin: Theme.spacingM
                        spacing: Theme.spacingS
-
+                        
                        DankIcon {
                            name: {
                                if (modelData.name.includes("bluez"))
@@ -166,11 +168,11 @@ Rectangle {
                            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
@@ -180,7 +182,7 @@ Rectangle {
                                width: parent.width
                                wrapMode: Text.NoWrap
                            }
-
+                            
                            StyledText {
                                text: modelData === AudioService.sink ? "Active" : "Available"
                                font.pixelSize: Theme.fontSizeSmall
@@ -191,7 +193,7 @@ Rectangle {
                            }
                        }
                    }
-
+                    
                    MouseArea {
                        id: deviceMouseArea
                        anchors.fill: parent
@@ -203,6 +205,14 @@ Rectangle {
                            }
                        }
                    }
+                    
+                    Behavior on color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
+                    
+                    Behavior on border.color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
                }
            }
        }
--- a/Modules/ControlCenter/Details/BatteryDetail.qml
+++ b/Modules/ControlCenter/Details/BatteryDetail.qml
@@ -9,9 +9,9 @@ import qs.Widgets
 Rectangle {
    implicitHeight: contentColumn.implicitHeight + Theme.spacingL * 2
    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
+    border.width: 1

    function isActiveProfile(profile) {
        if (typeof PowerProfiles === "undefined") {
@@ -125,7 +125,7 @@ Rectangle {
                width: (parent.width - Theme.spacingM) / 2
                height: 64
                radius: Theme.cornerRadius
-                color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                color: Theme.surfaceContainerHighest
                border.width: 0

                Column {
@@ -133,7 +133,7 @@ Rectangle {
                    spacing: Theme.spacingXS

                    StyledText {
-                        text: I18n.tr("Health")
+                        text: "Health"
                        font.pixelSize: Theme.fontSizeSmall
                        color: Theme.primary
                        font.weight: Font.Medium
@@ -160,7 +160,7 @@ Rectangle {
                width: (parent.width - Theme.spacingM) / 2
                height: 64
                radius: Theme.cornerRadius
-                color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                color: Theme.surfaceContainerHighest
                border.width: 0

                Column {
@@ -168,7 +168,7 @@ Rectangle {
                    spacing: Theme.spacingXS

                    StyledText {
-                        text: I18n.tr("Capacity")
+                        text: "Capacity"
                        font.pixelSize: Theme.fontSizeSmall
                        color: Theme.primary
                        font.weight: Font.Medium
@@ -209,7 +209,7 @@ Rectangle {
            radius: Theme.cornerRadius
            color: Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12)
            border.color: Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.3)
-            border.width: 0
+            border.width: 1
            visible: (typeof PowerProfiles !== "undefined") && PowerProfiles.degradationReason !== PerformanceDegradationReason.None

            Column {
@@ -237,7 +237,7 @@ Rectangle {
                        width: parent.width - Theme.iconSize - Theme.spacingM

                        StyledText {
-                            text: I18n.tr("Power Profile Degradation")
+                            text: "Power Profile Degradation"
                            font.pixelSize: Theme.fontSizeLarge
                            color: Theme.error
                            font.weight: Font.Medium
--- a/Modules/ControlCenter/Details/BluetoothCodecSelector.qml
+++ b/Modules/ControlCenter/Details/BluetoothCodecSelector.qml
@@ -83,12 +83,12 @@ Item {
        hoverEnabled: true
        preventStealing: true
        propagateComposedEvents: false
-
+        
        onClicked: root.hide()
        onWheel: (wheel) => { wheel.accepted = true }
        onPositionChanged: (mouse) => { mouse.accepted = true }
    }
-
+    
    Rectangle {
        id: modalBackground
        anchors.fill: parent
@@ -124,7 +124,7 @@ Item {
        radius: Theme.cornerRadius
        color: Theme.surfaceContainer
        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-        border.width: 0
+        border.width: 1
        opacity: modalVisible ? 1 : 0
        scale: modalVisible ? 1 : 0.9

@@ -170,7 +170,7 @@ Item {
                    }

                    StyledText {
-                        text: I18n.tr("Audio Codec Selection")
+                        text: "Audio Codec Selection"
                        font.pixelSize: Theme.fontSizeSmall
                        color: Theme.surfaceTextMedium
                    }
@@ -206,14 +206,14 @@ Item {
                        radius: Theme.cornerRadius
                        color: {
                            if (modelData.name === currentCodec)
-                                return Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency);
+                                return Theme.surfaceContainerHigh;
                            else if (codecMouseArea.containsMouse)
                                return Theme.surfaceHover;
                            else
                                return "transparent";
                        }
                        border.color: "transparent"
-                        border.width: 0
+                        border.width: 1

                        Row {
                            anchors.left: parent.left
@@ -272,6 +272,12 @@ Item {
                            }
                        }

+                        Behavior on color {
+                            ColorAnimation {
+                                duration: Theme.shortDuration
+                            }
+
+                        }

                    }

--- a/Modules/ControlCenter/Details/BluetoothDetail.qml
+++ b/Modules/ControlCenter/Details/BluetoothDetail.qml
@@ -5,45 +5,18 @@ import Quickshell.Bluetooth
 import qs.Common
 import qs.Services
 import qs.Widgets
-import qs.Modals

 Rectangle {
-    id: root
-
    implicitHeight: BluetoothService.adapter && BluetoothService.adapter.enabled ? headerRow.height + bluetoothContent.height + Theme.spacingM : headerRow.height
    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
-
+    border.width: 1
+    
    property var bluetoothCodecModalRef: null
-    property var devicesBeingPaired: new Set()
-
+    
    signal showCodecSelector(var device)
-
-    function isDeviceBeingPaired(deviceAddress) {
-        return devicesBeingPaired.has(deviceAddress)
-    }
-
-    function handlePairDevice(device) {
-        if (!device) return
-
-        const deviceAddr = device.address
-        devicesBeingPaired.add(deviceAddr)
-        devicesBeingPairedChanged()
-
-        BluetoothService.pairDevice(device, function(response) {
-            devicesBeingPaired.delete(deviceAddr)
-            devicesBeingPairedChanged()
-
-            if (response.error) {
-                ToastService.showError(I18n.tr("Pairing failed"), response.error)
-            } else if (!BluetoothService.enhancedPairingAvailable) {
-                ToastService.showSuccess(I18n.tr("Device paired"))
-            }
-        })
-    }
-
+    
    function updateDeviceCodecDisplay(deviceAddress, codecName) {
        for (let i = 0; i < pairedRepeater.count; i++) {
            let item = pairedRepeater.itemAt(i)
@@ -53,7 +26,7 @@ Rectangle {
            }
        }
    }
-
+    
    Row {
        id: headerRow
        anchors.left: parent.left
@@ -63,21 +36,21 @@ Rectangle {
        anchors.rightMargin: Theme.spacingM
        anchors.topMargin: Theme.spacingS
        height: 40
-
+        
        StyledText {
            id: headerText
-            text: I18n.tr("Bluetooth Settings")
+            text: "Bluetooth Settings"
            font.pixelSize: Theme.fontSizeLarge
            color: Theme.surfaceText
            font.weight: Font.Medium
            anchors.verticalCenter: parent.verticalCenter
        }
-
+        
        Item {
            width: Math.max(0, parent.width - headerText.implicitWidth - scanButton.width - Theme.spacingM)
            height: parent.height
        }
-
+        
        Rectangle {
            id: scanButton
            width: 100
@@ -85,24 +58,24 @@ Rectangle {
            radius: 18
            color: {
                if (!BluetoothService.adapter || !BluetoothService.adapter.enabled)
-                    return Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-                return scanMouseArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) : "transparent"
+                    return Theme.surfaceContainerHigh
+                return scanMouseArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
            }
            border.color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-            border.width: 0
+            border.width: 1
            visible: BluetoothService.adapter && BluetoothService.adapter.enabled
-
+            
            Row {
                anchors.centerIn: parent
                spacing: Theme.spacingXS
-
+                
                DankIcon {
                    name: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop" : "bluetooth_searching"
                    size: 18
                    color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Theme.surfaceVariantText
                    anchors.verticalCenter: parent.verticalCenter
                }
-
+                
                StyledText {
                    text: BluetoothService.adapter && BluetoothService.adapter.discovering ? "Scanning" : "Scan"
                    color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Theme.surfaceVariantText
@@ -111,7 +84,7 @@ Rectangle {
                    anchors.verticalCenter: parent.verticalCenter
                }
            }
-
+            
            MouseArea {
                id: scanMouseArea
                anchors.fill: parent
@@ -123,9 +96,16 @@ Rectangle {
                        BluetoothService.adapter.discovering = !BluetoothService.adapter.discovering
                }
            }
+            
+            Behavior on color {
+                ColorAnimation {
+                    duration: Theme.shortDuration
+                    easing.type: Theme.standardEasing
+                }
+            }
        }
    }
-
+    
    DankFlickable {
        id: bluetoothContent
        anchors.top: headerRow.bottom
@@ -137,19 +117,19 @@ Rectangle {
        visible: BluetoothService.adapter && BluetoothService.adapter.enabled
        contentHeight: bluetoothColumn.height
        clip: true
-
+        
        Column {
            id: bluetoothColumn
            width: parent.width
            spacing: Theme.spacingS
-
-
+            
+            
            Repeater {
                id: pairedRepeater
                model: {
                    if (!BluetoothService.adapter || !BluetoothService.adapter.devices)
                        return []
-
+                    
                    let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
                    devices.sort((a, b) => {
                        if (a.connected && !b.connected) return -1
@@ -158,17 +138,17 @@ Rectangle {
                    })
                    return devices
                }
-
+                
                delegate: Rectangle {
                    required property var modelData
                    required property int index
-
+                    
                    property string currentCodec: BluetoothService.deviceCodecs[modelData.address] || ""
-
+                    
                    width: parent.width
                    height: 50
                    radius: Theme.cornerRadius
-
+                    
                    Component.onCompleted: {
                        if (modelData.connected && BluetoothService.isAudioDevice(modelData)) {
                            BluetoothService.refreshDeviceCodec(modelData)
@@ -179,7 +159,7 @@ Rectangle {
                            return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
                        if (deviceMouseArea.containsMouse)
                            return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                        return Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                        return Theme.surfaceContainerHigh
                    }
                    border.color: {
                        if (modelData.state === BluetoothDeviceState.Connecting)
@@ -188,14 +168,14 @@ Rectangle {
                            return Theme.primary
                        return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                    }
-                    border.width: 0
-
+                    border.width: (modelData.connected || modelData.state === BluetoothDeviceState.Connecting) ? 2 : 1
+                    
                    Row {
                        anchors.left: parent.left
                        anchors.verticalCenter: parent.verticalCenter
                        anchors.leftMargin: Theme.spacingM
                        spacing: Theme.spacingS
-
+                        
                        DankIcon {
                            name: BluetoothService.getDeviceIcon(modelData)
                            size: Theme.iconSize - 4
@@ -208,11 +188,11 @@ Rectangle {
                            }
                            anchors.verticalCenter: parent.verticalCenter
                        }
-
+                        
                        Column {
                            anchors.verticalCenter: parent.verticalCenter
                            width: 200
-
+                            
                            StyledText {
                                text: modelData.name || modelData.deviceName || "Unknown Device"
                                font.pixelSize: Theme.fontSizeMedium
@@ -221,10 +201,10 @@ Rectangle {
                                elide: Text.ElideRight
                                width: parent.width
                            }
-
+                            
                            Row {
                                spacing: Theme.spacingXS
-
+                                
                                StyledText {
                                    text: {
                                        if (modelData.state === BluetoothDeviceState.Connecting)
@@ -245,12 +225,12 @@ Rectangle {
                                        return Theme.surfaceVariantText
                                    }
                                }
-
+                                
                                StyledText {
                                    text: {
                                        if (modelData.batteryAvailable && modelData.battery > 0)
                                            return "• " + Math.round(modelData.battery * 100) + "%"
-
+                                        
                                        var btBattery = BatteryService.bluetoothDevices.find(dev => {
                                            return dev.name === (modelData.name || modelData.deviceName) ||
                                                   dev.name.toLowerCase().includes((modelData.name || modelData.deviceName).toLowerCase()) ||
@@ -262,7 +242,7 @@ Rectangle {
                                    color: Theme.surfaceVariantText
                                    visible: text.length > 0
                                }
-
+                                
                                StyledText {
                                    text: modelData.signalStrength !== undefined && modelData.signalStrength > 0 ? "• " + modelData.signalStrength + "%" : ""
                                    font.pixelSize: Theme.fontSizeSmall
@@ -272,7 +252,7 @@ Rectangle {
                            }
                        }
                    }
-
+                    
                    DankActionButton {
                        id: pairedOptionsButton
                        anchors.right: parent.right
@@ -289,7 +269,7 @@ Rectangle {
                            }
                        }
                    }
-
+                    
                    MouseArea {
                        id: deviceMouseArea
                        anchors.fill: parent
@@ -304,28 +284,36 @@ Rectangle {
                            }
                        }
                    }
+                    
+                    Behavior on color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
+                    
+                    Behavior on border.color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
                }
            }
-
+            
            Rectangle {
                width: parent.width
                height: 1
                color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                visible: pairedRepeater.count > 0 && availableRepeater.count > 0
            }
-
-
+            
+            
            Item {
                width: parent.width
                height: 80
                visible: BluetoothService.adapter && BluetoothService.adapter.discovering && availableRepeater.count === 0
-
+                
                DankIcon {
                    anchors.centerIn: parent
                    name: "sync"
                    size: 24
                    color: Qt.rgba(Theme.surfaceText.r || 0.8, Theme.surfaceText.g || 0.8, Theme.surfaceText.b || 0.8, 0.4)
-
+                    
                    RotationAnimation on rotation {
                        running: parent.visible && BluetoothService.adapter && BluetoothService.adapter.discovering && availableRepeater.count === 0
                        loops: Animation.Infinite
@@ -335,52 +323,52 @@ Rectangle {
                    }
                }
            }
-
+            
            Repeater {
                id: availableRepeater
                model: {
                    if (!BluetoothService.adapter || !BluetoothService.adapter.discovering || !Bluetooth.devices)
                        return []
-
+                    
                    var filtered = Bluetooth.devices.values.filter(dev => {
                        return dev && !dev.paired && !dev.pairing && !dev.blocked &&
                               (dev.signalStrength === undefined || dev.signalStrength > 0)
                    })
                    return BluetoothService.sortDevices(filtered)
                }
-
+                
                delegate: Rectangle {
                    required property var modelData
                    required property int index
-
+                    
                    property bool canConnect: BluetoothService.canConnect(modelData)
-                    property bool isBusy: BluetoothService.isDeviceBusy(modelData) || isDeviceBeingPaired(modelData.address)
-
+                    property bool isBusy: BluetoothService.isDeviceBusy(modelData)
+                    
                    width: parent.width
                    height: 50
                    radius: Theme.cornerRadius
-                    color: availableMouseArea.containsMouse && !isBusy ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    color: availableMouseArea.containsMouse && !isBusy ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
                    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: 0
-                    opacity: (canConnect && !isBusy) ? 1 : 0.6
-
+                    border.width: 1
+                    opacity: canConnect ? 1 : 0.6
+                    
                    Row {
                        anchors.left: parent.left
                        anchors.verticalCenter: parent.verticalCenter
                        anchors.leftMargin: Theme.spacingM
                        spacing: Theme.spacingS
-
+                        
                        DankIcon {
                            name: BluetoothService.getDeviceIcon(modelData)
                            size: Theme.iconSize - 4
                            color: Theme.surfaceText
                            anchors.verticalCenter: parent.verticalCenter
                        }
-
+                        
                        Column {
                            anchors.verticalCenter: parent.verticalCenter
                            width: 200
-
+                            
                            StyledText {
                                text: modelData.name || modelData.deviceName || "Unknown Device"
                                font.pixelSize: Theme.fontSizeMedium
@@ -388,20 +376,20 @@ Rectangle {
                                elide: Text.ElideRight
                                width: parent.width
                            }
-
+                            
                            Row {
                                spacing: Theme.spacingXS
-
+                                
                                StyledText {
                                    text: {
-                                        if (modelData.pairing || isBusy) return "Pairing..."
+                                        if (modelData.pairing) return "Pairing..."
                                        if (modelData.blocked) return "Blocked"
                                        return BluetoothService.getSignalStrength(modelData)
                                    }
                                    font.pixelSize: Theme.fontSizeSmall
                                    color: Theme.surfaceVariantText
                                }
-
+                                
                                StyledText {
                                    text: modelData.signalStrength !== undefined && modelData.signalStrength > 0 ? "• " + modelData.signalStrength + "%" : ""
                                    font.pixelSize: Theme.fontSizeSmall
@@ -411,21 +399,21 @@ Rectangle {
                            }
                        }
                    }
-
+                    
                    StyledText {
                        anchors.right: parent.right
                        anchors.rightMargin: Theme.spacingM
                        anchors.verticalCenter: parent.verticalCenter
                        text: {
-                            if (isBusy) return "Pairing..."
+                            if (modelData.pairing) return "Pairing..."
                            if (!canConnect) return "Cannot pair"
                            return "Pair"
                        }
                        font.pixelSize: Theme.fontSizeSmall
-                        color: (canConnect && !isBusy) ? Theme.primary : Theme.surfaceVariantText
+                        color: canConnect ? Theme.primary : Theme.surfaceVariantText
                        font.weight: Font.Medium
                    }
-
+                    
                    MouseArea {
                        id: availableMouseArea
                        anchors.fill: parent
@@ -433,46 +421,51 @@ Rectangle {
                        cursorShape: canConnect && !isBusy ? Qt.PointingHandCursor : Qt.ArrowCursor
                        enabled: canConnect && !isBusy
                        onClicked: {
-                            root.handlePairDevice(modelData)
+                            if (modelData) {
+                                BluetoothService.connectDeviceWithTrust(modelData)
+                            }
                        }
                    }
-
+                    
+                    Behavior on color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
                }
            }
-
+            
            Item {
                width: parent.width
                height: 60
                visible: !BluetoothService.adapter
-
+                
                StyledText {
                    anchors.centerIn: parent
-                    text: I18n.tr("No Bluetooth adapter found")
+                    text: "No Bluetooth adapter found"
                    font.pixelSize: Theme.fontSizeMedium
                    color: Theme.surfaceVariantText
                }
            }
        }
    }
-
+    
    Menu {
        id: bluetoothContextMenu
        width: 150
        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-
+        
        property var currentDevice: null
-
+        
        background: Rectangle {
-            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+            color: Theme.popupBackground()
            radius: Theme.cornerRadius
-            border.width: 0
+            border.width: 1
            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
        }
-
+        
        MenuItem {
            text: bluetoothContextMenu.currentDevice && bluetoothContextMenu.currentDevice.connected ? "Disconnect" : "Connect"
            height: 32
-
+            
            contentItem: StyledText {
                text: parent.text
                font.pixelSize: Theme.fontSizeSmall
@@ -480,12 +473,12 @@ Rectangle {
                leftPadding: Theme.spacingS
                verticalAlignment: Text.AlignVCenter
            }
-
+            
            background: Rectangle {
                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
                radius: Theme.cornerRadius / 2
            }
-
+            
            onTriggered: {
                if (bluetoothContextMenu.currentDevice) {
                    if (bluetoothContextMenu.currentDevice.connected) {
@@ -496,12 +489,12 @@ Rectangle {
                }
            }
        }
-
+        
        MenuItem {
-            text: I18n.tr("Audio Codec")
+            text: "Audio Codec"
            height: bluetoothContextMenu.currentDevice && BluetoothService.isAudioDevice(bluetoothContextMenu.currentDevice) && bluetoothContextMenu.currentDevice.connected ? 32 : 0
            visible: bluetoothContextMenu.currentDevice && BluetoothService.isAudioDevice(bluetoothContextMenu.currentDevice) && bluetoothContextMenu.currentDevice.connected
-
+            
            contentItem: StyledText {
                text: parent.text
                font.pixelSize: Theme.fontSizeSmall
@@ -509,23 +502,23 @@ Rectangle {
                leftPadding: Theme.spacingS
                verticalAlignment: Text.AlignVCenter
            }
-
+            
            background: Rectangle {
                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
                radius: Theme.cornerRadius / 2
            }
-
+            
            onTriggered: {
                if (bluetoothContextMenu.currentDevice) {
                    showCodecSelector(bluetoothContextMenu.currentDevice)
                }
            }
        }
-
+        
        MenuItem {
-            text: I18n.tr("Forget Device")
+            text: "Forget Device"
            height: 32
-
+            
            contentItem: StyledText {
                text: parent.text
                font.pixelSize: Theme.fontSizeSmall
@@ -533,38 +526,18 @@ Rectangle {
                leftPadding: Theme.spacingS
                verticalAlignment: Text.AlignVCenter
            }
-
+            
            background: Rectangle {
                color: parent.hovered ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.08) : "transparent"
                radius: Theme.cornerRadius / 2
            }
-
+            
            onTriggered: {
                if (bluetoothContextMenu.currentDevice) {
-                    if (BluetoothService.enhancedPairingAvailable) {
-                        const devicePath = BluetoothService.getDevicePath(bluetoothContextMenu.currentDevice)
-                        DMSService.bluetoothRemove(devicePath, response => {
-                            if (response.error) {
-                                ToastService.showError(I18n.tr("Failed to remove device"), response.error)
-                            }
-                        })
-                    } else {
-                        bluetoothContextMenu.currentDevice.forget()
-                    }
+                    bluetoothContextMenu.currentDevice.forget()
                }
            }
        }
    }
-
-    BluetoothPairingModal {
-        id: bluetoothPairingModal
-    }
-
-    Connections {
-        target: DMSService
-
-        function onBluetoothPairingRequest(data) {
-            bluetoothPairingModal.show(data)
-        }
-    }
+    
 }
--- a/Modules/ControlCenter/Details/BrightnessDetail.qml
+++ b/Modules/ControlCenter/Details/BrightnessDetail.qml
@@ -1,460 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: root
-
-    property string initialDeviceName: ""
-    property string instanceId: ""
-    property string screenName: ""
-
-    signal deviceNameChanged(string newDeviceName)
-
-    property string currentDeviceName: ""
-
-    function resolveDeviceName() {
-        if (!DisplayService.brightnessAvailable || !DisplayService.devices || DisplayService.devices.length === 0) {
-            return ""
-        }
-
-        if (screenName && screenName.length > 0) {
-            const pins = SettingsData.brightnessDevicePins || {}
-            const pinnedDevice = pins[screenName]
-            if (pinnedDevice && pinnedDevice.length > 0) {
-                const found = DisplayService.devices.find(dev => dev.name === pinnedDevice)
-                if (found) {
-                    return found.name
-                }
-            }
-        }
-
-        if (initialDeviceName && initialDeviceName.length > 0) {
-            const found = DisplayService.devices.find(dev => dev.name === initialDeviceName)
-            if (found) {
-                return found.name
-            }
-        }
-
-        const currentDeviceNameFromService = DisplayService.currentDevice
-        if (currentDeviceNameFromService) {
-            const found = DisplayService.devices.find(dev => dev.name === currentDeviceNameFromService)
-            if (found) {
-                return found.name
-            }
-        }
-
-        const backlight = DisplayService.devices.find(d => d.class === "backlight")
-        if (backlight) {
-            return backlight.name
-        }
-
-        const ddc = DisplayService.devices.find(d => d.class === "ddc")
-        if (ddc) {
-            return ddc.name
-        }
-
-        return DisplayService.devices.length > 0 ? DisplayService.devices[0].name : ""
-    }
-
-    Component.onCompleted: {
-        currentDeviceName = resolveDeviceName()
-    }
-
-    property bool isPinnedToScreen: {
-        if (!screenName || screenName.length === 0) {
-            return false
-        }
-        const pins = SettingsData.brightnessDevicePins || {}
-        return pins[screenName] === currentDeviceName
-    }
-
-    function togglePinToScreen() {
-        if (!screenName || screenName.length === 0 || !currentDeviceName || currentDeviceName.length === 0) {
-            return
-        }
-
-        const pins = JSON.parse(JSON.stringify(SettingsData.brightnessDevicePins || {}))
-
-        if (isPinnedToScreen) {
-            delete pins[screenName]
-        } else {
-            pins[screenName] = currentDeviceName
-        }
-
-        SettingsData.set("brightnessDevicePins", pins)
-    }
-
-    implicitHeight: brightnessContent.height + Theme.spacingM
-    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-    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
-                    }
-                }
-            }
-
-            Rectangle {
-                width: parent.width
-                height: 40
-                visible: screenName && screenName.length > 0 && DisplayService.devices && DisplayService.devices.length > 1
-                radius: Theme.cornerRadius
-                color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-
-                Item {
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingM
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "monitor"
-                            size: Theme.iconSize
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: screenName || "Unknown Monitor"
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    Rectangle {
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: pinRow.width + Theme.spacingS * 2
-                        height: 28
-                        radius: height / 2
-                        color: isPinnedToScreen ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05)
-
-                        Row {
-                            id: pinRow
-                            anchors.centerIn: parent
-                            spacing: 4
-
-                            DankIcon {
-                                name: isPinnedToScreen ? "push_pin" : "push_pin"
-                                size: 16
-                                color: isPinnedToScreen ? Theme.primary : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: isPinnedToScreen ? "Pinned" : "Pin"
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: isPinnedToScreen ? Theme.primary : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: root.togglePinToScreen()
-                        }
-                    }
-                }
-            }
-
-            Repeater {
-                model: DisplayService.devices || []
-                delegate: Rectangle {
-                    required property var modelData
-                    required property int index
-
-                    property real deviceBrightness: {
-                        DisplayService.brightnessVersion
-                        return DisplayService.getDeviceBrightness(modelData.name)
-                    }
-
-                    width: parent.width
-                    height: 100
-                    radius: Theme.cornerRadius
-                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                    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
-
-                    Column {
-                        anchors.fill: parent
-                        anchors.margins: Theme.spacingM
-                        spacing: Theme.spacingS
-
-                        Item {
-                            width: parent.width
-                            height: Math.max(deviceIconColumn.height, deviceInfoColumn.height, exponentControls.height)
-
-                            Row {
-                                anchors.left: parent.left
-                                anchors.verticalCenter: parent.verticalCenter
-                                spacing: Theme.spacingM
-
-                                Column {
-                                    id: deviceIconColumn
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    spacing: 2
-
-                                    DankIcon {
-                                        name: {
-                                            const deviceClass = modelData.class || ""
-                                            const deviceName = modelData.name || ""
-
-                                            if (deviceClass === "backlight" || deviceClass === "ddc") {
-                                                if (deviceBrightness <= 33)
-                                                    return "brightness_low"
-                                                if (deviceBrightness <= 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: Math.round(deviceBrightness) + "%"
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceText
-                                        anchors.horizontalCenter: parent.horizontalCenter
-                                    }
-                                }
-
-                                Column {
-                                    id: deviceInfoColumn
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    width: parent.parent.width - deviceIconColumn.width - exponentControls.width - Theme.spacingM * 3
-
-                                    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
-                                    }
-                                }
-                            }
-
-                            Row {
-                                id: exponentControls
-                                width: 140
-                                height: 28
-                                anchors.right: parent.right
-                                anchors.verticalCenter: parent.verticalCenter
-                                spacing: Theme.spacingXS
-                                visible: SessionData.getBrightnessExponential(modelData.name)
-                                z: 1
-
-                                StyledRect {
-                                    width: 28
-                                    height: 28
-                                    radius: Theme.cornerRadius
-                                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                                    opacity: SessionData.getBrightnessExponent(modelData.name) > 1.0 ? 1.0 : 0.4
-
-                                    DankIcon {
-                                        anchors.centerIn: parent
-                                        name: "remove"
-                                        size: 14
-                                        color: Theme.surfaceText
-                                    }
-
-                                    StateLayer {
-                                        stateColor: Theme.primary
-                                        cornerRadius: parent.radius
-                                        enabled: SessionData.getBrightnessExponent(modelData.name) > 1.0
-                                        onClicked: {
-                                            const current = SessionData.getBrightnessExponent(modelData.name)
-                                            const newValue = Math.max(1.0, Math.round((current - 0.1) * 10) / 10)
-                                            SessionData.setBrightnessExponent(modelData.name, newValue)
-                                        }
-                                    }
-                                }
-
-                                StyledRect {
-                                    width: 50
-                                    height: 28
-                                    radius: Theme.cornerRadius
-                                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                                    border.width: 0
-
-                                    StyledText {
-                                        anchors.centerIn: parent
-                                        text: SessionData.getBrightnessExponent(modelData.name).toFixed(1)
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        font.weight: Font.Medium
-                                        color: Theme.primary
-                                    }
-                                }
-
-                                StyledRect {
-                                    width: 28
-                                    height: 28
-                                    radius: Theme.cornerRadius
-                                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                                    opacity: SessionData.getBrightnessExponent(modelData.name) < 2.5 ? 1.0 : 0.4
-
-                                    DankIcon {
-                                        anchors.centerIn: parent
-                                        name: "add"
-                                        size: 14
-                                        color: Theme.surfaceText
-                                    }
-
-                                    StateLayer {
-                                        stateColor: Theme.primary
-                                        cornerRadius: parent.radius
-                                        enabled: SessionData.getBrightnessExponent(modelData.name) < 2.5
-                                        onClicked: {
-                                            const current = SessionData.getBrightnessExponent(modelData.name)
-                                            const newValue = Math.min(2.5, Math.round((current + 0.1) * 10) / 10)
-                                            SessionData.setBrightnessExponent(modelData.name, newValue)
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        Rectangle {
-                            width: parent.width
-                            height: 24
-                            radius: height / 2
-                            color: SessionData.getBrightnessExponential(modelData.name) ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05)
-
-                            Row {
-                                anchors.centerIn: parent
-                                spacing: 4
-
-                                DankIcon {
-                                    name: "show_chart"
-                                    size: 14
-                                    color: SessionData.getBrightnessExponential(modelData.name) ? Theme.primary : Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-
-                                StyledText {
-                                    text: SessionData.getBrightnessExponential(modelData.name) ? "Exponential" : "Linear"
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: SessionData.getBrightnessExponential(modelData.name) ? Theme.primary : Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-                            }
-
-                            MouseArea {
-                                anchors.fill: parent
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: {
-                                    const currentState = SessionData.getBrightnessExponential(modelData.name)
-                                    SessionData.setBrightnessExponential(modelData.name, !currentState)
-                                }
-                            }
-                        }
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        anchors.bottomMargin: 28
-                        anchors.rightMargin: SessionData.getBrightnessExponential(modelData.name) ? 145 : 0
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            if (screenName && screenName.length > 0 && modelData.name !== currentDeviceName) {
-                                const pins = JSON.parse(JSON.stringify(SettingsData.brightnessDevicePins || {}))
-                                if (pins[screenName]) {
-                                    delete pins[screenName]
-                                    SettingsData.set("brightnessDevicePins", pins)
-                                }
-                            }
-                            currentDeviceName = modelData.name
-                            deviceNameChanged(modelData.name)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Modules/ControlCenter/Details/DiskUsageDetail.qml
+++ b/Modules/ControlCenter/Details/DiskUsageDetail.qml
@@ -6,8 +6,6 @@ import qs.Services
 import qs.Widgets

 Rectangle {
-    id: root
-
    property string currentMountPath: "/"
    property string instanceId: ""

@@ -15,9 +13,9 @@ Rectangle {

    implicitHeight: diskContent.height + Theme.spacingM
    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
+    border.width: 1

    Component.onCompleted: {
        DgopService.addRef(["diskmounts"])
@@ -78,9 +76,9 @@ Rectangle {
                    width: parent.width
                    height: 80
                    radius: Theme.cornerRadius
-                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    color: Theme.surfaceContainerHigh
                    border.color: modelData.mount === currentMountPath ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: modelData.mount === currentMountPath ? 2 : 0
+                    border.width: modelData.mount === currentMountPath ? 2 : 1

                    Row {
                        anchors.left: parent.left
@@ -154,11 +152,16 @@ Rectangle {
                        hoverEnabled: true
                        cursorShape: Qt.PointingHandCursor
                        onClicked: {
-                            currentMountPath = modelData.mount
-                            mountPathChanged(modelData.mount)
+                            if (modelData.mount !== currentMountPath) {
+                                currentMountPath = modelData.mount
+                                mountPathChanged(modelData.mount)
+                            }
                        }
                    }

+                    Behavior on border.color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
                }
            }
        }
--- a/Modules/ControlCenter/Details/NetworkDetail.qml
+++ b/Modules/ControlCenter/Details/NetworkDetail.qml
@@ -17,42 +17,30 @@ Rectangle {
        return headerRow.height + wifiOffContent.height + Theme.spacingM
    }
    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 0
-
+    border.width: 1
+    
    Component.onCompleted: {
        NetworkService.addRef()
+        if (NetworkService.wifiEnabled) {
+            NetworkService.scanWifi()
+        }
    }
-
+    
    Component.onDestruction: {
        NetworkService.removeRef()
    }
-
-    property int currentPreferenceIndex: {
-        if (DMSService.apiVersion < 5) {
-            return 1
-        }
-
-        if (NetworkService.backend !== "networkmanager" || DMSService.apiVersion <= 10) {
-            return 1
-        }
-
-        const pref = NetworkService.userPreference
-        const status = NetworkService.networkStatus
-        let index = 1
-
-        if (pref === "ethernet") {
-            index = 0
-        } else if (pref === "wifi") {
-            index = 1
-        } else {
-            index = status === "ethernet" ? 0 : 1
-        }
-
-        return index
+    
+    property var wifiPasswordModalRef: {
+        wifiPasswordModalLoader.active = true
+        return wifiPasswordModalLoader.item
    }
-
+    property var networkInfoModalRef: {
+        networkInfoModalLoader.active = true
+        return networkInfoModalLoader.item
+    }
+    
    Row {
        id: headerRow
        anchors.left: parent.left
@@ -62,37 +50,38 @@ Rectangle {
        anchors.rightMargin: Theme.spacingM
        anchors.topMargin: Theme.spacingS
        height: 40
-
+        
        StyledText {
            id: headerText
-            text: I18n.tr("Network Settings")
+            text: "Network Settings"
            font.pixelSize: Theme.fontSizeLarge
            color: Theme.surfaceText
            font.weight: Font.Medium
            anchors.verticalCenter: parent.verticalCenter
        }
-
+        
        Item {
            width: Math.max(0, parent.width - headerText.implicitWidth - preferenceControls.width - Theme.spacingM)
            height: parent.height
        }
-
+        
        DankButtonGroup {
            id: preferenceControls
            anchors.verticalCenter: parent.verticalCenter
-            visible: NetworkService.backend === "networkmanager" && DMSService.apiVersion > 10
+            visible: NetworkService.ethernetConnected && NetworkService.wifiConnected
+
+            property int currentPreferenceIndex: NetworkService.userPreference === "ethernet" ? 0 : 1

            model: ["Ethernet", "WiFi"]
            currentIndex: currentPreferenceIndex
            selectionMode: "single"
            onSelectionChanged: (index, selected) => {
                if (!selected) return
-                console.log("NetworkDetail: Setting preference to", index === 0 ? "ethernet" : "wifi")
                NetworkService.setNetworkPreference(index === 0 ? "ethernet" : "wifi")
            }
        }
    }
-
+    
    Item {
        id: wifiToggleContent
        anchors.top: headerRow.bottom
@@ -100,19 +89,19 @@ Rectangle {
        anchors.right: parent.right
        anchors.margins: Theme.spacingM
        anchors.topMargin: Theme.spacingM
-        visible: currentPreferenceIndex === 1 && NetworkService.wifiToggling
+        visible: NetworkService.wifiToggling
        height: visible ? 80 : 0
-
+        
        Column {
            anchors.centerIn: parent
            spacing: Theme.spacingM
-
+            
            DankIcon {
                anchors.horizontalCenter: parent.horizontalCenter
                name: "sync"
                size: 32
                color: Theme.primary
-
+                
                RotationAnimation on rotation {
                    running: NetworkService.wifiToggling
                    loops: Animation.Infinite
@@ -121,7 +110,7 @@ Rectangle {
                    duration: 1000
                }
            }
-
+            
            StyledText {
                anchors.horizontalCenter: parent.horizontalCenter
                text: NetworkService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
@@ -131,7 +120,7 @@ Rectangle {
            }
        }
    }
-
+    
    Item {
        id: wifiOffContent
        anchors.top: headerRow.bottom
@@ -139,47 +128,47 @@ Rectangle {
        anchors.right: parent.right
        anchors.margins: Theme.spacingM
        anchors.topMargin: Theme.spacingM
-        visible: currentPreferenceIndex === 1 && !NetworkService.wifiEnabled && !NetworkService.wifiToggling
+        visible: !NetworkService.wifiEnabled && !NetworkService.wifiToggling
        height: visible ? 120 : 0
-
+        
        Column {
            anchors.centerIn: parent
            spacing: Theme.spacingL
            width: parent.width
-
+            
            DankIcon {
                anchors.horizontalCenter: parent.horizontalCenter
                name: "wifi_off"
                size: 48
                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
            }
-
+            
            StyledText {
                anchors.horizontalCenter: parent.horizontalCenter
-                text: I18n.tr("WiFi is off")
+                text: "WiFi is off"
                font.pixelSize: Theme.fontSizeLarge
                color: Theme.surfaceText
                font.weight: Font.Medium
                horizontalAlignment: Text.AlignHCenter
            }
-
+            
            Rectangle {
                anchors.horizontalCenter: parent.horizontalCenter
                width: 120
                height: 36
                radius: 18
                color: enableWifiButton.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                border.width: 0
+                border.width: 1
                border.color: Theme.primary
-
+                
                StyledText {
                    anchors.centerIn: parent
-                    text: I18n.tr("Enable WiFi")
+                    text: "Enable WiFi"
                    color: Theme.primary
                    font.pixelSize: Theme.fontSizeMedium
                    font.weight: Font.Medium
                }
-
+                
                MouseArea {
                    id: enableWifiButton
                    anchors.fill: parent
@@ -187,180 +176,13 @@ Rectangle {
                    cursorShape: Qt.PointingHandCursor
                    onClicked: NetworkService.toggleWifiRadio()
                }
-
-            }
-        }
-    }
-
-    DankFlickable {
-        id: wiredContent
-        anchors.top: headerRow.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        anchors.margins: Theme.spacingM
-        anchors.topMargin: Theme.spacingM
-        visible: currentPreferenceIndex === 0 && NetworkService.backend === "networkmanager" && DMSService.apiVersion > 10
-        contentHeight: wiredColumn.height
-        clip: true
-
-        Column {
-            id: wiredColumn
-            width: parent.width
-            spacing: Theme.spacingS
-
-            Repeater {
-                model: ScriptModel {
-                    values: {
-                        const currentUuid = NetworkService.ethernetConnectionUuid
-                        const networks = NetworkService.wiredConnections
-                        let sorted = [...networks]
-                        sorted.sort((a, b) => {
-                            if (a.isActive && !b.isActive) return -1
-                            if (!a.isActive && b.isActive) return 1
-                            return a.id.localeCompare(b.id)
-                        })
-                        return sorted
+                
+                Behavior on color {
+                    ColorAnimation {
+                        duration: Theme.shortDuration
+                        easing.type: Theme.standardEasing
                    }
                }
-
-                delegate: Rectangle {
-                    required property var modelData
-                    required property int index
-
-                    width: parent.width
-                    height: 50
-                    radius: Theme.cornerRadius
-                    color: wiredNetworkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
-                    border.color: Theme.primary
-                    border.width: 0
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.leftMargin: Theme.spacingM
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "lan"
-                            size: Theme.iconSize - 4
-                            color: modelData.isActive ? Theme.primary : Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            anchors.verticalCenter: parent.verticalCenter
-                            width: 200
-
-                            StyledText {
-                                text: modelData.id || "Unknown Config"
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: modelData.isActive ? Theme.primary : Theme.surfaceText
-                                font.weight: modelData.isActive ? Font.Medium : Font.Normal
-                                elide: Text.ElideRight
-                                width: parent.width
-                            }
-                        }
-                    }
-
-                    DankActionButton {
-                        id: wiredOptionsButton
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        iconName: "more_horiz"
-                        buttonSize: 28
-                        onClicked: {
-                            if (wiredNetworkContextMenu.visible) {
-                                wiredNetworkContextMenu.close()
-                            } else {
-                                wiredNetworkContextMenu.currentID = modelData.id
-                                wiredNetworkContextMenu.currentUUID = modelData.uuid                               
-                                wiredNetworkContextMenu.currentConnected = modelData.isActive
-                                wiredNetworkContextMenu.popup(wiredOptionsButton, -wiredNetworkContextMenu.width + wiredOptionsButton.width, wiredOptionsButton.height + Theme.spacingXS)
-                            }
-                        }
-                    }
-
-                    MouseArea {
-                        id: wiredNetworkMouseArea
-                        anchors.fill: parent
-                        anchors.rightMargin: wiredOptionsButton.width + Theme.spacingS
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: function(event) {
-                            if (modelData.uuid !== NetworkService.ethernetConnectionUuid) {
-                                NetworkService.connectToSpecificWiredConfig(modelData.uuid)
-                            }
-                            event.accepted = true
-                        }
-                    }
-
-                }
-            }
-        }
-    }
-
-    Menu {
-        id: wiredNetworkContextMenu
-        width: 150
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-
-        property string currentID: ""
-        property string currentUUID: ""
-        property bool currentConnected: false
-
-        background: Rectangle {
-            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-            radius: Theme.cornerRadius
-            border.width: 0
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-        }
-
-        MenuItem {
-            text: "Activate"
-            height: !wiredNetworkContextMenu.currentConnected ? 32 : 0
-
-            contentItem: StyledText {
-                text: parent.text
-                font.pixelSize: Theme.fontSizeSmall
-                color: Theme.surfaceText
-                leftPadding: Theme.spacingS
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            background: Rectangle {
-                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
-                radius: Theme.cornerRadius / 2
-            }
-
-            onTriggered: {
-                if (!networkContextMenu.currentConnected) {
-                    NetworkService.connectToSpecificWiredConfig(wiredNetworkContextMenu.currentUUID)
-                }
-            }
-        }
-
-        MenuItem {
-            text: I18n.tr("Network Info")
-            height: wiredNetworkContextMenu.currentConnected ? 32 : 0
-
-            contentItem: StyledText {
-                text: parent.text
-                font.pixelSize: Theme.fontSizeSmall
-                color: Theme.surfaceText
-                leftPadding: Theme.spacingS
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            background: Rectangle {
-                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
-                radius: Theme.cornerRadius / 2
-            }
-
-            onTriggered: {
-                let networkData = NetworkService.getWiredNetworkInfo(wiredNetworkContextMenu.currentUUID)
-                networkWiredInfoModal.showNetworkInfo(wiredNetworkContextMenu.currentID, networkData)
            }
        }
    }
@@ -373,31 +195,28 @@ Rectangle {
        anchors.bottom: parent.bottom
        anchors.margins: Theme.spacingM
        anchors.topMargin: Theme.spacingM
-        visible: currentPreferenceIndex === 1 && NetworkService.wifiEnabled && !NetworkService.wifiToggling
+        visible: NetworkService.wifiInterface && NetworkService.wifiEnabled && !NetworkService.wifiToggling
        contentHeight: wifiColumn.height
        clip: true
-
-        property var frozenNetworks: []
-        property bool menuOpen: false
-
+        
        Column {
            id: wifiColumn
            width: parent.width
            spacing: Theme.spacingS
-
+            
            Item {
                width: parent.width
                height: 200
-                visible: NetworkService.wifiInterface && NetworkService.wifiNetworks?.length < 1 && !NetworkService.wifiToggling && NetworkService.isScanning
-
+                visible: NetworkService.wifiInterface && NetworkService.wifiNetworks?.length < 1 && !NetworkService.wifiToggling
+                
                DankIcon {
                    anchors.centerIn: parent
                    name: "refresh"
                    size: 48
                    color: Qt.rgba(Theme.surfaceText.r || 0.8, Theme.surfaceText.g || 0.8, Theme.surfaceText.b || 0.8, 0.3)
-
+                    
                    RotationAnimation on rotation {
-                        running: NetworkService.isScanning
+                        running: true
                        loops: Animation.Infinite
                        from: 0
                        to: 360
@@ -405,42 +224,34 @@ Rectangle {
                    }
                }
            }
-
+            
            Repeater {
-                model: ScriptModel {
-                    values: {
-                        const ssid = NetworkService.currentWifiSSID
-                        const networks = NetworkService.wifiNetworks
-                        let sorted = [...networks]
-                        sorted.sort((a, b) => {
-                            if (a.ssid === ssid) return -1
-                            if (b.ssid === ssid) return 1
-                            return b.signal - a.signal
-                        })
-                        if (!wifiContent.menuOpen) {
-                            wifiContent.frozenNetworks = sorted
-                        }
-                        return wifiContent.menuOpen ? wifiContent.frozenNetworks : sorted
-                    }
+                model: {
+                    let networks = [...NetworkService.wifiNetworks]
+                    networks.sort((a, b) => {
+                        if (a.ssid === NetworkService.currentWifiSSID) return -1
+                        if (b.ssid === NetworkService.currentWifiSSID) return 1
+                        return b.signal - a.signal
+                    })
+                    return networks
                }
-
                delegate: Rectangle {
                    required property var modelData
                    required property int index
-
+                    
                    width: parent.width
                    height: 50
                    radius: Theme.cornerRadius
-                    color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
                    border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    border.width: 0
-
+                    border.width: modelData.ssid === NetworkService.currentWifiSSID ? 2 : 1
+                    
                    Row {
                        anchors.left: parent.left
                        anchors.verticalCenter: parent.verticalCenter
                        anchors.leftMargin: Theme.spacingM
                        spacing: Theme.spacingS
-
+                        
                        DankIcon {
                            name: {
                                let strength = modelData.signal || 0
@@ -452,11 +263,11 @@ Rectangle {
                            color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Theme.surfaceText
                            anchors.verticalCenter: parent.verticalCenter
                        }
-
+                        
                        Column {
                            anchors.verticalCenter: parent.verticalCenter
                            width: 200
-
+                            
                            StyledText {
                                text: modelData.ssid || "Unknown Network"
                                font.pixelSize: Theme.fontSizeMedium
@@ -465,32 +276,32 @@ Rectangle {
                                elide: Text.ElideRight
                                width: parent.width
                            }
-
+                            
                            Row {
                                spacing: Theme.spacingXS
-
+                                
                                StyledText {
-                                    text: modelData.ssid === NetworkService.currentWifiSSID ? "Connected •" : (modelData.secured ? "Secured •" : "Open •")
+                                    text: modelData.ssid === NetworkService.currentWifiSSID ? "Connected" : (modelData.secured ? "Secured" : "Open")
                                    font.pixelSize: Theme.fontSizeSmall
                                    color: Theme.surfaceVariantText
                                }
-
+                                
                                StyledText {
-                                    text: modelData.saved ? "Saved" : ""
+                                    text: modelData.saved ? "• Saved" : ""
                                    font.pixelSize: Theme.fontSizeSmall
                                    color: Theme.primary
                                    visible: text.length > 0
                                }
-
+                                
                                StyledText {
-                                    text: (modelData.saved ? "• " : "") + modelData.signal + "%"
+                                    text: "• " + modelData.signal + "%"
                                    font.pixelSize: Theme.fontSizeSmall
                                    color: Theme.surfaceVariantText
                                }
                            }
                        }
                    }
-
+                    
                    DankActionButton {
                        id: optionsButton
                        anchors.right: parent.right
@@ -502,18 +313,16 @@ Rectangle {
                            if (networkContextMenu.visible) {
                                networkContextMenu.close()
                            } else {
-                                wifiContent.menuOpen = true
                                networkContextMenu.currentSSID = modelData.ssid
                                networkContextMenu.currentSecured = modelData.secured
                                networkContextMenu.currentConnected = modelData.ssid === NetworkService.currentWifiSSID
                                networkContextMenu.currentSaved = modelData.saved
                                networkContextMenu.currentSignal = modelData.signal
-                                networkContextMenu.currentAutoconnect = modelData.autoconnect || false
                                networkContextMenu.popup(optionsButton, -networkContextMenu.width + optionsButton.width, optionsButton.height + Theme.spacingXS)
                            }
                        }
                    }
-
+                    
                    MouseArea {
                        id: networkMouseArea
                        anchors.fill: parent
@@ -523,10 +332,8 @@ Rectangle {
                        onClicked: function(event) {
                            if (modelData.ssid !== NetworkService.currentWifiSSID) {
                                if (modelData.secured && !modelData.saved) {
-                                    if (DMSService.apiVersion >= 7) {
-                                        NetworkService.connectToWifi(modelData.ssid)
-                                    } else if (PopoutService.wifiPasswordModal) {
-                                        PopoutService.wifiPasswordModal.show(modelData.ssid)
+                                    if (wifiPasswordModalRef) {
+                                        wifiPasswordModalRef.show(modelData.ssid)
                                    }
                                } else {
                                    NetworkService.connectToWifi(modelData.ssid)
@@ -535,39 +342,41 @@ Rectangle {
                            event.accepted = true
                        }
                    }
-
+                    
+                    Behavior on color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
+                    
+                    Behavior on border.color {
+                        ColorAnimation { duration: Theme.shortDuration }
+                    }
                }
            }
        }
    }
-
+    
    Menu {
        id: networkContextMenu
        width: 150
        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-
+        
        property string currentSSID: ""
        property bool currentSecured: false
        property bool currentConnected: false
        property bool currentSaved: false
        property int currentSignal: 0
-        property bool currentAutoconnect: false
-
-        onClosed: {
-            wifiContent.menuOpen = false
-        }
-
+        
        background: Rectangle {
-            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+            color: Theme.popupBackground()
            radius: Theme.cornerRadius
-            border.width: 0
+            border.width: 1
            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
        }
-
+        
        MenuItem {
            text: networkContextMenu.currentConnected ? "Disconnect" : "Connect"
            height: 32
-
+            
            contentItem: StyledText {
                text: parent.text
                font.pixelSize: Theme.fontSizeSmall
@@ -575,21 +384,19 @@ Rectangle {
                leftPadding: Theme.spacingS
                verticalAlignment: Text.AlignVCenter
            }
-
+            
            background: Rectangle {
                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
                radius: Theme.cornerRadius / 2
            }
-
+            
            onTriggered: {
                if (networkContextMenu.currentConnected) {
                    NetworkService.disconnectWifi()
                } else {
                    if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
-                        if (DMSService.apiVersion >= 7) {
-                            NetworkService.connectToWifi(networkContextMenu.currentSSID)
-                        } else if (PopoutService.wifiPasswordModal) {
-                            PopoutService.wifiPasswordModal.show(networkContextMenu.currentSSID)
+                        if (wifiPasswordModalRef) {
+                            wifiPasswordModalRef.show(networkContextMenu.currentSSID)
                        }
                    } else {
                        NetworkService.connectToWifi(networkContextMenu.currentSSID)
@@ -597,11 +404,11 @@ Rectangle {
                }
            }
        }
-
+        
        MenuItem {
-            text: I18n.tr("Network Info")
+            text: "Network Info"
            height: 32
-
+            
            contentItem: StyledText {
                text: parent.text
                font.pixelSize: Theme.fontSizeSmall
@@ -609,46 +416,25 @@ Rectangle {
                leftPadding: Theme.spacingS
                verticalAlignment: Text.AlignVCenter
            }
-
+            
            background: Rectangle {
                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
                radius: Theme.cornerRadius / 2
            }
-
+            
            onTriggered: {
-                let networkData = NetworkService.getNetworkInfo(networkContextMenu.currentSSID)
-                networkInfoModal.showNetworkInfo(networkContextMenu.currentSSID, networkData)
+                if (networkInfoModalRef) {
+                    let networkData = NetworkService.getNetworkInfo(networkContextMenu.currentSSID)
+                    networkInfoModalRef.showNetworkInfo(networkContextMenu.currentSSID, networkData)
+                }
            }
        }
-
+        
        MenuItem {
-            text: networkContextMenu.currentAutoconnect ? I18n.tr("Disable Autoconnect") : I18n.tr("Enable Autoconnect")
-            height: (networkContextMenu.currentSaved || networkContextMenu.currentConnected) && DMSService.apiVersion > 13 ? 32 : 0
-            visible: (networkContextMenu.currentSaved || networkContextMenu.currentConnected) && DMSService.apiVersion > 13
-
-            contentItem: StyledText {
-                text: parent.text
-                font.pixelSize: Theme.fontSizeSmall
-                color: Theme.surfaceText
-                leftPadding: Theme.spacingS
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            background: Rectangle {
-                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
-                radius: Theme.cornerRadius / 2
-            }
-
-            onTriggered: {
-                NetworkService.setWifiAutoconnect(networkContextMenu.currentSSID, !networkContextMenu.currentAutoconnect)
-            }
-        }
-
-        MenuItem {
-            text: I18n.tr("Forget Network")
+            text: "Forget Network"
            height: networkContextMenu.currentSaved || networkContextMenu.currentConnected ? 32 : 0
            visible: networkContextMenu.currentSaved || networkContextMenu.currentConnected
-
+            
            contentItem: StyledText {
                text: parent.text
                font.pixelSize: Theme.fontSizeSmall
@@ -656,23 +442,35 @@ Rectangle {
                leftPadding: Theme.spacingS
                verticalAlignment: Text.AlignVCenter
            }
-
+            
            background: Rectangle {
                color: parent.hovered ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.08) : "transparent"
                radius: Theme.cornerRadius / 2
            }
-
+            
            onTriggered: {
                NetworkService.forgetWifiNetwork(networkContextMenu.currentSSID)
            }
        }
    }
-
-    NetworkInfoModal {
-        id: networkInfoModal
+    
+    LazyLoader {
+        id: wifiPasswordModalLoader
+        active: false
+        
+        WifiPasswordModal {
+            id: wifiPasswordModal
+        }
+    }
+    
+    LazyLoader {
+        id: networkInfoModalLoader
+        active: false
+        
+        NetworkInfoModal {
+            id: networkInfoModal
+        }
    }

-    NetworkWiredInfoModal {
-        id: networkWiredInfoModal
-    }
+
 }
--- a/Modules/ControlCenter/Models/WidgetModel.qml
+++ b/Modules/ControlCenter/Models/WidgetModel.qml
@@ -1,74 +1,13 @@
 import QtQuick
 import qs.Common
 import qs.Services
-import qs.Modules.ControlCenter.BuiltinPlugins
 import "../utils/widgets.js" as WidgetUtils

 QtObject {
    id: root

-    property var vpnBuiltinInstance: null
-    property var cupsBuiltinInstance: null
-
-    property var vpnLoader: Loader {
-        active: false
-        sourceComponent: Component {
-            VpnWidget {}
-        }
-
-        onItemChanged: {
-            root.vpnBuiltinInstance = item
-        }
-
-        Connections {
-            target: SettingsData
-            function onControlCenterWidgetsChanged() {
-                const widgets = SettingsData.controlCenterWidgets || []
-                const hasVpnWidget = widgets.some(w => w.id === "builtin_vpn")
-                if (!hasVpnWidget && vpnLoader.active) {
-                    console.log("VpnWidget: No VPN widget in control center, deactivating loader")
-                    vpnLoader.active = false
-                }
-            }
-        }
-    }
-
-    property var cupsLoader: Loader {
-        active: false
-        sourceComponent: Component {
-            CupsWidget {}
-        }
-
-        onItemChanged: {
-            root.cupsBuiltinInstance = item
-            if (item && !DMSService.activeSubscriptions.includes("cups") && !DMSService.activeSubscriptions.includes("all")) {
-                DMSService.addSubscription("cups")
-            }
-        }
-
-        onActiveChanged: {
-            if (!active) {
-                if (DMSService.activeSubscriptions.includes("cups")) {
-                    DMSService.removeSubscription("cups")
-                }
-                root.cupsBuiltinInstance = null
-            }
-        }
-
-        Connections {
-            target: SettingsData
-            function onControlCenterWidgetsChanged() {
-                const widgets = SettingsData.controlCenterWidgets || []
-                const hasCupsWidget = widgets.some(w => w.id === "builtin_cups")
-                if (!hasCupsWidget && cupsLoader.active) {
-                    console.log("CupsWidget: No CUPS widget in control center, deactivating loader")
-                    cupsLoader.active = false
-                }
-            }
-        }
-    }
-
-    readonly property var coreWidgetDefinitions: [{
+    readonly property var baseWidgetDefinitions: [
+        {
            "id": "nightMode",
            "text": "Night Mode",
            "description": "Blue light filter",
@@ -76,28 +15,32 @@ QtObject {
            "type": "toggle",
            "enabled": DisplayService.automationAvailable,
            "warning": !DisplayService.automationAvailable ? "Requires night mode support" : undefined
-        }, {
+        },
+        {
            "id": "darkMode",
            "text": "Dark Mode",
            "description": "System theme toggle",
            "icon": "contrast",
            "type": "toggle",
            "enabled": true
-        }, {
+        },
+        {
            "id": "doNotDisturb",
            "text": "Do Not Disturb",
            "description": "Block notifications",
            "icon": "do_not_disturb_on",
            "type": "toggle",
            "enabled": true
-        }, {
+        },
+        {
            "id": "idleInhibitor",
            "text": "Keep Awake",
            "description": "Prevent screen timeout",
            "icon": "motion_sensor_active",
            "type": "toggle",
            "enabled": true
-        }, {
+        },
+        {
            "id": "wifi",
            "text": "Network",
            "description": "Wi-Fi and Ethernet connection",
@@ -105,7 +48,8 @@ QtObject {
            "type": "connection",
            "enabled": NetworkService.wifiAvailable,
            "warning": !NetworkService.wifiAvailable ? "Wi-Fi not available" : undefined
-        }, {
+        },
+        {
            "id": "bluetooth",
            "text": "Bluetooth",
            "description": "Device connections",
@@ -113,51 +57,57 @@ QtObject {
            "type": "connection",
            "enabled": BluetoothService.available,
            "warning": !BluetoothService.available ? "Bluetooth not available" : undefined
-        }, {
+        },
+        {
            "id": "audioOutput",
            "text": "Audio Output",
            "description": "Speaker settings",
            "icon": "volume_up",
            "type": "connection",
            "enabled": true
-        }, {
+        },
+        {
            "id": "audioInput",
            "text": "Audio Input",
            "description": "Microphone settings",
            "icon": "mic",
            "type": "connection",
            "enabled": true
-        }, {
+        },
+        {
            "id": "volumeSlider",
            "text": "Volume Slider",
            "description": "Audio volume control",
            "icon": "volume_up",
            "type": "slider",
            "enabled": true
-        }, {
+        },
+        {
            "id": "brightnessSlider",
            "text": "Brightness Slider",
            "description": "Display brightness control",
            "icon": "brightness_6",
            "type": "slider",
            "enabled": DisplayService.brightnessAvailable,
-            "warning": !DisplayService.brightnessAvailable ? "Brightness control not available" : undefined,
-            "allowMultiple": true
-        }, {
+            "warning": !DisplayService.brightnessAvailable ? "Brightness control not available" : undefined
+        },
+        {
            "id": "inputVolumeSlider",
            "text": "Input Volume Slider",
            "description": "Microphone volume control",
            "icon": "mic",
            "type": "slider",
            "enabled": true
-        }, {
+        },
+        {
            "id": "battery",
            "text": "Battery",
            "description": "Battery and power management",
            "icon": "battery_std",
            "type": "action",
            "enabled": true
-        }, {
+        },
+        {
            "id": "diskUsage",
            "text": "Disk Usage",
            "description": "Filesystem usage monitoring",
@@ -166,77 +116,8 @@ QtObject {
            "enabled": DgopService.dgopAvailable,
            "warning": !DgopService.dgopAvailable ? "Requires 'dgop' tool" : undefined,
            "allowMultiple": true
-        }, {
-            "id": "colorPicker",
-            "text": "Color Picker",
-            "description": "Choose colors from palette",
-            "icon": "palette",
-            "type": "action",
-            "enabled": true
-        }, {
-            "id": "builtin_vpn",
-            "text": "VPN",
-            "description": "VPN connections",
-            "icon": "vpn_key",
-            "type": "builtin_plugin",
-            "enabled": DMSNetworkService.available,
-            "warning": !DMSNetworkService.available ? "VPN not available" : undefined,
-            "isBuiltinPlugin": true
-        }, {
-            "id": "builtin_cups",
-            "text": "Printers",
-            "description": "Print Server Management",
-            "icon": "Print",
-            "type": "builtin_plugin",
-            "enabled": CupsService.available,
-            "warning": !CupsService.available ? "CUPS not available" : undefined,
-            "isBuiltinPlugin": true
-        }]
-
-    function getPluginWidgets() {
-        const plugins = []
-        const loadedPlugins = PluginService.getLoadedPlugins()
-
-        for (var i = 0; i < loadedPlugins.length; i++) {
-            const plugin = loadedPlugins[i]
-
-            if (plugin.type === "daemon") {
-                continue
-            }
-
-            const pluginComponent = PluginService.pluginWidgetComponents[plugin.id]
-            if (!pluginComponent) {
-                continue
-            }
-
-            const tempInstance = pluginComponent.createObject(null)
-            if (!tempInstance) {
-                continue
-            }
-
-            const hasCCWidget = tempInstance.ccWidgetIcon && tempInstance.ccWidgetIcon.length > 0
-            tempInstance.destroy()
-
-            if (!hasCCWidget) {
-                continue
-            }
-
-            plugins.push({
-                             "id": "plugin_" + plugin.id,
-                             "pluginId": plugin.id,
-                             "text": plugin.name || "Plugin",
-                             "description": plugin.description || "",
-                             "icon": plugin.icon || "extension",
-                             "type": "plugin",
-                             "enabled": true,
-                             "isPlugin": true
-                         })
        }
-
-        return plugins
-    }
-
-    readonly property var baseWidgetDefinitions: coreWidgetDefinitions
+    ]

    function getWidgetForId(widgetId) {
        return WidgetUtils.getWidgetForId(baseWidgetDefinitions, widgetId)
@@ -265,4 +146,4 @@ QtObject {
    function clearAll() {
        WidgetUtils.clearAll()
    }
-}
+}
--- a/Modules/ControlCenter/PowerMenu.qml
+++ b/Modules/ControlCenter/PowerMenu.qml
@@ -10,12 +10,6 @@ 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)

@@ -46,11 +40,11 @@ PanelWindow {
        height: 320 // Fixed height to prevent cropping
        x: Math.max(Theme.spacingL, parent.width - width - Theme.spacingL)
        y: Theme.barHeight + Theme.spacingXS
-        color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+        color: Theme.popupBackground()
        radius: Theme.cornerRadius
        border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
                              Theme.outline.b, 0.08)
-        border.width: 0
+        border.width: 1
        opacity: powerMenuVisible ? 1 : 0
        scale: powerMenuVisible ? 1 : 0.85

@@ -71,7 +65,7 @@ PanelWindow {
                width: parent.width

                StyledText {
-                    text: root.powerOptionsText
+                    text: "Power Options"
                    font.pixelSize: Theme.fontSizeLarge
                    color: Theme.surfaceText
                    font.weight: Font.Medium
@@ -124,7 +118,7 @@ PanelWindow {
                        }

                        StyledText {
-                            text: root.logOutText
+                            text: "Log Out"
                            font.pixelSize: Theme.fontSizeMedium
                            color: Theme.surfaceText
                            font.weight: Font.Medium
@@ -174,7 +168,7 @@ PanelWindow {
                        }

                        StyledText {
-                            text: root.suspendText
+                            text: "Suspend"
                            font.pixelSize: Theme.fontSizeMedium
                            color: Theme.surfaceText
                            font.weight: Font.Medium
@@ -224,7 +218,7 @@ PanelWindow {
                        }

                        StyledText {
-                            text: root.rebootText
+                            text: "Reboot"
                            font.pixelSize: Theme.fontSizeMedium
                            color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
                            font.weight: Font.Medium
@@ -274,7 +268,7 @@ PanelWindow {
                        }

                        StyledText {
-                            text: root.powerOffText
+                            text: "Power Off"
                            font.pixelSize: Theme.fontSizeMedium
                            color: powerOffArea.containsMouse ? Theme.error : Theme.surfaceText
                            font.weight: Font.Medium
--- a/Modules/ControlCenter/Widgets/AudioInputPill.qml
+++ b/Modules/ControlCenter/Widgets/AudioInputPill.qml
@@ -0,0 +1,63 @@
+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
+    }
+}
--- a/Modules/ControlCenter/Widgets/AudioOutputPill.qml
+++ b/Modules/ControlCenter/Widgets/AudioOutputPill.qml
@@ -0,0 +1,66 @@
+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
+    }
+}
--- a/Show More
+++ b/Show More