feat: Sort bundles by patch count

fix: Ignore long click when already in delete mode
closes #2503
2026-01-12 14:16:18 +00:00 · 2025-05-05 01:29:06 +03:00 · 2025-04-30 13:34:33 +03:00 · 2025-04-28 18:10:01 +02:00 · 2025-04-28 17:19:07 +02:00 · 2025-04-23 19:26:04 +02:00
127 changed files with 2126 additions and 12686 deletions
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@@ -0,0 +1,61 @@
+name: 🐞 Bug report
+description: Create a new bug report.
+title: 'bug: <title>'
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced Manager bug report
+
+        Please check for existing issues [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: |
+        - Describe your bug in detail
+        - Add steps to reproduce the bug if possible (Step 1. Download some files. Step 2. ...)
+        - Add images and videos if possible
+        - List selected patches if applicable
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Version of ReVanced Manager and version & name of application you tried to patch
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Installation type
+      options:
+        - Non-root
+        - Root
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Device logs
+      description: Export logs in ReVanced Manager settings.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Patcher logs
+      description: Export logs in "Patcher" screen.
+      render: shell
+    validations:
+      required: false
+  - type: checkboxes
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you don't follow the checklist below!
+      options:
+        - label: This request is not a duplicate of an existing issue.
+          required: true
+        - label: I have chosen an appropriate title.
+          required: true
+        - label: All requested information has been provided properly.
+          required: true
+        - label: The issue is solely related to the ReVanced Manager
+          required: true
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,109 +0,0 @@
-name: 🐞 Bug report
-description: Report a bug or an issue.
-title: 'bug: '
-labels: ['Bug report']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
-            >
-          </picture>
-          <br>
-          <a href="https://revanced.app/">
-             <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
-             </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://github.com/ReVanced">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="http://revanced.app/discord">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://reddit.com/r/revancedapp">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://t.me/app_revanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://x.com/revancedapp">
-              <picture>
-                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://www.youtube.com/@ReVanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-             </picture>
-           </a>
-           <br>
-           <br>
-           Continuing the legacy of Vanced
-        </p>
-
-        # ReVanced Manager bug report
-
-        Before creating a new bug report, please keep the following in mind:
-
-        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-manager/issues?q=label%3A%22Bug+report%22).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-manager/blob/main/CONTRIBUTING.md).
-        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
-  - type: textarea
-    attributes:
-      label: Bug description
-      description: |
-        - Describe your bug in detail
-        - Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
-        - Add images and videos if possible
-        - List used patches, downloader and settings if applicable
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Patch logs
-      description: Patch logs can be exported by clicking on the "Logs" button in the "Patcher" screen, when patching finishes.
-      render: shell
-  - type: textarea
-    attributes:
-      label: Debug logs
-      description: Debug logs can be exported by clicking on  "Export debug logs" in "Settings" > "Advanced".
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Acknowledgements
-      description: Your bug report will be closed if you don't follow the checklist below.
-      options:
-        - label: I have checked all open and closed bug reports and this is not a duplicate.
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
-        - label: The bug is only related to ReVanced Manager.
-          required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 🗨 Discussions
-    url: https://github.com/revanced/revanced-suggestions/discussions
-    about: Have something unspecific to ReVanced Manager in mind? Search for or start a new discussion!
+blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/feature-issue.yml
+++ b/.github/ISSUE_TEMPLATE/feature-issue.yml
@@ -0,0 +1,42 @@
+name: ⭐ Feature request
+description: Create a new feature request.
+title: 'feat: <title>'
+labels: [feature request]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced Manager feature request
+
+        Please check for existing feature requests [here](https://github.com/revanced/revanced-manager/labels/bug) before creating a new one.
+  - type: textarea
+    attributes:
+      label: Feature description
+      description: Describe your feature in detail.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Explain why the lack of it is a problem.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: In case there is something else you want to add.
+    validations:
+      required: false
+  - type: checkboxes
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you don't follow the checklist below!
+      options:
+        - label: This request is not a duplicate of an existing issue.
+          required: true
+        - label: I have chosen an appropriate title.
+          required: true
+        - label: All requested information has been provided properly.
+          required: true
+        - label: The issue is solely related to the ReVanced Manager
+          required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,103 +0,0 @@
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
-            >
-          </picture>
-          <br>
-          <a href="https://revanced.app/">
-             <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-manager/main/assets/revanced-logo/revanced-logo.svg" />
-             </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://github.com/ReVanced">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="http://revanced.app/discord">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://reddit.com/r/revancedapp">
-               <picture>
-                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-               </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://t.me/app_revanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://x.com/revancedapp">
-              <picture>
-                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-              </picture>
-           </a>&nbsp;&nbsp;&nbsp;
-           <a href="https://www.youtube.com/@ReVanced">
-              <picture>
-                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-             </picture>
-           </a>
-           <br>
-           <br>
-           Continuing the legacy of Vanced
-        </p>
-
-        # ReVanced Manager feature request
-
-        Before creating a new feature request, please keep the following in mind:
-
-        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-manager/issues?q=label%3A%22Feature+request%22).
-        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-manager/blob/main/CONTRIBUTING.md).
-        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
-  - type: textarea
-    attributes:
-      label: Feature description
-      description: |
-        - Describe your feature in detail
-        - Add images, videos, links, examples, references, etc. if possible
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: |
-        A strong motivation is necessary for a feature request to be considered.
-        
-        - Why should this feature be implemented? 
-        - What is the explicit use case?
-        - What are the benefits?
-        - What makes this feature important?
-    validations:
-      required: true
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Your feature request will be closed if you don't follow the checklist below.
-      options:
-        - label: I have checked all open and closed feature requests and this is not a duplicate
-          required: true
-        - label: I have chosen an appropriate title.
-          required: true
-        - label: All requested information has been provided properly.
-          required: true
-        - label: The feature request is only related to ReVanced Manager.
-          required: true
--- a/.github/config.yaml
+++ b/.github/config.yaml
@@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
+  ❤️ Thank you for contributing to ReVanced Manager. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -1,38 +0,0 @@
-name: Build pull request
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - dev
-      - compose-dev
-
-jobs:
-  release:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v3
-
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease --no-daemon
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: revanced-manager
-          path: |
-            app/build/outputs/apk/release/revanced-manager*.apk
-            app/build/outputs/apk/release/revanced-manager*.apk.asc
--- a/.github/workflows/open_pull_request.yml
+++ b/.github/workflows/open_pull_request.yml
@@ -1,26 +0,0 @@
-name: Open a PR to main
-
-on:
-  push:
-    branches:
-      - dev
-  workflow_dispatch:
-
-env:
-  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
-
-jobs:
-  pull-request:
-    name: Open pull request
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Open pull request
-        uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: 'main'
-          pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
-          pr_draft: true
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -0,0 +1,44 @@
+name: Build pull request
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/pr-build.yml"
+      - "app/**"
+      - "gradle/**"
+      - "*.properties"
+      - ".kts"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build with Gradle
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew assembleRelease --no-daemon -PnoProguard -PsignAsDebug
+
+      - name: Set env
+        run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
+      - name: Add hash to APK
+        run: mv app/build/outputs/apk/release/app-release.apk revanced-manager-${{ env.COMMIT_HASH }}.apk
+
+      - name: Upload build
+        uses: actions/upload-artifact@v4
+        with:
+          name: revanced-manager
+          path: revanced-manager-${{ env.COMMIT_HASH }}.apk
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -0,0 +1,57 @@
+name: Release Build
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      attestations: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build with Gradle
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew assembleRelease --no-daemon
+
+      - name: Sign APK
+        id: sign_apk
+        uses: ilharp/sign-android-release@v1
+        with:
+          releaseDir: ./app/build/outputs/apk/release/
+          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
+          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
+          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
+          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+
+      - name: Add version to APK
+        run: mv ${{ steps.sign_apk.outputs.signedFile }} revanced-manager-${{ env.RELEASE_VERSION }}.apk
+
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: revanced-manager-${{ env.RELEASE_VERSION }}.apk
+
+      - name: Publish release APK
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,70 +0,0 @@
-name: Release
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - dev
-
-jobs:
-  release:
-    name: Release
-    permissions:
-      contents: write
-      id-token: write
-      attestations: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v3
-
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v5
-        with:
-          node-version: "lts/*"
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          fingerprint: ${{ vars.GPG_FINGERPRINT }}
-
-      - name: Setup keystore
-        run: |
-          echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
-
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v5
-        id: semantic
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
-          KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
-
-      - name: Attest
-        if: steps.semantic.outputs.new_release_published == 'true'
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-name: 'ReVanced Manager ${{ steps.release.outputs.new_release_git_tag }}'
-          subject-path: app/build/outputs/apk/release/revanced-manager*.apk
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -16,4 +16,4 @@ jobs:
          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
          repository: revanced/revanced-documentation
          event-type: update-documentation
-          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'
+          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'
--- a/.gitignore
+++ b/.gitignore
@@ -1,132 +1,12 @@
-### Java template
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-.idea/artifacts
-.idea/compiler.xml
-.idea/jarRepositories.xml
-.idea/modules.xml
-.idea/*.iml
-.idea/modules
 *.iml
-*.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Gradle template
 .gradle
-**/build/
-!src/**/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache
-
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
-
-# Potentially copyrighted test APK
-*.apk
-
-# Ignore vscode config
-.vscode/
-
-# Dependency directories
-node_modules/
-
-# Ignore IDEA files
-.idea/
-
-.kotlin/
-
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
 local.properties

-.cxx
+.kotlin/
--- a/.releaserc
+++ b/.releaserc
@@ -1,49 +0,0 @@
-{
-  "branches": [
-    "main",
-    {
-      "name": "dev",
-      "prerelease": true
-    }
-  ],
-  "plugins": [
-    [
-      "@semantic-release/commit-analyzer", {
-        "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
-        ]
-      }
-    ],
-    "@semantic-release/release-notes-generator",
-    "@semantic-release/changelog",
-    "gradle-semantic-release-plugin",
-    [
-      "@semantic-release/git",
-      {
-        "assets": [
-          "CHANGELOG.md",
-          "gradle.properties",
-        ],
-        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-      }
-    ],
-    [
-      "@semantic-release/github",
-      {
-        "assets": [
-          {
-            "path": "app/build/outputs/apk/release/revanced-manager*.apk?(.asc)"
-          },
-        ],
-        successComment: false
-      }
-    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        backmergeBranches: [{"from": "main", "to": "dev"}],
-        clearWorkspace: true
-      }
-    ]
-  ]
-}
--- a/README.md
+++ b/README.md
@@ -1,104 +1,55 @@
-<p align="center">
-  <picture>
-    <source
-      width="256px"
-      media="(prefers-color-scheme: dark)"
-      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
-    >
-    <img 
-      width="256px"
-      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
-    >
-  </picture>
-  <br>
-  <a href="https://revanced.app/">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
-   <br>
-   <br>
-   Continuing the legacy of Vanced
-</p>
+# ReVanced Manager (Compose Rewrite)

