fix gui

displays: fix hyprland config saving
displays: add configurator (Beta)
2026-01-25 05:52:50 -05:00 · 2025-12-15 16:30:35 -05:00 · 2025-12-15 16:04:31 -05:00 · 2025-12-15 15:55:31 -05:00
368 changed files with 11568 additions and 43669 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,65 @@
+---
+name: Bug Report
+about: Crashes or unexpected behaviors
+title: ""
+labels: "bug"
+assignees: ""
+---
+
+<!-- If your issue is related to ICONS
+- Purple and black checkerboards are QT's way of signalling an icon doesn't exist
+  - FIX: Configure a QT6 or Icon Pack in DMS Settings that has the icon you want
+  - Follow the [THEMING](https://danklinux.com/docs/dankmaterialshell/icon-theming) section to ensure your QT environment variable is configured correctly for themes.
+  - Once done, configure an icon theme - either however you normally do with gtk3 or qt6ct, or through the built-in settings modal. -->
+
+## Compositor
+
+- [ ] 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 -->
+
+## Expected Behavior
+
+<!-- Describe what you expected to happen -->
+
+## Steps to Reproduce
+
+<!-- Please provide detailed steps to reproduce the issue -->
+
+1.
+2.
+3.
+
+## 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
+```
+
+## Screenshots/Recordings
+
+<!-- If applicable, add screenshots or screen recordings -->
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,96 +0,0 @@
-name: Bug Report
-description: Crashes or unexpected behaviors
-labels:
-  - bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## DankMaterialShell Bug Report
-        Limit your report to one issue per submission unless closely related
-  - type: checkboxes
-    id: compositor
-    attributes:
-      label: Compositor
-      options:
-        - label: Niri
-        - label: Hyprland
-        - label: MangoWC (dwl)
-        - label: Sway
-    validations:
-      required: true
-  - type: checkboxes
-    id: distribution
-    attributes:
-      label: Distribution
-      options:
-        - label: Arch Linux
-        - label: CachyOS
-        - label: Fedora
-        - label: NixOS
-        - label: Debian
-        - label: Ubuntu
-        - label: Gentoo
-        - label: OpenSUSE
-        - label: Other (specify below)
-    validations:
-      required: true
-  - type: input
-    id: distribution_other
-    attributes:
-      label: If Other, please specify
-      placeholder: e.g., PikaOS, Void Linux, etc.
-    validations:
-      required: false
-  - type: input
-    id: dms_version
-    attributes:
-      label: dms version
-      description: Output of dms version command
-      placeholder: e.g., 1.2.3
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Brief description of the issue
-      placeholder: What happened?
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected Behavior
-      description: What did you expect to happen?
-      placeholder: Describe the expected behavior
-    validations:
-      required: false
-  - type: textarea
-    id: steps_to_reproduce
-    attributes:
-      label: Steps to Reproduce & Installation Method
-      description: Please provide detailed steps to reproduce the issue
-      placeholder: |
-        1. ...
-        2. ...
-        3. ...
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Error Messages/Logs
-      description: Please include any error messages, stack traces, or relevant logs
-      placeholder: |
-        Paste error messages or logs here
-    validations:
-      required: false
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots/Recordings
-      description: If applicable, add screenshots or screen recordings
-      placeholder: Attach images or videos here
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,33 @@
+---
+name: Request a Feature
+about: New widgets, new widget behavior, etc.
+title: ""
+labels: "enhancement"
+assignees: ""
+---
+
+## Feature Description
+
+<!-- Brief description of the feature requested -->
+
+## Use Case
+
+<!-- Explain the purpose of this feature/why it'd be useful to you -->
+
+## Compositor
+
+Is this feature specific to one compositor?
+
+- [ ] All compositors
+- [ ] niri
+- [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
+
+## Proposed Solution
+
+<!-- If you have any ideas for how to implement this, please share! -->
+
+## Alternatives/Existing Solutions
+
+<!-- Include any similar/pre-existing products that solve this problem -->
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,55 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or improvement for DMS
-labels:
-  - enhancement
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## DankMaterialShell Feature Request
-  - type: textarea
-    id: feature_description
-    attributes:
-      label: Feature Description
-      description: Brief description of the feature requested
-      placeholder: What feature would you like to see?
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use Case
-      description: Explain the purpose of this feature/why it'd be useful to you
-      placeholder: Why is this feature important?
-    validations:
-      required: false
-  - type: checkboxes
-    id: compositor
-    attributes:
-      label: Compositor(s)
-      description: Is this feature specific to one or more compositors?
-      options:
-        - label: All compositors
-        - label: Niri
-        - label: Hyprland
-        - label: MangoWC (dwl)
-        - label: Sway
-        - label: Other (specify below)
-    validations:
-      required: false
-  - type: textarea
-    id: proposed_solution
-    attributes:
-      label: Proposed Solution
-      description: If you have any ideas for how to implement this, please share!
-      placeholder: Suggest a solution or approach
-    validations:
-      required: false
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives/Existing Solutions
-      description: Include any similar/pre-existing products that solve this problem
-      placeholder: List alternatives or existing solutions
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/support_request.md
+++ b/.github/ISSUE_TEMPLATE/support_request.md
@@ -0,0 +1,40 @@
+---
+name: Request Assistance or Support
+about: Help with installation, usage, or general questions.
+title: ""
+labels: "support"
+assignees: ""
+---
+
+## Compositor
+
+- [ ] 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 -->
+
+## Solutions Tried
+
+<!-- Describe what you've tried so far -->
+<!-- Outlining what you've tried so far helps us make improvements to the user experience and documentation to avoid recurrent issues -->
+
+## Configuration Details
+
+<!-- Include any configuration if relevant -->
+
+## Screenshots/Recordings
+
+<!-- If applicable, add screenshots or screen recordings -->
--- a/.github/ISSUE_TEMPLATE/support_request.yml
+++ b/.github/ISSUE_TEMPLATE/support_request.yml
@@ -1,69 +0,0 @@
-name: Support Request
-description: Help with installation, usage, or general questions about DankMaterialShell
-labels:
-  - support
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## DankMaterialShell Support Request
-  - type: checkboxes
-    id: compositor
-    attributes:
-      label: Compositor
-      options:
-        - label: Niri
-        - label: Hyprland
-        - label: MangoWC (dwl)
-        - label: Sway
-        - label: Other (specify below)
-    validations:
-      required: false
-  - type: input
-    id: distribution
-    attributes:
-      label: Distribution
-      description: Which Linux distribution are you using? (e.g., Arch, Fedora, Debian, etc.)
-      placeholder: Your Linux distribution
-    validations:
-      required: false
-  - type: input
-    id: dms_version
-    attributes:
-      label: dms version
-      description: Output of dms version command
-      placeholder: e.g., 1.2.3
-    validations:
-      required: false
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Brief description of the support needed
-      placeholder: What do you need help with?
-    validations:
-      required: true
-  - type: textarea
-    id: solutions_tried
-    attributes:
-      label: Solutions Tried
-      description: Describe what you've tried so far (commands, documentation, etc.)
-      placeholder: List steps or resources you've already tried
-    validations:
-      required: false
-  - type: textarea
-    id: configuration
-    attributes:
-      label: Configuration Details
-      description: Include any relevant configuration if relevant
-      placeholder: Add configuration or environment info
-    validations:
-      required: false
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots/Recordings
-      description: If applicable, add screenshots or screen recordings
-      placeholder: Attach images or videos here
-    validations:
-      required: false
--- a/.github/workflows/go-ci.yml
+++ b/.github/workflows/go-ci.yml
@@ -28,15 +28,6 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4

-      - name: Install flatpak
-        run: sudo apt update && sudo apt install -y flatpak
-
-      - name: Add flathub
-        run: sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-      - name: Add a flatpak that mutagen could support
-        run: sudo flatpak install -y org.freedesktop.Platform/x86_64/24.08 app.zen_browser.zen
-
      - name: Set up Go
        uses: actions/setup-go@v5
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -398,3 +398,297 @@ jobs:
          prerelease: ${{ contains(env.TAG, '-') }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  # trigger-obs-update:
+  #   runs-on: ubuntu-latest
+  #   needs: release
+  #   env:
+  #     TAG: ${{ inputs.tag }}
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: ${{ inputs.tag }}
+
+  #     - name: Install OSC
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y osc
+
+  #         mkdir -p ~/.config/osc
+  #         cat > ~/.config/osc/oscrc << EOF
+  #         [general]
+  #         apiurl = https://api.opensuse.org
+
+  #         [https://api.opensuse.org]
+  #         user = ${{ secrets.OBS_USERNAME }}
+  #         pass = ${{ secrets.OBS_PASSWORD }}
+  #         EOF
+  #         chmod 600 ~/.config/osc/oscrc
+
+  #     - name: Update OBS packages
+  #       run: |
+  #         cd distro
+  #         bash scripts/obs-upload.sh dms "Update to ${TAG}"
+
+  # trigger-ppa-update:
+  #   runs-on: ubuntu-latest
+  #   needs: release
+  #   env:
+  #     TAG: ${{ inputs.tag }}
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: ${{ inputs.tag }}
+
+  #     - name: Install build dependencies
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y \
+  #           debhelper \
+  #           devscripts \
+  #           dput \
+  #           lftp \
+  #           build-essential \
+  #           fakeroot \
+  #           dpkg-dev
+
+  #     - name: Configure GPG
+  #       env:
+  #         GPG_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+  #       run: |
+  #         echo "$GPG_KEY" | gpg --import
+  #         GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
+  #         echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV
+
+  #     - name: Upload to PPA
+  #       run: |
+  #         cd distro/ubuntu/ppa
+  #         bash create-and-upload.sh ../dms dms questing
+
+  # copr-build:
+  #   runs-on: ubuntu-latest
+  #   needs: release
+  #   env:
+  #     TAG: ${{ inputs.tag }}
+
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: ${{ inputs.tag }}
+
+  #     - name: Determine version
+  #       id: version
+  #       run: |
+  #         VERSION="${TAG#v}"
+  #         echo "version=$VERSION" >> $GITHUB_OUTPUT
+  #         echo "Building DMS stable version: $VERSION"
+
+  #     - name: Setup build environment
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y rpm wget curl jq gzip
+  #         mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+
+  #     - name: Download release assets
+  #       run: |
+  #         VERSION="${{ steps.version.outputs.version }}"
+  #         cd ~/rpmbuild/SOURCES
+
+  #         wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || {
+  #           echo "Failed to download dms-qml.tar.gz for v${VERSION}"
+  #           exit 1
+  #         }
+
+  #     - name: Generate stable spec file
+  #       run: |
+  #         VERSION="${{ steps.version.outputs.version }}"
+  #         CHANGELOG_DATE="$(date '+%a %b %d %Y')"
+
+  #         cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
+  #         # Spec for DMS stable releases - Generated by GitHub Actions
+
+  #         %global debug_package %{nil}
+  #         %global version VERSION_PLACEHOLDER
+  #         %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
+
+  #         Name:           dms
+  #         Version:        %{version}
+  #         Release:        1%{?dist}
+  #         Summary:        %{pkg_summary}
+
+  #         License:        MIT
+  #         URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+  #         Source0:        dms-qml.tar.gz
+
+  #         BuildRequires:  gzip
+  #         BuildRequires:  wget
+  #         BuildRequires:  systemd-rpm-macros
+
+  #         Requires:       (quickshell or quickshell-git)
+  #         Requires:       accountsservice
+  #         Requires:       dms-cli = %{version}-%{release}
+  #         Requires:       dgop
+
+  #         Recommends:     cava
+  #         Recommends:     cliphist
+  #         Recommends:     danksearch
+  #         Recommends:     matugen
+  #         Recommends:     wl-clipboard
+  #         Recommends:     NetworkManager
+  #         Recommends:     qt6-qtmultimedia
+  #         Suggests:       qt6ct
+
+  #         %description
+  #         DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+  #         and optimized for the niri and hyprland compositors. Features notifications,
+  #         app launcher, wallpaper customization, and fully customizable with plugins.
+
+  #         Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+  #         process monitoring, notification center, clipboard history, dock, control center,
+  #         lock screen, and comprehensive plugin system.
+
+  #         %package -n dms-cli
+  #         Summary:        DankMaterialShell CLI tool
+  #         License:        MIT
+  #         URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+  #         %description -n dms-cli
+  #         Command-line interface for DankMaterialShell configuration and management.
+  #         Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+  #         %prep
+  #         %setup -q -c -n dms-qml
+
+  #         # Download architecture-specific binaries during build
+  #         case "%{_arch}" in
+  #           x86_64)
+  #             ARCH_SUFFIX="amd64"
+  #             ;;
+  #           aarch64)
+  #             ARCH_SUFFIX="arm64"
+  #             ;;
+  #           *)
+  #             echo "Unsupported architecture: %{_arch}"
+  #             exit 1
+  #             ;;
+  #         esac
+
+  #         wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+  #           echo "Failed to download dms-cli for architecture %{_arch}"
+  #           exit 1
+  #         }
+  #         gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+  #         chmod +x %{_builddir}/dms-cli
+
+  #         %build
+
+  #         %install
+  #         install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+
+  #         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 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+  #         install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop
+  #         install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
+
+  #         install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+  #         cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+  #         rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+  #         rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+  #         rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+  #         rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+  #         echo "%{version}" > %{buildroot}%{_datadir}/quickshell/dms/VERSION
+
+  #         %posttrans
+  #         if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+  #             rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+  #             rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+  #             rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+  #         fi
+  #         # Signal running DMS instances to reload
+  #         pkill -USR1 -x dms >/dev/null 2>&1 || :
+
+  #         %files
+  #         %license LICENSE
+  #         %doc README.md CONTRIBUTING.md
+  #         %{_datadir}/quickshell/dms/
+  #         %{_userunitdir}/dms.service
+  #         %{_datadir}/applications/dms-open.desktop
+  #         %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
+
+  #         %files -n dms-cli
+  #         %{_bindir}/dms
+  #         %{_datadir}/bash-completion/completions/dms
+  #         %{_datadir}/zsh/site-functions/_dms
+  #         %{_datadir}/fish/vendor_completions.d/dms.fish
+
+  #         %changelog
+  #         * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-1
+  #         - Stable release VERSION_PLACEHOLDER
+  #         - Built from GitHub release
+  #         SPECEOF
+
+  #         sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+  #         sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+
+  #     - name: Build SRPM
+  #       id: build
+  #       run: |
+  #         cd ~/rpmbuild/SPECS
+  #         rpmbuild -bs dms.spec
+
+  #         SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
+  #         SRPM_NAME=$(basename "$SRPM")
+
+  #         echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
+  #         echo "srpm_name=$SRPM_NAME" >> $GITHUB_OUTPUT
+  #         echo "SRPM built: $SRPM_NAME"
+
+  #     - name: Upload SRPM artifact
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: dms-stable-srpm-${{ steps.version.outputs.version }}
+  #         path: ${{ steps.build.outputs.srpm_path }}
+  #         retention-days: 90
+
+  #     - name: Install Copr CLI
+  #       run: |
+  #         sudo apt-get install -y python3-pip
+  #         pip3 install copr-cli
+
+  #         mkdir -p ~/.config
+  #         cat > ~/.config/copr << EOF
+  #         [copr-cli]
+  #         login = ${{ secrets.COPR_LOGIN }}
+  #         username = avengemedia
+  #         token = ${{ secrets.COPR_TOKEN }}
+  #         copr_url = https://copr.fedorainfracloud.org
+  #         EOF
+  #         chmod 600 ~/.config/copr
+
+  #     - name: Upload to Copr
+  #       run: |
+  #         SRPM="${{ steps.build.outputs.srpm_path }}"
+  #         VERSION="${{ steps.version.outputs.version }}"
+
+  #         echo "Uploading SRPM to avengemedia/dms..."
+  #         BUILD_OUTPUT=$(copr-cli build avengemedia/dms "$SRPM" --nowait 2>&1)
+  #         echo "$BUILD_OUTPUT"
+
+  #         BUILD_ID=$(echo "$BUILD_OUTPUT" | grep -oP 'Build was added to.*\K[0-9]+' || echo "unknown")
+
+  #         if [ "$BUILD_ID" != "unknown" ]; then
+  #           echo "Build submitted: https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
+  #         fi
--- a/.github/workflows/run-copr.yml
+++ b/.github/workflows/run-copr.yml
@@ -3,17 +3,8 @@ name: DMS Copr Stable Release
 on:
  workflow_dispatch:
    inputs:
-      package:
-        description: 'Package to build (dms, dms-greeter, or both)'
-        required: false
-        default: 'dms'
-        type: choice
-        options:
-          - dms
-          - dms-greeter
-          - both
      version:
-        description: 'Versioning (e.g., 1.0.3, leave empty for latest release)'
+        description: 'Versioning (e.g., 0.1.14, leave empty for latest release)'
        required: false
        default: ''
      release:
@@ -22,27 +13,8 @@ on:
        default: '1'

 jobs:
-  determine-packages:
-    runs-on: ubuntu-latest
-    outputs:
-      packages: ${{ steps.set-packages.outputs.packages }}
-    steps:
-      - name: Set package list
-        id: set-packages
-        run: |
-          PACKAGE_INPUT="${{ github.event.inputs.package || 'dms' }}"
-          if [ "$PACKAGE_INPUT" = "both" ]; then
-            echo 'packages=["dms","dms-greeter"]' >> $GITHUB_OUTPUT
-          else
-            echo "packages=[\"$PACKAGE_INPUT\"]" >> $GITHUB_OUTPUT
-          fi
-
  build-and-upload:
-    needs: determine-packages
    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package: ${{ fromJSON(needs.determine-packages.outputs.packages) }}

    steps:
      - name: Checkout repository
@@ -67,7 +39,7 @@ jobs:

          echo "version=$VERSION" >> $GITHUB_OUTPUT
          echo "release=$RELEASE" >> $GITHUB_OUTPUT
-          echo "✅ Building ${{ matrix.package }} version: $VERSION-$RELEASE"
+          echo "✅ Building DMS hotfix version: $VERSION-$RELEASE"

      - name: Setup build environment
        run: |
@@ -98,31 +70,157 @@ jobs:
          VERSION="${{ steps.version.outputs.version }}"
          RELEASE="${{ steps.version.outputs.release }}"
          CHANGELOG_DATE="$(date '+%a %b %d %Y')"
-          PACKAGE="${{ matrix.package }}"

-          # Copy spec file from repository
-          cp distro/fedora/${PACKAGE}.spec ~/rpmbuild/SPECS/${PACKAGE}.spec
+          cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF'
+          # Spec for DMS stable releases - Generated by GitHub Actions

-          # Replace placeholders with actual values
-          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/${PACKAGE}.spec
-          sed -i "s/RELEASE_PLACEHOLDER/${RELEASE}/g" ~/rpmbuild/SPECS/${PACKAGE}.spec
-          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/${PACKAGE}.spec
+          %global debug_package %{nil}
+          %global version VERSION_PLACEHOLDER
+          %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors

-          echo "✅ Spec file generated for ${PACKAGE} v${VERSION}-${RELEASE}"
+          Name:           dms
+          Version:        %{version}
+          Release:        RELEASE_PLACEHOLDER%{?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 = %{version}-%{release}
+          Requires:       dgop
+
+          Recommends:     cava
+          Recommends:     cliphist
+          Recommends:     danksearch
+          Recommends:     hyprpicker
+          Recommends:     matugen
+          Recommends:     wl-clipboard
+          Recommends:     NetworkManager
+          Recommends:     qt6-qtmultimedia
+          Suggests:       qt6ct
+
+          %description
+          DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
+          and optimized for the niri and hyprland compositors. Features notifications,
+          app launcher, wallpaper customization, and fully customizable with plugins.
+
+          Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
+          process monitoring, notification center, clipboard history, dock, control center,
+          lock screen, and comprehensive plugin system.
+
+          %package -n dms-cli
+          Summary:        DankMaterialShell CLI tool
+          License:        MIT
+          URL:            https://github.com/AvengeMedia/DankMaterialShell
+
+          %description -n dms-cli
+          Command-line interface for DankMaterialShell configuration and management.
+          Provides native DBus bindings, NetworkManager integration, and system utilities.
+
+          %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/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || {
+            echo "Failed to download dms-cli for architecture %{_arch}"
+            exit 1
+          }
+          gunzip -c %{_builddir}/dms-cli.gz > %{_builddir}/dms-cli
+          chmod +x %{_builddir}/dms-cli
+
+          %build
+
+          %install
+          install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
+
+          # Shell completions
+          install -d %{buildroot}%{_datadir}/bash-completion/completions
+          install -d %{buildroot}%{_datadir}/zsh/site-functions
+          install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
+          %{_builddir}/dms-cli completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
+          %{_builddir}/dms-cli completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
+          %{_builddir}/dms-cli completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
+
+          install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
+          install -dm755 %{buildroot}%{_datadir}/quickshell/dms
+          cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
+
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
+          rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
+          rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
+
+          %posttrans
+          # Clean up old installation path from previous versions (only if empty)
+          if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then
+              # Remove directories only if empty (preserves any user-added files)
+              rmdir "%{_sysconfdir}/xdg/quickshell/dms" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg/quickshell" 2>/dev/null || true
+              rmdir "%{_sysconfdir}/xdg" 2>/dev/null || true
+          fi
+          # Signal running DMS instances to reload (harmless if none running)
+          pkill -USR1 -x dms >/dev/null 2>&1 || :
+
+          %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
+
+          %changelog
+          * CHANGELOG_DATE_PLACEHOLDER AvengeMedia <contact@avengemedia.com> - VERSION_PLACEHOLDER-RELEASE_PLACEHOLDER
+          - Stable release VERSION_PLACEHOLDER
+          - Built from GitHub release
+          SPECEOF
+
+          sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/RELEASE_PLACEHOLDER/${RELEASE}/g" ~/rpmbuild/SPECS/dms.spec
+          sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec
+
+          echo "✅ Spec file generated for v${VERSION}-${RELEASE}"
          echo ""
          echo "=== Spec file preview ==="
-          head -40 ~/rpmbuild/SPECS/${PACKAGE}.spec
+          head -40 ~/rpmbuild/SPECS/dms.spec

      - name: Build SRPM
        id: build
        run: |
          cd ~/rpmbuild/SPECS
-          PACKAGE="${{ matrix.package }}"

-          echo "🔨 Building SRPM for ${PACKAGE}..."
-          rpmbuild -bs ${PACKAGE}.spec
+          echo "🔨 Building SRPM..."
+          rpmbuild -bs dms.spec

-          SRPM=$(ls ~/rpmbuild/SRPMS/${PACKAGE}-*.src.rpm | tail -n 1)
+          SRPM=$(ls ~/rpmbuild/SRPMS/*.src.rpm | tail -n 1)
          SRPM_NAME=$(basename "$SRPM")

          echo "srpm_path=$SRPM" >> $GITHUB_OUTPUT
@@ -136,7 +234,7 @@ jobs:
      - name: Upload SRPM artifact
        uses: actions/upload-artifact@v4
        with:
-          name: ${{ matrix.package }}-stable-srpm-${{ steps.version.outputs.version }}
+          name: dms-stable-srpm-${{ steps.version.outputs.version }}
          path: ${{ steps.build.outputs.srpm_path }}
          retention-days: 90

@@ -157,40 +255,23 @@ jobs:

          echo "✅ Copr CLI configured"

-      - name: Determine Copr project
-        id: copr_project
-        run: |
-          PACKAGE="${{ matrix.package }}"
-          if [ "$PACKAGE" = "dms" ]; then
-            COPR_PROJECT="avengemedia/dms"
-          elif [ "$PACKAGE" = "dms-greeter" ]; then
-            COPR_PROJECT="avengemedia/danklinux"
-          else
-            echo "❌ Unknown package: $PACKAGE"
-            exit 1
-          fi
-          echo "copr_project=$COPR_PROJECT" >> $GITHUB_OUTPUT
-          echo "✅ Copr project: $COPR_PROJECT"
-
      - name: Upload to Copr
        run: |
          SRPM="${{ steps.build.outputs.srpm_path }}"
          VERSION="${{ steps.version.outputs.version }}"
-          COPR_PROJECT="${{ steps.copr_project.outputs.copr_project }}"
-          PACKAGE="${{ matrix.package }}"

-          echo "🚀 Uploading ${PACKAGE} SRPM to ${COPR_PROJECT}..."
+          echo "🚀 Uploading SRPM to avengemedia/dms..."
          echo "   SRPM: $(basename $SRPM)"
          echo "   Version: $VERSION"

-          BUILD_OUTPUT=$(copr-cli build "$COPR_PROJECT" "$SRPM" --nowait 2>&1)
+          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/${COPR_PROJECT}/build/$BUILD_ID/"
+            echo "🔗 https://copr.fedorainfracloud.org/coprs/avengemedia/dms/build/$BUILD_ID/"
          else
            echo "⚠️  Could not extract build ID, but upload may have succeeded"
          fi
@@ -198,13 +279,10 @@ jobs:
      - name: Build summary
        if: always()
        run: |
-          PACKAGE="${{ matrix.package }}"
-          COPR_PROJECT="${{ steps.copr_project.outputs.copr_project }}"
-          echo "### 🎉 ${PACKAGE} Stable Build Summary" >> $GITHUB_STEP_SUMMARY
+          echo "### 🎉 DMS Stable Build Summary" >> $GITHUB_STEP_SUMMARY
          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- **Package:** ${PACKAGE}" >> $GITHUB_STEP_SUMMARY
          echo "- **Version:** ${{ steps.version.outputs.version }}-${{ steps.version.outputs.release }}" >> $GITHUB_STEP_SUMMARY
          echo "- **SRPM:** ${{ steps.build.outputs.srpm_name }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Project:** https://copr.fedorainfracloud.org/coprs/${COPR_PROJECT}/" >> $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/run-obs.yml
+++ b/.github/workflows/run-obs.yml
@@ -7,14 +7,13 @@ on:
        description: "Package to update (dms, dms-git, or all)"
        required: false
        default: "all"
-      tag_version:
-        description: "Specific tag version for dms stable (e.g., v1.0.2). Leave empty to auto-detect latest release."
-        required: false
-        default: ""
      rebuild_release:
        description: "Release number for rebuilds (e.g., 2, 3, 4 to increment spec Release)"
        required: false
        default: ""
+  push:
+    tags:
+      - "v*"
  schedule:
    - cron: "0 */3 * * *" # Every 3 hours for dms-git builds

@@ -98,7 +97,7 @@ jobs:
              # Rebuild requested - always proceed
              echo "packages=$PKG" >> $GITHUB_OUTPUT
              echo "has_updates=true" >> $GITHUB_OUTPUT
-              echo "🔄 Manual rebuild requested: $PKG (db$REBUILD)"
+              echo "🔄 Manual rebuild requested: $PKG (ppa$REBUILD)"

            elif [[ "$PKG" == "all" ]]; then
              # Check each package and build list of those needing updates
@@ -162,51 +161,16 @@ jobs:
        id: packages
        run: |
          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" =~ ^refs/tags/ ]]; then
-            # Tag push event - use the pushed tag
            echo "packages=dms" >> $GITHUB_OUTPUT
            VERSION="${GITHUB_REF#refs/tags/}"
            echo "version=$VERSION" >> $GITHUB_OUTPUT
            echo "Triggered by tag: $VERSION"
          elif [[ "${{ github.event_name }}" == "schedule" ]]; then
-            # Scheduled run - dms-git only
            echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
            echo "Triggered by schedule: updating git package"
          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
-            # Manual workflow dispatch
-
-            # Determine version for dms stable
-            if [[ "${{ github.event.inputs.package }}" == "dms" ]]; then
-              # For explicit dms selection, require tag_version
-              if [[ -n "${{ github.event.inputs.tag_version }}" ]]; then
-                VERSION="${{ github.event.inputs.tag_version }}"
-                echo "version=$VERSION" >> $GITHUB_OUTPUT
-                echo "Using specified tag: $VERSION"
-              else
-                echo "ERROR: tag_version is required when package=dms"
-                echo "Please specify a tag version (e.g., v1.0.2) or use package=all for auto-detection"
-                exit 1
-              fi
-            elif [[ "${{ github.event.inputs.package }}" == "all" ]]; then
-              # For "all", auto-detect if tag_version not specified
-              if [[ -n "${{ github.event.inputs.tag_version }}" ]]; then
-                VERSION="${{ github.event.inputs.tag_version }}"
-                echo "version=$VERSION" >> $GITHUB_OUTPUT
-                echo "Using specified tag: $VERSION"
-              else
-                # Auto-detect latest release for "all"
-                LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "")
-                if [[ -n "$LATEST_TAG" ]]; then
-                  echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT
-                  echo "Auto-detected latest release: $LATEST_TAG"
-                else
-                  echo "ERROR: Could not auto-detect latest release"
-                  exit 1
-                fi
-              fi
-            fi
-
-            # Use filtered packages from check-updates when package="all" and no rebuild/tag specified
-            if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]] && [[ -z "${{ github.event.inputs.tag_version }}" ]]; then
+            # Use filtered packages from check-updates when package="all" and no rebuild requested
+            if [[ "${{ github.event.inputs.package }}" == "all" ]] && [[ -z "${{ github.event.inputs.rebuild_release }}" ]]; then
              echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT
              echo "Manual trigger: all (filtered to: ${{ needs.check-updates.outputs.packages }})"
            else
@@ -222,7 +186,7 @@ jobs:
        run: |
          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
          COMMIT_COUNT=$(git rev-list --count HEAD)
-          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "1.0.2")
+          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "0.6.2")
          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
          echo "📦 Updating dms-git.spec to version: $NEW_VERSION"

@@ -243,14 +207,14 @@ jobs:
        run: |
          COMMIT_HASH=$(git rev-parse --short=8 HEAD)
          COMMIT_COUNT=$(git rev-list --count HEAD)
-          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "1.0.2")
+          BASE_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1 || echo "0.6.2")
          NEW_VERSION="${BASE_VERSION}+git${COMMIT_COUNT}.${COMMIT_HASH}"
          echo "📦 Updating Debian dms-git changelog to version: $NEW_VERSION"

          # Single changelog entry (git snapshots don't need history)
          CHANGELOG_DATE=$(date -R)
          {
-            echo "dms-git (${NEW_VERSION}db1) nightly; urgency=medium"
+            echo "dms-git ($NEW_VERSION) nightly; urgency=medium"
            echo ""
            echo "  * Git snapshot (commit $COMMIT_COUNT: $COMMIT_HASH)"
            echo ""
@@ -262,15 +226,10 @@ jobs:
        run: |
          VERSION="${{ steps.packages.outputs.version }}"
          VERSION_NO_V="${VERSION#v}"
-          echo "==> Updating packaging files to version: $VERSION_NO_V"
+          echo "Updating packaging to version $VERSION_NO_V"

-          # Update spec file
          sed -i "s/^Version:.*/Version:        $VERSION_NO_V/" distro/opensuse/dms.spec

-          # Verify the update
-          UPDATED_VERSION=$(grep -oP '^Version:\s+\K[0-9.]+' distro/opensuse/dms.spec | head -1)
-          echo "✓ Spec file now shows Version: $UPDATED_VERSION"
-
          # Single changelog entry (full history on OBS website)
          DATE_STR=$(date "+%a %b %d %Y")
          LOCAL_SPEC_HEAD=$(sed -n '1,/%changelog/{ /%changelog/d; p }' distro/opensuse/dms.spec)
@@ -297,13 +256,13 @@ jobs:
          if [[ -f "distro/debian/dms/debian/changelog" ]]; then
            CHANGELOG_DATE=$(date -R)
            {
-              echo "dms (${VERSION_NO_V}db1) stable; urgency=medium"
+              echo "dms ($VERSION_NO_V) stable; urgency=medium"
              echo ""
              echo "  * Update to $VERSION stable release"
              echo ""
              echo " -- Avenge Media <AvengeMedia.US@gmail.com>  $CHANGELOG_DATE"
            } > "distro/debian/dms/debian/changelog"
-            echo "✓ Updated Debian changelog to ${VERSION_NO_V}db1"
+            echo "✓ Updated Debian changelog to $VERSION_NO_V"
          fi

      - name: Install Go
@@ -330,7 +289,6 @@ jobs:
      - name: Upload to OBS
        env:
          REBUILD_RELEASE: ${{ github.event.inputs.rebuild_release }}
-          TAG_VERSION: ${{ steps.packages.outputs.version }}
        run: |
          PACKAGES="${{ steps.packages.outputs.packages }}"

@@ -342,7 +300,6 @@ jobs:
          MESSAGE="Automated update from GitHub Actions"
          if [[ -n "${{ steps.packages.outputs.version }}" ]]; then
            MESSAGE="Update to ${{ steps.packages.outputs.version }}"
-            echo "==> Version being uploaded: ${{ steps.packages.outputs.version }}"
          fi

          # PACKAGES can be space-separated list (e.g., "dms-git dms" from "all" check)
@@ -352,7 +309,7 @@ jobs:
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
            echo "Uploading $PKG to OBS..."
            if [[ -n "$REBUILD_RELEASE" ]]; then
-              echo "🔄 Using rebuild release number: db$REBUILD_RELEASE"
+              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
            fi
            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"

@@ -393,7 +350,7 @@ jobs:
            echo "" >> $GITHUB_STEP_SUMMARY

            if [[ -n "${{ github.event.inputs.rebuild_release }}" ]]; then
-              echo "**Rebuild Number:** db${{ github.event.inputs.rebuild_release }}" >> $GITHUB_STEP_SUMMARY
+              echo "**Rebuild Number:** ppa${{ github.event.inputs.rebuild_release }}" >> $GITHUB_STEP_SUMMARY
              echo "" >> $GITHUB_STEP_SUMMARY
            fi

--- a/.github/workflows/run-ppa.yml
+++ b/.github/workflows/run-ppa.yml
@@ -51,8 +51,7 @@ jobs:
          check_stable_package() {
            local PKG="$1"
            local PPA_NAME="$2"
-            # Use git ls-remote to find the latest tag, sorted by version (descending)
-            local LATEST_TAG=$(git ls-remote --tags --refs --sort='-v:refname' https://github.com/AvengeMedia/DankMaterialShell.git | head -n1 | awk -F/ '{print $NF}' | sed 's/^v//')
+            local LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "v\?\([^"]*\)".*/\1/' || echo "")
            local PPA_VERSION=$(curl -s "https://api.launchpad.net/1.0/~avengemedia/+archive/ubuntu/$PPA_NAME?ws.op=getPublishedSources&source_name=$PKG&status=Published" | grep -oP '"source_package_version":\s*"\K[^"]+' | head -1 || echo "")
            local PPA_BASE_VERSION=$(echo "$PPA_VERSION" | sed 's/ppa[0-9]*$//')

--- a/.gitignore
+++ b/.gitignore
@@ -96,12 +96,11 @@ go.work
 go.work.sum

 # env file
-.env*
+.env

 # Editor/IDE
 # .idea/
 # .vscode/
-vim/

 bin/

--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,17 +1,6 @@
-This file is more of a quick reference so I know what to account for before next releases.
-
 # 1.2.0

 - Added clipboard and clipboard history integration
 - Added swipe to dismiss notification popups and from center
 - Added paste from clipboard history view - requires wtype
 - Optimize surface damage of OSD & Toast
- Add monitor configurator (niri, Hyprland, MangoWC)
- **BREAKING** ghostty theme changed to ~/.config/ghostty/themes/danktheme
-  - requires intervention and doc update
- Added desktop widget plugins
-  - dev guidance available
-  - builtin clock & dgop widgets
-  - new IPC targets
- Initial RTL support/i18n
- Theme registry
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ quickshell -p quickshell/
  inputs.dms.url = "github:AvengeMedia/DankMaterialShell";

  # Use in home-manager or NixOS configuration
-  imports = [ inputs.dms.homeModules.dank-material-shell ];
+  imports = [ inputs.dms.homeModules.dankMaterialShell.default ];
 }
 ```

--- a/assets/dms-open.desktop
+++ b/assets/dms-open.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Name=DMS
+Name=DMS Application Picker
 Comment=Select an application to open links and files
 Exec=dms open %u
 Icon=danklogo
 Terminal=false
 NoDisplay=true
-MimeType=x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/dms;text/html;application/xhtml+xml;
+MimeType=x-scheme-handler/http;x-scheme-handler/https;text/html;application/xhtml+xml;
 Categories=Utility;
--- a/assets/systemd/dms.service
+++ b/assets/systemd/dms.service
@@ -9,7 +9,7 @@ Type=dbus
 BusName=org.freedesktop.Notifications
 ExecStart=/usr/bin/dms run --session
 ExecReload=/usr/bin/pkill -USR1 -x dms
-Restart=on-failure
+Restart=always
 RestartSec=1.23
 TimeoutStopSec=10

--- a/core/README.md
+++ b/core/README.md
@@ -14,63 +14,34 @@ Distribution-aware installer with TUI for deploying DMS and compositor configura

 ## System Integration

-### Wayland Protocols (Client)
+**Wayland Protocols**
+- `wlr-gamma-control-unstable-v1` - Night mode and gamma control
+- `wlr-screencopy-unstable-v1` - Screen capture for color picker
+- `wlr-layer-shell-unstable-v1` - Overlay surfaces for color picker
+- `wp-viewporter` - Fractional scaling support
+- `dwl-ipc-unstable-v2` - dwl/MangoWC workspace integration
+- `ext-workspace-v1` - Workspace protocol support
+- `wlr-output-management-unstable-v1` - Display configuration

-All Wayland protocols are consumed as a client - connecting to the compositor.
+**DBus Interfaces**
+- NetworkManager/iwd - Network management
+- logind - Session control and inhibit locks
+- accountsservice - User account information
+- CUPS - Printer management
+- Custom IPC via unix socket (JSON API)

-| Protocol                                  | Purpose                                                     |
-| ----------------------------------------- | ----------------------------------------------------------- |
-| `wlr-gamma-control-unstable-v1`           | Night mode color temperature control                        |
-| `wlr-screencopy-unstable-v1`              | Screen capture for color picker/screenshot                  |
-| `wlr-layer-shell-unstable-v1`             | Overlay surfaces for color picker UI/screenshot             |
-| `wlr-output-management-unstable-v1`       | Display configuration                                       |
-| `wlr-output-power-management-unstable-v1` | DPMS on/off CLI                                             |
-| `wp-viewporter`                           | Fractional scaling support (color picker/screenshot UIs)    |
-| `keyboard-shortcuts-inhibit-unstable-v1`  | Inhibit compositor shortcuts during color picker/screenshot |
-| `ext-data-control-v1`                     | Clipboard history and persistence                           |
-| `ext-workspace-v1`                        | Workspace integration                                       |
-| `dwl-ipc-unstable-v2`                     | dwl/MangoWC IPC for tags, outputs, etc.                     |
-
-### DBus Interfaces
-
-**Client (consuming external services):**
-
-| Interface                        | Purpose                                       |
-| -------------------------------- | --------------------------------------------- |
-| `org.bluez`                      | Bluetooth management with pairing agent       |
-| `org.freedesktop.NetworkManager` | Network management                            |
-| `net.connman.iwd`                | iwd Wi-Fi backend                             |
-| `org.freedesktop.network1`       | systemd-networkd integration                  |
-| `org.freedesktop.login1`         | Session control, sleep inhibitors, brightness |
-| `org.freedesktop.Accounts`       | User account information                      |
-| `org.freedesktop.portal.Desktop` | Desktop appearance settings (color scheme)    |
-| CUPS via IPP + D-Bus             | Printer management with job notifications     |
-
-**Server (implementing interfaces):**
-
-| Interface                     | Purpose                                |
-| ----------------------------- | -------------------------------------- |
-| `org.freedesktop.ScreenSaver` | Screensaver inhibit for video playback |
-
-Custom IPC via unix socket (JSON API) for shell communication.
-
-### Hardware Control
-
-| Subsystem | Method              | Purpose                            |
-| --------- | ------------------- | ---------------------------------- |
-| DDC/CI    | I2C direct          | External monitor brightness        |
-| Backlight | logind or sysfs     | Internal display brightness        |
-| evdev     | `/dev/input/event*` | Keyboard state (caps lock LED)     |
-| udev      | netlink monitor     | Backlight device updates (for OSD) |
-
-### Plugin System
+**Hardware Control**
+- DDC/CI protocol - External monitor brightness control (like `ddcutil`)
+- Backlight control - Internal display brightness via `login1` or sysfs
+- LED control - Keyboard/device LED management
+- evdev input monitoring - Keyboard state tracking (caps lock, etc.)

+**Plugin System**
 - Plugin registry integration
 - Plugin lifecycle management
 - Settings persistence

 ## CLI Commands
-
 - `dms run [-d]` - Start shell (optionally as daemon)
 - `dms restart` / `dms kill` - Manage running processes
 - `dms ipc <command>` - Send IPC commands (toggle launcher, notifications, etc.)
@@ -99,7 +70,6 @@ The on-screen preview displays the selected format. JSON output includes hex, RG
 Requires Go 1.24+

 **Development build:**
-
 ```bash
 make              # Build dms CLI
 make dankinstall  # Build installer
@@ -107,7 +77,6 @@ make test         # Run tests
 ```

 **Distribution build:**
-
 ```bash
 make dist         # Build without update/greeter features
 ```
@@ -115,7 +84,6 @@ make dist         # Build without update/greeter features
 Produces `bin/dms-linux-amd64` and `bin/dms-linux-arm64`

 **Installation:**
-
 ```bash
 sudo make install  # Install to /usr/local/bin/dms
 ```
@@ -123,7 +91,6 @@ sudo make install  # Install to /usr/local/bin/dms
 ## Development

 **Setup pre-commit hooks:**
-
 ```bash
 git config core.hooksPath .githooks
 ```
@@ -131,7 +98,6 @@ git config core.hooksPath .githooks
 This runs gofmt, golangci-lint, tests, and builds before each commit when `core/` files are staged.

 **Regenerating Wayland Protocol Bindings:**
-
 ```bash
 go install github.com/rajveermalviya/go-wayland/cmd/go-wayland-scanner@latest
 go-wayland-scanner -i internal/proto/xml/wlr-gamma-control-unstable-v1.xml \
@@ -139,7 +105,6 @@ go-wayland-scanner -i internal/proto/xml/wlr-gamma-control-unstable-v1.xml \
 ```

 **Module Structure:**
-
 - `cmd/` - Binary entrypoints (dms, dankinstall)
 - `internal/distros/` - Distribution-specific installation logic
 - `internal/proto/` - Wayland protocol bindings
--- a/core/cmd/dms/commands_brightness.go
+++ b/core/cmd/dms/commands_brightness.go
@@ -179,7 +179,7 @@ func runBrightnessList(cmd *cobra.Command, args []string) {
 	fmt.Printf("%-*s  %-12s  %-*s  %s\n", idPad, "Device", "Class", namePad, "Name", "Brightness")

 	sepLen := idPad + 2 + 12 + 2 + namePad + 2 + 15
-	for range sepLen {
+	for i := 0; i < sepLen; i++ {
 		fmt.Print("─")
 	}
 	fmt.Println()
--- a/core/cmd/dms/commands_clipboard.go
+++ b/core/cmd/dms/commands_clipboard.go
@@ -142,6 +142,10 @@ var (
 	clipConfigNoClearStartup bool
 	clipConfigDisabled       bool
 	clipConfigEnabled        bool
+	clipConfigDisableHistory bool
+	clipConfigEnableHistory  bool
+	clipConfigDisablePersist bool
+	clipConfigEnablePersist  bool
 )

 func init() {
@@ -165,8 +169,12 @@ func init() {
 	clipConfigSetCmd.Flags().IntVar(&clipConfigAutoClearDays, "auto-clear-days", -1, "Auto-clear entries older than N days (0 to disable)")
 	clipConfigSetCmd.Flags().BoolVar(&clipConfigClearAtStartup, "clear-at-startup", false, "Clear history on startup")
 	clipConfigSetCmd.Flags().BoolVar(&clipConfigNoClearStartup, "no-clear-at-startup", false, "Don't clear history on startup")
-	clipConfigSetCmd.Flags().BoolVar(&clipConfigDisabled, "disable", false, "Disable clipboard tracking")
-	clipConfigSetCmd.Flags().BoolVar(&clipConfigEnabled, "enable", false, "Enable clipboard tracking")
+	clipConfigSetCmd.Flags().BoolVar(&clipConfigDisabled, "disable", false, "Disable clipboard manager entirely")
+	clipConfigSetCmd.Flags().BoolVar(&clipConfigEnabled, "enable", false, "Enable clipboard manager")
+	clipConfigSetCmd.Flags().BoolVar(&clipConfigDisableHistory, "disable-history", false, "Disable clipboard history persistence")
+	clipConfigSetCmd.Flags().BoolVar(&clipConfigEnableHistory, "enable-history", false, "Enable clipboard history persistence")
+	clipConfigSetCmd.Flags().BoolVar(&clipConfigDisablePersist, "disable-persist", false, "Disable clipboard ownership persistence")
+	clipConfigSetCmd.Flags().BoolVar(&clipConfigEnablePersist, "enable-persist", false, "Enable clipboard ownership persistence")

 	clipWatchCmd.Flags().BoolVarP(&clipWatchStore, "store", "s", false, "Store clipboard changes to history (no server required)")

@@ -583,6 +591,18 @@ func runClipConfigSet(cmd *cobra.Command, args []string) {
 	if clipConfigEnabled {
 		params["disabled"] = false
 	}
+	if clipConfigDisableHistory {
+		params["disableHistory"] = true
+	}
+	if clipConfigEnableHistory {
+		params["disableHistory"] = false
+	}
+	if clipConfigDisablePersist {
+		params["disablePersist"] = true
+	}
+	if clipConfigEnablePersist {
+		params["disablePersist"] = false
+	}

 	if len(params) == 0 {
 		fmt.Println("No config options specified")
--- a/core/cmd/dms/commands_common.go
+++ b/core/cmd/dms/commands_common.go
@@ -171,6 +171,7 @@ var pluginsUpdateCmd = &cobra.Command{
 }

 func runVersion(cmd *cobra.Command, args []string) {
+	printASCII()
 	fmt.Printf("%s\n", formatVersion(Version))
 }

@@ -219,7 +220,7 @@ func getBaseVersion() string {
 	}

 	// Fallback
-	return "1.0.2"
+	return "0.6.2"
 }

 func startDebugServer() error {
--- a/core/cmd/dms/commands_dank16.go
+++ b/core/cmd/dms/commands_dank16.go
@@ -22,7 +22,6 @@ func init() {
 	dank16Cmd.Flags().Bool("json", false, "Output in JSON format")
 	dank16Cmd.Flags().Bool("kitty", false, "Output in Kitty terminal format")
 	dank16Cmd.Flags().Bool("foot", false, "Output in Foot terminal format")
-	dank16Cmd.Flags().Bool("neovim", false, "Output in Neovim plugin format")
 	dank16Cmd.Flags().Bool("alacritty", false, "Output in Alacritty terminal format")
 	dank16Cmd.Flags().Bool("ghostty", false, "Output in Ghostty terminal format")
 	dank16Cmd.Flags().Bool("wezterm", false, "Output in Wezterm terminal format")
@@ -41,7 +40,6 @@ func runDank16(cmd *cobra.Command, args []string) {
 	isJson, _ := cmd.Flags().GetBool("json")
 	isKitty, _ := cmd.Flags().GetBool("kitty")
 	isFoot, _ := cmd.Flags().GetBool("foot")
-	isNeovim, _ := cmd.Flags().GetBool("neovim")
 	isAlacritty, _ := cmd.Flags().GetBool("alacritty")
 	isGhostty, _ := cmd.Flags().GetBool("ghostty")
 	isWezterm, _ := cmd.Flags().GetBool("wezterm")
@@ -118,8 +116,6 @@ func runDank16(cmd *cobra.Command, args []string) {
 		fmt.Print(dank16.GenerateGhosttyTheme(colors))
 	} else if isWezterm {
 		fmt.Print(dank16.GenerateWeztermTheme(colors))
-	} else if isNeovim {
-		fmt.Print(dank16.GenerateNeovimTheme(colors))
 	} else {
 		fmt.Print(dank16.GenerateGhosttyTheme(colors))
 	}
--- a/core/cmd/dms/commands_features.go
+++ b/core/cmd/dms/commands_features.go
@@ -377,7 +377,7 @@ func updateDMSBinary() error {
 	}

 	version := ""
-	for line := range strings.SplitSeq(string(output), "\n") {
+	for _, line := range strings.Split(string(output), "\n") {
 		if strings.Contains(line, "\"tag_name\"") {
 			parts := strings.Split(line, "\"")
 			if len(parts) >= 4 {
@@ -443,7 +443,7 @@ func updateDMSBinary() error {

 	decompressedPath := filepath.Join(tempDir, "dms")

-	if err := os.Chmod(decompressedPath, 0o755); err != nil {
+	if err := os.Chmod(decompressedPath, 0755); err != nil {
 		return fmt.Errorf("failed to make binary executable: %w", err)
 	}

--- a/core/cmd/dms/commands_greeter.go
+++ b/core/cmd/dms/commands_greeter.go
@@ -211,8 +211,8 @@ func checkGroupExists(groupName string) bool {
 		return false
 	}

-	lines := strings.SplitSeq(string(data), "\n")
-	for line := range lines {
+	lines := strings.Split(string(data), "\n")
+	for _, line := range lines {
 		if strings.HasPrefix(line, groupName+":") {
 			return true
 		}
@@ -521,7 +521,7 @@ func enableGreeter() error {
 	newConfig := strings.Join(finalLines, "\n")

 	tmpFile := "/tmp/greetd-config.toml"
-	if err := os.WriteFile(tmpFile, []byte(newConfig), 0o644); err != nil {
+	if err := os.WriteFile(tmpFile, []byte(newConfig), 0644); err != nil {
 		return fmt.Errorf("failed to write temp config: %w", err)
 	}

@@ -592,8 +592,8 @@ func checkGreeterStatus() error {
 	if data, err := os.ReadFile(configPath); err == nil {
 		configContent := string(data)
 		if strings.Contains(configContent, "dms-greeter") {
-			lines := strings.SplitSeq(configContent, "\n")
-			for line := range lines {
+			lines := strings.Split(configContent, "\n")
+			for _, line := range lines {
 				trimmed := strings.TrimSpace(line)
 				if strings.HasPrefix(trimmed, "command =") || strings.HasPrefix(trimmed, "command=") {
 					parts := strings.SplitN(trimmed, "=", 2)
--- a/core/cmd/dms/commands_matugen.go
+++ b/core/cmd/dms/commands_matugen.go
@@ -74,7 +74,7 @@ func buildMatugenOptions(cmd *cobra.Command) matugen.Options {
 		ConfigDir:           configDir,
 		Kind:                kind,
 		Value:               value,
-		Mode:                matugen.ColorMode(mode),
+		Mode:                mode,
 		IconTheme:           iconTheme,
 		MatugenType:         matugenType,
 		RunUserTemplates:    runUserTemplates,
--- a/core/cmd/dms/commands_open.go
+++ b/core/cmd/dms/commands_open.go
@@ -131,12 +131,6 @@ func runOpen(target string) {
 			detectedRequestType = "url"
 		}
 		log.Infof("Detected HTTP(S) URL")
-	} else if strings.HasPrefix(target, "dms://") {
-		// Handle DMS internal URLs (theme/plugin install, etc.)
-		if detectedRequestType == "" {
-			detectedRequestType = "url"
-		}
-		log.Infof("Detected DMS internal URL")
 	} else if _, err := os.Stat(target); err == nil {
 		// Handle local file paths directly (not file:// URIs)
 		// Convert to absolute path
@@ -183,7 +177,7 @@ func runOpen(target string) {
 	}

 	method := "apppicker.open"
-	if detectedMimeType == "" && len(detectedCategories) == 0 && (strings.HasPrefix(target, "http://") || strings.HasPrefix(target, "https://") || strings.HasPrefix(target, "dms://")) {
+	if detectedMimeType == "" && len(detectedCategories) == 0 && (strings.HasPrefix(target, "http://") || strings.HasPrefix(target, "https://")) {
 		method = "browser.open"
 		params["url"] = target
 	}
--- a/core/cmd/dms/commands_root.go
+++ b/core/cmd/dms/commands_root.go
@@ -50,18 +50,15 @@ func findConfig(cmd *cobra.Command, args []string) error {

 	configStateFile := filepath.Join(getRuntimeDir(), "danklinux.path")
 	if data, readErr := os.ReadFile(configStateFile); readErr == nil {
-		if len(getAllDMSPIDs()) == 0 {
-			os.Remove(configStateFile)
-		} else {
-			statePath := strings.TrimSpace(string(data))
-			shellPath := filepath.Join(statePath, "shell.qml")
+		statePath := strings.TrimSpace(string(data))
+		shellPath := filepath.Join(statePath, "shell.qml")

-			if info, statErr := os.Stat(shellPath); statErr == nil && !info.IsDir() {
-				log.Debug("Using config from active session state file: %s", statePath)
-				configPath = statePath
-				log.Debug("Using config from: %s", configPath)
-				return nil
-			}
+		if info, statErr := os.Stat(shellPath); statErr == nil && !info.IsDir() {
+			log.Debug("Using config from active session state file: %s", statePath)
+			configPath = statePath
+			log.Debug("Using config from: %s", configPath)
+			return nil // <-- Guard statement
+		} else {
 			os.Remove(configStateFile)
 		}
 	}
--- a/core/cmd/dms/dpms_client.go
+++ b/core/cmd/dms/dpms_client.go
@@ -87,14 +87,20 @@ func newDPMSClient() (*dpmsClient, error) {
 		switch e.Interface {
 		case wlr_output_power.ZwlrOutputPowerManagerV1InterfaceName:
 			powerMgr := wlr_output_power.NewZwlrOutputPowerManagerV1(c.ctx)
-			version := min(e.Version, 1)
+			version := e.Version
+			if version > 1 {
+				version = 1
+			}
 			if err := registry.Bind(e.Name, e.Interface, version, powerMgr); err == nil {
 				c.powerMgr = powerMgr
 			}

 		case "wl_output":
 			output := wlclient.NewOutput(c.ctx)
-			version := min(e.Version, 4)
+			version := e.Version
+			if version > 4 {
+				version = 4
+			}
 			if err := registry.Bind(e.Name, e.Interface, version, output); err == nil {
 				outputID := fmt.Sprintf("output-%d", output.ID())
 				state := &outputState{
--- a/core/cmd/dms/shell.go
+++ b/core/cmd/dms/shell.go
@@ -7,10 +7,8 @@ import (
 	"os/exec"
 	"os/signal"
 	"path/filepath"
-	"slices"
 	"strconv"
 	"strings"
-	"sync"
 	"syscall"
 	"time"

@@ -20,25 +18,6 @@ import (

 type ipcTargets map[string]map[string][]string

-// getProcessExitCode returns the exit code from a ProcessState.
-// For normal exits, returns the exit code directly.
-// For signal termination, returns 128 + signal number (Unix convention).
-func getProcessExitCode(state *os.ProcessState) int {
-	if state == nil {
-		return 1
-	}
-	if code := state.ExitCode(); code != -1 {
-		return code
-	}
-	// Process was killed by signal - extract signal number
-	if status, ok := state.Sys().(syscall.WaitStatus); ok {
-		if status.Signaled() {
-			return 128 + int(status.Signal())
-		}
-	}
-	return 1
-}
-
 var isSessionManaged bool

 func execDetachedRestart(targetPID int) {
@@ -186,10 +165,8 @@ func runShellInteractive(session bool) {

 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
 	cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
-	if os.Getenv("QT_LOGGING_RULES") == "" {
-		if qtRules := log.GetQtLoggingRules(); qtRules != "" {
-			cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
-		}
+	if qtRules := log.GetQtLoggingRules(); qtRules != "" {
+		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
 	}

 	if isSessionManaged && hasSystemdRun() {
@@ -203,16 +180,6 @@ func runShellInteractive(session bool) {
 		}
 	}

-	if os.Getenv("QT_QPA_PLATFORMTHEME") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORMTHEME_QT6") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME_QT6=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORM") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland")
-	}
-
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -247,28 +214,14 @@ func runShellInteractive(session bool) {
 	for {
 		select {
 		case sig := <-sigChan:
-			if sig == syscall.SIGUSR1 {
-				if isSessionManaged {
-					log.Infof("Received SIGUSR1, exiting for systemd restart...")
-					cancel()
-					cmd.Process.Signal(syscall.SIGTERM)
-					os.Remove(socketPath)
-					os.Exit(1)
-				}
+			// Handle SIGUSR1 restart for non-session managed processes
+			if sig == syscall.SIGUSR1 && !isSessionManaged {
 				log.Infof("Received SIGUSR1, spawning detached restart process...")
 				execDetachedRestart(os.Getpid())
+				// Exit immediately to avoid race conditions with detached restart
 				return
 			}

-			// Check if qs already crashed before we got SIGTERM (systemd sends SIGTERM when D-Bus name is released)
-			select {
-			case <-errChan:
-				cancel()
-				os.Remove(socketPath)
-				os.Exit(getProcessExitCode(cmd.ProcessState))
-			case <-time.After(500 * time.Millisecond):
-			}
-
 			log.Infof("\nReceived signal %v, shutting down...", sig)
 			cancel()
 			cmd.Process.Signal(syscall.SIGTERM)
@@ -282,7 +235,7 @@ func runShellInteractive(session bool) {
 				cmd.Process.Signal(syscall.SIGTERM)
 			}
 			os.Remove(socketPath)
-			os.Exit(getProcessExitCode(cmd.ProcessState))
+			os.Exit(1)
 		}
 	}
 }
@@ -375,7 +328,13 @@ func killShell() {

 func runShellDaemon(session bool) {
 	isSessionManaged = session
-	isDaemonChild := slices.Contains(os.Args, "--daemon-child")
+	isDaemonChild := false
+	for _, arg := range os.Args {
+		if arg == "--daemon-child" {
+			isDaemonChild = true
+			break
+		}
+	}

 	if !isDaemonChild {
 		fmt.Fprintf(os.Stderr, "dms %s\n", Version)
@@ -426,10 +385,8 @@ func runShellDaemon(session bool) {

 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
 	cmd.Env = append(os.Environ(), "DMS_SOCKET="+socketPath)
-	if os.Getenv("QT_LOGGING_RULES") == "" {
-		if qtRules := log.GetQtLoggingRules(); qtRules != "" {
-			cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
-		}
+	if qtRules := log.GetQtLoggingRules(); qtRules != "" {
+		cmd.Env = append(cmd.Env, "QT_LOGGING_RULES="+qtRules)
 	}

 	if isSessionManaged && hasSystemdRun() {
@@ -443,16 +400,6 @@ func runShellDaemon(session bool) {
 		}
 	}

-	if os.Getenv("QT_QPA_PLATFORMTHEME") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORMTHEME_QT6") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORMTHEME_QT6=gtk3")
-	}
-	if os.Getenv("QT_QPA_PLATFORM") == "" {
-		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland")
-	}
-
 	devNull, err := os.OpenFile("/dev/null", os.O_RDWR, 0)
 	if err != nil {
 		log.Fatalf("Error opening /dev/null: %v", err)
@@ -493,28 +440,15 @@ func runShellDaemon(session bool) {
 	for {
 		select {
 		case sig := <-sigChan:
-			if sig == syscall.SIGUSR1 {
-				if isSessionManaged {
-					log.Infof("Received SIGUSR1, exiting for systemd restart...")
-					cancel()
-					cmd.Process.Signal(syscall.SIGTERM)
-					os.Remove(socketPath)
-					os.Exit(1)
-				}
+			// Handle SIGUSR1 restart for non-session managed processes
+			if sig == syscall.SIGUSR1 && !isSessionManaged {
 				log.Infof("Received SIGUSR1, spawning detached restart process...")
 				execDetachedRestart(os.Getpid())
+				// Exit immediately to avoid race conditions with detached restart
 				return
 			}

-			// Check if qs already crashed before we got SIGTERM (systemd sends SIGTERM when D-Bus name is released)
-			select {
-			case <-errChan:
-				cancel()
-				os.Remove(socketPath)
-				os.Exit(getProcessExitCode(cmd.ProcessState))
-			case <-time.After(500 * time.Millisecond):
-			}
-
+			// All other signals: clean shutdown
 			cancel()
 			cmd.Process.Signal(syscall.SIGTERM)
 			os.Remove(socketPath)
@@ -526,25 +460,17 @@ func runShellDaemon(session bool) {
 				cmd.Process.Signal(syscall.SIGTERM)
 			}
 			os.Remove(socketPath)
-			os.Exit(getProcessExitCode(cmd.ProcessState))
+			os.Exit(1)
 		}
 	}
 }

-var qsHasAnyDisplay = sync.OnceValue(func() bool {
-	out, err := exec.Command("qs", "ipc", "--help").Output()
-	if err != nil {
-		return false
-	}
-	return strings.Contains(string(out), "--any-display")
-})
-
 func parseTargetsFromIPCShowOutput(output string) ipcTargets {
 	targets := make(ipcTargets)
 	var currentTarget string
-	for line := range strings.SplitSeq(output, "\n") {
-		if after, ok := strings.CutPrefix(line, "target "); ok {
-			currentTarget = strings.TrimSpace(after)
+	for _, line := range strings.Split(output, "\n") {
+		if strings.HasPrefix(line, "target ") {
+			currentTarget = strings.TrimSpace(strings.TrimPrefix(line, "target "))
 			targets[currentTarget] = make(map[string][]string)
 		}
 		if strings.HasPrefix(line, "  function") && currentTarget != "" {
@@ -569,11 +495,7 @@ func parseTargetsFromIPCShowOutput(output string) ipcTargets {
 }

 func getShellIPCCompletions(args []string, _ string) []string {
-	cmdArgs := []string{"ipc"}
-	if qsHasAnyDisplay() {
-		cmdArgs = append(cmdArgs, "--any-display")
-	}
-	cmdArgs = append(cmdArgs, "-p", configPath, "show")
+	cmdArgs := []string{"-p", configPath, "ipc", "show"}
 	cmd := exec.Command("qs", cmdArgs...)
 	var targets ipcTargets

@@ -627,12 +549,7 @@ func runShellIPCCommand(args []string) {
 		args = append([]string{"call"}, args...)
 	}

-	cmdArgs := []string{"ipc"}
-	if qsHasAnyDisplay() {
-		cmdArgs = append(cmdArgs, "--any-display")
-	}
-	cmdArgs = append(cmdArgs, "-p", configPath)
-	cmdArgs = append(cmdArgs, args...)
+	cmdArgs := append([]string{"-p", configPath, "ipc"}, args...)
 	cmd := exec.Command("qs", cmdArgs...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
--- a/core/cmd/dms/utils.go
+++ b/core/cmd/dms/utils.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"os/exec"
-	"slices"
 	"strings"
 )

@@ -37,7 +36,13 @@ func checkSystemdServiceEnabled(serviceName string) (string, bool, error) {

 	if err != nil {
 		knownStates := []string{"disabled", "masked", "masked-runtime", "not-found", "enabled", "enabled-runtime", "static", "indirect", "alias"}
-		isKnownState := slices.Contains(knownStates, stateStr)
+		isKnownState := false
+		for _, known := range knownStates {
+			if stateStr == known {
+				isKnownState = true
+				break
+			}
+		}

 		if !isKnownState {
 			return stateStr, false, fmt.Errorf("systemctl is-enabled failed: %w (output: %s)", err, stateStr)
--- a/core/internal/colorpicker/picker.go
+++ b/core/internal/colorpicker/picker.go
@@ -221,7 +221,10 @@ func (p *Picker) handleGlobal(e client.RegistryGlobalEvent) {

 	case client.OutputInterfaceName:
 		output := client.NewOutput(p.ctx)
-		version := min(e.Version, 4)
+		version := e.Version
+		if version > 4 {
+			version = 4
+		}
 		if err := p.registry.Bind(e.Name, e.Interface, version, output); err == nil {
 			p.outputsMu.Lock()
 			p.outputs[e.Name] = &Output{
@@ -236,14 +239,20 @@ func (p *Picker) handleGlobal(e client.RegistryGlobalEvent) {

 	case wlr_layer_shell.ZwlrLayerShellV1InterfaceName:
 		layerShell := wlr_layer_shell.NewZwlrLayerShellV1(p.ctx)
-		version := min(e.Version, 4)
+		version := e.Version
+		if version > 4 {
+			version = 4
+		}
 		if err := p.registry.Bind(e.Name, e.Interface, version, layerShell); err == nil {
 			p.layerShell = layerShell
 		}

 	case wlr_screencopy.ZwlrScreencopyManagerV1InterfaceName:
 		screencopy := wlr_screencopy.NewZwlrScreencopyManagerV1(p.ctx)
-		version := min(e.Version, 3)
+		version := e.Version
+		if version > 3 {
+			version = 3
+		}
 		if err := p.registry.Bind(e.Name, e.Interface, version, screencopy); err == nil {
 			p.screencopy = screencopy
 		}
--- a/core/internal/colorpicker/state.go
+++ b/core/internal/colorpicker/state.go
@@ -1157,7 +1157,7 @@ func drawGlyph(data []byte, stride, width, height, x, y int, r rune, col Color,
 		rOff, bOff = 2, 0
 	}

-	for row := range fontH {
+	for row := 0; row < fontH; row++ {
 		yy := y + row
 		if yy < 0 || yy >= height {
 			continue
@@ -1165,7 +1165,7 @@ func drawGlyph(data []byte, stride, width, height, x, y int, r rune, col Color,
 		rowPattern := g[row]
 		dstRowOff := yy * stride

-		for colIdx := range fontW {
+		for colIdx := 0; colIdx < fontW; colIdx++ {
 			if (rowPattern & (1 << (fontW - 1 - colIdx))) == 0 {
 				continue
 			}
--- a/core/internal/colorpicker/state_test.go
+++ b/core/internal/colorpicker/state_test.go
@@ -14,11 +14,11 @@ func TestSurfaceState_ConcurrentPointerMotion(t *testing.T) {
 	const goroutines = 50
 	const iterations = 100

-	for i := range goroutines {
+	for i := 0; i < goroutines; i++ {
 		wg.Add(1)
 		go func(id int) {
 			defer wg.Done()
-			for j := range iterations {
+			for j := 0; j < iterations; j++ {
 				s.OnPointerMotion(float64(id*10+j), float64(id*10+j))
 			}
 		}(i)
@@ -34,21 +34,21 @@ func TestSurfaceState_ConcurrentScaleAccess(t *testing.T) {
 	const goroutines = 30
 	const iterations = 100

-	for i := range goroutines / 2 {
+	for i := 0; i < goroutines/2; i++ {
 		wg.Add(1)
 		go func(id int) {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				s.SetScale(int32(id%3 + 1))
 			}
 		}(i)
 	}

-	for range goroutines / 2 {
+	for i := 0; i < goroutines/2; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				scale := s.Scale()
 				assert.GreaterOrEqual(t, scale, int32(1))
 			}
@@ -65,21 +65,21 @@ func TestSurfaceState_ConcurrentLogicalSize(t *testing.T) {
 	const goroutines = 20
 	const iterations = 100

-	for i := range goroutines / 2 {
+	for i := 0; i < goroutines/2; i++ {
 		wg.Add(1)
 		go func(id int) {
 			defer wg.Done()
-			for j := range iterations {
+			for j := 0; j < iterations; j++ {
 				_ = s.OnLayerConfigure(1920+id, 1080+j)
 			}
 		}(i)
 	}

-	for range goroutines / 2 {
+	for i := 0; i < goroutines/2; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				w, h := s.LogicalSize()
 				_ = w
 				_ = h
@@ -97,31 +97,31 @@ func TestSurfaceState_ConcurrentIsDone(t *testing.T) {
 	const goroutines = 30
 	const iterations = 100

-	for range goroutines / 3 {
+	for i := 0; i < goroutines/3; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				s.OnPointerButton(0x110, 1)
 			}
 		}()
 	}

-	for range goroutines / 3 {
+	for i := 0; i < goroutines/3; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				s.OnKey(1, 1)
 			}
 		}()
 	}

-	for range goroutines / 3 {
+	for i := 0; i < goroutines/3; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				picked, cancelled := s.IsDone()
 				_ = picked
 				_ = cancelled
@@ -139,11 +139,11 @@ func TestSurfaceState_ConcurrentIsReady(t *testing.T) {
 	const goroutines = 20
 	const iterations = 100

-	for range goroutines {
+	for i := 0; i < goroutines; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				_ = s.IsReady()
 			}
 		}()
@@ -159,11 +159,11 @@ func TestSurfaceState_ConcurrentSwapBuffers(t *testing.T) {
 	const goroutines = 20
 	const iterations = 100

-	for range goroutines {
+	for i := 0; i < goroutines; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for range iterations {
+			for j := 0; j < iterations; j++ {
 				s.SwapBuffers()
 			}
 		}()
--- a/core/internal/config/deployer.go
+++ b/core/internal/config/deployer.go
@@ -213,11 +213,6 @@ func (cd *ConfigDeployer) deployNiriDmsConfigs(dmsDir, terminalCommand string) e

 	for _, cfg := range configs {
 		path := filepath.Join(dmsDir, cfg.name)
-		// Skip if file already exists to preserve user modifications
-		if _, err := os.Stat(path); err == nil {
-			cd.log(fmt.Sprintf("Skipping %s (already exists)", cfg.name))
-			continue
-		}
 		if err := os.WriteFile(path, []byte(cfg.content), 0644); err != nil {
 			return fmt.Errorf("failed to write %s: %w", cfg.name, err)
 		}
@@ -270,13 +265,7 @@ func (cd *ConfigDeployer) deployGhosttyConfig() ([]DeploymentResult, error) {

 	colorResult := DeploymentResult{
 		ConfigType: "Ghostty Colors",
-		Path:       filepath.Join(os.Getenv("HOME"), ".config", "ghostty", "themes", "dankcolors"),
-	}
-
-	themesDir := filepath.Dir(colorResult.Path)
-	if err := os.MkdirAll(themesDir, 0755); err != nil {
-		mainResult.Error = fmt.Errorf("failed to create themes directory: %w", err)
-		return []DeploymentResult{mainResult}, mainResult.Error
+		Path:       filepath.Join(os.Getenv("HOME"), ".config", "ghostty", "config-dankcolors"),
 	}

 	if err := os.WriteFile(colorResult.Path, []byte(GhosttyColorConfig), 0644); err != nil {
--- a/core/internal/config/deployer_test.go
+++ b/core/internal/config/deployer_test.go
@@ -462,13 +462,13 @@ func TestHyprlandConfigStructure(t *testing.T) {
 	assert.Contains(t, HyprlandConfig, "# KEYBINDINGS")
 	assert.Contains(t, HyprlandConfig, "bind = $mod, T, exec, {{TERMINAL_COMMAND}}")
 	assert.Contains(t, HyprlandConfig, "bind = $mod, space, exec, dms ipc call spotlight toggle")
-	assert.Contains(t, HyprlandConfig, "windowrule = border_size 0, match:class ^(com\\.mitchellh\\.ghostty)$")
+	assert.Contains(t, HyprlandConfig, "windowrulev2 = noborder, class:^(com\\.mitchellh\\.ghostty)$")
 }

 func TestGhosttyConfigStructure(t *testing.T) {
 	assert.Contains(t, GhosttyConfig, "window-decoration = false")
 	assert.Contains(t, GhosttyConfig, "background-opacity = 1.0")
-	assert.Contains(t, GhosttyConfig, "theme = dankcolors")
+	assert.Contains(t, GhosttyConfig, "config-file = ./config-dankcolors")
 }

 func TestGhosttyColorConfigStructure(t *testing.T) {
--- a/core/internal/config/dms.go
+++ b/core/internal/config/dms.go
@@ -21,7 +21,7 @@ func LocateDMSConfig() (string, error) {
 		dataDirs = "/usr/local/share:/usr/share"
 	}

-	for dir := range strings.SplitSeq(dataDirs, ":") {
+	for _, dir := range strings.Split(dataDirs, ":") {
 		if dir != "" {
 			primaryPaths = append(primaryPaths, filepath.Join(dir, "quickshell", "dms"))
 		}
@@ -33,7 +33,7 @@ func LocateDMSConfig() (string, error) {
 		configDirs = "/etc/xdg"
 	}

-	for dir := range strings.SplitSeq(configDirs, ":") {
+	for _, dir := range strings.Split(configDirs, ":") {
 		if dir != "" {
 			primaryPaths = append(primaryPaths, filepath.Join(dir, "quickshell", "dms"))
 		}
--- a/core/internal/config/embedded/ghostty.conf
+++ b/core/internal/config/embedded/ghostty.conf
@@ -48,4 +48,4 @@ keybind = shift+enter=text:\n
 gtk-single-instance = true

 # Dank color generation
-theme = dankcolors
+config-file = ./config-dankcolors
--- a/core/internal/config/embedded/hyprland.conf
+++ b/core/internal/config/embedded/hyprland.conf
@@ -90,36 +90,36 @@ misc {
 # ==================
 # WINDOW RULES
 # ==================
-windowrule = tile on, match:class ^(org\.wezfurlong\.wezterm)$
+windowrulev2 = tile, class:^(org\.wezfurlong\.wezterm)$

-windowrule = rounding 12, match:class ^(org\.gnome\.)
-windowrule = border_size 0, match:class ^(org\.gnome\.)
+windowrulev2 = rounding 12, class:^(org\.gnome\.)
+windowrulev2 = noborder, class:^(org\.gnome\.)

-windowrule = tile on, match:class ^(gnome-control-center)$
-windowrule = tile on, match:class ^(pavucontrol)$
-windowrule = tile on, match:class ^(nm-connection-editor)$
+windowrulev2 = tile, class:^(gnome-control-center)$
+windowrulev2 = tile, class:^(pavucontrol)$
+windowrulev2 = tile, class:^(nm-connection-editor)$

-windowrule = float on, match:class ^(gnome-calculator)$
-windowrule = float on, match:class ^(galculator)$
-windowrule = float on, match:class ^(blueman-manager)$
-windowrule = float on, match:class ^(org\.gnome\.Nautilus)$
-windowrule = float on, match:class ^(steam)$
-windowrule = float on, match:class ^(xdg-desktop-portal)$
+windowrulev2 = float, class:^(gnome-calculator)$
+windowrulev2 = float, class:^(galculator)$
+windowrulev2 = float, class:^(blueman-manager)$
+windowrulev2 = float, class:^(org\.gnome\.Nautilus)$
+windowrulev2 = float, class:^(steam)$
+windowrulev2 = float, class:^(xdg-desktop-portal)$

-windowrule = border_size 0, match:class ^(org\.wezfurlong\.wezterm)$
-windowrule = border_size 0, match:class ^(Alacritty)$
-windowrule = border_size 0, match:class ^(zen)$
-windowrule = border_size 0, match:class ^(com\.mitchellh\.ghostty)$
-windowrule = border_size 0, match:class ^(kitty)$
+windowrulev2 = noborder, class:^(org\.wezfurlong\.wezterm)$
+windowrulev2 = noborder, class:^(Alacritty)$
+windowrulev2 = noborder, class:^(zen)$
+windowrulev2 = noborder, class:^(com\.mitchellh\.ghostty)$
+windowrulev2 = noborder, class:^(kitty)$

-windowrule = float on, match:class ^(firefox)$, match:title ^(Picture-in-Picture)$
-windowrule = float on, match:class ^(zoom)$
+windowrulev2 = float, class:^(firefox)$, title:^(Picture-in-Picture)$
+windowrulev2 = float, class:^(zoom)$

 # DMS windows floating by default
-windowrule = float on, match:class ^(org.quickshell)$
-windowrule = opacity 0.9 0.9, match:float false, match:focus false
+windowrulev2 = float, class:^(org.quickshell)$
+windowrulev2 = opacity 0.9 0.9, floating:0, focus:0

-layerrule = no_anim on, match:namespace ^(quickshell)$
+layerrule = noanim, ^(quickshell)$

 # ==================
 # KEYBINDINGS
@@ -150,10 +150,6 @@ bindel = , XF86AudioRaiseVolume, exec, dms ipc call audio increment 3
 bindel = , XF86AudioLowerVolume, exec, dms ipc call audio decrement 3
 bindl = , XF86AudioMute, exec, dms ipc call audio mute
 bindl = , XF86AudioMicMute, exec, dms ipc call audio micmute
-bindl = , XF86AudioPause, exec, dms ipc call mpris playPause
-bindl = , XF86AudioPlay, exec, dms ipc call mpris playPause
-bindl = , XF86AudioPrev, exec, dms ipc call mpris previous
-bindl = , XF86AudioNext, exec, dms ipc call mpris next

 # === Brightness Controls ===
 bindel = , XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 ""
--- a/core/internal/config/embedded/niri-binds.kdl
+++ b/core/internal/config/embedded/niri-binds.kdl
@@ -51,18 +51,6 @@ binds {
    XF86AudioMicMute allow-when-locked=true {
        spawn "dms" "ipc" "call" "audio" "micmute";
    }
-		XF86AudioPause allow-when-locked=true {
-		    spawn "dms" "ipc" "call" "mpris" "playPause";
-		}
-		XF86AudioPlay allow-when-locked=true {
-		    spawn "dms" "ipc" "call" "mpris" "playPause";
-		}
-		XF86AudioPrev allow-when-locked=true {
-		    spawn "dms" "ipc" "call" "mpris" "previous";
-		}
-		XF86AudioNext allow-when-locked=true {
-		    spawn "dms" "ipc" "call" "mpris" "next";
-		}

    // === Brightness Controls ===
    XF86MonBrightnessUp allow-when-locked=true {
--- a/core/internal/dank16/dank16.go
+++ b/core/internal/dank16/dank16.go
@@ -345,7 +345,7 @@ func EnsureContrastDPSLstar(hexColor, hexBg string, minLc float64, isLightMode b
 	}

 	step := 0.5
-	for range 120 {
+	for i := 0; i < 120; i++ {
 		Lf = math.Max(0, math.Min(100, Lf+dir*step))
 		cand := labToHex(Lf, af, bf)
 		if DeltaPhiStarContrast(cand, hexBg, isLightMode) >= minLc {
--- a/core/internal/dank16/dank16_test.go
+++ b/core/internal/dank16/dank16_test.go
@@ -658,7 +658,7 @@ func TestContrastAlgorithmComparison(t *testing.T) {
 	}

 	differentCount := 0
-	for i := range 16 {
+	for i := 0; i < 16; i++ {
 		if wcagColors[i].Hex != dpsColors[i].Hex {
 			differentCount++
 		}
--- a/core/internal/dank16/terminals.go
+++ b/core/internal/dank16/terminals.go
@@ -112,24 +112,3 @@ func GenerateWeztermTheme(p Palette) string {
 		p.Color12.Hex, p.Color13.Hex, p.Color14.Hex, p.Color15.Hex)
 	return result.String()
 }
-
-func GenerateNeovimTheme(p Palette) string {
-	var result strings.Builder
-	fmt.Fprintf(&result, "vim.g.terminal_color_0 = \"%s\"\n", p.Color0.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_1 = \"%s\"\n", p.Color1.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_2 = \"%s\"\n", p.Color2.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_3 = \"%s\"\n", p.Color3.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_4 = \"%s\"\n", p.Color4.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_5 = \"%s\"\n", p.Color5.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_6 = \"%s\"\n", p.Color6.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_7 = \"%s\"\n", p.Color7.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_8 = \"%s\"\n", p.Color8.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_9 = \"%s\"\n", p.Color9.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_10 = \"%s\"\n", p.Color10.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_11 = \"%s\"\n", p.Color11.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_12 = \"%s\"\n", p.Color12.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_13 = \"%s\"\n", p.Color13.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_14 = \"%s\"\n", p.Color14.Hex)
-	fmt.Fprintf(&result, "vim.g.terminal_color_15 = \"%s\"\n", p.Color15.Hex)
-	return result.String()
-}
--- a/core/internal/distros/arch.go
+++ b/core/internal/distros/arch.go
@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"slices"
 	"strings"

 	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
@@ -515,9 +514,12 @@ func (a *ArchDistribution) reorderAURPackages(packages []string) []string {
 			dmsShell = append(dmsShell, pkg)
 		} else {
 			isDep := false
-			if slices.Contains(dmsDepencies, pkg) {
-				deps = append(deps, pkg)
-				isDep = true
+			for _, dep := range dmsDepencies {
+				if pkg == dep {
+					deps = append(deps, pkg)
+					isDep = true
+					break
+				}
 			}
 			if !isDep {
 				others = append(others, pkg)
@@ -543,7 +545,7 @@ func (a *ArchDistribution) installSingleAURPackage(ctx context.Context, pkg, sud
 		a.log(fmt.Sprintf("Warning: failed to clean existing cache for %s: %v", pkg, err))
 	}

-	if err := os.MkdirAll(buildDir, 0o755); err != nil {
+	if err := os.MkdirAll(buildDir, 0755); err != nil {
 		return fmt.Errorf("failed to create build directory: %w", err)
 	}
 	defer func() {
--- a/core/internal/distros/base.go
+++ b/core/internal/distros/base.go
@@ -550,7 +550,10 @@ func (b *BaseDistribution) WriteEnvironmentConfig(terminal deps.Terminal) error
 		terminalCmd = "ghostty"
 	}

-	content := fmt.Sprintf(`ELECTRON_OZONE_PLATFORM_HINT=auto
+	content := fmt.Sprintf(`QT_QPA_PLATFORM=wayland
+ELECTRON_OZONE_PLATFORM_HINT=auto
+QT_QPA_PLATFORMTHEME=gtk3
+QT_QPA_PLATFORMTHEME_QT6=gtk3
 TERMINAL=%s
 `, terminalCmd)

@@ -564,6 +567,12 @@ TERMINAL=%s
 }

 func (b *BaseDistribution) EnableDMSService(ctx context.Context, wm deps.WindowManager) error {
+	cmd := exec.CommandContext(ctx, "systemctl", "--user", "enable", "--now", "dms")
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("failed to enable dms service: %w", err)
+	}
+	b.log("Enabled dms systemd user service")
+
 	switch wm {
 	case deps.WindowManagerNiri:
 		if err := exec.CommandContext(ctx, "systemctl", "--user", "add-wants", "niri.service", "dms").Run(); err != nil {
--- a/core/internal/distros/debian.go
+++ b/core/internal/distros/debian.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os/exec"
-	"runtime"
 	"strings"

 	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
@@ -385,8 +384,6 @@ func (d *DebianDistribution) enableOBSRepos(ctx context.Context, obsPkgs []Packa
 	debianVersion := "Debian_13"
 	if osInfo.VersionID == "testing" {
 		debianVersion = "Debian_Testing"
-	} else if osInfo.VersionCodename == "sid" || osInfo.VersionID == "sid" || strings.Contains(strings.ToLower(osInfo.PrettyName), "sid") || strings.Contains(strings.ToLower(osInfo.PrettyName), "unstable") {
-		debianVersion = "Debian_Unstable"
 	}

 	for _, pkg := range obsPkgs {
@@ -430,7 +427,7 @@ func (d *DebianDistribution) enableOBSRepos(ctx context.Context, obsPkgs []Packa
 			}

 			// Add repository
-			repoLine := fmt.Sprintf("deb [signed-by=%s, arch=%s] %s/ /", keyringPath, runtime.GOARCH, baseURL)
+			repoLine := fmt.Sprintf("deb [signed-by=%s] %s/ /", keyringPath, baseURL)

 			progressChan <- InstallProgressMsg{
 				Phase:       PhaseSystemPackages,
--- a/core/internal/distros/manual_packages.go
+++ b/core/internal/distros/manual_packages.go
@@ -18,8 +18,8 @@ type ManualPackageInstaller struct {

 // parseLatestTagFromGitOutput parses git ls-remote output and returns the latest tag
 func (m *ManualPackageInstaller) parseLatestTagFromGitOutput(output string) string {
-	lines := strings.SplitSeq(output, "\n")
-	for line := range lines {
+	lines := strings.Split(output, "\n")
+	for _, line := range lines {
 		if strings.Contains(line, "refs/tags/") && !strings.Contains(line, "^{}") {
 			parts := strings.Split(line, "refs/tags/")
 			if len(parts) > 1 {
@@ -103,12 +103,12 @@ func (m *ManualPackageInstaller) installDgop(ctx context.Context, sudoPassword s
 	}

 	cacheDir := filepath.Join(homeDir, ".cache", "dankinstall")
-	if err := os.MkdirAll(cacheDir, 0o755); err != nil {
+	if err := os.MkdirAll(cacheDir, 0755); err != nil {
 		return fmt.Errorf("failed to create cache directory: %w", err)
 	}

 	tmpDir := filepath.Join(cacheDir, "dgop-build")
-	if err := os.MkdirAll(tmpDir, 0o755); err != nil {
+	if err := os.MkdirAll(tmpDir, 0755); err != nil {
 		return fmt.Errorf("failed to create temp directory: %w", err)
 	}
 	defer os.RemoveAll(tmpDir)
@@ -160,10 +160,10 @@ func (m *ManualPackageInstaller) installNiri(ctx context.Context, sudoPassword s
 	homeDir, _ := os.UserHomeDir()
 	buildDir := filepath.Join(homeDir, ".cache", "dankinstall", "niri-build")
 	tmpDir := filepath.Join(homeDir, ".cache", "dankinstall", "tmp")
-	if err := os.MkdirAll(buildDir, 0o755); err != nil {
+	if err := os.MkdirAll(buildDir, 0755); err != nil {
 		return fmt.Errorf("failed to create build directory: %w", err)
 	}
-	if err := os.MkdirAll(tmpDir, 0o755); err != nil {
+	if err := os.MkdirAll(tmpDir, 0755); err != nil {
 		return fmt.Errorf("failed to create temp directory: %w", err)
 	}
 	defer func() {
@@ -237,12 +237,12 @@ func (m *ManualPackageInstaller) installQuickshell(ctx context.Context, variant
 	}

 	cacheDir := filepath.Join(homeDir, ".cache", "dankinstall")
-	if err := os.MkdirAll(cacheDir, 0o755); err != nil {
+	if err := os.MkdirAll(cacheDir, 0755); err != nil {
 		return fmt.Errorf("failed to create cache directory: %w", err)
 	}

 	tmpDir := filepath.Join(cacheDir, "quickshell-build")
-	if err := os.MkdirAll(tmpDir, 0o755); err != nil {
+	if err := os.MkdirAll(tmpDir, 0755); err != nil {
 		return fmt.Errorf("failed to create temp directory: %w", err)
 	}
 	defer os.RemoveAll(tmpDir)
@@ -273,7 +273,7 @@ func (m *ManualPackageInstaller) installQuickshell(ctx context.Context, variant
 	}

 	buildDir := tmpDir + "/build"
-	if err := os.MkdirAll(buildDir, 0o755); err != nil {
+	if err := os.MkdirAll(buildDir, 0755); err != nil {
 		return fmt.Errorf("failed to create build directory: %w", err)
 	}

@@ -343,12 +343,12 @@ func (m *ManualPackageInstaller) installHyprland(ctx context.Context, sudoPasswo
 	}

 	cacheDir := filepath.Join(homeDir, ".cache", "dankinstall")
-	if err := os.MkdirAll(cacheDir, 0o755); err != nil {
+	if err := os.MkdirAll(cacheDir, 0755); err != nil {
 		return fmt.Errorf("failed to create cache directory: %w", err)
 	}

 	tmpDir := filepath.Join(cacheDir, "hyprland-build")
-	if err := os.MkdirAll(tmpDir, 0o755); err != nil {
+	if err := os.MkdirAll(tmpDir, 0755); err != nil {
 		return fmt.Errorf("failed to create temp directory: %w", err)
 	}
 	defer os.RemoveAll(tmpDir)
@@ -406,12 +406,12 @@ func (m *ManualPackageInstaller) installGhostty(ctx context.Context, sudoPasswor
 	}

 	cacheDir := filepath.Join(homeDir, ".cache", "dankinstall")
-	if err := os.MkdirAll(cacheDir, 0o755); err != nil {
+	if err := os.MkdirAll(cacheDir, 0755); err != nil {
 		return fmt.Errorf("failed to create cache directory: %w", err)
 	}

 	tmpDir := filepath.Join(cacheDir, "ghostty-build")
-	if err := os.MkdirAll(tmpDir, 0o755); err != nil {
+	if err := os.MkdirAll(tmpDir, 0755); err != nil {
 		return fmt.Errorf("failed to create temp directory: %w", err)
 	}
 	defer os.RemoveAll(tmpDir)
@@ -528,7 +528,7 @@ func (m *ManualPackageInstaller) installDankMaterialShell(ctx context.Context, v
 		}

 		configDir := filepath.Dir(dmsPath)
-		if err := os.MkdirAll(configDir, 0o755); err != nil {
+		if err := os.MkdirAll(configDir, 0755); err != nil {
 			return fmt.Errorf("failed to create quickshell config directory: %w", err)
 		}

--- a/core/internal/distros/opensuse.go
+++ b/core/internal/distros/opensuse.go
@@ -15,12 +15,6 @@ func init() {
 	Register("opensuse-tumbleweed", "#73BA25", FamilySUSE, func(config DistroConfig, logChan chan<- string) Distribution {
 		return NewOpenSUSEDistribution(config, logChan)
 	})
-	Register("opensuse-leap", "#73BA25", FamilySUSE, func(config DistroConfig, logChan chan<- string) Distribution {
-		return NewOpenSUSEDistribution(config, logChan)
-	})
-	Register("opensuse-slowroll", "#73BA25", FamilySUSE, func(config DistroConfig, logChan chan<- string) Distribution {
-		return NewOpenSUSEDistribution(config, logChan)
-	})
 }

 type OpenSUSEDistribution struct {
@@ -440,19 +434,6 @@ func (o *OpenSUSEDistribution) extractPackageNames(packages []PackageMapping) []
 func (o *OpenSUSEDistribution) enableOBSRepos(ctx context.Context, obsPkgs []PackageMapping, sudoPassword string, progressChan chan<- InstallProgressMsg) error {
 	enabledRepos := make(map[string]bool)

-	osInfo, err := GetOSInfo()
-	if err != nil {
-		return fmt.Errorf("failed to get OS info: %w", err)
-	}
-
-	obsDistroVersion := "openSUSE_Tumbleweed"
-	switch osInfo.Distribution.ID {
-	case "opensuse-leap":
-		obsDistroVersion = fmt.Sprintf("openSUSE_Leap_%s", osInfo.VersionID)
-	case "opensuse-slowroll":
-		obsDistroVersion = "openSUSE_Slowroll"
-	}
-
 	for _, pkg := range obsPkgs {
 		if pkg.RepoURL != "" && !enabledRepos[pkg.RepoURL] {
 			o.log(fmt.Sprintf("Enabling OBS repository: %s", pkg.RepoURL))
@@ -460,8 +441,8 @@ func (o *OpenSUSEDistribution) enableOBSRepos(ctx context.Context, obsPkgs []Pac
 			// RepoURL format: "home:AvengeMedia:danklinux"
 			repoPath := strings.ReplaceAll(pkg.RepoURL, ":", ":/")
 			repoName := strings.ReplaceAll(pkg.RepoURL, ":", "-")
-			repoURL := fmt.Sprintf("https://download.opensuse.org/repositories/%s/%s/%s.repo",
-				repoPath, obsDistroVersion, pkg.RepoURL)
+			repoURL := fmt.Sprintf("https://download.opensuse.org/repositories/%s/openSUSE_Tumbleweed/%s.repo",
+				repoPath, pkg.RepoURL)

 			checkCmd := exec.CommandContext(ctx, "zypper", "repos", repoName)
 			if checkCmd.Run() == nil {
--- a/core/internal/distros/osinfo.go
+++ b/core/internal/distros/osinfo.go
@@ -19,12 +19,11 @@ type DistroInfo struct {

 // OSInfo contains complete OS information
 type OSInfo struct {
-	Distribution    DistroInfo
-	Version         string
-	VersionID       string
-	VersionCodename string
-	PrettyName      string
-	Architecture    string
+	Distribution DistroInfo
+	Version      string
+	VersionID    string
+	PrettyName   string
+	Architecture string
 }

 // GetOSInfo detects the current OS and returns information about it
@@ -73,8 +72,6 @@ func GetOSInfo() (*OSInfo, error) {
 			info.VersionID = value
 		case "VERSION":
 			info.Version = value
-		case "VERSION_CODENAME":
-			info.VersionCodename = value
 		case "PRETTY_NAME":
 			info.PrettyName = value
 		}
@@ -103,10 +100,6 @@ func IsUnsupportedDistro(distroID, versionID string) bool {
 	}

 	if distroID == "debian" {
-		// unstable/sid support
-		if versionID == "sid" {
-			return false
-		}
 		if versionID == "" {
 			// debian testing/sid have no version ID
 			return false
--- a/core/internal/keybinds/discovery.go
+++ b/core/internal/keybinds/discovery.go
@@ -23,7 +23,7 @@ func DefaultDiscoveryConfig() *DiscoveryConfig {

 	configDirs := os.Getenv("XDG_CONFIG_DIRS")
 	if configDirs != "" {
-		for dir := range strings.SplitSeq(configDirs, ":") {
+		for _, dir := range strings.Split(configDirs, ":") {
 			if dir != "" {
 				searchPaths = append(searchPaths, filepath.Join(dir, "DankMaterialShell", "cheatsheets"))
 			}
--- a/core/internal/keybinds/providers/jsonfile_test.go
+++ b/core/internal/keybinds/providers/jsonfile_test.go
@@ -12,7 +12,7 @@ func TestNewJSONFileProvider(t *testing.T) {
 	tmpDir := t.TempDir()
 	testFile := filepath.Join(tmpDir, "test.json")

-	if err := os.WriteFile(testFile, []byte("{}"), 0o644); err != nil {
+	if err := os.WriteFile(testFile, []byte("{}"), 0644); err != nil {
 		t.Fatalf("Failed to create test file: %v", err)
 	}

@@ -81,7 +81,7 @@ func TestJSONFileProviderGetCheatSheet(t *testing.T) {
  }
 }`

-	if err := os.WriteFile(testFile, []byte(content), 0o644); err != nil {
+	if err := os.WriteFile(testFile, []byte(content), 0644); err != nil {
 		t.Fatalf("Failed to write test file: %v", err)
 	}

@@ -135,7 +135,7 @@ func TestJSONFileProviderGetCheatSheetNoProvider(t *testing.T) {
  "binds": {}
 }`

-	if err := os.WriteFile(testFile, []byte(content), 0o644); err != nil {
+	if err := os.WriteFile(testFile, []byte(content), 0644); err != nil {
 		t.Fatalf("Failed to write test file: %v", err)
 	}

@@ -181,7 +181,7 @@ func TestJSONFileProviderFlatArrayBackwardsCompat(t *testing.T) {
  ]
 }`

-	if err := os.WriteFile(testFile, []byte(content), 0o644); err != nil {
+	if err := os.WriteFile(testFile, []byte(content), 0644); err != nil {
 		t.Fatalf("Failed to write test file: %v", err)
 	}

@@ -216,7 +216,7 @@ func TestJSONFileProviderInvalidJSON(t *testing.T) {
 	tmpDir := t.TempDir()
 	testFile := filepath.Join(tmpDir, "invalid.json")

-	if err := os.WriteFile(testFile, []byte("not valid json"), 0o644); err != nil {
+	if err := os.WriteFile(testFile, []byte("not valid json"), 0644); err != nil {
 		t.Fatalf("Failed to write test file: %v", err)
 	}

--- a/core/internal/matugen/matugen.go
+++ b/core/internal/matugen/matugen.go
@@ -16,22 +16,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 )

-type ColorMode string
-
-const (
-	ColorModeDark  ColorMode = "dark"
-	ColorModeLight ColorMode = "light"
-)
-
-func (c *ColorMode) GTKTheme() string {
-	switch *c {
-	case ColorModeDark:
-		return "adw-gtk3-dark"
-	default:
-		return "adw-gtk3"
-	}
-}
-
 var (
 	matugenVersionOnce sync.Once
 	matugenSupportsCOE bool
@@ -43,7 +27,7 @@ type Options struct {
 	ConfigDir           string
 	Kind                string
 	Value               string
-	Mode                ColorMode
+	Mode                string
 	IconTheme           string
 	MatugenType         string
 	RunUserTemplates    bool
@@ -93,7 +77,7 @@ func Run(opts Options) error {
 		return fmt.Errorf("value is required")
 	}
 	if opts.Mode == "" {
-		opts.Mode = ColorModeDark
+		opts.Mode = "dark"
 	}
 	if opts.MatugenType == "" {
 		opts.MatugenType = "scheme-tonal-spot"
@@ -161,7 +145,7 @@ func buildOnce(opts *Options) error {
 		importArgs = []string{"--import-json-string", importData}

 		log.Info("Running matugen color hex with stock color overrides")
-		args := []string{"color", "hex", primaryDark, "-m", string(opts.Mode), "-t", opts.MatugenType, "-c", cfgFile.Name()}
+		args := []string{"color", "hex", primaryDark, "-m", opts.Mode, "-t", opts.MatugenType, "-c", cfgFile.Name()}
 		args = append(args, importArgs...)
 		if err := runMatugen(args); err != nil {
 			return err
@@ -197,7 +181,7 @@ func buildOnce(opts *Options) error {
 		default:
 			args = []string{opts.Kind, opts.Value}
 		}
-		args = append(args, "-m", string(opts.Mode), "-t", opts.MatugenType, "-c", cfgFile.Name())
+		args = append(args, "-m", opts.Mode, "-t", opts.MatugenType, "-c", cfgFile.Name())
 		args = append(args, importArgs...)
 		if err := runMatugen(args); err != nil {
 			return err
@@ -250,61 +234,53 @@ output_path = '%s'
 	if !opts.ShouldSkipTemplate("gtk") {
 		switch opts.Mode {
 		case "light":
-			appendConfig(opts, cfgFile, nil, "gtk3-light.toml")
+			appendConfig(opts, cfgFile, "skip", "gtk3-light.toml")
 		default:
-			appendConfig(opts, cfgFile, nil, "gtk3-dark.toml")
+			appendConfig(opts, cfgFile, "skip", "gtk3-dark.toml")
 		}
 	}

 	if !opts.ShouldSkipTemplate("niri") {
-		appendConfig(opts, cfgFile, []string{"niri"}, "niri.toml")
+		appendConfig(opts, cfgFile, "niri", "niri.toml")
 	}
 	if !opts.ShouldSkipTemplate("qt5ct") {
-		appendConfig(opts, cfgFile, []string{"qt5ct"}, "qt5ct.toml")
+		appendConfig(opts, cfgFile, "qt5ct", "qt5ct.toml")
 	}
 	if !opts.ShouldSkipTemplate("qt6ct") {
-		appendConfig(opts, cfgFile, []string{"qt6ct"}, "qt6ct.toml")
+		appendConfig(opts, cfgFile, "qt6ct", "qt6ct.toml")
 	}
 	if !opts.ShouldSkipTemplate("firefox") {
-		appendConfig(opts, cfgFile, []string{"firefox"}, "firefox.toml")
+		appendConfig(opts, cfgFile, "firefox", "firefox.toml")
 	}
 	if !opts.ShouldSkipTemplate("pywalfox") {
-		appendConfig(opts, cfgFile, []string{"pywalfox"}, "pywalfox.toml")
-	}
-	if !opts.ShouldSkipTemplate("zenbrowser") {
-		appendConfig(opts, cfgFile, []string{"zen", "zen-browser"}, "zenbrowser.toml")
+		appendConfig(opts, cfgFile, "pywalfox", "pywalfox.toml")
 	}
 	if !opts.ShouldSkipTemplate("vesktop") {
-		appendConfig(opts, cfgFile, []string{"vesktop"}, "vesktop.toml")
-	}
-	if !opts.ShouldSkipTemplate("equibop") {
-		appendConfig(opts, cfgFile, []string{"equibop"}, "equibop.toml")
+		appendConfig(opts, cfgFile, "vesktop", "vesktop.toml")
 	}
+
 	if !opts.ShouldSkipTemplate("ghostty") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"ghostty"}, "ghostty.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, "ghostty", "ghostty.toml")
 	}
 	if !opts.ShouldSkipTemplate("kitty") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"kitty"}, "kitty.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, "kitty", "kitty.toml")
 	}
 	if !opts.ShouldSkipTemplate("foot") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"foot"}, "foot.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, "foot", "foot.toml")
 	}
 	if !opts.ShouldSkipTemplate("alacritty") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"alacritty"}, "alacritty.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, "alacritty", "alacritty.toml")
 	}
 	if !opts.ShouldSkipTemplate("wezterm") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"wezterm"}, "wezterm.toml")
-	}
-	if !opts.ShouldSkipTemplate("nvim") {
-		appendTerminalConfig(opts, cfgFile, tmpDir, []string{"nvim"}, "neovim.toml")
+		appendTerminalConfig(opts, cfgFile, tmpDir, "wezterm", "wezterm.toml")
 	}

 	if !opts.ShouldSkipTemplate("dgop") {
-		appendConfig(opts, cfgFile, []string{"dgop"}, "dgop.toml")
+		appendConfig(opts, cfgFile, "dgop", "dgop.toml")
 	}

 	if !opts.ShouldSkipTemplate("kcolorscheme") {
-		appendConfig(opts, cfgFile, nil, "kcolorscheme.toml")
+		appendConfig(opts, cfgFile, "skip", "kcolorscheme.toml")
 	}

 	if !opts.ShouldSkipTemplate("vscode") {
@@ -342,12 +318,12 @@ output_path = '%s'
 	return nil
 }

-func appendConfig(opts *Options, cfgFile *os.File, checkCmd []string, fileName string) {
+func appendConfig(opts *Options, cfgFile *os.File, checkCmd, fileName string) {
 	configPath := filepath.Join(opts.ShellDir, "matugen", "configs", fileName)
 	if _, err := os.Stat(configPath); err != nil {
 		return
 	}
-	if len(checkCmd) > 0 && !utils.AnyCommandExists(checkCmd...) {
+	if checkCmd != "skip" && !utils.CommandExists(checkCmd) {
 		return
 	}
 	data, err := os.ReadFile(configPath)
@@ -358,12 +334,12 @@ func appendConfig(opts *Options, cfgFile *os.File, checkCmd []string, fileName s
 	cfgFile.WriteString("\n")
 }

-func appendTerminalConfig(opts *Options, cfgFile *os.File, tmpDir string, checkCmd []string, fileName string) {
+func appendTerminalConfig(opts *Options, cfgFile *os.File, tmpDir, checkCmd, fileName string) {
 	configPath := filepath.Join(opts.ShellDir, "matugen", "configs", fileName)
 	if _, err := os.Stat(configPath); err != nil {
 		return
 	}
-	if len(checkCmd) > 0 && !utils.AnyCommandExists(checkCmd...) {
+	if checkCmd != "skip" && !utils.CommandExists(checkCmd) {
 		return
 	}
 	data, err := os.ReadFile(configPath)
@@ -572,19 +548,19 @@ func extractNestedColor(jsonStr, colorName, variant string) string {
 	return color
 }

-func generateDank16Variants(primaryDark, primaryLight, surface string, mode ColorMode) string {
+func generateDank16Variants(primaryDark, primaryLight, surface, mode string) string {
 	variantOpts := dank16.VariantOptions{
 		PrimaryDark:  primaryDark,
 		PrimaryLight: primaryLight,
 		Background:   surface,
 		UseDPS:       true,
-		IsLightMode:  mode == ColorModeLight,
+		IsLightMode:  mode == "light",
 	}
 	variantColors := dank16.GenerateVariantPalette(variantOpts)
 	return dank16.GenerateVariantJSON(variantColors)
 }

-func refreshGTK(configDir string, mode ColorMode) {
+func refreshGTK(configDir, mode string) {
 	gtkCSS := filepath.Join(configDir, "gtk-3.0", "gtk.css")

 	info, err := os.Lstat(gtkCSS)
@@ -610,7 +586,7 @@ func refreshGTK(configDir string, mode ColorMode) {
 	}

 	exec.Command("gsettings", "set", "org.gnome.desktop.interface", "gtk-theme", "").Run()
-	exec.Command("gsettings", "set", "org.gnome.desktop.interface", "gtk-theme", mode.GTKTheme()).Run()
+	exec.Command("gsettings", "set", "org.gnome.desktop.interface", "gtk-theme", "adw-gtk3-"+mode).Run()
 }

 func signalTerminals() {
@@ -640,9 +616,9 @@ func signalByName(name string, sig syscall.Signal) {
 	}
 }

-func syncColorScheme(mode ColorMode) {
+func syncColorScheme(mode string) {
 	scheme := "prefer-dark"
-	if mode == ColorModeLight {
+	if mode == "light" {
 		scheme = "default"
 	}

--- a/core/internal/screenshot/region_input.go
+++ b/core/internal/screenshot/region_input.go
@@ -141,7 +141,7 @@ func (r *RegionSelector) setupKeyboardHandlers() {
 			for _, os := range r.surfaces {
 				r.redrawSurface(os)
 			}
-		case 28, 57, 96:
+		case 28, 57:
 			if r.selection.hasSelection {
 				r.finishSelection()
 			}
--- a/core/internal/server/apppicker/handlers.go
+++ b/core/internal/server/apppicker/handlers.go
@@ -19,9 +19,9 @@ func HandleRequest(conn net.Conn, req models.Request, manager *Manager) {
 func handleOpen(conn net.Conn, req models.Request, manager *Manager) {
 	log.Infof("AppPicker: Received %s request with params: %+v", req.Method, req.Params)

-	target, ok := models.Get[string](req, "target")
+	target, ok := req.Params["target"].(string)
 	if !ok {
-		target, ok = models.Get[string](req, "url")
+		target, ok = req.Params["url"].(string)
 		if !ok {
 			log.Warnf("AppPicker: Invalid target parameter in request")
 			models.RespondError(conn, req.ID, "invalid target parameter")
@@ -31,11 +31,14 @@ func handleOpen(conn net.Conn, req models.Request, manager *Manager) {

 	event := OpenEvent{
 		Target:      target,
-		RequestType: models.GetOr(req, "requestType", "url"),
-		MimeType:    models.GetOr(req, "mimeType", ""),
+		RequestType: "url",
 	}

-	if categories, ok := models.Get[[]any](req, "categories"); ok {
+	if mimeType, ok := req.Params["mimeType"].(string); ok {
+		event.MimeType = mimeType
+	}
+
+	if categories, ok := req.Params["categories"].([]any); ok {
 		event.Categories = make([]string, 0, len(categories))
 		for _, cat := range categories {
 			if catStr, ok := cat.(string); ok {
@@ -44,6 +47,10 @@ func handleOpen(conn net.Conn, req models.Request, manager *Manager) {
 		}
 	}

+	if requestType, ok := req.Params["requestType"].(string); ok {
+		event.RequestType = requestType
+	}
+
 	log.Infof("AppPicker: Broadcasting event: %+v", event)
 	manager.RequestOpen(event)
 	models.Respond(conn, req.ID, "ok")
--- a/core/internal/server/browser/handlers.go
+++ b/core/internal/server/browser/handlers.go
@@ -9,7 +9,7 @@ import (
 func HandleRequest(conn net.Conn, req models.Request, manager *Manager) {
 	switch req.Method {
 	case "browser.open":
-		url, ok := models.Get[string](req, "url")
+		url, ok := req.Params["url"].(string)
 		if !ok {
 			models.RespondError(conn, req.ID, "invalid url parameter")
 			return
--- a/core/internal/server/clipboard/handlers.go
+++ b/core/internal/server/clipboard/handlers.go
@@ -168,14 +168,14 @@ func handleSearch(conn net.Conn, req models.Request, m *Manager) {
 		Offset:   params.IntOpt(req.Params, "offset", 0),
 	}

-	if img, ok := models.Get[bool](req, "isImage"); ok {
+	if img, ok := req.Params["isImage"].(bool); ok {
 		p.IsImage = &img
 	}
-	if b, ok := models.Get[float64](req, "before"); ok {
+	if b, ok := req.Params["before"].(float64); ok {
 		v := int64(b)
 		p.Before = &v
 	}
-	if a, ok := models.Get[float64](req, "after"); ok {
+	if a, ok := req.Params["after"].(float64); ok {
 		v := int64(a)
 		p.After = &v
 	}
@@ -190,21 +190,27 @@ func handleGetConfig(conn net.Conn, req models.Request, m *Manager) {
 func handleSetConfig(conn net.Conn, req models.Request, m *Manager) {
 	cfg := m.GetConfig()

-	if v, ok := models.Get[float64](req, "maxHistory"); ok {
-		cfg.MaxHistory = int(v)
+	if _, ok := req.Params["maxHistory"]; ok {
+		cfg.MaxHistory = params.IntOpt(req.Params, "maxHistory", cfg.MaxHistory)
 	}
-	if v, ok := models.Get[float64](req, "maxEntrySize"); ok {
-		cfg.MaxEntrySize = int64(v)
+	if _, ok := req.Params["maxEntrySize"]; ok {
+		cfg.MaxEntrySize = int64(params.IntOpt(req.Params, "maxEntrySize", int(cfg.MaxEntrySize)))
 	}
-	if v, ok := models.Get[float64](req, "autoClearDays"); ok {
-		cfg.AutoClearDays = int(v)
+	if _, ok := req.Params["autoClearDays"]; ok {
+		cfg.AutoClearDays = params.IntOpt(req.Params, "autoClearDays", cfg.AutoClearDays)
 	}
-	if v, ok := models.Get[bool](req, "clearAtStartup"); ok {
+	if v, ok := req.Params["clearAtStartup"].(bool); ok {
 		cfg.ClearAtStartup = v
 	}
-	if v, ok := models.Get[bool](req, "disabled"); ok {
+	if v, ok := req.Params["disabled"].(bool); ok {
 		cfg.Disabled = v
 	}
+	if v, ok := req.Params["disableHistory"].(bool); ok {
+		cfg.DisableHistory = v
+	}
+	if v, ok := req.Params["disablePersist"].(bool); ok {
+		cfg.DisablePersist = v
+	}

 	if err := m.SetConfig(cfg); err != nil {
 		models.RespondError(conn, req.ID, err.Error())
--- a/core/internal/server/clipboard/manager.go
+++ b/core/internal/server/clipboard/manager.go
@@ -11,16 +11,14 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"slices"
 	"strings"
 	"syscall"
 	"time"

-	"hash/fnv"
-
 	"github.com/fsnotify/fsnotify"
 	_ "golang.org/x/image/bmp"
 	_ "golang.org/x/image/tiff"
+	"hash/fnv"

 	bolt "go.etcd.io/bbolt"

@@ -30,12 +28,11 @@ import (
 	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
 )

-// These mime types wont be stored in history
-var sensitiveMimeTypes = []string{
-	"x-kde-passwordManagerHint",
-}
-
 func NewManager(wlCtx wlcontext.WaylandContext, config Config) (*Manager, error) {
+	if config.Disabled {
+		return nil, fmt.Errorf("clipboard disabled in config")
+	}
+
 	display := wlCtx.Display()
 	dbPath, err := getDBPath()
 	if err != nil {
@@ -57,10 +54,8 @@ func NewManager(wlCtx wlcontext.WaylandContext, config Config) (*Manager, error)
 		dbPath:         dbPath,
 	}

-	if !config.Disabled {
-		if err := m.setupRegistry(); err != nil {
-			return nil, err
-		}
+	if err := m.setupRegistry(); err != nil {
+		return nil, err
 	}

 	m.notifierWg.Add(1)
@@ -68,17 +63,17 @@ func NewManager(wlCtx wlcontext.WaylandContext, config Config) (*Manager, error)

 	go m.watchConfig()

-	db, err := openDB(dbPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open db: %w", err)
-	}
-	m.db = db
+	if !config.DisableHistory {
+		db, err := openDB(dbPath)
+		if err != nil {
+			return nil, fmt.Errorf("failed to open db: %w", err)
+		}
+		m.db = db

-	if err := m.migrateHashes(); err != nil {
-		log.Errorf("Failed to migrate hashes: %v", err)
-	}
+		if err := m.migrateHashes(); err != nil {
+			log.Errorf("Failed to migrate hashes: %v", err)
+		}

-	if !config.Disabled {
 		if config.ClearAtStartup {
 			if err := m.clearHistoryInternal(); err != nil {
 				log.Errorf("Failed to clear history at startup: %v", err)
@@ -95,7 +90,7 @@ func NewManager(wlCtx wlcontext.WaylandContext, config Config) (*Manager, error)
 	m.alive = true
 	m.updateState()

-	if !config.Disabled && m.dataControlMgr != nil && m.seat != nil {
+	if m.dataControlMgr != nil && m.seat != nil {
 		m.setupDataDeviceSync()
 	}

@@ -258,10 +253,6 @@ func (m *Manager) setupDataDeviceSync() {
 			return
 		}

-		if m.hasSensitiveMimeType(mimes) {
-			return
-		}
-
 		preferredMime := m.selectMimeType(mimes)
 		if preferredMime == "" {
 			return
@@ -324,10 +315,14 @@ func (m *Manager) readAndStore(r *os.File, mimeType string) {
 		return
 	}

-	if !cfg.Disabled && m.db != nil {
+	if !cfg.DisableHistory && m.db != nil {
 		m.storeClipboardEntry(data, mimeType)
 	}

+	if !cfg.DisablePersist {
+		m.persistClipboard([]string{mimeType}, map[string][]byte{mimeType: data})
+	}
+
 	m.updateState()
 	m.notifySubscribers()
 }
@@ -353,6 +348,105 @@ func (m *Manager) storeClipboardEntry(data []byte, mimeType string) {
 	}
 }

+func (m *Manager) persistClipboard(mimeTypes []string, data map[string][]byte) {
+	m.persistMutex.Lock()
+	m.persistMimeTypes = mimeTypes
+	m.persistData = data
+	m.persistMutex.Unlock()
+
+	m.post(func() {
+		m.takePersistOwnership()
+	})
+}
+
+func (m *Manager) takePersistOwnership() {
+	if m.dataControlMgr == nil || m.dataDevice == nil {
+		return
+	}
+
+	if m.getConfig().DisablePersist {
+		return
+	}
+
+	m.persistMutex.RLock()
+	mimeTypes := m.persistMimeTypes
+	m.persistMutex.RUnlock()
+
+	if len(mimeTypes) == 0 {
+		return
+	}
+
+	dataMgr := m.dataControlMgr.(*ext_data_control.ExtDataControlManagerV1)
+
+	source, err := dataMgr.CreateDataSource()
+	if err != nil {
+		log.Errorf("Failed to create persist source: %v", err)
+		return
+	}
+
+	for _, mime := range mimeTypes {
+		if err := source.Offer(mime); err != nil {
+			log.Errorf("Failed to offer mime type %s: %v", mime, err)
+		}
+	}
+
+	source.SetSendHandler(func(e ext_data_control.ExtDataControlSourceV1SendEvent) {
+		fd := e.Fd
+		defer syscall.Close(fd)
+
+		m.persistMutex.RLock()
+		d := m.persistData[e.MimeType]
+		m.persistMutex.RUnlock()
+
+		if len(d) == 0 {
+			return
+		}
+
+		file := os.NewFile(uintptr(fd), "clipboard-pipe")
+		defer file.Close()
+		file.Write(d)
+	})
+
+	source.SetCancelledHandler(func(e ext_data_control.ExtDataControlSourceV1CancelledEvent) {
+		m.ownerLock.Lock()
+		m.isOwner = false
+		m.ownerLock.Unlock()
+	})
+
+	if m.currentSource != nil {
+		oldSource := m.currentSource.(*ext_data_control.ExtDataControlSourceV1)
+		oldSource.Destroy()
+	}
+	m.currentSource = source
+
+	device := m.dataDevice.(*ext_data_control.ExtDataControlDeviceV1)
+	if err := device.SetSelection(source); err != nil {
+		log.Errorf("Failed to set persist selection: %v", err)
+		return
+	}
+
+	m.ownerLock.Lock()
+	m.isOwner = true
+	m.ownerLock.Unlock()
+}
+
+func (m *Manager) releaseOwnership() {
+	m.ownerLock.Lock()
+	m.isOwner = false
+	m.ownerLock.Unlock()
+
+	m.persistMutex.Lock()
+	m.persistData = nil
+	m.persistMimeTypes = nil
+	m.persistMutex.Unlock()
+
+	if m.currentSource != nil {
+		source := m.currentSource.(*ext_data_control.ExtDataControlSourceV1)
+		source.Destroy()
+		m.currentSource = nil
+	}
+}
+
 func (m *Manager) storeEntry(entry Entry) error {
 	if m.db == nil {
 		return fmt.Errorf("database not available")
@@ -401,9 +495,6 @@ func (m *Manager) deduplicateInTx(b *bolt.Bucket, hash uint64) error {
 }

 func (m *Manager) trimLengthInTx(b *bolt.Bucket) error {
-	if m.config.MaxHistory < 0 {
-		return nil
-	}
 	c := b.Cursor()
 	var count int
 	for k, _ := c.Last(); k != nil; k, _ = c.Prev() {
@@ -501,12 +592,6 @@ func extractHash(data []byte) uint64 {
 	return binary.BigEndian.Uint64(data[len(data)-8:])
 }

-func (m *Manager) hasSensitiveMimeType(mimes []string) bool {
-	return slices.ContainsFunc(mimes, func(mime string) bool {
-		return slices.Contains(sensitiveMimeTypes, mime)
-	})
-}
-
 func (m *Manager) selectMimeType(mimes []string) string {
 	preferredTypes := []string{
 		"text/plain;charset=utf-8",
@@ -1209,13 +1294,29 @@ func (m *Manager) applyConfigChange(newCfg Config) {
 	m.config = newCfg
 	m.configMutex.Unlock()

-	switch {
-	case newCfg.Disabled && !oldCfg.Disabled:
-		log.Info("Clipboard tracking disabled")
-	case !newCfg.Disabled && oldCfg.Disabled:
-		log.Info("Clipboard tracking enabled")
+	if newCfg.DisableHistory && !oldCfg.DisableHistory && m.db != nil {
+		log.Info("Clipboard history disabled, closing database")
+		m.db.Close()
+		m.db = nil
 	}

+	if !newCfg.DisableHistory && oldCfg.DisableHistory && m.db == nil {
+		log.Info("Clipboard history enabled, opening database")
+		if db, err := openDB(m.dbPath); err == nil {
+			m.db = db
+		} else {
+			log.Errorf("Failed to reopen database: %v", err)
+		}
+	}
+
+	if newCfg.DisablePersist && !oldCfg.DisablePersist {
+		log.Info("Clipboard persist disabled, releasing ownership")
+		m.releaseOwnership()
+	}
+
+	log.Infof("Clipboard config reloaded: disableHistory=%v disablePersist=%v",
+		newCfg.DisableHistory, newCfg.DisablePersist)
+
 	m.updateState()
 	m.notifySubscribers()
 }
@@ -1223,8 +1324,8 @@ func (m *Manager) applyConfigChange(newCfg Config) {
 func (m *Manager) StoreData(data []byte, mimeType string) error {
 	cfg := m.getConfig()

-	if cfg.Disabled {
-		return fmt.Errorf("clipboard tracking disabled")
+	if cfg.DisableHistory {
+		return fmt.Errorf("clipboard history disabled")
 	}

 	if m.db == nil {
--- a/core/internal/server/clipboard/manager_test.go
+++ b/core/internal/server/clipboard/manager_test.go
@@ -457,6 +457,8 @@ func TestDefaultConfig(t *testing.T) {
 	assert.Equal(t, 0, cfg.AutoClearDays)
 	assert.False(t, cfg.ClearAtStartup)
 	assert.False(t, cfg.Disabled)
+	assert.False(t, cfg.DisableHistory)
+	assert.True(t, cfg.DisablePersist)
 }

 func TestManager_PostDelegatesToWlContext(t *testing.T) {
--- a/core/internal/server/clipboard/types.go
+++ b/core/internal/server/clipboard/types.go
@@ -18,7 +18,10 @@ type Config struct {
 	MaxEntrySize   int64 `json:"maxEntrySize"`
 	AutoClearDays  int   `json:"autoClearDays"`
 	ClearAtStartup bool  `json:"clearAtStartup"`
-	Disabled       bool  `json:"disabled"`
+
+	Disabled       bool `json:"disabled"`
+	DisableHistory bool `json:"disableHistory"`
+	DisablePersist bool `json:"disablePersist"`
 }

 func DefaultConfig() Config {
@@ -27,6 +30,7 @@ func DefaultConfig() Config {
 		MaxEntrySize:   5 * 1024 * 1024,
 		AutoClearDays:  0,
 		ClearAtStartup: false,
+		DisablePersist: true,
 	}
 }

--- a/core/internal/server/cups/actions.go
+++ b/core/internal/server/cups/actions.go
@@ -2,8 +2,6 @@ package cups

 import (
 	"errors"
-	"net"
-	"net/url"
 	"strings"
 	"time"

@@ -158,42 +156,9 @@ func (m *Manager) PurgeJobs(printerName string) error {
 	return err
 }

-func resolveIPFromURI(uri string) string {
-	parsed, err := url.Parse(uri)
-	if err != nil {
-		return ""
-	}
-	host := parsed.Hostname()
-	if host == "" {
-		return ""
-	}
-	if ip := net.ParseIP(host); ip != nil {
-		return ip.String()
-	}
-	addrs, err := net.LookupIP(host)
-	if err != nil || len(addrs) == 0 {
-		return ""
-	}
-	for _, addr := range addrs {
-		if v4 := addr.To4(); v4 != nil {
-			return v4.String()
-		}
-	}
-	return addrs[0].String()
-}
-
 func (m *Manager) GetDevices() ([]Device, error) {
 	if m.pkHelper != nil {
-		devices, err := m.pkHelper.DevicesGet(10, 0, nil, nil)
-		if err != nil {
-			return nil, err
-		}
-		for i := range devices {
-			if devices[i].Class == "network" {
-				devices[i].IP = resolveIPFromURI(devices[i].URI)
-			}
-		}
-		return devices, nil
+		return m.pkHelper.DevicesGet(10, 0, nil, nil)
 	}

 	deviceAttrs, err := m.client.GetDevices()
@@ -211,9 +176,6 @@ func (m *Manager) GetDevices() ([]Device, error) {
 			ID:        getStringAttr(attrs, "device-id"),
 			Location:  getStringAttr(attrs, "device-location"),
 		}
-		if device.Class == "network" {
-			device.IP = resolveIPFromURI(uri)
-		}
 		devices = append(devices, device)
 	}

--- a/core/internal/server/cups/types.go
+++ b/core/internal/server/cups/types.go
@@ -42,7 +42,6 @@ type Device struct {
 	MakeModel string `json:"makeModel"`
 	ID        string `json:"id"`
 	Location  string `json:"location"`
-	IP        string `json:"ip,omitempty"`
 }

 type PPD struct {
--- a/core/internal/server/dwl/handlers.go
+++ b/core/internal/server/dwl/handlers.go
@@ -41,19 +41,19 @@ func handleGetState(conn net.Conn, req models.Request, manager *Manager) {
 }

 func handleSetTags(conn net.Conn, req models.Request, manager *Manager) {
-	output, ok := models.Get[string](req, "output")
+	output, ok := req.Params["output"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'output' parameter")
 		return
 	}

-	tagmask, ok := models.Get[float64](req, "tagmask")
+	tagmask, ok := req.Params["tagmask"].(float64)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'tagmask' parameter")
 		return
 	}

-	toggleTagset, ok := models.Get[float64](req, "toggleTagset")
+	toggleTagset, ok := req.Params["toggleTagset"].(float64)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'toggleTagset' parameter")
 		return
@@ -68,19 +68,19 @@ func handleSetTags(conn net.Conn, req models.Request, manager *Manager) {
 }

 func handleSetClientTags(conn net.Conn, req models.Request, manager *Manager) {
-	output, ok := models.Get[string](req, "output")
+	output, ok := req.Params["output"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'output' parameter")
 		return
 	}

-	andTags, ok := models.Get[float64](req, "andTags")
+	andTags, ok := req.Params["andTags"].(float64)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'andTags' parameter")
 		return
 	}

-	xorTags, ok := models.Get[float64](req, "xorTags")
+	xorTags, ok := req.Params["xorTags"].(float64)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'xorTags' parameter")
 		return
@@ -95,13 +95,13 @@ func handleSetClientTags(conn net.Conn, req models.Request, manager *Manager) {
 }

 func handleSetLayout(conn net.Conn, req models.Request, manager *Manager) {
-	output, ok := models.Get[string](req, "output")
+	output, ok := req.Params["output"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'output' parameter")
 		return
 	}

-	index, ok := models.Get[float64](req, "index")
+	index, ok := req.Params["index"].(float64)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'index' parameter")
 		return
--- a/core/internal/server/extworkspace/handlers.go
+++ b/core/internal/server/extworkspace/handlers.go
@@ -43,8 +43,12 @@ func handleGetState(conn net.Conn, req models.Request, manager *Manager) {
 }

 func handleActivateWorkspace(conn net.Conn, req models.Request, manager *Manager) {
-	groupID := models.GetOr(req, "groupID", "")
-	workspaceID, ok := models.Get[string](req, "workspaceID")
+	groupID, ok := req.Params["groupID"].(string)
+	if !ok {
+		groupID = ""
+	}
+
+	workspaceID, ok := req.Params["workspaceID"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'workspaceID' parameter")
 		return
@@ -59,8 +63,12 @@ func handleActivateWorkspace(conn net.Conn, req models.Request, manager *Manager
 }

 func handleDeactivateWorkspace(conn net.Conn, req models.Request, manager *Manager) {
-	groupID := models.GetOr(req, "groupID", "")
-	workspaceID, ok := models.Get[string](req, "workspaceID")
+	groupID, ok := req.Params["groupID"].(string)
+	if !ok {
+		groupID = ""
+	}
+
+	workspaceID, ok := req.Params["workspaceID"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'workspaceID' parameter")
 		return
@@ -75,8 +83,12 @@ func handleDeactivateWorkspace(conn net.Conn, req models.Request, manager *Manag
 }

 func handleRemoveWorkspace(conn net.Conn, req models.Request, manager *Manager) {
-	groupID := models.GetOr(req, "groupID", "")
-	workspaceID, ok := models.Get[string](req, "workspaceID")
+	groupID, ok := req.Params["groupID"].(string)
+	if !ok {
+		groupID = ""
+	}
+
+	workspaceID, ok := req.Params["workspaceID"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'workspaceID' parameter")
 		return
@@ -91,13 +103,13 @@ func handleRemoveWorkspace(conn net.Conn, req models.Request, manager *Manager)
 }

 func handleCreateWorkspace(conn net.Conn, req models.Request, manager *Manager) {
-	groupID, ok := models.Get[string](req, "groupID")
+	groupID, ok := req.Params["groupID"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'groupID' parameter")
 		return
 	}

-	workspaceName, ok := models.Get[string](req, "name")
+	workspaceName, ok := req.Params["name"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'name' parameter")
 		return
--- a/core/internal/server/matugen_handler.go
+++ b/core/internal/server/matugen_handler.go
@@ -15,23 +15,37 @@ type MatugenQueueResult struct {
 }

 func handleMatugenQueue(conn net.Conn, req models.Request) {
-	opts := matugen.Options{
-		StateDir:            models.GetOr(req, "stateDir", ""),
-		ShellDir:            models.GetOr(req, "shellDir", ""),
-		ConfigDir:           models.GetOr(req, "configDir", ""),
-		Kind:                models.GetOr(req, "kind", ""),
-		Value:               models.GetOr(req, "value", ""),
-		Mode:                matugen.ColorMode(models.GetOr(req, "mode", "")),
-		IconTheme:           models.GetOr(req, "iconTheme", ""),
-		MatugenType:         models.GetOr(req, "matugenType", ""),
-		RunUserTemplates:    models.GetOr(req, "runUserTemplates", true),
-		StockColors:         models.GetOr(req, "stockColors", ""),
-		SyncModeWithPortal:  models.GetOr(req, "syncModeWithPortal", false),
-		TerminalsAlwaysDark: models.GetOr(req, "terminalsAlwaysDark", false),
-		SkipTemplates:       models.GetOr(req, "skipTemplates", ""),
+	getString := func(key string) string {
+		if v, ok := req.Params[key].(string); ok {
+			return v
+		}
+		return ""
 	}

-	wait := models.GetOr(req, "wait", true)
+	getBool := func(key string, def bool) bool {
+		if v, ok := req.Params[key].(bool); ok {
+			return v
+		}
+		return def
+	}
+
+	opts := matugen.Options{
+		StateDir:            getString("stateDir"),
+		ShellDir:            getString("shellDir"),
+		ConfigDir:           getString("configDir"),
+		Kind:                getString("kind"),
+		Value:               getString("value"),
+		Mode:                getString("mode"),
+		IconTheme:           getString("iconTheme"),
+		MatugenType:         getString("matugenType"),
+		RunUserTemplates:    getBool("runUserTemplates", true),
+		StockColors:         getString("stockColors"),
+		SyncModeWithPortal:  getBool("syncModeWithPortal", false),
+		TerminalsAlwaysDark: getBool("terminalsAlwaysDark", false),
+		SkipTemplates:       getString("skipTemplates"),
+	}
+
+	wait := getBool("wait", true)

 	queue := matugen.GetQueue()
 	resultCh := queue.Submit(opts)
--- a/core/internal/server/models/types.go
+++ b/core/internal/server/models/types.go
@@ -5,7 +5,6 @@ import (
 	"net"

 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/params"
 )

 type Request struct {
@@ -14,15 +13,6 @@ type Request struct {
 	Params map[string]any `json:"params,omitempty"`
 }

-func Get[T any](r Request, key string) (T, bool) {
-	v, err := params.Get[T](r.Params, key)
-	return v, err == nil
-}
-
-func GetOr[T any](r Request, key string, def T) T {
-	return params.GetOpt(r.Params, key, def)
-}
-
 type Response[T any] struct {
 	ID     int    `json:"id,omitempty"`
 	Result *T     `json:"result,omitempty"`
--- a/core/internal/server/models/types_test.go
+++ b/core/internal/server/models/types_test.go
@@ -1,52 +0,0 @@
-package models
-
-import "testing"
-
-func TestGet(t *testing.T) {
-	req := Request{Params: map[string]any{"name": "test", "count": 42, "enabled": true}}
-
-	name, ok := Get[string](req, "name")
-	if !ok || name != "test" {
-		t.Errorf("Get[string] = %q, %v; want 'test', true", name, ok)
-	}
-
-	count, ok := Get[int](req, "count")
-	if !ok || count != 42 {
-		t.Errorf("Get[int] = %d, %v; want 42, true", count, ok)
-	}
-
-	enabled, ok := Get[bool](req, "enabled")
-	if !ok || !enabled {
-		t.Errorf("Get[bool] = %v, %v; want true, true", enabled, ok)
-	}
-
-	_, ok = Get[string](req, "missing")
-	if ok {
-		t.Error("Get missing key should return false")
-	}
-
-	_, ok = Get[int](req, "name")
-	if ok {
-		t.Error("Get wrong type should return false")
-	}
-}
-
-func TestGetOr(t *testing.T) {
-	req := Request{Params: map[string]any{"name": "test", "enabled": true}}
-
-	if v := GetOr(req, "name", "default"); v != "test" {
-		t.Errorf("GetOr existing = %q; want 'test'", v)
-	}
-
-	if v := GetOr(req, "missing", "default"); v != "default" {
-		t.Errorf("GetOr missing = %q; want 'default'", v)
-	}
-
-	if v := GetOr(req, "enabled", false); !v {
-		t.Errorf("GetOr bool = %v; want true", v)
-	}
-
-	if v := GetOr(req, "name", 0); v != 0 {
-		t.Errorf("GetOr wrong type = %d; want 0 (default)", v)
-	}
-}
--- a/core/internal/server/network/agent_networkmanager.go
+++ b/core/internal/server/network/agent_networkmanager.go
@@ -233,9 +233,6 @@ func (a *SecretAgent) GetSecrets(
 	if a.manager != nil && connType == "802-11-wireless" && a.manager.WasRecentlyFailed(ssid) {
 		reason = "wrong-password"
 	}
-	if settingName == "vpn" && isPKCS11Auth(conn, vpnSvc) {
-		reason = "pkcs11"
-	}

 	var connId, connUuid string
 	if c, ok := conn["connection"]; ok {
@@ -252,28 +249,6 @@ func (a *SecretAgent) GetSecrets(
 	}

 	if settingName == "vpn" && a.backend != nil {
-		// Check for cached PKCS11 PIN first
-		isPKCS11Request := len(fields) == 1 && fields[0] == "key_pass"
-		if isPKCS11Request {
-			a.backend.cachedPKCS11Mu.Lock()
-			cached := a.backend.cachedPKCS11PIN
-			if cached != nil && cached.ConnectionUUID == connUuid {
-				a.backend.cachedPKCS11PIN = nil
-				a.backend.cachedPKCS11Mu.Unlock()
-
-				log.Infof("[SecretAgent] Using cached PKCS11 PIN")
-
-				out := nmSettingMap{}
-				vpnSec := nmVariantMap{}
-				vpnSec["secrets"] = dbus.MakeVariant(map[string]string{"key_pass": cached.PIN})
-				out[settingName] = vpnSec
-
-				return out, nil
-			}
-			a.backend.cachedPKCS11Mu.Unlock()
-		}
-
-		// Check for cached VPN password
 		a.backend.cachedVPNCredsMu.Lock()
 		cached := a.backend.cachedVPNCreds
 		if cached != nil && cached.ConnectionUUID == connUuid {
@@ -283,9 +258,9 @@ func (a *SecretAgent) GetSecrets(
 			log.Infof("[SecretAgent] Using cached password from pre-activation prompt")

 			out := nmSettingMap{}
-			vpnSec := nmVariantMap{}
-			vpnSec["secrets"] = dbus.MakeVariant(map[string]string{"password": cached.Password})
-			out[settingName] = vpnSec
+			sec := nmVariantMap{}
+			sec["password"] = dbus.MakeVariant(cached.Password)
+			out[settingName] = sec

 			if cached.SavePassword {
 				a.backend.pendingVPNSaveMu.Lock()
@@ -389,41 +364,16 @@ func (a *SecretAgent) GetSecrets(
 		}
 		sec[k] = dbus.MakeVariant(v)
 	}
-
-	// Check if this is PKCS11 auth (key_pass)
-	pin, isPKCS11 := reply.Secrets["key_pass"]
+	out[settingName] = sec

 	switch settingName {
-	case "vpn":
-		// VPN secrets must be wrapped in a "secrets" key per NM spec
-		secretsDict := make(map[string]string)
-		for k, v := range reply.Secrets {
-			if k != "username" {
-				secretsDict[k] = v
-			}
-		}
-		vpnSec := nmVariantMap{}
-		vpnSec["secrets"] = dbus.MakeVariant(secretsDict)
-		out[settingName] = vpnSec
-		log.Infof("[SecretAgent] Returning VPN secrets with %d fields for %s", len(secretsDict), vpnSvc)
-
-		// Cache PKCS11 PIN in case GetSecrets is called again during activation
-		if isPKCS11 && a.backend != nil {
-			a.backend.cachedPKCS11Mu.Lock()
-			a.backend.cachedPKCS11PIN = &cachedPKCS11PIN{
-				ConnectionUUID: connUuid,
-				PIN:            pin,
-			}
-			a.backend.cachedPKCS11Mu.Unlock()
-			log.Infof("[SecretAgent] Cached PKCS11 PIN for potential re-request")
-		}
 	case "802-1x":
-		out[settingName] = sec
 		log.Infof("[SecretAgent] Returning 802-1x enterprise secrets with %d fields", len(sec))
-	default:
-		out[settingName] = sec
+	case "vpn":
+		log.Infof("[SecretAgent] Returning VPN secrets with %d fields for %s", len(sec), vpnSvc)
 	}
-	if settingName == "vpn" && a.backend != nil && !isPKCS11 && (vpnUsername != "" || reply.Save) {
+
+	if settingName == "vpn" && a.backend != nil && (vpnUsername != "" || reply.Save) {
 		pw := reply.Secrets["password"]
 		a.backend.pendingVPNSaveMu.Lock()
 		a.backend.pendingVPNSave = &pendingVPNCredentials{
@@ -629,15 +579,6 @@ func inferVPNFields(conn map[string]nmVariantMap, vpnService string) []string {
 	connType := dataMap["connection-type"]

 	switch {
-	case strings.Contains(vpnService, "openconnect"):
-		authType := dataMap["authtype"]
-		userCert := dataMap["usercert"]
-		if authType == "cert" && strings.HasPrefix(userCert, "pkcs11:") {
-			return []string{"key_pass"}
-		}
-		if dataMap["username"] == "" {
-			fields = []string{"username", "password"}
-		}
 	case strings.Contains(vpnService, "openvpn"):
 		if connType == "password" || connType == "password-tls" {
 			if dataMap["username"] == "" {
@@ -645,7 +586,7 @@ func inferVPNFields(conn map[string]nmVariantMap, vpnService string) []string {
 			}
 		}
 	case strings.Contains(vpnService, "vpnc"), strings.Contains(vpnService, "l2tp"),
-		strings.Contains(vpnService, "pptp"):
+		strings.Contains(vpnService, "pptp"), strings.Contains(vpnService, "openconnect"):
 		if dataMap["username"] == "" {
 			fields = []string{"username", "password"}
 		}
@@ -656,8 +597,6 @@ func inferVPNFields(conn map[string]nmVariantMap, vpnService string) []string {

 func vpnFieldMeta(field, vpnService string) (label string, isSecret bool) {
 	switch field {
-	case "key_pass":
-		return "PIN", true
 	case "password":
 		return "Password", true
 	case "Xauth password":
@@ -685,25 +624,6 @@ func vpnFieldMeta(field, vpnService string) (label string, isSecret bool) {
 	return titleCaser.String(strings.ReplaceAll(field, "-", " ")), false
 }

-func isPKCS11Auth(conn map[string]nmVariantMap, vpnService string) bool {
-	if !strings.Contains(vpnService, "openconnect") {
-		return false
-	}
-	vpnSettings, ok := conn["vpn"]
-	if !ok {
-		return false
-	}
-	dataVariant, ok := vpnSettings["data"]
-	if !ok {
-		return false
-	}
-	dataMap, ok := dataVariant.Value().(map[string]string)
-	if !ok {
-		return false
-	}
-	return dataMap["authtype"] == "cert" && strings.HasPrefix(dataMap["usercert"], "pkcs11:")
-}
-
 func readVPNPasswordFlags(conn map[string]nmVariantMap, settingName string) uint32 {
 	if settingName != "vpn" {
 		return 0xFFFF
--- a/core/internal/server/network/backend_networkmanager.go
+++ b/core/internal/server/network/backend_networkmanager.go
@@ -72,8 +72,6 @@ type NetworkManagerBackend struct {
 	pendingVPNSaveMu sync.Mutex
 	cachedVPNCreds   *cachedVPNCredentials
 	cachedVPNCredsMu sync.Mutex
-	cachedPKCS11PIN  *cachedPKCS11PIN
-	cachedPKCS11Mu   sync.Mutex

 	onStateChange func()
 }
@@ -91,11 +89,6 @@ type cachedVPNCredentials struct {
 	SavePassword   bool
 }

-type cachedPKCS11PIN struct {
-	ConnectionUUID string
-	PIN            string
-}
-
 func NewNetworkManagerBackend(nmConn ...gonetworkmanager.NetworkManager) (*NetworkManagerBackend, error) {
 	var nm gonetworkmanager.NetworkManager
 	var err error
--- a/core/internal/server/network/backend_networkmanager_vpn.go
+++ b/core/internal/server/network/backend_networkmanager_vpn.go
@@ -33,7 +33,7 @@ func (b *NetworkManagerBackend) ListVPNProfiles() ([]VPNProfile, error) {
 		return nil, fmt.Errorf("failed to get connections: %w", err)
 	}

-	profiles := []VPNProfile{}
+	var profiles []VPNProfile
 	for _, conn := range connections {
 		settings, err := conn.GetSettings()
 		if err != nil {
@@ -101,7 +101,7 @@ func (b *NetworkManagerBackend) ListActiveVPN() ([]VPNActive, error) {
 		return nil, fmt.Errorf("failed to get active connections: %w", err)
 	}

-	active := []VPNActive{}
+	var active []VPNActive
 	for _, activeConn := range activeConns {
 		connType, err := activeConn.GetPropertyType()
 		if err != nil {
@@ -282,26 +282,111 @@ func (b *NetworkManagerBackend) ConnectVPN(uuidOrName string, singleActive bool)
 		}
 	}

+	needsUsernamePrePrompt := false
 	var vpnServiceType string
-	var vpnData map[string]string
 	if vpnSettings, ok := targetSettings["vpn"]; ok {
 		if svc, ok := vpnSettings["service-type"].(string); ok {
 			vpnServiceType = svc
 		}
 		if data, ok := vpnSettings["data"].(map[string]string); ok {
-			vpnData = data
+			connType := data["connection-type"]
+			username := data["username"]
+			// OpenVPN password auth needs username in vpn.data
+			if strings.Contains(vpnServiceType, "openvpn") &&
+				(connType == "password" || connType == "password-tls") &&
+				username == "" {
+				needsUsernamePrePrompt = true
+			}
 		}
 	}

-	authAction := detectVPNAuthAction(vpnServiceType, vpnData)
+	// If username is needed but missing, prompt for it before activating
+	if needsUsernamePrePrompt && b.promptBroker != nil {
+		log.Infof("[ConnectVPN] OpenVPN requires username in vpn.data - prompting before activation")

-	switch authAction {
-	case "openvpn_username":
-		if b.promptBroker == nil {
-			return fmt.Errorf("OpenVPN password authentication requires interactive prompt")
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+		defer cancel()
+
+		token, err := b.promptBroker.Ask(ctx, PromptRequest{
+			Name:           connName,
+			ConnType:       "vpn",
+			VpnService:     vpnServiceType,
+			SettingName:    "vpn",
+			Fields:         []string{"username", "password"},
+			FieldsInfo:     []FieldInfo{{Name: "username", Label: "Username", IsSecret: false}, {Name: "password", Label: "Password", IsSecret: true}},
+			Reason:         "required",
+			ConnectionId:   connName,
+			ConnectionUuid: targetUUID,
+			ConnectionPath: string(targetConn.GetPath()),
+		})
+		if err != nil {
+			return fmt.Errorf("failed to request credentials: %w", err)
 		}
-		if err := b.handleOpenVPNUsernameAuth(targetConn, connName, targetUUID, vpnServiceType); err != nil {
-			return err
+
+		reply, err := b.promptBroker.Wait(ctx, token)
+		if err != nil {
+			return fmt.Errorf("credentials prompt failed: %w", err)
+		}
+
+		username := reply.Secrets["username"]
+		password := reply.Secrets["password"]
+		if username != "" {
+			connObj := b.dbusConn.Object("org.freedesktop.NetworkManager", targetConn.GetPath())
+			var existingSettings map[string]map[string]dbus.Variant
+			if err := connObj.Call("org.freedesktop.NetworkManager.Settings.Connection.GetSettings", 0).Store(&existingSettings); err != nil {
+				return fmt.Errorf("failed to get settings for username save: %w", err)
+			}
+
+			settings := make(map[string]map[string]dbus.Variant)
+			if connSection, ok := existingSettings["connection"]; ok {
+				settings["connection"] = connSection
+			}
+			vpn := existingSettings["vpn"]
+			var data map[string]string
+			if dataVariant, ok := vpn["data"]; ok {
+				if dm, ok := dataVariant.Value().(map[string]string); ok {
+					data = make(map[string]string)
+					for k, v := range dm {
+						data[k] = v
+					}
+				} else {
+					data = make(map[string]string)
+				}
+			} else {
+				data = make(map[string]string)
+			}
+			data["username"] = username
+
+			if reply.Save && password != "" {
+				data["password-flags"] = "0"
+				secs := make(map[string]string)
+				secs["password"] = password
+				vpn["secrets"] = dbus.MakeVariant(secs)
+				log.Infof("[ConnectVPN] Saving username and password to vpn.data")
+			} else {
+				log.Infof("[ConnectVPN] Saving username to vpn.data (password will be prompted)")
+			}
+
+			vpn["data"] = dbus.MakeVariant(data)
+			settings["vpn"] = vpn
+
+			var result map[string]dbus.Variant
+			if err := connObj.Call("org.freedesktop.NetworkManager.Settings.Connection.Update2", 0,
+				settings, uint32(0x1), map[string]dbus.Variant{}).Store(&result); err != nil {
+				return fmt.Errorf("failed to save username: %w", err)
+			}
+			log.Infof("[ConnectVPN] Username saved to connection, now activating")
+
+			if password != "" && !reply.Save {
+				b.cachedVPNCredsMu.Lock()
+				b.cachedVPNCreds = &cachedVPNCredentials{
+					ConnectionUUID: targetUUID,
+					Password:       password,
+					SavePassword:   reply.Save,
+				}
+				b.cachedVPNCredsMu.Unlock()
+				log.Infof("[ConnectVPN] Cached password for GetSecrets")
+			}
 		}
 	}

@@ -332,119 +417,6 @@ func (b *NetworkManagerBackend) ConnectVPN(uuidOrName string, singleActive bool)
 	return nil
 }

-func detectVPNAuthAction(serviceType string, data map[string]string) string {
-	if data == nil {
-		return ""
-	}
-
-	switch {
-	case strings.Contains(serviceType, "openvpn"):
-		connType := data["connection-type"]
-		username := data["username"]
-		if (connType == "password" || connType == "password-tls") && username == "" {
-			return "openvpn_username"
-		}
-	}
-	return ""
-}
-
-func (b *NetworkManagerBackend) handleOpenVPNUsernameAuth(targetConn gonetworkmanager.Connection, connName, targetUUID, vpnServiceType string) error {
-	log.Infof("[ConnectVPN] OpenVPN requires username in vpn.data - prompting before activation")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer cancel()
-
-	token, err := b.promptBroker.Ask(ctx, PromptRequest{
-		Name:           connName,
-		ConnType:       "vpn",
-		VpnService:     vpnServiceType,
-		SettingName:    "vpn",
-		Fields:         []string{"username", "password"},
-		FieldsInfo:     []FieldInfo{{Name: "username", Label: "Username", IsSecret: false}, {Name: "password", Label: "Password", IsSecret: true}},
-		Reason:         "required",
-		ConnectionId:   connName,
-		ConnectionUuid: targetUUID,
-		ConnectionPath: string(targetConn.GetPath()),
-	})
-	if err != nil {
-		return fmt.Errorf("failed to request credentials: %w", err)
-	}
-
-	reply, err := b.promptBroker.Wait(ctx, token)
-	if err != nil {
-		return fmt.Errorf("credentials prompt failed: %w", err)
-	}
-
-	if reply.Cancel {
-		return fmt.Errorf("user cancelled authentication")
-	}
-
-	username := reply.Secrets["username"]
-	password := reply.Secrets["password"]
-	if username == "" {
-		return nil
-	}
-
-	connObj := b.dbusConn.Object("org.freedesktop.NetworkManager", targetConn.GetPath())
-	var existingSettings map[string]map[string]dbus.Variant
-	if err := connObj.Call("org.freedesktop.NetworkManager.Settings.Connection.GetSettings", 0).Store(&existingSettings); err != nil {
-		return fmt.Errorf("failed to get settings for username save: %w", err)
-	}
-
-	settings := make(map[string]map[string]dbus.Variant)
-	if connSection, ok := existingSettings["connection"]; ok {
-		settings["connection"] = connSection
-	}
-	vpn := existingSettings["vpn"]
-	var data map[string]string
-	if dataVariant, ok := vpn["data"]; ok {
-		if dm, ok := dataVariant.Value().(map[string]string); ok {
-			data = make(map[string]string)
-			for k, v := range dm {
-				data[k] = v
-			}
-		} else {
-			data = make(map[string]string)
-		}
-	} else {
-		data = make(map[string]string)
-	}
-	data["username"] = username
-
-	if reply.Save && password != "" {
-		data["password-flags"] = "0"
-		secs := make(map[string]string)
-		secs["password"] = password
-		vpn["secrets"] = dbus.MakeVariant(secs)
-		log.Infof("[ConnectVPN] Saving username and password to vpn.data")
-	} else {
-		log.Infof("[ConnectVPN] Saving username to vpn.data (password will be prompted)")
-	}
-
-	vpn["data"] = dbus.MakeVariant(data)
-	settings["vpn"] = vpn
-
-	var result map[string]dbus.Variant
-	if err := connObj.Call("org.freedesktop.NetworkManager.Settings.Connection.Update2", 0,
-		settings, uint32(0x1), map[string]dbus.Variant{}).Store(&result); err != nil {
-		return fmt.Errorf("failed to save username: %w", err)
-	}
-	log.Infof("[ConnectVPN] Username saved to connection")
-
-	if password != "" && !reply.Save {
-		b.cachedVPNCredsMu.Lock()
-		b.cachedVPNCreds = &cachedVPNCredentials{
-			ConnectionUUID: targetUUID,
-			Password:       password,
-			SavePassword:   reply.Save,
-		}
-		b.cachedVPNCredsMu.Unlock()
-		log.Infof("[ConnectVPN] Cached password for GetSecrets")
-	}
-
-	return nil
-}
-
 func (b *NetworkManagerBackend) DisconnectVPN(uuidOrName string) error {
 	nm := b.nmConn.(gonetworkmanager.NetworkManager)

@@ -683,11 +655,6 @@ func (b *NetworkManagerBackend) updateVPNConnectionState() {
 				b.state.LastError = ""
 				b.stateMutex.Unlock()

-				// Clear cached PKCS11 PIN on success
-				b.cachedPKCS11Mu.Lock()
-				b.cachedPKCS11PIN = nil
-				b.cachedPKCS11Mu.Unlock()
-
 				b.pendingVPNSaveMu.Lock()
 				pending := b.pendingVPNSave
 				b.pendingVPNSave = nil
@@ -704,11 +671,6 @@ func (b *NetworkManagerBackend) updateVPNConnectionState() {
 				b.state.ConnectingVPNUUID = ""
 				b.state.LastError = "VPN connection failed"
 				b.stateMutex.Unlock()
-
-				// Clear cached PKCS11 PIN on failure
-				b.cachedPKCS11Mu.Lock()
-				b.cachedPKCS11PIN = nil
-				b.cachedPKCS11Mu.Unlock()
 				return
 			}
 		}
@@ -721,11 +683,6 @@ func (b *NetworkManagerBackend) updateVPNConnectionState() {
 		b.state.ConnectingVPNUUID = ""
 		b.state.LastError = "VPN connection failed"
 		b.stateMutex.Unlock()
-
-		// Clear cached PKCS11 PIN
-		b.cachedPKCS11Mu.Lock()
-		b.cachedPKCS11PIN = nil
-		b.cachedPKCS11Mu.Unlock()
 	}
 }

--- a/core/internal/server/network/handlers.go
+++ b/core/internal/server/network/handlers.go
@@ -157,7 +157,7 @@ func handleConnectWiFi(conn net.Conn, req models.Request, manager *Manager) {
 	connReq.Username = params.StringOpt(req.Params, "username", "")
 	connReq.Device = params.StringOpt(req.Params, "device", "")

-	if interactive, ok := models.Get[bool](req, "interactive"); ok {
+	if interactive, ok := req.Params["interactive"].(bool); ok {
 		connReq.Interactive = interactive
 	} else {
 		state := manager.GetState()
@@ -185,7 +185,7 @@ func handleConnectWiFi(conn net.Conn, req models.Request, manager *Manager) {
 	connReq.ClientCertPath = params.StringOpt(req.Params, "clientCertPath", "")
 	connReq.PrivateKeyPath = params.StringOpt(req.Params, "privateKeyPath", "")

-	if useSystemCACerts, ok := models.Get[bool](req, "useSystemCACerts"); ok {
+	if useSystemCACerts, ok := req.Params["useSystemCACerts"].(bool); ok {
 		connReq.UseSystemCACerts = &useSystemCACerts
 	}

@@ -528,13 +528,13 @@ func handleUpdateVPNConfig(conn net.Conn, req models.Request, manager *Manager)

 	updates := make(map[string]any)

-	if name, ok := models.Get[string](req, "name"); ok {
+	if name, ok := req.Params["name"].(string); ok {
 		updates["name"] = name
 	}
-	if autoconnect, ok := models.Get[bool](req, "autoconnect"); ok {
+	if autoconnect, ok := req.Params["autoconnect"].(bool); ok {
 		updates["autoconnect"] = autoconnect
 	}
-	if data, ok := models.Get[map[string]any](req, "data"); ok {
+	if data, ok := req.Params["data"].(map[string]any); ok {
 		updates["data"] = data
 	}

--- a/core/internal/server/plugins/install.go
+++ b/core/internal/server/plugins/install.go
@@ -9,7 +9,7 @@ import (
 )

 func HandleInstall(conn net.Conn, req models.Request) {
-	idOrName, ok := models.Get[string](req, "name")
+	idOrName, ok := req.Params["name"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'name' parameter")
 		return
--- a/core/internal/server/plugins/search.go
+++ b/core/internal/server/plugins/search.go
@@ -10,7 +10,7 @@ import (
 )

 func HandleSearch(conn net.Conn, req models.Request) {
-	query, ok := models.Get[string](req, "query")
+	query, ok := req.Params["query"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'query' parameter")
 		return
@@ -30,15 +30,15 @@ func HandleSearch(conn net.Conn, req models.Request) {

 	searchResults := plugins.FuzzySearch(query, pluginList)

-	if category := models.GetOr(req, "category", ""); category != "" {
+	if category, ok := req.Params["category"].(string); ok && category != "" {
 		searchResults = plugins.FilterByCategory(category, searchResults)
 	}

-	if compositor := models.GetOr(req, "compositor", ""); compositor != "" {
+	if compositor, ok := req.Params["compositor"].(string); ok && compositor != "" {
 		searchResults = plugins.FilterByCompositor(compositor, searchResults)
 	}

-	if capability := models.GetOr(req, "capability", ""); capability != "" {
+	if capability, ok := req.Params["capability"].(string); ok && capability != "" {
 		searchResults = plugins.FilterByCapability(capability, searchResults)
 	}

--- a/core/internal/server/plugins/uninstall.go
+++ b/core/internal/server/plugins/uninstall.go
@@ -9,7 +9,7 @@ import (
 )

 func HandleUninstall(conn net.Conn, req models.Request) {
-	name, ok := models.Get[string](req, "name")
+	name, ok := req.Params["name"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'name' parameter")
 		return
--- a/core/internal/server/plugins/update.go
+++ b/core/internal/server/plugins/update.go
@@ -9,7 +9,7 @@ import (
 )

 func HandleUpdate(conn net.Conn, req models.Request) {
-	name, ok := models.Get[string](req, "name")
+	name, ok := req.Params["name"].(string)
 	if !ok {
 		models.RespondError(conn, req.ID, "missing or invalid 'name' parameter")
 		return
--- a/core/internal/server/router.go
+++ b/core/internal/server/router.go
@@ -18,7 +18,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/network"
 	serverPlugins "github.com/AvengeMedia/DankMaterialShell/core/internal/server/plugins"
-	serverThemes "github.com/AvengeMedia/DankMaterialShell/core/internal/server/themes"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput"
 )
@@ -38,11 +37,6 @@ func RouteRequest(conn net.Conn, req models.Request) {
 		return
 	}

-	if strings.HasPrefix(req.Method, "themes.") {
-		serverThemes.HandleRequest(conn, req)
-		return
-	}
-
 	if strings.HasPrefix(req.Method, "loginctl.") {
 		if loginctlManager == nil {
 			models.RespondError(conn, req.ID, "loginctl manager not initialized")
@@ -192,21 +186,27 @@ func RouteRequest(conn net.Conn, req models.Request) {
 func handleClipboardSetConfig(conn net.Conn, req models.Request) {
 	cfg := clipboard.LoadConfig()

-	if v, ok := models.Get[float64](req, "maxHistory"); ok {
+	if v, ok := req.Params["maxHistory"].(float64); ok {
 		cfg.MaxHistory = int(v)
 	}
-	if v, ok := models.Get[float64](req, "maxEntrySize"); ok {
+	if v, ok := req.Params["maxEntrySize"].(float64); ok {
 		cfg.MaxEntrySize = int64(v)
 	}
-	if v, ok := models.Get[float64](req, "autoClearDays"); ok {
+	if v, ok := req.Params["autoClearDays"].(float64); ok {
 		cfg.AutoClearDays = int(v)
 	}
-	if v, ok := models.Get[bool](req, "clearAtStartup"); ok {
+	if v, ok := req.Params["clearAtStartup"].(bool); ok {
 		cfg.ClearAtStartup = v
 	}
-	if v, ok := models.Get[bool](req, "disabled"); ok {
+	if v, ok := req.Params["disabled"].(bool); ok {
 		cfg.Disabled = v
 	}
+	if v, ok := req.Params["disableHistory"].(bool); ok {
+		cfg.DisableHistory = v
+	}
+	if v, ok := req.Params["disablePersist"].(bool); ok {
+		cfg.DisablePersist = v
+	}

 	if err := clipboard.SaveConfig(cfg); err != nil {
 		models.RespondError(conn, req.ID, err.Error())
--- a/core/internal/server/server.go
+++ b/core/internal/server/server.go
@@ -520,7 +520,7 @@ func handleSubscribe(conn net.Conn, req models.Request) {
 	clientID := fmt.Sprintf("meta-client-%p", conn)

 	var services []string
-	if servicesParam, ok := models.Get[[]any](req, "services"); ok {
+	if servicesParam, ok := req.Params["services"].([]any); ok {
 		for _, s := range servicesParam {
 			if str, ok := s.(string); ok {
 				services = append(services, str)
--- a/core/internal/server/themes/handlers.go
+++ b/core/internal/server/themes/handlers.go
@@ -1,27 +0,0 @@
-package themes
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-)
-
-func HandleRequest(conn net.Conn, req models.Request) {
-	switch req.Method {
-	case "themes.list":
-		HandleList(conn, req)
-	case "themes.listInstalled":
-		HandleListInstalled(conn, req)
-	case "themes.install":
-		HandleInstall(conn, req)
-	case "themes.uninstall":
-		HandleUninstall(conn, req)
-	case "themes.update":
-		HandleUpdate(conn, req)
-	case "themes.search":
-		HandleSearch(conn, req)
-	default:
-		models.RespondError(conn, req.ID, fmt.Sprintf("unknown method: %s", req.Method))
-	}
-}
--- a/core/internal/server/themes/install.go
+++ b/core/internal/server/themes/install.go
@@ -1,52 +0,0 @@
-package themes
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/themes"
-)
-
-func HandleInstall(conn net.Conn, req models.Request) {
-	idOrName, ok := models.Get[string](req, "name")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'name' parameter")
-		return
-	}
-
-	registry, err := themes.NewRegistry()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create registry: %v", err))
-		return
-	}
-
-	themeList, err := registry.List()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to list themes: %v", err))
-		return
-	}
-
-	theme := themes.FindByIDOrName(idOrName, themeList)
-	if theme == nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("theme not found: %s", idOrName))
-		return
-	}
-
-	manager, err := themes.NewManager()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create manager: %v", err))
-		return
-	}
-
-	registryThemeDir := registry.GetThemeDir(theme.SourceDir)
-	if err := manager.Install(*theme, registryThemeDir); err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to install theme: %v", err))
-		return
-	}
-
-	models.Respond(conn, req.ID, models.SuccessResult{
-		Success: true,
-		Message: fmt.Sprintf("theme installed: %s", theme.Name),
-	})
-}
--- a/core/internal/server/themes/list.go
+++ b/core/internal/server/themes/list.go
@@ -1,54 +0,0 @@
-package themes
-
-import (
-	"fmt"
-	"net"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/themes"
-)
-
-func HandleList(conn net.Conn, req models.Request) {
-	registry, err := themes.NewRegistry()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create registry: %v", err))
-		return
-	}
-
-	themeList, err := registry.List()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to list themes: %v", err))
-		return
-	}
-
-	manager, err := themes.NewManager()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create manager: %v", err))
-		return
-	}
-
-	result := make([]ThemeInfo, len(themeList))
-	for i, t := range themeList {
-		installed, _ := manager.IsInstalled(t)
-		info := ThemeInfo{
-			ID:          t.ID,
-			Name:        t.Name,
-			Version:     t.Version,
-			Author:      t.Author,
-			Description: t.Description,
-			PreviewPath: t.PreviewPath,
-			SourceDir:   t.SourceDir,
-			Installed:   installed,
-			FirstParty:  isFirstParty(t.Author),
-		}
-		addVariantsInfo(&info, t.Variants)
-		result[i] = info
-	}
-
-	models.Respond(conn, req.ID, result)
-}
-
-func isFirstParty(author string) bool {
-	return strings.EqualFold(author, "Avenge Media") || strings.EqualFold(author, "AvengeMedia")
-}
--- a/core/internal/server/themes/list_installed.go
+++ b/core/internal/server/themes/list_installed.go
@@ -1,157 +0,0 @@
-package themes
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/themes"
-)
-
-func addVariantsInfo(info *ThemeInfo, variants *themes.ThemeVariants) {
-	if variants == nil {
-		return
-	}
-
-	if variants.Type == "multi" {
-		if len(variants.Flavors) == 0 && len(variants.Accents) == 0 {
-			return
-		}
-		info.HasVariants = true
-		info.Variants = &VariantsInfo{
-			Type:    "multi",
-			Flavors: make([]FlavorInfo, len(variants.Flavors)),
-			Accents: make([]AccentInfo, len(variants.Accents)),
-		}
-		if variants.Defaults != nil {
-			info.Variants.Defaults = &MultiDefaults{
-				Dark:  variants.Defaults.Dark,
-				Light: variants.Defaults.Light,
-			}
-		}
-		for i, f := range variants.Flavors {
-			mode := ""
-			switch {
-			case f.Dark.Primary != "" && f.Light.Primary != "":
-				mode = "both"
-			case f.Dark.Primary != "":
-				mode = "dark"
-			case f.Light.Primary != "":
-				mode = "light"
-			default:
-				if f.Dark.Surface != "" {
-					mode = "dark"
-				} else if f.Light.Surface != "" {
-					mode = "light"
-				}
-			}
-			info.Variants.Flavors[i] = FlavorInfo{ID: f.ID, Name: f.Name, Mode: mode}
-		}
-		for i, a := range variants.Accents {
-			color := ""
-			if colors, ok := a.FlavorColors["mocha"]; ok && colors.Primary != "" {
-				color = colors.Primary
-			} else if colors, ok := a.FlavorColors["latte"]; ok && colors.Primary != "" {
-				color = colors.Primary
-			} else {
-				for _, c := range a.FlavorColors {
-					if c.Primary != "" {
-						color = c.Primary
-						break
-					}
-				}
-			}
-			info.Variants.Accents[i] = AccentInfo{ID: a.ID, Name: a.Name, Color: color}
-		}
-		return
-	}
-
-	if len(variants.Options) == 0 {
-		return
-	}
-	info.HasVariants = true
-	info.Variants = &VariantsInfo{
-		Default: variants.Default,
-		Options: make([]VariantInfo, len(variants.Options)),
-	}
-	for i, v := range variants.Options {
-		info.Variants.Options[i] = VariantInfo{ID: v.ID, Name: v.Name}
-	}
-}
-
-func HandleListInstalled(conn net.Conn, req models.Request) {
-	manager, err := themes.NewManager()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create manager: %v", err))
-		return
-	}
-
-	installedIDs, err := manager.ListInstalled()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to list installed themes: %v", err))
-		return
-	}
-
-	registry, err := themes.NewRegistry()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create registry: %v", err))
-		return
-	}
-
-	allThemes, err := registry.List()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to list themes: %v", err))
-		return
-	}
-
-	themeMap := make(map[string]themes.Theme)
-	for _, t := range allThemes {
-		themeMap[t.ID] = t
-	}
-
-	result := make([]ThemeInfo, 0, len(installedIDs))
-	for _, id := range installedIDs {
-		if theme, ok := themeMap[id]; ok {
-			hasUpdate := false
-			if hasUpdates, err := manager.HasUpdates(id, theme); err == nil {
-				hasUpdate = hasUpdates
-			}
-
-			info := ThemeInfo{
-				ID:          theme.ID,
-				Name:        theme.Name,
-				Version:     theme.Version,
-				Author:      theme.Author,
-				Description: theme.Description,
-				SourceDir:   id,
-				FirstParty:  isFirstParty(theme.Author),
-				HasUpdate:   hasUpdate,
-			}
-			addVariantsInfo(&info, theme.Variants)
-			result = append(result, info)
-		} else {
-			installed, err := manager.GetInstalledTheme(id)
-			if err != nil {
-				result = append(result, ThemeInfo{
-					ID:        id,
-					Name:      id,
-					SourceDir: id,
-				})
-				continue
-			}
-			info := ThemeInfo{
-				ID:          installed.ID,
-				Name:        installed.Name,
-				Version:     installed.Version,
-				Author:      installed.Author,
-				Description: installed.Description,
-				SourceDir:   id,
-				FirstParty:  isFirstParty(installed.Author),
-			}
-			addVariantsInfo(&info, installed.Variants)
-			result = append(result, info)
-		}
-	}
-
-	models.Respond(conn, req.ID, result)
-}
--- a/core/internal/server/themes/search.go
+++ b/core/internal/server/themes/search.go
@@ -1,53 +0,0 @@
-package themes
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/themes"
-)
-
-func HandleSearch(conn net.Conn, req models.Request) {
-	query, ok := models.Get[string](req, "query")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'query' parameter")
-		return
-	}
-
-	registry, err := themes.NewRegistry()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create registry: %v", err))
-		return
-	}
-
-	themeList, err := registry.List()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to list themes: %v", err))
-		return
-	}
-
-	searchResults := themes.FuzzySearch(query, themeList)
-
-	manager, err := themes.NewManager()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create manager: %v", err))
-		return
-	}
-
-	result := make([]ThemeInfo, len(searchResults))
-	for i, t := range searchResults {
-		installed, _ := manager.IsInstalled(t)
-		result[i] = ThemeInfo{
-			ID:          t.ID,
-			Name:        t.Name,
-			Version:     t.Version,
-			Author:      t.Author,
-			Description: t.Description,
-			Installed:   installed,
-			FirstParty:  isFirstParty(t.Author),
-		}
-	}
-
-	models.Respond(conn, req.ID, result)
-}
--- a/core/internal/server/themes/types.go
+++ b/core/internal/server/themes/types.go
@@ -1,47 +0,0 @@
-package themes
-
-type VariantInfo struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
-}
-
-type FlavorInfo struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
-	Mode string `json:"mode,omitempty"`
-}
-
-type AccentInfo struct {
-	ID    string `json:"id"`
-	Name  string `json:"name"`
-	Color string `json:"color,omitempty"`
-}
-
-type MultiDefaults struct {
-	Dark  map[string]string `json:"dark,omitempty"`
-	Light map[string]string `json:"light,omitempty"`
-}
-
-type VariantsInfo struct {
-	Type     string         `json:"type,omitempty"`
-	Default  string         `json:"default,omitempty"`
-	Defaults *MultiDefaults `json:"defaults,omitempty"`
-	Options  []VariantInfo  `json:"options,omitempty"`
-	Flavors  []FlavorInfo   `json:"flavors,omitempty"`
-	Accents  []AccentInfo   `json:"accents,omitempty"`
-}
-
-type ThemeInfo struct {
-	ID          string        `json:"id"`
-	Name        string        `json:"name"`
-	Version     string        `json:"version"`
-	Author      string        `json:"author,omitempty"`
-	Description string        `json:"description,omitempty"`
-	PreviewPath string        `json:"previewPath,omitempty"`
-	SourceDir   string        `json:"sourceDir,omitempty"`
-	Installed   bool          `json:"installed,omitempty"`
-	FirstParty  bool          `json:"firstParty,omitempty"`
-	HasUpdate   bool          `json:"hasUpdate,omitempty"`
-	HasVariants bool          `json:"hasVariants,omitempty"`
-	Variants    *VariantsInfo `json:"variants,omitempty"`
-}
--- a/core/internal/server/themes/uninstall.go
+++ b/core/internal/server/themes/uninstall.go
@@ -1,63 +0,0 @@
-package themes
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/themes"
-)
-
-func HandleUninstall(conn net.Conn, req models.Request) {
-	idOrName, ok := models.Get[string](req, "name")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'name' parameter")
-		return
-	}
-
-	manager, err := themes.NewManager()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create manager: %v", err))
-		return
-	}
-
-	registry, err := themes.NewRegistry()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create registry: %v", err))
-		return
-	}
-
-	themeList, _ := registry.List()
-	theme := themes.FindByIDOrName(idOrName, themeList)
-
-	if theme != nil {
-		installed, err := manager.IsInstalled(*theme)
-		if err != nil {
-			models.RespondError(conn, req.ID, fmt.Sprintf("failed to check if theme is installed: %v", err))
-			return
-		}
-		if !installed {
-			models.RespondError(conn, req.ID, fmt.Sprintf("theme not installed: %s", idOrName))
-			return
-		}
-		if err := manager.Uninstall(*theme); err != nil {
-			models.RespondError(conn, req.ID, fmt.Sprintf("failed to uninstall theme: %v", err))
-			return
-		}
-		models.Respond(conn, req.ID, models.SuccessResult{
-			Success: true,
-			Message: fmt.Sprintf("theme uninstalled: %s", theme.Name),
-		})
-		return
-	}
-
-	if err := manager.UninstallByID(idOrName); err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("theme not found: %s", idOrName))
-		return
-	}
-
-	models.Respond(conn, req.ID, models.SuccessResult{
-		Success: true,
-		Message: fmt.Sprintf("theme uninstalled: %s", idOrName),
-	})
-}
--- a/core/internal/server/themes/update.go
+++ b/core/internal/server/themes/update.go
@@ -1,57 +0,0 @@
-package themes
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/themes"
-)
-
-func HandleUpdate(conn net.Conn, req models.Request) {
-	idOrName, ok := models.Get[string](req, "name")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'name' parameter")
-		return
-	}
-
-	manager, err := themes.NewManager()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create manager: %v", err))
-		return
-	}
-
-	registry, err := themes.NewRegistry()
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to create registry: %v", err))
-		return
-	}
-
-	themeList, _ := registry.List()
-	theme := themes.FindByIDOrName(idOrName, themeList)
-
-	if theme == nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("theme not found in registry: %s", idOrName))
-		return
-	}
-
-	installed, err := manager.IsInstalled(*theme)
-	if err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to check if theme is installed: %v", err))
-		return
-	}
-	if !installed {
-		models.RespondError(conn, req.ID, fmt.Sprintf("theme not installed: %s", idOrName))
-		return
-	}
-
-	if err := manager.Update(*theme); err != nil {
-		models.RespondError(conn, req.ID, fmt.Sprintf("failed to update theme: %v", err))
-		return
-	}
-
-	models.Respond(conn, req.ID, models.SuccessResult{
-		Success: true,
-		Message: fmt.Sprintf("theme updated: %s", theme.Name),
-	})
-}
--- a/core/internal/server/wayland/handlers.go
+++ b/core/internal/server/wayland/handlers.go
@@ -45,7 +45,7 @@ func handleGetState(conn net.Conn, req models.Request, manager *Manager) {
 func handleSetTemperature(conn net.Conn, req models.Request, manager *Manager) {
 	var lowTemp, highTemp int

-	if temp, ok := models.Get[float64](req, "temp"); ok {
+	if temp, ok := req.Params["temp"].(float64); ok {
 		lowTemp = int(temp)
 		highTemp = int(temp)
 	} else {
@@ -93,10 +93,24 @@ func handleSetLocation(conn net.Conn, req models.Request, manager *Manager) {
 }

 func handleSetManualTimes(conn net.Conn, req models.Request, manager *Manager) {
-	sunriseStr, sunriseOK := models.Get[string](req, "sunrise")
-	sunsetStr, sunsetOK := models.Get[string](req, "sunset")
+	sunriseParam := req.Params["sunrise"]
+	sunsetParam := req.Params["sunset"]

-	if !sunriseOK || !sunsetOK || sunriseStr == "" || sunsetStr == "" {
+	if sunriseParam == nil || sunsetParam == nil {
+		manager.ClearManualTimes()
+		models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "manual times cleared"})
+		return
+	}
+
+	sunriseStr, ok := sunriseParam.(string)
+	if !ok || sunriseStr == "" {
+		manager.ClearManualTimes()
+		models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "manual times cleared"})
+		return
+	}
+
+	sunsetStr, ok := sunsetParam.(string)
+	if !ok || sunsetStr == "" {
 		manager.ClearManualTimes()
 		models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "manual times cleared"})
 		return
--- a/core/internal/server/wayland/manager.go
+++ b/core/internal/server/wayland/manager.go
@@ -878,35 +878,18 @@ func (m *Manager) handleDBusSignal(sig *dbus.Signal) {
 		return
 	}
 	preparing, ok := sig.Body[0].(bool)
-	if !ok || preparing {
+	if !ok {
+		return
+	}
+	if preparing {
 		return
 	}
 	m.configMutex.RLock()
 	enabled := m.config.Enabled
 	m.configMutex.RUnlock()
-	if !enabled {
-		return
+	if enabled {
+		m.triggerUpdate()
 	}
-	time.AfterFunc(500*time.Millisecond, func() {
-		m.post(func() {
-			m.configMutex.RLock()
-			stillEnabled := m.config.Enabled
-			m.configMutex.RUnlock()
-			if !stillEnabled || !m.controlsInitialized {
-				return
-			}
-			m.outputs.Range(func(_ uint32, out *outputState) bool {
-				if out.gammaControl != nil {
-					out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1).Destroy()
-					out.gammaControl = nil
-				}
-				out.retryCount = 0
-				out.failed = false
-				m.recreateOutputControl(out)
-				return true
-			})
-		})
-	})
 }

 func (m *Manager) triggerUpdate() {
--- a/core/internal/server/wayland/manager_test.go
+++ b/core/internal/server/wayland/manager_test.go
@@ -13,7 +13,7 @@ import (

 func TestManager_ActorSerializesOutputStateAccess(t *testing.T) {
 	m := &Manager{
-		cmdq:     make(chan cmd, 8192),
+		cmdq:     make(chan cmd, 128),
 		stopChan: make(chan struct{}),
 	}

--- a/core/internal/server/wlcontext/context_test.go
+++ b/core/internal/server/wlcontext/context_test.go
@@ -5,29 +5,13 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"golang.org/x/sys/unix"
 )

-func newTestSharedContext(t *testing.T, queueSize int) *SharedContext {
-	t.Helper()
-	fds := make([]int, 2)
-	if err := unix.Pipe(fds); err != nil {
-		t.Fatalf("failed to create test pipe: %v", err)
-	}
-	t.Cleanup(func() {
-		unix.Close(fds[0])
-		unix.Close(fds[1])
-	})
-	return &SharedContext{
-		cmdQueue: make(chan func(), queueSize),
-		stopChan: make(chan struct{}),
-		wakeR:    fds[0],
-		wakeW:    fds[1],
-	}
-}
-
 func TestSharedContext_ConcurrentPostNonBlocking(t *testing.T) {
-	sc := newTestSharedContext(t, 256)
+	sc := &SharedContext{
+		cmdQueue: make(chan func(), 256),
+		stopChan: make(chan struct{}),
+	}

 	var wg sync.WaitGroup
 	const goroutines = 100
@@ -49,7 +33,10 @@ func TestSharedContext_ConcurrentPostNonBlocking(t *testing.T) {
 }

 func TestSharedContext_PostQueueFull(t *testing.T) {
-	sc := newTestSharedContext(t, 2)
+	sc := &SharedContext{
+		cmdQueue: make(chan func(), 2),
+		stopChan: make(chan struct{}),
+	}

 	sc.Post(func() {})
 	sc.Post(func() {})
@@ -60,8 +47,11 @@ func TestSharedContext_PostQueueFull(t *testing.T) {
 }

 func TestSharedContext_StartMultipleTimes(t *testing.T) {
-	sc := newTestSharedContext(t, 256)
-	sc.started = true
+	sc := &SharedContext{
+		cmdQueue: make(chan func(), 256),
+		stopChan: make(chan struct{}),
+		started:  false,
+	}

 	var wg sync.WaitGroup
 	const goroutines = 10
@@ -80,7 +70,10 @@ func TestSharedContext_StartMultipleTimes(t *testing.T) {
 }

 func TestSharedContext_DrainCmdQueue(t *testing.T) {
-	sc := newTestSharedContext(t, 256)
+	sc := &SharedContext{
+		cmdQueue: make(chan func(), 256),
+		stopChan: make(chan struct{}),
+	}

 	counter := 0
 	for i := 0; i < 10; i++ {
@@ -96,7 +89,10 @@ func TestSharedContext_DrainCmdQueue(t *testing.T) {
 }

 func TestSharedContext_DrainCmdQueueEmpty(t *testing.T) {
-	sc := newTestSharedContext(t, 256)
+	sc := &SharedContext{
+		cmdQueue: make(chan func(), 256),
+		stopChan: make(chan struct{}),
+	}

 	sc.drainCmdQueue()

@@ -104,7 +100,10 @@ func TestSharedContext_DrainCmdQueueEmpty(t *testing.T) {
 }

 func TestSharedContext_ConcurrentDrainAndPost(t *testing.T) {
-	sc := newTestSharedContext(t, 256)
+	sc := &SharedContext{
+		cmdQueue: make(chan func(), 256),
+		stopChan: make(chan struct{}),
+	}

 	var wg sync.WaitGroup

--- a/core/internal/server/wlroutput/handlers.go
+++ b/core/internal/server/wlroutput/handlers.go
@@ -56,7 +56,7 @@ func handleGetState(conn net.Conn, req models.Request, manager *Manager) {
 }

 func handleApplyConfiguration(conn net.Conn, req models.Request, manager *Manager, test bool) {
-	headsParam, ok := models.Get[any](req, "heads")
+	headsParam, ok := req.Params["heads"]
 	if !ok {
 		models.RespondError(conn, req.ID, "missing 'heads' parameter")
 		return
--- a/core/internal/server/wlroutput/manager.go
+++ b/core/internal/server/wlroutput/manager.go
@@ -241,7 +241,6 @@ func (m *Manager) handleHead(e wlr_output_management.ZwlrOutputManagerV1HeadEven
 	handle.SetAdaptiveSyncHandler(func(e wlr_output_management.ZwlrOutputHeadV1AdaptiveSyncEvent) {
 		log.Debugf("WlrOutput: Head %d adaptive sync: %d", headID, e.State)
 		head.adaptiveSync = e.State
-		head.adaptiveSyncSupported = true
 		m.post(func() {
 			m.updateState()
 		})
@@ -361,23 +360,22 @@ func (m *Manager) updateState() {
 		}

 		output := Output{
-			Name:                  head.name,
-			Description:           head.description,
-			Make:                  head.make,
-			Model:                 head.model,
-			SerialNumber:          head.serialNumber,
-			PhysicalWidth:         head.physicalWidth,
-			PhysicalHeight:        head.physicalHeight,
-			Enabled:               head.enabled,
-			X:                     head.x,
-			Y:                     head.y,
-			Transform:             head.transform,
-			Scale:                 head.scale,
-			CurrentMode:           currentMode,
-			Modes:                 modes,
-			AdaptiveSync:          head.adaptiveSync,
-			AdaptiveSyncSupported: head.adaptiveSyncSupported,
-			ID:                    head.id,
+			Name:           head.name,
+			Description:    head.description,
+			Make:           head.make,
+			Model:          head.model,
+			SerialNumber:   head.serialNumber,
+			PhysicalWidth:  head.physicalWidth,
+			PhysicalHeight: head.physicalHeight,
+			Enabled:        head.enabled,
+			X:              head.x,
+			Y:              head.y,
+			Transform:      head.transform,
+			Scale:          head.scale,
+			CurrentMode:    currentMode,
+			Modes:          modes,
+			AdaptiveSync:   head.adaptiveSync,
+			ID:             head.id,
 		}
 		outputs = append(outputs, output)
 		return true
--- a/core/internal/server/wlroutput/types.go
+++ b/core/internal/server/wlroutput/types.go
@@ -17,23 +17,22 @@ type OutputMode struct {
 }

 type Output struct {
-	Name                  string       `json:"name"`
-	Description           string       `json:"description"`
-	Make                  string       `json:"make"`
-	Model                 string       `json:"model"`
-	SerialNumber          string       `json:"serialNumber"`
-	PhysicalWidth         int32        `json:"physicalWidth"`
-	PhysicalHeight        int32        `json:"physicalHeight"`
-	Enabled               bool         `json:"enabled"`
-	X                     int32        `json:"x"`
-	Y                     int32        `json:"y"`
-	Transform             int32        `json:"transform"`
-	Scale                 float64      `json:"scale"`
-	CurrentMode           *OutputMode  `json:"currentMode"`
-	Modes                 []OutputMode `json:"modes"`
-	AdaptiveSync          uint32       `json:"adaptiveSync"`
-	AdaptiveSyncSupported bool         `json:"adaptiveSyncSupported"`
-	ID                    uint32       `json:"id"`
+	Name           string       `json:"name"`
+	Description    string       `json:"description"`
+	Make           string       `json:"make"`
+	Model          string       `json:"model"`
+	SerialNumber   string       `json:"serialNumber"`
+	PhysicalWidth  int32        `json:"physicalWidth"`
+	PhysicalHeight int32        `json:"physicalHeight"`
+	Enabled        bool         `json:"enabled"`
+	X              int32        `json:"x"`
+	Y              int32        `json:"y"`
+	Transform      int32        `json:"transform"`
+	Scale          float64      `json:"scale"`
+	CurrentMode    *OutputMode  `json:"currentMode"`
+	Modes          []OutputMode `json:"modes"`
+	AdaptiveSync   uint32       `json:"adaptiveSync"`
+	ID             uint32       `json:"id"`
 }

 type State struct {
@@ -73,26 +72,25 @@ type Manager struct {
 }

 type headState struct {
-	id                    uint32
-	handle                *wlr_output_management.ZwlrOutputHeadV1
-	name                  string
-	description           string
-	make                  string
-	model                 string
-	serialNumber          string
-	physicalWidth         int32
-	physicalHeight        int32
-	enabled               bool
-	x                     int32
-	y                     int32
-	transform             int32
-	scale                 float64
-	currentModeID         uint32
-	modeIDs               []uint32
-	adaptiveSync          uint32
-	adaptiveSyncSupported bool
-	finished              bool
-	ready                 bool
+	id             uint32
+	handle         *wlr_output_management.ZwlrOutputHeadV1
+	name           string
+	description    string
+	make           string
+	model          string
+	serialNumber   string
+	physicalWidth  int32
+	physicalHeight int32
+	enabled        bool
+	x              int32
+	y              int32
+	transform      int32
+	scale          float64
+	currentModeID  uint32
+	modeIDs        []uint32
+	adaptiveSync   uint32
+	finished       bool
+	ready          bool
 }

 type modeState struct {
@@ -171,7 +169,7 @@ func stateChanged(old, new *State) bool {
 		if oldOut.Transform != newOut.Transform || oldOut.Scale != newOut.Scale {
 			return true
 		}
-		if oldOut.AdaptiveSync != newOut.AdaptiveSync || oldOut.AdaptiveSyncSupported != newOut.AdaptiveSyncSupported {
+		if oldOut.AdaptiveSync != newOut.AdaptiveSync {
 			return true
 		}
 		if (oldOut.CurrentMode == nil) != (newOut.CurrentMode == nil) {
--- a/core/internal/themes/manager.go
+++ b/core/internal/themes/manager.go
@@ -1,258 +0,0 @@
-package themes
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/spf13/afero"
-)
-
-type Manager struct {
-	fs        afero.Fs
-	themesDir string
-}
-
-func NewManager() (*Manager, error) {
-	return NewManagerWithFs(afero.NewOsFs())
-}
-
-func NewManagerWithFs(fs afero.Fs) (*Manager, error) {
-	themesDir := getThemesDir()
-	return &Manager{
-		fs:        fs,
-		themesDir: themesDir,
-	}, nil
-}
-
-func getThemesDir() string {
-	configDir, err := os.UserConfigDir()
-	if err != nil {
-		log.Error("failed to get user config dir", "err", err)
-		return ""
-	}
-	return filepath.Join(configDir, "DankMaterialShell", "themes")
-}
-
-func (m *Manager) IsInstalled(theme Theme) (bool, error) {
-	path := m.getInstalledPath(theme.ID)
-	exists, err := afero.Exists(m.fs, path)
-	if err != nil {
-		return false, err
-	}
-	return exists, nil
-}
-
-func (m *Manager) getInstalledDir(themeID string) string {
-	return filepath.Join(m.themesDir, themeID)
-}
-
-func (m *Manager) getInstalledPath(themeID string) string {
-	return filepath.Join(m.getInstalledDir(themeID), "theme.json")
-}
-
-func (m *Manager) Install(theme Theme, registryThemeDir string) error {
-	themeDir := m.getInstalledDir(theme.ID)
-
-	exists, err := afero.DirExists(m.fs, themeDir)
-	if err != nil {
-		return fmt.Errorf("failed to check if theme exists: %w", err)
-	}
-
-	if exists {
-		return fmt.Errorf("theme already installed: %s", theme.Name)
-	}
-
-	if err := m.fs.MkdirAll(themeDir, 0755); err != nil {
-		return fmt.Errorf("failed to create theme directory: %w", err)
-	}
-
-	data, err := json.MarshalIndent(theme, "", "  ")
-	if err != nil {
-		return fmt.Errorf("failed to marshal theme: %w", err)
-	}
-
-	themePath := filepath.Join(themeDir, "theme.json")
-	if err := afero.WriteFile(m.fs, themePath, data, 0644); err != nil {
-		return fmt.Errorf("failed to write theme file: %w", err)
-	}
-
-	m.copyPreviewFiles(registryThemeDir, themeDir, theme)
-	return nil
-}
-
-func (m *Manager) copyPreviewFiles(srcDir, dstDir string, theme Theme) {
-	previews := []string{"preview-dark.svg", "preview-light.svg"}
-
-	if theme.Variants != nil {
-		for _, v := range theme.Variants.Options {
-			previews = append(previews,
-				fmt.Sprintf("preview-%s.svg", v.ID),
-				fmt.Sprintf("preview-%s-dark.svg", v.ID),
-				fmt.Sprintf("preview-%s-light.svg", v.ID),
-			)
-		}
-	}
-
-	for _, preview := range previews {
-		srcPath := filepath.Join(srcDir, preview)
-		if exists, _ := afero.Exists(m.fs, srcPath); !exists {
-			continue
-		}
-		data, err := afero.ReadFile(m.fs, srcPath)
-		if err != nil {
-			continue
-		}
-		dstPath := filepath.Join(dstDir, preview)
-		_ = afero.WriteFile(m.fs, dstPath, data, 0644)
-	}
-}
-
-func (m *Manager) InstallFromRegistry(registry *Registry, themeID string) error {
-	theme, err := registry.Get(themeID)
-	if err != nil {
-		return err
-	}
-
-	registryThemeDir := registry.GetThemeDir(theme.SourceDir)
-	return m.Install(*theme, registryThemeDir)
-}
-
-func (m *Manager) Update(theme Theme) error {
-	themePath := m.getInstalledPath(theme.ID)
-
-	exists, err := afero.Exists(m.fs, themePath)
-	if err != nil {
-		return fmt.Errorf("failed to check if theme exists: %w", err)
-	}
-
-	if !exists {
-		return fmt.Errorf("theme not installed: %s", theme.Name)
-	}
-
-	data, err := json.MarshalIndent(theme, "", "  ")
-	if err != nil {
-		return fmt.Errorf("failed to marshal theme: %w", err)
-	}
-
-	if err := afero.WriteFile(m.fs, themePath, data, 0644); err != nil {
-		return fmt.Errorf("failed to write theme file: %w", err)
-	}
-
-	return nil
-}
-
-func (m *Manager) Uninstall(theme Theme) error {
-	return m.UninstallByID(theme.ID)
-}
-
-func (m *Manager) UninstallByID(themeID string) error {
-	themeDir := m.getInstalledDir(themeID)
-
-	exists, err := afero.DirExists(m.fs, themeDir)
-	if err != nil {
-		return fmt.Errorf("failed to check if theme exists: %w", err)
-	}
-
-	if !exists {
-		return fmt.Errorf("theme not installed: %s", themeID)
-	}
-
-	if err := m.fs.RemoveAll(themeDir); err != nil {
-		return fmt.Errorf("failed to remove theme: %w", err)
-	}
-
-	return nil
-}
-
-func (m *Manager) ListInstalled() ([]string, error) {
-	exists, err := afero.DirExists(m.fs, m.themesDir)
-	if err != nil {
-		return nil, err
-	}
-
-	if !exists {
-		return []string{}, nil
-	}
-
-	entries, err := afero.ReadDir(m.fs, m.themesDir)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read themes directory: %w", err)
-	}
-
-	var installed []string
-	for _, entry := range entries {
-		if !entry.IsDir() {
-			continue
-		}
-
-		themeID := entry.Name()
-		themePath := filepath.Join(m.themesDir, themeID, "theme.json")
-		if exists, _ := afero.Exists(m.fs, themePath); exists {
-			installed = append(installed, themeID)
-		}
-	}
-
-	return installed, nil
-}
-
-func (m *Manager) GetInstalledTheme(themeID string) (*Theme, error) {
-	themePath := m.getInstalledPath(themeID)
-
-	data, err := afero.ReadFile(m.fs, themePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read theme file: %w", err)
-	}
-
-	var theme Theme
-	if err := json.Unmarshal(data, &theme); err != nil {
-		return nil, fmt.Errorf("failed to parse theme file: %w", err)
-	}
-
-	return &theme, nil
-}
-
-func (m *Manager) HasUpdates(themeID string, registryTheme Theme) (bool, error) {
-	installed, err := m.GetInstalledTheme(themeID)
-	if err != nil {
-		return false, err
-	}
-
-	return compareVersions(installed.Version, registryTheme.Version) < 0, nil
-}
-
-func compareVersions(installed, registry string) int {
-	installedParts := strings.Split(installed, ".")
-	registryParts := strings.Split(registry, ".")
-
-	maxLen := len(installedParts)
-	if len(registryParts) > maxLen {
-		maxLen = len(registryParts)
-	}
-
-	for i := 0; i < maxLen; i++ {
-		var installedNum, registryNum int
-		if i < len(installedParts) {
-			fmt.Sscanf(installedParts[i], "%d", &installedNum)
-		}
-		if i < len(registryParts) {
-			fmt.Sscanf(registryParts[i], "%d", &registryNum)
-		}
-
-		if installedNum < registryNum {
-			return -1
-		}
-		if installedNum > registryNum {
-			return 1
-		}
-	}
-
-	return 0
-}
-
-func (m *Manager) GetThemesDir() string {
-	return m.themesDir
-}
--- a/core/internal/themes/registry.go
+++ b/core/internal/themes/registry.go
@@ -1,309 +0,0 @@
-package themes
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/go-git/go-git/v6"
-	"github.com/spf13/afero"
-)
-
-const registryRepo = "https://github.com/AvengeMedia/dms-plugin-registry.git"
-
-type ColorScheme struct {
-	Primary                 string `json:"primary,omitempty"`
-	PrimaryText             string `json:"primaryText,omitempty"`
-	PrimaryContainer        string `json:"primaryContainer,omitempty"`
-	Secondary               string `json:"secondary,omitempty"`
-	Surface                 string `json:"surface,omitempty"`
-	SurfaceText             string `json:"surfaceText,omitempty"`
-	SurfaceVariant          string `json:"surfaceVariant,omitempty"`
-	SurfaceVariantText      string `json:"surfaceVariantText,omitempty"`
-	SurfaceTint             string `json:"surfaceTint,omitempty"`
-	Background              string `json:"background,omitempty"`
-	BackgroundText          string `json:"backgroundText,omitempty"`
-	Outline                 string `json:"outline,omitempty"`
-	SurfaceContainer        string `json:"surfaceContainer,omitempty"`
-	SurfaceContainerHigh    string `json:"surfaceContainerHigh,omitempty"`
-	SurfaceContainerHighest string `json:"surfaceContainerHighest,omitempty"`
-	Error                   string `json:"error,omitempty"`
-	Warning                 string `json:"warning,omitempty"`
-	Info                    string `json:"info,omitempty"`
-}
-
-type ThemeVariant struct {
-	ID    string      `json:"id"`
-	Name  string      `json:"name"`
-	Dark  ColorScheme `json:"dark,omitempty"`
-	Light ColorScheme `json:"light,omitempty"`
-}
-
-type ThemeFlavor struct {
-	ID    string      `json:"id"`
-	Name  string      `json:"name"`
-	Dark  ColorScheme `json:"dark,omitempty"`
-	Light ColorScheme `json:"light,omitempty"`
-}
-
-type ThemeAccent struct {
-	ID           string                 `json:"id"`
-	Name         string                 `json:"name"`
-	FlavorColors map[string]ColorScheme `json:"-"`
-}
-
-func (a *ThemeAccent) UnmarshalJSON(data []byte) error {
-	var raw map[string]json.RawMessage
-	if err := json.Unmarshal(data, &raw); err != nil {
-		return err
-	}
-	a.FlavorColors = make(map[string]ColorScheme)
-	var mErr error
-	for key, value := range raw {
-		switch key {
-		case "id":
-			mErr = errors.Join(mErr, json.Unmarshal(value, &a.ID))
-		case "name":
-			mErr = errors.Join(mErr, json.Unmarshal(value, &a.Name))
-		default:
-			var colors ColorScheme
-			if err := json.Unmarshal(value, &colors); err == nil {
-				a.FlavorColors[key] = colors
-			} else {
-				mErr = errors.Join(mErr, fmt.Errorf("failed to unmarshal flavor colors for key %s: %w", key, err))
-			}
-		}
-	}
-	return mErr
-}
-
-func (a ThemeAccent) MarshalJSON() ([]byte, error) {
-	m := map[string]any{
-		"id":   a.ID,
-		"name": a.Name,
-	}
-	for k, v := range a.FlavorColors {
-		m[k] = v
-	}
-	return json.Marshal(m)
-}
-
-type MultiVariantDefaults struct {
-	Dark  map[string]string `json:"dark,omitempty"`
-	Light map[string]string `json:"light,omitempty"`
-}
-
-type ThemeVariants struct {
-	Type     string                `json:"type,omitempty"`
-	Default  string                `json:"default,omitempty"`
-	Defaults *MultiVariantDefaults `json:"defaults,omitempty"`
-	Options  []ThemeVariant        `json:"options,omitempty"`
-	Flavors  []ThemeFlavor         `json:"flavors,omitempty"`
-	Accents  []ThemeAccent         `json:"accents,omitempty"`
-}
-
-type Theme struct {
-	ID          string         `json:"id"`
-	Name        string         `json:"name"`
-	Version     string         `json:"version"`
-	Author      string         `json:"author"`
-	Description string         `json:"description"`
-	Dark        ColorScheme    `json:"dark"`
-	Light       ColorScheme    `json:"light"`
-	Variants    *ThemeVariants `json:"variants,omitempty"`
-	PreviewPath string         `json:"-"`
-	SourceDir   string         `json:"sourceDir,omitempty"`
-}
-
-type GitClient interface {
-	PlainClone(path string, url string) error
-	Pull(path string) error
-}
-
-type realGitClient struct{}
-
-func (g *realGitClient) PlainClone(path string, url string) error {
-	_, err := git.PlainClone(path, &git.CloneOptions{
-		URL:      url,
-		Progress: os.Stdout,
-	})
-	return err
-}
-
-func (g *realGitClient) Pull(path string) error {
-	repo, err := git.PlainOpen(path)
-	if err != nil {
-		return err
-	}
-
-	worktree, err := repo.Worktree()
-	if err != nil {
-		return err
-	}
-
-	err = worktree.Pull(&git.PullOptions{})
-	if err != nil && err.Error() != "already up-to-date" {
-		return err
-	}
-
-	return nil
-}
-
-type Registry struct {
-	fs       afero.Fs
-	cacheDir string
-	themes   []Theme
-	git      GitClient
-}
-
-func NewRegistry() (*Registry, error) {
-	return NewRegistryWithFs(afero.NewOsFs())
-}
-
-func NewRegistryWithFs(fs afero.Fs) (*Registry, error) {
-	cacheDir := getCacheDir()
-	return &Registry{
-		fs:       fs,
-		cacheDir: cacheDir,
-		git:      &realGitClient{},
-	}, nil
-}
-
-func getCacheDir() string {
-	return filepath.Join(os.TempDir(), "dankdots-plugin-registry")
-}
-
-func (r *Registry) Update() error {
-	exists, err := afero.DirExists(r.fs, r.cacheDir)
-	if err != nil {
-		return fmt.Errorf("failed to check cache directory: %w", err)
-	}
-
-	if !exists {
-		if err := r.fs.MkdirAll(filepath.Dir(r.cacheDir), 0755); err != nil {
-			return fmt.Errorf("failed to create cache directory: %w", err)
-		}
-
-		if err := r.git.PlainClone(r.cacheDir, registryRepo); err != nil {
-			return fmt.Errorf("failed to clone registry: %w", err)
-		}
-	} else {
-		if err := r.git.Pull(r.cacheDir); err != nil {
-			if err := r.fs.RemoveAll(r.cacheDir); err != nil {
-				return fmt.Errorf("failed to remove corrupted registry: %w", err)
-			}
-
-			if err := r.fs.MkdirAll(filepath.Dir(r.cacheDir), 0755); err != nil {
-				return fmt.Errorf("failed to create cache directory: %w", err)
-			}
-
-			if err := r.git.PlainClone(r.cacheDir, registryRepo); err != nil {
-				return fmt.Errorf("failed to re-clone registry: %w", err)
-			}
-		}
-	}
-
-	return r.loadThemes()
-}
-
-func (r *Registry) loadThemes() error {
-	themesDir := filepath.Join(r.cacheDir, "themes")
-
-	entries, err := afero.ReadDir(r.fs, themesDir)
-	if err != nil {
-		return fmt.Errorf("failed to read themes directory: %w", err)
-	}
-
-	r.themes = []Theme{}
-
-	for _, entry := range entries {
-		if !entry.IsDir() {
-			continue
-		}
-
-		themeDir := filepath.Join(themesDir, entry.Name())
-		themeFile := filepath.Join(themeDir, "theme.json")
-
-		data, err := afero.ReadFile(r.fs, themeFile)
-		if err != nil {
-			continue
-		}
-
-		var theme Theme
-		if err := json.Unmarshal(data, &theme); err != nil {
-			continue
-		}
-
-		if theme.ID == "" {
-			theme.ID = entry.Name()
-		}
-		theme.SourceDir = entry.Name()
-
-		previewPath := filepath.Join(themeDir, "preview.svg")
-		if exists, _ := afero.Exists(r.fs, previewPath); exists {
-			theme.PreviewPath = previewPath
-		}
-
-		r.themes = append(r.themes, theme)
-	}
-
-	return nil
-}
-
-func (r *Registry) List() ([]Theme, error) {
-	if len(r.themes) == 0 {
-		if err := r.Update(); err != nil {
-			return nil, err
-		}
-	}
-
-	return SortByFirstParty(r.themes), nil
-}
-
-func (r *Registry) Search(query string) ([]Theme, error) {
-	allThemes, err := r.List()
-	if err != nil {
-		return nil, err
-	}
-
-	if query == "" {
-		return allThemes, nil
-	}
-
-	return SortByFirstParty(FuzzySearch(query, allThemes)), nil
-}
-
-func (r *Registry) Get(idOrName string) (*Theme, error) {
-	themes, err := r.List()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, t := range themes {
-		if t.ID == idOrName {
-			return &t, nil
-		}
-	}
-
-	for _, t := range themes {
-		if t.Name == idOrName {
-			return &t, nil
-		}
-	}
-
-	return nil, fmt.Errorf("theme not found: %s", idOrName)
-}
-
-func (r *Registry) GetThemeSourcePath(themeID string) string {
-	return filepath.Join(r.cacheDir, "themes", themeID, "theme.json")
-}
-
-func (r *Registry) GetThemeDir(themeID string) string {
-	return filepath.Join(r.cacheDir, "themes", themeID)
-}
-
-func SortByFirstParty(themes []Theme) []Theme {
-	return themes
-}
--- a/core/internal/themes/search.go
+++ b/core/internal/themes/search.go
@@ -1,40 +0,0 @@
-package themes
-
-import (
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
-)
-
-func FuzzySearch(query string, themes []Theme) []Theme {
-	if query == "" {
-		return themes
-	}
-
-	queryLower := strings.ToLower(query)
-	return utils.Filter(themes, func(t Theme) bool {
-		return fuzzyMatch(queryLower, strings.ToLower(t.Name)) ||
-			fuzzyMatch(queryLower, strings.ToLower(t.Description)) ||
-			fuzzyMatch(queryLower, strings.ToLower(t.Author))
-	})
-}
-
-func fuzzyMatch(query, text string) bool {
-	queryIdx := 0
-	for _, char := range text {
-		if queryIdx < len(query) && char == rune(query[queryIdx]) {
-			queryIdx++
-		}
-	}
-	return queryIdx == len(query)
-}
-
-func FindByIDOrName(idOrName string, themes []Theme) *Theme {
-	if t, found := utils.Find(themes, func(t Theme) bool { return t.ID == idOrName }); found {
-		return &t
-	}
-	if t, found := utils.Find(themes, func(t Theme) bool { return t.Name == idOrName }); found {
-		return &t
-	}
-	return nil
-}
--- a/core/internal/utils/exec.go
+++ b/core/internal/utils/exec.go
@@ -6,12 +6,3 @@ func CommandExists(cmd string) bool {
 	_, err := exec.LookPath(cmd)
 	return err == nil
 }
-
-func AnyCommandExists(cmds ...string) bool {
-	for _, cmd := range cmds {
-		if CommandExists(cmd) {
-			return true
-		}
-	}
-	return false
-}
--- a/core/internal/utils/flatpak.go
+++ b/core/internal/utils/flatpak.go
@@ -1,78 +0,0 @@
-package utils
-
-import (
-	"bytes"
-	"errors"
-	"os/exec"
-	"strings"
-)
-
-func FlatpakInPath() bool {
-	_, err := exec.LookPath("flatpak")
-	return err == nil
-}
-
-func FlatpakExists(name string) bool {
-	if !FlatpakInPath() {
-		return false
-	}
-
-	cmd := exec.Command("flatpak", "info", name)
-	err := cmd.Run()
-	return err == nil
-}
-
-func FlatpakSearchBySubstring(substring string) bool {
-	if !FlatpakInPath() {
-		return false
-	}
-
-	cmd := exec.Command("flatpak", "list", "--app")
-	var stdout bytes.Buffer
-	cmd.Stdout = &stdout
-
-	if err := cmd.Run(); err != nil {
-		return false
-	}
-
-	out := stdout.String()
-
-	for line := range strings.SplitSeq(out, "\n") {
-		fields := strings.Fields(line)
-		if len(fields) > 1 {
-			id := fields[1]
-			idParts := strings.Split(id, ".")
-			// We are assuming that the last part of the ID is
-			// the package name we're looking for. This might
-			// not always be true, some developers use arbitrary
-			// suffixes.
-			if len(idParts) > 0 && idParts[len(idParts)-1] == substring {
-				cmd := exec.Command("flatpak", "info", id)
-				err := cmd.Run()
-				return err == nil
-			}
-		}
-	}
-	return false
-}
-
-func FlatpakInstallationDir(name string) (string, error) {
-	if !FlatpakInPath() {
-		return "", errors.New("flatpak not found in PATH")
-	}
-
-	cmd := exec.Command("flatpak", "info", "--show-location", name)
-	var stdout bytes.Buffer
-	cmd.Stdout = &stdout
-
-	if err := cmd.Run(); err != nil {
-		return "", errors.New("flatpak not installed: " + name)
-	}
-
-	location := strings.TrimSpace(stdout.String())
-	if location == "" {
-		return "", errors.New("installation directory not found for: " + name)
-	}
-
-	return location, nil
-}
--- a/core/internal/utils/flatpak_test.go
+++ b/core/internal/utils/flatpak_test.go
@@ -1,210 +0,0 @@
-package utils
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestFlatpakInPathAvailable(t *testing.T) {
-	result := FlatpakInPath()
-	if !result {
-		t.Skip("flatpak not in PATH")
-	}
-	if !result {
-		t.Errorf("expected true when flatpak is in PATH")
-	}
-}
-
-func TestFlatpakInPathUnavailable(t *testing.T) {
-	tempDir := t.TempDir()
-	t.Setenv("PATH", tempDir)
-
-	result := FlatpakInPath()
-	if result {
-		t.Errorf("expected false when flatpak not in PATH, got true")
-	}
-}
-
-func TestFlatpakExistsValidPackage(t *testing.T) {
-	if !FlatpakInPath() {
-		t.Skip("flatpak not in PATH")
-	}
-
-	result := FlatpakExists("com.nonexistent.package.test")
-	if result {
-		t.Logf("package exists (unexpected but not an error)")
-	}
-}
-
-func TestFlatpakExistsNoFlatpak(t *testing.T) {
-	tempDir := t.TempDir()
-	t.Setenv("PATH", tempDir)
-
-	result := FlatpakExists("any.package.name")
-	if result {
-		t.Errorf("expected false when flatpak not in PATH, got true")
-	}
-}
-
-func TestFlatpakSearchBySubstringNoFlatpak(t *testing.T) {
-	tempDir := t.TempDir()
-	t.Setenv("PATH", tempDir)
-
-	result := FlatpakSearchBySubstring("test")
-	if result {
-		t.Errorf("expected false when flatpak not in PATH, got true")
-	}
-}
-
-func TestFlatpakSearchBySubstringNonexistent(t *testing.T) {
-	if !FlatpakInPath() {
-		t.Skip("flatpak not in PATH")
-	}
-
-	result := FlatpakSearchBySubstring("ThisIsAVeryUnlikelyPackageName12345")
-	if result {
-		t.Errorf("expected false for nonexistent package substring")
-	}
-}
-
-func TestFlatpakInstallationDirNoFlatpak(t *testing.T) {
-	tempDir := t.TempDir()
-	t.Setenv("PATH", tempDir)
-
-	_, err := FlatpakInstallationDir("any.package.name")
-	if err == nil {
-		t.Errorf("expected error when flatpak not in PATH")
-	}
-	if err != nil && !strings.Contains(err.Error(), "not found in PATH") {
-		t.Errorf("expected 'not found in PATH' error, got: %v", err)
-	}
-}
-
-func TestFlatpakInstallationDirNonexistent(t *testing.T) {
-	if !FlatpakInPath() {
-		t.Skip("flatpak not in PATH")
-	}
-
-	_, err := FlatpakInstallationDir("com.nonexistent.package.test")
-	if err == nil {
-		t.Errorf("expected error for nonexistent package")
-	}
-	if err != nil && !strings.Contains(err.Error(), "not installed") {
-		t.Errorf("expected 'not installed' error, got: %v", err)
-	}
-}
-
-func TestFlatpakInstallationDirValid(t *testing.T) {
-	if !FlatpakInPath() {
-		t.Skip("flatpak not in PATH")
-	}
-
-	// This test requires a known installed flatpak
-	// We can't guarantee any specific flatpak is installed,
-	// so we'll skip if we can't find a common one
-	commonFlatpaks := []string{
-		"org.mozilla.firefox",
-		"org.gnome.Calculator",
-		"org.freedesktop.Platform",
-	}
-
-	var testPackage string
-	for _, pkg := range commonFlatpaks {
-		if FlatpakExists(pkg) {
-			testPackage = pkg
-			break
-		}
-	}
-
-	if testPackage == "" {
-		t.Skip("no common flatpak packages found for testing")
-	}
-
-	result, err := FlatpakInstallationDir(testPackage)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if result == "" {
-		t.Errorf("expected non-empty installation directory")
-	}
-	if !strings.Contains(result, testPackage) {
-		t.Logf("installation directory %s doesn't contain package name (may be expected)", result)
-	}
-}
-
-func TestFlatpakExistsCommandFailure(t *testing.T) {
-	if !FlatpakInPath() {
-		t.Skip("flatpak not in PATH")
-	}
-
-	// Mock a failing flatpak command through PATH interception
-	tempDir := t.TempDir()
-	fakeFlatpak := filepath.Join(tempDir, "flatpak")
-
-	script := "#!/bin/sh\nexit 1\n"
-	err := os.WriteFile(fakeFlatpak, []byte(script), 0755)
-	if err != nil {
-		t.Fatalf("failed to create fake flatpak: %v", err)
-	}
-
-	originalPath := os.Getenv("PATH")
-	t.Setenv("PATH", tempDir+":"+originalPath)
-
-	result := FlatpakExists("test.package")
-	if result {
-		t.Errorf("expected false when flatpak command fails, got true")
-	}
-}
-
-func TestFlatpakSearchBySubstringCommandFailure(t *testing.T) {
-	if !FlatpakInPath() {
-		t.Skip("flatpak not in PATH")
-	}
-
-	// Mock a failing flatpak command through PATH interception
-	tempDir := t.TempDir()
-	fakeFlatpak := filepath.Join(tempDir, "flatpak")
-
-	script := "#!/bin/sh\nexit 1\n"
-	err := os.WriteFile(fakeFlatpak, []byte(script), 0755)
-	if err != nil {
-		t.Fatalf("failed to create fake flatpak: %v", err)
-	}
-
-	originalPath := os.Getenv("PATH")
-	t.Setenv("PATH", tempDir+":"+originalPath)
-
-	result := FlatpakSearchBySubstring("test")
-	if result {
-		t.Errorf("expected false when flatpak command fails, got true")
-	}
-}
-
-func TestFlatpakInstallationDirCommandFailure(t *testing.T) {
-	if !FlatpakInPath() {
-		t.Skip("flatpak not in PATH")
-	}
-
-	// Mock a failing flatpak command through PATH interception
-	tempDir := t.TempDir()
-	fakeFlatpak := filepath.Join(tempDir, "flatpak")
-
-	script := "#!/bin/sh\nexit 1\n"
-	err := os.WriteFile(fakeFlatpak, []byte(script), 0755)
-	if err != nil {
-		t.Fatalf("failed to create fake flatpak: %v", err)
-	}
-
-	originalPath := os.Getenv("PATH")
-	t.Setenv("PATH", tempDir+":"+originalPath)
-
-	_, err = FlatpakInstallationDir("test.package")
-	if err == nil {
-		t.Errorf("expected error when flatpak command fails")
-	}
-	if err != nil && !strings.Contains(err.Error(), "not installed") {
-		t.Errorf("expected 'not installed' error, got: %v", err)
-	}
-}
--- a/distro/debian/dms-git/debian/changelog
+++ b/distro/debian/dms-git/debian/changelog
@@ -1,4 +1,4 @@
-dms-git (1.0.2+git2528.d336866fdb1) nightly; urgency=medium
+dms-git (1.0.2+git2528.d336866f) nightly; urgency=medium

  * Git snapshot (commit 2528: d336866f)

@@ -16,6 +16,23 @@ dms-git (1.0.2+git2518.a783d650) nightly; urgency=medium

 -- Avenge Media <AvengeMedia.US@gmail.com>  Sat, 13 Dec 2025 15:11:40 +0000

+dms-git (1.0.2+git2510.0f89886c) nightly; urgency=medium
+
+  * Git snapshot (commit 2510: 0f89886c)
+
+ -- Avenge Media <AvengeMedia.US@gmail.com>  Sat, 13 Dec 2025 06:46:43 +0000
+
+dms-git (1.0.2+git2507.b2ac9c6c) nightly; urgency=medium
+
+  * Git snapshot (commit 2507: b2ac9c6c)
+
+ -- Avenge Media <AvengeMedia.US@gmail.com>  Sat, 13 Dec 2025 06:18:05 +0000
+
+dms-git (1.0.2+git2505.82f881af) nightly; urgency=medium
+
+  * Git snapshot (commit 2505: 82f881af)
+
+ -- Avenge Media <AvengeMedia.US@gmail.com>  Sat, 13 Dec 2025 05:55:03 +0000

 dms-git (1.0.0+git2419.993f14a3) nightly; urgency=medium

--- a/distro/debian/dms/_service
+++ b/distro/debian/dms/_service
@@ -3,19 +3,19 @@
  <service name="download_url">
    <param name="protocol">https</param>
    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/archive/refs/tags/v1.0.3.tar.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/archive/refs/tags/v1.0.2.tar.gz</param>
    <param name="filename">dms-source.tar.gz</param>
  </service>
  <!-- Download amd64 binary -->
  <service name="download_url">
    <param name="protocol">https</param>
    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.3/dms-distropkg-amd64.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.2/dms-distropkg-amd64.gz</param>
  </service>
  <!-- Download arm64 binary -->
  <service name="download_url">
    <param name="protocol">https</param>
    <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.3/dms-distropkg-arm64.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.0.2/dms-distropkg-arm64.gz</param>
  </service>
 </services>
--- a/distro/debian/dms/debian/changelog
+++ b/distro/debian/dms/debian/changelog
@@ -1,12 +1,6 @@
-dms (1.0.3db1) unstable; urgency=medium
+dms (1.0.2ppa6) unstable; urgency=medium

-  * Update to v1.0.3 stable release
-
- -- Avenge Media <AvengeMedia.US@gmail.com>  Mon, 16 Dec 2025 10:00:00 +0000
-
-dms (1.0.2db1) unstable; urgency=medium
-
-  * Update to v1.0.2 stable release
+  * Rebuild to fix repository metadata issues

 -- Avenge Media <AvengeMedia.US@gmail.com>  Sat, 13 Dec 2025 06:47:39 +0000

--- a/distro/debian/dms/debian/control
+++ b/distro/debian/dms/debian/control
@@ -11,7 +11,7 @@ Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git
 Package: dms
 Architecture: amd64
 Depends: ${misc:Depends},
-         quickshell | quickshell-git,
+         quickshell-git | quickshell,
         accountsservice,
         cava,
         cliphist,
--- a/distro/fedora/dms-git.spec
+++ b/distro/fedora/dms-git.spec
@@ -1,135 +0,0 @@
-# Spec for DMS - uses rpkg macros for git builds
-
-%global debug_package %{nil}
-%global version {{{ git_repo_version }}}
-%global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
-
-Name:           dms
-Epoch:          2
-Version:        %{version}
-Release:        1%{?dist}
-Summary:        %{pkg_summary}
-
-License:        MIT
-URL:            https://github.com/AvengeMedia/DankMaterialShell
-VCS:            {{{ git_repo_vcs }}}
-Source0:        {{{ git_repo_pack }}}
-
-BuildRequires:  git-core
-BuildRequires:  gzip
-BuildRequires:  golang >= 1.24
-BuildRequires:  make
-BuildRequires:  wget
-BuildRequires:  systemd-rpm-macros
-
-# Core requirements
-Requires:       (quickshell-git or quickshell)
-Requires:       accountsservice
-Requires:       dms-cli = %{epoch}:%{version}-%{release}
-Requires:       dgop
-
-# Core utilities (Highly recommended for DMS functionality)
-Recommends:     cava
-Recommends:     danksearch
-Recommends:     matugen
-Recommends:     quickshell-git
-Recommends:     wl-clipboard
-
-# Recommended system packages
-Recommends:     NetworkManager
-Recommends:     qt6-qtmultimedia
-Suggests:       qt6ct
-
-%description
-DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell
-and optimized for the niri, hyprland, sway, and dwl (MangoWC) compositors. Features notifications,
-app launcher, wallpaper customization, and fully customizable with plugins.
-
-Includes auto-theming for GTK/Qt apps with matugen, 20+ customizable widgets,
-process monitoring, notification center, clipboard history, dock, control center,
-lock screen, and comprehensive plugin system.
-
-%package -n dms-cli
-Summary:        DankMaterialShell CLI tool
-License:        MIT
-URL:            https://github.com/AvengeMedia/DankMaterialShell
-
-%description -n dms-cli
-Command-line interface for DankMaterialShell configuration and management.
-Provides native DBus bindings, NetworkManager integration, and system utilities.
-
-%prep
-{{{ git_repo_setup_macro }}}
-
-%build
-# Build DMS CLI from source (core/subdirectory)
-VERSION="%{version}"
-COMMIT=$(echo "%{version}" | grep -oP '[a-f0-9]{7,}' | head -n1 || echo "unknown")
-
-cd core
-make dist VERSION="$VERSION" COMMIT="$COMMIT"
-
-%install
-# Install dms-cli binary (built from source)
-case "%{_arch}" in
-  x86_64)
-    DMS_BINARY="dms-linux-amd64"
-    ;;
-  aarch64)
-    DMS_BINARY="dms-linux-arm64"
-    ;;
-  *)
-    echo "Unsupported architecture: %{_arch}"
-    exit 1
-    ;;
-esac
-
-install -Dm755 core/bin/${DMS_BINARY} %{buildroot}%{_bindir}/dms
-
-# Shell completions
-install -d %{buildroot}%{_datadir}/bash-completion/completions
-install -d %{buildroot}%{_datadir}/zsh/site-functions
-install -d %{buildroot}%{_datadir}/fish/vendor_completions.d
-core/bin/${DMS_BINARY} completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || :
-core/bin/${DMS_BINARY} completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || :
-core/bin/${DMS_BINARY} completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || :
-
-# Install systemd user service
-install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
-
-install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop
-install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
-
-# Install shell files to shared data location
-install -dm755 %{buildroot}%{_datadir}/quickshell/dms
-cp -r quickshell/* %{buildroot}%{_datadir}/quickshell/dms/
-
-# Remove build files
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git*
-rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github
-rm -rf %{buildroot}%{_datadir}/quickshell/dms/distro
-
-echo "%{version}" > %{buildroot}%{_datadir}/quickshell/dms/VERSION
-
-%posttrans
-# Signal running DMS instances to reload
-pkill -USR1 -x dms >/dev/null 2>&1 || :
-
-%files
-%license LICENSE
-%doc CONTRIBUTING.md
-%doc quickshell/README.md
-%{_datadir}/quickshell/dms/
-%{_userunitdir}/dms.service
-%{_datadir}/applications/dms-open.desktop
-%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg
-
-%files -n dms-cli
-%{_bindir}/dms
-%{_datadir}/bash-completion/completions/dms
-%{_datadir}/zsh/site-functions/_dms
-%{_datadir}/fish/vendor_completions.d/dms.fish
-
-%changelog
-{{{ git_repo_changelog }}}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bbedward	9673078a75	fix gui	2025-12-15 16:30:35 -05:00
bbedward	9e8c93bfd7	displays: fix hyprland config saving	2025-12-15 16:04:31 -05:00
bbedward	43d6f4b1d3	displays: add configurator (Beta) - Position, resolution, refresh, orientation, VRR - niri, Hyprland, MangoWC - Rely on wlr-output for reading data, compositors to write output configurations - Re-organize display setting group	2025-12-15 15:55:31 -05:00