feat: add required options screen

2025-07-03 07:29:43 +08:00 · 2025-01-03 22:20:01 +01:00
103 changed files with 2321 additions and 2012 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,25 +0,0 @@
-name: Build pull request
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - dev
-
-jobs:
-  release:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
-
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build --no-daemon
--- 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@v4
-
-      - 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,49 @@
+name: Release Build
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    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: 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,64 +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@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
-
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Setup keystore
-        run: |
-          echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
-
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v4
-        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@v2
-        with:
-          subject-path: build/app/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/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
@ -13,8 +13,8 @@
  <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" />
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo-round.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://github.com/ReVanced">
@ -58,46 +58,21 @@
   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.
+| Version | Branch      | Supported          |
+| ------- | ------------|------------------- |
+| v1.18.0 | main        | :white_check_mark: |
+| latest  | dev         | :white_check_mark: |
+| latest  | compose-dev | :white_check_mark: |

-## 🐞 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
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -13,7 +13,7 @@ plugins {
 android {
    namespace = "app.revanced.manager"
    compileSdk = 35
-    buildToolsVersion = "35.0.1"
+    buildToolsVersion = "35.0.0"

    defaultConfig {
        applicationId = "app.revanced.manager"
@ -27,8 +27,7 @@ android {
    buildTypes {
        debug {
            applicationIdSuffix = ".debug"
-            resValue("string", "app_name", "ReVanced Manager (Debug)")
-            isPseudoLocalesEnabled = true
+            resValue("string", "app_name", "ReVanced Manager (dev)")

            buildConfigField("long", "BUILD_ID", "${Random.nextLong()}L")
        }
@ -40,21 +39,10 @@ android {
                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)")
+            if (project.hasProperty("signAsDebug")) {
+                applicationIdSuffix = ".debug"
+                resValue("string", "app_name", "ReVanced Manager Debug")
                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")
@ -72,17 +60,15 @@ android {
    }

    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",
-            )
-        )
+        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
        }
@ -172,7 +158,7 @@ dependencies {
    implementation(libs.revanced.library)

    // Downloader plugins
-    implementation(libs.plugin.api)
+    implementation(project(":downloader-plugin"))

    // Native processes
    implementation(libs.kotlin.process)
--- a/app/src/main/java/app/revanced/manager/MainActivity.kt
+++ b/app/src/main/java/app/revanced/manager/MainActivity.kt
@ -1,16 +1,11 @@
 package app.revanced.manager

-import android.content.ActivityNotFoundException
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.activity.ComponentActivity
-import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@ -25,32 +20,10 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import app.revanced.manager.ui.model.navigation.AppSelector
-import app.revanced.manager.ui.model.navigation.ComplexParameter
-import app.revanced.manager.ui.model.navigation.Dashboard
-import app.revanced.manager.ui.model.navigation.InstalledApplicationInfo
-import app.revanced.manager.ui.model.navigation.Patcher
-import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
-import app.revanced.manager.ui.model.navigation.Settings
-import app.revanced.manager.ui.model.navigation.Update
-import app.revanced.manager.ui.screen.AppSelectorScreen
-import app.revanced.manager.ui.screen.DashboardScreen
-import app.revanced.manager.ui.screen.InstalledAppInfoScreen
-import app.revanced.manager.ui.screen.PatcherScreen
-import app.revanced.manager.ui.screen.PatchesSelectorScreen
-import app.revanced.manager.ui.screen.RequiredOptionsScreen
-import app.revanced.manager.ui.screen.SelectedAppInfoScreen
-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.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.model.navigation.*
+import app.revanced.manager.ui.screen.*
+import app.revanced.manager.ui.screen.settings.*
+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
@ -73,22 +46,12 @@ class MainActivity : ComponentActivity() {
        installSplashScreen()

        val vm: MainViewModel = getActivityViewModel()
+        vm.importLegacySettings(this)

        setContent {
-            val launcher = rememberLauncherForActivityResult(
-                ActivityResultContracts.StartActivityForResult(),
-                onResult = vm::applyLegacySettings
-            )
            val theme by vm.prefs.theme.getAsState()
            val dynamicColor by vm.prefs.dynamicColor.getAsState()

-            EventEffect(vm.legacyImportActivityFlow) {
-                try {
-                    launcher.launch(it)
-                } catch (_: ActivityNotFoundException) {
-                }
-            }
-
            ReVancedManagerTheme(
                darkTheme = theme == Theme.SYSTEM && isSystemInDarkTheme() || theme == Theme.DARK,
                dynamicColor = dynamicColor
@ -113,10 +76,6 @@ private fun ReVancedManager(vm: MainViewModel) {
    NavHost(
        navController = navController,
        startDestination = Dashboard,
-        enterTransition = { slideInHorizontally(initialOffsetX = { it }) },
-        exitTransition = { slideOutHorizontally(targetOffsetX = { -it / 3 }) },
-        popEnterTransition = { slideInHorizontally(initialOffsetX = { -it / 3 }) },
-        popExitTransition = { slideOutHorizontally(targetOffsetX = { it }) },
    ) {
        composable<Dashboard> {
            DashboardScreen(
@ -164,7 +123,7 @@ private fun ReVancedManager(vm: MainViewModel) {
                        }
                    }
                },
-                viewModel = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
+                vm = koinViewModel { parametersOf(it.getComplexArg<Patcher.ViewModelParams>()) }
            )
        }

@ -277,10 +236,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 +260,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/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
@ -29,6 +28,4 @@ class PreferencesManager(
    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/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?) =
@ -180,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/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
@ -97,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()
@ -111,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/ui/component/AppScaffold.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt
@ -4,20 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@ -55,14 +44,9 @@ fun AppTopBar(
        )
    },
    actions: @Composable (RowScope.() -> Unit) = {},
-    scrollBehavior: TopAppBarScrollBehavior? = null,
-    applyContainerColor: Boolean = false
+    scrollBehavior: TopAppBarScrollBehavior? = null
 ) {
-    val containerColor = if (applyContainerColor) {
-        MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
-    } else {
-        Color.Unspecified
-    }
+    val containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)

    TopAppBar(
        title = { Text(title) },
@ -81,41 +65,3 @@ fun AppTopBar(
    )
 }

-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AppTopBar(
-    title: @Composable () -> Unit,
-    onBackClick: (() -> Unit)? = null,
-    backIcon: @Composable (() -> Unit) = @Composable {
-        Icon(
-            imageVector = Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(
-                R.string.back
-            )
-        )
-    },
-    actions: @Composable (RowScope.() -> Unit) = {},
-    scrollBehavior: TopAppBarScrollBehavior? = null,
-    applyContainerColor: Boolean = false
-) {
-    val containerColor = if (applyContainerColor) {
-        MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
-    } else {
-        Color.Unspecified
-    }
-
-    TopAppBar(
-        title = title,
-        scrollBehavior = scrollBehavior,
-        navigationIcon = {
-            if (onBackClick != null) {
-                IconButton(onClick = onBackClick) {
-                    backIcon()
-                }
-            }
-        },
-        actions = actions,
-        colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = containerColor
-        )
-    )
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/AvailableUpdateDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AvailableUpdateDialog.kt
@ -12,12 +12,11 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
-import app.revanced.manager.util.transparentListItemColors

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun AvailableUpdateDialog(
    onDismiss: () -> Unit,
@ -71,11 +70,10 @@ fun AvailableUpdateDialog(
                        Text(stringResource(R.string.never_show_again))
                    },
                    leadingContent = {
-                        CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
+                        CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
                            HapticCheckbox(checked = dontShowAgain, onCheckedChange = { dontShowAgain = it })
                        }
-                    },
-                    colors = transparentListItemColors
+                    }
                )
            }
        },
--- a/app/src/main/java/app/revanced/manager/ui/component/CheckedFilterChip.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/CheckedFilterChip.kt
@ -1,61 +0,0 @@
-package app.revanced.manager.ui.component
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.expandIn
-import androidx.compose.animation.shrinkOut
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Done
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.FilterChipDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.SelectableChipColors
-import androidx.compose.material3.SelectableChipElevation
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Shape
-
-@Composable
-fun CheckedFilterChip(
-    selected: Boolean,
-    onClick: () -> Unit,
-    label: @Composable () -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    shape: Shape = FilterChipDefaults.shape,
-    colors: SelectableChipColors = FilterChipDefaults.filterChipColors(),
-    elevation: SelectableChipElevation? = FilterChipDefaults.filterChipElevation(),
-    border: BorderStroke? = FilterChipDefaults.filterChipBorder(enabled, selected),
-    interactionSource: MutableInteractionSource? = null
-) {
-    FilterChip(
-        selected = selected,
-        onClick = onClick,
-        label = label,
-        modifier = modifier,
-        enabled = enabled,
-        leadingIcon = {
-            AnimatedVisibility(
-                visible = selected,
-                enter = expandIn(expandFrom = Alignment.CenterStart),
-                exit = shrinkOut(shrinkTowards = Alignment.CenterStart)
-            ) {
-                Icon(
-                    modifier = Modifier.size(FilterChipDefaults.IconSize),
-                    imageVector = Icons.Filled.Done,
-                    contentDescription = null,
-                )
-            }
-        },
-        trailingIcon = trailingIcon,
-        shape = shape,
-        colors = colors,
-        elevation = elevation,
-        border = border,
-        interactionSource = interactionSource
-    )
-}
--- 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,8 +26,12 @@ 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 = {
--- 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,34 +0,0 @@
-package app.revanced.manager.ui.component
-
-import android.view.WindowManager
-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
-
-private val properties = DialogProperties(
-    usePlatformDefaultWidth = false,
-    dismissOnBackPress = true,
-    decorFitsSystemWindows = false,
-)
-
-@Composable
-fun FullscreenDialog(onDismissRequest: () -> Unit, content: @Composable () -> Unit) {
-    Dialog(
-        onDismissRequest = onDismissRequest,
-        properties = properties
-    ) {
-        val window = (LocalView.current.parent as DialogWindowProvider).window
-        LaunchedEffect(Unit) {
-            window.statusBarColor = Color.Transparent.toArgb()
-            window.navigationBarColor = Color.Transparent.toArgb()
-            window.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
-        }
-
-        content()
-    }
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/SearchBar.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/SearchBar.kt
@ -1,60 +0,0 @@
-package app.revanced.manager.ui.component
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SearchBar
-import androidx.compose.material3.SearchBarColors
-import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.unit.dp
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SearchBar(
-    query: String,
-    onQueryChange: (String) -> Unit,
-    expanded: Boolean,
-    onExpandedChange: (Boolean) -> Unit,
-    placeholder: (@Composable () -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    content: @Composable ColumnScope.() -> Unit
-) {
-    val colors = SearchBarColors(
-        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline
-    )
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    Box(modifier = Modifier.fillMaxWidth()) {
-        SearchBar(
-            modifier = Modifier.align(Alignment.Center),
-            inputField = {
-                SearchBarDefaults.InputField(
-                    modifier = Modifier.sizeIn(minWidth = 380.dp),
-                    query = query,
-                    onQueryChange = onQueryChange,
-                    onSearch = {
-                        keyboardController?.hide()
-                    },
-                    expanded = expanded,
-                    onExpandedChange = onExpandedChange,
-                    placeholder = placeholder,
-                    leadingIcon = leadingIcon,
-                    trailingIcon = trailingIcon
-                )
-            },
-            expanded = expanded,
-            onExpandedChange = onExpandedChange,
-            colors = colors,
-            content = content
-        )
-    }
-}
--- 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
@ -12,18 +12,17 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+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.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.bundles.PatchBundleSource.Extensions.nameState
 import app.revanced.manager.ui.component.ExceptionViewerDialog
-import app.revanced.manager.ui.component.FullscreenDialog
 import kotlinx.coroutines.launch
-import org.koin.compose.koinInject

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -33,8 +32,6 @@ fun BundleInformationDialog(
    bundle: PatchBundleSource,
    onUpdate: () -> Unit,
 ) {
-    val networkInfo = koinInject<NetworkInfo>()
-    val hasNetwork = remember { networkInfo.isConnected() }
    val composableScope = rememberCoroutineScope()
    var viewCurrentBundlePatches by remember { mutableStateOf(false) }
    val isLocal = bundle is LocalPatchBundle
@ -55,8 +52,12 @@ fun BundleInformationDialog(
        )
    }

-    FullscreenDialog(
+    Dialog(
        onDismissRequest = onDismissRequest,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
    ) {
        val bundleName by bundle.nameState

@ -80,7 +81,7 @@ fun BundleInformationDialog(
                                )
                            }
                        }
-                        if (!isLocal && hasNetwork) {
+                        if (!isLocal) {
                            IconButton(onClick = onUpdate) {
                                Icon(
                                    Icons.Outlined.Update,
--- 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
@ -27,9 +26,8 @@ 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.domain.bundles.PatchBundleSource.Extensions.nameState
-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)
@ -44,7 +42,6 @@ fun BundleItem(
    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) {
@ -55,25 +52,15 @@ fun BundleItem(
    if (viewBundleDialogPage) {
        BundleInformationDialog(
            onDismissRequest = { viewBundleDialogPage = false },
-            onDeleteRequest = { showDeleteConfirmationDialog = true },
+            onDeleteRequest = {
+                viewBundleDialogPage = false
+                onDelete()
+            },
            bundle = bundle,
            onUpdate = onUpdate,
        )
    }

-    if (showDeleteConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDeleteConfirmationDialog = false },
-            onConfirm = {
-                onDelete()
-                viewBundleDialogPage = false
-            },
-            title = stringResource(R.string.bundle_delete_single_dialog_title),
-            description = stringResource(R.string.bundle_delete_single_dialog_description, name),
-            icon = Icons.Outlined.Delete
-        )
-    }
-
    ListItem(
        modifier = Modifier
            .height(64.dp)
--- 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
@ -22,12 +22,13 @@ 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.patcher.patch.PatchInfo
 import app.revanced.manager.ui.component.ArrowButton
-import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar

@OptIn(ExperimentalMaterial3Api::class)
@ -40,8 +41,12 @@ fun BundlePatchesDialog(
    var showOptions by rememberSaveable { mutableStateOf(false) }
    val state by bundle.state.collectAsStateWithLifecycle()

-    FullscreenDialog(
+    Dialog(
        onDismissRequest = onDismissRequest,
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true
+        )
    ) {
        Scaffold(
            topBar = {
--- 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
@ -16,7 +16,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AlertDialogExtended
@ -219,7 +218,7 @@ fun ImportBundleStep(
                        ),
                        headlineContent = { Text(stringResource(R.string.auto_update)) },
                        leadingContent = {
-                            CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
+                            CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
                                HapticCheckbox(
                                    checked = autoUpdate,
                                    onCheckedChange = {
--- 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
@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@ -22,25 +21,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.DragHandle
-import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.Edit
-import androidx.compose.material.icons.outlined.Folder
-import androidx.compose.material.icons.outlined.MoreVert
-import androidx.compose.material.icons.outlined.Restore
-import androidx.compose.material.icons.outlined.SelectAll
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisallowComposableCalls
 import androidx.compose.runtime.derivedStateOf
@ -56,15 +38,11 @@ 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.*
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticRadioButton
 import app.revanced.manager.ui.component.haptics.HapticSwitch
@ -74,17 +52,16 @@ import app.revanced.manager.util.saver.snapshotStateListSaver
 import app.revanced.manager.util.saver.snapshotStateSetSaver
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.transparentListItemColors
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.parcelize.Parcelize
 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.rememberReorderableLazyColumnState
-import sh.calvin.reorderable.rememberReorderableLazyListState
 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>,
@ -499,8 +476,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))
            }
@ -527,8 +503,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 = {
@ -622,10 +602,8 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                        interactionSource = interactionSource,
                                        onLongClickLabel = stringResource(R.string.select),
                                        onLongClick = {
-                                            if (!deleteMode) {
-                                                deletionTargets.add(item.key)
-                                                deleteMode = true
-                                            }
+                                            deletionTargets.add(item.key)
+                                            deleteMode = true
                                        },
                                        onClick = {
                                            if (!deleteMode) {
--- 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/settings/Changelog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/settings/Changelog.kt
@ -7,7 +7,10 @@ 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.outlined.NewReleases
+import androidx.compose.material.icons.outlined.CalendarToday
+import androidx.compose.material.icons.outlined.Campaign
+import androidx.compose.material.icons.outlined.FileDownload
+import androidx.compose.material.icons.outlined.Sell
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@ -34,18 +37,28 @@ fun Changelog(
            verticalAlignment = Alignment.CenterVertically
        ) {
            Icon(
-                imageVector = Icons.Outlined.NewReleases,
+                imageVector = Icons.Outlined.Campaign,
                contentDescription = null,
                tint = MaterialTheme.colorScheme.primary,
                modifier = Modifier
                    .size(32.dp)
            )
            Text(
-                "${version.removePrefix("v")} ($publishDate)",
+                version.removePrefix("v"),
                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight(800)),
                color = MaterialTheme.colorScheme.primary,
            )
        }
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            Tag(
+                Icons.Outlined.CalendarToday,
+                publishDate
+            )
+        }
    }
    Markdown(
        markdown,
--- a/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
+++ b/app/src/main/java/app/revanced/manager/ui/model/BundleInfo.kt
@ -11,36 +11,35 @@ import kotlinx.coroutines.flow.map
 */
 data class BundleInfo(
    val name: String,
-    val version: String?,
    val uid: Int,
-    val compatible: List<PatchInfo>,
-    val incompatible: List<PatchInfo>,
+    val supported: List<PatchInfo>,
+    val unsupported: List<PatchInfo>,
    val universal: List<PatchInfo>
 ) {
    val all = sequence {
-        yieldAll(compatible)
-        yieldAll(incompatible)
+        yieldAll(supported)
+        yieldAll(unsupported)
        yieldAll(universal)
    }

-    val patchCount get() = compatible.size + incompatible.size + universal.size
+    val patchCount get() = supported.size + unsupported.size + universal.size

-    fun patchSequence(allowIncompatible: Boolean) = if (allowIncompatible) {
+    fun patchSequence(allowUnsupported: Boolean) = if (allowUnsupported) {
        all
    } else {
        sequence {
-            yieldAll(compatible)
+            yieldAll(supported)
            yieldAll(universal)
        }
    }

    companion object Extensions {
        inline fun Iterable<BundleInfo>.toPatchSelection(
-            allowIncompatible: Boolean,
+            allowUnsupported: Boolean,
            condition: (Int, PatchInfo) -> Boolean
        ): PatchSelection = this.associate { bundle ->
            val patches =
-                bundle.patchSequence(allowIncompatible)
+                bundle.patchSequence(allowUnsupported)
                    .mapNotNullTo(mutableSetOf()) { patch ->
                        patch.name.takeIf {
                            condition(
@ -61,8 +60,8 @@ data class BundleInfo(
                source.state.map { state ->
                    val bundle = state.patchBundleOrNull() ?: return@map null

-                    val compatible = mutableListOf<PatchInfo>()
-                    val incompatible = mutableListOf<PatchInfo>()
+                    val supported = mutableListOf<PatchInfo>()
+                    val unsupported = mutableListOf<PatchInfo>()
                    val universal = mutableListOf<PatchInfo>()

                    bundle.patches.filter { it.compatibleWith(packageName) }.forEach {
@ -71,15 +70,15 @@ data class BundleInfo(
                            it.supports(
                                packageName,
                                version
-                            ) -> compatible
+                            ) -> supported

-                            else -> incompatible
+                            else -> unsupported
                        }

                        targetList.add(it)
                    }

-                    BundleInfo(source.getName(), source.currentVersion(), source.uid, compatible, incompatible, universal)
+                    BundleInfo(source.getName(), source.uid, supported, unsupported, universal)
                }
            }

--- 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/AppSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
@ -3,26 +3,12 @@ package app.revanced.manager.ui.screen
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Storage
 import androidx.compose.material.icons.outlined.Search
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@ -31,7 +17,6 @@ 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.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@ -153,13 +138,10 @@ fun AppSelectorScreen(
            }
        }

-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.select_app),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick,
                actions = {
                    IconButton(onClick = { search = true }) {
@ -167,8 +149,7 @@ fun AppSelectorScreen(
                    }
                }
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        LazyColumnWithScrollbar(
            modifier = Modifier
--- a/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/BundleListScreen.kt
@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@ -20,19 +19,13 @@ fun BundleListScreen(
    selectedSources: SnapshotStateList<PatchBundleSource>,
    bundlesSelectable: Boolean,
 ) {
-    val sortedSources = remember(sources) {
-        sources.sortedByDescending { source ->
-            source.state.value.patchBundleOrNull()?.patches?.size ?: 0
-        }
-    }
-
    LazyColumnWithScrollbar(
        modifier = Modifier.fillMaxSize(),
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.Top,
    ) {
        items(
-            sortedSources,
+            sources,
            key = { it.uid }
        ) { source ->
            BundleItem(
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@ -6,49 +6,18 @@ import android.net.Uri
 import android.provider.Settings
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 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
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.Source
-import androidx.compose.material.icons.outlined.Update
-import androidx.compose.material.icons.outlined.WarningAmber
-import androidx.compose.material3.Badge
-import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TabRow
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
@ -63,11 +32,10 @@ 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
 import app.revanced.manager.ui.component.haptics.HapticTab
+import app.revanced.manager.ui.component.bundle.ImportPatchBundleDialog
 import app.revanced.manager.ui.viewmodel.DashboardViewModel
 import app.revanced.manager.util.RequestInstallAppsContract
 import app.revanced.manager.util.toast
@ -156,20 +124,6 @@ fun DashboardScreen(
        }
    )

-    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
-    if (showDeleteConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDeleteConfirmationDialog = false },
-            onConfirm = {
-                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
-                vm.cancelSourceSelection()
-            },
-            title = stringResource(R.string.bundle_delete_multiple_dialog_title),
-            description = stringResource(R.string.bundle_delete_multiple_dialog_description),
-            icon = Icons.Outlined.Delete
-        )
-    }
-
    Scaffold(
        topBar = {
            if (bundlesSelectable) {
@ -185,7 +139,8 @@ fun DashboardScreen(
                    actions = {
                        IconButton(
                            onClick = {
-                                showDeleteConfirmationDialog = true
+                                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
+                                vm.cancelSourceSelection()
                            }
                        ) {
                            Icon(
@ -216,7 +171,11 @@ fun DashboardScreen(
                            ) {
                                BadgedBox(
                                    badge = {
-                                        Badge(modifier = Modifier.size(6.dp))
+                                        Badge(
+                                            // A size value above 6.dp forces the Badge icon to be closer to the center, fixing a clipping issue
+                                            modifier = Modifier.size(7.dp),
+                                            containerColor = MaterialTheme.colorScheme.primary,
+                                        )
                                    }
                                ) {
                                    Icon(Icons.Outlined.Update, stringResource(R.string.update))
@ -226,8 +185,7 @@ fun DashboardScreen(
                        IconButton(onClick = onSettingsClick) {
                            Icon(Icons.Outlined.Settings, stringResource(R.string.settings))
                        }
-                    },
-                    applyContainerColor = true
+                    }
                )
            }
        },
@ -280,6 +238,7 @@ fun DashboardScreen(
                }
            }

+            val showBatteryOptimizationsWarning by vm.showBatteryOptimizationsWarningFlow.collectAsStateWithLifecycle(false)
            Notifications(
                if (!Aapt.supportsDevice()) {
                    {
@ -291,23 +250,16 @@ fun DashboardScreen(
                        )
                    }
                } else null,
-                if (vm.showBatteryOptimizationsWarning) {
+                if (showBatteryOptimizationsWarning) {
                    {
-                        val batteryOptimizationsLauncher =
-                            rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-                                vm.updateBatteryOptimizationsWarning()
-                            }
                        NotificationCard(
                            isWarning = true,
                            icon = Icons.Default.BatteryAlert,
                            text = stringResource(R.string.battery_optimization_notification),
                            onClick = {
-                                batteryOptimizationsLauncher.launch(
-                                    Intent(
-                                        Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                                        Uri.fromParts("package", androidContext.packageName, null)
-                                    )
-                                )
+                                androidContext.startActivity(Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).apply {
+                                    data = Uri.parse("package:${androidContext.packageName}")
+                                })
                            }
                        )
                    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppInfoScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppInfoScreen.kt
@ -21,8 +21,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
@ -31,7 +29,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
@ -67,17 +64,13 @@ fun InstalledAppInfoScreen(
            onConfirm = { viewModel.uninstall() }
        )

-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.app_info),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        ColumnWithScrollbar(
            modifier = Modifier
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@ -7,28 +7,15 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 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
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.BottomAppBar
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LinearProgressIndicator
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.derivedStateOf
@ -46,7 +33,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,23 +46,25 @@ import app.revanced.manager.util.EventEffect
@Composable
 fun PatcherScreen(
    onBackClick: () -> Unit,
-    viewModel: PatcherViewModel
+    vm: PatcherViewModel
 ) {
+    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) }
-
-    BackHandler(onBack = { showDismissConfirmationDialog = true })

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

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

-    if (showDismissConfirmationDialog) {
-        ConfirmDialog(
-            onDismiss = { showDismissConfirmationDialog = false },
-            onConfirm = {
-                viewModel.onBack()
-                onBackClick()
-            },
-            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))
                }
@ -146,24 +121,23 @@ fun PatcherScreen(
    }

    AppScaffold(
-        topBar = { scrollBehavior ->
+        topBar = {
            AppTopBar(
                title = stringResource(R.string.patcher),
-                scrollBehavior = scrollBehavior,
-                onBackClick = { showDismissConfirmationDialog = true }
+                onBackClick = ::leaveScreen
            )
        },
        bottomBar = {
            BottomAppBar(
                actions = {
                    IconButton(
-                        onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
+                        onClick = { exportApkLauncher.launch("${vm.packageName}.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))
@ -174,11 +148,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)
@ -189,10 +163,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()
                            }
                        )
                    }
@ -206,7 +180,7 @@ fun PatcherScreen(
                .fillMaxSize()
        ) {
            LinearProgressIndicator(
-                progress = { viewModel.progress },
+                progress = { vm.progress },
                modifier = Modifier.fillMaxWidth()
            )

@ -222,8 +196,8 @@ 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
@ -1,50 +1,16 @@
 package app.revanced.manager.ui.screen

-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.EaseInOut
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.outlined.FilterList
-import androidx.compose.material.icons.outlined.Restore
-import androidx.compose.material.icons.outlined.Save
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.WarningAmber
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ScrollableTabRow
-import androidx.compose.material3.SmallFloatingActionButton
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@ -53,37 +19,36 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 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.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
+import app.revanced.manager.ui.component.SearchView
 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.viewmodel.PatchesSelectorViewModel
-import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_INCOMPATIBLE
+import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_SUPPORTED
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNIVERSAL
+import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNSUPPORTED
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.isScrollingUp
 import app.revanced.manager.util.transparentListItemColors
 import kotlinx.coroutines.launch

-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun PatchesSelectorScreen(
    onSave: (PatchSelection?, Options) -> Unit,
@ -98,17 +63,20 @@ fun PatchesSelectorScreen(
        bundles.size
    }
    val composableScope = rememberCoroutineScope()
-    val (query, setQuery) = rememberSaveable {
-        mutableStateOf("")
-    }
-    val (searchExpanded, setSearchExpanded) = rememberSaveable {
-        mutableStateOf(false)
+    var search: String? by rememberSaveable {
+        mutableStateOf(null)
    }
    var showBottomSheet by rememberSaveable { mutableStateOf(false) }
    val showSaveButton by remember {
        derivedStateOf { vm.selectionIsValid(bundles) }
    }

+    val availablePatchCount by remember {
+        derivedStateOf {
+            bundles.sumOf { it.patchCount }
+        }
+    }
+
    val defaultPatchSelectionCount by vm.defaultSelectionCount
        .collectAsStateWithLifecycle(initialValue = 0)

@ -140,40 +108,45 @@ fun PatchesSelectorScreen(
                    style = MaterialTheme.typography.titleMedium
                )

-                FlowRow(
+                Row(
                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    verticalArrangement = Arrangement.spacedBy(12.dp)
+                    horizontalArrangement = Arrangement.spacedBy(5.dp)
                ) {
-                    CheckedFilterChip(
-                        selected = vm.filter and SHOW_INCOMPATIBLE == 0,
-                        onClick = { vm.toggleFlag(SHOW_INCOMPATIBLE) },
-                        label = { Text(stringResource(R.string.this_version)) }
+                    FilterChip(
+                        selected = vm.filter and SHOW_SUPPORTED != 0,
+                        onClick = { vm.toggleFlag(SHOW_SUPPORTED) },
+                        label = { Text(stringResource(R.string.supported)) }
                    )

-                    CheckedFilterChip(
+                    FilterChip(
                        selected = vm.filter and SHOW_UNIVERSAL != 0,
                        onClick = { vm.toggleFlag(SHOW_UNIVERSAL) },
                        label = { Text(stringResource(R.string.universal)) },
                    )
+
+                    FilterChip(
+                        selected = vm.filter and SHOW_UNSUPPORTED != 0,
+                        onClick = { vm.toggleFlag(SHOW_UNSUPPORTED) },
+                        label = { Text(stringResource(R.string.unsupported)) },
+                    )
                }
            }
        }
    }

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

    vm.optionsDialog?.let { (bundle, patch) ->
@ -202,35 +175,34 @@ fun PatchesSelectorScreen(
    fun LazyListScope.patchList(
        uid: Int,
        patches: List<PatchInfo>,
-        visible: Boolean,
-        compatible: Boolean,
+        filterFlag: Int,
+        supported: Boolean,
        header: (@Composable () -> Unit)? = null
    ) {
-        if (patches.isNotEmpty() && visible) {
+        if (patches.isNotEmpty() && (vm.filter and filterFlag) != 0 || vm.filter == 0) {
            header?.let {
-                item(contentType = 0) {
+                item {
                    it()
                }
            }

            items(
                items = patches,
-                key = { it.name },
-                contentType = { 1 }
+                key = { it.name }
            ) { patch ->
                PatchItem(
                    patch = patch,
                    onOptionsDialog = {
                        vm.optionsDialog = uid to patch
                    },
-                    selected = compatible && vm.isSelected(
+                    selected = supported && vm.isSelected(
                        uid,
                        patch
                    ),
                    onToggle = {
                        when {
-                            // Open incompatible dialog if the patch is not supported
-                            !compatible -> vm.openIncompatibleDialog(patch)
+                            // Open unsupported dialog if the patch is not supported
+                            !supported -> vm.openUnsupportedDialog(patch)

                            // Show selection warning if enabled
                            vm.selectionWarningEnabled -> showSelectionWarning = true
@ -244,156 +216,108 @@ fun PatchesSelectorScreen(
                            else -> vm.togglePatch(uid, patch)
                        }
                    },
-                    compatible = compatible
+                    supported = supported
                )
            }
        }
    }

+    search?.let { query ->
+        SearchView(
+            query = query,
+            onQueryChange = { search = it },
+            onActiveChange = { if (!it) search = null },
+            placeholder = { Text(stringResource(R.string.search_patches)) }
+        ) {
+            val bundle = bundles[pagerState.currentPage]
+
+            LazyColumnWithScrollbar(
+                modifier = Modifier.fillMaxSize()
+            ) {
+                fun List<PatchInfo>.searched() = filter {
+                    it.name.contains(query, true)
+                }
+
+                patchList(
+                    uid = bundle.uid,
+                    patches = bundle.supported.searched(),
+                    filterFlag = SHOW_SUPPORTED,
+                    supported = true
+                )
+                patchList(
+                    uid = bundle.uid,
+                    patches = bundle.universal.searched(),
+                    filterFlag = SHOW_UNIVERSAL,
+                    supported = true
+                ) {
+                    ListHeader(
+                        title = stringResource(R.string.universal_patches),
+                    )
+                }
+
+                if (!vm.allowIncompatiblePatches) return@LazyColumnWithScrollbar
+                patchList(
+                    uid = bundle.uid,
+                    patches = bundle.unsupported.searched(),
+                    filterFlag = SHOW_UNSUPPORTED,
+                    supported = true
+                ) {
+                    ListHeader(
+                        title = stringResource(R.string.unsupported_patches),
+                        onHelpClick = { showUnsupportedPatchesDialog = true }
+                    )
+                }
+            }
+        }
+    }
+
    Scaffold(
        topBar = {
-            SearchBar(
-                query = query,
-                onQueryChange = setQuery,
-                expanded = searchExpanded,
-                onExpandedChange = setSearchExpanded,
-                placeholder = {
-                    Text(stringResource(R.string.search_patches))
-                },
-                leadingIcon = {
-                    val rotation by animateFloatAsState(
-                        targetValue = if (searchExpanded) 360f else 0f,
-                        animationSpec = tween(durationMillis = 400, easing = EaseInOut),
-                        label = "SearchBar back button"
-                    )
+            AppTopBar(
+                title = stringResource(
+                    R.string.patches_selected,
+                    selectedPatchCount,
+                    availablePatchCount
+                ),
+                onBackClick = onBackClick,
+                actions = {
+                    IconButton(onClick = vm::reset) {
+                        Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
+                    }
+                    IconButton(onClick = { showBottomSheet = true }) {
+                        Icon(Icons.Outlined.FilterList, stringResource(R.string.more))
+                    }
                    IconButton(
                        onClick = {
-                            if (searchExpanded) {
-                                setSearchExpanded(false)
-                            } else {
-                                onBackClick()
-                            }
+                            search = ""
                        }
                    ) {
-                        Icon(
-                            modifier = Modifier.rotate(rotation),
-                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = stringResource(R.string.back)
-                        )
-                    }
-                },
-                trailingIcon = {
-                    AnimatedContent(
-                        targetState = searchExpanded,
-                        label = "Filter/Clear",
-                        transitionSpec = { fadeIn() togetherWith fadeOut() }
-                    ) { searchExpanded ->
-                        if (searchExpanded) {
-                            IconButton(
-                                onClick = { setQuery("") },
-                                enabled = query.isNotEmpty()
-                            ) {
-                                Icon(
-                                    imageVector = Icons.Filled.Close,
-                                    contentDescription = stringResource(R.string.clear)
-                                )
-                            }
-                        } else {
-                            IconButton(onClick = { showBottomSheet = true }) {
-                                Icon(
-                                    imageVector = Icons.Outlined.FilterList,
-                                    contentDescription = stringResource(R.string.more)
-                                )
-                            }
-                        }
+                        Icon(Icons.Outlined.Search, stringResource(R.string.search))
                    }
                }
-            ) {
-                val bundle = bundles[pagerState.currentPage]
-
-                LazyColumnWithScrollbar(
-                    modifier = Modifier.fillMaxSize()
-                ) {
-                    fun List<PatchInfo>.searched() = filter {
-                        it.name.contains(query, true)
-                    }
-
-                    patchList(
-                        uid = bundle.uid,
-                        patches = bundle.compatible.searched(),
-                        visible = true,
-                        compatible = true
-                    )
-                    patchList(
-                        uid = bundle.uid,
-                        patches = bundle.universal.searched(),
-                        visible = vm.filter and SHOW_UNIVERSAL != 0,
-                        compatible = true
-                    ) {
-                        ListHeader(
-                            title = stringResource(R.string.universal_patches),
-                        )
-                    }
-
-                    patchList(
-                        uid = bundle.uid,
-                        patches = bundle.incompatible.searched(),
-                        visible = vm.filter and SHOW_INCOMPATIBLE != 0,
-                        compatible = vm.allowIncompatiblePatches
-                    ) {
-                        ListHeader(
-                            title = stringResource(R.string.incompatible_patches),
-                            onHelpClick = { showIncompatiblePatchesDialog = true }
-                        )
-                    }
-                }
-            }
+            )
        },
        floatingActionButton = {
            if (!showSaveButton) return@Scaffold

-            AnimatedVisibility(
-                visible = !searchExpanded,
-                enter = slideInHorizontally { it } + fadeIn(),
-                exit = slideOutHorizontally { it } + fadeOut()
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.End,
-                    verticalArrangement = Arrangement.spacedBy(4.dp)
-                ) {
-                    SmallFloatingActionButton(
-                        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
-                                )
-                            )
-                        },
-                        icon = {
-                            Icon(
-                                imageVector = Icons.Outlined.Save,
-                                contentDescription = stringResource(R.string.save)
-                            )
-                        },
-                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
-                            ?: true,
-                        onClick = {
-                            onSave(vm.getCustomSelection(), vm.getOptions())
-                        }
+            HapticExtendedFloatingActionButton(
+                text = { Text(stringResource(R.string.save)) },
+                icon = {
+                    Icon(
+                        Icons.Outlined.Save,
+                        stringResource(R.string.save)
                    )
+                },
+                expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
+                    ?: true,
+                onClick = {
+                    onSave(vm.getCustomSelection(), vm.getOptions())
                }
-            }
+            )
        }
    ) { paddingValues ->
        Column(
-            modifier = Modifier
+            Modifier
                .fillMaxSize()
                .padding(paddingValues)
        ) {
@ -412,19 +336,7 @@ fun PatchesSelectorScreen(
                                    )
                                }
                            },
-                            text = {
-                                Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                                    Text(
-                                        text = bundle.name,
-                                        style = MaterialTheme.typography.bodyMedium
-                                    )
-                                    Text(
-                                        text = bundle.version!!,
-                                        style = MaterialTheme.typography.bodySmall,
-                                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                                    )
-                                }
-                            },
+                            text = { Text(bundle.name) },
                            selectedContentColor = MaterialTheme.colorScheme.primary,
                            unselectedContentColor = MaterialTheme.colorScheme.onSurfaceVariant
                        )
@ -446,15 +358,15 @@ fun PatchesSelectorScreen(
                    ) {
                        patchList(
                            uid = bundle.uid,
-                            patches = bundle.compatible,
-                            visible = true,
-                            compatible = true
+                            patches = bundle.supported,
+                            filterFlag = SHOW_SUPPORTED,
+                            supported = true
                        )
                        patchList(
                            uid = bundle.uid,
                            patches = bundle.universal,
-                            visible = vm.filter and SHOW_UNIVERSAL != 0,
-                            compatible = true
+                            filterFlag = SHOW_UNIVERSAL,
+                            supported = true
                        ) {
                            ListHeader(
                                title = stringResource(R.string.universal_patches),
@ -462,13 +374,13 @@ fun PatchesSelectorScreen(
                        }
                        patchList(
                            uid = bundle.uid,
-                            patches = bundle.incompatible,
-                            visible = vm.filter and SHOW_INCOMPATIBLE != 0,
-                            compatible = vm.allowIncompatiblePatches
+                            patches = bundle.unsupported,
+                            filterFlag = SHOW_UNSUPPORTED,
+                            supported = vm.allowIncompatiblePatches
                        ) {
                            ListHeader(
-                                title = stringResource(R.string.incompatible_patches),
-                                onHelpClick = { showIncompatiblePatchesDialog = true }
+                                title = stringResource(R.string.unsupported_patches),
+                                onHelpClick = { showUnsupportedPatchesDialog = true }
                            )
                        }
                    }
@ -525,24 +437,24 @@ private fun PatchItem(
    onOptionsDialog: () -> Unit,
    selected: Boolean,
    onToggle: () -> Unit,
-    compatible: Boolean = true
+    supported: Boolean = true
 ) = ListItem(
    modifier = Modifier
-        .let { if (!compatible) it.alpha(0.5f) else it }
+        .let { if (!supported) it.alpha(0.5f) else it }
        .clickable(onClick = onToggle)
        .fillMaxSize(),
    leadingContent = {
        HapticCheckbox(
            checked = selected,
            onCheckedChange = { onToggle() },
-            enabled = compatible
+            enabled = supported
        )
    },
    headlineContent = { Text(patch.name) },
    supportingContent = patch.description?.let { { Text(it) } },
    trailingContent = {
        if (patch.options?.isNotEmpty() == true) {
-            IconButton(onClick = onOptionsDialog, enabled = compatible) {
+            IconButton(onClick = onOptionsDialog, enabled = supported) {
                Icon(Icons.Outlined.Settings, null)
            }
        }
@ -578,7 +490,7 @@ fun ListHeader(
 }

@Composable
-private fun IncompatiblePatchesDialog(
+private fun UnsupportedPatchesDialog(
    appVersion: String,
    onDismissRequest: () -> Unit
 ) = AlertDialog(
@ -591,11 +503,11 @@ private fun IncompatiblePatchesDialog(
            Text(stringResource(R.string.ok))
        }
    },
-    title = { Text(stringResource(R.string.incompatible_patches)) },
+    title = { Text(stringResource(R.string.unsupported_patches)) },
    text = {
        Text(
            stringResource(
-                R.string.incompatible_patches_dialog,
+                R.string.unsupported_patches_dialog,
                appVersion
            )
        )
@ -603,9 +515,9 @@ private fun IncompatiblePatchesDialog(
 )

@Composable
-private fun IncompatiblePatchDialog(
+private fun UnsupportedPatchDialog(
    appVersion: String,
-    compatibleVersions: List<String>,
+    supportedVersions: List<String>,
    onDismissRequest: () -> Unit
 ) = AlertDialog(
    icon = {
@ -617,13 +529,13 @@ private fun IncompatiblePatchDialog(
            Text(stringResource(R.string.ok))
        }
    },
-    title = { Text(stringResource(R.string.incompatible_patch)) },
+    title = { Text(stringResource(R.string.unsupported_patch)) },
    text = {
        Text(
            stringResource(
-                R.string.app_version_not_compatible,
+                R.string.app_not_supported,
                appVersion,
-                compatibleVersions.joinToString(", ")
+                supportedVersions.joinToString(", ")
            )
        )
    }
@ -637,7 +549,13 @@ private fun OptionsDialog(
    reset: () -> Unit,
    set: (String, Any?) -> Unit,
    onDismissRequest: () -> Unit,
-) = FullscreenDialog(onDismissRequest = onDismissRequest) {
+) = Dialog(
+    onDismissRequest = onDismissRequest,
+    properties = DialogProperties(
+        usePlatformDefaultWidth = false,
+        dismissOnBackPress = true
+    )
+) {
    Scaffold(
        topBar = {
            AppTopBar(
--- a/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/RequiredOptionsScreen.kt
@ -15,8 +15,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.ScrollableTabRow
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
@ -24,7 +22,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -69,13 +66,10 @@ fun RequiredOptionsScreen(
    }
    val composableScope = rememberCoroutineScope()

-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.required_options_screen),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
        },
@ -96,8 +90,7 @@ fun RequiredOptionsScreen(
                    onContinue(vm.getCustomSelection(), vm.getOptions())
                }
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        Column(
            Modifier
--- a/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
@ -4,8 +4,6 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@ -14,28 +12,17 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowRight
 import androidx.compose.material.icons.filled.AutoFixHigh
-import androidx.compose.material.icons.outlined.WarningAmber
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 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.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import app.revanced.manager.R
-import app.revanced.manager.data.platform.NetworkInfo
 import app.revanced.manager.data.room.apps.installed.InstallType
 import app.revanced.manager.data.room.apps.installed.InstalledApp
 import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
@ -44,7 +31,6 @@ import app.revanced.manager.ui.component.AppInfo
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
-import app.revanced.manager.ui.component.NotificationCard
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
@ -55,7 +41,6 @@ import app.revanced.manager.util.enabled
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.transparentListItemColors
 import kotlinx.coroutines.launch
-import org.koin.compose.koinInject

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -67,9 +52,6 @@ fun SelectedAppInfoScreen(
    vm: SelectedAppInfoViewModel
 ) {
    val context = LocalContext.current
-    val networkInfo = koinInject<NetworkInfo>()
-    val networkConnected = remember { networkInfo.isConnected() }
-    val networkMetered = remember { !networkInfo.isUnmetered() }

    val packageName = vm.selectedApp.packageName
    val version = vm.selectedApp.version
@ -93,14 +75,10 @@ fun SelectedAppInfoScreen(
    val composableScope = rememberCoroutineScope()

    val error by vm.errorFlow.collectAsStateWithLifecycle(null)
-
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.app_info),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
        },
@ -136,8 +114,7 @@ fun SelectedAppInfoScreen(
                    }
                }
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        val plugins by vm.plugins.collectAsStateWithLifecycle(emptyList())

@ -217,35 +194,6 @@ fun SelectedAppInfoScreen(
                    modifier = Modifier.padding(horizontal = 24.dp)
                )
            }
-
-            Column(
-                modifier = Modifier.padding(horizontal = 24.dp),
-                verticalArrangement = Arrangement.spacedBy(16.dp)
-            ) {
-                val needsInternet =
-                    vm.selectedApp.let { it is SelectedApp.Search || it is SelectedApp.Download }
-
-                when {
-                    !needsInternet -> {}
-                    !networkConnected -> {
-                        NotificationCard(
-                            isWarning = true,
-                            icon = Icons.Outlined.WarningAmber,
-                            text = stringResource(R.string.network_unavailable_warning),
-                            onDismiss = null
-                        )
-                    }
-
-                    networkMetered -> {
-                        NotificationCard(
-                            isWarning = true,
-                            icon = Icons.Outlined.WarningAmber,
-                            text = stringResource(R.string.network_metered_warning),
-                            onDismiss = null
-                        )
-                    }
-                }
-            }
        }
    }
 }
--- 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/UpdateScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/UpdateScreen.kt
@ -5,36 +5,36 @@ import androidx.compose.animation.core.spring
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Cancel
-import androidx.compose.material.icons.outlined.InstallMobile
 import androidx.compose.material.icons.outlined.Update
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
+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.unit.dp
+import app.revanced.manager.BuildConfig
 import app.revanced.manager.R
 import app.revanced.manager.network.dto.ReVancedAsset
 import app.revanced.manager.ui.component.AppTopBar
-import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.settings.Changelog
 import app.revanced.manager.ui.viewmodel.UpdateViewModel
 import app.revanced.manager.ui.viewmodel.UpdateViewModel.State
@ -52,86 +52,38 @@ fun UpdateScreen(
    onBackClick: () -> Unit,
    vm: UpdateViewModel = koinViewModel()
 ) {
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
-                title = {
-                    Column {
-                        Text(stringResource(vm.state.title))
-
-                        if (vm.state == State.DOWNLOADING) {
-                            Text(
-                                text = "${vm.downloadedSize.div(1000000)} MB /  ${
-                                    vm.totalSize.div(1000000)
-                                } MB (${vm.downloadProgress.times(100).toInt()}%)",
-                                style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.outline
-                            )
-                        }
-                    }
-                },
-                scrollBehavior = scrollBehavior,
+                title = stringResource(R.string.update),
                onBackClick = onBackClick
            )
-        },
-        floatingActionButton = {
-            val buttonConfig = when (vm.state) {
-                State.CAN_DOWNLOAD -> Triple(
-                    { vm.downloadUpdate() },
-                    R.string.download,
-                    Icons.Outlined.InstallMobile
-                )
-
-                State.DOWNLOADING -> Triple(onBackClick, R.string.cancel, Icons.Outlined.Cancel)
-                State.CAN_INSTALL -> Triple(
-                    { vm.installUpdate() },
-                    R.string.install_app,
-                    Icons.Outlined.InstallMobile
-                )
-
-                else -> null
-            }
-
-            buttonConfig?.let { (onClick, textRes, icon) ->
-                HapticExtendedFloatingActionButton(
-                    onClick = onClick::invoke,
-                    icon = { Icon(icon, null) },
-                    text = { Text(stringResource(textRes)) }
-                )
-            }
-
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
+        AnimatedVisibility(visible = vm.showInternetCheckDialog) {
+            MeteredDownloadConfirmationDialog(
+                onDismiss = { vm.showInternetCheckDialog = false },
+                onDownloadAnyways = { vm.downloadUpdate(true) }
+            )
+        }
        Column(
            modifier = Modifier
-                .padding(paddingValues),
+                .fillMaxSize()
+                .padding(paddingValues)
+                .padding(vertical = 16.dp, horizontal = 24.dp)
+                .verticalScroll(rememberScrollState()),
+            verticalArrangement = Arrangement.spacedBy(32.dp)
        ) {
-            if (vm.state == State.DOWNLOADING)
-                LinearProgressIndicator(
-                    progress = { vm.downloadProgress },
-                    modifier = Modifier.fillMaxWidth(),
-                )
-
-            AnimatedVisibility(visible = vm.showInternetCheckDialog) {
-                MeteredDownloadConfirmationDialog(
-                    onDismiss = { vm.showInternetCheckDialog = false },
-                    onDownloadAnyways = { vm.downloadUpdate(true) }
-                )
-            }
-            Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(16.dp)
-                    .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(32.dp)
-            ) {
-                vm.releaseInfo?.let { changelog ->
-                    Changelog(changelog)
-                }
-            }
+            Header(
+                vm.state,
+                vm.releaseInfo,
+                DownloadData(vm.downloadProgress, vm.downloadedSize, vm.totalSize)
+            )
+            vm.releaseInfo?.let { changelog ->
+                HorizontalDivider()
+                Changelog(changelog)
+            } ?: Spacer(modifier = Modifier.weight(1f))
+            Buttons(vm.state, vm::downloadUpdate, vm::installUpdate, onBackClick)
        }
    }
 }
@ -164,6 +116,58 @@ private fun MeteredDownloadConfirmationDialog(
    )
 }

+@Composable
+private fun Header(state: State, releaseInfo: ReVancedAsset?, downloadData: DownloadData) {
+    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+        Text(
+            text = stringResource(state.title),
+            style = MaterialTheme.typography.headlineMedium
+        )
+        if (state == State.CAN_DOWNLOAD) {
+            Column {
+                Text(
+                    text = stringResource(
+                        id = R.string.current_version,
+                        BuildConfig.VERSION_NAME
+                    ),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                releaseInfo?.version?.let {
+                    Text(
+                        text = stringResource(
+                            R.string.new_version,
+                            it.replace("v", "")
+                        ),
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+            }
+        } else if (state == State.DOWNLOADING) {
+            LinearProgressIndicator(
+                progress = { downloadData.downloadProgress },
+                modifier = Modifier.fillMaxWidth(),
+            )
+            Text(
+                text =
+                "${downloadData.downloadedSize.div(1000000)} MB /  ${
+                    downloadData.totalSize.div(
+                        1000000
+                    )
+                } MB (${
+                    downloadData.downloadProgress.times(
+                        100
+                    ).toInt()
+                }%)",
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.outline,
+                modifier = Modifier.align(Alignment.CenterHorizontally)
+            )
+        }
+    }
+}
+
@Composable
 private fun ColumnScope.Changelog(releaseInfo: ReVancedAsset) {
    val scrollState = rememberScrollState()
@ -194,4 +198,40 @@ private fun ColumnScope.Changelog(releaseInfo: ReVancedAsset) {
            publishDate = releaseInfo.createdAt.relativeTime(LocalContext.current)
        )
    }
-}
+}
+
+@Composable
+private fun Buttons(
+    state: State,
+    onDownloadClick: () -> Unit,
+    onInstallClick: () -> Unit,
+    onBackClick: () -> Unit
+) {
+    Row(modifier = Modifier.fillMaxWidth()) {
+        if (state.showCancel) {
+            TextButton(
+                onClick = onBackClick,
+            ) {
+                Text(text = stringResource(R.string.cancel))
+            }
+        }
+        Spacer(modifier = Modifier.weight(1f))
+        if (state == State.CAN_DOWNLOAD) {
+            Button(onClick = onDownloadClick) {
+                Text(text = stringResource(R.string.update))
+            }
+        } else if (state == State.CAN_INSTALL) {
+            Button(
+                onClick = onInstallClick
+            ) {
+                Text(text = stringResource(R.string.install_app))
+            }
+        }
+    }
+}
+
+data class DownloadData(
+    val downloadProgress: Float,
+    val downloadedSize: Long,
+    val totalSize: Long
+)
--- 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,13 @@ 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,10 +39,8 @@ 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
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import org.koin.androidx.compose.koinViewModel

@ -120,8 +105,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")
@ -129,14 +113,12 @@ fun AboutSettingsScreen(
        Triple(
            stringResource(R.string.contributors),
            stringResource(R.string.contributors_description),
-            third = nav@{
-                if (!viewModel.isConnected) {
-                    context.toast(context.getString(R.string.no_network_toast))
-                    return@nav
-                }
-
-                navigate(Settings.Contributors)
-            }
+            third = { 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),
@ -145,49 +127,13 @@ 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 = {
            AppTopBar(
                title = stringResource(R.string.about),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        snackbarHost = {
-            SnackbarHost(hostState = snackbarHostState)
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        ColumnWithScrollbar(
            modifier = Modifier
@ -197,11 +143,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 +153,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
@ -10,33 +10,14 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Api
 import androidx.compose.material.icons.outlined.Restore
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 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.text.style.TextAlign
@ -72,17 +53,14 @@ fun AdvancedSettingsScreen(
            activityManager.largeMemoryClass
        )
    }
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())

    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.advanced),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        ColumnWithScrollbar(
            modifier = Modifier
@ -112,6 +90,20 @@ 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 = vm.prefs.disablePatchVersionCompatCheck,
@ -142,20 +134,6 @@ fun AdvancedSettingsScreen(
                confirmationText = R.string.patch_selection_safeguard_confirmation
            )

-            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.debugging))
            val exportDebugLogsLauncher =
                rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) {
--- 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
@ -25,14 +25,11 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@ -51,22 +48,18 @@ import org.koin.androidx.compose.koinViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun ContributorSettingsScreen(
+fun ContributorScreen(
    onBackClick: () -> Unit,
    viewModel: ContributorViewModel = koinViewModel()
 ) {
    val repositories = viewModel.repositories
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.contributors),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
    ) { paddingValues ->
        LazyColumnWithScrollbar(
            modifier = Modifier
@ -97,14 +90,7 @@ fun ContributorSettingsScreen(
                        )
                    }
                }
-            } ?: item {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    LoadingIndicator()
-                }
-            }
+            } ?: item { LoadingIndicator() }
        }
    }
 }
--- 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
@ -5,49 +5,31 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 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 = {
            AppTopBar(
                title = stringResource(R.string.developer_options),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        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.patch_bundles_section))
            SettingsListItem(
                headlineContent = stringResource(R.string.patch_bundles_force_download),
--- 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
@ -9,7 +9,6 @@ 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,11 +17,9 @@ import androidx.compose.material3.MaterialTheme
 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.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
 import androidx.compose.runtime.mutableStateOf
@ -31,7 +28,6 @@ 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
@ -44,7 +40,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
@ -60,35 +55,21 @@ fun DownloadsSettingsScreen(
    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 = {
            AppTopBar(
                title = stringResource(R.string.downloads),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick,
                actions = {
                    if (viewModel.appSelection.isNotEmpty()) {
-                        IconButton(onClick = { showDeleteConfirmationDialog = true }) {
+                        IconButton(onClick = { viewModel.deleteApps() }) {
                            Icon(Icons.Default.Delete, stringResource(R.string.delete))
                        }
                    }
                }
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        Box(
            contentAlignment = Alignment.TopCenter,
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt
@ -13,8 +13,6 @@ import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@ -22,7 +20,6 @@ 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.lifecycle.viewModelScope
 import app.revanced.manager.R
@ -54,17 +51,14 @@ fun GeneralSettingsScreen(
            onConfirm = { viewModel.setTheme(it) }
        )
    }
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())

    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.general),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        ColumnWithScrollbar(
            modifier = Modifier
--- 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,17 +13,7 @@ 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.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@ -32,7 +22,6 @@ 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.text.style.TextAlign
@ -48,7 +37,6 @@ import app.revanced.manager.ui.component.bundle.BundleSelector
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.ImportExportViewModel
 import app.revanced.manager.util.toast
-import app.revanced.manager.util.uiSafe
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel

@ -98,56 +86,27 @@ fun ImportExportSettingsScreen(
            onDismissRequest = vm::cancelKeystoreImport,
            onSubmit = { cn, pass ->
                vm.viewModelScope.launch {
-                    uiSafe(context, R.string.failed_to_import_keystore, "Failed to import keystore") {
-                        val result = vm.tryKeystoreImport(cn, pass)
-                        if (!result) context.toast(context.getString(R.string.import_keystore_wrong_credentials))
-                    }
+                    val result = vm.tryKeystoreImport(cn, pass)
+                    if (!result) context.toast(context.getString(R.string.import_keystore_wrong_credentials))
                }
            }
        )
    }

-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.import_export),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        ColumnWithScrollbar(
            modifier = Modifier
                .fillMaxSize()
                .padding(paddingValues)
        ) {
-            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_))
+            GroupHeader(stringResource(R.string.signing))
            GroupItem(
                onClick = {
                    importKeystoreLauncher.launch("*/*")
@ -155,13 +114,6 @@ fun ImportExportSettingsScreen(
                headline = R.string.import_keystore,
                description = R.string.import_keystore_description
            )
-            GroupItem(
-                onClick = vm::importSelection,
-                headline = R.string.import_patch_selection,
-                description = R.string.import_patch_selection_description
-            )
-
-            GroupHeader(stringResource(R.string.export))
            GroupItem(
                onClick = {
                    if (!vm.canExport()) {
@ -173,25 +125,54 @@ fun ImportExportSettingsScreen(
                headline = R.string.export_keystore,
                description = R.string.export_keystore_description
            )
-            GroupItem(
-                onClick = vm::exportSelection,
-                headline = R.string.export_patch_selection,
-                description = R.string.export_patch_selection_description
-            )
-
-            GroupHeader(stringResource(R.string.reset))
            GroupItem(
                onClick = vm::regenerateKeystore,
                headline = R.string.regenerate_keystore,
                description = R.string.regenerate_keystore_description
            )
+
+            GroupHeader(stringResource(R.string.patches))
            GroupItem(
-                onClick = vm::resetSelection, // TODO: allow resetting selection for specific bundle or package name.
+                onClick = vm::importSelection,
+                headline = R.string.import_patch_selection,
+                description = R.string.import_patch_selection_description
+            )
+            GroupItem(
+                onClick = vm::exportSelection,
+                headline = R.string.export_patch_selection,
+                description = R.string.export_patch_selection_description
+            )
+            // TODO: allow resetting selection for specific bundle or package name.
+            GroupItem(
+                onClick = vm::resetSelection,
                headline = R.string.reset_patch_selection,
                description = R.string.reset_patch_selection_description
            )
+
+            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
+                }
+
+            // TODO: patch options import/export.
            GroupItem(
-                onClick = vm::resetOptions, // TODO: patch options import/export.
+                onClick = vm::resetOptions,
                headline = R.string.patch_options_reset_all,
                description = R.string.patch_options_reset_all_description,
            )
@ -200,13 +181,12 @@ fun ImportExportSettingsScreen(
                headline = R.string.patch_options_reset_package,
                description = R.string.patch_options_reset_package_description
            )
-            if (patchBundles.size > 1) {
+            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
@ -18,7 +18,7 @@ import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults

@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
@ -7,12 +7,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 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.unit.dp
@ -27,21 +24,17 @@ import org.koin.androidx.compose.koinViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun ChangelogsSettingsScreen(
+fun ChangelogsScreen(
    onBackClick: () -> Unit,
    vm: ChangelogsViewModel = koinViewModel()
 ) {
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-
    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.changelog),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        ColumnWithScrollbar(
            modifier = Modifier
--- 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
@ -5,13 +5,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 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 app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
@ -19,7 +15,6 @@ import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.UpdatesSettingsViewModel
-import app.revanced.manager.util.toast
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel

@ -31,19 +26,15 @@ fun UpdatesSettingsScreen(
    onUpdateClick: () -> Unit,
    vm: UpdatesSettingsViewModel = koinViewModel(),
 ) {
-    val context = LocalContext.current
    val coroutineScope = rememberCoroutineScope()
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())

    Scaffold(
        topBar = {
            AppTopBar(
                title = stringResource(R.string.updates),
-                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick
            )
-        },
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        }
    ) { paddingValues ->
        ColumnWithScrollbar(
            modifier = Modifier
@ -53,10 +44,6 @@ fun UpdatesSettingsScreen(
            SettingsListItem(
                modifier = Modifier.clickable {
                    coroutineScope.launch {
-                        if (!vm.isConnected) {
-                            context.toast(context.getString(R.string.no_network_toast))
-                            return@launch
-                        }
                        if (vm.checkForUpdates()) onUpdateClick()
                    }
                },
@ -65,13 +52,7 @@ fun UpdatesSettingsScreen(
            )

            SettingsListItem(
-                modifier = Modifier.clickable {
-                    if (!vm.isConnected) {
-                        context.toast(context.getString(R.string.no_network_toast))
-                        return@clickable
-                    }
-                    onChangelogClick()
-                },
+                modifier = Modifier.clickable(onClick = onChangelogClick),
                headlineContent = stringResource(R.string.changelog),
                supportingContent = stringResource(
                    R.string.changelog_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
@ -7,8 +7,6 @@ import androidx.compose.runtime.mutableStateOf
 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
@ -25,27 +23,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

-class AboutViewModel(
-    private val reVancedAPI: ReVancedAPI,
-    private val network: NetworkInfo,
-    prefs: PreferencesManager,
-) : ViewModel() {
+class AboutViewModel(private val reVancedAPI: ReVancedAPI) : ViewModel() {
    var socials by mutableStateOf(emptyList<ReVancedSocial>())
-        private set
+    	private set
    var contact by mutableStateOf<String?>(null)
-        private set
+      	private set
    var donate by mutableStateOf<String?>(null)
-        private set
-    val isConnected: Boolean
-        get() = network.isConnected()
-
-    val showDeveloperSettings = prefs.showDeveloperSettings
+      	private set

    init {
        viewModelScope.launch {
-            if (!isConnected) {
-                return@launch
-            }
            withContext(Dispatchers.IO) {
                reVancedAPI.getInfo("https://api.revanced.app").getOrNull()
            }?.let {
@ -57,8 +44,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/DashboardViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
@ -24,7 +24,9 @@ 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.delay
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch

@ -56,13 +58,19 @@ class DashboardViewModel(

    var updatedManagerVersion: String? by mutableStateOf(null)
        private set
-    var showBatteryOptimizationsWarning by mutableStateOf(false)
-        private set
+    val showBatteryOptimizationsWarningFlow = flow {
+        while (true) {
+            // There is no callback for this, so we have to poll it.
+            val result = !powerManager.isIgnoringBatteryOptimizations(app.packageName)
+            emit(result)
+            if (!result) return@flow
+            delay(500L)
+        }
+    }

    init {
        viewModelScope.launch {
            checkForManagerUpdates()
-            updateBatteryOptimizationsWarning()
        }
    }

@ -82,10 +90,6 @@ class DashboardViewModel(
        }
    }

-    fun updateBatteryOptimizationsWarning() {
-        showBatteryOptimizationsWarning = !powerManager.isIgnoringBatteryOptimizations(app.packageName)
-    }
-
    fun setShowManagerUpdateDialogOnLaunch(value: Boolean) {
        viewModelScope.launch {
            prefs.showManagerUpdateDialogOnLaunch.update(value)
--- 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
@ -69,27 +69,25 @@ class ImportExportViewModel(
    }

    fun startKeystoreImport(content: Uri) = viewModelScope.launch {
-        uiSafe(app, R.string.failed_to_import_keystore, "Failed to import keystore") {
-            val path = withContext(Dispatchers.IO) {
-                File.createTempFile("signing", "ks", app.cacheDir).toPath().also {
-                    Files.copy(
-                        contentResolver.openInputStream(content)!!,
-                        it,
-                        StandardCopyOption.REPLACE_EXISTING
-                    )
-                }
+        val path = withContext(Dispatchers.IO) {
+            File.createTempFile("signing", "ks", app.cacheDir).toPath().also {
+                Files.copy(
+                    contentResolver.openInputStream(content)!!,
+                    it,
+                    StandardCopyOption.REPLACE_EXISTING
+                )
            }
-
-            aliases.forEach { alias ->
-                knownPasswords.forEach { pass ->
-                    if (tryKeystoreImport(alias, pass, path)) {
-                        return@launch
-                    }
-                }
-            }
-
-            keystoreImportPath = path
        }
+
+        aliases.forEach { alias ->
+            knownPasswords.forEach { pass ->
+                if (tryKeystoreImport(alias, pass, path)) {
+                    return@launch
+                }
+            }
+        }
+
+        keystoreImportPath = path
    }

    fun cancelKeystoreImport() {
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt
@ -2,10 +2,13 @@ package app.revanced.manager.ui.viewmodel

 import android.app.Activity
 import android.app.Application
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.util.Base64
 import android.util.Log
+import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
@ -25,7 +28,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json

 class MainViewModel(
@ -34,13 +36,10 @@ class MainViewModel(
    private val downloadedAppRepository: DownloadedAppRepository,
    private val keystoreManager: KeystoreManager,
    private val app: Application,
-    val prefs: PreferencesManager,
-    private val json: Json
+    val prefs: PreferencesManager
 ) : ViewModel() {
    private val appSelectChannel = Channel<SelectedApp>()
    val appSelectFlow = appSelectChannel.receiveAsFlow()
-    private val legacyImportActivityChannel = Channel<Intent>()
-    val legacyImportActivityFlow = legacyImportActivityChannel.receiveAsFlow()

    private suspend fun suggestedVersion(packageName: String) =
        patchBundleRepository.suggestedVersions.first()[packageName]
@ -51,8 +50,7 @@ class MainViewModel(
        val suggestedVersion = suggestedVersion(app.packageName) ?: return null

        val downloadedApp =
-            downloadedAppRepository.get(app.packageName, suggestedVersion, markUsed = true)
-                ?: return null
+            downloadedAppRepository.get(app.packageName, suggestedVersion, markUsed = true) ?: return null
        return SelectedApp.Local(
            downloadedApp.packageName,
            downloadedApp.version,
@ -69,46 +67,42 @@ class MainViewModel(
        selectApp(SelectedApp.Search(packageName, suggestedVersion(packageName)))
    }

-    init {
-        viewModelScope.launch {
-            if (!prefs.firstLaunch.get()) return@launch
-            legacyImportActivityChannel.send(Intent().apply {
+    fun importLegacySettings(componentActivity: ComponentActivity) {
+        if (!prefs.firstLaunch.getBlocking()) return
+
+        try {
+            val launcher = componentActivity.registerForActivityResult(
+                ActivityResultContracts.StartActivityForResult()
+            ) { result: ActivityResult ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    result.data?.getStringExtra("data")?.let {
+                        applyLegacySettings(it)
+                    } ?: app.toast(app.getString(R.string.legacy_import_failed))
+                } else {
+                    app.toast(app.getString(R.string.legacy_import_failed))
+                }
+            }
+
+            val intent = Intent().apply {
                setClassName(
                    "app.revanced.manager.flutter",
                    "app.revanced.manager.flutter.ExportSettingsActivity"
                )
-            })
+            }
+
+            launcher.launch(intent)
+        } catch (e: Exception) {
+            if (e !is ActivityNotFoundException) {
+                app.toast(app.getString(R.string.legacy_import_failed))
+                Log.e(tag, "Failed to launch legacy import activity: $e")
+            }
        }
    }

-    fun applyLegacySettings(result: ActivityResult) {
-        if (result.resultCode != Activity.RESULT_OK) {
-            app.toast(app.getString(R.string.legacy_import_failed))
-            Log.e(
-                tag,
-                "Got unknown result code while importing legacy settings: ${result.resultCode}"
-            )
-            return
-        }
+    private fun applyLegacySettings(data: String) = viewModelScope.launch {
+        val json = Json { ignoreUnknownKeys = true }
+        val settings = json.decodeFromString<LegacySettings>(data)

-        val jsonStr = result.data?.getStringExtra("data")
-        if (jsonStr == null) {
-            app.toast(app.getString(R.string.legacy_import_failed))
-            Log.e(tag, "Legacy settings data is null")
-            return
-        }
-        val settings = try {
-            json.decodeFromString<LegacySettings>(jsonStr)
-        } catch (e: SerializationException) {
-            app.toast(app.getString(R.string.legacy_import_failed))
-            Log.e(tag, "Legacy settings data could not be deserialized", e)
-            return
-        }
-
-        applyLegacySettings(settings)
-    }
-
-    private fun applyLegacySettings(settings: LegacySettings) = viewModelScope.launch {
        settings.themeMode?.let { theme ->
            val themeMap = mapOf(
                0 to Theme.SYSTEM,
@ -151,7 +145,6 @@ class MainViewModel(
        settings.patches?.let { selection ->
            patchSelectionRepository.import(0, selection)
        }
-        Log.d(tag, "Imported legacy settings")
    }

    @Serializable
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
@ -83,9 +83,7 @@ class PatcherViewModel(
    private val savedStateHandle: SavedStateHandle = get()

    private var installedApp: InstalledApp? = null
-    private val selectedApp = input.selectedApp
-    val packageName = selectedApp.packageName
-    val version = selectedApp.version
+    val packageName = input.selectedApp.packageName

    var installedPackageName by savedStateHandle.saveable(
        key = "installedPackageName",
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt
@ -1,13 +1,14 @@
 package app.revanced.manager.ui.viewmodel

 import android.app.Application
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.Saver
-import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
@ -30,20 +31,15 @@ import app.revanced.manager.util.saver.persistentMapSaver
 import app.revanced.manager.util.saver.persistentSetSaver
 import app.revanced.manager.util.saver.snapshotStateMapSaver
 import app.revanced.manager.util.toast
-import kotlinx.collections.immutable.PersistentMap
-import kotlinx.collections.immutable.PersistentSet
-import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.collections.immutable.toPersistentMap
-import kotlinx.collections.immutable.toPersistentSet
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
+import kotlinx.collections.immutable.*
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map

@OptIn(SavedStateHandleSaveableApi::class)
 class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.ViewModelParams) :
@ -108,7 +104,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi

    val compatibleVersions = mutableStateListOf<String>()

-    var filter by mutableIntStateOf(SHOW_UNIVERSAL)
+    var filter by mutableIntStateOf(0)
        private set

    private val defaultPatchSelection = bundlesFlow.map { bundles ->
@ -213,8 +209,8 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
        compatibleVersions.clear()
    }

-    fun openIncompatibleDialog(incompatiblePatch: PatchInfo) {
-        compatibleVersions.addAll(incompatiblePatch.compatiblePackages?.find { it.packageName == packageName }?.versions.orEmpty())
+    fun openUnsupportedDialog(unsupportedPatch: PatchInfo) {
+        compatibleVersions.addAll(unsupportedPatch.compatiblePackages?.find { it.packageName == packageName }?.versions.orEmpty())
    }

    fun toggleFlag(flag: Int) {
@ -222,8 +218,9 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
    }

    companion object {
-        const val SHOW_INCOMPATIBLE = 1 // 2^0
+        const val SHOW_SUPPORTED = 1 // 2^0
        const val SHOW_UNIVERSAL = 2 // 2^1
+        const val SHOW_UNSUPPORTED = 4 // 2^2

        private val optionsSaver: Saver<PersistentOptions, Options> = snapshotStateMapSaver(
            // Patch name -> Options
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt
@ -30,13 +30,14 @@ import app.revanced.manager.domain.repository.PatchOptionsRepository
 import app.revanced.manager.domain.repository.PatchSelectionRepository
 import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
 import app.revanced.manager.network.downloader.ParceledDownloaderData
+import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.plugin.downloader.GetScope
 import app.revanced.manager.plugin.downloader.PluginHostApi
 import app.revanced.manager.plugin.downloader.UserInteractionException
 import app.revanced.manager.ui.model.BundleInfo
 import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
-import app.revanced.manager.ui.model.BundleInfo.Extensions.requiredOptionsSet
 import app.revanced.manager.ui.model.BundleInfo.Extensions.toPatchSelection
+import app.revanced.manager.ui.model.BundleInfo.Extensions.requiredOptionsSet
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.model.navigation.Patcher
 import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
@ -274,25 +275,25 @@ class SelectedAppInfoViewModel(
        )

    suspend fun getPatcherParams(): Patcher.ViewModelParams {
-        val allowIncompatible = prefs.disablePatchVersionCompatCheck.get()
+        val allowUnsupported = prefs.disablePatchVersionCompatCheck.get()
        val bundles = bundleInfoFlow.first()
        return Patcher.ViewModelParams(
            selectedApp,
-            getPatches(bundles, allowIncompatible),
+            getPatches(bundles, allowUnsupported),
            getOptionsFiltered(bundles)
        )
    }

    fun getOptionsFiltered(bundles: List<BundleInfo>) = options.filtered(bundles)

-    fun getPatches(bundles: List<BundleInfo>, allowIncompatible: Boolean) =
-        selectionState.patches(bundles, allowIncompatible)
+    fun getPatches(bundles: List<BundleInfo>, allowUnsupported: Boolean) =
+        selectionState.patches(bundles, allowUnsupported)

    fun getCustomPatches(
        bundles: List<BundleInfo>,
-        allowIncompatible: Boolean
+        allowUnsupported: Boolean
    ): PatchSelection? =
-        (selectionState as? SelectionState.Customized)?.patches(bundles, allowIncompatible)
+        (selectionState as? SelectionState.Customized)?.patches(bundles, allowUnsupported)

    fun updateConfiguration(selection: PatchSelection?, options: Options) = viewModelScope.launch {
        val bundles = bundleInfoFlow.first()
@ -342,13 +343,13 @@ class SelectedAppInfoViewModel(
 }

 private sealed interface SelectionState : Parcelable {
-    fun patches(bundles: List<BundleInfo>, allowIncompatible: Boolean): PatchSelection
+    fun patches(bundles: List<BundleInfo>, allowUnsupported: Boolean): PatchSelection

    @Parcelize
    data class Customized(val patchSelection: PatchSelection) : SelectionState {
-        override fun patches(bundles: List<BundleInfo>, allowIncompatible: Boolean) =
+        override fun patches(bundles: List<BundleInfo>, allowUnsupported: Boolean) =
            bundles.toPatchSelection(
-                allowIncompatible
+                allowUnsupported
            ) { uid, patch ->
                patchSelection[uid]?.contains(patch.name) ?: false
            }
@ -356,8 +357,8 @@ private sealed interface SelectionState : Parcelable {

    @Parcelize
    data object Default : SelectionState {
-        override fun patches(bundles: List<BundleInfo>, allowIncompatible: Boolean) =
-            bundles.toPatchSelection(allowIncompatible) { _, patch -> patch.include }
+        override fun patches(bundles: List<BundleInfo>, allowUnsupported: Boolean) =
+            bundles.toPatchSelection(allowUnsupported) { _, patch -> patch.include }
    }
 }

--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateViewModel.kt
@ -9,7 +9,6 @@ import android.content.pm.PackageInstaller
 import androidx.annotation.StringRes
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.core.content.ContextCompat
@ -43,9 +42,9 @@ class UpdateViewModel(
    private val networkInfo: NetworkInfo by inject()
    private val fs: Filesystem by inject()

-    var downloadedSize by mutableLongStateOf(0L)
+    var downloadedSize by mutableStateOf(0L)
        private set
-    var totalSize by mutableLongStateOf(0L)
+    var totalSize by mutableStateOf(0L)
        private set
    val downloadProgress by derivedStateOf {
        if (downloadedSize == 0L || totalSize == 0L) return@derivedStateOf 0f
@ -90,7 +89,7 @@ class UpdateViewModel(
                            totalSize = contentLength
                        }
                    }
-                    installUpdate()
+                    state = State.CAN_INSTALL
                }
            }
        }
@ -109,19 +108,14 @@ class UpdateViewModel(
                val extra =
                    intent.getStringExtra(InstallService.EXTRA_INSTALL_STATUS_MESSAGE)!!

-                when(pmStatus) {
-                    PackageInstaller.STATUS_SUCCESS -> {
-                        app.toast(app.getString(R.string.install_app_success))
-                        state = State.SUCCESS
-                    }
-                    PackageInstaller.STATUS_FAILURE_ABORTED -> {
-                        state = State.CAN_INSTALL
-                    }
-                    else -> {
-                        app.toast(app.getString(R.string.install_app_fail, extra))
-                        installError = extra
-                        state = State.FAILED
-                    }
+                if (pmStatus == PackageInstaller.STATUS_SUCCESS) {
+                    app.toast(app.getString(R.string.install_app_success))
+                    state = State.SUCCESS
+                } else {
+                    state = State.FAILED
+                    // TODO: handle install fail with a popup
+                    installError = extra
+                    app.toast(app.getString(R.string.install_app_fail, extra))
                }
            }
        }
@ -141,10 +135,10 @@ class UpdateViewModel(
        location.delete()
    }

-    enum class State(@StringRes val title: Int) {
+    enum class State(@StringRes val title: Int, val showCancel: Boolean = false) {
        CAN_DOWNLOAD(R.string.update_available),
-        DOWNLOADING(R.string.downloading_manager_update),
-        CAN_INSTALL(R.string.ready_to_install_update),
+        DOWNLOADING(R.string.downloading_manager_update, true),
+        CAN_INSTALL(R.string.ready_to_install_update, true),
        INSTALLING(R.string.installing_manager_update),
        FAILED(R.string.install_update_manager_failed),
        SUCCESS(R.string.update_completed)
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdatesSettingsViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdatesSettingsViewModel.kt
@ -3,7 +3,6 @@ package app.revanced.manager.ui.viewmodel
 import android.app.Application
 import androidx.lifecycle.ViewModel
 import app.revanced.manager.R
-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.util.toast
@ -13,14 +12,10 @@ class UpdatesSettingsViewModel(
    prefs: PreferencesManager,
    private val app: Application,
    private val reVancedAPI: ReVancedAPI,
-    private val network: NetworkInfo,
 ) : ViewModel() {
    val managerAutoUpdates = prefs.managerAutoUpdates
    val showManagerUpdateDialogOnLaunch = prefs.showManagerUpdateDialogOnLaunch

-    val isConnected: Boolean
-        get() = network.isConnected()
-
    suspend fun checkForUpdates(): Boolean {
        uiSafe(app, R.string.failed_to_check_updates, "Failed to check for updates") {
            app.toast(app.getString(R.string.update_check))
--- a/app/src/main/java/app/revanced/manager/util/Util.kt
+++ b/app/src/main/java/app/revanced/manager/util/Util.kt
@ -180,10 +180,6 @@ fun LocalDateTime.relativeTime(context: Context): String {

 private var transparentListItemColorsCached: ListItemColors? = null

-fun resetListItemColorsCached() {
-    transparentListItemColorsCached = null
-}
-
 /**
 * The default ListItem colors, but with [ListItemColors.containerColor] set to [Color.Transparent].
 */
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -38,8 +38,6 @@
    <string name="android_11_bug_dialog_title">Android 11 bug</string>
    <string name="android_11_bug_dialog_description">The app installation permission must be granted ahead of time to avoid a bug in the Android 11 system that will negatively affect the user experience.</string>

-    <string name="no_network_toast">No internet connection available</string>
-
    <string name="selected_app_meta_any_version">Any available version</string>
    <string name="app_source_dialog_title">Select source</string>
    <string name="app_source_dialog_option_auto">Auto</string>
@ -53,9 +51,6 @@
    <string name="patch_selector_item_description">%d patches selected</string>
    <string name="no_patches_selected">No patches selected</string>

-    <string name="network_unavailable_warning">Your device is not connected to the internet. Downloading will fail later.</string>
-    <string name="network_metered_warning">You are currently on a metered connection. Data charges from your service provider may apply.</string>
-
    <string name="apk_source_selector_item">Change source</string>
    <string name="apk_source_auto">Current: All downloaders</string>
    <string name="apk_source_downloader">Current: %s</string>
@ -92,7 +87,7 @@
    <string name="theme_description">Choose between light or dark theme</string>
    <string name="safeguards">Safeguards</string>
    <string name="patch_compat_check">Disable version compatibility check</string>
-    <string name="patch_compat_check_description">The check restricts patches to compatible app versions</string>
+    <string name="patch_compat_check_description">The check restricts patches to supported app versions</string>
    <string name="patch_compat_check_confirmation">Selecting incompatible patches can result in a broken app.\n\nDo you want to proceed anyways?</string>
    <string name="suggested_version_safeguard">Require suggested app version</string>
    <string name="suggested_version_safeguard_description">Enforce selection of the suggested app version</string>
@ -143,8 +138,6 @@
    <string name="downloader_plugin_trust_dialog_title">Trust plugin?</string>
    <string name="downloader_plugin_revoke_trust_dialog_title">Revoke trust?</string>
    <string name="downloader_plugin_trust_dialog_body">Package name: %1$s\nSignature (SHA-256): %2$s</string>
-    <string name="downloader_plugin_delete_apps_title">Delete selected apps</string>
-    <string name="downloader_plugin_delete_apps_description">Are you sure you want to delete the selected apps?</string>
    <string name="downloader_settings_no_apps">No downloaded apps found</string>

    <string name="search_apps">Search apps…</string>
@ -171,7 +164,6 @@
    <string name="warning">Warning</string>
    <string name="add">Add</string>
    <string name="close">Close</string>
-    <string name="clear">Clear</string>
    <string name="system">System</string>
    <string name="light">Light</string>
    <string name="dark">Dark</string>
@ -218,7 +210,7 @@
    <string name="no_patched_apps_found">No patched apps found</string>
    <string name="tap_on_patches">Tap on the patches to get more information about them</string>
    <string name="bundles_selected">%s selected</string>
-    <string name="incompatible_patches">Incompatible patches</string>
+    <string name="unsupported_patches">Unsupported patches</string>
    <string name="universal_patches">Universal patches</string>
    <string name="patch_selection_reset_toast">Patch selection and options has been reset to recommended defaults</string>
    <string name="patch_options_reset_toast">Patch options have been reset</string>
@ -227,12 +219,13 @@
    <string name="selection_warning_title">Stop using defaults?</string>
    <string name="selection_warning_description">It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou need to turn on \"Allow changing patch selection\" in the advanced settings before toggling patches.</string>
    <string name="universal_patch_warning_description">Universal patches have a more generalized use and do not work as reliably as patches that target specific apps. You may encounter issues while using them.\n\nThis warning can be disabled in the advanced settings.</string>
-    <string name="this_version">This version</string>
-    <string name="universal">Any app</string>
-    <string name="search_patches">Search patches</string>
-    <string name="app_version_not_compatible">This patch is not compatible with the selected app version (%1$s).\n\nIt is only compatible with the following version(s): %2$s.</string>
+    <string name="supported">Supported</string>
+    <string name="universal">Universal</string>
+    <string name="unsupported">Unsupported</string>
+    <string name="search_patches">Patch name</string>
+    <string name="app_not_supported">This patch is not compatible with the selected app version (%1$s).\n\nIt only supports the following version(s): %2$s.</string>
    <string name="continue_with_version">Continue with this version?</string>
-    <string name="version_not_compatible">Not all patches are compatible with this version (%s). Do you want to continue anyway?</string>
+    <string name="version_not_supported">Not all patches support this version (%s). Do you want to continue anyway?</string>
    <string name="download_application">Download application?</string>
    <string name="app_not_installed">The app you selected isn\'t installed. Do you want to download it?</string>
    <string name="failed_to_load_apk">Failed to load APK</string>
@ -303,8 +296,6 @@
    <string name="patcher_step_write_patched">Write patched APK file</string>
    <string name="patcher_step_sign_apk">Sign patched APK file</string>
    <string name="patcher_notification_message">Patching in progress…</string>
-    <string name="patcher_stop_confirm_title">Stop patcher</string>
-    <string name="patcher_stop_confirm_description">Are you sure you want to stop the patching process?</string>
    <string name="execute_patches">Execute patches</string>
    <string name="executing_patch">Execute %s</string>
    <string name="failed_to_execute_patch">Failed to execute %s</string>
@ -340,17 +331,9 @@
    <string name="bundle_view_patches">View patches</string>
    <string name="bundle_view_patches_any_version">Any version</string>
    <string name="bundle_view_patches_any_package">Any package</string>
-    <string name="bundle_delete_single_dialog_title">Delete bundle</string>
-    <string name="bundle_delete_multiple_dialog_title">Delete bundles</string>
-    <string name="bundle_delete_single_dialog_description">Are you sure you want to delete the bundle \"%s\"?</string>
-    <string name="bundle_delete_multiple_dialog_description">Are you sure you want to delete the selected bundles?</string>
-

    <string name="about_revanced_manager">About ReVanced Manager</string>
    <string name="revanced_manager_description">ReVanced Manager is an application designed to work with ReVanced Patcher, which allows for long-lasting patches to be created for Android apps. The patching system is designed to automatically work with new versions of apps with minimal maintenance.</string>
-    <string name="developer_options_taps">%d taps remaining</string>
-    <string name="developer_options_enabled">Developer options enabled</string>
-    <string name="developer_options_already_enabled">Developer options are already enabled</string>
    <string name="update_available">An update is available</string>
    <string name="current_version">Current version: %s</string>
    <string name="new_version">New version: %s</string>
@ -371,7 +354,6 @@
    <string name="download_manager_failed">Failed to download update: %s</string>
    <string name="cancel">Cancel</string>
    <string name="save">Save</string>
-    <string name="save_with_count">Save (%1$s)</string>
    <string name="update">Update</string>
    <string name="empty">Empty</string>
    <string name="installing_message">Tap on <b>Update</b> when prompted. \n ReVanced Manager will close when updating.</string>
@ -416,7 +398,7 @@
    <string name="installation_aborted_description">The installation was cancelled manually. Try again?</string>
    <string name="installation_blocked_description">The installation was blocked. Review your device security settings and try again.</string>
    <string name="installation_conflict_description">The installation was prevented by an existing installation of the app. Uninstall the installed app and try again?</string>
-    <string name="installation_incompatible_description">The app is incompatible with this device. Use an APK that is compatible by this device and try again.</string>
+    <string name="installation_incompatible_description">The app is incompatible with this device. Use an APK that is supported by this device and try again.</string>
    <string name="installation_invalid_description">The app is invalid. Uninstall the app and try again?</string>
    <string name="installation_storage_issue_description">The app could not be installed due to insufficient storage. Free up some space and try again.</string>
    <string name="installation_timeout_description">The installation took too long. Try again?</string>
@ -429,13 +411,10 @@
    <string name="add_patch_bundle">Add patch bundle</string>
    <string name="bundle_url">Bundle URL</string>
    <string name="auto_update">Auto update</string>
-    <string name="incompatible_patches_dialog">These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details.</string>
-    <string name="incompatible_patch">Incompatible patch</string>
+    <string name="unsupported_patches_dialog">These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details.</string>
+    <string name="unsupported_patch">Unsupported patch</string>
    <string name="any_version">Any</string>
    <string name="never_show_again">Never show again</string>
    <string name="show_manager_update_dialog_on_launch">Show update message on launch</string>
    <string name="show_manager_update_dialog_on_launch_description">Shows a popup notification whenever there is a new update available on launch.</string>
-    <string name="failed_to_import_keystore">Failed to import keystore</string>
-    <string name="export">Export</string>
-    <string name="confirm">Confirm</string>
 </resources>
--- a/assets/revanced-logo/revanced-logo-round.svg
+++ b/assets/revanced-logo/revanced-logo-round.svg
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -7,4 +7,10 @@ plugins {
    alias(libs.plugins.kotlin.parcelize) apply false
    alias(libs.plugins.about.libraries) apply false
    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.binary.compatibility.validator)
 }
+
+apiValidation {
+    ignoredProjects.addAll(listOf("app", "example-downloader-plugin"))
+    nonPublicMarkers += "app.revanced.manager.plugin.downloader.PluginHostApi"
+}
--- a/downloader-plugin/.gitignore
+++ b/downloader-plugin/.gitignore
@ -0,0 +1 @@
+/build
--- a/downloader-plugin/api/downloader-plugin.api
+++ b/downloader-plugin/api/downloader-plugin.api
@ -0,0 +1,171 @@
+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 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 final class app/revanced/manager/plugin/downloader/DownloaderBuilder {
+}
+
+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 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 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 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 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 final class app/revanced/manager/plugin/downloader/UserInteractionException$Activity$NotCompleted : app/revanced/manager/plugin/downloader/UserInteractionException$Activity {
+	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 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 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/downloader-plugin/build.gradle.kts
+++ b/downloader-plugin/build.gradle.kts
@ -0,0 +1,61 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.parcelize)
+    `maven-publish`
+}
+
+android {
+    namespace = "app.revanced.manager.plugin.downloader"
+    compileSdk = 35
+
+    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
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        aidl = true
+    }
+}
+dependencies {
+    implementation(libs.androidx.ktx)
+    implementation(libs.activity.ktx)
+    implementation(libs.runtime.ktx)
+    implementation(libs.appcompat)
+}
+
+publishing {
+    repositories {
+        mavenLocal()
+    }
+
+    publications {
+        create<MavenPublication>("release") {
+            groupId = "app.revanced"
+            artifactId = "manager-downloader-plugin"
+            version = "1.0"
+
+            afterEvaluate {
+                from(components["release"])
+            }
+        }
+    }
+}
--- a/downloader-plugin/consumer-rules.pro
+++ b/downloader-plugin/consumer-rules.pro
--- a/downloader-plugin/proguard-rules.pro
+++ b/downloader-plugin/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/downloader-plugin/src/main/AndroidManifest.xml
+++ b/downloader-plugin/src/main/AndroidManifest.xml
@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>
--- a/downloader-plugin/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebView.aidl
+++ b/downloader-plugin/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebView.aidl
@ -0,0 +1,8 @@
+// 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/downloader-plugin/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebViewEvents.aidl
+++ b/downloader-plugin/src/main/aidl/app/revanced/manager/plugin/downloader/webview/IWebViewEvents.aidl
@ -0,0 +1,11 @@
+// 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/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Constants.kt
+++ b/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Constants.kt
@ -0,0 +1,7 @@
+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/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Downloader.kt
+++ b/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Downloader.kt
@ -0,0 +1,165 @@
+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/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Extensions.kt
+++ b/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Extensions.kt
@ -0,0 +1,42 @@
+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/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Parcelables.kt
+++ b/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/Parcelables.kt
@ -0,0 +1,39 @@
+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/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/webview/API.kt
+++ b/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/webview/API.kt
@ -0,0 +1,176 @@
+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/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/webview/WebViewActivity.kt
+++ b/downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/webview/WebViewActivity.kt
@ -0,0 +1,161 @@
+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/downloader-plugin/src/main/res/layout/activity_webview.xml
+++ b/downloader-plugin/src/main/res/layout/activity_webview.xml
@ -0,0 +1,11 @@
+<?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/downloader-plugin/src/main/res/values/strings.xml
+++ b/downloader-plugin/src/main/res/values/strings.xml
@ -0,0 +1 @@
+<resources></resources>
--- a/downloader-plugin/src/main/res/values/themes.xml
+++ b/downloader-plugin/src/main/res/values/themes.xml
@ -0,0 +1,7 @@
+<?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/example-downloader-plugin/.gitignore
+++ b/example-downloader-plugin/.gitignore
@ -0,0 +1 @@
+/build
--- a/example-downloader-plugin/build.gradle.kts
+++ b/example-downloader-plugin/build.gradle.kts
@ -0,0 +1,53 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    val packageName = "app.revanced.manager.plugin.downloader.example"
+
+    namespace = packageName
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = packageName
+        minSdk = 26
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+
+            if (project.hasProperty("signAsDebug")) {
+                signingConfig = signingConfigs.getByName("debug")
+            }
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures.compose = true
+}
+
+dependencies {
+    implementation(libs.activity.compose)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling)
+    implementation(libs.compose.material3)
+
+    compileOnly(project(":downloader-plugin"))
+}
--- a/example-downloader-plugin/proguard-rules.pro
+++ b/example-downloader-plugin/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/example-downloader-plugin/src/main/AndroidManifest.xml
+++ b/example-downloader-plugin/src/main/AndroidManifest.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-feature android:name="app.revanced.manager.plugin.downloader" />
+
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        tools:targetApi="34">
+
+        <activity
+            android:name=".InteractionActivity"
+            android:exported="true"
+            android:permission="app.revanced.manager.permission.PLUGIN_HOST"
+            android:theme="@android:style/Theme.DeviceDefault" />
+
+        <meta-data
+            android:name="app.revanced.manager.plugin.downloader.class"
+            android:value="app.revanced.manager.plugin.downloader.example.ExamplePluginKt" />
+    </application>
+
+</manifest>
--- a/example-downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/example/ExamplePlugin.kt
+++ b/example-downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/example/ExamplePlugin.kt
@ -0,0 +1,69 @@
+@file:Suppress("Unused")
+
+package app.revanced.manager.plugin.downloader.example
+
+import android.app.Application
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Parcelable
+import app.revanced.manager.plugin.downloader.Downloader
+import app.revanced.manager.plugin.downloader.requestStartActivity
+import app.revanced.manager.plugin.downloader.webview.WebViewDownloader
+import kotlinx.parcelize.Parcelize
+import kotlin.io.path.*
+
+val apkMirrorDownloader = WebViewDownloader { packageName, version ->
+    with(Uri.Builder()) {
+        scheme("https")
+        authority("www.apkmirror.com")
+        mapOf(
+            "post_type" to "app_release",
+            "searchtype" to "apk",
+            "s" to (version?.let { "$packageName $it" } ?: packageName),
+            "bundles%5B%5D" to "apk_files" // bundles[]
+        ).forEach { (key, value) ->
+            appendQueryParameter(key, value)
+        }
+
+        build().toString()
+    }
+}
+
+@Parcelize
+class InstalledApp(val path: String) : Parcelable
+
+private val application by lazy {
+    // Don't do this in a real plugin.
+    val clazz = Class.forName("android.app.ActivityThread")
+    val activityThread = clazz.getMethod("currentActivityThread")(null)
+    clazz.getMethod("getApplication")(activityThread) as Application
+}
+
+val installedAppDownloader = Downloader<InstalledApp> {
+    val pm = application.packageManager
+
+    get { packageName, version ->
+        val packageInfo = try {
+            pm.getPackageInfo(packageName, 0)
+        } catch (_: PackageManager.NameNotFoundException) {
+            return@get null
+        }
+        if (version != null && packageInfo.versionName != version) return@get null
+
+        requestStartActivity<InteractionActivity>()
+
+        InstalledApp(packageInfo.applicationInfo!!.sourceDir) to packageInfo.versionName
+    }
+
+
+    download { app ->
+        with(Path(app.path)) { inputStream() to fileSize() }
+    }
+
+    /*
+    download { app, outputStream ->
+        val path = Path(app.path)
+        reportSize(path.fileSize())
+        Files.copy(path, outputStream)
+    }*/
+}
--- a/example-downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/example/InteractionActivity.kt
+++ b/example-downloader-plugin/src/main/java/app/revanced/manager/plugin/downloader/example/InteractionActivity.kt
@ -0,0 +1,65 @@
+package app.revanced.manager.plugin.downloader.example
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.ui.Modifier
+
+class InteractionActivity : ComponentActivity() {
+    @OptIn(ExperimentalMaterial3Api::class)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            val isDarkTheme = isSystemInDarkTheme()
+
+            val colorScheme = if (isDarkTheme) darkColorScheme() else lightColorScheme()
+
+            MaterialTheme(colorScheme) {
+                Scaffold(
+                    topBar = {
+                        TopAppBar(
+                            title = { Text("User interaction example") }
+                        )
+                    }
+                ) { paddingValues ->
+                    Column(modifier = Modifier.padding(paddingValues)) {
+                        Text("This is an example interaction.")
+                        Row {
+                            TextButton(
+                                onClick = {
+                                    setResult(RESULT_CANCELED)
+                                    finish()
+                                }
+                            ) {
+                                Text("Cancel")
+                            }
+
+                            TextButton(
+                                onClick = {
+                                    setResult(RESULT_OK)
+                                    finish()
+                                }
+                            ) {
+                                Text("Continue")
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+}
--- a/example-downloader-plugin/src/main/res/drawable/ic_launcher_background.xml
+++ b/example-downloader-plugin/src/main/res/drawable/ic_launcher_background.xml
@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
--- a/example-downloader-plugin/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/example-downloader-plugin/src/main/res/drawable/ic_launcher_foreground.xml
@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/example-downloader-plugin/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ b/example-downloader-plugin/src/main/res/mipmap-anydpi/ic_launcher.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/example-downloader-plugin/src/main/res/mipmap-anydpi/ic_launcher_round.xml
+++ b/example-downloader-plugin/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/example-downloader-plugin/src/main/res/values/strings.xml
+++ b/example-downloader-plugin/src/main/res/values/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Example Downloader Plugin</string>
+</resources>
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -1,41 +1,41 @@
 [versions]
-ktx = "1.16.0"
-material3 = "1.3.2"
-ui-tooling = "1.8.1"
-viewmodel-lifecycle = "2.9.0"
+ktx = "1.15.0"
+material3 = "1.3.1"
+ui-tooling = "1.7.6"
+viewmodel-lifecycle = "2.8.7"
 splash-screen = "1.0.1"
-activity = "1.10.1"
+activity = "1.9.3"
 appcompat = "1.7.0"
-preferences-datastore = "1.1.2"
-work-runtime = "2.10.1"
-compose-bom = "2025.05.00"
-navigation = "2.9.0"
-accompanist = "0.37.0"
+preferences-datastore = "1.1.1"
+work-runtime = "2.10.0"
+compose-bom = "2024.12.01"
+navigation = "2.8.5"
+accompanist = "0.34.0"
 placeholder = "1.1.2"
-reorderable = "2.4.3"
-serialization = "1.8.0"
+reorderable = "1.5.2"
+serialization = "1.7.3"
 collection = "0.3.8"
-datetime = "0.6.1"
-room-version = "2.7.1"
+datetime = "0.6.0"
+room-version = "2.6.1"
 revanced-patcher = "21.0.0"
 revanced-library = "3.0.2"
-plugin-api = "1.0.0"
 koin = "3.5.3"
 ktor = "2.3.9"
-markdown-renderer = "0.30.0"
+markdown-renderer = "0.22.0"
 fading-edges = "1.0.4"
-kotlin = "2.1.10"
-android-gradle-plugin = "8.9.1"
-dev-tools-gradle-plugin = "2.1.10-1.0.29"
-about-libraries-gradle-plugin = "11.5.0"
-coil = "2.7.0"
+kotlin = "2.1.0"
+android-gradle-plugin = "8.7.3"
+dev-tools-gradle-plugin = "2.1.0-1.0.29"
+about-libraries-gradle-plugin = "11.1.1"
+binary-compatibility-validator = "0.17.0"
+coil = "2.6.0"
 app-icon-loader-coil = "1.5.0"
 skrapeit = "1.2.2"
-libsu = "6.0.0"
+libsu = "5.2.2"
 scrollbars = "1.0.4"
-enumutil = "1.1.1"
+enumutil = "1.1.0"
 compose-icons = "1.2.4"
-kotlin-process = "1.5.1"
+kotlin-process = "1.4.1"
 hidden-api-stub = "4.3.3"

 [libraries]
@ -45,6 +45,7 @@ runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", ve
 runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "viewmodel-lifecycle" }
 splash-screen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splash-screen" }
 activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity" }
+activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
 work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work-runtime" }
 preferences-datastore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "preferences-datastore" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
@ -83,9 +84,6 @@ room-compiler = { group = "androidx.room", name = "room-compiler", version.ref =
 revanced-patcher = { group = "app.revanced", name = "revanced-patcher", version.ref = "revanced-patcher" }
 revanced-library = { group = "app.revanced", name = "revanced-library", version.ref = "revanced-library" }

-# Plugin API
-plugin-api = { group = "app.revanced", name = "revanced-manager-downloader-api", version.ref = "plugin-api" }
-
 # Koin
 koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
 koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
@ -145,4 +143,5 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 devtools = { id = "com.google.devtools.ksp", version.ref = "dev-tools-gradle-plugin" }
-about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries-gradle-plugin" }
+about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "about-libraries-gradle-plugin" }
+binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,7 +1,7 @@
+#Tue Nov 12 21:36:50 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/Show More
+++ b/Show More