-# 💊 ReVanced Manager
+[![GitHub license](https://img.shields.io/github/license/revanced/revanced-manager)](../../blob/main/LICENSE)
+[![GitHub last commit](https://img.shields.io/github/last-commit/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/w/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)

-![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-manager/release.yml)
-![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)
+_(Yet another)_ rewrite of the ReVanced Manager using Kotlin and Jetpack Compose.

-Application to use ReVanced on Android
+## Design system

-## ❓ About
+In this rewrite, we are adopting the latest Material Design principles and guidelines by using Material 3 and Material You.

-ReVanced Manager is an application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
+Material Design is a design system developed by Google that provides a unified visual language for building beautiful and consistent user interfaces across all platforms and devices. Material You is an extension of Material Design that provides even more customization options for users, making it possible for them to personalize their device and create a unique look and feel.

-## 💪 Features
+### Why Material 3?

-Some of the features ReVanced Manager provides are:
+* **Consistent design language**
+* **Improved accessibility**
+* **Better user experience**

- ⬇️ **Download**: Automatically download apps using the ReVanced Manager downloader plugin system
- 💉 **Patch**: Select and apply patches to any Android app
- 🛠️ **Customize**: Manage patches, apps, signing, themes, updates, and many more settings
+By using Material 3 and Material You, we are ensuring that the app's user interface is consistent, customizable, accessible, and engaging for our users. This will help to improve the overall user experience and increase user satisfaction with the the manager.
+
+## Technology stack
+
+* Kotlin: Kotlin is a modern and concise programming language that is fully interoperable with Java and provides improved safety, readability, and maintainability compared to Java.
+* Jetpack Compose: Jetpack Compose is a modern UI toolkit for Android development that allows developers to build beautiful and performant user interfaces using declarative programming. It provides a unified and efficient way of building UI that is well-integrated with the Android framework.
+
+## Why Kotlin and Compose?
+
+* **Improved safety:** Kotlin provides improved safety compared to Java, which reduces the likelihood of common programming mistakes that can cause security vulnerabilities or crashes.
+* **Concise and readable code:** Kotlin's concise syntax and expressive type system make the code more readable, which makes it easier for developers to understand and maintain the codebase.
+* **Better performance:** Jetpack Compose uses the power of the Android framework to provide smooth and fast performance, which enhances the user experience.
+* **Modern and efficient UI development:** Jetpack Compose provides a modern and efficient way of building UI, which makes it easier for developers to create beautiful and performant user interfaces.

 ## 🔽 Download

-You can download the most recent version of ReVanced Manager at [revanced.app/download](https://revanced.app/download) or from [GitHub releases](https://github.com/ReVanced/revanced-manager/releases/latest).  
-Learn how to use ReVanced Manager by following the [documentation](/docs).
+You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)

-## 📚 Everything else
+## 📝 Prerequisites

-### 📙 Contributing
+For a list of prerequisites, refer to [docs/0_prerequisites.md](docs/0_prerequisites.md)

-Thank you for considering contributing to ReVanced Manager.
-You can find the contribution guidelines [here](CONTRIBUTING.md).
+## 🔴 Issues

-### 🛠️ Building
+For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).

-To build a ReVanced Manager, you can follow the [documentation](/docs).
+## 🌐 Translation

-### 📄 Documentation
+[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)

-You can find the documentation for ReVanced Manager [here](/docs).
+We're accepting translations on [Crowdin](https://translate.revanced.app)

-## ⚖️ License
+## 🛠️ Building Manager from source

-ReVanced Manager is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.
-[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced Manager as long as you track changes/dates in source files.
-Any modifications to ReVanced Manager must also be made available under the GPL, along with build & install instructions.
+For instructions on how to build ReVanced Manager from source, refer to [docs/4_building.md](docs/4_building.md)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,46 +58,20 @@
   Continuing the legacy of Vanced
 </p>

-# 👋 Contribution guidelines
+# 🔒 Security Policy

-This document describes how to contribute to ReVanced Manager.
+This document describes how to report security vulnerabilities for ReVanced Manager.

-## 📖 Resources to help you get started
+## 🚨 Reporting a Vulnerability

-* The [documentation](/docs/README.md) provides steps to build ReVanced Manager from source
-* Our [backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
-* [Issues](https://github.com/ReVanced/revanced-manager/issues) are where we keep track of bugs and feature requests
+Please open an issue in our [advisory tracker](https://github.com/ReVanced/revanced-manager/security/advisories/new) or reach out privately to us on [Discord](https://discord.gg/revanced).

-## 🙏 Submitting a feature request
+If a vulnerability is confirmed and accepted, you can join our [Discord](https://discord.gg/revanced) server to receive a special contributor role.

-Features can be requested by opening an issue using the
-[Feature request issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=Feature+request&projects=&template=feature_request.yml&title=feat%3A+).
+### ⏳ Supported Versions

-> **Note**
-> Requests can be accepted or rejected at the discretion of maintainers of ReVanced Manager.
-> Good motivation has to be provided for a request to be accepted.
-
-## 🐞 Submitting a bug report
-
-If you encounter a bug while using ReVanced Manager, open an issue using the
-[Bug report issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=Bug+report&projects=&template=bug_report.yml&title=bug%3A+).
-
-## 📝 How to contribute
-
-1. Before contributing, it is recommended to open an issue to discuss your change
-   with the maintainers of ReVanced Manager. This will help you determine whether your change is acceptable
-   and whether it is worth your time to implement it
-2. Development happens on the `dev` branch. Fork the repository and create your branch from `dev`
-3. Commit your changes
-4. Submit a pull request to the `dev` branch of the repository and reference issues
-   that your pull request closes in the description of your pull request
-5. Our team will review your pull request and provide feedback. Once your pull request is approved,
-   it will be merged into the `dev` branch and will be included in the next release of ReVanced Manager
-
-## 🤚 I want to contribute but don't know how to code
-
-Even if you don't know how to code, you can still contribute by
-translating ReVanced Manager on [Crowdin](https://translate.revanced.app/).
-
-❤️ Thank you for considering contributing to ReVanced Manager,  
-ReVanced
+| Version                                                                                                                                 | Branch      | Supported          |
+| --------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------------------ |
+| ![Latest stable release](https://img.shields.io/github/v/release/ReVanced/revanced-manager?style=for-the-badge "Latest stable release") | main        | :white_check_mark: |
+| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | dev         | :white_check_mark: |
+| ![Latest version](https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version")                         | compose-dev | :white_check_mark: |
--- a/api/api/api.api
+++ b/api/api/api.api
@@ -1,182 +0,0 @@
-public abstract interface class app/revanced/manager/plugin/downloader/BaseDownloadScope : app/revanced/manager/plugin/downloader/Scope {
-}
-
-public final class app/revanced/manager/plugin/downloader/ConstantsKt {
-	public static final field PLUGIN_HOST_PERMISSION Ljava/lang/String;
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloadUrl : android/os/Parcelable {
-	public static final field $stable I
-	public static final field CREATOR Landroid/os/Parcelable$Creator;
-	public fun <init> (Ljava/lang/String;Ljava/util/Map;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/Map;
-	public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/DownloadUrl;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public final fun describeContents ()I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getHeaders ()Ljava/util/Map;
-	public final fun getUrl ()Ljava/lang/String;
-	public fun hashCode ()I
-	public final fun toDownloadResult ()Lkotlin/Pair;
-	public fun toString ()Ljava/lang/String;
-	public final fun writeToParcel (Landroid/os/Parcel;I)V
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloadUrl$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/DownloadUrl;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/Downloader {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloaderBuilder {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloaderKt {
-	public static final fun Downloader (Lkotlin/jvm/functions/Function1;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder;
-}
-
-public final class app/revanced/manager/plugin/downloader/DownloaderScope : app/revanced/manager/plugin/downloader/Scope {
-	public static final field $stable I
-	public final fun download (Lkotlin/jvm/functions/Function3;)V
-	public final fun get (Lkotlin/jvm/functions/Function4;)V
-	public fun getHostPackageName ()Ljava/lang/String;
-	public fun getPluginPackageName ()Ljava/lang/String;
-	public final fun useService (Landroid/content/Intent;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/ExtensionsKt {
-	public static final fun download (Lapp/revanced/manager/plugin/downloader/DownloaderScope;Lkotlin/jvm/functions/Function4;)V
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/GetScope : app/revanced/manager/plugin/downloader/Scope {
-	public abstract fun requestStartActivity (Landroid/content/Intent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/InputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope {
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/OutputDownloadScope : app/revanced/manager/plugin/downloader/BaseDownloadScope {
-	public abstract fun reportSize (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/Package : android/os/Parcelable {
-	public static final field $stable I
-	public static final field CREATOR Landroid/os/Parcelable$Creator;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/manager/plugin/downloader/Package;
-	public static synthetic fun copy$default (Lapp/revanced/manager/plugin/downloader/Package;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lapp/revanced/manager/plugin/downloader/Package;
-	public final fun describeContents ()I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getName ()Ljava/lang/String;
-	public final fun getVersion ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public final fun writeToParcel (Landroid/os/Parcel;I)V
-}
-
-public final class app/revanced/manager/plugin/downloader/Package$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/Package;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/Package;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public abstract interface annotation class app/revanced/manager/plugin/downloader/PluginHostApi : java/lang/annotation/Annotation {
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/Scope {
-	public abstract fun getHostPackageName ()Ljava/lang/String;
-	public abstract fun getPluginPackageName ()Ljava/lang/String;
-}
-
-public abstract class app/revanced/manager/plugin/downloader/UserInteractionException : java/lang/Exception {
-	public static final field $stable I
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public abstract class app/revanced/manager/plugin/downloader/UserInteractionException$Activity : app/revanced/manager/plugin/downloader/UserInteractionException {
-	public static final field $stable I
-	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$Cancelled : app/revanced/manager/plugin/downloader/UserInteractionException$Activity {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$NotCompleted : app/revanced/manager/plugin/downloader/UserInteractionException$Activity {
-	public static final field $stable I
-	public final fun getIntent ()Landroid/content/Intent;
-	public final fun getResultCode ()I
-}
-
-public final class app/revanced/manager/plugin/downloader/UserInteractionException$RequestDenied : app/revanced/manager/plugin/downloader/UserInteractionException {
-	public static final field $stable I
-}
-
-public final class app/revanced/manager/plugin/downloader/webview/APIKt {
-	public static final fun WebViewDownloader (Lkotlin/jvm/functions/Function4;)Lapp/revanced/manager/plugin/downloader/DownloaderBuilder;
-	public static final fun runWebView (Lapp/revanced/manager/plugin/downloader/GetScope;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class app/revanced/manager/plugin/downloader/webview/IWebView$Default : app/revanced/manager/plugin/downloader/webview/IWebView {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public fun finish ()V
-	public fun load (Ljava/lang/String;)V
-}
-
-public abstract class app/revanced/manager/plugin/downloader/webview/IWebView$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebView {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebView;
-	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-}
-
-public class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Default : app/revanced/manager/plugin/downloader/webview/IWebViewEvents {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public fun download (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-	public fun pageLoad (Ljava/lang/String;)V
-	public fun ready (Lapp/revanced/manager/plugin/downloader/webview/IWebView;)V
-}
-
-public abstract class app/revanced/manager/plugin/downloader/webview/IWebViewEvents$Stub : android/os/Binder, app/revanced/manager/plugin/downloader/webview/IWebViewEvents {
-	public fun <init> ()V
-	public fun asBinder ()Landroid/os/IBinder;
-	public static fun asInterface (Landroid/os/IBinder;)Lapp/revanced/manager/plugin/downloader/webview/IWebViewEvents;
-	public fun onTransact (ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-}
-
-public final class app/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lapp/revanced/manager/plugin/downloader/webview/WebViewActivity$Parameters;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public abstract interface class app/revanced/manager/plugin/downloader/webview/WebViewCallbackScope : app/revanced/manager/plugin/downloader/Scope {
-	public abstract fun finish (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun load (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class app/revanced/manager/plugin/downloader/webview/WebViewScope : app/revanced/manager/plugin/downloader/Scope {
-	public static final field $stable I
-	public final fun download (Lkotlin/jvm/functions/Function5;)V
-	public fun getHostPackageName ()Ljava/lang/String;
-	public fun getPluginPackageName ()Ljava/lang/String;
-	public final fun pageLoad (Lkotlin/jvm/functions/Function3;)V
-}
-
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -1,153 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.io.IOException
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.binary.compatibility.validator)
-    `maven-publish`
-    signing
-}
-
-group = "app.revanced"
-
-dependencies {
-    implementation(libs.androidx.ktx)
-    implementation(libs.runtime.ktx)
-    implementation(libs.activity.compose)
-    implementation(libs.appcompat)
-}
-
-fun String.runCommand(): String {
-    val process = ProcessBuilder(split("\\s".toRegex()))
-        .redirectErrorStream(true)
-        .directory(rootDir)
-        .start()
-
-    val output = StringBuilder()
-    val reader = process.inputStream.bufferedReader()
-
-    val thread = Thread {
-        reader.forEachLine {
-            output.appendLine(it)
-        }
-    }
-    thread.start()
-
-    if (!process.waitFor(10, TimeUnit.SECONDS)) {
-        process.destroy()
-        throw IOException("Command timed out: $this")
-    }
-
-    thread.join()
-    return output.toString().trim()
-}
-
-val projectPath: String = projectDir.relativeTo(rootDir).path
-val lastTag = "git describe --tags --abbrev=0".runCommand()
-val hasChangesInThisModule = "git diff --name-only $lastTag..HEAD".runCommand().lineSequence().any {
-    it.startsWith(projectPath)
-}
-
-tasks.matching { it.name.startsWith("publish") }.configureEach {
-    onlyIf {
-        hasChangesInThisModule
-    }
-}
-
-android {
-    namespace = "app.revanced.manager.plugin.downloader"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 26
-
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.fromTarget("17")
-        }
-    }
-
-    buildFeatures {
-        aidl = true
-    }
-}
-
-apiValidation {
-    nonPublicMarkers += "app.revanced.manager.plugin.downloader.PluginHostApi"
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/revanced/revanced-manager")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR") ?: extra["gpr.user"] as String?
-                password = System.getenv("GITHUB_TOKEN") ?: extra["gpr.key"] as String?
-            }
-        }
-    }
-
-    publications {
-        create<MavenPublication>("Api") {
-            afterEvaluate {
-                from(components["release"])
-            }
-
-            groupId = "app.revanced"
-            artifactId = "revanced-manager-api"
-            version = project.version.toString()
-
-            pom {
-                name = "ReVanced Manager API"
-                description = "API for ReVanced Manager."
-                url = "https://revanced.app"
-
-                licenses {
-                    license {
-                        name = "GNU General Public License v3.0"
-                        url = "https://www.gnu.org/licenses/gpl-3.0.en.html"
-                    }
-                }
-                developers {
-                    developer {
-                        id = "ReVanced"
-                        name = "ReVanced"
-                        email = "contact@revanced.app"
-                    }
-                }
-                scm {
-                    connection = "scm:git:git://github.com/revanced/revanced-manager.git"
-                    developerConnection = "scm:git:git@github.com:revanced/revanced-manager.git"
-                    url = "https://github.com/revanced/revanced-manager"
-                }
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign(publishing.publications["Api"])
-}
--- a/api/src/main/AndroidManifest.xml
+++ b/api/src/main/AndroidManifest.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>
--- a/api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebView.aidl
+++ b/api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebView.aidl
@@ -1,8 +0,0 @@
-// IWebView.aidl
-package app.revanced.manager.plugin.downloader.webview;
-
-@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
-oneway interface IWebView {
-    void load(String url);
-    void finish();
-}
--- a/api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebViewEvents.aidl
+++ b/api/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebViewEvents.aidl
@@ -1,11 +0,0 @@
-// IWebViewEvents.aidl
-package app.revanced.manager.plugin.downloader.webview;
-
-import app.revanced.manager.plugin.downloader.webview.IWebView;
-
-@JavaPassthrough(annotation="@app.revanced.manager.plugin.downloader.PluginHostApi")
-oneway interface IWebViewEvents {
-    void ready(IWebView iface);
-    void pageLoad(String url);
-    void download(String url, String mimetype, String userAgent);
-}
--- a/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Constants.kt
+++ b/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Constants.kt
@@ -1,7 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-/**
- * The permission ID of the special plugin host permission. Only ReVanced Manager will have this permission.
- * Plugin UI activities and internal services can be protected using this permission.
- */
-const val PLUGIN_HOST_PERMISSION = "app.revanced.manager.permission.PLUGIN_HOST"
--- a/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Downloader.kt
+++ b/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Downloader.kt
@@ -1,165 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.IBinder
-import android.app.Activity
-import android.os.Parcelable
-import kotlinx.coroutines.withTimeout
-import java.io.InputStream
-import java.io.OutputStream
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-@RequiresOptIn(
-    level = RequiresOptIn.Level.ERROR,
-    message = "This API is only intended for plugin hosts, don't use it in a plugin.",
-)
-@Retention(AnnotationRetention.BINARY)
-annotation class PluginHostApi
-
-/**
- * The base interface for all DSL scopes.
- */
-interface Scope {
-    /**
-     * The package name of ReVanced Manager.
-     */
-    val hostPackageName: String
-
-    /**
-     * The package name of the plugin.
-     */
-    val pluginPackageName: String
-}
-
-/**
- * The scope of [DownloaderScope.get].
- */
-interface GetScope : Scope {
-    /**
-     * Ask the user to perform some required interaction in the activity specified by the provided [Intent].
-     * This function returns normally with the resulting [Intent] when the activity finishes with code [Activity.RESULT_OK].
-     *
-     * @throws UserInteractionException.RequestDenied User decided to skip this plugin.
-     * @throws UserInteractionException.Activity.Cancelled The activity was cancelled.
-     * @throws UserInteractionException.Activity.NotCompleted The activity finished with an unknown result code.
-     */
-    suspend fun requestStartActivity(intent: Intent): Intent?
-}
-
-interface BaseDownloadScope : Scope
-
-/**
- * The scope for [DownloaderScope.download].
- */
-interface InputDownloadScope : BaseDownloadScope
-
-typealias Size = Long
-typealias DownloadResult = Pair<InputStream, Size?>
-
-typealias Version = String
-typealias GetResult<T> = Pair<T, Version?>
-
-class DownloaderScope<T : Parcelable> internal constructor(
-    private val scopeImpl: Scope,
-    internal val context: Context
-) : Scope by scopeImpl {
-    // Returning an InputStream is the primary way for plugins to implement the download function, but we also want to offer an OutputStream API since using InputStream might not be convenient in all cases.
-    // It is much easier to implement the main InputStream API on top of OutputStreams compared to doing it the other way around, which is why we are using OutputStream here. This detail is not visible to plugins.
-    internal var download: (suspend OutputDownloadScope.(T, OutputStream) -> Unit)? = null
-    internal var get: (suspend GetScope.(String, String?) -> GetResult<T>?)? = null
-    private val inputDownloadScopeImpl = object : InputDownloadScope, Scope by scopeImpl {}
-
-    /**
-     * Define the download block of the plugin.
-     */
-    fun download(block: suspend InputDownloadScope.(data: T) -> DownloadResult) {
-        download = { app, outputStream ->
-            val (inputStream, size) = inputDownloadScopeImpl.block(app)
-
-            inputStream.use {
-                if (size != null) reportSize(size)
-                it.copyTo(outputStream)
-            }
-        }
-    }
-
-    /**
-     * Define the get block of the plugin.
-     * The block should return null if the app cannot be found. The version in the result must match the version argument unless it is null.
-     */
-    fun get(block: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?) {
-        get = block
-    }
-
-    /**
-     * Utilize the service specified by the provided [Intent]. The service will be unbound when the scope ends.
-     */
-    suspend fun <R : Any?> useService(intent: Intent, block: suspend (IBinder) -> R): R {
-        var onBind: ((IBinder) -> Unit)? = null
-        val serviceConn = object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName?, service: IBinder?) =
-                onBind!!(service!!)
-
-            override fun onServiceDisconnected(name: ComponentName?) {}
-        }
-
-        return try {
-            val binder = withTimeout(10000L) {
-                suspendCoroutine { continuation ->
-                    onBind = continuation::resume
-                    context.bindService(intent, serviceConn, Context.BIND_AUTO_CREATE)
-                }
-            }
-            block(binder)
-        } finally {
-            onBind = null
-            context.unbindService(serviceConn)
-        }
-    }
-}
-
-class DownloaderBuilder<T : Parcelable> internal constructor(private val block: DownloaderScope<T>.() -> Unit) {
-    @PluginHostApi
-    fun build(scopeImpl: Scope, context: Context) =
-        with(DownloaderScope<T>(scopeImpl, context)) {
-            block()
-
-            Downloader(
-                download = download!!,
-                get = get!!
-            )
-        }
-}
-
-class Downloader<T : Parcelable> internal constructor(
-    @property:PluginHostApi val get: suspend GetScope.(packageName: String, version: String?) -> GetResult<T>?,
-    @property:PluginHostApi val download: suspend OutputDownloadScope.(data: T, outputStream: OutputStream) -> Unit
-)
-
-/**
- * Define a downloader plugin.
- */
-fun <T : Parcelable> Downloader(block: DownloaderScope<T>.() -> Unit) = DownloaderBuilder(block)
-
-/**
- * @see GetScope.requestStartActivity
- */
-sealed class UserInteractionException(message: String) : Exception(message) {
-    class RequestDenied @PluginHostApi constructor() :
-        UserInteractionException("Request denied by user")
-
-    sealed class Activity(message: String) : UserInteractionException(message) {
-        class Cancelled @PluginHostApi constructor() : Activity("Interaction cancelled")
-
-        /**
-         * @param resultCode The result code of the activity.
-         * @param intent The [Intent] of the activity.
-         */
-        class NotCompleted @PluginHostApi constructor(val resultCode: Int, val intent: Intent?) :
-            Activity("Unexpected activity result code: $resultCode")
-    }
-}
--- a/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Extensions.kt
+++ b/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Extensions.kt
@@ -1,42 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-import android.app.Activity
-import android.app.Service
-import android.content.Intent
-import android.os.IBinder
-import android.os.Parcelable
-import java.io.OutputStream
-
-/**
- * The scope of the [OutputStream] version of [DownloaderScope.download].
- */
-interface OutputDownloadScope : BaseDownloadScope {
-    suspend fun reportSize(size: Long)
-}
-
-/**
- * A replacement for [DownloaderScope.download] that uses [OutputStream].
- * The provided [OutputStream] does not need to be closed manually.
- */
-fun <T : Parcelable> DownloaderScope<T>.download(block: suspend OutputDownloadScope.(T, OutputStream) -> Unit) {
-    download = block
-}
-
-/**
- * Performs [GetScope.requestStartActivity] with an [Intent] created using the type information of [ACTIVITY].
- * @see [GetScope.requestStartActivity]
- */
-suspend inline fun <reified ACTIVITY : Activity> GetScope.requestStartActivity() =
-    requestStartActivity(
-        Intent().apply { setClassName(pluginPackageName, ACTIVITY::class.qualifiedName!!) }
-    )
-
-/**
- * Performs [DownloaderScope.useService] with an [Intent] created using the type information of [SERVICE].
- * @see [DownloaderScope.useService]
- */
-suspend inline fun <reified SERVICE : Service, R : Any?> DownloaderScope<*>.useService(
-    noinline block: suspend (IBinder) -> R
-) = useService(
-    Intent().apply { setClassName(pluginPackageName, SERVICE::class.qualifiedName!!) }, block
-)
--- a/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Parcelables.kt
+++ b/api/src/main/kotlin/app/revanced/manager/plugin/downloader/Parcelables.kt
@@ -1,39 +0,0 @@
-package app.revanced.manager.plugin.downloader
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-import java.net.HttpURLConnection
-import java.net.URI
-
-/**
- * A simple parcelable data class for storing a package name and version.
- * This can be used as the data type for plugins that only need a name and version to implement their [DownloaderScope.download] function.
- *
- * @param name The package name.
- * @param version The version.
- */
-@Parcelize
-data class Package(val name: String, val version: String) : Parcelable
-
-/**
- * A data class for storing a download URL.
- *
- * @param url The download URL.
- * @param headers The headers to use for the request.
- */
-@Parcelize
-data class DownloadUrl(val url: String, val headers: Map<String, String> = emptyMap()) : Parcelable {
-    /**
-     * Converts this into a [DownloadResult].
-     */
-    fun toDownloadResult(): DownloadResult = with(URI.create(url).toURL().openConnection() as HttpURLConnection) {
-        useCaches = false
-        allowUserInteraction = false
-        headers.forEach(::setRequestProperty)
-
-        connectTimeout = 10_000
-        connect()
-
-        inputStream to getHeaderField("Content-Length").toLong()
-    }
-}
--- a/api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/API.kt
+++ b/api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/API.kt
@@ -1,176 +0,0 @@
-package app.revanced.manager.plugin.downloader.webview
-
-import android.content.Intent
-import app.revanced.manager.plugin.downloader.DownloadUrl
-import app.revanced.manager.plugin.downloader.DownloaderScope
-import app.revanced.manager.plugin.downloader.GetScope
-import app.revanced.manager.plugin.downloader.Scope
-import app.revanced.manager.plugin.downloader.Downloader
-import app.revanced.manager.plugin.downloader.PluginHostApi
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.supervisorScope
-import kotlinx.coroutines.withContext
-import kotlin.properties.Delegates
-
-typealias InitialUrl = String
-typealias PageLoadCallback<T> = suspend WebViewCallbackScope<T>.(url: String) -> Unit
-typealias DownloadCallback<T> = suspend WebViewCallbackScope<T>.(url: String, mimeType: String, userAgent: String) -> Unit
-
-interface WebViewCallbackScope<T> : Scope {
-    /**
-     * Finishes the activity and returns the [result].
-     */
-    suspend fun finish(result: T)
-
-    /**
-     * Tells the WebView to load the specified [url].
-     */
-    suspend fun load(url: String)
-}
-
-@OptIn(PluginHostApi::class)
-class WebViewScope<T> internal constructor(
-    coroutineScope: CoroutineScope,
-    private val scopeImpl: Scope,
-    setResult: (T) -> Unit
-) : Scope by scopeImpl {
-    private var onPageLoadCallback: PageLoadCallback<T> = {}
-    private var onDownloadCallback: DownloadCallback<T> = { _, _, _ -> }
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    private val dispatcher = Dispatchers.Default.limitedParallelism(1)
-    private lateinit var webView: IWebView
-    internal lateinit var initialUrl: String
-
-    internal val binder = object : IWebViewEvents.Stub() {
-        override fun ready(iface: IWebView?) {
-            coroutineScope.launch(dispatcher) {
-                webView = iface!!.also {
-                    it.load(initialUrl)
-                }
-            }
-        }
-
-        override fun pageLoad(url: String?) {
-            coroutineScope.launch(dispatcher) { onPageLoadCallback(callbackScope, url!!) }
-        }
-
-        override fun download(url: String?, mimetype: String?, userAgent: String?) {
-            coroutineScope.launch(dispatcher) {
-                onDownloadCallback(
-                    callbackScope,
-                    url!!,
-                    mimetype!!,
-                    userAgent!!
-                )
-            }
-        }
-    }
-
-    private val callbackScope = object : WebViewCallbackScope<T>, Scope by scopeImpl {
-        override suspend fun finish(result: T) {
-            setResult(result)
-            // Tell the WebViewActivity to finish
-            webView.let { withContext(Dispatchers.IO) { it.finish() } }
-        }
-
-        override suspend fun load(url: String) {
-            webView.let { withContext(Dispatchers.IO) { it.load(url) } }
-        }
-
-    }
-
-    /**
-     * Called when the WebView attempts to download a file to disk.
-     */
-    fun download(block: DownloadCallback<T>) {
-        onDownloadCallback = block
-    }
-
-    /**
-     * Called when the WebView finishes loading a page.
-     */
-    fun pageLoad(block: PageLoadCallback<T>) {
-        onPageLoadCallback = block
-    }
-}
-
-@JvmInline
-private value class Container<U>(val value: U)
-
-/**
- * Run a [android.webkit.WebView] Activity controlled by the provided code block.
- * The activity will keep running until it is cancelled or an event handler calls [WebViewCallbackScope.finish].
- * The [block] defines the event handlers and returns the initial URL.
- *
- * @param title The string displayed in the action bar.
- * @param block The control block.
- */
-@OptIn(PluginHostApi::class)
-suspend fun <T> GetScope.runWebView(
-    title: String,
-    block: suspend WebViewScope<T>.() -> InitialUrl
-) = supervisorScope {
-    var result by Delegates.notNull<Container<T>>()
-
-    val scope = WebViewScope<T>(this@supervisorScope, this@runWebView) { result = Container(it) }
-    scope.initialUrl = scope.block()
-
-    // Start the webview activity and wait until it finishes.
-    requestStartActivity(Intent().apply {
-        putExtra(
-            WebViewActivity.KEY,
-            WebViewActivity.Parameters(title, scope.binder)
-        )
-        setClassName(
-            hostPackageName,
-            WebViewActivity::class.qualifiedName!!
-        )
-    })
-
-    // Return the result and cancel any leftover coroutines.
-    coroutineContext.cancelChildren()
-    result.value
-}
-
-/**
- * Implement a downloader using [runWebView] and [DownloadUrl]. This function will automatically define a handler for download events unlike [runWebView].
- * Returning null inside the [block] is equivalent to returning null inside [DownloaderScope.get].
- *
- * @see runWebView
- */
-fun WebViewDownloader(block: suspend WebViewScope<DownloadUrl>.(packageName: String, version: String?) -> InitialUrl?) =
-    Downloader<DownloadUrl> {
-        val label = context.applicationInfo.loadLabel(
-            context.packageManager
-        ).toString()
-
-        get { packageName, version ->
-            class ReturnNull : Exception()
-
-            try {
-                runWebView(label) {
-                    download { url, _, userAgent ->
-                        finish(
-                            DownloadUrl(
-                                url,
-                                mapOf("User-Agent" to userAgent)
-                            )
-                        )
-                    }
-
-                    block(this@runWebView, packageName, version) ?: throw ReturnNull()
-                } to version
-            } catch (_: ReturnNull) {
-                null
-            }
-        }
-
-        download {
-            it.toDownloadResult()
-        }
-    }
--- a/api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/WebViewActivity.kt
+++ b/api/src/main/kotlin/app/revanced/manager/plugin/downloader/webview/WebViewActivity.kt
@@ -1,161 +0,0 @@
-package app.revanced.manager.plugin.downloader.webview
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.os.IBinder
-import android.os.Parcelable
-import android.view.MenuItem
-import android.webkit.CookieManager
-import android.webkit.WebSettings
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.activity.ComponentActivity
-import androidx.activity.addCallback
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.viewModels
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.lifecycle.viewModelScope
-import app.revanced.manager.plugin.downloader.PluginHostApi
-import app.revanced.manager.plugin.downloader.R
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.launch
-import kotlinx.parcelize.Parcelize
-
-@OptIn(PluginHostApi::class)
-@PluginHostApi
-class WebViewActivity : ComponentActivity() {
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val vm by viewModels<WebViewModel>()
-        enableEdgeToEdge()
-        setContentView(R.layout.activity_webview)
-
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
-        }
-        val webView = findViewById<WebView>(R.id.webview)
-        onBackPressedDispatcher.addCallback {
-            if (webView.canGoBack()) webView.goBack()
-            else cancelActivity()
-        }
-
-        val params = intent.getParcelableExtra<Parameters>(KEY)!!
-        actionBar?.apply {
-            title = params.title
-            setHomeAsUpIndicator(android.R.drawable.ic_menu_close_clear_cancel)
-            setDisplayHomeAsUpEnabled(true)
-        }
-
-        val events = IWebViewEvents.Stub.asInterface(params.events)!!
-        vm.setup(events)
-
-        webView.apply {
-            settings.apply {
-                cacheMode = WebSettings.LOAD_NO_CACHE
-                allowContentAccess = false
-                domStorageEnabled = true
-                javaScriptEnabled = true
-            }
-
-            webViewClient = vm.webViewClient
-            setDownloadListener { url, userAgent, _, mimetype, _ ->
-                vm.onDownload(url, mimetype, userAgent)
-            }
-        }
-
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.STARTED) {
-                vm.commands.collect {
-                    when (it) {
-                        is WebViewModel.Command.Finish -> {
-                            setResult(RESULT_OK)
-                            finish()
-                        }
-
-                        is WebViewModel.Command.Load -> webView.loadUrl(it.url)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun cancelActivity() {
-        setResult(RESULT_CANCELED)
-        finish()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
-        cancelActivity()
-
-        true
-    } else super.onOptionsItemSelected(item)
-
-    @Parcelize
-    internal class Parameters(
-        val title: String, val events: IBinder
-    ) : Parcelable
-
-    internal companion object {
-        const val KEY = "params"
-    }
-}
-
-@OptIn(PluginHostApi::class)
-internal class WebViewModel : ViewModel() {
-    init {
-        CookieManager.getInstance().apply {
-            removeAllCookies(null)
-            setAcceptCookie(true)
-        }
-    }
-
-    private val commandChannel = Channel<Command>()
-    val commands = commandChannel.receiveAsFlow()
-
-    private var eventBinder: IWebViewEvents? = null
-    private val ctrlBinder = object : IWebView.Stub() {
-        override fun load(url: String?) {
-            viewModelScope.launch {
-                commandChannel.send(Command.Load(url!!))
-            }
-        }
-
-        override fun finish() {
-            viewModelScope.launch {
-                commandChannel.send(Command.Finish)
-            }
-        }
-    }
-
-    val webViewClient = object : WebViewClient() {
-        override fun onPageFinished(view: WebView?, url: String?) {
-            super.onPageFinished(view, url)
-            eventBinder!!.pageLoad(url)
-        }
-    }
-
-    fun onDownload(url: String, mimeType: String, userAgent: String) {
-        eventBinder!!.download(url, mimeType, userAgent)
-    }
-
-    fun setup(binder: IWebViewEvents) {
-        if (eventBinder != null) return
-        eventBinder = binder
-        binder.ready(ctrlBinder)
-    }
-
-    sealed interface Command {
-        data class Load(val url: String) : Command
-        data object Finish : Command
-    }
-}
--- a/api/src/main/res/layout/activity_webview.xml
+++ b/api/src/main/res/layout/activity_webview.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/main">
-
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
--- a/api/src/main/res/values/strings.xml
+++ b/api/src/main/res/values/strings.xml
@@ -1 +0,0 @@
-<resources></resources>
--- a/api/src/main/res/values/themes.xml
+++ b/api/src/main/res/values/themes.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.WebViewActivity" parent="Theme.AppCompat.DayNight">
-        <item name="android:windowActionBar">true</item>
-        <item name="android:windowNoTitle">false</item>
-    </style>
-</resources>
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import kotlin.random.Random

 plugins {
@@ -9,12 +8,109 @@ plugins {
    alias(libs.plugins.compose.compiler)
    alias(libs.plugins.devtools)
    alias(libs.plugins.about.libraries)
-    signing
 }

-val outputApkFileName = "${rootProject.name}-$version.apk"
+android {
+    namespace = "app.revanced.manager"
+    compileSdk = 35
+    buildToolsVersion = "35.0.1"
+
+    defaultConfig {
+        applicationId = "app.revanced.manager"
+        minSdk = 26
+        targetSdk = 35
+        versionCode = 1
+        versionName = "0.0.1"
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+            resValue("string", "app_name", "ReVanced Manager (dev)")
+            isPseudoLocalesEnabled = true
+
+            buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
+        }
+
+        release {
+            if (!project.hasProperty("noProguard")) {
+                isMinifyEnabled = true
+                isShrinkResources = true
+                proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            }
+
+            if (project.hasProperty("signAsDebug")) {
+                applicationIdSuffix = ".debug"
+                resValue("string", "app_name", "ReVanced Manager Debug")
+                signingConfig = signingConfigs.getByName("debug")
+
+                isPseudoLocalesEnabled = true
+            }
+
+            buildConfigField("long", "BUILD_ID", "0L")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
+
+    packaging {
+        resources.excludes.addAll(listOf(
+            "/prebuilt/**",
+            "META-INF/DEPENDENCIES",
+            "META-INF/**.version",
+            "DebugProbesKt.bin",
+            "kotlin-tooling-metadata.json",
+            "org/bouncycastle/pqc/**.properties",
+            "org/bouncycastle/x509/**.properties",
+        ))
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
+    ksp {
+        arg("room.schemaLocation", "$projectDir/schemas")
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
+    buildFeatures {
+        compose = true
+        aidl = true
+        buildConfig = true
+    }
+
+    android {
+        androidResources {
+            generateLocaleConfig = true
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path = file("src/main/cpp/CMakeLists.txt")
+            version = "3.22.1"
+        }
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
+}

 dependencies {
+
    // AndroidX Core
    implementation(libs.androidx.ktx)
    implementation(libs.runtime.ktx)
@@ -41,6 +137,10 @@ dependencies {
    // Placeholder
    implementation(libs.placeholder.material3)

+    // HTML Scraper
+    implementation(libs.skrapeit.dsl)
+    implementation(libs.skrapeit.parser)
+
    // Coil (async image loading, network image)
    implementation(libs.coil.compose)
    implementation(libs.coil.appiconloader)
@@ -53,6 +153,7 @@ dependencies {
    // Room
    implementation(libs.room.runtime)
    implementation(libs.room.ktx)
+    annotationProcessor(libs.room.compiler)
    ksp(libs.room.compiler)

    // ReVanced
@@ -60,7 +161,7 @@ dependencies {
    implementation(libs.revanced.library)

    // Downloader plugins
-    implementation(projects.api)
+    implementation(libs.plugin.api)

    // Native processes
    implementation(libs.kotlin.process)
@@ -108,146 +209,3 @@ dependencies {
    // Compose Icons
    implementation(libs.compose.icons.fontawesome)
 }
-
-android {
-    namespace = "app.revanced.manager"
-    compileSdk = 36
-    buildToolsVersion = "36.0.0"
-
-    defaultConfig {
-        applicationId = "app.revanced.manager"
-        minSdk = 26
-        targetSdk = 36
-        versionCode = 1
-        versionName = "0.0.1"
-        vectorDrawables.useSupportLibrary = true
-    }
-
-    buildTypes {
-        configureEach {
-        }
-        debug {
-            applicationIdSuffix = ".debug"
-            resValue("string", "app_name", "ReVanced Manager (Debug)")
-            isPseudoLocalesEnabled = true
-
-            buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
-        }
-
-        release {
-            if (!project.hasProperty("noProguard")) {
-                isMinifyEnabled = true
-                isShrinkResources = true
-                proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-            }
-
-            val keystoreFile = file("keystore.jks")
-
-            if (project.hasProperty("signAsDebug") || !keystoreFile.exists()) {
-                applicationIdSuffix = ".debug_signed"
-                resValue("string", "app_name", "ReVanced Manager (Debug signed)")
-                signingConfig = signingConfigs.getByName("debug")
-
-                isPseudoLocalesEnabled = true
-            } else {
-                signingConfig = signingConfigs.create("release") {
-                    storeFile = keystoreFile
-                    storePassword = System.getenv("KEYSTORE_PASSWORD")
-                    keyAlias = System.getenv("KEYSTORE_ENTRY_ALIAS")
-                    keyPassword = System.getenv("KEYSTORE_ENTRY_PASSWORD")
-                }
-            }
-
-            buildConfigField("long", "BUILD_ID", "0L")
-        }
-    }
-
-    applicationVariants.all {
-        outputs.all {
-            this as com.android.build.gradle.internal.api.ApkVariantOutputImpl
-
-            outputFileName = outputApkFileName
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
-
-    packaging {
-        resources.excludes.addAll(
-            listOf(
-                "/prebuilt/**",
-                "META-INF/DEPENDENCIES",
-                "META-INF/**.version",
-                "DebugProbesKt.bin",
-                "kotlin-tooling-metadata.json",
-                "org/bouncycastle/pqc/**.properties",
-                "org/bouncycastle/x509/**.properties",
-            )
-        )
-        jniLibs {
-            useLegacyPackaging = true
-        }
-    }
-
-    ksp {
-        arg("room.schemaLocation", "$projectDir/schemas")
-    }
-
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.fromTarget("17")
-            jvmToolchain(17)
-        }
-    }
-
-    buildFeatures {
-        compose = true
-        aidl = true
-        buildConfig = true
-    }
-
-    android {
-        androidResources {
-            generateLocaleConfig = true
-        }
-    }
-
-    externalNativeBuild {
-        cmake {
-            path = file("src/main/cpp/CMakeLists.txt")
-            version = "3.22.1"
-        }
-    }
-}
-
-tasks {
-    // Needed by gradle-semantic-release-plugin.
-    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435.
-    val publish by registering {
-        group = "publishing"
-        description = "Build the release APK"
-
-        dependsOn("assembleRelease")
-
-        val apk = project.layout.buildDirectory.file("outputs/apk/release/${outputApkFileName}")
-        val ascFile = apk.map { it.asFile.resolveSibling("${it.asFile.name}.asc") }
-
-        inputs.file(apk).withPropertyName("inputApk")
-        outputs.file(ascFile).withPropertyName("outputAsc")
-
-        doLast {
-            signing {
-                useGpgCmd()
-                sign(apk.get().asFile)
-            }
-        }
-    }
-}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,14 +1,63 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
 -dontobfuscate

-keep class app.revanced.manager.patcher.runtime.process.* { *; }
-keep class app.revanced.manager.plugin.** { *; }
-keep class app.revanced.patcher.** { *; }
-keep class com.android.tools.smali.** { *; }
-keep class kotlin.** { *; }
-keepnames class com.android.apksig.internal.** { *; }
-keepnames class org.xmlpull.** { *; }
+# Required for serialization to work properly
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}

-dontwarn com.google.j2objc.annotations.*
+# This required for the process runtime.
+-keep class app.revanced.manager.patcher.runtime.process.* {
+  *;
+}
+# Required for the patcher to function correctly
+-keep class app.revanced.patcher.** {
+  *;
+}
+-keep class brut.** {
+  *;
+}
+-keep class org.xmlpull.** {
+  *;
+}
+-keep class kotlin.** {
+  *;
+}
+-keep class org.jf.** {
+  *;
+}
+-keep class com.android.** {
+  *;
+}
+-keep class app.revanced.manager.plugin.** {
+  *;
+}
+
+-dontwarn com.google.auto.value.**
 -dontwarn java.awt.**
 -dontwarn javax.**
-dontwarn org.slf4j.**
+-dontwarn org.slf4j.**
+-dontwarn it.skrape.fetcher.*
+-dontwarn com.google.j2objc.annotations.*
+
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
        tools:ignore="ScopedStorage" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />

    <application
        android:name=".ManagerApplication"
--- a/app/src/main/java/app/revanced/manager/MainActivity.kt
+++ b/app/src/main/java/app/revanced/manager/MainActivity.kt
@@ -44,13 +44,13 @@ import app.revanced.manager.ui.screen.SettingsScreen
 import app.revanced.manager.ui.screen.UpdateScreen
 import app.revanced.manager.ui.screen.settings.AboutSettingsScreen
 import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen
-import app.revanced.manager.ui.screen.settings.ContributorSettingsScreen
-import app.revanced.manager.ui.screen.settings.DeveloperSettingsScreen
+import app.revanced.manager.ui.screen.settings.ContributorScreen
+import app.revanced.manager.ui.screen.settings.DeveloperOptionsScreen
 import app.revanced.manager.ui.screen.settings.DownloadsSettingsScreen
 import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen
 import app.revanced.manager.ui.screen.settings.ImportExportSettingsScreen
-import app.revanced.manager.ui.screen.settings.LicensesSettingsScreen
-import app.revanced.manager.ui.screen.settings.update.ChangelogsSettingsScreen
+import app.revanced.manager.ui.screen.settings.LicensesScreen
+import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen
 import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
 import app.revanced.manager.ui.theme.ReVancedManagerTheme
 import app.revanced.manager.ui.theme.Theme
@@ -164,7 +164,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                        }
                    }
                },
-                viewModel = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
+                vm = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
            )
        }

@@ -234,7 +234,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                        selectedAppInfoVm.updateConfiguration(patches, options)
                        navController.popBackStack()
                    },
-                    viewModel = koinViewModel { parametersOf(data) }
+                    vm = koinViewModel { parametersOf(data) }
                )
            }

@@ -277,10 +277,6 @@ private fun ReVancedManager(vm: MainViewModel) {
                AdvancedSettingsScreen(onBackClick = navController::popBackStack)
            }

-            composable<Settings.Developer> {
-                DeveloperSettingsScreen(onBackClick = navController::popBackStack)
-            }
-
            composable<Settings.Updates> {
                UpdatesSettingsScreen(
                    onBackClick = navController::popBackStack,
@@ -305,17 +301,20 @@ private fun ReVancedManager(vm: MainViewModel) {
            }

            composable<Settings.Changelogs> {
-                ChangelogsSettingsScreen(onBackClick = navController::popBackStack)
+                ChangelogsScreen(onBackClick = navController::popBackStack)
            }

            composable<Settings.Contributors> {
-                ContributorSettingsScreen(onBackClick = navController::popBackStack)
+                ContributorScreen(onBackClick = navController::popBackStack)
            }

            composable<Settings.Licenses> {
-                LicensesSettingsScreen(onBackClick = navController::popBackStack)
+                LicensesScreen(onBackClick = navController::popBackStack)
            }

+            composable<Settings.DeveloperOptions> {
+                DeveloperOptionsScreen(onBackClick = navController::popBackStack)
+            }
        }
    }
 }
--- a/app/src/main/java/app/revanced/manager/data/redux/Redux.kt
+++ b/app/src/main/java/app/revanced/manager/data/redux/Redux.kt
@@ -1,74 +0,0 @@
-package app.revanced.manager.data.redux
-
-import android.util.Log
-import app.revanced.manager.util.tag
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withTimeoutOrNull
-
-// This file implements React Redux-like state management.
-
-class Store<S>(private val coroutineScope: CoroutineScope, initialState: S) : ActionContext {
-    private val _state = MutableStateFlow(initialState)
-    val state = _state.asStateFlow()
-
-    // Do not touch these without the lock.
-    private var isRunningActions = false
-    private val queueChannel = Channel<Action<S>>(capacity = 10)
-    private val lock = Mutex()
-
-    suspend fun dispatch(action: Action<S>) = lock.withLock {
-        Log.d(tag, "Dispatching $action")
-        queueChannel.send(action)
-
-        if (isRunningActions) return@withLock
-        isRunningActions = true
-        coroutineScope.launch {
-            runActions()
-        }
-    }
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    private suspend fun runActions() {
-        while (true) {
-            val action = withTimeoutOrNull(200L) { queueChannel.receive() }
-            if (action == null) {
-                Log.d(tag, "Stopping action runner")
-                lock.withLock {
-                    // New actions may be dispatched during the timeout.
-                    isRunningActions = !queueChannel.isEmpty
-                    if (!isRunningActions) return
-                }
-                continue
-            }
-
-            Log.d(tag, "Running $action")
-            _state.value = try {
-                with(action) { this@Store.execute(_state.value) }
-            } catch (c: CancellationException) {
-                // This is done without the lock, but cancellation usually means the store is no longer needed.
-                isRunningActions = false
-                throw c
-            } catch (e: Exception) {
-                action.catch(e)
-                continue
-            }
-        }
-    }
-}
-
-interface ActionContext
-
-interface Action<S> {
-    suspend fun ActionContext.execute(current: S): S
-    suspend fun catch(exception: Exception) {
-        Log.e(tag, "Got exception while executing $this", exception)
-    }
-}
--- a/app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleDao.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleDao.kt
@@ -1,14 +1,24 @@
 package app.revanced.manager.data.room.bundles

 import androidx.room.*
+import kotlinx.coroutines.flow.Flow

@Dao
 interface PatchBundleDao {
    @Query("SELECT * FROM patch_bundles")
    suspend fun all(): List<PatchBundleEntity>

+    @Query("SELECT version, auto_update FROM patch_bundles WHERE uid = :uid")
+    fun getPropsById(uid: Int): Flow<BundleProperties?>
+
    @Query("UPDATE patch_bundles SET version = :patches WHERE uid = :uid")
-    suspend fun updateVersionHash(uid: Int, patches: String?)
+    suspend fun updateVersion(uid: Int, patches: String?)
+
+    @Query("UPDATE patch_bundles SET auto_update = :value WHERE uid = :uid")
+    suspend fun setAutoUpdate(uid: Int, value: Boolean)
+
+    @Query("UPDATE patch_bundles SET name = :value WHERE uid = :uid")
+    suspend fun setName(uid: Int, value: String)

    @Query("DELETE FROM patch_bundles WHERE uid != 0")
    suspend fun purgeCustomBundles()
@@ -16,15 +26,12 @@ interface PatchBundleDao {
    @Transaction
    suspend fun reset() {
        purgeCustomBundles()
-        updateVersionHash(0, null) // Reset the main source
+        updateVersion(0, null) // Reset the main source
    }

    @Query("DELETE FROM patch_bundles WHERE uid = :uid")
    suspend fun remove(uid: Int)

-    @Query("SELECT name, version, auto_update, source FROM patch_bundles WHERE uid = :uid")
-    suspend fun getProps(uid: Int): PatchBundleProperties?
-
-    @Upsert
-    suspend fun upsert(source: PatchBundleEntity)
+    @Insert
+    suspend fun add(source: PatchBundleEntity)
 }
--- a/app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleEntity.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleEntity.kt
@@ -33,14 +33,12 @@ sealed class Source {
 data class PatchBundleEntity(
    @PrimaryKey val uid: Int,
    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "version") val versionHash: String? = null,
+    @ColumnInfo(name = "version") val version: String? = null,
    @ColumnInfo(name = "source") val source: Source,
    @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
 )

-data class PatchBundleProperties(
-    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "version") val versionHash: String? = null,
-    @ColumnInfo(name = "source") val source: Source,
+data class BundleProperties(
+    @ColumnInfo(name = "version") val version: String? = null,
    @ColumnInfo(name = "auto_update") val autoUpdate: Boolean
 )
--- a/app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/options/OptionDao.kt
@@ -27,10 +27,10 @@ abstract class OptionDao {
    abstract suspend fun createOptionGroup(group: OptionGroup)

    @Query("DELETE FROM option_groups WHERE patch_bundle = :uid")
-    abstract suspend fun resetOptionsForPatchBundle(uid: Int)
+    abstract suspend fun clearForPatchBundle(uid: Int)

    @Query("DELETE FROM option_groups WHERE package_name = :packageName")
-    abstract suspend fun resetOptionsForPackage(packageName: String)
+    abstract suspend fun clearForPackage(packageName: String)

    @Query("DELETE FROM option_groups")
    abstract suspend fun reset()
--- a/app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt
+++ b/app/src/main/java/app/revanced/manager/data/room/selection/SelectionDao.kt
@@ -5,7 +5,6 @@ import androidx.room.Insert
 import androidx.room.MapColumn
 import androidx.room.Query
 import androidx.room.Transaction
-import kotlinx.coroutines.flow.Flow

@Dao
 abstract class SelectionDao {
@@ -35,14 +34,11 @@ abstract class SelectionDao {
    @Insert
    abstract suspend fun createSelection(selection: PatchSelection)

-    @Query("SELECT package_name FROM patch_selections")
-    abstract fun getPackagesWithSelection(): Flow<List<String>>
-
    @Query("DELETE FROM patch_selections WHERE patch_bundle = :uid")
-    abstract suspend fun resetForPatchBundle(uid: Int)
+    abstract suspend fun clearForPatchBundle(uid: Int)

    @Query("DELETE FROM patch_selections WHERE package_name = :packageName")
-    abstract suspend fun resetForPackage(packageName: String)
+    abstract suspend fun clearForPackage(packageName: String)

    @Query("DELETE FROM patch_selections")
    abstract suspend fun reset()
--- a/app/src/main/java/app/revanced/manager/di/RepositoryModule.kt
+++ b/app/src/main/java/app/revanced/manager/di/RepositoryModule.kt
@@ -15,6 +15,7 @@ val repositoryModule = module {
        createdAtStart()
    }
    singleOf(::NetworkInfo)
+    singleOf(::PatchBundlePersistenceRepository)
    singleOf(::PatchSelectionRepository)
    singleOf(::PatchOptionsRepository)
    singleOf(::PatchBundleRepository) {
--- a/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt
+++ b/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt
@@ -23,5 +23,4 @@ val viewModelModule = module {
    viewModelOf(::InstalledAppsViewModel)
    viewModelOf(::InstalledAppInfoViewModel)
    viewModelOf(::UpdatesSettingsViewModel)
-    viewModelOf(::BundleListViewModel)
 }
--- a/app/src/main/java/app/revanced/manager/domain/bundles/LocalPatchBundle.kt
+++ b/app/src/main/java/app/revanced/manager/domain/bundles/LocalPatchBundle.kt
@@ -1,29 +1,21 @@
 package app.revanced.manager.domain.bundles

-import app.revanced.manager.data.redux.ActionContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.InputStream

-class LocalPatchBundle(
-    name: String,
-    uid: Int,
-    error: Throwable?,
-    directory: File
-) : PatchBundleSource(name, uid, error, directory) {
-    suspend fun ActionContext.replace(patches: InputStream) {
+class LocalPatchBundle(name: String, id: Int, directory: File) :
+    PatchBundleSource(name, id, directory) {
+    suspend fun replace(patches: InputStream) {
        withContext(Dispatchers.IO) {
            patchBundleOutputStream().use { outputStream ->
                patches.copyTo(outputStream)
            }
        }
-    }

-    override fun copy(error: Throwable?, name: String) = LocalPatchBundle(
-        name,
-        uid,
-        error,
-        directory
-    )
+        reload()?.also {
+            saveVersion(it.readManifestAttribute("Version"))
+        }
+    }
 }
--- a/app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt
+++ b/app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt
@@ -1,10 +1,22 @@
 package app.revanced.manager.domain.bundles

+import android.app.Application
+import android.util.Log
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
-import app.revanced.manager.data.redux.ActionContext
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import app.revanced.manager.R
+import app.revanced.manager.domain.repository.PatchBundlePersistenceRepository
 import app.revanced.manager.patcher.patch.PatchBundle
+import app.revanced.manager.util.tag
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import java.io.File
 import java.io.OutputStream

@@ -12,32 +24,24 @@ import java.io.OutputStream
 * A [PatchBundle] source.
 */
@Stable
-sealed class PatchBundleSource(
-    val name: String,
-    val uid: Int,
-    error: Throwable?,
-    protected val directory: File
-) {
+sealed class PatchBundleSource(initialName: String, val uid: Int, directory: File) : KoinComponent {
+    protected val configRepository: PatchBundlePersistenceRepository by inject()
+    private val app: Application by inject()
    protected val patchesFile = directory.resolve("patches.jar")

-    val state = when {
-        error != null -> State.Failed(error)
-        !hasInstalled() -> State.Missing
-        else -> State.Available(PatchBundle(patchesFile.absolutePath))
-    }
+    private val _state = MutableStateFlow(load())
+    val state = _state.asStateFlow()

-    val patchBundle get() = (state as? State.Available)?.bundle
-    val version get() = patchBundle?.manifestAttributes?.version
-    val isNameOutOfDate get() = patchBundle?.manifestAttributes?.name?.let { it != name } == true
-    val error get() = (state as? State.Failed)?.throwable
+    private val _nameFlow = MutableStateFlow(initialName)
+    val nameFlow =
+        _nameFlow.map { it.ifEmpty { app.getString(if (isDefault) R.string.bundle_name_default else R.string.bundle_name_fallback) } }

-    suspend fun ActionContext.deleteLocalFile() = withContext(Dispatchers.IO) {
-        patchesFile.delete()
-    }
+    suspend fun getName() = nameFlow.first()

-    abstract fun copy(error: Throwable? = this.error, name: String = this.name): PatchBundleSource
-
-    protected fun hasInstalled() = patchesFile.exists()
+    /**
+     * Returns true if the bundle has been downloaded to local storage.
+     */
+    fun hasInstalled() = patchesFile.exists()

    protected fun patchBundleOutputStream(): OutputStream = with(patchesFile) {
        // Android 14+ requires dex containers to be readonly.
@@ -49,14 +53,62 @@ sealed class PatchBundleSource(
        }
    }

+    private fun load(): State {
+        if (!hasInstalled()) return State.Missing
+
+        return try {
+            State.Loaded(PatchBundle(patchesFile))
+        } catch (t: Throwable) {
+            Log.e(tag, "Failed to load patch bundle with UID $uid", t)
+            State.Failed(t)
+        }
+    }
+
+    suspend fun reload(): PatchBundle? {
+        val newState = load()
+        _state.value = newState
+
+        val bundle = newState.patchBundleOrNull()
+        // Try to read the name from the patch bundle manifest if the bundle does not have a name.
+        if (bundle != null && _nameFlow.value.isEmpty()) {
+            bundle.readManifestAttribute("Name")?.let { setName(it) }
+        }
+
+        return bundle
+    }
+
+    /**
+     * Create a flow that emits the [app.revanced.manager.data.room.bundles.BundleProperties] of this [PatchBundleSource].
+     * The flow will emit null if the associated [PatchBundleSource] is deleted.
+     */
+    fun propsFlow() = configRepository.getProps(uid).flowOn(Dispatchers.Default)
+    suspend fun getProps() = propsFlow().first()!!
+
+    suspend fun currentVersion() = getProps().version
+    protected suspend fun saveVersion(version: String?) =
+        configRepository.updateVersion(uid, version)
+
+    suspend fun setName(name: String) {
+        configRepository.setName(uid, name)
+        _nameFlow.value = name
+    }
+
    sealed interface State {
+        fun patchBundleOrNull(): PatchBundle? = null
+
        data object Missing : State
        data class Failed(val throwable: Throwable) : State
-        data class Available(val bundle: PatchBundle) : State
+        data class Loaded(val bundle: PatchBundle) : State {
+            override fun patchBundleOrNull() = bundle
+        }
    }

    companion object Extensions {
        val PatchBundleSource.isDefault inline get() = uid == 0
        val PatchBundleSource.asRemoteOrNull inline get() = this as? RemotePatchBundle
+        val PatchBundleSource.nameState
+            @Composable inline get() = nameFlow.collectAsStateWithLifecycle(
+                ""
+            )
    }
 }
--- a/app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt
+++ b/app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt
@@ -1,6 +1,6 @@
 package app.revanced.manager.domain.bundles

-import app.revanced.manager.data.redux.ActionContext
+import androidx.compose.runtime.Stable
 import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.network.dto.ReVancedAsset
 import app.revanced.manager.network.service.HttpService
@@ -8,24 +8,15 @@ import app.revanced.manager.network.utils.getOrThrow
 import io.ktor.client.request.url
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.io.File

-sealed class RemotePatchBundle(
-    name: String,
-    uid: Int,
-    protected val versionHash: String?,
-    error: Throwable?,
-    directory: File,
-    val endpoint: String,
-    val autoUpdate: Boolean,
-) : PatchBundleSource(name, uid, error, directory), KoinComponent {
+@Stable
+sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpoint: String) :
+    PatchBundleSource(name, id, directory) {
    protected val http: HttpService by inject()

    protected abstract suspend fun getLatestInfo(): ReVancedAsset
-    abstract fun copy(error: Throwable? = this.error, name: String = this.name, autoUpdate: Boolean = this.autoUpdate): RemotePatchBundle
-    override fun copy(error: Throwable?, name: String): RemotePatchBundle = copy(error, name, this.autoUpdate)

    private suspend fun download(info: ReVancedAsset) = withContext(Dispatchers.IO) {
        patchBundleOutputStream().use {
@@ -34,72 +25,47 @@ sealed class RemotePatchBundle(
            }
        }

-        info.version
+        saveVersion(info.version)
+        reload()
    }

-    /**
-     * Downloads the latest version regardless if there is a new update available.
-     */
-    suspend fun ActionContext.downloadLatest() = download(getLatestInfo())
+    suspend fun downloadLatest() {
+        download(getLatestInfo())
+    }

-    suspend fun ActionContext.update(): String? = withContext(Dispatchers.IO) {
+    suspend fun update(): Boolean = withContext(Dispatchers.IO) {
        val info = getLatestInfo()
-        if (hasInstalled() && info.version == versionHash)
-            return@withContext null
+        if (hasInstalled() && info.version == currentVersion())
+            return@withContext false

        download(info)
+        true
    }

+    suspend fun deleteLocalFiles() = withContext(Dispatchers.Default) {
+        patchesFile.delete()
+        reload()
+    }
+
+    suspend fun setAutoUpdate(value: Boolean) = configRepository.setAutoUpdate(uid, value)
+
    companion object {
-        const val updateFailMsg = "Failed to update patches"
+        const val updateFailMsg = "Failed to update patch bundle(s)"
    }
 }

-class JsonPatchBundle(
-    name: String,
-    uid: Int,
-    versionHash: String?,
-    error: Throwable?,
-    directory: File,
-    endpoint: String,
-    autoUpdate: Boolean,
-) : RemotePatchBundle(name, uid, versionHash, error, directory, endpoint, autoUpdate) {
+class JsonPatchBundle(name: String, id: Int, directory: File, endpoint: String) :
+    RemotePatchBundle(name, id, directory, endpoint) {
    override suspend fun getLatestInfo() = withContext(Dispatchers.IO) {
        http.request<ReVancedAsset> {
            url(endpoint)
        }.getOrThrow()
    }
-
-    override fun copy(error: Throwable?, name: String, autoUpdate: Boolean) = JsonPatchBundle(
-        name,
-        uid,
-        versionHash,
-        error,
-        directory,
-        endpoint,
-        autoUpdate,
-    )
 }

-class APIPatchBundle(
-    name: String,
-    uid: Int,
-    versionHash: String?,
-    error: Throwable?,
-    directory: File,
-    endpoint: String,
-    autoUpdate: Boolean,
-) : RemotePatchBundle(name, uid, versionHash, error, directory, endpoint, autoUpdate) {
+class APIPatchBundle(name: String, id: Int, directory: File, endpoint: String) :
+    RemotePatchBundle(name, id, directory, endpoint) {
    private val api: ReVancedAPI by inject()

    override suspend fun getLatestInfo() = api.getPatchesUpdate().getOrThrow()
-    override fun copy(error: Throwable?, name: String, autoUpdate: Boolean) = APIPatchBundle(
-        name,
-        uid,
-        versionHash,
-        error,
-        directory,
-        endpoint,
-        autoUpdate,
-    )
 }
--- a/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt
+++ b/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt
@@ -3,7 +3,6 @@ package app.revanced.manager.domain.manager
 import android.content.Context
 import app.revanced.manager.domain.manager.base.BasePreferencesManager
 import app.revanced.manager.ui.theme.Theme
-import app.revanced.manager.util.isDebuggable

 class PreferencesManager(
    context: Context
@@ -25,10 +24,8 @@ class PreferencesManager(

    val disablePatchVersionCompatCheck = booleanPreference("disable_patch_version_compatibility_check", false)
    val disableSelectionWarning = booleanPreference("disable_selection_warning", false)
-    val disableUniversalPatchCheck = booleanPreference("disable_patch_universal_check", false)
+    val disableUniversalPatchWarning = booleanPreference("disable_universal_patch_warning", false)
    val suggestedVersionSafeguard = booleanPreference("suggested_version_safeguard", true)

    val acknowledgedDownloaderPlugins = stringSetPreference("acknowledged_downloader_plugins", emptySet())
-
-    val showDeveloperSettings = booleanPreference("show_developer_settings", context.isDebuggable)
 }
--- a/app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/DownloadedAppRepository.kt
@@ -40,8 +40,6 @@ class DownloadedAppRepository(
        data: Parcelable,
        expectedPackageName: String,
        expectedVersion: String?,
-        appCompatibilityCheck: Boolean,
-        patchesCompatibilityCheck: Boolean,
        onDownload: suspend (downloadProgress: Pair<Long, Long?>) -> Unit,
    ): File {
        // Converted integers cannot contain / or .. unlike the package name or version, so they are safer to use here.
@@ -98,12 +96,7 @@ class DownloadedAppRepository(
            val pkgInfo =
                pm.getPackageInfo(targetFile.toFile()) ?: error("Downloaded APK file is invalid")
            if (pkgInfo.packageName != expectedPackageName) error("Downloaded APK has the wrong package name. Expected: $expectedPackageName, Actual: ${pkgInfo.packageName}")
-            expectedVersion?.let {
-                if (
-                    pkgInfo.versionName != expectedVersion &&
-                    (appCompatibilityCheck || patchesCompatibilityCheck)
-                ) error("The selected app version ($pkgInfo.versionName) doesn't match the suggested version. Please use the suggested version ($expectedVersion), or adjust your settings by disabling \"Require suggested app version\" and enabling \"Disable version compatibility check\".")
-            }
+            if (expectedVersion != null && pkgInfo.versionName != expectedVersion) error("Downloaded APK has the wrong version. Expected: $expectedVersion, Actual: ${pkgInfo.versionName}")

            // Delete the previous copy (if present).
            dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let {
--- a/app/src/main/java/app/revanced/manager/domain/repository/PatchBundlePersistenceRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/PatchBundlePersistenceRepository.kt
@@ -0,0 +1,55 @@
+package app.revanced.manager.domain.repository
+
+import app.revanced.manager.data.room.AppDatabase
+import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
+import app.revanced.manager.data.room.bundles.PatchBundleEntity
+import app.revanced.manager.data.room.bundles.Source
+import kotlinx.coroutines.flow.distinctUntilChanged
+
+class PatchBundlePersistenceRepository(db: AppDatabase) {
+    private val dao = db.patchBundleDao()
+
+    suspend fun loadConfiguration(): List<PatchBundleEntity> {
+        val all = dao.all()
+        if (all.isEmpty()) {
+            dao.add(defaultSource)
+            return listOf(defaultSource)
+        }
+
+        return all
+    }
+
+    suspend fun reset() = dao.reset()
+
+    suspend fun create(name: String, source: Source, autoUpdate: Boolean = false) =
+        PatchBundleEntity(
+            uid = generateUid(),
+            name = name,
+            version = null,
+            source = source,
+            autoUpdate = autoUpdate
+        ).also {
+            dao.add(it)
+        }
+
+    suspend fun delete(uid: Int) = dao.remove(uid)
+
+    suspend fun updateVersion(uid: Int, version: String?) =
+        dao.updateVersion(uid, version)
+
+    suspend fun setAutoUpdate(uid: Int, value: Boolean) = dao.setAutoUpdate(uid, value)
+
+    suspend fun setName(uid: Int, name: String) = dao.setName(uid, name)
+
+    fun getProps(id: Int) = dao.getPropsById(id).distinctUntilChanged()
+
+    private companion object {
+        val defaultSource = PatchBundleEntity(
+            uid = 0,
+            name = "",
+            version = null,
+            source = Source.API,
+            autoUpdate = false
+        )
+    }
+}
--- a/app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt
@@ -3,78 +3,55 @@ package app.revanced.manager.domain.repository
 import android.app.Application
 import android.content.Context
 import android.util.Log
-import androidx.annotation.StringRes
 import app.revanced.library.mostCommonCompatibleVersions
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.NetworkInfo
-import app.revanced.manager.data.redux.Action
-import app.revanced.manager.data.redux.ActionContext
-import app.revanced.manager.data.redux.Store
-import app.revanced.manager.data.room.AppDatabase
-import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
 import app.revanced.manager.data.room.bundles.PatchBundleEntity
-import app.revanced.manager.data.room.bundles.PatchBundleProperties
-import app.revanced.manager.data.room.bundles.Source
 import app.revanced.manager.domain.bundles.APIPatchBundle
 import app.revanced.manager.domain.bundles.JsonPatchBundle
 import app.revanced.manager.data.room.bundles.Source as SourceInfo
 import app.revanced.manager.domain.bundles.LocalPatchBundle
 import app.revanced.manager.domain.bundles.RemotePatchBundle
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.patcher.patch.PatchInfo
-import app.revanced.manager.patcher.patch.PatchBundle
-import app.revanced.manager.patcher.patch.PatchBundleInfo
-import app.revanced.manager.util.simpleMessage
+import app.revanced.manager.util.flatMapLatestAndCombine
 import app.revanced.manager.util.tag
-import app.revanced.manager.util.toast
-import kotlinx.collections.immutable.*
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
+import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.InputStream
-import kotlin.collections.joinToString
-import kotlin.collections.map
-import kotlin.text.ifEmpty

 class PatchBundleRepository(
    private val app: Application,
+    private val persistenceRepo: PatchBundlePersistenceRepository,
    private val networkInfo: NetworkInfo,
    private val prefs: PreferencesManager,
-    db: AppDatabase,
 ) {
-    private val dao = db.patchBundleDao()
    private val bundlesDir = app.getDir("patch_bundles", Context.MODE_PRIVATE)

-    private val store = Store(CoroutineScope(Dispatchers.Default), State())
+    private val _sources: MutableStateFlow<Map<Int, PatchBundleSource>> =
+        MutableStateFlow(emptyMap())
+    val sources = _sources.map { it.values.toList() }

-    val sources = store.state.map { it.sources.values.toList() }
-    val bundles = store.state.map {
-        it.sources.mapNotNull { (uid, src) ->
-            uid to (src.patchBundle ?: return@mapNotNull null)
-        }.toMap()
-    }
-    val bundleInfoFlow = store.state.map { it.info }
-
-    fun scopedBundleInfoFlow(packageName: String, version: String?) = bundleInfoFlow.map {
-        it.map { (_, bundleInfo) ->
-            bundleInfo.forPackage(
-                packageName,
-                version
-            )
+    val bundles = sources.flatMapLatestAndCombine(
+        combiner = {
+            it.mapNotNull { (uid, state) ->
+                val bundle = state.patchBundleOrNull() ?: return@mapNotNull null
+                uid to bundle
+            }.toMap()
        }
+    ) {
+        it.state.map { state -> it.uid to state }
    }

-    val patchCountsFlow = bundleInfoFlow.map { it.mapValues { (_, info) -> info.patches.size } }
-
-    val suggestedVersions = bundleInfoFlow.map {
+    val suggestedVersions = bundles.map {
        val allPatches =
            it.values.flatMap { bundle -> bundle.patches.map(PatchInfo::toPatcherPatch) }.toSet()

@@ -97,100 +74,6 @@ class PatchBundleRepository(
            }
    }

-    private suspend inline fun dispatchAction(
-        name: String,
-        crossinline block: suspend ActionContext.(current: State) -> State
-    ) {
-        store.dispatch(object : Action<State> {
-            override suspend fun ActionContext.execute(current: State) = block(current)
-            override fun toString() = name
-        })
-    }
-
-    /**
-     * Performs a reload. Do not call this outside of a store action.
-     */
-    private suspend fun doReload(): State {
-        val entities = loadFromDb().onEach {
-            Log.d(tag, "Bundle: $it")
-        }
-
-        val sources = entities.associate { it.uid to it.load() }.toPersistentMap()
-
-        val hasOutOfDateNames = sources.values.any { it.isNameOutOfDate }
-        if (hasOutOfDateNames) dispatchAction(
-            "Sync names"
-        ) { state ->
-            val nameChanges = state.sources.mapNotNull { (_, src) ->
-                if (!src.isNameOutOfDate) return@mapNotNull null
-                val newName = src.patchBundle?.manifestAttributes?.name?.takeIf { it != src.name }
-                    ?: return@mapNotNull null
-
-                src.uid to newName
-            }
-            val sources = state.sources.toMutableMap()
-            val info = state.info.toMutableMap()
-            nameChanges.forEach { (uid, name) ->
-                updateDb(uid) { it.copy(name = name) }
-                sources[uid] = sources[uid]!!.copy(name = name)
-                info[uid] = info[uid]?.copy(name = name) ?: return@forEach
-            }
-
-            State(sources.toPersistentMap(), info.toPersistentMap())
-        }
-        val info = loadMetadata(sources).toPersistentMap()
-
-        return State(sources, info)
-    }
-
-    suspend fun reload() = dispatchAction("Full reload") {
-        doReload()
-    }
-
-    private suspend fun loadFromDb(): List<PatchBundleEntity> {
-        val all = dao.all()
-        if (all.isEmpty()) {
-            dao.upsert(defaultSource)
-            return listOf(defaultSource)
-        }
-
-        return all
-    }
-
-    private suspend fun loadMetadata(sources: Map<Int, PatchBundleSource>): Map<Int, PatchBundleInfo.Global> {
-        // Map bundles -> sources
-        val map = sources.mapNotNull { (_, src) ->
-            (src.patchBundle ?: return@mapNotNull null) to src
-        }.toMap()
-
-        val metadata = try {
-            PatchBundle.Loader.metadata(map.keys)
-        } catch (error: Throwable) {
-            val uids = map.values.map { it.uid }
-
-            dispatchAction("Mark bundles as failed") { state ->
-                state.copy(sources = state.sources.mutate {
-                    uids.forEach { uid ->
-                        it[uid] = it[uid]?.copy(error = error) ?: return@forEach
-                    }
-                })
-            }
-
-            Log.e(tag, "Failed to load bundles", error)
-            emptyMap()
-        }
-
-        return metadata.entries.associate { (bundle, patches) ->
-            val src = map[bundle]!!
-            src.uid to PatchBundleInfo.Global(
-                src.name,
-                bundle.manifestAttributes?.version,
-                src.uid,
-                patches
-            )
-        }
-    }
-
    suspend fun isVersionAllowed(packageName: String, version: String) =
        withContext(Dispatchers.Default) {
            if (!prefs.suggestedVersionSafeguard.get()) return@withContext true
@@ -206,211 +89,96 @@ class PatchBundleRepository(

    private fun PatchBundleEntity.load(): PatchBundleSource {
        val dir = directoryOf(uid)
-        val actualName =
-            name.ifEmpty { app.getString(if (uid == 0) R.string.patches_name_default else R.string.patches_name_fallback) }

        return when (source) {
-            is SourceInfo.Local -> LocalPatchBundle(actualName, uid, null, dir)
-            is SourceInfo.API -> APIPatchBundle(
-                actualName,
-                uid,
-                versionHash,
-                null,
-                dir,
-                SourceInfo.API.SENTINEL,
-                autoUpdate,
-            )
-
+            is SourceInfo.Local -> LocalPatchBundle(name, uid, dir)
+            is SourceInfo.API -> APIPatchBundle(name, uid, dir, SourceInfo.API.SENTINEL)
            is SourceInfo.Remote -> JsonPatchBundle(
-                actualName,
+                name,
                uid,
-                versionHash,
-                null,
                dir,
-                source.url.toString(),
-                autoUpdate,
+                source.url.toString()
            )
        }
    }

-    private suspend fun createEntity(name: String, source: Source, autoUpdate: Boolean = false) =
-        PatchBundleEntity(
-            uid = generateUid(),
-            name = name,
-            versionHash = null,
-            source = source,
-            autoUpdate = autoUpdate
-        ).also {
-            dao.upsert(it)
+    suspend fun reload() = withContext(Dispatchers.Default) {
+        val entities = persistenceRepo.loadConfiguration().onEach {
+            Log.d(tag, "Bundle: $it")
        }

-    /**
-     * Updates a patch bundle in the database. Do not use this outside an action.
-     */
-    private suspend fun updateDb(
-        uid: Int,
-        block: (PatchBundleProperties) -> PatchBundleProperties
-    ) {
-        val previous = dao.getProps(uid)!!
-        val new = block(previous)
-        dao.upsert(
-            PatchBundleEntity(
-                uid = uid,
-                name = new.name,
-                versionHash = new.versionHash,
-                source = new.source,
-                autoUpdate = new.autoUpdate,
-            )
-        )
+        _sources.value = entities.associate {
+            it.uid to it.load()
+        }
    }

-    suspend fun reset() = dispatchAction("Reset") { state ->
-        dao.reset()
-        state.sources.keys.forEach { directoryOf(it).deleteRecursively() }
-        doReload()
+    suspend fun reset() = withContext(Dispatchers.Default) {
+        persistenceRepo.reset()
+        _sources.value = emptyMap()
+        bundlesDir.apply {
+            deleteRecursively()
+            mkdirs()
+        }
+
+        reload()
    }

-    suspend fun remove(vararg bundles: PatchBundleSource) =
-        dispatchAction("Remove (${bundles.map { it.uid }.joinToString(",")})") { state ->
-            val sources = state.sources.toMutableMap()
-            val info = state.info.toMutableMap()
-            bundles.forEach {
-                if (it.isDefault) return@forEach
+    suspend fun remove(bundle: PatchBundleSource) = withContext(Dispatchers.Default) {
+        persistenceRepo.delete(bundle.uid)
+        directoryOf(bundle.uid).deleteRecursively()

-                dao.remove(it.uid)
-                directoryOf(it.uid).deleteRecursively()
-                sources.remove(it.uid)
-                info.remove(it.uid)
+        _sources.update {
+            it.filterKeys { key ->
+                key != bundle.uid
            }
+        }
+    }

-            State(sources.toPersistentMap(), info.toPersistentMap())
+    private fun addBundle(patchBundle: PatchBundleSource) =
+        _sources.update { it.toMutableMap().apply { put(patchBundle.uid, patchBundle) } }
+
+    suspend fun createLocal(patches: InputStream) = withContext(Dispatchers.Default) {
+        val uid = persistenceRepo.create("", SourceInfo.Local).uid
+        val bundle = LocalPatchBundle("", uid, directoryOf(uid))
+
+        bundle.replace(patches)
+        addBundle(bundle)
+    }
+
+    suspend fun createRemote(url: String, autoUpdate: Boolean) = withContext(Dispatchers.Default) {
+        val entity = persistenceRepo.create("", SourceInfo.from(url), autoUpdate)
+        addBundle(entity.load())
+    }
+
+    private suspend inline fun <reified T> getBundlesByType() =
+        sources.first().filterIsInstance<T>()
+
+    suspend fun reloadApiBundles() {
+        getBundlesByType<APIPatchBundle>().forEach {
+            it.deleteLocalFiles()
        }

-    suspend fun createLocal(createStream: suspend () -> InputStream) = dispatchAction("Add bundle") {
-        with(createEntity("", SourceInfo.Local).load() as LocalPatchBundle) {
-            try {
-                createStream().use { patches -> replace(patches) }
-            } catch (e: Exception) {
-                if (e is CancellationException) throw e
-                Log.e(tag, "Got exception while importing bundle", e)
-                withContext(Dispatchers.Main) {
-                    app.toast(app.getString(R.string.patches_replace_fail, e.simpleMessage()))
+        reload()
+    }
+
+    suspend fun redownloadRemoteBundles() =
+        getBundlesByType<RemotePatchBundle>().forEach { it.downloadLatest() }
+
+    suspend fun updateCheck() =
+        uiSafe(app, R.string.source_download_fail, "Failed to update bundles") {
+            coroutineScope {
+                if (!networkInfo.isSafe()) {
+                    Log.d(tag, "Skipping update check because the network is down or metered.")
+                    return@coroutineScope
                }

-                deleteLocalFile()
-            }
-        }
-
-        doReload()
-    }
-
-    suspend fun createRemote(url: String, autoUpdate: Boolean) =
-        dispatchAction("Add bundle ($url)") { state ->
-            val src = createEntity("", SourceInfo.from(url), autoUpdate).load() as RemotePatchBundle
-            update(src)
-            state.copy(sources = state.sources.put(src.uid, src))
-        }
-
-    suspend fun reloadApiBundles() = dispatchAction("Reload API bundles") {
-        this@PatchBundleRepository.sources.first().filterIsInstance<APIPatchBundle>().forEach {
-            with(it) { deleteLocalFile() }
-            updateDb(it.uid) { it.copy(versionHash = null) }
-        }
-
-        doReload()
-    }
-
-    suspend fun RemotePatchBundle.setAutoUpdate(value: Boolean) =
-        dispatchAction("Set auto update ($name, $value)") { state ->
-            updateDb(uid) { it.copy(autoUpdate = value) }
-            val newSrc = (state.sources[uid] as? RemotePatchBundle)?.copy(autoUpdate = value)
-                ?: return@dispatchAction state
-
-            state.copy(sources = state.sources.put(uid, newSrc))
-        }
-
-    suspend fun update(vararg sources: RemotePatchBundle, showToast: Boolean = false) {
-        val uids = sources.map { it.uid }.toSet()
-        store.dispatch(Update(showToast = showToast) { it.uid in uids })
-    }
-
-    suspend fun redownloadRemoteBundles() = store.dispatch(Update(force = true))
-
-    /**
-     * Updates all bundles that should be automatically updated.
-     */
-    suspend fun updateCheck() = store.dispatch(Update { it.autoUpdate })
-
-    private inner class Update(
-        private val force: Boolean = false,
-        private val showToast: Boolean = false,
-        private val predicate: (bundle: RemotePatchBundle) -> Boolean = { true },
-    ) : Action<State> {
-        private suspend fun toast(@StringRes id: Int, vararg args: Any?) =
-            withContext(Dispatchers.Main) { app.toast(app.getString(id, *args)) }
-
-        override fun toString() = if (force) "Redownload remote bundles" else "Update check"
-
-        override suspend fun ActionContext.execute(
-            current: State
-        ) = coroutineScope {
-            if (!networkInfo.isSafe()) {
-                Log.d(tag, "Skipping update check because the network is down or metered.")
-                return@coroutineScope current
-            }
-
-            val updated = current.sources.values
-                .filterIsInstance<RemotePatchBundle>()
-                .filter { predicate(it) }
-                .map {
-                    async {
-                        Log.d(tag, "Updating patch bundle: ${it.name}")
-
-                        val newVersion = with(it) {
-                            if (force) downloadLatest() else update()
-                        } ?: return@async null
-
-                        it to newVersion
+                getBundlesByType<RemotePatchBundle>().forEach {
+                    launch {
+                        if (!it.getProps().autoUpdate) return@launch
+                        Log.d(tag, "Updating patch bundle: ${it.getName()}")
+                        it.update()
                    }
                }
-                .awaitAll()
-                .filterNotNull()
-                .toMap()
-            if (updated.isEmpty()) {
-                if (showToast) toast(R.string.patches_update_unavailable)
-                return@coroutineScope current
            }
-
-            updated.forEach { (src, newVersionHash) ->
-                val name = src.patchBundle?.manifestAttributes?.name ?: src.name
-
-                updateDb(src.uid) {
-                    it.copy(versionHash = newVersionHash, name = name)
-                }
-            }
-
-            if (showToast) toast(R.string.patches_update_success)
-            doReload()
        }
-
-        override suspend fun catch(exception: Exception) {
-            Log.e(tag, "Failed to update patches", exception)
-            toast(R.string.patches_download_fail, exception.simpleMessage())
-        }
-    }
-
-    data class State(
-        val sources: PersistentMap<Int, PatchBundleSource> = persistentMapOf(),
-        val info: PersistentMap<Int, PatchBundleInfo.Global> = persistentMapOf()
-    )
-
-    private companion object {
-        val defaultSource = PatchBundleEntity(
-            uid = 0,
-            name = "",
-            versionHash = null,
-            source = Source.API,
-            autoUpdate = false
-        )
-    }
 }
--- a/app/src/main/java/app/revanced/manager/domain/repository/PatchOptionsRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/PatchOptionsRepository.kt
@@ -76,7 +76,7 @@ class PatchOptionsRepository(db: AppDatabase) {
    fun getPackagesWithSavedOptions() =
        dao.getPackagesWithOptions().map(Iterable<String>::toSet).distinctUntilChanged()

-    suspend fun resetOptionsForPackage(packageName: String) = dao.resetOptionsForPackage(packageName)
-    suspend fun resetOptionsForPatchBundle(uid: Int) = dao.resetOptionsForPatchBundle(uid)
+    suspend fun clearOptionsForPackage(packageName: String) = dao.clearForPackage(packageName)
+    suspend fun clearOptionsForPatchBundle(uid: Int) = dao.clearForPatchBundle(uid)
    suspend fun reset() = dao.reset()
 }
--- a/app/src/main/java/app/revanced/manager/domain/repository/PatchSelectionRepository.kt
+++ b/app/src/main/java/app/revanced/manager/domain/repository/PatchSelectionRepository.kt
@@ -3,8 +3,6 @@ package app.revanced.manager.domain.repository
 import app.revanced.manager.data.room.AppDatabase
 import app.revanced.manager.data.room.AppDatabase.Companion.generateUid
 import app.revanced.manager.data.room.selection.PatchSelection
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map

 class PatchSelectionRepository(db: AppDatabase) {
    private val dao = db.selectionDao()
@@ -27,15 +25,8 @@ class PatchSelectionRepository(db: AppDatabase) {
            )
        })

-    fun getPackagesWithSavedSelection() =
-        dao.getPackagesWithSelection().map(Iterable<String>::toSet).distinctUntilChanged()
-
-    suspend fun resetSelectionForPackage(packageName: String) {
-        dao.resetForPackage(packageName)
-    }
-
-    suspend fun resetSelectionForPatchBundle(uid: Int) {
-        dao.resetForPatchBundle(uid)
+    suspend fun clearSelection(packageName: String) {
+        dao.clearForPackage(packageName)
    }

    suspend fun reset() = dao.reset()
@@ -43,7 +34,7 @@ class PatchSelectionRepository(db: AppDatabase) {
    suspend fun export(bundleUid: Int): SerializedSelection = dao.exportSelection(bundleUid)

    suspend fun import(bundleUid: Int, selection: SerializedSelection) {
-        dao.resetForPatchBundle(bundleUid)
+        dao.clearForPatchBundle(bundleUid)
        dao.updateSelections(selection.entries.associate { (packageName, patches) ->
            getOrCreateSelection(bundleUid, packageName) to patches.toSet()
        })
--- a/app/src/main/java/app/revanced/manager/network/downloader/ParceledDownloaderData.kt
+++ b/app/src/main/java/app/revanced/manager/network/downloader/ParceledDownloaderData.kt
@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize

@Parcelize
 /**
- * A container for [Parcelable] data returned from downloader. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader].
+ * A container for [Parcelable] data returned from downloaders. Instances of this class can be safely stored in a bundle without needing to set the [ClassLoader].
 */
 class ParceledDownloaderData private constructor(
    val pluginPackageName: String,
--- a/app/src/main/java/app/revanced/manager/network/service/HttpService.kt
+++ b/app/src/main/java/app/revanced/manager/network/service/HttpService.kt
@@ -8,6 +8,7 @@ import app.revanced.manager.util.tag
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.client.request.get
 import io.ktor.client.request.prepareGet
 import io.ktor.client.request.request
 import io.ktor.client.statement.bodyAsText
@@ -16,12 +17,9 @@ import io.ktor.http.isSuccess
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.core.isNotEmpty
 import io.ktor.utils.io.core.readBytes
-import io.ktor.utils.io.core.remaining
-import io.ktor.utils.io.exhausted
-import io.ktor.utils.io.readRemaining
+import it.skrape.core.htmlDocument
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlinx.io.asSink
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.OutputStream
@@ -73,14 +71,14 @@ class HttpService(
    ) {
        http.prepareGet(builder).execute { httpResponse ->
            if (httpResponse.status.isSuccess()) {
-                val stream = outputStream.asSink()
                val channel: ByteReadChannel = httpResponse.body()
-                var count = 0L
-                stream.use {
-                    while (!channel.exhausted()) {
-                        val chunk = channel.readRemaining()
-                        count += chunk.remaining
-                        chunk.transferTo(stream)
+                withContext(Dispatchers.IO) {
+                    while (!channel.isClosedForRead) {
+                        val packet = channel.readRemaining(DEFAULT_BUFFER_SIZE.toLong())
+                        while (packet.isNotEmpty) {
+                            val bytes = packet.readBytes()
+                            outputStream.write(bytes)
+                        }
                    }
                }

@@ -95,5 +93,9 @@ class HttpService(
        builder: HttpRequestBuilder.() -> Unit
    ) = saveLocation.outputStream().use { streamTo(it, builder) }

+    suspend fun getHtml(builder: HttpRequestBuilder.() -> Unit) = htmlDocument(
+        html = http.get(builder).bodyAsText()
+    )
+
    class HttpException(status: HttpStatusCode) : Exception("Failed to fetch: http status: $status")
 }
--- a/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt
@@ -1,84 +1,56 @@
 package app.revanced.manager.patcher.patch

-import kotlinx.parcelize.IgnoredOnParcel
-import android.os.Parcelable
-import app.revanced.patcher.patch.loadPatchesFromDex
-import kotlinx.parcelize.Parcelize
+import android.util.Log
+import app.revanced.manager.util.tag
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.PatchLoader
 import java.io.File
 import java.io.IOException
 import java.util.jar.JarFile
-import kotlin.collections.filter

-@Parcelize
-data class PatchBundle(val patchesJar: String) : Parcelable {
+class PatchBundle(val patchesJar: File) {
+    private val loader = object : Iterable<Patch<*>> {
+        private fun load(): Iterable<Patch<*>> {
+            patchesJar.setReadOnly()
+            return PatchLoader.Dex(setOf(patchesJar))
+        }
+
+        override fun iterator(): Iterator<Patch<*>> = load().iterator()
+    }
+
+    init {
+        Log.d(tag, "Loaded patch bundle: $patchesJar")
+    }
+
+    /**
+     * A list containing the metadata of every patch inside this bundle.
+     */
+    val patches = loader.map(::PatchInfo)
+
    /**
     * The [java.util.jar.Manifest] of [patchesJar].
     */
-    @IgnoredOnParcel
-    private val manifest by lazy {
-        try {
-            JarFile(patchesJar).use { it.manifest }
-        } catch (_: IOException) {
-            null
+    private val manifest = try {
+        JarFile(patchesJar).use { it.manifest }
+    } catch (_: IOException) {
+        null
+    }
+
+    fun readManifestAttribute(name: String) = manifest?.mainAttributes?.getValue(name)
+
+    /**
+     * Load all patches compatible with the specified package.
+     */
+    fun patches(packageName: String) = loader.filter { patch ->
+        val compatiblePackages = patch.compatiblePackages
+            ?: // The patch has no compatibility constraints, which means it is universal.
+            return@filter true
+
+        if (!compatiblePackages.any { (name, _) -> name == packageName }) {
+            // Patch is not compatible with this package.
+            return@filter false
        }
+
+        true
    }
-
-    @IgnoredOnParcel
-    val manifestAttributes by lazy {
-        if (manifest != null)
-            ManifestAttributes(
-                name = readManifestAttribute("name"),
-                version = readManifestAttribute("version"),
-                description = readManifestAttribute("description"),
-                source = readManifestAttribute("source"),
-                author = readManifestAttribute("author"),
-                contact = readManifestAttribute("contact"),
-                website = readManifestAttribute("website"),
-                license = readManifestAttribute("license")
-            ) else
-            null
-    }
-
-    private fun readManifestAttribute(name: String) = manifest?.mainAttributes?.getValue(name)
-        ?.takeIf { it.isNotBlank() } // If empty, set it to null instead.
-
-    data class ManifestAttributes(
-        val name: String?,
-        val version: String?,
-        val description: String?,
-        val source: String?,
-        val author: String?,
-        val contact: String?,
-        val website: String?,
-        val license: String?
-    )
-
-    object Loader {
-        private fun patches(bundles: Iterable<PatchBundle>) =
-            loadPatchesFromDex(
-                bundles.map { File(it.patchesJar) }.toSet()
-            ).byPatchesFile.mapKeys { (file, _) ->
-                val absPath = file.absolutePath
-                bundles.single { absPath == it.patchesJar }
-            }
-
-        fun metadata(bundles: Iterable<PatchBundle>) =
-            patches(bundles).mapValues { (_, patches) -> patches.map(::PatchInfo) }
-
-        fun patches(bundles: Iterable<PatchBundle>, packageName: String) =
-            patches(bundles).mapValues { (_, patches) ->
-                patches.filter { patch ->
-                    val compatiblePackages = patch.compatiblePackages
-                        ?: // The patch has no compatibility constraints, which means it is universal.
-                        return@filter true
-
-                    if (!compatiblePackages.any { (name, _) -> name == packageName }) {
-                        // Patch is not compatible with this package.
-                        return@filter false
-                    }
-
-                    true
-                }.toSet()
-            }
-    }
-}
+}
--- a/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundleInfo.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundleInfo.kt
@@ -1,145 +0,0 @@
-package app.revanced.manager.patcher.patch
-
-import app.revanced.manager.util.PatchSelection
-
-/**
- * A base class for storing [PatchBundle] metadata.
- */
-sealed class PatchBundleInfo {
-    /**
-     * The name of the bundle.
-     */
-    abstract val name: String
-
-    /**
-     * The version of the bundle.
-     */
-    abstract val version: String?
-
-    /**
-     * The unique ID of the bundle.
-     */
-    abstract val uid: Int
-
-    /**
-     * The patch list.
-     */
-    abstract val patches: List<PatchInfo>
-
-    /**
-     * Information about a bundle and all the patches it contains.
-     *
-     * @see [PatchBundleInfo]
-     */
-    data class Global(
-        override val name: String,
-        override val version: String?,
-        override val uid: Int,
-        override val patches: List<PatchInfo>
-    ) : PatchBundleInfo() {
-        /**
-         * Create a [PatchBundleInfo.Scoped] that only contains information about patches that are relevant for a specific [packageName].
-         */
-        fun forPackage(packageName: String, version: String?): Scoped {
-            val relevantPatches = patches.filter { it.compatibleWith(packageName) }
-            val compatible = mutableListOf<PatchInfo>()
-            val incompatible = mutableListOf<PatchInfo>()
-            val universal = mutableListOf<PatchInfo>()
-
-            relevantPatches.forEach {
-                val targetList = when {
-                    it.compatiblePackages == null -> universal
-                    it.supports(
-                        packageName,
-                        version
-                    ) -> compatible
-
-                    else -> incompatible
-                }
-
-                targetList.add(it)
-            }
-
-            return Scoped(
-                name,
-                this.version,
-                uid,
-                relevantPatches,
-                compatible,
-                incompatible,
-                universal
-            )
-        }
-    }
-
-    /**
-     * Contains information about a bundle that is relevant for a specific package name.
-     *
-     * @param compatible Patches that are compatible with the specified package name and version.
-     * @param incompatible Patches that are compatible with the specified package name but not version.
-     * @param universal Patches that are compatible with all packages.
-     * @see [PatchBundleInfo.Global.forPackage]
-     * @see [PatchBundleInfo]
-     */
-    data class Scoped(
-        override val name: String,
-        override val version: String?,
-        override val uid: Int,
-        override val patches: List<PatchInfo>,
-        val compatible: List<PatchInfo>,
-        val incompatible: List<PatchInfo>,
-        val universal: List<PatchInfo>
-    ) : PatchBundleInfo() {
-        fun patchSequence(allowIncompatible: Boolean) = if (allowIncompatible) {
-            patches.asSequence()
-        } else {
-            sequence {
-                yieldAll(compatible)
-                yieldAll(universal)
-            }
-        }
-    }
-
-    companion object Extensions {
-        inline fun Iterable<Scoped>.toPatchSelection(
-            allowIncompatible: Boolean,
-            condition: (Int, PatchInfo) -> Boolean
-        ): PatchSelection = this.associate { bundle ->
-            val patches =
-                bundle.patchSequence(allowIncompatible)
-                    .mapNotNullTo(mutableSetOf()) { patch ->
-                        patch.name.takeIf {
-                            condition(
-                                bundle.uid,
-                                patch
-                            )
-                        }
-                    }
-
-            bundle.uid to patches
-        }
-
-        /**
-         * Algorithm for determining whether all required options have been set.
-         */
-        inline fun Iterable<Scoped>.requiredOptionsSet(
-            allowIncompatible: Boolean,
-            crossinline isSelected: (Scoped, PatchInfo) -> Boolean,
-            crossinline optionsForPatch: (Scoped, PatchInfo) -> Map<String, Any?>?
-        ) = all bundle@{ bundle ->
-            bundle
-                .patchSequence(allowIncompatible)
-                .filter { isSelected(bundle, it) }
-                .all patch@{
-                    if (it.options.isNullOrEmpty()) return@patch true
-                    val opts by lazy { optionsForPatch(bundle, it).orEmpty() }
-
-                    it.options.all option@{ option ->
-                        if (!option.required || option.default != null) return@option true
-
-                        option.key in opts
-                    }
-                }
-        }
-    }
-}
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/CoroutineRuntime.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/CoroutineRuntime.kt
@@ -3,7 +3,6 @@ package app.revanced.manager.patcher.runtime
 import android.content.Context
 import app.revanced.manager.patcher.Session
 import app.revanced.manager.patcher.logger.Logger
-import app.revanced.manager.patcher.patch.PatchBundle
 import app.revanced.manager.patcher.worker.ProgressEventHandler
 import app.revanced.manager.ui.model.State
 import app.revanced.manager.util.Options
@@ -24,17 +23,14 @@ class CoroutineRuntime(private val context: Context) : Runtime(context) {
        onPatchCompleted: suspend () -> Unit,
        onProgress: ProgressEventHandler,
    ) {
-        val selectedBundles = selectedPatches.keys
        val bundles = bundles()
-        val uids = bundles.entries.associate { (key, value) -> value to key }

-        val allPatches =
-            PatchBundle.Loader.patches(bundles.values, packageName)
-                .mapKeys { (b, _) -> uids[b]!! }
-                .filterKeys { it in selectedBundles }
+        val selectedBundles = selectedPatches.keys
+        val allPatches = bundles.filterKeys { selectedBundles.contains(it) }
+            .mapValues { (_, bundle) -> bundle.patches(packageName) }

        val patchList = selectedPatches.flatMap { (bundle, selected) ->
-            allPatches[bundle]?.filter { it.name in selected }
+            allPatches[bundle]?.filter { selected.contains(it.name) }
                ?: throw IllegalArgumentException("Patch bundle $bundle does not exist")
        }

--- a/app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/ProcessRuntime.kt
@@ -111,7 +111,6 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
        }

        val patching = CompletableDeferred<Unit>()
-        val scope = this

        launch(Dispatchers.IO) {
            val binder = awaitBinderConnection()
@@ -125,7 +124,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
                override fun log(level: String, msg: String) = logger.log(enumValueOf(level), msg)

                override fun patchSucceeded() {
-                    scope.launch { onPatchCompleted() }
+                    launch { onPatchCompleted() }
                }

                override fun progress(name: String?, state: String?, msg: String?) =
@@ -142,6 +141,8 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
                }
            }

+            val bundles = bundles()
+
            val parameters = Parameters(
                aaptPath = aaptPath,
                frameworkDir = frameworkPath,
@@ -149,11 +150,13 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
                packageName = packageName,
                inputFile = inputFile,
                outputFile = outputFile,
-                configurations = bundles().map { (uid, bundle) ->
+                configurations = selectedPatches.map { (id, patches) ->
+                    val bundle = bundles[id]!!
+
                    PatchConfiguration(
-                        bundle,
-                        selectedPatches[uid].orEmpty(),
-                        options[uid].orEmpty()
+                        bundle.patchesJar.absolutePath,
+                        patches,
+                        options[id].orEmpty()
                    )
                }
            )
@@ -176,7 +179,7 @@ class ProcessRuntime(private val context: Context) : Runtime(context) {
    }

    /**
-     * An [Exception] occurred in the remote process while patching.
+     * An [Exception] occured in the remote process while patching.
     *
     * @param originalStackTrace The stack trace of the original [Exception].
     */
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/process/Parameters.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/process/Parameters.kt
@@ -1,7 +1,6 @@
 package app.revanced.manager.patcher.runtime.process

 import android.os.Parcelable
-import app.revanced.manager.patcher.patch.PatchBundle
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.RawValue

@@ -18,7 +17,7 @@ data class Parameters(

@Parcelize
 data class PatchConfiguration(
-    val bundle: PatchBundle,
+    val bundlePath: String,
    val patches: Set<String>,
    val options: @RawValue Map<String, Map<String, Any?>>
 ) : Parcelable
--- a/app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/runtime/process/PatcherProcess.kt
@@ -1,10 +1,8 @@
 package app.revanced.manager.patcher.runtime.process

-import android.annotation.SuppressLint
 import android.app.ActivityThread
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.os.Looper
 import app.revanced.manager.BuildConfig
@@ -56,10 +54,11 @@ class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {

            logger.info("Memory limit: ${Runtime.getRuntime().maxMemory() / (1024 * 1024)}MB")

-            val allPatches = PatchBundle.Loader.patches(parameters.configurations.map { it.bundle }, parameters.packageName)
            val patchList = parameters.configurations.flatMap { config ->
-                val patches = (allPatches[config.bundle] ?: return@flatMap emptyList())
-                        .filter { it.name in config.patches }
+                val bundle = PatchBundle(File(config.bundlePath))
+
+                val patches =
+                    bundle.patches(parameters.packageName).filter { it.name in config.patches }
                        .associateBy { it.name }

                config.options.forEach { (patchName, opts) ->
@@ -96,10 +95,6 @@ class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
    }

    companion object {
-        private val longArrayClass = LongArray::class.java
-        private val emptyLongArray = LongArray(0)
-
-        @SuppressLint("PrivateApi")
        @JvmStatic
        fun main(args: Array<String>) {
            Looper.prepare()
@@ -110,15 +105,6 @@ class PatcherProcess(private val context: Context) : IPatcherProcess.Stub() {
            val systemContext = ActivityThread.systemMain().systemContext as Context
            val appContext = systemContext.createPackageContext(managerPackageName, 0)

-            // Avoid annoying logs. See https://github.com/robolectric/robolectric/blob/ad0484c6b32c7d11176c711abeb3cb4a900f9258/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java#L376-L388
-            Class.forName("android.app.AppCompatCallbacks").apply {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                    getDeclaredMethod("install", longArrayClass, longArrayClass).also { it.isAccessible = true }(null, emptyLongArray, emptyLongArray)
-                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    getDeclaredMethod("install", longArrayClass).also { it.isAccessible = true }(null, emptyLongArray)
-                }
-            }
-
            val ipcInterface = PatcherProcess(appContext)

            appContext.sendBroadcast(Intent().apply {
--- a/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
+++ b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
@@ -14,9 +14,9 @@ import android.os.Parcelable
 import android.os.PowerManager
 import android.util.Log
 import androidx.activity.result.ActivityResult
+import androidx.core.content.ContextCompat
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
-import app.revanced.manager.MainActivity
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.data.room.apps.installed.InstallType
@@ -88,25 +88,22 @@ class PatcherWorker(
        )

    private fun createNotification(): Notification {
-        val notificationIntent = Intent(applicationContext, MainActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        }
-        val pendingIntent = PendingIntent.getActivity(
+        val notificationIntent = Intent(applicationContext, PatcherWorker::class.java)
+        val pendingIntent: PendingIntent = PendingIntent.getActivity(
            applicationContext, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE
        )
        val channel = NotificationChannel(
-            "revanced-patcher-patching", "Patching", NotificationManager.IMPORTANCE_LOW
+            "revanced-patcher-patching", "Patching", NotificationManager.IMPORTANCE_HIGH
        )
        val notificationManager =
-            applicationContext.getSystemService(NotificationManager::class.java)
-        notificationManager.createNotificationChannel(channel)
+            ContextCompat.getSystemService(applicationContext, NotificationManager::class.java)
+        notificationManager!!.createNotificationChannel(channel)
        return Notification.Builder(applicationContext, channel.id)
-            .setContentTitle(applicationContext.getText(R.string.patcher_notification_title))
-            .setContentText(applicationContext.getText(R.string.patcher_notification_text))
+            .setContentTitle(applicationContext.getText(R.string.app_name))
+            .setContentText(applicationContext.getText(R.string.patcher_notification_message))
+            .setLargeIcon(Icon.createWithResource(applicationContext, R.drawable.ic_notification))
            .setSmallIcon(Icon.createWithResource(applicationContext, R.drawable.ic_notification))
-            .setContentIntent(pendingIntent)
-            .setCategory(Notification.CATEGORY_SERVICE)
-            .build()
+            .setContentIntent(pendingIntent).build()
    }

    override suspend fun doWork(): Result {
@@ -161,8 +158,6 @@ class PatcherWorker(
                    data,
                    args.packageName,
                    args.input.version,
-                    prefs.suggestedVersionSafeguard.get(),
-                    !prefs.disablePatchVersionCompatCheck.get(),
                    onDownload = args.onDownloadProgress
                ).also {
                    args.setInputFile(it)
--- a/app/src/main/java/app/revanced/manager/ui/component/ConfirmDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ConfirmDialog.kt
@@ -1,41 +0,0 @@
-package app.revanced.manager.ui.component
-
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
-import app.revanced.manager.R
-
-@Composable
-fun ConfirmDialog(
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-    title: String,
-    description: String,
-    icon: ImageVector
-) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        dismissButton = {
-            TextButton(onDismiss) {
-                Text(stringResource(R.string.cancel))
-            }
-        },
-        confirmButton = {
-            TextButton(
-                onClick = {
-                    onConfirm()
-                    onDismiss()
-                }
-            ) {
-                Text(stringResource(R.string.confirm))
-            }
-        },
-        title = { Text(title) },
-        icon = { Icon(icon, null) },
-        text = { Text(description) }
-    )
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/ExceptionViewerDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ExceptionViewerDialog.kt
@@ -16,6 +16,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.bundle.BundleTopBar

@@ -24,13 +26,17 @@ import app.revanced.manager.ui.component.bundle.BundleTopBar
 fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {
    val context = LocalContext.current

-    FullscreenDialog(
+    Dialog(
        onDismissRequest = onDismiss,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
    ) {
        Scaffold(
            topBar = {
                BundleTopBar(
-                    title = stringResource(R.string.patches_error),
+                    title = stringResource(R.string.bundle_error),
                    onBackClick = onDismiss,
                    backIcon = {
                        Icon(
--- a/app/src/main/java/app/revanced/manager/ui/component/FullscreenDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/FullscreenDialog.kt
@@ -1,42 +0,0 @@
-package app.revanced.manager.ui.component
-
-import android.view.WindowManager
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.compose.ui.window.DialogWindowProvider
-import androidx.core.view.WindowCompat
-
-private val properties = DialogProperties(
-    usePlatformDefaultWidth = false,
-    dismissOnBackPress = true,
-    decorFitsSystemWindows = false,
-)
-
-@Composable
-fun FullscreenDialog(onDismissRequest: () -> Unit, content: @Composable () -> Unit) {
-    Dialog(
-        onDismissRequest = onDismissRequest,
-        properties = properties
-    ) {
-        val view = LocalView.current
-        val isDarkTheme = isSystemInDarkTheme()
-        LaunchedEffect(isDarkTheme) {
-            val window = (view.parent as DialogWindowProvider).window
-            window.statusBarColor = Color.Transparent.toArgb()
-            window.navigationBarColor = Color.Transparent.toArgb()
-            window.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
-
-            val insetsController = WindowCompat.getInsetsController(window, view)
-            insetsController.isAppearanceLightStatusBars = !isDarkTheme
-            insetsController.isAppearanceLightNavigationBars = !isDarkTheme
-        }
-
-        content()
-    }
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/Markdown.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/Markdown.kt
@@ -2,9 +2,7 @@ package app.revanced.manager.ui.component

 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.TextLinkStyles
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
 import com.mikepenz.markdown.compose.Markdown
 import com.mikepenz.markdown.m3.markdownColor
 import com.mikepenz.markdown.m3.markdownTypography
@@ -20,29 +18,15 @@ fun Markdown(
        colors = markdownColor(
            text = MaterialTheme.colorScheme.onSurfaceVariant,
            codeBackground = MaterialTheme.colorScheme.secondaryContainer,
+            codeText = MaterialTheme.colorScheme.onSecondaryContainer,
+            linkText = MaterialTheme.colorScheme.primary
        ),
        typography = markdownTypography(
            h1 = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
            h2 = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
            h3 = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
            text = MaterialTheme.typography.bodyMedium,
-            code = markdownTypography().code.copy(color = MaterialTheme.colorScheme.onSecondaryContainer),
-            list = MaterialTheme.typography.bodyMedium,
-            textLink = TextLinkStyles(
-                style = MaterialTheme.typography.bodyMedium.copy(
-                    fontWeight = FontWeight.Bold, textDecoration = TextDecoration.Underline,
-                    color = MaterialTheme.colorScheme.primary
-                ).toSpanStyle(),
-                hoveredStyle = MaterialTheme.typography.bodyMedium.copy(
-                    fontWeight = FontWeight.Bold, textDecoration = TextDecoration.Underline,
-                    color = MaterialTheme.colorScheme.secondary
-                ).toSpanStyle(),
-                pressedStyle = MaterialTheme.typography.bodyMedium.copy(
-                    fontWeight = FontWeight.Bold, textDecoration = TextDecoration.Underline,
-                    color = MaterialTheme.colorScheme.tertiary
-                ).toSpanStyle()
-
-            ),
+            list = MaterialTheme.typography.bodyMedium
        )
    )
 }
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
@@ -0,0 +1,181 @@
+package app.revanced.manager.ui.component.bundle
+
+import android.webkit.URLUtil
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowRight
+import androidx.compose.material.icons.outlined.Extension
+import androidx.compose.material.icons.outlined.Inventory2
+import androidx.compose.material.icons.outlined.Sell
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import app.revanced.manager.R
+import app.revanced.manager.ui.component.ColumnWithScrollbar
+import app.revanced.manager.ui.component.TextInputDialog
+import app.revanced.manager.ui.component.haptics.HapticSwitch
+
+@Composable
+fun BaseBundleDialog(
+    modifier: Modifier = Modifier,
+    isDefault: Boolean,
+    name: String?,
+    remoteUrl: String?,
+    onRemoteUrlChange: ((String) -> Unit)? = null,
+    patchCount: Int,
+    version: String?,
+    autoUpdate: Boolean,
+    onAutoUpdateChange: (Boolean) -> Unit,
+    onPatchesClick: () -> Unit,
+    extraFields: @Composable ColumnScope.() -> Unit = {}
+) {
+    ColumnWithScrollbar(
+        modifier = Modifier
+            .fillMaxWidth()
+            .then(modifier),
+    ) {
+        Column(
+            modifier = Modifier.padding(16.dp),
+            verticalArrangement = Arrangement.spacedBy(4.dp)
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.Start),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.Inventory2,
+                    contentDescription = null,
+                    tint = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.size(32.dp)
+                )
+                name?.let {
+                    Text(
+                        text = it,
+                        style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight(800)),
+                        color = MaterialTheme.colorScheme.primary,
+                    )
+                }
+            }
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 2.dp)
+            ) {
+                version?.let {
+                    Tag(Icons.Outlined.Sell, it)
+                }
+                Tag(Icons.Outlined.Extension, patchCount.toString())
+            }
+        }
+
+        HorizontalDivider(
+            modifier = Modifier.padding(horizontal = 16.dp),
+            color = MaterialTheme.colorScheme.outlineVariant
+        )
+
+        if (remoteUrl != null) {
+            BundleListItem(
+                headlineText = stringResource(R.string.bundle_auto_update),
+                supportingText = stringResource(R.string.bundle_auto_update_description),
+                trailingContent = {
+                    HapticSwitch(
+                        checked = autoUpdate,
+                        onCheckedChange = onAutoUpdateChange
+                    )
+                },
+                modifier = Modifier.clickable {
+                    onAutoUpdateChange(!autoUpdate)
+                }
+            )
+        }
+
+        remoteUrl?.takeUnless { isDefault }?.let { url ->
+            var showUrlInputDialog by rememberSaveable {
+                mutableStateOf(false)
+            }
+            if (showUrlInputDialog) {
+                TextInputDialog(
+                    initial = url,
+                    title = stringResource(R.string.bundle_input_source_url),
+                    onDismissRequest = { showUrlInputDialog = false },
+                    onConfirm = {
+                        showUrlInputDialog = false
+                        onRemoteUrlChange?.invoke(it)
+                    },
+                    validator = {
+                        if (it.isEmpty()) return@TextInputDialog false
+
+                        URLUtil.isValidUrl(it)
+                    }
+                )
+            }
+
+            BundleListItem(
+                modifier = Modifier.clickable(
+                    enabled = onRemoteUrlChange != null,
+                    onClick = {
+                        showUrlInputDialog = true
+                    }
+                ),
+                headlineText = stringResource(R.string.bundle_input_source_url),
+                supportingText = url.ifEmpty {
+                    stringResource(R.string.field_not_set)
+                }
+            )
+        }
+
+        val patchesClickable = patchCount > 0
+        BundleListItem(
+            headlineText = stringResource(R.string.patches),
+            supportingText = stringResource(R.string.bundle_view_patches),
+            modifier = Modifier.clickable(
+                enabled = patchesClickable,
+                onClick = onPatchesClick
+            )
+        ) {
+            if (patchesClickable) {
+                Icon(
+                    Icons.AutoMirrored.Outlined.ArrowRight,
+                    stringResource(R.string.patches)
+                )
+            }
+        }
+
+        extraFields()
+    }
+}
+
+@Composable
+private fun Tag(
+    icon: ImageVector,
+    text: String
+) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(6.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            modifier = Modifier.size(16.dp),
+            tint = MaterialTheme.colorScheme.outline,
+        )
+        Text(
+            text,
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.outline,
+        )
+    }
+}
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
@@ -1,99 +1,74 @@
 package app.revanced.manager.ui.component.bundle

-import android.webkit.URLUtil.isValidUrl
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.outlined.ArrowRight
-import androidx.compose.material.icons.automirrored.outlined.Send
-import androidx.compose.material.icons.outlined.Commit
 import androidx.compose.material.icons.outlined.DeleteOutline
-import androidx.compose.material.icons.outlined.Description
-import androidx.compose.material.icons.outlined.Gavel
-import androidx.compose.material.icons.outlined.Language
-import androidx.compose.material.icons.outlined.Person
-import androidx.compose.material.icons.outlined.Sell
 import androidx.compose.material.icons.outlined.Update
 import androidx.compose.material3.*
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.*
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
-import app.revanced.manager.R.string.auto_update
-import app.revanced.manager.R.string.auto_update_description
-import app.revanced.manager.R.string.field_not_set
-import app.revanced.manager.R.string.patches
-import app.revanced.manager.R.string.patches_url
-import app.revanced.manager.R.string.view_patches
 import app.revanced.manager.data.platform.NetworkInfo
 import app.revanced.manager.domain.bundles.LocalPatchBundle
 import app.revanced.manager.domain.bundles.PatchBundleSource
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
-import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.ui.component.ColumnWithScrollbar
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
 import app.revanced.manager.ui.component.ExceptionViewerDialog
-import app.revanced.manager.ui.component.FullscreenDialog
-import app.revanced.manager.ui.component.TextInputDialog
-import app.revanced.manager.ui.component.haptics.HapticSwitch
 import kotlinx.coroutines.launch
 import org.koin.compose.koinInject

@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun BundleInformationDialog(
-    src: PatchBundleSource,
-    patchCount: Int,
    onDismissRequest: () -> Unit,
    onDeleteRequest: () -> Unit,
+    bundle: PatchBundleSource,
    onUpdate: () -> Unit,
 ) {
-    val bundleRepo = koinInject<PatchBundleRepository>()
    val networkInfo = koinInject<NetworkInfo>()
    val hasNetwork = remember { networkInfo.isConnected() }
    val composableScope = rememberCoroutineScope()
    var viewCurrentBundlePatches by remember { mutableStateOf(false) }
-    val isLocal = src is LocalPatchBundle
-    val bundleManifestAttributes = src.patchBundle?.manifestAttributes
-    val (autoUpdate, endpoint) = src.asRemoteOrNull?.let { it.autoUpdate to it.endpoint } ?: (null to null)
-
-    fun onAutoUpdateChange(new: Boolean) = composableScope.launch {
-        with(bundleRepo) {
-            src.asRemoteOrNull?.setAutoUpdate(new)
-        }
+    val isLocal = bundle is LocalPatchBundle
+    val state by bundle.state.collectAsStateWithLifecycle()
+    val props by remember(bundle) {
+        bundle.propsFlow()
+    }.collectAsStateWithLifecycle(null)
+    val patchCount = remember(state) {
+        state.patchBundleOrNull()?.patches?.size ?: 0
    }

    if (viewCurrentBundlePatches) {
        BundlePatchesDialog(
-            src = src,
            onDismissRequest = {
                viewCurrentBundlePatches = false
-            }
+            },
+            bundle = bundle,
        )
    }

-    FullscreenDialog(
+    Dialog(
        onDismissRequest = onDismissRequest,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
    ) {
+        val bundleName by bundle.nameState
+
        Scaffold(
            topBar = {
                BundleTopBar(
-                    title = src.name,
+                    title = stringResource(R.string.patch_bundle_field),
                    onBackClick = onDismissRequest,
                    backIcon = {
                        Icon(
@@ -102,7 +77,7 @@ fun BundleInformationDialog(
                        )
                    },
                    actions = {
-                        if (!src.isDefault) {
+                        if (!bundle.isDefault) {
                            IconButton(onClick = onDeleteRequest) {
                                Icon(
                                    Icons.Outlined.DeleteOutline,
@@ -122,175 +97,54 @@ fun BundleInformationDialog(
                )
            },
        ) { paddingValues ->
-            ColumnWithScrollbar(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(paddingValues),
-            ) {
-                Column(
-                    modifier = Modifier.padding(16.dp),
-                    verticalArrangement = Arrangement.spacedBy(4.dp)
-                ) {
-                    Tag(Icons.Outlined.Sell, src.name)
-                    bundleManifestAttributes?.description?.let {
-                        Tag(Icons.Outlined.Description, it)
+            BaseBundleDialog(
+                modifier = Modifier.padding(paddingValues),
+                isDefault = bundle.isDefault,
+                name = bundleName,
+                remoteUrl = bundle.asRemoteOrNull?.endpoint,
+                patchCount = patchCount,
+                version = props?.version,
+                autoUpdate = props?.autoUpdate ?: false,
+                onAutoUpdateChange = {
+                    composableScope.launch {
+                        bundle.asRemoteOrNull?.setAutoUpdate(it)
                    }
-                    bundleManifestAttributes?.source?.let {
-                        Tag(Icons.Outlined.Commit, it)
-                    }
-                    bundleManifestAttributes?.author?.let {
-                        Tag(Icons.Outlined.Person, it)
-                    }
-                    bundleManifestAttributes?.contact?.let {
-                        Tag(Icons.AutoMirrored.Outlined.Send, it)
-                    }
-                    bundleManifestAttributes?.website?.let {
-                        Tag(Icons.Outlined.Language, it, isUrl = true)
-                    }
-                    bundleManifestAttributes?.license?.let {
-                        Tag(Icons.Outlined.Gavel, it)
-                    }
-                }
-
-                HorizontalDivider(
-                    modifier = Modifier.padding(horizontal = 16.dp),
-                    color = MaterialTheme.colorScheme.outlineVariant
-                )
-
-                if (autoUpdate != null) {
-                    BundleListItem(
-                        headlineText = stringResource(auto_update),
-                        supportingText = stringResource(auto_update_description),
-                        trailingContent = {
-                            HapticSwitch(
-                                checked = autoUpdate,
-                                onCheckedChange = ::onAutoUpdateChange
-                            )
-                        },
-                        modifier = Modifier.clickable {
-                            onAutoUpdateChange(!autoUpdate)
+                },
+                onPatchesClick = {
+                    viewCurrentBundlePatches = true
+                },
+                extraFields = {
+                    (state as? PatchBundleSource.State.Failed)?.throwable?.let {
+                        var showDialog by rememberSaveable {
+                            mutableStateOf(false)
                        }
-                    )
-                }
+                        if (showDialog) ExceptionViewerDialog(
+                            onDismiss = { showDialog = false },
+                            text = remember(it) { it.stackTraceToString() }
+                        )

-                endpoint?.takeUnless { src.isDefault }?.let { url ->
-                    var showUrlInputDialog by rememberSaveable {
-                        mutableStateOf(false)
-                    }
-                    if (showUrlInputDialog) {
-                        TextInputDialog(
-                            initial = url,
-                            title = stringResource(patches_url),
-                            onDismissRequest = { showUrlInputDialog = false },
-                            onConfirm = {
-                                showUrlInputDialog = false
-                                TODO("Not implemented.")
+                        BundleListItem(
+                            headlineText = stringResource(R.string.bundle_error),
+                            supportingText = stringResource(R.string.bundle_error_description),
+                            trailingContent = {
+                                Icon(
+                                    Icons.AutoMirrored.Outlined.ArrowRight,
+                                    null
+                                )
                            },
-                            validator = {
-                                if (it.isEmpty()) return@TextInputDialog false
-
-                                isValidUrl(it)
-                            }
+                            modifier = Modifier.clickable { showDialog = true }
                        )
                    }

-                    BundleListItem(
-                        modifier = Modifier.clickable(
-                            enabled = false,
-                            onClick = {
-                                showUrlInputDialog = true
-                            }
-                        ),
-                        headlineText = stringResource(patches_url),
-                        supportingText = url.ifEmpty {
-                            stringResource(field_not_set)
-                        }
-                    )
-                }
-
-                val patchesClickable = patchCount > 0
-                BundleListItem(
-                    headlineText = stringResource(patches),
-                    supportingText = stringResource(view_patches),
-                    modifier = Modifier.clickable(
-                        enabled = patchesClickable,
-                        onClick = {
-                            viewCurrentBundlePatches = true
-                        }
-                    )
-                ) {
-                    if (patchesClickable) {
-                        Icon(
-                            Icons.AutoMirrored.Outlined.ArrowRight,
-                            stringResource(patches)
+                    if (state is PatchBundleSource.State.Missing && !isLocal) {
+                        BundleListItem(
+                            headlineText = stringResource(R.string.bundle_error),
+                            supportingText = stringResource(R.string.bundle_not_downloaded),
+                            modifier = Modifier.clickable(onClick = onUpdate)
                        )
                    }
                }
-
-                src.error?.let {
-                    var showDialog by rememberSaveable {
-                        mutableStateOf(false)
-                    }
-                    if (showDialog) ExceptionViewerDialog(
-                        onDismiss = { showDialog = false },
-                        text = remember(it) { it.stackTraceToString() }
-                    )
-
-                    BundleListItem(
-                        headlineText = stringResource(R.string.patches_error),
-                        supportingText = stringResource(R.string.patches_error_description),
-                        trailingContent = {
-                            Icon(
-                                Icons.AutoMirrored.Outlined.ArrowRight,
-                                null
-                            )
-                        },
-                        modifier = Modifier.clickable { showDialog = true }
-                    )
-                }
-                if (src.state is PatchBundleSource.State.Missing && !isLocal) {
-                    BundleListItem(
-                        headlineText = stringResource(R.string.patches_error),
-                        supportingText = stringResource(R.string.patches_not_downloaded),
-                        modifier = Modifier.clickable(onClick = onUpdate)
-                    )
-                }
-            }
+            )
        }
    }
-}
-
-@Composable
-private fun Tag(
-    icon: ImageVector,
-    text: String,
-    isUrl: Boolean = false
-) {
-    val uriHandler = LocalUriHandler.current
-
-    Row(
-        horizontalArrangement = Arrangement.spacedBy(6.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = if (isUrl) {
-            Modifier
-                .clickable {
-                    try {
-                        uriHandler.openUri(text)
-                    } catch (_: Exception) {
-                    }
-                }
-        } else
-            Modifier,
-    ) {
-        Icon(
-            imageVector = icon,
-            contentDescription = null,
-            modifier = Modifier.size(16.dp)
-        )
-        Text(
-            text,
-            style = MaterialTheme.typography.bodyMedium,
-            color = if (isUrl) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline,
-        )
-    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.icons.outlined.Warning
 import androidx.compose.material3.Icon
@@ -24,46 +23,41 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
+import kotlinx.coroutines.flow.map

@OptIn(ExperimentalFoundationApi::class)
@Composable
 fun BundleItem(
-    src: PatchBundleSource,
-    patchCount: Int,
-    selectable: Boolean,
-    isBundleSelected: Boolean,
-    toggleSelection: (Boolean) -> Unit,
-    onSelect: () -> Unit,
+    bundle: PatchBundleSource,
    onDelete: () -> Unit,
    onUpdate: () -> Unit,
+    selectable: Boolean,
+    onSelect: () -> Unit,
+    isBundleSelected: Boolean,
+    toggleSelection: (Boolean) -> Unit,
 ) {
    var viewBundleDialogPage by rememberSaveable { mutableStateOf(false) }
-    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
+    val state by bundle.state.collectAsStateWithLifecycle()
+
+    val version by remember(bundle) {
+        bundle.propsFlow().map { props -> props?.version }
+    }.collectAsStateWithLifecycle(null)
+    val name by bundle.nameState

    if (viewBundleDialogPage) {
        BundleInformationDialog(
-            src = src,
-            patchCount = patchCount,
            onDismissRequest = { viewBundleDialogPage = false },
-            onDeleteRequest = { showDeleteConfirmationDialog = true },
-            onUpdate = onUpdate,
-        )
-    }
-
-    if (showDeleteConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDeleteConfirmationDialog = false },
-            onConfirm = {
-                onDelete()
+            onDeleteRequest = {
                viewBundleDialogPage = false
+                onDelete()
            },
-            title = stringResource(R.string.delete),
-            description = stringResource(R.string.patches_delete_single_dialog_description, src.name),
-            icon = Icons.Outlined.Delete
+            bundle = bundle,
+            onUpdate = onUpdate,
        )
    }

@@ -84,19 +78,19 @@ fun BundleItem(
            }
        } else null,

-        headlineContent = { Text(src.name) },
+        headlineContent = { Text(name) },
        supportingContent = {
-            if (src.state is PatchBundleSource.State.Available) {
+            state.patchBundleOrNull()?.patches?.size?.let { patchCount ->
                Text(pluralStringResource(R.plurals.patch_count, patchCount, patchCount))
            }
        },
        trailingContent = {
            Row {
-                val icon = remember(src.state) {
-                    when (src.state) {
-                        is PatchBundleSource.State.Failed -> Icons.Outlined.ErrorOutline to R.string.patches_error
-                        is PatchBundleSource.State.Missing -> Icons.Outlined.Warning to R.string.patches_missing
-                        is PatchBundleSource.State.Available -> null
+                val icon = remember(state) {
+                    when (state) {
+                        is PatchBundleSource.State.Failed -> Icons.Outlined.ErrorOutline to R.string.bundle_error
+                        is PatchBundleSource.State.Missing -> Icons.Outlined.Warning to R.string.bundle_missing
+                        is PatchBundleSource.State.Loaded -> null
                    }
                }

@@ -109,7 +103,7 @@ fun BundleItem(
                    )
                }

-                src.version?.let { Text(text = it) }
+                version?.let { Text(text = it) }
            }
        },
    )
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundlePatchesDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundlePatchesDialog.kt
@@ -12,7 +12,6 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -23,37 +22,36 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.ui.component.ArrowButton
-import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
-import kotlinx.coroutines.flow.mapNotNull
-import org.koin.compose.koinInject

@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun BundlePatchesDialog(
    onDismissRequest: () -> Unit,
-    src: PatchBundleSource,
+    bundle: PatchBundleSource,
 ) {
    var showAllVersions by rememberSaveable { mutableStateOf(false) }
    var showOptions by rememberSaveable { mutableStateOf(false) }
-    val patchBundleRepository: PatchBundleRepository = koinInject()
-    val patches by remember(src.uid) {
-        patchBundleRepository.bundleInfoFlow.mapNotNull { it[src.uid]?.patches }
-    }.collectAsStateWithLifecycle(emptyList())
+    val state by bundle.state.collectAsStateWithLifecycle()

-    FullscreenDialog(
+    Dialog(
        onDismissRequest = onDismissRequest,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
    ) {
        Scaffold(
            topBar = {
                BundleTopBar(
-                    title = stringResource(R.string.patches),
+                    title = stringResource(R.string.bundle_patches),
                    onBackClick = onDismissRequest,
                    backIcon = {
                        Icon(
@@ -71,14 +69,16 @@ fun BundlePatchesDialog(
                verticalArrangement = Arrangement.spacedBy(12.dp),
                contentPadding = PaddingValues(16.dp)
            ) {
-                items(patches) { patch ->
-                    PatchItem(
-                        patch,
-                        showAllVersions,
-                        onExpandVersions = { showAllVersions = !showAllVersions },
-                        showOptions,
-                        onExpandOptions = { showOptions = !showOptions }
-                    )
+                state.patchBundleOrNull()?.let { bundle ->
+                    items(bundle.patches) { patch ->
+                        PatchItem(
+                            patch,
+                            showAllVersions,
+                            onExpandVersions = { showAllVersions = !showAllVersions },
+                            showOptions,
+                            onExpandOptions = { showOptions = !showOptions }
+                        )
+                    }
                }
            }
        }
@@ -138,10 +138,10 @@ fun PatchItem(
                        verticalAlignment = Alignment.CenterVertically
                    ) {
                        PatchInfoChip(
-                            text = "$PACKAGE_ICON ${stringResource(R.string.patches_view_any_package)}"
+                            text = "$PACKAGE_ICON ${stringResource(R.string.bundle_view_patches_any_package)}"
                        )
                        PatchInfoChip(
-                            text = "$VERSION_ICON ${stringResource(R.string.patches_view_any_version)}"
+                            text = "$VERSION_ICON ${stringResource(R.string.bundle_view_patches_any_version)}"
                        )
                    }
                } else {
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleSelector.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleSelector.kt
@@ -12,23 +12,23 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import app.revanced.manager.R
 import app.revanced.manager.domain.bundles.PatchBundleSource
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun BundleSelector(sources: List<PatchBundleSource>, onFinish: (PatchBundleSource?) -> Unit) {
-    LaunchedEffect(sources) {
-        if (sources.size == 1) {
-            onFinish(sources[0])
+fun BundleSelector(bundles: List<PatchBundleSource>, onFinish: (PatchBundleSource?) -> Unit) {
+    LaunchedEffect(bundles) {
+        if (bundles.size == 1) {
+            onFinish(bundles[0])
        }
    }

-    if (sources.size < 2) {
+    if (bundles.size < 2) {
        return
    }

@@ -47,12 +47,13 @@ fun BundleSelector(sources: List<PatchBundleSource>, onFinish: (PatchBundleSourc
                    .fillMaxWidth()
            ) {
                Text(
-                    text = stringResource(R.string.select),
+                    text = "Select bundle",
                    style = MaterialTheme.typography.titleLarge,
                    color = MaterialTheme.colorScheme.onSurface
                )
            }
-            sources.forEach {
+            bundles.forEach {
+                val name by it.nameState
                Row(
                    verticalAlignment = Alignment.CenterVertically,
                    horizontalArrangement = Arrangement.Center,
@@ -64,7 +65,7 @@ fun BundleSelector(sources: List<PatchBundleSource>, onFinish: (PatchBundleSourc
                        }
                ) {
                    Text(
-                        "${it.name} ${it.version}",
+                        name,
                        style = MaterialTheme.typography.titleMedium,
                        color = MaterialTheme.colorScheme.onSurface
                    )
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
@@ -23,14 +23,10 @@ import app.revanced.manager.ui.component.AlertDialogExtended
 import app.revanced.manager.ui.component.TextHorizontalPadding
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.haptics.HapticRadioButton
+import app.revanced.manager.ui.model.BundleType
 import app.revanced.manager.util.BIN_MIMETYPE
 import app.revanced.manager.util.transparentListItemColors

-private enum class BundleType {
-    Local,
-    Remote
-}
-
@Composable
 fun ImportPatchBundleDialog(
    onDismiss: () -> Unit,
@@ -41,7 +37,7 @@ fun ImportPatchBundleDialog(
    var bundleType by rememberSaveable { mutableStateOf(BundleType.Remote) }
    var patchBundle by rememberSaveable { mutableStateOf<Uri?>(null) }
    var remoteUrl by rememberSaveable { mutableStateOf("") }
-    var autoUpdate by rememberSaveable { mutableStateOf(true) }
+    var autoUpdate by rememberSaveable { mutableStateOf(false) }

    val patchActivityLauncher =
        rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
@@ -81,7 +77,7 @@ fun ImportPatchBundleDialog(
    AlertDialogExtended(
        onDismissRequest = onDismiss,
        title = {
-            Text(stringResource(if (currentStep == 0) R.string.select else R.string.add_patches))
+            Text(stringResource(if (currentStep == 0) R.string.select else R.string.add_patch_bundle))
        },
        text = {
            steps[currentStep]()
@@ -121,7 +117,7 @@ fun ImportPatchBundleDialog(
 }

@Composable
-private fun SelectBundleTypeStep(
+fun SelectBundleTypeStep(
    bundleType: BundleType,
    onBundleTypeSelected: (BundleType) -> Unit
 ) {
@@ -130,7 +126,7 @@ private fun SelectBundleTypeStep(
    ) {
        Text(
            modifier = Modifier.padding(horizontal = 24.dp),
-            text = stringResource(R.string.select_patches_type_dialog_description)
+            text = stringResource(R.string.select_bundle_type_dialog_description)
        )
        Column {
            ListItem(
@@ -140,7 +136,7 @@ private fun SelectBundleTypeStep(
                ),
                headlineContent = { Text(stringResource(R.string.enter_url)) },
                overlineContent = { Text(stringResource(R.string.recommended)) },
-                supportingContent = { Text(stringResource(R.string.remote_patches_description)) },
+                supportingContent = { Text(stringResource(R.string.remote_bundle_description)) },
                leadingContent = {
                    HapticRadioButton(
                        selected = bundleType == BundleType.Remote,
@@ -156,7 +152,7 @@ private fun SelectBundleTypeStep(
                    onClick = { onBundleTypeSelected(BundleType.Local) }
                ),
                headlineContent = { Text(stringResource(R.string.select_from_storage)) },
-                supportingContent = { Text(stringResource(R.string.local_patches_description)) },
+                supportingContent = { Text(stringResource(R.string.local_bundle_description)) },
                overlineContent = { },
                leadingContent = {
                    HapticRadioButton(
@@ -172,7 +168,7 @@ private fun SelectBundleTypeStep(

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-private fun ImportBundleStep(
+fun ImportBundleStep(
    bundleType: BundleType,
    patchBundle: Uri?,
    remoteUrl: String,
@@ -189,7 +185,7 @@ private fun ImportBundleStep(
                ) {
                    ListItem(
                        headlineContent = {
-                            Text(stringResource(R.string.patches))
+                            Text(stringResource(R.string.patch_bundle_field))
                        },
                        supportingContent = { Text(stringResource(if (patchBundle != null) R.string.file_field_set else R.string.file_field_not_set)) },
                        trailingContent = {
@@ -210,11 +206,11 @@ private fun ImportBundleStep(
                    OutlinedTextField(
                        value = remoteUrl,
                        onValueChange = onRemoteUrlChange,
-                        label = { Text(stringResource(R.string.patches_url)) }
+                        label = { Text(stringResource(R.string.bundle_url)) }
                    )
                }
                Column(
-                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 5.dp)
+                    modifier = Modifier.padding(horizontal = 8.dp)
                ) {
                    ListItem(
                        modifier = Modifier.clickable(
--- a/app/src/main/java/app/revanced/manager/ui/component/haptics/HapticSwitch.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/haptics/HapticSwitch.kt
@@ -9,7 +9,6 @@ import androidx.compose.material3.SwitchDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalView

@Composable
 fun HapticSwitch(
@@ -21,19 +20,16 @@ fun HapticSwitch(
    colors: SwitchColors = SwitchDefaults.colors(),
    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
 ) {
-    val view = LocalView.current
    Switch(
        checked = checked,
        onCheckedChange = { newChecked ->
            val useNewConstants = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
-            val hapticFeedbackType = when {
+            when {
                newChecked && useNewConstants -> HapticFeedbackConstants.TOGGLE_ON
                newChecked -> HapticFeedbackConstants.VIRTUAL_KEY
                !newChecked && useNewConstants -> HapticFeedbackConstants.TOGGLE_OFF
                !newChecked -> HapticFeedbackConstants.CLOCK_TICK
-                else -> {HapticFeedbackConstants.VIRTUAL_KEY}
            }
-            view.performHapticFeedback(hapticFeedbackType)
            onCheckedChange(newChecked)
        },
        modifier = modifier,
--- a/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
@@ -55,13 +55,13 @@ import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.patcher.patch.Option
 import app.revanced.manager.ui.component.AlertDialogExtended
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.FloatInputDialog
-import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.IntInputDialog
 import app.revanced.manager.ui.component.LongInputDialog
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
@@ -78,38 +78,26 @@ import org.koin.compose.koinInject
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import sh.calvin.reorderable.ReorderableItem
-import sh.calvin.reorderable.rememberReorderableLazyListState
+import sh.calvin.reorderable.rememberReorderableLazyColumnState
 import java.io.Serializable
 import kotlin.random.Random
 import kotlin.reflect.typeOf
+import androidx.compose.ui.window.Dialog as ComposeDialog

 private class OptionEditorScope<T : Any>(
    private val editor: OptionEditor<T>,
    val option: Option<T>,
    val openDialog: () -> Unit,
    val dismissDialog: () -> Unit,
-    val selectionWarningEnabled: Boolean,
-    val showSelectionWarning: () -> Unit,
    val value: T?,
-    val setValue: (T?) -> Unit
+    val setValue: (T?) -> Unit,
 ) {
    fun submitDialog(value: T?) {
        setValue(value)
        dismissDialog()
    }

-    fun checkSafeguard(block: () -> Unit) {
-        if (!option.required && selectionWarningEnabled)
-            showSelectionWarning()
-        else
-            block()
-    }
-
-    fun clickAction() {
-        checkSafeguard {
-            editor.clickAction(this)
-        }
-    }
+    fun clickAction() = editor.clickAction(this)

    @Composable
    fun ListItemTrailingContent() = editor.ListItemTrailingContent(this)
@@ -123,7 +111,7 @@ private interface OptionEditor<T : Any> {

    @Composable
    fun ListItemTrailingContent(scope: OptionEditorScope<T>) {
-        IconButton(onClick = { scope.checkSafeguard { clickAction(scope) } }) {
+        IconButton(onClick = { clickAction(scope) }) {
            Icon(Icons.Outlined.Edit, stringResource(R.string.edit))
        }
    }
@@ -151,14 +139,11 @@ private inline fun <T : Any> WithOptionEditor(
    option: Option<T>,
    value: T?,
    noinline setValue: (T?) -> Unit,
-    selectionWarningEnabled: Boolean,
    crossinline onDismissDialog: @DisallowComposableCalls () -> Unit = {},
    block: OptionEditorScope<T>.() -> Unit
 ) {
    var showDialog by rememberSaveable { mutableStateOf(false) }
-    var showSelectionWarningDialog by rememberSaveable { mutableStateOf(false) }
-
-    val scope = remember(editor, option, value, setValue, selectionWarningEnabled) {
+    val scope = remember(editor, option, value, setValue) {
        OptionEditorScope(
            editor,
            option,
@@ -167,18 +152,11 @@ private inline fun <T : Any> WithOptionEditor(
                showDialog = false
                onDismissDialog()
            },
-            selectionWarningEnabled,
-            showSelectionWarning = { showSelectionWarningDialog = true },
            value,
            setValue
        )
    }

-    if (showSelectionWarningDialog)
-        SelectionWarningDialog(
-            onDismiss = { showSelectionWarningDialog = false }
-        )
-
    if (showDialog) scope.Dialog()

    scope.block()
@@ -189,7 +167,6 @@ fun <T : Any> OptionItem(
    option: Option<T>,
    value: T?,
    setValue: (T?) -> Unit,
-    selectionWarningEnabled: Boolean
 ) {
    val editor = remember(option.type, option.presets) {
        @Suppress("UNCHECKED_CAST")
@@ -202,7 +179,7 @@ fun <T : Any> OptionItem(
        else baseOptionEditor
    }

-    WithOptionEditor(editor, option, value, setValue, selectionWarningEnabled) {
+    WithOptionEditor(editor, option, value, setValue) {
        ListItem(
            modifier = Modifier.clickable(onClick = ::clickAction),
            headlineContent = { Text(option.title) },
@@ -321,7 +298,7 @@ private object StringOptionEditor : OptionEditor<String> {

 private abstract class NumberOptionEditor<T : Number> : OptionEditor<T> {
    @Composable
-    abstract fun NumberDialog(
+    protected abstract fun NumberDialog(
        title: String,
        current: T?,
        validator: (T?) -> Boolean,
@@ -375,14 +352,7 @@ private object BooleanOptionEditor : OptionEditor<Boolean> {

    @Composable
    override fun ListItemTrailingContent(scope: OptionEditorScope<Boolean>) {
-        HapticSwitch(
-            checked = scope.current,
-            onCheckedChange = { value ->
-                scope.checkSafeguard {
-                    scope.setValue(value)
-                }
-            }
-        )
+        HapticSwitch(checked = scope.current, onCheckedChange = scope.setValue)
    }

    @Composable
@@ -421,7 +391,6 @@ private class PresetOptionEditor<T : Any>(private val innerEditor: OptionEditor<
            scope.option,
            scope.value,
            scope.setValue,
-            scope.selectionWarningEnabled,
            onDismissDialog = scope.dismissDialog
        ) inner@{
            var hidePresetsDialog by rememberSaveable {
@@ -528,8 +497,7 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti

        val lazyListState = rememberLazyListState()
        val reorderableLazyColumnState =
-            // Update the list
-            rememberReorderableLazyListState(lazyListState) { from, to ->
+            rememberReorderableLazyColumnState(lazyListState) { from, to ->
                // Update the list
                items.add(to.index, items.removeAt(from.index))
            }
@@ -556,8 +524,12 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
            scope.submitDialog(items.mapNotNull { it.value })
        }

-        FullscreenDialog(
+        ComposeDialog(
            onDismissRequest = back,
+            properties = DialogProperties(
+                usePlatformDefaultWidth = false,
+                dismissOnBackPress = true
+            ),
        ) {
            Scaffold(
                topBar = {
@@ -643,8 +615,7 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                elementEditor,
                                elementOption,
                                value = item.value,
-                                setValue = { items[index] = item.copy(value = it) },
-                                selectionWarningEnabled = scope.selectionWarningEnabled
+                                setValue = { items[index] = item.copy(value = it) }
                            ) {
                                ListItem(
                                    modifier = Modifier.combinedClickable(
--- a/app/src/main/java/app/revanced/manager/ui/component/patches/PathSelectorDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patches/PathSelectorDialog.kt
@@ -23,9 +23,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
-import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.util.saver.PathSaver
@@ -47,8 +48,12 @@ fun PathSelectorDialog(root: Path, onSelect: (Path?) -> Unit) {
        currentDirectory.listDirectoryEntries().filter(Path::isReadable).partition(Path::isDirectory)
    }

-    FullscreenDialog(
+    Dialog(
        onDismissRequest = { onSelect(null) },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
    ) {
        Scaffold(
            topBar = {
--- a/app/src/main/java/app/revanced/manager/ui/component/patches/SelectionWarningDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patches/SelectionWarningDialog.kt
@@ -1,17 +0,0 @@
-package app.revanced.manager.ui.component.patches
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import app.revanced.manager.R
-import app.revanced.manager.ui.component.SafeguardDialog
-
-@Composable
-fun SelectionWarningDialog(
-    onDismiss: () -> Unit
-) {
-    SafeguardDialog(
-        onDismiss = onDismiss,
-        title = R.string.warning,
-        body = stringResource(R.string.selection_warning_description),
-    )
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardBooleanItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardBooleanItem.kt
@@ -1,8 +1,6 @@
 package app.revanced.manager.ui.component.settings

 import androidx.annotation.StringRes
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.WarningAmber
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -11,9 +9,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import app.revanced.manager.R
 import app.revanced.manager.domain.manager.base.Preference
-import app.revanced.manager.ui.component.ConfirmDialog
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch

@@ -32,15 +28,13 @@ fun SafeguardBooleanItem(
    }

    if (showSafeguardWarning) {
-        ConfirmDialog(
+        SafeguardConfirmationDialog(
            onDismiss = { showSafeguardWarning = false },
            onConfirm = {
                coroutineScope.launch { preference.update(!value) }
                showSafeguardWarning = false
            },
-            title = stringResource(id = R.string.warning),
-            description = stringResource(confirmationText),
-            icon = Icons.Outlined.WarningAmber
+            body = stringResource(confirmationText)
        )
    }

--- a/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardConfirmationDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardConfirmationDialog.kt
@@ -0,0 +1,46 @@
+package app.revanced.manager.ui.component.settings
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.WarningAmber
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import app.revanced.manager.R
+
+@Composable
+fun SafeguardConfirmationDialog(
+    onDismiss: () -> Unit,
+    onConfirm: () -> Unit,
+    body: String,
+) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        confirmButton = {
+            TextButton(onClick = onConfirm) {
+                Text(stringResource(R.string.yes))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.no))
+            }
+        },
+        icon = {
+            Icon(Icons.Outlined.WarningAmber, null)
+        },
+        title = {
+            Text(
+                text = stringResource(id = R.string.warning),
+                style = MaterialTheme.typography.headlineSmall.copy(textAlign = TextAlign.Center)
+            )
+        },
+        text = {
+            Text(body)
+        }
+    )
+}
--- a/app/src/main/java/app/revanced/manager/ui/component/settings/SettingsListItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/settings/SettingsListItem.kt
@@ -1,17 +1,6 @@
 package app.revanced.manager.ui.component.settings

-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ExpandLess
-import androidx.compose.material.icons.filled.ExpandMore
-import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItemColors
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
@@ -21,10 +10,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.material3.ListItem
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue

@Composable
 fun SettingsListItem(
@@ -82,48 +67,4 @@ fun SettingsListItem(
    colors = colors,
    tonalElevation = tonalElevation,
    shadowElevation = shadowElevation
-)
-
-@Composable
-fun ExpandableSettingListItem(
-    headlineContent: String,
-    supportingContent: String,
-    expandableContent: @Composable () -> Unit
-) {
-    var expanded by remember { mutableStateOf(false) }
-
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .animateContentSize()
-    ) {
-        SettingsListItem(
-            modifier = Modifier
-                .clickable{ expanded = !expanded },
-            headlineContent = headlineContent,
-            supportingContent = supportingContent,
-            trailingContent = {
-                Icon(
-                    imageVector = if (expanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore,
-                    contentDescription = null
-                )
-            }
-        )
-
-        AnimatedVisibility(visible = expanded) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(bottom = 12.dp, start = 16.dp, end = 16.dp)
-                    .animateContentSize(
-                        animationSpec = tween(
-                            durationMillis = 500,
-                            easing = FastOutSlowInEasing
-                        )
-                    )
-            ) {
-                expandableContent()
-            }
-        }
-    }
-}
+)
--- a/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
@@ -0,0 +1,112 @@
+package app.revanced.manager.ui.model
+
+import app.revanced.manager.domain.repository.PatchBundleRepository
+import app.revanced.manager.patcher.patch.PatchInfo
+import app.revanced.manager.util.PatchSelection
+import app.revanced.manager.util.flatMapLatestAndCombine
+import kotlinx.coroutines.flow.map
+
+/**
+ * A data class that contains patch bundle metadata for use by UI code.
+ */
+data class BundleInfo(
+    val name: String,
+    val uid: Int,
+    val compatible: List<PatchInfo>,
+    val incompatible: List<PatchInfo>,
+    val universal: List<PatchInfo>
+) {
+    val all = sequence {
+        yieldAll(compatible)
+        yieldAll(incompatible)
+        yieldAll(universal)
+    }
+
+    val patchCount get() = compatible.size + incompatible.size + universal.size
+
+    fun patchSequence(allowIncompatible: Boolean) = if (allowIncompatible) {
+        all
+    } else {
+        sequence {
+            yieldAll(compatible)
+            yieldAll(universal)
+        }
+    }
+
+    companion object Extensions {
+        inline fun Iterable<BundleInfo>.toPatchSelection(
+            allowIncompatible: Boolean,
+            condition: (Int, PatchInfo) -> Boolean
+        ): PatchSelection = this.associate { bundle ->
+            val patches =
+                bundle.patchSequence(allowIncompatible)
+                    .mapNotNullTo(mutableSetOf()) { patch ->
+                        patch.name.takeIf {
+                            condition(
+                                bundle.uid,
+                                patch
+                            )
+                        }
+                    }
+
+            bundle.uid to patches
+        }
+
+        fun PatchBundleRepository.bundleInfoFlow(packageName: String, version: String?) =
+            sources.flatMapLatestAndCombine(
+                combiner = { it.filterNotNull() }
+            ) { source ->
+                // Regenerate bundle information whenever this source updates.
+                source.state.map { state ->
+                    val bundle = state.patchBundleOrNull() ?: return@map null
+
+                    val compatible = mutableListOf<PatchInfo>()
+                    val incompatible = mutableListOf<PatchInfo>()
+                    val universal = mutableListOf<PatchInfo>()
+
+                    bundle.patches.filter { it.compatibleWith(packageName) }.forEach {
+                        val targetList = when {
+                            it.compatiblePackages == null -> universal
+                            it.supports(
+                                packageName,
+                                version
+                            ) -> compatible
+
+                            else -> incompatible
+                        }
+
+                        targetList.add(it)
+                    }
+
+                    BundleInfo(source.getName(), source.uid, compatible, incompatible, universal)
+                }
+            }
+
+        /**
+         * Algorithm for determining whether all required options have been set.
+         */
+        inline fun Iterable<BundleInfo>.requiredOptionsSet(
+            crossinline isSelected: (BundleInfo, PatchInfo) -> Boolean,
+            crossinline optionsForPatch: (BundleInfo, PatchInfo) -> Map<String, Any?>?
+        ) = all bundle@{ bundle ->
+            bundle
+                .all
+                .filter { isSelected(bundle, it) }
+                .all patch@{
+                    if (it.options.isNullOrEmpty()) return@patch true
+                    val opts by lazy { optionsForPatch(bundle, it).orEmpty() }
+
+                    it.options.all option@{ option ->
+                        if (!option.required || option.default != null) return@option true
+
+                        option.key in opts
+                    }
+                }
+        }
+    }
+}
+
+enum class BundleType {
+    Local,
+    Remote
+}
--- a/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt
@@ -92,5 +92,5 @@ object Settings {
    data object Licenses : Destination

    @Serializable
-    data object Developer : Destination
+    data object DeveloperOptions : Destination
 }
--- a/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt
@@ -3,74 +3,56 @@ package app.revanced.manager.ui.screen
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import app.revanced.manager.domain.bundles.PatchBundleSource
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.bundle.BundleItem
-import app.revanced.manager.ui.viewmodel.BundleListViewModel
-import app.revanced.manager.util.EventEffect
-import kotlinx.coroutines.flow.Flow
-import org.koin.androidx.compose.koinViewModel

-@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun BundleListScreen(
-    viewModel: BundleListViewModel = koinViewModel(),
-    eventsFlow: Flow<BundleListViewModel.Event>,
-    setSelectedSourceCount: (Int) -> Unit
+    onDelete: (PatchBundleSource) -> Unit,
+    onUpdate: (PatchBundleSource) -> Unit,
+    sources: List<PatchBundleSource>,
+    selectedSources: SnapshotStateList<PatchBundleSource>,
+    bundlesSelectable: Boolean,
 ) {
-    val patchCounts by viewModel.patchCounts.collectAsStateWithLifecycle(emptyMap())
-    val sources by viewModel.sources.collectAsStateWithLifecycle(emptyList())
-
-    EventEffect(eventsFlow) {
-        viewModel.handleEvent(it)
-    }
-    LaunchedEffect(viewModel.selectedSources.size) {
-        setSelectedSourceCount(viewModel.selectedSources.size)
+    val sortedSources = sources.sortedBy {
+        it.state.value.patchBundleOrNull()?.patches?.size
    }

-    PullToRefreshBox(
-        onRefresh = viewModel::refresh,
-        isRefreshing = viewModel.isRefreshing
+    LazyColumnWithScrollbar(
+        modifier = Modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Top,
    ) {
-        LazyColumnWithScrollbar(
-            modifier = Modifier.fillMaxSize(),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Top,
-        ) {
-            items(
-                sources,
-                key = { it.uid }
-            ) { source ->
-                BundleItem(
-                    src = source,
-                    patchCount = patchCounts[source.uid] ?: 0,
-                    onDelete = {
-                        viewModel.delete(source)
-                    },
-                    onUpdate = {
-                        viewModel.update(source)
-                    },
-                    selectable = viewModel.selectedSources.size > 0,
-                    onSelect = {
-                        viewModel.selectedSources.add(source.uid)
-                    },
-                    isBundleSelected = source.uid in viewModel.selectedSources,
-                    toggleSelection = { bundleIsNotSelected ->
-                        if (bundleIsNotSelected) {
-                            viewModel.selectedSources.add(source.uid)
-                        } else {
-                            viewModel.selectedSources.remove(source.uid)
-                        }
+        items(
+            sortedSources,
+            key = { it.uid }
+        ) { source ->
+            BundleItem(
+                bundle = source,
+                onDelete = {
+                    onDelete(source)
+                },
+                onUpdate = {
+                    onUpdate(source)
+                },
+                selectable = bundlesSelectable,
+                onSelect = {
+                    selectedSources.add(source)
+                },
+                isBundleSelected = selectedSources.contains(source),
+                toggleSelection = { bundleIsNotSelected ->
+                    if (bundleIsNotSelected) {
+                        selectedSources.add(source)
+                    } else {
+                        selectedSources.remove(source)
                    }
-                )
-            }
+                }
+            )
        }
    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.material.icons.filled.BatteryAlert
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.outlined.Apps
 import androidx.compose.material.icons.outlined.BugReport
-import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material.icons.outlined.Refresh
@@ -44,7 +43,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -57,13 +55,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
+import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
 import app.revanced.manager.patcher.aapt.Aapt
 import app.revanced.manager.ui.component.AlertDialogExtended
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.AutoUpdatesDialog
 import app.revanced.manager.ui.component.AvailableUpdateDialog
 import app.revanced.manager.ui.component.NotificationCard
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.bundle.BundleTopBar
 import app.revanced.manager.ui.component.bundle.ImportPatchBundleDialog
 import app.revanced.manager.ui.component.haptics.HapticFloatingActionButton
@@ -79,7 +77,7 @@ enum class DashboardPage(
    val icon: ImageVector
 ) {
    DASHBOARD(R.string.tab_apps, Icons.Outlined.Apps),
-    BUNDLES(R.string.tab_patches, Icons.Outlined.Source),
+    BUNDLES(R.string.tab_bundles, Icons.Outlined.Source),
 }

@SuppressLint("BatteryLife")
@@ -93,8 +91,7 @@ fun DashboardScreen(
    onDownloaderPluginClick: () -> Unit,
    onAppClick: (String) -> Unit
 ) {
-    var selectedSourceCount by rememberSaveable { mutableIntStateOf(0) }
-    val bundlesSelectable by remember { derivedStateOf { selectedSourceCount > 0 } }
+    val bundlesSelectable by remember { derivedStateOf { vm.selectedSources.size > 0 } }
    val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0)
    val showNewDownloaderPluginsNotification by vm.newDownloaderPluginsAvailable.collectAsStateWithLifecycle(
        false
@@ -157,22 +154,11 @@ fun DashboardScreen(
        }
    )

-    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
-    if (showDeleteConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDeleteConfirmationDialog = false },
-            onConfirm = vm::deleteSources,
-            title = stringResource(R.string.delete),
-            description = stringResource(R.string.patches_delete_multiple_dialog_description),
-            icon = Icons.Outlined.Delete
-        )
-    }
-
    Scaffold(
        topBar = {
            if (bundlesSelectable) {
                BundleTopBar(
-                    title = stringResource(R.string.patches_selected, selectedSourceCount),
+                    title = stringResource(R.string.bundles_selected, vm.selectedSources.size),
                    onBackClick = vm::cancelSourceSelection,
                    backIcon = {
                        Icon(
@@ -183,7 +169,8 @@ fun DashboardScreen(
                    actions = {
                        IconButton(
                            onClick = {
-                                showDeleteConfirmationDialog = true
+                                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
+                                vm.cancelSourceSelection()
                            }
                        ) {
                            Icon(
@@ -192,7 +179,10 @@ fun DashboardScreen(
                            )
                        }
                        IconButton(
-                            onClick = vm::updateSources
+                            onClick = {
+                                vm.selectedSources.forEach { vm.update(it) }
+                                vm.cancelSourceSelection()
+                            }
                        ) {
                            Icon(
                                Icons.Outlined.Refresh,
@@ -234,7 +224,7 @@ fun DashboardScreen(
                    when (pagerState.currentPage) {
                        DashboardPage.DASHBOARD.ordinal -> {
                            if (availablePatches < 1) {
-                                androidContext.toast(androidContext.getString(R.string.no_patch_found))
+                                androidContext.toast(androidContext.getString(R.string.patches_unavailable))
                                composableScope.launch {
                                    pagerState.animateScrollToPage(
                                        DashboardPage.BUNDLES.ordinal
@@ -344,9 +334,18 @@ fun DashboardScreen(
                                }
                            }

+                            val sources by vm.sources.collectAsStateWithLifecycle(initialValue = emptyList())
+
                            BundleListScreen(
-                                eventsFlow = vm.bundleListEventsFlow,
-                                setSelectedSourceCount = { selectedSourceCount = it }
+                                onDelete = {
+                                    vm.delete(it)
+                                },
+                                onUpdate = {
+                                    vm.update(it)
+                                },
+                                sources = sources,
+                                selectedSources = vm.selectedSources,
+                                bundlesSelectable = bundlesSelectable
                            )
                        }
                    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@@ -17,7 +17,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.OpenInNew
-import androidx.compose.material.icons.outlined.Cancel
 import androidx.compose.material.icons.outlined.FileDownload
 import androidx.compose.material.icons.outlined.PostAdd
 import androidx.compose.material.icons.outlined.Save
@@ -46,7 +45,6 @@ import app.revanced.manager.R
 import app.revanced.manager.data.room.apps.installed.InstallType
 import app.revanced.manager.ui.component.AppScaffold
 import app.revanced.manager.ui.component.AppTopBar
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.InstallerStatusDialog
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.patcher.InstallPickerDialog
@@ -60,34 +58,25 @@ import app.revanced.manager.util.EventEffect
@Composable
 fun PatcherScreen(
    onBackClick: () -> Unit,
-    viewModel: PatcherViewModel
+    vm: PatcherViewModel
 ) {
-    fun onLeave() {
-        viewModel.onBack()
+    fun leaveScreen() {
+        vm.onBack()
        onBackClick()
    }
+    BackHandler(onBack = ::leaveScreen)

    val context = LocalContext.current
    val exportApkLauncher =
-        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), viewModel::export)
+        rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), vm::export)

-    val patcherSucceeded by viewModel.patcherSucceeded.observeAsState(null)
-    val canInstall by remember { derivedStateOf { patcherSucceeded == true && (viewModel.installedPackageName != null || !viewModel.isInstalling) } }
+    val patcherSucceeded by vm.patcherSucceeded.observeAsState(null)
+    val canInstall by remember { derivedStateOf { patcherSucceeded == true && (vm.installedPackageName != null || !vm.isInstalling) } }
    var showInstallPicker by rememberSaveable { mutableStateOf(false) }
-    var showDismissConfirmationDialog by rememberSaveable { mutableStateOf(false) }
-
-    fun onPageBack() {
-        if(patcherSucceeded == null)
-            showDismissConfirmationDialog = true
-        else
-            onLeave()
-    }
-
-    BackHandler(onBack = ::onPageBack)

    val steps by remember {
        derivedStateOf {
-            viewModel.steps.groupBy { it.category }
+            vm.steps.groupBy { it.category }
        }
    }

@@ -104,44 +93,34 @@ fun PatcherScreen(
    if (showInstallPicker)
        InstallPickerDialog(
            onDismiss = { showInstallPicker = false },
-            onConfirm = viewModel::install
+            onConfirm = vm::install
        )

-    if (showDismissConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDismissConfirmationDialog = false },
-            onConfirm = ::onLeave,
-            title = stringResource(R.string.patcher_stop_confirm_title),
-            description = stringResource(R.string.patcher_stop_confirm_description),
-            icon = Icons.Outlined.Cancel
-        )
-    }
-
-    viewModel.packageInstallerStatus?.let {
-        InstallerStatusDialog(it, viewModel, viewModel::dismissPackageInstallerDialog)
+    vm.packageInstallerStatus?.let {
+        InstallerStatusDialog(it, vm, vm::dismissPackageInstallerDialog)
    }

    val activityLauncher = rememberLauncherForActivityResult(
        contract = ActivityResultContracts.StartActivityForResult(),
-        onResult = viewModel::handleActivityResult
+        onResult = vm::handleActivityResult
    )
-    EventEffect(flow = viewModel.launchActivityFlow) { intent ->
+    EventEffect(flow = vm.launchActivityFlow) { intent ->
        activityLauncher.launch(intent)
    }

-    viewModel.activityPromptDialog?.let { title ->
+    vm.activityPromptDialog?.let { title ->
        AlertDialog(
-            onDismissRequest = viewModel::rejectInteraction,
+            onDismissRequest = vm::rejectInteraction,
            confirmButton = {
                TextButton(
-                    onClick = viewModel::allowInteraction
+                    onClick = vm::allowInteraction
                ) {
                    Text(stringResource(R.string.continue_))
                }
            },
            dismissButton = {
                TextButton(
-                    onClick = viewModel::rejectInteraction
+                    onClick = vm::rejectInteraction
                ) {
                    Text(stringResource(R.string.cancel))
                }
@@ -158,20 +137,20 @@ fun PatcherScreen(
            AppTopBar(
                title = stringResource(R.string.patcher),
                scrollBehavior = scrollBehavior,
-                onBackClick = ::onPageBack
+                onBackClick = ::leaveScreen
            )
        },
        bottomBar = {
            BottomAppBar(
                actions = {
                    IconButton(
-                        onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
+                        onClick = { exportApkLauncher.launch("${vm.packageName}_${vm.version}_revanced_patched.apk") },
                        enabled = patcherSucceeded == true
                    ) {
                        Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
                    }
                    IconButton(
-                        onClick = { viewModel.exportLogs(context) },
+                        onClick = { vm.exportLogs(context) },
                        enabled = patcherSucceeded != null
                    ) {
                        Icon(Icons.Outlined.PostAdd, stringResource(id = R.string.save_logs))
@@ -182,11 +161,11 @@ fun PatcherScreen(
                        HapticExtendedFloatingActionButton(
                            text = {
                                Text(
-                                    stringResource(if (viewModel.installedPackageName == null) R.string.install_app else R.string.open_app)
+                                    stringResource(if (vm.installedPackageName == null) R.string.install_app else R.string.open_app)
                                )
                            },
                            icon = {
-                                viewModel.installedPackageName?.let {
+                                vm.installedPackageName?.let {
                                    Icon(
                                        Icons.AutoMirrored.Outlined.OpenInNew,
                                        stringResource(R.string.open_app)
@@ -197,10 +176,10 @@ fun PatcherScreen(
                                )
                            },
                            onClick = {
-                                if (viewModel.installedPackageName == null)
-                                    if (viewModel.isDeviceRooted()) showInstallPicker = true
-                                    else viewModel.install(InstallType.DEFAULT)
-                                else viewModel.open()
+                                if (vm.installedPackageName == null)
+                                    if (vm.isDeviceRooted()) showInstallPicker = true
+                                    else vm.install(InstallType.DEFAULT)
+                                else vm.open()
                            }
                        )
                    }
@@ -214,7 +193,7 @@ fun PatcherScreen(
                .fillMaxSize()
        ) {
            LinearProgressIndicator(
-                progress = { viewModel.progress },
+                progress = { vm.progress },
                modifier = Modifier.fillMaxWidth()
            )

@@ -230,11 +209,11 @@ fun PatcherScreen(
                    Steps(
                        category = category,
                        steps = steps,
-                        stepCount = if (category == StepCategory.PATCHING) viewModel.patchesProgress else null,
-                        stepProgressProvider = viewModel
+                        stepCount = if (category == StepCategory.PATCHING) vm.patchesProgress else null,
+                        stepProgressProvider = vm
                    )
                }
            }
        }
    }
-}
+}
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@@ -58,14 +58,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.patcher.patch.Option
 import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.CheckedFilterChip
-import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.SafeguardDialog
 import app.revanced.manager.ui.component.SearchBar
@@ -73,7 +75,6 @@ import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticTab
 import app.revanced.manager.ui.component.patches.OptionItem
-import app.revanced.manager.ui.component.patches.SelectionWarningDialog
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_INCOMPATIBLE
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNIVERSAL
@@ -88,9 +89,9 @@ import kotlinx.coroutines.launch
 fun PatchesSelectorScreen(
    onSave: (PatchSelection?, Options) -> Unit,
    onBackClick: () -> Unit,
-    viewModel: PatchesSelectorViewModel
+    vm: PatchesSelectorViewModel
 ) {
-    val bundles by viewModel.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList())
+    val bundles by vm.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList())
    val pagerState = rememberPagerState(
        initialPage = 0,
        initialPageOffsetFraction = 0f
@@ -106,15 +107,15 @@ fun PatchesSelectorScreen(
    }
    var showBottomSheet by rememberSaveable { mutableStateOf(false) }
    val showSaveButton by remember {
-        derivedStateOf { viewModel.selectionIsValid(bundles) }
+        derivedStateOf { vm.selectionIsValid(bundles) }
    }

-    val defaultPatchSelectionCount by viewModel.defaultSelectionCount
+    val defaultPatchSelectionCount by vm.defaultSelectionCount
        .collectAsStateWithLifecycle(initialValue = 0)

    val selectedPatchCount by remember {
        derivedStateOf {
-            viewModel.customPatchSelection?.values?.sumOf { it.size } ?: defaultPatchSelectionCount
+            vm.customPatchSelection?.values?.sumOf { it.size } ?: defaultPatchSelectionCount
        }
    }

@@ -146,14 +147,14 @@ fun PatchesSelectorScreen(
                    verticalArrangement = Arrangement.spacedBy(12.dp)
                ) {
                    CheckedFilterChip(
-                        selected = viewModel.filter and SHOW_INCOMPATIBLE == 0,
-                        onClick = { viewModel.toggleFlag(SHOW_INCOMPATIBLE) },
+                        selected = vm.filter and SHOW_INCOMPATIBLE == 0,
+                        onClick = { vm.toggleFlag(SHOW_INCOMPATIBLE) },
                        label = { Text(stringResource(R.string.this_version)) }
                    )

                    CheckedFilterChip(
-                        selected = viewModel.filter and SHOW_UNIVERSAL != 0,
-                        onClick = { viewModel.toggleFlag(SHOW_UNIVERSAL) },
+                        selected = vm.filter and SHOW_UNIVERSAL != 0,
+                        onClick = { vm.toggleFlag(SHOW_UNIVERSAL) },
                        label = { Text(stringResource(R.string.universal)) },
                    )
                }
@@ -161,40 +162,43 @@ fun PatchesSelectorScreen(
        }
    }

-    if (viewModel.compatibleVersions.isNotEmpty())
+    if (vm.compatibleVersions.isNotEmpty())
        IncompatiblePatchDialog(
-            appVersion = viewModel.appVersion ?: stringResource(R.string.any_version),
-            compatibleVersions = viewModel.compatibleVersions,
-            onDismissRequest = viewModel::dismissDialogs
+            appVersion = vm.appVersion ?: stringResource(R.string.any_version),
+            compatibleVersions = vm.compatibleVersions,
+            onDismissRequest = vm::dismissDialogs
        )
    var showIncompatiblePatchesDialog by rememberSaveable {
        mutableStateOf(false)
    }
    if (showIncompatiblePatchesDialog)
        IncompatiblePatchesDialog(
-            appVersion = viewModel.appVersion ?: stringResource(R.string.any_version),
+            appVersion = vm.appVersion ?: stringResource(R.string.any_version),
            onDismissRequest = { showIncompatiblePatchesDialog = false }
        )

-    viewModel.optionsDialog?.let { (bundle, patch) ->
+    vm.optionsDialog?.let { (bundle, patch) ->
        OptionsDialog(
-            onDismissRequest = viewModel::dismissDialogs,
+            onDismissRequest = vm::dismissDialogs,
            patch = patch,
-            values = viewModel.getOptions(bundle, patch),
-            reset = { viewModel.resetOptions(bundle, patch) },
-            set = { key, value -> viewModel.setOption(bundle, patch, key, value) },
-            selectionWarningEnabled = viewModel.selectionWarningEnabled
+            values = vm.getOptions(bundle, patch),
+            reset = { vm.resetOptions(bundle, patch) },
+            set = { key, value -> vm.setOption(bundle, patch, key, value) }
        )
    }

-    var showSelectionWarning by rememberSaveable { mutableStateOf(false) }
-    var showUniversalWarning by rememberSaveable { mutableStateOf(false) }
-
-    if (showSelectionWarning)
+    var showSelectionWarning by rememberSaveable {
+        mutableStateOf(false)
+    }
+    if (showSelectionWarning) {
        SelectionWarningDialog(onDismiss = { showSelectionWarning = false })
-
-    if (showUniversalWarning)
-        UniversalPatchWarningDialog(onDismiss = { showUniversalWarning = false })
+    }
+    vm.pendingUniversalPatchAction?.let {
+        UniversalPatchWarningDialog(
+            onCancel = vm::dismissUniversalPatchWarning,
+            onConfirm = vm::confirmUniversalPatchWarning
+        )
+    }

    fun LazyListScope.patchList(
        uid: Int,
@@ -217,24 +221,28 @@ fun PatchesSelectorScreen(
            ) { patch ->
                PatchItem(
                    patch = patch,
-                    onOptionsDialog = { viewModel.optionsDialog = uid to patch },
-                    selected = compatible && viewModel.isSelected(
+                    onOptionsDialog = {
+                        vm.optionsDialog = uid to patch
+                    },
+                    selected = compatible && vm.isSelected(
                        uid,
                        patch
                    ),
                    onToggle = {
                        when {
                            // Open incompatible dialog if the patch is not supported
-                            !compatible -> viewModel.openIncompatibleDialog(patch)
+                            !compatible -> vm.openIncompatibleDialog(patch)

                            // Show selection warning if enabled
-                            viewModel.selectionWarningEnabled -> showSelectionWarning = true
+                            vm.selectionWarningEnabled -> showSelectionWarning = true

-                            // Show universal warning if universal patch is selected and the toggle is off
-                            patch.compatiblePackages == null && viewModel.universalPatchWarningEnabled -> showUniversalWarning = true
+                            // Set pending universal patch action if the universal patch warning is enabled and there are no compatible packages
+                            vm.universalPatchWarningEnabled && patch.compatiblePackages == null -> {
+                                vm.pendingUniversalPatchAction = { vm.togglePatch(uid, patch) }
+                            }

                            // Toggle the patch otherwise
-                            else -> viewModel.togglePatch(uid, patch)
+                            else -> vm.togglePatch(uid, patch)
                        }
                    },
                    compatible = compatible
@@ -320,7 +328,7 @@ fun PatchesSelectorScreen(
                    patchList(
                        uid = bundle.uid,
                        patches = bundle.universal.searched(),
-                        visible = viewModel.filter and SHOW_UNIVERSAL != 0,
+                        visible = vm.filter and SHOW_UNIVERSAL != 0,
                        compatible = true
                    ) {
                        ListHeader(
@@ -331,8 +339,8 @@ fun PatchesSelectorScreen(
                    patchList(
                        uid = bundle.uid,
                        patches = bundle.incompatible.searched(),
-                        visible = viewModel.filter and SHOW_INCOMPATIBLE != 0,
-                        compatible = viewModel.allowIncompatiblePatches
+                        visible = vm.filter and SHOW_INCOMPATIBLE != 0,
+                        compatible = vm.allowIncompatiblePatches
                    ) {
                        ListHeader(
                            title = stringResource(R.string.incompatible_patches),
@@ -355,30 +363,22 @@ fun PatchesSelectorScreen(
                    verticalArrangement = Arrangement.spacedBy(4.dp)
                ) {
                    SmallFloatingActionButton(
-                        onClick = viewModel::reset,
+                        onClick = vm::reset,
                        containerColor = MaterialTheme.colorScheme.tertiaryContainer
                    ) {
                        Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                    }
                    HapticExtendedFloatingActionButton(
-                        text = {
-                            Text(
-                                stringResource(
-                                    R.string.save_with_count,
-                                    selectedPatchCount
-                                )
-                            )
-                        },
+                        text = { Text(stringResource(R.string.save_with_count, selectedPatchCount)) },
                        icon = {
                            Icon(
                                imageVector = Icons.Outlined.Save,
                                contentDescription = stringResource(R.string.save)
                            )
                        },
-                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
-                            ?: true,
+                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp ?: true,
                        onClick = {
-                            onSave(viewModel.getCustomSelection(), viewModel.getOptions())
+                            onSave(vm.getCustomSelection(), vm.getOptions())
                        }
                    )
                }
@@ -389,7 +389,6 @@ fun PatchesSelectorScreen(
            modifier = Modifier
                .fillMaxSize()
                .padding(paddingValues)
-                .padding(top = 16.dp)
        ) {
            if (bundles.size > 1) {
                ScrollableTabRow(
@@ -406,19 +405,7 @@ fun PatchesSelectorScreen(
                                    )
                                }
                            },
-                            text = {
-                                Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                                    Text(
-                                        text = bundle.name,
-                                        style = MaterialTheme.typography.bodyMedium
-                                    )
-                                    Text(
-                                        text = bundle.version.orEmpty(),
-                                        style = MaterialTheme.typography.bodySmall,
-                                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                                    )
-                                }
-                            },
+                            text = { Text(bundle.name) },
                            selectedContentColor = MaterialTheme.colorScheme.primary,
                            unselectedContentColor = MaterialTheme.colorScheme.onSurfaceVariant
                        )
@@ -447,7 +434,7 @@ fun PatchesSelectorScreen(
                        patchList(
                            uid = bundle.uid,
                            patches = bundle.universal,
-                            visible = viewModel.filter and SHOW_UNIVERSAL != 0,
+                            visible = vm.filter and SHOW_UNIVERSAL != 0,
                            compatible = true
                        ) {
                            ListHeader(
@@ -457,8 +444,8 @@ fun PatchesSelectorScreen(
                        patchList(
                            uid = bundle.uid,
                            patches = bundle.incompatible,
-                            visible = viewModel.filter and SHOW_INCOMPATIBLE != 0,
-                            compatible = viewModel.allowIncompatiblePatches
+                            visible = vm.filter and SHOW_INCOMPATIBLE != 0,
+                            compatible = vm.allowIncompatiblePatches
                        ) {
                            ListHeader(
                                title = stringResource(R.string.incompatible_patches),
@@ -473,13 +460,43 @@ fun PatchesSelectorScreen(
 }

@Composable
-private fun UniversalPatchWarningDialog(
-    onDismiss: () -> Unit
-) {
+private fun SelectionWarningDialog(onDismiss: () -> Unit) {
    SafeguardDialog(
        onDismiss = onDismiss,
        title = R.string.warning,
-        body = stringResource(R.string.universal_patch_warning_description),
+        body = stringResource(R.string.selection_warning_description),
+    )
+}
+
+@Composable
+private fun UniversalPatchWarningDialog(
+    onCancel: () -> Unit,
+    onConfirm: () -> Unit
+) {
+    AlertDialog(
+        onDismissRequest = onCancel,
+        confirmButton = {
+            TextButton(onClick = onConfirm) {
+                Text(stringResource(R.string.continue_))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onCancel) {
+                Text(stringResource(R.string.cancel))
+            }
+        },
+        icon = {
+            Icon(Icons.Outlined.WarningAmber, null)
+        },
+        title = {
+            Text(
+                text = stringResource(R.string.warning),
+                style = MaterialTheme.typography.headlineSmall.copy(textAlign = TextAlign.Center)
+            )
+        },
+        text = {
+            Text(stringResource(R.string.universal_patch_warning_description))
+        }
    )
 }

@@ -601,8 +618,13 @@ private fun OptionsDialog(
    reset: () -> Unit,
    set: (String, Any?) -> Unit,
    onDismissRequest: () -> Unit,
-    selectionWarningEnabled: Boolean
-) = FullscreenDialog(onDismissRequest = onDismissRequest) {
+) = Dialog(
+    onDismissRequest = onDismissRequest,
+    properties = DialogProperties(
+        usePlatformDefaultWidth = false,
+        dismissOnBackPress = true
+    )
+) {
    Scaffold(
        topBar = {
            AppTopBar(
@@ -632,8 +654,7 @@ private fun OptionsDialog(
                    value = value,
                    setValue = {
                        set(key, it)
-                    },
-                    selectionWarningEnabled = selectionWarningEnabled
+                    }
                )
            }
        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
@@ -30,12 +30,12 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.patcher.patch.Option
-import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.requiredOptionsSet
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticTab
 import app.revanced.manager.ui.component.patches.OptionItem
+import app.revanced.manager.ui.model.BundleInfo.Extensions.requiredOptionsSet
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
@@ -62,7 +62,6 @@ fun RequiredOptionsScreen(
    val showContinueButton by remember {
        derivedStateOf {
            bundles.requiredOptionsSet(
-                allowIncompatible = vm.allowIncompatiblePatches,
                isSelected = { bundle, patch -> vm.isSelected(bundle.uid, patch) },
                optionsForPatch = { bundle, patch -> vm.getOptions(bundle.uid, patch) }
            )
@@ -154,8 +153,7 @@ fun RequiredOptionsScreen(
                                    value = value,
                                    setValue = { new ->
                                        vm.setOption(bundle.uid, it, key, new)
-                                    },
-                                    selectionWarningEnabled = vm.selectionWarningEnabled
+                                    }
                                )
                            }
                        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@@ -1,6 +1,5 @@
 package app.revanced.manager.ui.screen

-import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -8,79 +7,50 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
-import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.model.navigation.Settings
-import org.koin.compose.koinInject

-private data class Section(
-    @StringRes val name: Int,
-    @StringRes val description: Int,
-    val image: ImageVector,
-    val destination: Settings.Destination,
+private val settingsSections = listOf(
+    Triple(
+        R.string.general,
+        R.string.general_description,
+        Icons.Outlined.Settings
+    ) to Settings.General,
+    Triple(
+        R.string.updates,
+        R.string.updates_description,
+        Icons.Outlined.Update
+    ) to Settings.Updates,
+    Triple(
+        R.string.downloads,
+        R.string.downloads_description,
+        Icons.Outlined.Download
+    ) to Settings.Downloads,
+    Triple(
+        R.string.import_export,
+        R.string.import_export_description,
+        Icons.Outlined.SwapVert
+    ) to Settings.ImportExport,
+    Triple(
+        R.string.advanced,
+        R.string.advanced_description,
+        Icons.Outlined.Tune
+    ) to Settings.Advanced,
+    Triple(
+        R.string.about,
+        R.string.app_name,
+        Icons.Outlined.Info
+    ) to Settings.About,
 )

@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun SettingsScreen(onBackClick: () -> Unit, navigate: (Settings.Destination) -> Unit) {
-    val prefs: PreferencesManager = koinInject()
-    val showDeveloperSettings by prefs.showDeveloperSettings.getAsState()
-
-    val settingsSections = remember(showDeveloperSettings) {
-        listOfNotNull(
-            Section(
-                R.string.general,
-                R.string.general_description,
-                Icons.Outlined.Settings,
-                Settings.General
-            ),
-            Section(
-                R.string.updates,
-                R.string.updates_description,
-                Icons.Outlined.Update,
-                Settings.Updates
-            ),
-            Section(
-                R.string.downloads,
-                R.string.downloads_description,
-                Icons.Outlined.Download,
-                Settings.Downloads
-            ),
-            Section(
-                R.string.import_export,
-                R.string.import_export_description,
-                Icons.Outlined.SwapVert,
-                Settings.ImportExport
-            ),
-            Section(
-                R.string.advanced,
-                R.string.advanced_description,
-                Icons.Outlined.Tune,
-                Settings.Advanced
-            ),
-            Section(
-                R.string.about,
-                R.string.app_name,
-                Icons.Outlined.Info,
-                Settings.About
-            ),
-            Section(
-                R.string.developer_options,
-                R.string.developer_options_description,
-                Icons.Outlined.Code,
-                Settings.Developer
-            ).takeIf { showDeveloperSettings }
-        )
-    }
-
    Scaffold(
        topBar = {
            AppTopBar(
@@ -94,12 +64,12 @@ fun SettingsScreen(onBackClick: () -> Unit, navigate: (Settings.Destination) ->
                .padding(paddingValues)
                .fillMaxSize()
        ) {
-            settingsSections.forEach { (name, description, icon, destination) ->
+            settingsSections.forEach { (titleDescIcon, destination) ->
                SettingsListItem(
                    modifier = Modifier.clickable { navigate(destination) },
-                    headlineContent = stringResource(name),
-                    supportingContent = stringResource(description),
-                    leadingContent = { Icon(icon, null) }
+                    headlineContent = stringResource(titleDescIcon.first),
+                    supportingContent = stringResource(titleDescIcon.second),
+                    leadingContent = { Icon(titleDescIcon.third, null) }
                )
            }
        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
@@ -23,26 +23,16 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarDuration
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.hideFromAccessibility
-import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.BuildConfig
 import app.revanced.manager.R
@@ -52,7 +42,6 @@ import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.model.navigation.Settings
 import app.revanced.manager.ui.viewmodel.AboutViewModel
-import app.revanced.manager.ui.viewmodel.AboutViewModel.Companion.DEVELOPER_OPTIONS_TAPS
 import app.revanced.manager.ui.viewmodel.AboutViewModel.Companion.getSocialIcon
 import app.revanced.manager.util.openUrl
 import app.revanced.manager.util.toast
@@ -120,8 +109,7 @@ fun AboutSettingsScreen(
    }

    val listItems = listOfNotNull(
-        Triple(
-            stringResource(R.string.submit_feedback),
+        Triple(stringResource(R.string.submit_feedback),
            stringResource(R.string.submit_feedback_description),
            third = {
                context.openUrl("https://github.com/ReVanced/revanced-manager/issues/new/choose")
@@ -138,6 +126,11 @@ fun AboutSettingsScreen(
                navigate(Settings.Contributors)
            }
        ),
+        Triple(
+            stringResource(R.string.developer_options),
+            stringResource(R.string.developer_options_description),
+            third = { navigate(Settings.DeveloperOptions) }
+        ),
        Triple(
            stringResource(R.string.opensource_licenses),
            stringResource(R.string.opensource_licenses_description),
@@ -146,35 +139,6 @@ fun AboutSettingsScreen(
    )

    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-    val snackbarHostState = remember { SnackbarHostState() }
-
-    val showDeveloperSettings by viewModel.showDeveloperSettings.getAsState()
-    var developerTaps by rememberSaveable { mutableIntStateOf(0) }
-    LaunchedEffect(developerTaps) {
-        if (developerTaps == 0) return@LaunchedEffect
-        if (showDeveloperSettings) {
-            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_already_enabled))
-            developerTaps = 0
-            return@LaunchedEffect
-        }
-
-        val remaining = DEVELOPER_OPTIONS_TAPS - developerTaps
-        if (remaining > 0) {
-            snackbarHostState.showSnackbar(
-                context.getString(
-                    R.string.developer_options_taps,
-                    remaining
-                ),
-                duration = SnackbarDuration.Long
-            )
-        } else if (remaining == 0) {
-            viewModel.showDeveloperSettings.update(true)
-            snackbarHostState.showSnackbar(context.getString(R.string.developer_options_enabled))
-        }
-
-        // Reset the counter
-        developerTaps = 0
-    }

    Scaffold(
        topBar = {
@@ -184,9 +148,6 @@ fun AboutSettingsScreen(
                onBackClick = onBackClick
            )
        },
-        snackbarHost = {
-            SnackbarHost(hostState = snackbarHostState)
-        },
        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
    ) { paddingValues ->
        ColumnWithScrollbar(
@@ -197,11 +158,9 @@ fun AboutSettingsScreen(
            verticalArrangement = Arrangement.spacedBy(16.dp)
        ) {
            Image(
-                modifier = Modifier
-                    .padding(top = 16.dp)
-                    .clickable { developerTaps += 1 },
+                modifier = Modifier.padding(top = 16.dp),
                painter = icon,
-                contentDescription = stringResource(R.string.app_name)
+                contentDescription = null
            )
            Column(
                horizontalAlignment = Alignment.CenterHorizontally,
@@ -209,11 +168,7 @@ fun AboutSettingsScreen(
            ) {
                Text(
                    stringResource(R.string.app_name),
-                    style = MaterialTheme.typography.headlineSmall,
-                    modifier = Modifier.semantics {
-                        // Icon already has this information for the purpose of being clickable.
-                        hideFromAccessibility()
-                    }
+                    style = MaterialTheme.typography.headlineSmall
                )
                Text(
                    text = stringResource(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")",
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
@@ -61,7 +61,7 @@ import org.koin.androidx.compose.koinViewModel
@Composable
 fun AdvancedSettingsScreen(
    onBackClick: () -> Unit,
-    viewModel: AdvancedSettingsViewModel = koinViewModel()
+    vm: AdvancedSettingsViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
    val memoryLimit = remember {
@@ -91,16 +91,16 @@ fun AdvancedSettingsScreen(
        ) {
            GroupHeader(stringResource(R.string.manager))

-            val apiUrl by viewModel.prefs.api.getAsState()
+            val apiUrl by vm.prefs.api.getAsState()
            var showApiUrlDialog by rememberSaveable { mutableStateOf(false) }

            if (showApiUrlDialog) {
                APIUrlDialog(
                    currentUrl = apiUrl,
-                    defaultUrl = viewModel.prefs.api.default,
+                    defaultUrl = vm.prefs.api.default,
                    onSubmit = {
                        showApiUrlDialog = false
-                        it?.let(viewModel::setApiUrl)
+                        it?.let(vm::setApiUrl)
                    }
                )
            }
@@ -112,58 +112,58 @@ fun AdvancedSettingsScreen(
                }
            )

+            GroupHeader(stringResource(R.string.patcher))
+            BooleanItem(
+                preference = vm.prefs.useProcessRuntime,
+                coroutineScope = vm.viewModelScope,
+                headline = R.string.process_runtime,
+                description = R.string.process_runtime_description,
+            )
+            IntegerItem(
+                preference = vm.prefs.patcherProcessMemoryLimit,
+                coroutineScope = vm.viewModelScope,
+                headline = R.string.process_runtime_memory_limit,
+                description = R.string.process_runtime_memory_limit_description,
+            )
+
            GroupHeader(stringResource(R.string.safeguards))
            SafeguardBooleanItem(
-                preference = viewModel.prefs.disablePatchVersionCompatCheck,
-                coroutineScope = viewModel.viewModelScope,
+                preference = vm.prefs.disablePatchVersionCompatCheck,
+                coroutineScope = vm.viewModelScope,
                headline = R.string.patch_compat_check,
                description = R.string.patch_compat_check_description,
                confirmationText = R.string.patch_compat_check_confirmation
            )
            SafeguardBooleanItem(
-                preference = viewModel.prefs.suggestedVersionSafeguard,
-                coroutineScope = viewModel.viewModelScope,
+                preference = vm.prefs.disableUniversalPatchWarning,
+                coroutineScope = vm.viewModelScope,
+                headline = R.string.universal_patches_safeguard,
+                description = R.string.universal_patches_safeguard_description,
+                confirmationText = R.string.universal_patches_safeguard_confirmation
+            )
+            SafeguardBooleanItem(
+                preference = vm.prefs.suggestedVersionSafeguard,
+                coroutineScope = vm.viewModelScope,
                headline = R.string.suggested_version_safeguard,
                description = R.string.suggested_version_safeguard_description,
                confirmationText = R.string.suggested_version_safeguard_confirmation
            )
            SafeguardBooleanItem(
-                preference = viewModel.prefs.disableSelectionWarning,
-                coroutineScope = viewModel.viewModelScope,
+                preference = vm.prefs.disableSelectionWarning,
+                coroutineScope = vm.viewModelScope,
                headline = R.string.patch_selection_safeguard,
                description = R.string.patch_selection_safeguard_description,
                confirmationText = R.string.patch_selection_safeguard_confirmation
            )
-            SafeguardBooleanItem(
-                preference = viewModel.prefs.disableUniversalPatchCheck,
-                coroutineScope = viewModel.viewModelScope,
-                headline = R.string.universal_patches_safeguard,
-                description = R.string.universal_patches_safeguard_description,
-                confirmationText = R.string.universal_patches_safeguard_confirmation
-            )
-
-            GroupHeader(stringResource(R.string.patcher))
-            BooleanItem(
-                preference = viewModel.prefs.useProcessRuntime,
-                coroutineScope = viewModel.viewModelScope,
-                headline = R.string.process_runtime,
-                description = R.string.process_runtime_description,
-            )
-            IntegerItem(
-                preference = viewModel.prefs.patcherProcessMemoryLimit,
-                coroutineScope = viewModel.viewModelScope,
-                headline = R.string.process_runtime_memory_limit,
-                description = R.string.process_runtime_memory_limit_description,
-            )

            GroupHeader(stringResource(R.string.debugging))
            val exportDebugLogsLauncher =
                rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) {
-                    it?.let(viewModel::exportDebugLogs)
+                    it?.let(vm::exportDebugLogs)
                }
            SettingsListItem(
                headlineContent = stringResource(R.string.debug_logs_export),
-                modifier = Modifier.clickable { exportDebugLogsLauncher.launch(viewModel.debugLogFileName) }
+                modifier = Modifier.clickable { exportDebugLogsLauncher.launch(vm.debugLogFileName) }
            )
            val clipboard = remember { context.getSystemService<ClipboardManager>()!! }
            val deviceContent = """
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorSettingsScreen.kt
@@ -51,7 +51,7 @@ import org.koin.androidx.compose.koinViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun ContributorSettingsScreen(
+fun ContributorScreen(
    onBackClick: () -> Unit,
    viewModel: ContributorViewModel = koinViewModel()
 ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperSettingsScreen.kt
@@ -12,23 +12,19 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
-import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.GroupHeader
-import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.DeveloperOptionsViewModel
 import org.koin.androidx.compose.koinViewModel
-import org.koin.compose.koinInject

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun DeveloperSettingsScreen(
+fun DeveloperOptionsScreen(
    onBackClick: () -> Unit,
    vm: DeveloperOptionsViewModel = koinViewModel()
 ) {
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-    val prefs: PreferencesManager = koinInject()

    Scaffold(
        topBar = {
@@ -41,20 +37,13 @@ fun DeveloperSettingsScreen(
        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
    ) { paddingValues ->
        Column(modifier = Modifier.padding(paddingValues)) {
-            GroupHeader(stringResource(R.string.manager))
-            BooleanItem(
-                preference = prefs.showDeveloperSettings,
-                headline = R.string.developer_options,
-                description = R.string.developer_options_description,
-            )
-
-            GroupHeader(stringResource(R.string.patches))
+            GroupHeader(stringResource(R.string.patch_bundles_section))
            SettingsListItem(
-                headlineContent = stringResource(R.string.patches_force_download),
+                headlineContent = stringResource(R.string.patch_bundles_force_download),
                modifier = Modifier.clickable(onClick = vm::redownloadBundles)
            )
            SettingsListItem(
-                headlineContent = stringResource(R.string.patches_reset),
+                headlineContent = stringResource(R.string.patch_bundles_reset),
                modifier = Modifier.clickable(onClick = vm::redownloadBundles)
            )
        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
@@ -2,13 +2,13 @@ package app.revanced.manager.ui.screen.settings

 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -18,7 +18,9 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
+import androidx.compose.material3.pulltorefresh.pullToRefresh
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -26,11 +28,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
 import app.revanced.manager.network.downloader.DownloaderPluginState
@@ -39,7 +43,6 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ExceptionViewerDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.DownloadsViewModel
@@ -52,20 +55,10 @@ fun DownloadsSettingsScreen(
    onBackClick: () -> Unit,
    viewModel: DownloadsViewModel = koinViewModel()
 ) {
+    val pullRefreshState = rememberPullToRefreshState()
    val downloadedApps by viewModel.downloadedApps.collectAsStateWithLifecycle(emptyList())
    val pluginStates by viewModel.downloaderPluginStates.collectAsStateWithLifecycle()
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
-
-    if (showDeleteConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDeleteConfirmationDialog = false },
-            onConfirm = { viewModel.deleteApps() },
-            title = stringResource(R.string.downloader_plugin_delete_apps_title),
-            description = stringResource(R.string.downloader_plugin_delete_apps_description),
-            icon = Icons.Outlined.Delete
-        )
-    }

    Scaffold(
        topBar = {
@@ -75,7 +68,7 @@ fun DownloadsSettingsScreen(
                onBackClick = onBackClick,
                actions = {
                    if (viewModel.appSelection.isNotEmpty()) {
-                        IconButton(onClick = { showDeleteConfirmationDialog = true }) {
+                        IconButton(onClick = { viewModel.deleteApps() }) {
                            Icon(Icons.Default.Delete, stringResource(R.string.delete))
                        }
                    }
@@ -84,138 +77,152 @@ fun DownloadsSettingsScreen(
        },
        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
    ) { paddingValues ->
-        PullToRefreshBox(
-            onRefresh = viewModel::refreshPlugins,
-            isRefreshing = viewModel.isRefreshingPlugins,
-            modifier = Modifier.padding(paddingValues)
+        Box(
+            contentAlignment = Alignment.TopCenter,
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxWidth()
+                .zIndex(1f)
        ) {
-            LazyColumnWithScrollbar(
-                modifier = Modifier.fillMaxSize()
-            ) {
-                item {
-                    GroupHeader(stringResource(R.string.downloader_plugins))
-                }
-                pluginStates.forEach { (packageName, state) ->
-                    item(key = packageName) {
-                        var showDialog by rememberSaveable {
-                            mutableStateOf(false)
-                        }
+            PullToRefreshDefaults.Indicator(
+                state = pullRefreshState,
+                isRefreshing = viewModel.isRefreshingPlugins
+            )
+        }

-                        fun dismiss() {
-                            showDialog = false
-                        }
+        LazyColumnWithScrollbar(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+                .pullToRefresh(
+                    isRefreshing = viewModel.isRefreshingPlugins,
+                    state = pullRefreshState,
+                    onRefresh = viewModel::refreshPlugins
+                )
+        ) {
+            item {
+                GroupHeader(stringResource(R.string.downloader_plugins))
+            }
+            pluginStates.forEach { (packageName, state) ->
+                item(key = packageName) {
+                    var showDialog by rememberSaveable {
+                        mutableStateOf(false)
+                    }

-                        val packageInfo =
+                    fun dismiss() {
+                        showDialog = false
+                    }
+
+                    val packageInfo =
+                        remember(packageName) {
+                            viewModel.pm.getPackageInfo(
+                                packageName
+                            )
+                        } ?: return@item
+
+                    if (showDialog) {
+                        val signature =
                            remember(packageName) {
-                                viewModel.pm.getPackageInfo(
-                                    packageName
-                                )
-                            } ?: return@item
-
-                        if (showDialog) {
-                            val signature =
-                                remember(packageName) {
-                                    val androidSignature =
-                                        viewModel.pm.getSignature(packageName)
-                                    val hash = MessageDigest.getInstance("SHA-256")
-                                        .digest(androidSignature.toByteArray())
-                                    hash.toHexString(format = HexFormat.UpperCase)
-                                }
-
-                            when (state) {
-                                is DownloaderPluginState.Loaded -> TrustDialog(
-                                    title = R.string.downloader_plugin_revoke_trust_dialog_title,
-                                    body = stringResource(
-                                        R.string.downloader_plugin_trust_dialog_body,
-                                        packageName,
-                                        signature
-                                    ),
-                                    onDismiss = ::dismiss,
-                                    onConfirm = {
-                                        viewModel.revokePluginTrust(packageName)
-                                        dismiss()
-                                    }
-                                )
-
-                                is DownloaderPluginState.Failed -> ExceptionViewerDialog(
-                                    text = remember(state.throwable) {
-                                        state.throwable.stackTraceToString()
-                                    },
-                                    onDismiss = ::dismiss
-                                )
-
-                                is DownloaderPluginState.Untrusted -> TrustDialog(
-                                    title = R.string.downloader_plugin_trust_dialog_title,
-                                    body = stringResource(
-                                        R.string.downloader_plugin_trust_dialog_body,
-                                        packageName,
-                                        signature
-                                    ),
-                                    onDismiss = ::dismiss,
-                                    onConfirm = {
-                                        viewModel.trustPlugin(packageName)
-                                        dismiss()
-                                    }
-                                )
+                                val androidSignature =
+                                    viewModel.pm.getSignature(packageName)
+                                val hash = MessageDigest.getInstance("SHA-256")
+                                    .digest(androidSignature.toByteArray())
+                                hash.toHexString(format = HexFormat.UpperCase)
                            }
-                        }

-                        SettingsListItem(
-                            modifier = Modifier.clickable { showDialog = true },
-                            headlineContent = {
-                                AppLabel(
-                                    packageInfo = packageInfo,
-                                    style = MaterialTheme.typography.titleLarge
-                                )
-                            },
-                            supportingContent = stringResource(
-                                when (state) {
-                                    is DownloaderPluginState.Loaded -> R.string.downloader_plugin_state_trusted
-                                    is DownloaderPluginState.Failed -> R.string.downloader_plugin_state_failed
-                                    is DownloaderPluginState.Untrusted -> R.string.downloader_plugin_state_untrusted
+                        when (state) {
+                            is DownloaderPluginState.Loaded -> TrustDialog(
+                                title = R.string.downloader_plugin_revoke_trust_dialog_title,
+                                body = stringResource(
+                                    R.string.downloader_plugin_trust_dialog_body,
+                                    packageName,
+                                    signature
+                                ),
+                                onDismiss = ::dismiss,
+                                onConfirm = {
+                                    viewModel.revokePluginTrust(packageName)
+                                    dismiss()
                                }
-                            ),
-                            trailingContent = { Text(packageInfo.versionName!!) }
-                        )
-                    }
-                }
-                if (pluginStates.isEmpty()) {
-                    item {
-                        Text(
-                            stringResource(R.string.downloader_no_plugins_installed),
-                            modifier = Modifier.fillMaxWidth(),
-                            textAlign = TextAlign.Center
-                        )
-                    }
-                }
+                            )

-                item {
-                    GroupHeader(stringResource(R.string.downloaded_apps))
-                }
-                items(downloadedApps, key = { it.packageName to it.version }) { app ->
-                    val selected = app in viewModel.appSelection
+                            is DownloaderPluginState.Failed -> ExceptionViewerDialog(
+                                text = remember(state.throwable) {
+                                    state.throwable.stackTraceToString()
+                                },
+                                onDismiss = ::dismiss
+                            )
+
+                            is DownloaderPluginState.Untrusted -> TrustDialog(
+                                title = R.string.downloader_plugin_trust_dialog_title,
+                                body = stringResource(
+                                    R.string.downloader_plugin_trust_dialog_body,
+                                    packageName,
+                                    signature
+                                ),
+                                onDismiss = ::dismiss,
+                                onConfirm = {
+                                    viewModel.trustPlugin(packageName)
+                                    dismiss()
+                                }
+                            )
+                        }
+                    }

                    SettingsListItem(
-                        modifier = Modifier.clickable { viewModel.toggleApp(app) },
-                        headlineContent = app.packageName,
-                        leadingContent = (@Composable {
-                            HapticCheckbox(
-                                checked = selected,
-                                onCheckedChange = { viewModel.toggleApp(app) }
+                        modifier = Modifier.clickable { showDialog = true },
+                        headlineContent = {
+                            AppLabel(
+                                packageInfo = packageInfo,
+                                style = MaterialTheme.typography.titleLarge
                            )
-                        }).takeIf { viewModel.appSelection.isNotEmpty() },
-                        supportingContent = app.version,
-                        tonalElevation = if (selected) 8.dp else 0.dp
+                        },
+                        supportingContent = stringResource(
+                            when (state) {
+                                is DownloaderPluginState.Loaded -> R.string.downloader_plugin_state_trusted
+                                is DownloaderPluginState.Failed -> R.string.downloader_plugin_state_failed
+                                is DownloaderPluginState.Untrusted -> R.string.downloader_plugin_state_untrusted
+                            }
+                        ),
+                        trailingContent = { Text(packageInfo.versionName!!) }
                    )
                }
-                if (downloadedApps.isEmpty()) {
-                    item {
-                        Text(
-                            stringResource(R.string.downloader_settings_no_apps),
-                            modifier = Modifier.fillMaxWidth(),
-                            textAlign = TextAlign.Center
+            }
+            if (pluginStates.isEmpty()) {
+                item {
+                    Text(
+                        stringResource(R.string.downloader_no_plugins_installed),
+                        modifier = Modifier.fillMaxWidth(),
+                        textAlign = TextAlign.Center
+                    )
+                }
+            }
+
+            item {
+                GroupHeader(stringResource(R.string.downloaded_apps))
+            }
+            items(downloadedApps, key = { it.packageName to it.version }) { app ->
+                val selected = app in viewModel.appSelection
+
+                SettingsListItem(
+                    modifier = Modifier.clickable { viewModel.toggleApp(app) },
+                    headlineContent = app.packageName,
+                    leadingContent = (@Composable {
+                        HapticCheckbox(
+                            checked = selected,
+                            onCheckedChange = { viewModel.toggleApp(app) }
                        )
-                    }
+                    }).takeIf { viewModel.appSelection.isNotEmpty() },
+                    supportingContent = app.version,
+                    tonalElevation = if (selected) 8.dp else 0.dp
+                )
+            }
+            if (downloadedApps.isEmpty()) {
+                item {
+                    Text(
+                        stringResource(R.string.downloader_settings_no_apps),
+                        modifier = Modifier.fillMaxWidth(),
+                        textAlign = TextAlign.Center
+                    )
                }
            }
        }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt
@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Key
-import androidx.compose.material.icons.outlined.WarningAmber
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -29,7 +28,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -44,14 +42,11 @@ import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.PasswordField
 import app.revanced.manager.ui.component.bundle.BundleSelector
-import app.revanced.manager.ui.component.settings.ExpandableSettingListItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.ImportExportViewModel
-import app.revanced.manager.ui.viewmodel.ResetDialogState
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.launch
@@ -64,8 +59,6 @@ fun ImportExportSettingsScreen(
    vm: ImportExportViewModel = koinViewModel()
 ) {
    val context = LocalContext.current
-    val coroutineScope = rememberCoroutineScope()
-    var selectorDialog by rememberSaveable { mutableStateOf<(@Composable () -> Unit)?>(null) }

    val importKeystoreLauncher =
        rememberLauncherForActivityResult(contract = ActivityResultContracts.GetContent()) {
@@ -77,7 +70,6 @@ fun ImportExportSettingsScreen(
        }

    val patchBundles by vm.patchBundles.collectAsStateWithLifecycle(initialValue = emptyList())
-    val packagesWithSelections by vm.packagesWithSelection.collectAsStateWithLifecycle(initialValue = emptySet())
    val packagesWithOptions by vm.packagesWithOptions.collectAsStateWithLifecycle(initialValue = emptySet())

    vm.selectionAction?.let { action ->
@@ -115,20 +107,6 @@ fun ImportExportSettingsScreen(
        )
    }

-    vm.resetDialogState?.let {
-        with(vm.resetDialogState!!) {
-            ConfirmDialog(
-                onDismiss = { vm.resetDialogState = null },
-                onConfirm = onConfirm,
-                title = stringResource(titleResId),
-                description = dialogOptionName?.let {
-                    stringResource(descriptionResId, it)
-                } ?: stringResource(descriptionResId),
-                icon = Icons.Outlined.WarningAmber
-            )
-        }
-    }
-
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())

    Scaffold(
@@ -146,7 +124,28 @@ fun ImportExportSettingsScreen(
                .fillMaxSize()
                .padding(paddingValues)
        ) {
-            selectorDialog?.invoke()
+            var showPackageSelector by rememberSaveable {
+                mutableStateOf(false)
+            }
+            var showBundleSelector by rememberSaveable {
+                mutableStateOf(false)
+            }
+
+            if (showPackageSelector) {
+                PackageSelector(packages = packagesWithOptions) { selected ->
+                    selected?.let(vm::resetOptionsForPackage)
+
+                    showPackageSelector = false
+                }
+            }
+
+            if (showBundleSelector) {
+                BundleSelector(bundles = patchBundles) { bundle ->
+                    bundle?.let(vm::clearOptionsForBundle)
+
+                    showBundleSelector = false
+                }
+            }

            GroupHeader(stringResource(R.string.import_))
            GroupItem(
@@ -182,126 +181,32 @@ fun ImportExportSettingsScreen(

            GroupHeader(stringResource(R.string.reset))
            GroupItem(
-                onClick = {
-                    vm.resetDialogState = ResetDialogState.Keystore {
-                        vm.regenerateKeystore()
-                    }
-                },
+                onClick = vm::regenerateKeystore,
                headline = R.string.regenerate_keystore,
                description = R.string.regenerate_keystore_description
            )
-
-            ExpandableSettingListItem(
-                headlineContent = stringResource(R.string.reset_patch_selection),
-                supportingContent = stringResource(R.string.reset_patch_selection_description),
-                expandableContent = {
-                    GroupItem(
-                        onClick = {
-                            vm.resetDialogState = ResetDialogState.PatchSelectionAll {
-                                vm.resetSelection()
-                            }
-                        },
-                        headline = R.string.patch_selection_reset_all,
-                        description = R.string.patch_selection_reset_all_description
-                    )
-
-                    GroupItem(
-                        onClick = {
-                            selectorDialog = {
-                                PackageSelector(packages = packagesWithSelections) { packageName ->
-                                    packageName?.also {
-                                        vm.resetDialogState =
-                                            ResetDialogState.PatchSelectionPackage(packageName) {
-                                                vm.resetSelectionForPackage(packageName)
-                                            }
-                                    }
-                                    selectorDialog = null
-                                }
-                            }
-                        },
-                        headline = R.string.patch_selection_reset_package,
-                        description = R.string.patch_selection_reset_package_description
-                    )
-
-                    if (patchBundles.isNotEmpty()) {
-                        GroupItem(
-                            onClick = {
-                                selectorDialog = {
-                                    BundleSelector(sources = patchBundles) { src ->
-                                        src?.also {
-                                            coroutineScope.launch {
-                                                vm.resetDialogState =
-                                                    ResetDialogState.PatchSelectionBundle(it.name) {
-                                                        vm.resetSelectionForPatchBundle(it)
-                                                    }
-                                            }
-                                        }
-                                        selectorDialog = null
-                                    }
-                                }
-                            },
-                            headline = R.string.patch_selection_reset_patches,
-                            description = R.string.patch_selection_reset_patches_description
-                        )
-                    }
-                }
+            GroupItem(
+                onClick = vm::resetSelection, // TODO: allow resetting selection for specific bundle or package name.
+                headline = R.string.reset_patch_selection,
+                description = R.string.reset_patch_selection_description
            )
-
-            ExpandableSettingListItem(
-                headlineContent = stringResource(R.string.reset_patch_options),
-                supportingContent = stringResource(R.string.reset_patch_options_description),
-                expandableContent = {
-                    GroupItem(
-                        onClick = {
-                            vm.resetDialogState = ResetDialogState.PatchOptionsAll {
-                                vm.resetOptions()
-                            }
-                        }, // TODO: patch options import/export.
-                        headline = R.string.patch_options_reset_all,
-                        description = R.string.patch_options_reset_all_description,
-                    )
-
-                    GroupItem(
-                        onClick = {
-                            selectorDialog = {
-                                PackageSelector(packages = packagesWithOptions) { packageName ->
-                                    packageName?.also {
-                                        vm.resetDialogState =
-                                            ResetDialogState.PatchOptionPackage(packageName) {
-                                                vm.resetOptionsForPackage(packageName)
-                                            }
-                                    }
-                                    selectorDialog = null
-                                }
-                            }
-                        },
-                        headline = R.string.patch_options_reset_package,
-                        description = R.string.patch_options_reset_package_description
-                    )
-
-                    if (patchBundles.isNotEmpty()) {
-                        GroupItem(
-                            onClick = {
-                                selectorDialog = {
-                                    BundleSelector(sources = patchBundles) { src ->
-                                        src?.also {
-                                            coroutineScope.launch {
-                                                vm.resetDialogState =
-                                                    ResetDialogState.PatchOptionBundle(src.name) {
-                                                        vm.resetOptionsForBundle(src)
-                                                    }
-                                            }
-                                        }
-                                        selectorDialog = null
-                                    }
-                                }
-                            },
-                            headline = R.string.patch_options_reset_patches,
-                            description = R.string.patch_options_reset_patches_description,
-                        )
-                    }
-                }
+            GroupItem(
+                onClick = vm::resetOptions, // TODO: patch options import/export.
+                headline = R.string.patch_options_reset_all,
+                description = R.string.patch_options_reset_all_description,
            )
+            GroupItem(
+                onClick = { showPackageSelector = true },
+                headline = R.string.patch_options_reset_package,
+                description = R.string.patch_options_reset_package_description
+            )
+            if (patchBundles.size > 1) {
+                GroupItem(
+                    onClick = { showBundleSelector = true },
+                    headline = R.string.patch_options_reset_bundle,
+                    description = R.string.patch_options_reset_bundle_description,
+                )
+            }
        }
    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt
@@ -15,11 +15,10 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.Scrollbar
 import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
 import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
-import com.mikepenz.aboutlibraries.ui.compose.libraryColors

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun LicensesSettingsScreen(
+fun LicensesScreen(
    onBackClick: () -> Unit,
 ) {
    AppScaffold(
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsSettingsScreen.kt
@@ -27,7 +27,7 @@ import org.koin.androidx.compose.koinViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun ChangelogsSettingsScreen(
+fun ChangelogsScreen(
    onBackClick: () -> Unit,
    vm: ChangelogsViewModel = koinViewModel()
 ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdatesSettingsScreen.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
-import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.UpdatesSettingsViewModel
@@ -51,8 +50,6 @@ fun UpdatesSettingsScreen(
                .fillMaxSize()
                .padding(paddingValues)
        ) {
-            GroupHeader(stringResource(R.string.manager))
-
            SettingsListItem(
                modifier = Modifier.clickable {
                    coroutineScope.launch {
@@ -90,7 +87,7 @@ fun UpdatesSettingsScreen(
            BooleanItem(
                preference = vm.showManagerUpdateDialogOnLaunch,
                headline = R.string.show_manager_update_dialog_on_launch,
-                description = R.string.show_manager_update_dialog_on_launch_description
+                description = R.string.update_checking_manager_description
            )
        }
    }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/AboutViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/AboutViewModel.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.data.platform.NetworkInfo
-import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.network.dto.ReVancedDonationLink
 import app.revanced.manager.network.dto.ReVancedSocial
@@ -28,7 +27,6 @@ import kotlinx.coroutines.withContext
 class AboutViewModel(
    private val reVancedAPI: ReVancedAPI,
    private val network: NetworkInfo,
-    prefs: PreferencesManager,
 ) : ViewModel() {
    var socials by mutableStateOf(emptyList<ReVancedSocial>())
        private set
@@ -39,8 +37,6 @@ class AboutViewModel(
    val isConnected: Boolean
        get() = network.isConnected()

-    val showDeveloperSettings = prefs.showDeveloperSettings
-
    init {
        viewModelScope.launch {
            if (!isConnected) {
@@ -57,8 +53,6 @@ class AboutViewModel(
    }

    companion object {
-        const val DEVELOPER_OPTIONS_TAPS = 5
-
        private val socialIcons = mapOf(
            "Discord" to FontAwesomeIcons.Brands.Discord,
            "GitHub" to FontAwesomeIcons.Brands.Github,
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/BundleListViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/BundleListViewModel.kt
@@ -1,76 +0,0 @@
-package app.revanced.manager.ui.viewmodel
-
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import app.revanced.manager.domain.bundles.PatchBundleSource
-import app.revanced.manager.domain.bundles.RemotePatchBundle
-import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.util.mutableStateSetOf
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-
-class BundleListViewModel : ViewModel(), KoinComponent {
-    private val patchBundleRepository: PatchBundleRepository = get()
-    val patchCounts = patchBundleRepository.patchCountsFlow
-    var isRefreshing by mutableStateOf(false)
-        private set
-
-    val sources = combine(
-        patchBundleRepository.sources,
-        patchBundleRepository.patchCountsFlow
-    ) { sources, patchCounts ->
-        isRefreshing = false
-        sources.sortedByDescending { patchCounts[it.uid] ?: 0 }
-    }
-
-    val selectedSources = mutableStateSetOf<Int>()
-
-    fun refresh() = viewModelScope.launch {
-        isRefreshing = true
-        patchBundleRepository.reload()
-    }
-
-    private suspend fun getSelectedSources() = patchBundleRepository.sources
-        .first()
-        .filter { it.uid in selectedSources }
-        .also {
-            selectedSources.clear()
-        }
-
-    fun handleEvent(event: Event) {
-        when (event) {
-            Event.CANCEL -> selectedSources.clear()
-            Event.DELETE_SELECTED -> viewModelScope.launch {
-                patchBundleRepository.remove(*getSelectedSources().toTypedArray())
-            }
-
-            Event.UPDATE_SELECTED -> viewModelScope.launch {
-                patchBundleRepository.update(
-                    *getSelectedSources().filterIsInstance<RemotePatchBundle>().toTypedArray(),
-                    showToast = true,
-                )
-            }
-        }
-    }
-
-    fun delete(src: PatchBundleSource) =
-        viewModelScope.launch { patchBundleRepository.remove(src) }
-
-    fun update(src: PatchBundleSource) = viewModelScope.launch {
-        if (src !is RemotePatchBundle) return@launch
-
-        patchBundleRepository.update(src, showToast = true)
-    }
-
-    enum class Event {
-        DELETE_SELECTED,
-        UPDATE_SELECTED,
-        CANCEL,
-    }
-}
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
@@ -1,6 +1,5 @@
 package app.revanced.manager.ui.viewmodel

-import android.annotation.SuppressLint
 import android.app.Application
 import android.content.ContentResolver
 import android.net.Uri
@@ -25,10 +24,8 @@ import app.revanced.manager.network.api.ReVancedAPI
 import app.revanced.manager.util.PM
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.uiSafe
-import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch

 class DashboardViewModel(
@@ -41,12 +38,13 @@ class DashboardViewModel(
    private val pm: PM,
 ) : ViewModel() {
    val availablePatches =
-        patchBundleRepository.bundleInfoFlow.map { it.values.sumOf { bundle -> bundle.patches.size } }
+        patchBundleRepository.bundles.map { it.values.sumOf { bundle -> bundle.patches.size } }
    private val contentResolver: ContentResolver = app.contentResolver
    private val powerManager = app.getSystemService<PowerManager>()!!
+    val sources = patchBundleRepository.sources
+    val selectedSources = mutableStateListOf<PatchBundleSource>()

-    val newDownloaderPluginsAvailable =
-        downloaderPluginRepository.newPluginPackageNames.map { it.isNotEmpty() }
+    val newDownloaderPluginsAvailable = downloaderPluginRepository.newPluginPackageNames.map { it.isNotEmpty() }

    /**
     * Android 11 kills the app process after granting the "install apps" permission, which is a problem for the patcher screen.
@@ -61,9 +59,6 @@ class DashboardViewModel(
    var showBatteryOptimizationsWarning by mutableStateOf(false)
        private set

-    private val bundleListEventsChannel = Channel<BundleListViewModel.Event>()
-    val bundleListEventsFlow = bundleListEventsChannel.receiveAsFlow()
-
    init {
        viewModelScope.launch {
            checkForManagerUpdates()
@@ -75,6 +70,10 @@ class DashboardViewModel(
        downloaderPluginRepository.acknowledgeAllNewPlugins()
    }

+    fun dismissUpdateDialog() {
+        updatedManagerVersion = null
+    }
+
    private suspend fun checkForManagerUpdates() {
        if (!prefs.managerAutoUpdates.get() || !networkInfo.isConnected()) return

@@ -84,8 +83,7 @@ class DashboardViewModel(
    }

    fun updateBatteryOptimizationsWarning() {
-        showBatteryOptimizationsWarning =
-            !powerManager.isIgnoringBatteryOptimizations(app.packageName)
+        showBatteryOptimizationsWarning = !powerManager.isIgnoringBatteryOptimizations(app.packageName)
    }

    fun setShowManagerUpdateDialogOnLaunch(value: Boolean) {
@@ -114,20 +112,36 @@ class DashboardViewModel(
        }
    }

-    private fun sendEvent(event: BundleListViewModel.Event) {
-        viewModelScope.launch { bundleListEventsChannel.send(event) }
+
+    fun cancelSourceSelection() {
+        selectedSources.clear()
    }

-    fun cancelSourceSelection() = sendEvent(BundleListViewModel.Event.CANCEL)
-    fun updateSources() = sendEvent(BundleListViewModel.Event.UPDATE_SELECTED)
-    fun deleteSources() = sendEvent(BundleListViewModel.Event.DELETE_SELECTED)
+    fun createLocalSource(patchBundle: Uri) =
+        viewModelScope.launch {
+            contentResolver.openInputStream(patchBundle)!!.use { patchesStream ->
+                patchBundleRepository.createLocal(patchesStream)
+            }
+        }

-    @SuppressLint("Recycle")
-    fun createLocalSource(patchBundle: Uri) = viewModelScope.launch {
-        patchBundleRepository.createLocal { contentResolver.openInputStream(patchBundle)!! }
-    }
+    fun createRemoteSource(apiUrl: String, autoUpdate: Boolean) =
+        viewModelScope.launch { patchBundleRepository.createRemote(apiUrl, autoUpdate) }

-    fun createRemoteSource(apiUrl: String, autoUpdate: Boolean) = viewModelScope.launch {
-        patchBundleRepository.createRemote(apiUrl, autoUpdate)
+    fun delete(bundle: PatchBundleSource) =
+        viewModelScope.launch { patchBundleRepository.remove(bundle) }
+
+    fun update(bundle: PatchBundleSource) = viewModelScope.launch {
+        if (bundle !is RemotePatchBundle) return@launch
+
+        uiSafe(
+            app,
+            R.string.source_download_fail,
+            RemotePatchBundle.updateFailMsg
+        ) {
+            if (bundle.update())
+                app.toast(app.getString(R.string.bundle_update_success, bundle.getName()))
+            else
+                app.toast(app.getString(R.string.bundle_update_unavailable, bundle.getName()))
+        }
    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/DeveloperOptionsViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/DeveloperOptionsViewModel.kt
@@ -16,7 +16,7 @@ class DeveloperOptionsViewModel(
    private val patchBundleRepository: PatchBundleRepository
 ) : ViewModel() {
    fun redownloadBundles() = viewModelScope.launch {
-        uiSafe(app, R.string.patches_download_fail, RemotePatchBundle.updateFailMsg) {
+        uiSafe(app, R.string.source_download_fail, RemotePatchBundle.updateFailMsg) {
            patchBundleRepository.redownloadRemoteBundles()
        }
    }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/GeneralSettingsViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/GeneralSettingsViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.ui.theme.Theme
-import app.revanced.manager.util.resetListItemColorsCached
 import kotlinx.coroutines.launch

 class GeneralSettingsViewModel(
@@ -12,6 +11,5 @@ class GeneralSettingsViewModel(
 ) : ViewModel() {
    fun setTheme(theme: Theme) = viewModelScope.launch {
        prefs.theme.update(theme)
-        resetListItemColorsCached()
    }
 }
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/ImportExportViewModel.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import android.net.Uri
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.StringRes
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -35,59 +34,6 @@ import java.nio.file.StandardCopyOption
 import kotlin.io.path.deleteExisting
 import kotlin.io.path.inputStream

-sealed class ResetDialogState(
-    @StringRes val titleResId: Int,
-    @StringRes val descriptionResId: Int,
-    val onConfirm: () -> Unit,
-    val dialogOptionName: String? = null
-) {
-    class Keystore(onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.regenerate_keystore,
-        descriptionResId = R.string.regenerate_keystore_dialog_description,
-        onConfirm = onConfirm
-    )
-
-    class PatchSelectionAll(onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_selection_reset_all,
-        descriptionResId = R.string.patch_selection_reset_all_dialog_description,
-        onConfirm = onConfirm
-    )
-
-    class PatchSelectionPackage(dialogOptionName:String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_selection_reset_package,
-        descriptionResId = R.string.patch_selection_reset_package_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-
-    class PatchSelectionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_selection_reset_patches,
-        descriptionResId = R.string.patch_selection_reset_patches_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-
-    class PatchOptionsAll(onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_options_reset_all,
-        descriptionResId = R.string.patch_options_reset_all_dialog_description,
-        onConfirm = onConfirm
-    )
-
-    class PatchOptionPackage(dialogOptionName:String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_options_reset_package,
-        descriptionResId = R.string.patch_options_reset_package_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-
-    class PatchOptionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState(
-        titleResId = R.string.patch_options_reset_patches,
-        descriptionResId = R.string.patch_options_reset_patches_dialog_description,
-        onConfirm = onConfirm,
-        dialogOptionName = dialogOptionName
-    )
-}
-
@OptIn(ExperimentalSerializationApi::class)
 class ImportExportViewModel(
    private val app: Application,
@@ -105,18 +51,15 @@ class ImportExportViewModel(
    private var keystoreImportPath by mutableStateOf<Path?>(null)
    val showCredentialsDialog by derivedStateOf { keystoreImportPath != null }

-    var resetDialogState by mutableStateOf<ResetDialogState?>(null)
-
    val packagesWithOptions = optionsRepository.getPackagesWithSavedOptions()
-    val packagesWithSelection = selectionRepository.getPackagesWithSavedSelection()

    fun resetOptionsForPackage(packageName: String) = viewModelScope.launch {
-        optionsRepository.resetOptionsForPackage(packageName)
+        optionsRepository.clearOptionsForPackage(packageName)
        app.toast(app.getString(R.string.patch_options_reset_toast))
    }

-    fun resetOptionsForBundle(patchBundle: PatchBundleSource) = viewModelScope.launch {
-        optionsRepository.resetOptionsForPatchBundle(patchBundle.uid)
+    fun clearOptionsForBundle(patchBundle: PatchBundleSource) = viewModelScope.launch {
+        optionsRepository.clearOptionsForPatchBundle(patchBundle.uid)
        app.toast(app.getString(R.string.patch_options_reset_toast))
    }

@@ -192,16 +135,6 @@ class ImportExportViewModel(
        app.toast(app.getString(R.string.reset_patch_selection_success))
    }

-    fun resetSelectionForPackage(packageName: String) = viewModelScope.launch {
-        selectionRepository.resetSelectionForPackage(packageName)
-        app.toast(app.getString(R.string.reset_patch_selection_success))
-    }
-
-    fun resetSelectionForPatchBundle(patchBundle: PatchBundleSource) = viewModelScope.launch {
-        selectionRepository.resetSelectionForPatchBundle(patchBundle.uid)
-        app.toast(app.getString(R.string.reset_patch_selection_success))
-    }
-
    fun executeSelectionAction(target: Uri) = viewModelScope.launch {
        val source = selectedBundle!!
        val action = selectionAction!!
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt
@@ -17,9 +17,10 @@ import androidx.lifecycle.viewmodel.compose.saveable
 import app.revanced.manager.R
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.domain.repository.PatchBundleRepository
-import app.revanced.manager.patcher.patch.PatchBundleInfo
-import app.revanced.manager.patcher.patch.PatchBundleInfo.Extensions.toPatchSelection
 import app.revanced.manager.patcher.patch.PatchInfo
+import app.revanced.manager.ui.model.BundleInfo
+import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
+import app.revanced.manager.ui.model.BundleInfo.Extensions.toPatchSelection
 import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
@@ -54,6 +55,8 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
    private val packageName = input.app.packageName
    val appVersion = input.app.version

+    var pendingUniversalPatchAction by mutableStateOf<(() -> Unit)?>(null)
+
    var selectionWarningEnabled by mutableStateOf(true)
        private set
    var universalPatchWarningEnabled by mutableStateOf(true)
@@ -62,24 +65,22 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
    val allowIncompatiblePatches =
        get<PreferencesManager>().disablePatchVersionCompatCheck.getBlocking()
    val bundlesFlow =
-        get<PatchBundleRepository>().scopedBundleInfoFlow(packageName, input.app.version)
+        get<PatchBundleRepository>().bundleInfoFlow(packageName, input.app.version)

    init {
        viewModelScope.launch {
-            if (prefs.disableUniversalPatchCheck.get()) {
-                universalPatchWarningEnabled = false
-            }
+            universalPatchWarningEnabled = !prefs.disableUniversalPatchWarning.get()

            if (prefs.disableSelectionWarning.get()) {
                selectionWarningEnabled = false
                return@launch
            }

-            fun PatchBundleInfo.Scoped.hasDefaultPatches() =
+            fun BundleInfo.hasDefaultPatches() =
                patchSequence(allowIncompatiblePatches).any { it.include }

            // Don't show the warning if there are no default patches.
-            selectionWarningEnabled = bundlesFlow.first().any(PatchBundleInfo.Scoped::hasDefaultPatches)
+            selectionWarningEnabled = bundlesFlow.first().any(BundleInfo::hasDefaultPatches)
        }
    }

@@ -122,7 +123,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
    // This is for the required options screen.
    private val requiredOptsPatchesDeferred = viewModelScope.async(start = CoroutineStart.LAZY) {
        bundlesFlow.first().map { bundle ->
-            bundle to bundle.patchSequence(allowIncompatiblePatches).filter { patch ->
+            bundle to bundle.all.filter { patch ->
                val opts by lazy {
                    getOptions(bundle.uid, patch).orEmpty()
                }
@@ -135,14 +136,14 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
    }
    val requiredOptsPatches = flow { emit(requiredOptsPatchesDeferred.await()) }

-    fun selectionIsValid(bundles: List<PatchBundleInfo.Scoped>) = bundles.any { bundle ->
+    fun selectionIsValid(bundles: List<BundleInfo>) = bundles.any { bundle ->
        bundle.patchSequence(allowIncompatiblePatches).any { patch ->
            isSelected(bundle.uid, patch)
        }
    }

    fun isSelected(bundle: Int, patch: PatchInfo) = customPatchSelection?.let { selection ->
-        selection[bundle]?.contains(patch.name) == true
+        selection[bundle]?.contains(patch.name) ?: false
    } ?: patch.include

    fun togglePatch(bundle: Int, patch: PatchInfo) = viewModelScope.launch {
@@ -159,6 +160,17 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
        customPatchSelection = selection.put(bundle, newPatches)
    }

+    fun confirmUniversalPatchWarning() {
+        universalPatchWarningEnabled = false
+
+        pendingUniversalPatchAction?.invoke()
+        pendingUniversalPatchAction = null
+    }
+
+    fun dismissUniversalPatchWarning() {
+        pendingUniversalPatchAction = null
+    }
+
    fun reset() {
        patchOptions.clear()
        customPatchSelection = null
--- a/Show More
+++ b/Show More