update: rewrite ART method and module related code to C

This commit rewrites both ART method and module related code to C, following the same behavior, aside from the module's `on load` now be called globally, allowing a better flexibility. This will not impact any module.
improve: preload modules globally
2025-09-06 06:37:01 +00:00 · 2025-09-01 22:38:55 -03:00 · 2025-08-24 14:19:08 -03:00 · 2025-08-15 21:30:18 -03:00 · 2025-08-15 06:30:48 -03:00 · 2025-08-13 22:06:04 -03:00
131 changed files with 7885 additions and 3497 deletions
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -59,7 +59,7 @@ body:
    id: code_of_conduct
    attributes:
      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/PerformanC/voice/blob/main/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/PerformanC/contributing/blob/main/CODE_OF_CONDUCT.md)
      options:
        - label: I agree to follow this project's Code of Conduct
          required: true
--- a/.github/ISSUE_TEMPLATE/pull_request.yml
+++ b/.github/ISSUE_TEMPLATE/pull_request.yml
@@ -35,7 +35,7 @@ body:
    id: code_of_conduct
    attributes:
      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/PerformanC/voice/blob/main/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/PerformanC/contributing/blob/main/CODE_OF_CONDUCT.md)
      options:
        - label: I agree to follow this project's Code of Conduct
          required: true
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,6 @@
-name: CI
+name: Untrusted CI

 on:
-  push:
-    branches: [ main ]
-
  pull_request:
  merge_group:
  workflow_dispatch:
@@ -25,7 +22,7 @@ jobs:
          java-version: "17"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.2.1
+        uses: gradle/actions/setup-gradle@v4

      - name: Build with Gradle
        run: |
--- a/.github/workflows/trusted_ci.yml
+++ b/.github/workflows/trusted_ci.yml
@@ -0,0 +1,66 @@
+name: Trusted CI
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup keys
+        env:
+          private_key: ${{ secrets.ORG_PRIVATE_KEY }}
+          public_key: ${{ secrets.ORG_PUBLIC_KEY }}
+        run: |
+          if [ -z "$private_key" ] || [ -z "$public_key" ]; then
+            echo "Private or public key is not set."
+          else
+            echo "$private_key" | base64 -d > module/private_key
+            echo "$public_key" | base64 -d > module/public_key
+          fi
+
+      - name: Build with Gradle
+        run: |
+          echo 'org.gradle.parallel=true' >> gradle.properties
+          echo 'org.gradle.vfs.watch=true' >> gradle.properties
+          echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+          sed -i 's/org.gradle.unsafe.configuration-cache=true//g' gradle.properties
+          ./gradlew zipRelease
+          ./gradlew zipDebug
+
+      - name: Prepare artifact
+        if: success()
+        id: prepareArtifact
+        run: |
+          releaseName=`ls module/build/outputs/release/ReZygisk-v*-release.zip | awk -F '(/|.zip)' '{print $5}'` && echo "releaseName=$releaseName" >> $GITHUB_OUTPUT
+          debugName=`ls module/build/outputs/release/ReZygisk-v*-debug.zip | awk -F '(/|.zip)' '{print $5}'` && echo "debugName=$debugName" >> $GITHUB_OUTPUT
+          unzip module/build/outputs/release/ReZygisk-v*-release.zip -d zksu-release
+          unzip module/build/outputs/release/ReZygisk-v*-debug.zip -d zksu-debug
+
+      - name: Upload release
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.prepareArtifact.outputs.releaseName }}
+          path: "./zksu-release/*"
+
+      - name: Upload debug
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.prepareArtifact.outputs.debugName }}
+          path: "./zksu-debug/*"
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "loader/src/external/lsplt"]
+[submodule "LSPlt"]
 	path = loader/src/external/lsplt
-	url = https://github.com/JingMatrix/LSPlt
+	url = https://github.com/PerformanC/LSPlt
--- a/README.md
+++ b/README.md
@@ -1,15 +1,10 @@
 # ReZygisk

-[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[Türkçe](/READMEs/README_tr-TR.md)|[French](/READMEs/README_fr-FR.md)
+[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[French](/READMEs/README_fr-FR.md)|[日本語](/READMEs/README_ja-JP.md)

-ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, Magisk (besides built-in), and APatch (Work In Progress).
+ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, APatch and Magisk (Official and Kitsune).

-It aims to modernize and re-write the codebase to C (from C++ and Rust), allowing a more efficient and faster implementation of the Zygisk API with a more permissive license.
-
-> [!NOTE]
-> This module/fork is WIP (Work In Progress); only use .zip from the Releases.
->
-> Although you may install the .zip from the [Actions](https://github.com/PerformanC/ReZygisk/actions) page, it is only at your discretion to install it since your device might enter bootloop.
+It aims to modernize and re-write the codebase to C entirely, allowing a more efficient and faster implementation of the Zygisk API with a more permissive, and FOSS friendly, license.

 ## Why?

@@ -33,24 +28,45 @@ The Zygisk Next developers are famous and trusted in the Android community, howe
 |------------|-------------------------------|
 | `lsplt`    | Simple PLT Hook for Android   |

-## Usage
-
-We're currently in the process of cooking. (Coming Soon)
-
 ## Installation

-There are currently no available stable releases. (Coming Soon)
+### 1. Select the right zip
+
+The selection of the build/zip is important, as it will determine how hidden and stable ReZygisk will be. This, however, is not a hard task:
+
+- `release` should be the one chosen for most cases, it removes app-level logging and offers more optimized binaries.
+- `debug`, however, offers the opposite, with heavy logging and no optimizations, For this reason, **you should only use it for debugging purposes** and **when obtaining logs for creating an Issue**.
+
+As for branches, you should always use the `main` branch, unless told otherwise by the developers, or if you want to test upcoming features and are aware of the risks involved.
+
+### 2. Flash the zip
+
+After choosing the right build, you should flash it using your current root manager, like Magisk or KernelSU. You can do this by going to the `Modules` section of your root manager and selecting the zip you downloaded.
+
+After flashing, check the installation logs to ensure there are no errors, and if everything is fine, you can reboot your device.
+
+> [!WARNING]
+> Magisk users should disable built-in Zygisk, as it will conflict with ReZygisk. This can be done by going to the `Settings` section of Magisk and disabling the `Zygisk` option.
+
+### 3. Verify the installation
+
+After rebooting, you can verify if ReZygisk is working properly by checking the module description in the `Modules` section of your root manager. The description should indicate that the necessary daemons are running. For example, if your environment supports both 64-bit and 32-bit, it should look similar to this: `[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`

 ## Translation

-As of now, we don't have integration with another platform for translations but you may contribute to the [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) branch. Please don't forget to include your GitHub profile in [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) so that people can see your contribution.
+There are currently two different ways to contribute translations for ReZygisk:
+
+- For translations of the README, you can create a new file in the `READMEs` folder, following the naming convention of `README_<language>.md`, where `<language>` is the language code (e.g., `README_pt-BR.md` for Brazilian Portuguese), and open a pull request to the `main` branch with your changes.
+- For translations of the ReZygisk WebUI, you should first contribute to our [Crowdin](https://crowdin.com/project/rezygisk). Once approved retrieve the `.json` file from there and open a pull request with your changes -- adding the `.json` file to the `webroot/lang` folder and your credits to the `TRANSLATOR.md` file, in alphabetic order.

 ## Support
+
 For any question related to ReZygisk or other PerformanC projects, feel free to join any of the following channels below:

 - Discord Channel: [PerformanC](https://discord.gg/uPveNfTuCJ)
- ReZygisk Telegram Channel: [@rezygiskchat](https://t.me/rezygiskchat)
+- ReZygisk Telegram Channel: [@rezygisk](https://t.me/rezygisk)
 - PerformanC Telegram Channel: [@performancorg](https://t.me/performancorg)
+- PerformanC Signal Group: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)

 ## Contribution

--- a/READMEs/README_fr-FR.md
+++ b/READMEs/README_fr-FR.md
@@ -2,14 +2,11 @@

 [English](../README.md)

-ReZygisk est un fork de Zygisk Next, une implémentation autonome de Zygisk. Il vise à fournir un support de l'API Zygisk pour KernelSU, Magisk (en plus de l'intégration existante), et pour Apatch (encore en cours de développement).
+ReZygisk est un fork de Zygisk Next, une implémentation autonome de Zygisk. Il vise à fournir un support de l'API Zygisk pour KernelSU, APatch et Magisk (Officiel et Kitsune).
+
+L'objectif est de moderniser et de réécrire la base du code initégralement en C. Cela permettra une meilleure efficacité et une implémentation plus rapide de l'API Zygisk, le tout sous une licence plus permissive et en faveur des logiciels libres (FOSS).

-L'objectif est de moderniser et de réécrire la base du code, initialement en C, vers du C++ et du Rust. Cela permettra une meilleure efficacité et une implémentation plus rapide de l'API Zygisk, le tout sous une licence plus permissive.

-> [!NOTE]
-> Ce module/fork est en cours de développement ; n'utilisez que les fichiers .zip provenant des 'Releases'.
->
->Bien que vous puissiez installer les fichiers .zip provenant de la page [Actions](https://github.com/PerformanC/ReZygisk/actions), cela vous regarde et peut faire entrer votre téléphone en boucle de redémarrage (bootloop).
 ## Pourquoi ?

 La dernière release de Zygisk Next n'est pas open source, le code est donc accessible uniquement à ses développeurs. Non seulement cela limite notre capacité à contribuer au projet, mais cela rend également impossible la vérification du code, ce qui constitue une préoccupation majeure en matière de sécurité. Zygisk Next est un module fonctionnant avec les permissions administrateur (root) et a donc accès à l'entièreté du système.
@@ -32,25 +29,47 @@ Les développeurs de Zygisk Next sont connus et reconnus dans la communauté And
 |------------|-------------------------------|
 | `lsplt`    | Simple PLT Hook pour Android  |

-## Utilisation
-
-Nous sommes actuellement en train de préparer cela. (Pour bientôt)
-
 ## Installation

-Il n'y a actuellement pas de version (releases) stable (Pour bientôt)
+### 1. Choisi la bonne archive ZIP
+
+La sélection du build/archive ZIP est important, car cela déterminera à quel point ReZygisk sera caché et stable. Toutefois, ce n'est pas compliqué :
+
+ - `release` doit être choisie dans la majorité des cas, car elle supprime les journaux au niveau application et offre des binaires plus optimisés. 
+ - `debug`, en revanche, cette version offre l'inverse avec des journaux détaillés et aucune optimisation. C'est pour cela que **vous ne devriez n'utiliser cette version uniquement pour le débogage** et **l'obtention de journaux pour ouvrir un rapport d'incident (issue Github)**.
+ 
+En ce qui concerne les branches, vous devriez toujours utiliser la branche `main`, sauf si les développeurs vous indiquent le contraire ou si vous souhaitez tester les fonctionnalités à venir et êtes conscient des risques encourus.
+ 
+### 2. Flashez l'archive zip
+
+Après avoir choisi le bon build, vous devez le flasher à l'aide de votre gestionnaire root, comme Magisk ou KernelSU. Vous pouvez le faire en allant dans la section `Modules` de votre gestionnaire root et en y sélectionnant l'archive zip que vous venez de télécharger.
+ 
+Après le flash, vérifiez les journaux d'installation pour vous assurer qu'il n'y ait pas d'erreurs, et si tout va bien, vous pouvez redémarrer votre appareil.
+
+ 
+> [!WARNING] 
+> Les utilisateurs de Magisk doivent désactiver Zygisk pré intégré, car sinon il entrera en conflit avec ReZygisk. Cela peut être fait en vous rendant dans la section `Paramètres` de Magisk et en désactivant l'option `Zygisk`
+ 
+### 3. Vérifiez l'installation
+
+Après le redémarrage, vous ne pouvez pas vérifier si ReZygisk fonctionne normalement en vérifiant la description du moudles dans la section `Modules` de votre gestionnaire root. La description doit indiquer que les processus en arrière plan nécessaire sont en cours d'exécution. Par exemple, si votre environnement prend en charge à la fois le 64 bits et le 32 bits, cela devrait ressembler à ceci :`[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`
+

 ## Traduction

-À ce jour, nous n'avons pas d'intégration avec d'autres plateformes pour traduire, mais vous pouvez contribuer à la branche [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Merci de ne pas oublier d'inclure votre profil GitHub dans le fichier [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) afin que les autres puissent voir votre contribution.
+Il existe actuellement deux façons différentes de contribuer aux traductions pour ReZygisk:
+ 
+- Pour les traductions du README, vous pouvez créer un nouveau fichier dans le dossier READMEs, en suivant la convention de dénomination des fichiers `README_<langue>.md`, où `<langue>` est le code de la langue (par exemple, `README_fr-FR.md` pour le franco français), puis ouvrir un pull request vers la branche `main` avec vos modifications.
+- Pour les traductions de l'interface WebUI de ReZygisk, vous devez passer par le projet [Crowdin](https://crowdin.com/project/rezygisk). Une fois approuvé, récupérez le fichier `.json` et ouvrez un pull request avec vos modifications -- en ajoutant le fichier `.json` au dossier `webroot/lang` et vos crédits au fichier `TRANSLATOR.md`, par ordre alphabétique.

 ## Support

 Pour toutes questions relatives a ReZygisk ou d'autres projets de PerformanC, n'hésitez pas à nous rejoindre via les différents moyens disponibles: 

 - Notre Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
- Le Telegram relatif a ReZygisk: [@rezygiskchat](https://t.me/rezygiskchat)
+- Le Telegram relatif a ReZygisk: [@rezygisk](https://t.me/rezygisk)
 - Notre Telegram: [@performancorg](https://t.me/performancorg)
+- Notre Signal: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)

 ## Contribution

--- a/READMEs/README_id-ID.md
+++ b/READMEs/README_id-ID.md
@@ -2,16 +2,9 @@

 [English](https://github.com/PerformanC/ReZygisk)

-ReZygisk adalah turunan dari Zygisk Next, sebuah implementasi mandiri Zygisk, yang mendukung API Zygisk untuk KernelSU, Magisk (selain versi bawaan), dan APatch (dalam tahap pengembangan).
+ReZygisk adalah turunan dari Zygisk Next, sebuah implementasi mandiri dari Zygisk, menyediakan dukungan API Zygisk untuk KernelSU, APatch, dan Magisk (Versi Resmi dan Kitsune).

-Proyek ini bertujuan untuk memodernisasi dan menulis ulang basis kode ke dalam bahasa pemorgraman C (dari C++ dan Rust), memungkinkan implementasi API Zygisk yang lebih efisien dan cepat dengan lisensi yang lebih permisif.
-
-> [!NOTE]
-> [CATATAN]
-> 
-> Modul/turunan ini sedang dalam tahap pengembangan. gunakan hanya file .zip dari halaman Rilis.
->
-> Anda dapat menginstal file .zip dari halaman [Actions](https://github.com/PerformanC/ReZygisk/actions), namun instalan ini sepenuhnya menjadi tanggung jawab Anda karena perangkat dapat mengalami bootloop.
+Tujuannya adalah untuk memodernisasi dan menulis ulang kode sumber sepenuhnya dalam bahasa C, memungkinkan implementasi API Zygisk yang lebih efisien dan cepat dengan lisensi yang lebih permisif dan ramah terhadap FOSS (Free and Open Source Software).

 ## Mengapa?

@@ -19,44 +12,68 @@ Rilisan terbaru dari Zygisk Next tidak bersifat open-source, dengan kode yang se

 Meskipun developer Zygisk Next terkenal dan dipercaya dalam komunitas Android, hal ini tidak menjamin bahwa kode tersebut bebas dari bahaya atau kerentanan. Kami (PerformanC) memahami alasan mereka untuk menjaga kode tetap tertutup, tetapi kami memiliki pandangan yang berbeda.

-## Kelebihan
+## Keunggulan

 - FOSS (Free and Open Source Software) Selamanya.

 ## Komponen Pendukung

-| Alat            | Deskripsi                                |
-|-----------------|------------------------------------------|
-| `Android NDK`   | Native Development Kit untuk Android     |
+| Alat             | Deskripsi                                  |
+|------------------|--------------------------------------------|
+| `Android NDK`    | Native Development Kit untuk Android      |

 ### Komponen Pendukung C++

-| Komponen   | Deskripsi                       |
-|------------|---------------------------------|
-| `lsplt`    | Simple PLT Hook untuk Android   |
-
-## Penggunaan
-
-Kami saat ini sedang dalam tahap pengembangan. (Segera Hadir)
+| Ketergantungan | Deskripsi                      |
+|----------------|---------------------------------|
+| `lsplt`        | Simple PLT Hook untuk Android |

 ## Instalasi

-Saat ini belum tersedia rilisan yang stabil. (Segera Hadir)
+### 1. Pilih file ZIP yang tepat
+
+Pemilihan build/zip sangat penting, karena ini akan menentukan seberapa tersembunyi dan stabil ReZygisk. Namun, ini bukan tugas yang sulit:
+
+- `release`: Direkomendasikan untuk penggunaan normal. Binary lebih optimal, logging minimal.
+- `debug`: Untuk keperluan debug. Logging lengkap, tanpa optimasi.
+
+Untuk branch, selalu gunakan main branch, kecuali diinstruksikan oleh pengembang, atau jika Anda ingin menguji fitur mendatang dan menyadari risikonya.
+
+### 2. Flash file ZIP
+
+Setelah memilih build yang tepat, Anda harus mem-flash-nya menggunakan pengelola root Anda saat ini, seperti Magisk atau KernelSU. Anda dapat melakukannya dengan masuk ke bagian Modules di pengelola root Anda dan memilih zip yang telah diunduh.
+
+Setelah mem-flash, periksa log instalasi untuk memastikan tidak ada kesalahan, dan jika semuanya selesai, Anda dapat me-reboot perangkat Anda
+
+> [!WARNING]
+> Pengguna Magisk harus menonaktifkan Zygisk bawaan, karena ini akan bentrok dengan ReZygisk. Ini dapat dilakukan dengan masuk ke bagian `Settings` di Magisk dan menonaktifkan opsi `Zygisk`.
+
+### 3. Verifikasi Instalasi
+
+Setelah reboot, Anda dapat memverifikasi apakah ReZygisk bekerja dengan baik dengan memeriksa deskripsi modul di bagian Modules pada pengelola root Anda. Deskripsi tersebut harus menunjukkan bahwa daemon yang diperlukan sedang berjalan. Misalnya, jika lingkungan Anda mendukung 64-bit dan 32-bit, itu akan terlihat seperti ini:
+`[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`

 ## Terjemahan

-Saat ini, kami belum terintegrasi dengan platform lain untuk penerjemahan, tetapi Anda dapat berkontribusi pada cabang [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Jangan lupa untuk menyertakan profil GitHub Anda di [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) agar orang lain dapat melihat kontribusi Anda.
+Saat ini ada dua cara untuk berkontribusi dalam terjemahan untuk ReZygisk:
+
+- Untuk terjemahan README, Anda dapat membuat file baru di folder `READMEs`, mengikuti konvensi penamaan `README_<bahasa>.md`, di mana `<bahasa>` adalah kode bahasa (misalnya, `README_id-ID.md` untuk Bahasa Indonesia), dan membuka pull request ke `main` branch.
+- Untuk terjemahan WebUI ReZygisk, Anda harus berkontribusi terlebih dahulu di [Crowdin](https://crowdin.com/project/rezygisk). Setelah disetujui, ambil file `.json` dari sana dan buka pull request dengan perubahan Anda -- tambahkan file `.json` ke folder `webroot/lang` dan kredit Anda ke file TRANSLATOR.md, dalam urutan alfabet.

 ## Dukungan
+
+Untuk pertanyaan terkait ReZygisk atau proyek PerformanC lainnya, jangan ragu untuk bergabung dengan salah satu saluran berikut:
+
 Untuk pertanyaan terkait ReZygisk atau proyek PerformanC lainnya, silakan bergabung ke salah satu saluran berikut:

 - Saluran Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
- Saluran Telegram ReZygisk: [@rezygiskchat](https://t.me/rezygiskchat)
+- Saluran Telegram ReZygisk: [@rezygisk](https://t.me/rezygisk)
 - Saluran Telegram PerformanC: [@performancorg](https://t.me/performancorg)
+- Grup Signal PerformanC: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)

 ## Kontribusi

-Wajib mengikuti [Pedoman Kontribusi](https://github.com/PerformanC/contributing) PerformanC untuk berkontribusi pada ReZygisk. Sesuai dengan Kebijakan Keamanan, Kode Etik, dan standar struktur dan format yang berlaku.
+Wajib mengikuti [Pedoman Kontribusi](https://github.com/PerformanC/contributing) PerformanC's untuk berkontribusi pada ReZygisk. Sesuai dengan Kebijakan Keamanan, Kode Etik, standar struktur dan format yang berlaku.

 ## Lisensi

--- a/READMEs/README_ja-JP.md
+++ b/READMEs/README_ja-JP.md
@@ -1,73 +1,77 @@
 # ReZygisk

-[English](https://github.com/PerformanC/ReZygisk/blob/main/README.md)|[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)
+[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[French](/READMEs/README_fr-FR.md)

-ReZygiskはkernelSU、Magisk、APatchにZygiskのAPIサポートを提供するスタンドアローンZygiskであるZygisk Nextのフォークです。
+ReZygiskはZygiskのスタンドアローン実装であるZygisk Nextのフォークです。ReZygiskは、KernelSU、APatch、Magisk（オフィシャルバージョンとKitsuneバージョン両方）それぞれへのZygisk APIサポートを備えています。

-ReZygiskは更に高速かつ効率的なZygisk APIとより寛容なライセンスを、コードベースをC（もともとはC++とRustでした）でアップデート/書き直すことで実現することを目標としています。
+ReZygiskはコードベースをCに移行し、よりモダンなコードで書き換えることを目標にしています。これにより、Zygisk APIのより効率的かつ高速な実装と、FOSSライセンスの両方を備えることができています。

-> [!NOTE]
-> このモジュール/フォークはWIP（Work in Progress、すべての作業が進行中であることを意味します）: ReleasesタブのZipのみを使用するようにしてください。
->
-> GitHub [Actions](https://github.com/PerformanC/ReZygisk/actions) よりZipをダウンロードして使用することも可能ですが、デバイスがブートループなどの不具合が起きる可能性があります。ユーザー自身の裁量にて使用してください。
+## なぜReZygiskを選ぶべきか

-## ReZygiskを使う理由
+Zygisk Nextの最新リリースはオープンソースではなく、コードをその開発者のみにアクセス可能にしています。これは我々のように一般の開発者の貢献を無下にするだけでなく、Zygisk Nextがroot権限で走るアプリなのにもかかわらずコードにアクセスできないため、セキュリティ上でも深刻な問題が有ります。

-Zygisk Nextの最新リリースはクローズドソースであり、コードはプロジェクトの開発者のみアクセスできるものです。これはコミュニティがコードに貢献することを妨げるだけではなく、コード監査をも難しくしています。これはZygisk Nextがルート権限で作動するアプリであるため、セキュリティ上深刻な問題です。
-
-Zygisk Nextの開発者はAndroid Communityにて有名かつ信用されています。が、これはコード自体が悪意の無いこと/脆弱でないことを証明するものではありません。
-
-我々（PerformanC）はZygisk Nextの開発者らがコードをクローズドに保つ重要な理由があることは承知していますが、我々はオープンソース/コミュニティドリブンにすることが重要だと考えています。
+Zygisk Nextの開発者達は有名かつコミュニティからも信頼されていますが、これはコードが100%悪意が無いことや脆弱性が無いことを意味しません。我々（PerformanC）は彼らがZygisk Nextをクローズドソースにする理由も理解していますが、我々はその逆を信じます。

 ## メリット

- オープンソース、Free to Use、FOSS (永続的)
+- FOSS (無制限)

 ## 依存関係

-| ツール           | 説明                                    |
+| ツール           | 説明                                   |
 |-----------------|----------------------------------------|
-| `Android NDK`   | Androidのネイティブ開発環境キット           |
+| `Android NDK`   | Native Development Kit for Android     |

 ### C++ 依存関係

-| 依存        | 説明                          |
+| 依存関係    | 説明                           |
 |------------|-------------------------------|
-| `lsplt`    | シンプルなAndroidのPLTフック     |
-
-## 使い方
-
-ただいま調理中です、しばらくお待ち下さい！（できるだけ早くお届けします）
+| `lsplt`    | Simple PLT Hook for Android   |

 ## インストール

-現状、ステーブルリリースはありません。（できるだけ早くお届けします）
+### 1. 必要なZipファイルを選択
+
+ReZygiskの安定性や匿名性のためには、ビルドファイル/Zipファイルの選択は**非常に重要**です。しかしながら、これはそこまで難しくもありません。
+
+- `release` バージョンが基本的にはおすすめです。アプリレベルのログが出力されなかったりなど、より効率化されたバイナリが提供されるためです。
+- `debug` バージョンはreleaseバージョンの反対です。重いログの出力がなされたり、高速化されていないバイナリが提供されます。このため、このバージョンは**デバッグ用に**、もしくは**Issueを作るためにログを入手する**ときのみに使われるべきです。
+
+ブランチに関しては、基本的に`main`ブランチを選択すべきです。しかしながら、PerformanCの開発者に違うブランチを使うように言われたり、あなたがベータ版のコードを使うことのリスクを理解しかつ実装されたばかりの機能を使いたいのならば違うブランチを選択することも選択肢の一つでしょう。
+
+### 2. Zipファイルをフラッシュ
+
+正しいビルドを選択したあとは、ReZygiskのビルドを現在使用しているルートマネージャー（MagiskやKernelSU等）を使用してフラッシュしてください。これは、マネージャーで`Modules`セクションを開きダウンロードしたビルドファイルを選択することでできます。
+
+フラッシュしたあとは、インストールログを確認して、エラーがないか確かめてください。なんのエラーも起きていなければ、デバイスを再起動してください。
+
+> [!WARNING]
+> Magiskを使用しているのならば、ビルトインのZygiskがReZygiskと競合するため無効化してください。Magiskの`設定`セクションを開き、Zygiskオプションを無効化することでできます。
+### 3. インストールを確認
+
+再起動後、ルートマネージャーの`Modules`セクションをチェックすることによりReZygiskが正常に動いているかどうか確認できます。
+説明欄は、必要なデーモンが動作していることを示しているはずです。例えば、あなたの端末が64bitと32bitの両方をサポートしている場合、右記のように見えるはずです: `[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`

 ## 翻訳

-現状では、翻訳を他のプラットフォーム上で展開することはしていません。
+There are currently two different ways to contribute translations for ReZygisk:

-が、[add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) ブランチにて翻訳作業に参加していただくことができます。
-
-他の開発者さんたちがあなたの貢献を確認できるように、 [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) にあなたのプロフィールを追加することを忘れないでください！
+- READMEの翻訳は、`READMEs`フォルダに`README_<language code>.md`というファイルを作り、そこに翻訳を書き込んでください。その後、プルリクエストを送信してくださいlang` folder and your credits to the `TRANSLATOR.md` file, in alphabetic order.
+- ReZygisk WebUIの翻訳のためには、まず[Crowdin](https://crowdin.com/project/rezygisk)で貢献する必要が有ります。一度貢献を許可され、`.json`ファイルを入手したならば、そのファイルを元に新しい言語のファイルを作り、その`.json`ファイルを`webroot/lang`フォルダに入れてください。更に、TRANSLATOR.mdにあなたのクレジットを付与するのも忘れないでください！（なお名前の順番はアルファベット順です）

 ## サポート
-For any question related to ReZygisk or other PerformanC projects, feel free to join any of the following channels below:
-ReZygisk/他のPerformanCのプロジェクトに対する質問がある場合は、以下のどれかに参加してください！
+
+ReZygiskやPerformanCのプロジェクトに関して質問がある場合、以下のいずれかに参加して質問してください。

 - Discord チャンネル: [PerformanC](https://discord.gg/uPveNfTuCJ)
- ReZygisk Telegram チャンネル: [@rezygiskchat](https://t.me/rezygiskchat)
+- ReZygisk Telegram チャンネル: [@rezygisk](https://t.me/rezygisk)
 - PerformanC Telegram チャンネル: [@performancorg](https://t.me/performancorg)
+- PerformanC Signal Group: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)

 ## 貢献

-貢献をしたい場合、PerformanCの[Contribution Guidelines](https://github.com/PerformanC/contributing)に従うことが必要になります。
-
-セキュリティーポリシー、行動規範、シンタックススタンダードを採用してください。
+[Contribution Guidelines](https://github.com/PerformanC/contributing)に従ってください。セキュリティポリシー、コードスタイル等、すべて従う必要が有ります。

 ## ライセンス

-ReZygiskは基本的にDr-TSNGによるGPLライセンス下にてライセンスされています。
-
-ただし、書き直しされたコードに関してはPerformanCによるAGPL3.0ライセンスにてライセンスされています。
-詳細については [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0) を参照してください。
+ReZygiskはDr-TSNGによるGPLライセンスと、PerformanCが書き直したコードに関してはThe PerformanC OrganizationによるAGPL 3.0ライセンスの元に配布されます。[Open Source Initiative](https://opensource.org/licenses/AGPL-3.0)で、より詳しい情報を得ることができます。
--- a/READMEs/README_pt-BR.md
+++ b/READMEs/README_pt-BR.md
@@ -2,14 +2,9 @@

 [English](../README.md)

-ReZygisk é uma fork do Zygisk Next, uma implementação do Zygisk independente, fornecendo a API do Zygisk para o kernelSU, Magisk (além do embutido) e APatch (a ser desenvolvido).
+ReZygisk é uma fork do Zygisk Next, uma implementação do Zygisk independente, fornecendo a API do Zygisk para o KernelSU, APatch e Magisk (além do embutido).

-Ele foca em modernizar e re-escrever o código fonte para C (de C++ e Rust), permitindo uma implementação da API do Zygisk com uma licença mais permissiva.
-
-> [!NOTE]
-> Este módulo/fork ainda está em processo de desenvolvimento; apenas use .zip da aba Releases.
->
-> Apesar de você poder instalar um .zip da aba [Actions](https://github.com/PerformanC/ReZygisk/actions), é de sua conta e risco, já que pode acarretar em um bootloop.
+Ele foca em modernizar e re-escrever todo o código fonte para C, permitindo uma implementação da API do Zygisk com uma licença mais permissiva e amigável a FOSS.

 ## Por quê?

@@ -23,35 +18,53 @@ Os desenvolvedores do Zygisk Next são famosos e confiados pela comunidade Andro

 ## Dependências

-| Ferramenta      | Descrição                                  |
-|-----------------|--------------------------------------------|
-| `Android NDK`   | Kit de Desenvolvimento Nativo para Android |
+| Ferramenta      | Descrição                                    |
+|-----------------|----------------------------------------------|
+| `Android NDK`   | Kit de Desenvolvimento Nativo para o Android |

 ### Dependências C++

-| Dependência | Descrição                     |
-|-------------|-------------------------------|
-| `lsplt`     | PLT Hook simples para Android  |
+| Dependência | Descrição                        |
+|-------------|----------------------------------|
+| `lsplt`     | PLT Hook simples para o Android  |

-## Forma de uso
+## Instalação

-Estamos ainda em processo de desenvolvimento desta aba. (Em breve)
+### 1. Selecionando o zip apropriado

-## Processo de instalação
+A seleção da build/zip é importate, já que vai determinar o quão escondido e estável o ReZygisk vai ser. Isso, no entanto, não é uma tarefa difícil:

-Estamos ainda em processo de desenvolvimento desta aba. (Em breve)
+- `release` deve ser a escolha para a maioria dos casos, ele remove o log de nível de app e oferece binários mais otimizados.
+- `debug`, no entanto, oferece o oposto, com logs extensos, e sem otimizações. Por isso, **você deve usar apenas para fins de depuração** e **ao obter logs para criar um Issue**.
+
+### 2. "Flash"ando o zip
+
+Depois de escolher a build apropriada, você deve "flashar" ela usando seu gerenciador de root atual, como o Magisk ou o KernelSU. Você pode fazer isso indo na seção `Módulos` do seu gerenciador de root e selecionando o zip que você fez download.
+
+Depois de "flashar", confira os logs de instalação para garantir que não houve erros, e se tudo estiver certo, você pode reiniciar seu dispositivo.
+
+> [!WARNING]
+> Usuários do Magisk devem desabilitar o Zygisk embutido, já que ele vai conflitar com o ReZygisk. Isso pode ser feito indo na seção `Configurações` do Magisk e desabilitando a opção `Zygisk`.
+
+### 3. Verificando a instalação
+
+Depois de reiniciar, você pode verificar se o ReZygisk está funcionando corretamente indo na seção `Módulos` do seu gerenciador de root. A descrição deve indicar que os daemons necessários estão rodando. Por exemplo, se seu ambiente suporta tanto 64-bit quanto 32-bit, deve estar parecido com isso: `[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`

 ## Tradução

-Até agora, a gente não possui uma plataforma para traduções, mas você pode contribuir para a branch [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Por favor, não esqueça de incluir seu perfil do GitHub no [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) para que assim outras pessoas vejam sua contribuição.
+Tem duas formas diferentes de contribuir com traduções para o ReZygisk:
+
+- Para traduções do README, você pode criar um novo arquivo na pasta `READMEs`, seguindo a padronização de nome de `README_<idioma>.md`, onde `<idioma>` é o código do idioma (ex: `README_pt-BR.md` para português brasileiro), e abrir um pull request para o branch `main` com suas mudanças.
+- Para traduções da WebUI do ReZygisk, você deve primeiro contribuir no nosso [Crowdin](https://crowdin.com/project/rezygisk). Depois de aprovado, pegue o arquivo `.json` de lá e abra um pull request com suas mudanças -- adicionando o arquivo `.json` na pasta `webroot/lang` e seus créditos no arquivo `TRANSLATOR.md`, em ordem alfabética.

 ## Suporte

 Para quaisquer problemas no ReZygisk ou qualquer projeto da PerformanC, sinta-se livre para entrar em qualquer canal abaixo:

 - Server do Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
- Canal do Telegram ReZygisk: [@rezygiskchat](https://t.me/rezygiskchat)
- Canal do Telegram PerformanC: [@performancorg](https://t.me/performancorg)
+- Canal do Telegram do ReZygisk: [@rezygisk](https://t.me/rezygisk)
+- Canal do Telegram da PerformanC: [@performancorg](https://t.me/performancorg)
+- Grupo do Signal da PerformanC: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)

 ## Contribuição

--- a/READMEs/README_tr-TR.md
+++ b/READMEs/README_tr-TR.md
@@ -1,61 +0,0 @@
-# ReZygisk
-
-[English](../README.md)
-
-ReZygisk, Zygisk Next'in bir forkudur ve Zygisk'in bağımsız bir uygulamasıdır. KernelSU, Magisk (yerleşik olanın dışında) ve APatch (Çalışmalar Devam Ediyor) için Zygisk API desteği sağlar.
-
-Amacı, C++ ve Rust'tan C diline geçerek kod tabanını modernize etmek ve yeniden yazmaktır. Bu, daha verimli ve hızlı bir Zygisk API uygulaması sağlarken daha esnek bir lisans sunar.
-
-> [!NOT]
-> Bu modül/fork şu anda geliştirme aşamasındadır (WIP - Work In Progress); yalnızca Release'deki .zip dosyasını kullanın.
->
-> [Actions](https://github.com/PerformanC/ReZygisk/actions) sayfasındaki .zip dosyasını yüklemek tamamen sizin sorumluluğunuzdadır; cihazınız bootloop'a girebilir.
-
-## Neden?
-
-Zygisk Next'in son sürümleri açık kaynaklı değildir ve tamamen geliştiricilerine ayrılmıştır. Bu durum, projeye katkıda bulunma yeteneğimizi sınırlamakla kalmaz, aynı zamanda kodun denetlenmesini imkansız hale getirir. Bu, Zygisk Next'in süper kullanıcı (root) ayrıcalıklarıyla çalışması ve tüm sisteme erişimi olması nedeniyle büyük bir güvenlik sorunudur.
-
-Zygisk Next geliştiricileri, Android topluluğunda tanınmış ve güvenilir kişilerdir, ancak bu, kodun kötü niyetli veya hassas olmadığını garanti etmez. PerformanC olarak, kodu kapalı kaynaklı tutma nedenlerini anlasak da, bunun tersini savunuyoruz.
-
-## Avantajlar
-
- Sonsuza kadar açık kaynak (FOSS)
-
-## Bağımlılıklar
-
-| Araç             | Açıklama                             |
-|------------------|--------------------------------------|
-| `Android NDK`    | Android için Yerel Geliştirme Kiti   |
-
-### C++ Bağımlılıkları
-
-| Bağımlılık | Açıklama                        |
-|------------|---------------------------------|
-| `lsplt`    | Android için Basit PLT Hook     |
-
-## Kullanım
-
-Şu anda geliştirme aşamasındayız. (Yakında)
-
-## Kurulum
-
-Şu anda mevcut kararlı sürüm yoktur. (Yakında)
-
-## Çeviri
-
-Şu anda başka bir platformla entegre bir çeviri sistemimiz bulunmuyor, ancak [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) branch'ine katkıda bulunabilirsiniz. Lütfen GitHub profilinizi [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) dosyasına eklemeyi unutmayın, böylece katkılarınız görülebilir.
-
-## Destek
-ReZygisk veya diğer PerformanC projeleriyle ilgili herhangi bir soru için aşağıdaki kanallardan herhangi birine katılabilirsiniz:
-
- Discord Kanalı: [PerformanC](https://discord.gg/uPveNfTuCJ)
- ReZygisk Telegram Kanalı: [@rezygiskchat](https://t.me/rezygiskchat)
- PerformanC Telegram Kanalı: [@performancorg](https://t.me/performancorg)
-
-## Katkıda Bulunma
-
-ReZygisk'e katkıda bulunmak için PerformanC'nin [Katkı Yönergeleri](https://github.com/PerformanC/contributing)'ni takip etmek zorunludur. Güvenlik Politikası, Davranış Kuralları ve sözdizimi standartlarına uyulmalıdır.
-
-## Lisans
-
-ReZygisk, büyük ölçüde Dr-TSNG tarafından GPL lisansı altında, ancak yeniden yazılmış kodlar için The PerformanC Organization tarafından AGPL 3.0 lisansı altında lisanslanmıştır. Daha fazla bilgi için [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0)'e göz atabilirsiniz.
--- a/READMEs/README_vi-VN.md
+++ b/READMEs/README_vi-VN.md
@@ -2,14 +2,9 @@

 [English](../README.md)

-ReZygisk làm một nhánh phát triển lấy từ ZygiskNext, một triển khai độc lập của Zygisk, cung cấp và hỗ trợ Zygisk API cho KernelSU, Magisk (bên cạnh tích hợp) và APatch (Đang trong quá trình phát triển).
+ReZygisk làm một nhánh phát triển lấy từ ZygiskNext, một triển khai độc lập của Zygisk, cung cấp và hỗ trợ Zygisk API cho KernelSU, APatch và Magisk (chính thức và Kitsune).

-Mục tiêu của ReZygisk là mô-đun hoá và viết lại toàn bộ codebase từ C++/Rust sang C, cho phép triển khai API Zygisk hiệu quả hơn và nhanh hơn với giấy phép dễ dàng tái sử dụng hơn.
-
-> [!NOTE]
-> Mô-đun này đang trong quá trình phát triển; chỉ nên sử dụng file .zip từ các bản phát hành.
->
-> Mạc dù bạn có thể cài đặt mô-đun được lấy từ trang [Actions](https://github.com/PerformanC/ReZygisk/actions), nhưng sẽ chỉ phụ thuộc vào bạn có chấp nhận rủi ro hay không vì các mô-đun này có thể gây lỗi cho hệ điều hành. Ví dụ: Bootloop (Lỗi liên tục khởi động lại máy)
+Mục tiêu của ReZygisk là mô-đun hoá và viết lại toàn bộ codebase sang C, cho phép triển khai API Zygisk hiệu quả hơn và nhanh hơn với giấy phép dễ dàng tái sử dụng hơn.

 ## Tại sao nhánh phát triển này lại xuất hiện?

@@ -23,9 +18,9 @@ Các nhà phát triển Zygisk Next đều là những người nổi tiếng v

 ## Các công cụ/thư viện được sử dụng

-| Công cụ         | Mô tả                                     |
-|-----------------|-------------------------------------------|
-| `Android NDK`   | Bộ công cụ phát triển cốt lõi cho Android |
+| Công cụ / Thư Viện        | Mô tả                                     |
+|---------------------------|-------------------------------------------|
+| `Android NDK`             | Bộ công cụ phát triển cốt lõi cho Android |

 ### Các công cụ/thư viện của C++ được sử dụng

@@ -33,24 +28,45 @@ Các nhà phát triển Zygisk Next đều là những người nổi tiếng v
 |------------|----------------------------------------------|
 | `lsplt`    | Công cụ **móc** vào PLT đơn giản cho Android |

-## Các sử dụng
-
-Chúng tôi đang trong quá trình phát triển (Sắp ra mắt)
-
 ## Cài Đặt

-Hiện chưa có bản ra mắt ổn định (Sắp ra mắt)
+### 1. Sử dụng đúng tệp zip
+
+Chọn đúng tệp bản dựng / zip là một điều tất yếu, bởi nó sẽ xác định khả năng ẩn của ReZygisk. Về cơ bản đây không phải là một việc khó:
+
+- `release` bản này sẽ được chọn trong hầy hết các trường hợp sử dụng, bản này loại bỏ nhật ký phát triển cấp độ ứng dụng và cung cấp các tệp nhị phân được tối ưu hóa hơn.
+- `debug`,  bản này tuy nhiên không được tối ưu và đi kèm với nó là ghi lại nhật ký phát triển khá nhiều. Vì lý do này, **chỉ nên sử dụng khi cần gỡ lỗi** và **khi cần ghi lại nhật lý để tạo báo về lỗi hoặc gì đó**.
+
+As for branches, you should always use the `main` branch, unless told otherwise by the developers, or if you want to test upcoming features and are aware of the risks involved.
+
+### 2. Flash the zip
+
+Sau khi chọn một bản dựng phù hợp với bạn, điều cần làm là flash nó bằng trình quản lý root như Magisk hay KernelSU. Bạn có thể làm điều này bằng cách vào mục `Mô-đun / Module` của trình quản lý root của bạn và chọn tệp zip vừa tải xuống.
+
+Sau khi flash, kiểm tra lại nhật ký lỗi để chắc chắn rằng không có lỗi nào xảy ra, nếu mọi thứ xuôn sẻ, khởi động lại thiết bị.
+
+> [!WARNING]
+> Người dùng Magisk cần phải tắt `built-in Zygisk`, bởi nó sẽ xung đột với ReZygisk. Điều này có thể thực hiện bằng cách vào `Cài Đặt` và tắt tùy chọn `ZygiskZygisk`
+
+### 3. Verify the installation
+
+Sau khi khởi động lại, bạn có thể xác minh ReZygisk có hoạt động bình thường không bằng cách kiểm tra mô tả module trong phần `Modules` của trình quản lý gốc. Mô tả sẽ chỉ ra rằng các daemon cần thiết đang chạy. Ví dụ, nếu môi trường của bạn hỗ trợ cả cấu trúctrúc 64-bit và 32-bit, nó sẽ trông giống như thế này: `[monitor: 😋 tracing, zygote64: 😋 inject, daemon64: 😋 running (...) zygote32: 😋 inject, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`

 ## Dịch WebUI cho mô-đun

-Hiện tai, chúng tôi chưa tích hợp nền táng dịch nào để dịch một cách thuận tiện nhưng bạn có thể đóng góp vào nhánh [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Đừng quên thêm trang cá nhân Github của bạn vào [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) để mọi người thâys được đóng góp của bạn
+Hiện tại có hai cách khác nhau để đóng góp bản dịch cho ReZygisk:
+
+- Đối với bản dịch của README, bạn có thể tạo một tệp mới trong thư mục `READMEs`, theo quy ước đặt tên `README_<language>.md`, trong đó `<language>` là mã ngôn ngữ (ví dụ: `README_pt-BR.md` cho tiếng Bồ Đào Nha Brazil) và mở yêu cầu kéo đến nhánh `main` với các thay đổi của bạn.
+- Đối với bản dịch của ReZygisk WebUI, trước tiên bạn phải đóng góp cho [Crowdin](https://crowdin.com/project/rezygisk) của chúng tôi. Sau khi được chấp thuận, hãy lấy tệp `.json` từ đó và mở yêu cầu kéo với các thay đổi của bạn -- thêm tệp `.json` vào thư mục `webroot/lang` và ghi công của bạn vào tệp `TRANSLATOR.md`, theo thứ tự bảng chữ cái.

 ## Hỗ trợ
+
 Nếu bạn có những câu hỏi nào dành cho ReZygisk hoặc bất kì một dự án nào của PerformanC, hãy tự nhiên tham gia các kênh trò chuyện dưới đây:

- Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
- Telegram [ReZygisk]: [@rezygiskchat](https://t.me/rezygiskchat)
- Telegram [PerformanC]: [@performancorg](https://t.me/performancorg)
+- Kênh Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
+- Kênh Telegram ReZygisk: [@rezygisk](https://t.me/rezygisk)
+- Kênh Telegram PerformanC: [@performancorg](https://t.me/performancorg)
+- Nhóm Signal PerformanC: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)

 ## Đóng góp cho dự án này

@@ -58,4 +74,4 @@ Tuân theo [hướng dẫn đóng góp](https://github.com/PerformanC/contributi

 ## Bản quyền

-Hầu hết các thành phần của ReZygisk để dưới bản quyền GPL (bởi Dr-TSNG) và AGPL 3.0 (bởiThe PerformanC Organization) cho những phần được viết lại. Bạn có thể xem thêm trong trang [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0).
+Hầu hết các thành phần của ReZygisk để dưới bản quyền GPL (bởi Dr-TSNG) và AGPL 3.0 (bởiThe PerformanC Organization) cho những phần được viết lại. Bạn có thể xem thêm trong trang [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0).
--- a/READMEs/README_zh-CN.md
+++ b/READMEs/README_zh-CN.md
@@ -1,68 +0,0 @@
-# ReZygisk
-
-[English](https://github.com/PerformanC/ReZygisk/blob/main/README.md)
-
-ReZygisk 是 Zygisk 的另一个独立实现，从 Zygisk Next 分叉而来，为 KernelSU、Magisk 和 APatch 提供 Zygisk API 支持(目前处于测试阶段)。
-
-项目致力于使用 C 语言重写原本的 C++ 和 Rust 代码，从而更加现代、高效地实现 Zygisk API，并使用更宽松的开源许可证。
-
-> [!NOTE]
-> 此模块还在测试阶段，请仅安装正式版本的压缩包。
->
-> 您可以从 [Actions](https://github.com/PerformanC/ReZygisk/actions) 页面下载自动构建包，但要注意自负风险。使用不稳定的版本时，设备可能会陷入启动循环(Bootloop)。
-
-## 为什么要选择 ReZygisk？
-
-最新版本的 Zygisk Next 并不开源，仅其核心开发者有权查阅全部源代码。这不仅阻止了其他开发者贡献代码，还阻止了他人对项目代码进行审计。Zygisk Next 是一个以超级用户(root)权限运行的模块，可以访问整个系统，闭源后存在重大安全隐患。
-
-Zygisk Next 的开发者们在Android社区享有盛誉，备受信任。但这并不意味着他们的项目就一定没有任何恶意代码和漏洞。我们(PerformanC)理解他们出于某些原因不愿保持开源，但我们坚信，开源是更好的选择。
-
-## 优点
-
- 永远保持开源
-
-## 依赖
-
-| 工具          | 简介                                |
-|---------------|------------------------------------|
-| `Android NDK` | Android 本地开发工具包               |
-
-### C++ 依赖
-
-| 依赖    | 简介                         |
-|---------|-----------------------------|
-| `lsplt` | Android 程序链接表钩子        |
-
-## 用法
-
-目前正在编写中 (敬请期待)
-
-## 安装
-
-目前还没有发布正式版本 (敬请期待)
-
-## 翻译
-
-您可以向 [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) 分支贡献翻译。
-
-请不要忘记在 [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) 中添加您的 GitHub 账号信息，以便人们看到您的贡献。
-
-## 支持
-
-如果您有任何关于 ReZygisk 或者其他 PerformanC 项目的问题，可以随时加入以下群组：
-
- Discord 服务器: [PerformanC](https://discord.gg/uPveNfTuCJ)
- ReZygisk Telegram 群组: [@rezygiskchat](https://t.me/rezygiskchat)
- PerformanC Telegram 群组: [@performancorg](https://t.me/performancorg)
-
-## 贡献
-
-要对 ReZygisk 做出贡献，请遵守 PerformanC 的 [贡献指南](https://github.com/PerformanC/contributing) 。
-
-请遵循其安全政策、行为准则和语法标准。
-
-## 开源许可证
-
-ReZygisk 项目中，旧的 Zygisk Next 部分采用 GPL 许可证，但由 PerformanC 组织重写的代码则采用 AGPL 3.0 许可证。
-
-您可以在 [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0) 上阅读更多相关信息。
--- a/READMEs/README_zh-TW.md
+++ b/READMEs/README_zh-TW.md
@@ -1,62 +0,0 @@
-# ReZygisk
-> 繁體中文（README_zh-TW.md）是根據[英文版自述檔案（README.md）](https://github.com/PerformanC/ReZygisk/blob/main/README.md)翻譯，僅供參考以便理解英文內容，翻譯可能滯後。
-
-ReZygisk 是 Zygisk Next 的一個分支，這是一個獨立實現的 Zygisk，為 KernelSU、Magisk（除了內建支援外）和 APatch（開發中）提供 Zygisk API 支援。
-
-此專案致力於用 C 語言重寫原有的 C++ 和 Rust 代碼，藉此以更現代且高效的方式實現 Zygisk API，並採用更寬鬆的授權條款。
-
-> [!NOTE]
-> 此模組/分支仍在開發中（WIP）；請僅安裝正式版本的壓縮包。
->
-> 雖然你可以從 [Actions](https://github.com/PerformanC/ReZygisk/actions) 頁面安裝 .zip 檔，但若因此導致裝置進入開機循環（Bootloop），後果須自行承擔。
-
-## 為什麼選擇ReZygisk？
-
-最新版本的 Zygisk Next 已轉為閉源，只有核心開發者能查閱完整的原始碼。這不僅限制了其他開發者的貢獻，也無法進行代碼審計。由於 Zygisk Next 是一個以超級使用者（root）權限運行的模組，能夠存取整個系統，若閉源將帶來重大的安全風險。
-
-雖然 Zygisk Next 的開發者在 Android 社群中享有盛譽，並且備受信任，但這並不代表他們的專案就完全沒有任何惡意程式碼或漏洞。我們（PerformanC）理解他們因某些原因選擇保持閉源，但我們堅信開源才是更好的選擇。
-
-## 優勢
-
- 永遠是自由及開放原始碼軟體（FOSS）
-
-## 依賴項
-
-| 工具            | 說明                                   |
-|-----------------|---------------------------------------|
-| `Android NDK`   | Android 原生開發工具包                  |
-
-### C++ 依賴項
-
-| 依賴     | 說明                                          |
-|----------|----------------------------------------------|
-| `lsplt`  | Android 的簡單 PLT（程式連結表） 勾取           |
-
-## 用法
-
-我們目前正在開發中。（敬請期待）
-
-## 安裝
-
-目前沒有穩定版本可供下載。（敬請期待）
-
-## 翻譯
-
-目前我們尚未與其他平台整合進行翻譯，但您可以為 [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui)分支做出貢獻。請別忘了在 [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) 中包含您的 GitHub 個人檔案，讓大家能夠看到您的貢獻。
-
-## 支援
-如有關於 ReZygisk 或其他 PerformanC 專案的任何問題，歡迎加入以下任一頻道：
-
- Discord 頻道: [PerformanC](https://discord.gg/uPveNfTuCJ)
- ReZygisk Telegram 頻道: [@rezygiskchat](https://t.me/rezygiskchat)
- PerformanC Telegram 頻道: [@performancorg](https://t.me/performancorg)
-
-## 貢獻
-
-要為 ReZygisk 貢獻，必須遵循 PerformanC 的[貢獻指南](https://github.com/PerformanC/contributing)，並遵守其安全政策、行為準則以及語法標準。
-
-## 授權條款
-
-在 ReZygisk 專案中，舊的 Zygisk Next 部分採用了 GPL 授權，而由 PerformanC 組織重寫的程式碼則採用 AGPL 3.0 授權。
-
-您可以在[開放原始碼倡議（Open Source Initiative）](https://opensource.org/licenses/AGPL-3.0)上閱讀更多相關資訊。
--- a/TRANSLATOR.md
+++ b/TRANSLATOR.md
@@ -0,0 +1,22 @@
+# 🌎 Translators
+- **ar_EG** by [@ZG089](https://github.com/ZG089)
+- **de_DE** by [@Blazzycrafer](https://github.com/Blazzycrafter)
+- **en_US** by [@PerformanC (The PerformanC Organization)](https://github.com/PerformanC)
+- **es_AR** by [@Flopster101](https://github.com/Flopster101)
+- **es_ES** by [@LuchoModzzz](https://github.com/Lxchoooo)
+- **es_MX** by [@LuchoModzzz](https://github.com/Lxchoooo)
+- **fr_FR** by [@GhostFRR](https://github.com/GhostFRR)
+- **ja_JP** by [@Fyphen1223](https://github.com/Fyphen1223) & [@reindex-ot](https://github.com/reindex-ot) 
+- **id_ID** by [@bpanca05](https://github.com/bpanca05) & [@LuckyKiddos](https://github.com/GuitarHeroStyles)
+- **it_IT** by [@thasave14](https://github.com/thasave14)
+- **pt_BR** by [@ThePedroo](https://github.com/ThePedroo)
+- **ro_RO** by [@ExtremeXT](https://github.com/ExtremeXT)
+- **ru_RU** by [@Emulond](https://github.com/Emulond) & [@AJleKcAHgP68](https://github.com/AJleKcAHgP68)
+- **tr_TR** by [@witchfuneral](https://github.com/witchfuneral)
+- **uk_UA** by [@Kittyskj](https://github.com/Kittyskj)
+- **vi_VN** by [@RainyXeon](https://github.com/RainyXeon)
+- **zh_CN** by [@Meltartica](https://github.com/Meltartica) & [@SheepChef](https://github.com/SheepChef)
+- **zh_TW** by [@Meltartica](https://github.com/Meltartica)
+
+> [!NOTE]
+> Want to add your translation? Go to [Crowdin](https://crowdin.com/project/rezygisk) and translate!
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ fun String.execute(currentWorkingDir: File = file("./")): String {
 val gitCommitCount = "git rev-list HEAD --count".execute().toInt()
 val gitCommitHash = "git rev-parse --verify --short HEAD".execute()

-val moduleId by extra("zygisksu")
+val moduleId by extra("rezygisk")
 val moduleName by extra("ReZygisk")
 val verName by extra("v1.0.0")
 val verCode by extra(gitCommitCount)
@@ -38,19 +38,18 @@ val androidSourceCompatibility by extra(JavaVersion.VERSION_11)
 val androidTargetCompatibility by extra(JavaVersion.VERSION_11)

 tasks.register("Delete", Delete::class) {
-    delete(rootProject.buildDir)
+    delete(layout.buildDirectory.get())
 }

 fun Project.configureBaseExtension() {
    extensions.findByType(LibraryExtension::class)?.run {
-        namespace = "icu.nullptr.zygisk.next"
+        namespace = "com.performanc.org.rezygisk"
        compileSdk = androidCompileSdkVersion
        ndkVersion = androidCompileNdkVersion
        buildToolsVersion = androidBuildToolsVersion

        defaultConfig {
            minSdk = androidMinSdkVersion
-            targetSdk = androidTargetSdkVersion
        }

        lint {
--- a/loader/build.gradle.kts
+++ b/loader/build.gradle.kts
@@ -57,7 +57,6 @@ android {
    defaultConfig {
        externalNativeBuild.cmake {
            arguments += "-DANDROID_STL=none"
-            arguments += "-DLSPLT_STANDALONE=ON"
            arguments += "-DCMAKE_BUILD_PARALLEL_LEVEL=${Runtime.getRuntime().availableProcessors()}"
            cFlags("-std=c18", *defaultCFlags)
            cppFlags("-std=c++20", *defaultCFlags)
--- a/loader/src/CMakeLists.txt
+++ b/loader/src/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(common log)
 aux_source_directory(injector INJECTOR_SRC_LIST)
 add_library(zygisk SHARED ${INJECTOR_SRC_LIST})
 target_include_directories(zygisk PRIVATE include)
-target_link_libraries(zygisk cxx::cxx log common lsplt_static phmap)
+target_link_libraries(zygisk cxx::cxx log common lsplt_static)

 aux_source_directory(ptracer PTRACER_SRC_LIST)
 add_executable(libzygisk_ptrace.so ${PTRACER_SRC_LIST})
--- a/loader/src/common/daemon.c
+++ b/loader/src/common/daemon.c
@@ -64,7 +64,7 @@ bool rezygiskd_ping() {
  return true;
 }

-uint32_t rezygiskd_get_process_flags(uid_t uid) {
+uint32_t rezygiskd_get_process_flags(uid_t uid, const char *const process) {
  int fd = rezygiskd_connect(1);
  if (fd == -1) {
    PLOGE("connection to ReZygiskd");
@@ -74,6 +74,7 @@ uint32_t rezygiskd_get_process_flags(uid_t uid) {

  write_uint8_t(fd, (uint8_t)GetProcessFlags);
  write_uint32_t(fd, (uint32_t)uid);
+  write_string(fd, process);

  uint32_t res = 0;
  read_uint32_t(fd, &res);
@@ -107,43 +108,32 @@ void rezygiskd_get_info(struct rezygisk_info *info) {

  read_uint32_t(fd, (uint32_t *)&info->pid);

-  read_size_t(fd, &info->modules->modules_count);
-  if (info->modules->modules_count == 0) {
-    info->modules->modules = NULL;
+  read_size_t(fd, &info->modules.modules_count);
+  if (info->modules.modules_count == 0) {
+    info->modules.modules = NULL;

    close(fd);

    return;
  }

-  info->modules->modules = (char **)malloc(sizeof(char *) * info->modules->modules_count);
-  if (info->modules->modules == NULL) {
+  info->modules.modules = (char **)malloc(sizeof(char *) * info->modules.modules_count);
+  if (!info->modules.modules) {
    PLOGE("allocating modules name memory");

-    free(info->modules);
-    info->modules = NULL;
-    info->modules->modules_count = 0;
+    info->modules.modules_count = 0;

    close(fd);

    return;
  }

-  for (size_t i = 0; i < info->modules->modules_count; i++) {
+  for (size_t i = 0; i < info->modules.modules_count; i++) {
    char *module_name = read_string(fd);
    if (module_name == NULL) {
      PLOGE("reading module name");

-      info->modules->modules_count = i;
-
-      free_rezygisk_info(info);
-
-      info->modules = NULL;
-      info->modules->modules_count = 0;
-
-      close(fd);
-
-      return;
+      goto info_cleanup;
    }

    char module_path[PATH_MAX];
@@ -155,43 +145,49 @@ void rezygiskd_get_info(struct rezygisk_info *info) {
    if (!module_prop) {
      PLOGE("failed to open module prop file %s", module_path);

-      info->modules->modules_count = i;
-
-      free_rezygisk_info(info);
-
-      info->modules = NULL;
-      info->modules->modules_count = 0;
-
-      close(fd);
-
-      return;
+      goto info_cleanup;
    }

+    info->modules.modules[i] = NULL;
+
    char line[1024];
    while (fgets(line, sizeof(line), module_prop) != NULL) {
      if (strncmp(line, "name=", strlen("name=")) != 0) continue;

-      info->modules->modules[i] = strndup(line + 5, strlen(line) - 6);
+      info->modules.modules[i] = strndup(line + 5, strlen(line) - 6);

      break;
    }

+    if (info->modules.modules[i] == NULL) {
+      PLOGE("failed to read module name from %s", module_path);
+
+      fclose(module_prop);
+
+      goto info_cleanup;
+    }
+
    fclose(module_prop);
+
+    continue;
+
+    info_cleanup:
+      info->modules.modules_count = i;
+      free_rezygisk_info(info);
+
+      break;
  }

  close(fd);
 }

 void free_rezygisk_info(struct rezygisk_info *info) {
-  if (info->modules->modules) {
-    for (size_t i = 0; i < info->modules->modules_count; i++) {
-      free(info->modules->modules[i]);
-    }
-
-    free(info->modules->modules);
+  for (size_t i = 0; i < info->modules.modules_count; i++) {
+    free(info->modules.modules[i]);
  }

-  free(info->modules);
+  free(info->modules.modules);
+  info->modules.modules = NULL;
 }

 bool rezygiskd_read_modules(struct zygisk_modules *modules) {
@@ -236,13 +232,11 @@ bool rezygiskd_read_modules(struct zygisk_modules *modules) {
 }

 void free_modules(struct zygisk_modules *modules) {
-  if (modules->modules) {
-    for (size_t i = 0; i < modules->modules_count; i++) {
-      free(modules->modules[i]);
-    }
-
-    free(modules->modules);
+  for (size_t i = 0; i < modules->modules_count; i++) {
+    free(modules->modules[i]);
  }
+
+  free(modules->modules);
 }

 int rezygiskd_connect_companion(size_t index) {
--- a/loader/src/common/elf_util.c
+++ b/loader/src/common/elf_util.c
@@ -5,9 +5,16 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <sys/auxv.h>

 #include <unistd.h>

+#ifdef __LP64__
+  #define LOG_TAG "zygisk-elfutil64"
+#else
+  #define LOG_TAG "zygisk-elfutil32"
+#endif
+
 #include "logging.h"

 #include "elf_util.h"
@@ -41,31 +48,31 @@ uint32_t GnuHash(const char *name) {
  return h;
 }

-ElfW(Shdr) *offsetOf_Shdr(ElfW(Ehdr) * head, ElfW(Off) off) {
+ElfW(Shdr) *offsetOf_Shdr(ElfW(Ehdr) *head, ElfW(Off) off) {
  return (ElfW(Shdr) *)(((uintptr_t)head) + off);
 }

-char *offsetOf_char(ElfW(Ehdr) * head, ElfW(Off) off) {
+char *offsetOf_char(ElfW(Ehdr) *head, ElfW(Off) off) {
  return (char *)(((uintptr_t)head) + off);
 }

-ElfW(Sym) *offsetOf_Sym(ElfW(Ehdr) * head, ElfW(Off) off) {
+ElfW(Sym) *offsetOf_Sym(ElfW(Ehdr) *head, ElfW(Off) off) {
  return (ElfW(Sym) *)(((uintptr_t)head) + off);
 }

-ElfW(Word) *offsetOf_Word(ElfW(Ehdr) * head, ElfW(Off) off) {
+ElfW(Word) *offsetOf_Word(ElfW(Ehdr) *head, ElfW(Off) off) {
  return (ElfW(Word) *)(((uintptr_t)head) + off);
 }

 int dl_cb(struct dl_phdr_info *info, size_t size, void *data) {
  (void) size;

-  if ((info)->dlpi_name == NULL) return 0;
+  if (info->dlpi_name == NULL)
+    return 0;

  ElfImg *img = (ElfImg *)data;

-  if (strstr(info->dlpi_name, img->elf)) {  
-    img->elf = strdup(info->dlpi_name);
+  if (strstr(info->dlpi_name, img->elf)) {
    img->base = (void *)info->dlpi_addr;

    return 1;
@@ -74,7 +81,7 @@ int dl_cb(struct dl_phdr_info *info, size_t size, void *data) {
  return 0;
 }

-bool find_module_base(ElfImg *img) {
+bool _find_module_base(ElfImg *img) {
  dl_iterate_phdr(dl_cb, img);

  return img->base != NULL;
@@ -83,47 +90,59 @@ bool find_module_base(ElfImg *img) {
 size_t calculate_valid_symtabs_amount(ElfImg *img) {
  size_t count = 0;

-  if (img->symtab_start == NULL || img->symstr_offset_for_symtab == 0) return count;
+  if (img->symtab_start == NULL || img->symstr_offset_for_symtab == 0) {
+    LOGE("Invalid symtab_start or symstr_offset_for_symtab, cannot count valid symbols");
+
+    return 0;
+  }
+
+  char *symtab_strings = offsetOf_char(img->header, img->symstr_offset_for_symtab);

  for (ElfW(Off) i = 0; i < img->symtab_count; i++) {
+    const char *sym_name = symtab_strings + img->symtab_start[i].st_name;
+    if (!sym_name)
+      continue;
+
    unsigned int st_type = ELF_ST_TYPE(img->symtab_start[i].st_info);

-    if ((st_type == STT_FUNC || st_type == STT_OBJECT) && img->symtab_start[i].st_size)
+    if ((st_type == STT_FUNC || st_type == STT_OBJECT) && img->symtab_start[i].st_size > 0 && img->symtab_start[i].st_name != 0)
      count++;
  }

  return count;
 }

+
 void ElfImg_destroy(ElfImg *img) {
-  if (img->elf) {
-    free(img->elf);
-    img->elf = NULL;
-  }
+  if (!img) return;

  if (img->symtabs_) {
    size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
-    if (valid_symtabs_amount == 0) goto finalize;
-
-    for (size_t i = 0; i < valid_symtabs_amount; i++) {
-      free(img->symtabs_[i].name);
+    if (valid_symtabs_amount > 0) {
+      for (size_t i = 0; i < valid_symtabs_amount; i++) {
+        free(img->symtabs_[i].name);
+      }
    }

    free(img->symtabs_);
    img->symtabs_ = NULL;
  }

+  if (img->elf) {
+    free(img->elf);
+    img->elf = NULL;
+  }
+
  if (img->header) {
    munmap(img->header, img->size);
    img->header = NULL;
  }

-  finalize:
-    free(img);
-    img = NULL;
+  free(img);
 }

-ElfImg *ElfImg_create(const char *elf) {
+
+ElfImg *ElfImg_create(const char *elf, void *base) {
  ElfImg *img = (ElfImg *)calloc(1, sizeof(ElfImg));
  if (!img) {
    LOGE("Failed to allocate memory for ElfImg");
@@ -131,204 +150,483 @@ ElfImg *ElfImg_create(const char *elf) {
    return NULL;
  }

-  img->bias = -4396;
  img->elf = strdup(elf);
-  img->base = NULL;
-  img->symtabs_ = NULL;
+  if (!img->elf) {
+    LOGE("Failed to duplicate elf path string");

-  if (!find_module_base(img)) {
-    LOGE("Failed to find module base for %s", img->elf);
-
-    ElfImg_destroy(img);
+    free(img);

    return NULL;
  }

-  int fd = open(img->elf, O_RDONLY);
+  if (base) {
+    /* INFO: Due to the use in zygisk-ptracer, we need to allow pre-
+              fetched bases to be passed, as the linker (Android 7.1
+              and below) is not loaded from dlopen, which makes it not
+              be visible with dl_iterate_phdr.
+    */
+    img->base = base;
+
+    LOGD("Using provided base address 0x%p for %s", base, elf);
+  } else {
+    if (!_find_module_base(img)) {
+      LOGE("Failed to find module base for %s using dl_iterate_phdr", elf);
+
+      ElfImg_destroy(img);
+
+      return NULL;
+    }
+  }
+
+  int fd = open(elf, O_RDONLY | O_CLOEXEC);
  if (fd < 0) {
-    LOGE("failed to open %s", img->elf);
+    LOGE("failed to open %s", elf);

    ElfImg_destroy(img);

    return NULL;
  }

-  img->size = lseek(fd, 0, SEEK_END);
-  if (img->size <= 0) {
-    LOGE("lseek() failed for %s", img->elf);
+  struct stat st;
+  if (fstat(fd, &st) != 0) {
+    LOGE("fstat() failed for %s", elf);

+    close(fd);
    ElfImg_destroy(img);

    return NULL;
  }

-  img->header = (ElfW(Ehdr) *)mmap(NULL, img->size, PROT_READ, MAP_SHARED, fd, 0);
+  img->size = st.st_size;
+
+  if (img->size <= sizeof(ElfW(Ehdr))) {
+    LOGE("Invalid file size %zu for %s", img->size, elf);
+
+    close(fd);
+    ElfImg_destroy(img);
+
+    return NULL;
+  }
+
+  img->header = (ElfW(Ehdr) *)mmap(NULL, img->size, PROT_READ, MAP_PRIVATE, fd, 0);

  close(fd);

-  img->section_header = offsetOf_Shdr(img->header, img->header->e_shoff);
+  if (img->header == MAP_FAILED) {
+    LOGE("mmap() failed for %s", elf);

-  uintptr_t shoff = (uintptr_t)img->section_header;
-  char *section_str = offsetOf_char(img->header, img->section_header[img->header->e_shstrndx].sh_offset);
+    img->header = NULL;
+    ElfImg_destroy(img);

-  for (int i = 0; i < img->header->e_shnum; i++, shoff += img->header->e_shentsize) {
-    ElfW(Shdr) *section_h = (ElfW(Shdr *))shoff;
+    return NULL;
+  }

-    char *sname = section_h->sh_name + section_str;
-    size_t entsize = section_h->sh_entsize;
+  if (memcmp(img->header->e_ident, ELFMAG, SELFMAG) != 0) {
+    LOGE("Invalid ELF header for %s", elf);

-    switch (section_h->sh_type) {
-      case SHT_DYNSYM: {
-        if (img->bias == -4396) {
-          img->dynsym = section_h;
+    ElfImg_destroy(img);
+
+    return NULL;
+  }
+
+  if (img->header->e_shoff == 0 || img->header->e_shentsize == 0 || img->header->e_shnum == 0) {
+    LOGW("Section header table missing or invalid in %s", elf);
+  } else {
+    img->section_header = offsetOf_Shdr(img->header, img->header->e_shoff);
+  }
+
+  if (img->header->e_phoff == 0 || img->header->e_phentsize == 0 || img->header->e_phnum == 0) {
+    LOGW("Program header table missing or invalid in %s", elf);
+  }
+
+  ElfW(Shdr) *dynsym_shdr = NULL;
+  ElfW(Shdr) *symtab_shdr = NULL;
+
+  char *section_str = NULL;
+  if (img->section_header && img->header->e_shstrndx != SHN_UNDEF) {
+    if (img->header->e_shstrndx < img->header->e_shnum) {
+      ElfW(Shdr) *shstrtab_hdr = img->section_header + img->header->e_shstrndx;
+      section_str = offsetOf_char(img->header, shstrtab_hdr->sh_offset);
+    } else {
+      LOGW("Section header string table index (%u) out of bounds (%u)", img->header->e_shstrndx, img->header->e_shnum);
+    }
+  } else {
+    LOGW("Section header string table index not set or no section headers");
+  }
+
+  if (img->section_header) {
+    uintptr_t shoff = (uintptr_t)img->section_header;
+    for (int i = 0; i < img->header->e_shnum; i++, shoff += img->header->e_shentsize) {
+      ElfW(Shdr) *section_h = (ElfW(Shdr *))shoff;
+      char *sname = section_str ? (section_h->sh_name + section_str) : "<?>";
+      size_t entsize = section_h->sh_entsize;
+
+      switch (section_h->sh_type) {
+        case SHT_DYNSYM: {
+          dynsym_shdr = section_h;
          img->dynsym_offset = section_h->sh_offset;
          img->dynsym_start = offsetOf_Sym(img->header, img->dynsym_offset);
-        }

-        break;
-      }
-      case SHT_SYMTAB: {
-        if (strcmp(sname, ".symtab") == 0) {
-          img->symtab = section_h;
-          img->symtab_offset = section_h->sh_offset;
-          img->symtab_size = section_h->sh_size;
-          img->symtab_count = img->symtab_size / entsize;
-          img->symtab_start = offsetOf_Sym(img->header, img->symtab_offset);
-        }
-
-        break;
-      }
-      case SHT_STRTAB: {
-        if (img->bias == -4396) {
-          img->strtab = section_h;
-          img->symstr_offset = section_h->sh_offset;
-          img->strtab_start = offsetOf_Sym(img->header, img->symstr_offset);
-        }
-
-        if (strcmp(sname, ".strtab") == 0) {
-          img->symstr_offset_for_symtab = section_h->sh_offset;
-        }
-
-        break;
-      }
-      case SHT_PROGBITS: {
-        if (img->strtab == NULL || img->dynsym == NULL)
          break;
-
-        if (img->bias == -4396) {
-          img->bias = (off_t)section_h->sh_addr - (off_t)section_h->sh_offset;
        }
+        case SHT_SYMTAB: {
+          if (strcmp(sname, ".symtab") == 0) {
+            symtab_shdr = section_h;
+            img->symtab_offset = section_h->sh_offset;
+            img->symtab_size = section_h->sh_size;

-        break;
-      }
-      case SHT_HASH: {
-        ElfW(Word) *d_un = offsetOf_Word(img->header, section_h->sh_offset);
-        img->nbucket_ = d_un[0];
-        img->bucket_ = d_un + 2;
-        img->chain_ = img->bucket_ + img->nbucket_;
+            if (entsize > 0) img->symtab_count = img->symtab_size / entsize;
+            else {
+              LOGW("Section %s has zero sh_entsize", sname);
+              img->symtab_count = 0;
+            }

-        break;
+            img->symtab_start = offsetOf_Sym(img->header, img->symtab_offset);
+          }
+
+          break;
+        }
+        case SHT_STRTAB: break;
+        case SHT_PROGBITS: break;
+        case SHT_HASH: {
+          ElfW(Word) *d_un = offsetOf_Word(img->header, section_h->sh_offset);
+
+          if (section_h->sh_size >= 2 * sizeof(ElfW(Word))) {
+            img->nbucket_ = d_un[0];
+
+            if (img->nbucket_ > 0 && section_h->sh_size >= (2 + img->nbucket_ + d_un[1]) * sizeof(ElfW(Word))) {
+              img->bucket_ = d_un + 2;
+              img->chain_ = img->bucket_ + img->nbucket_;
+            } else {
+              LOGW("Invalid SHT_HASH size or nbucket count in section %s", sname);
+              img->nbucket_ = 0;
+            }
+          } else {
+            LOGW("SHT_HASH section %s too small", sname);
+          }
+
+          break;
+        }
+        case SHT_GNU_HASH: {
+          ElfW(Word) *d_buf = offsetOf_Word(img->header, section_h->sh_offset);
+
+          if (section_h->sh_size >= 4 * sizeof(ElfW(Word))) {
+            img->gnu_nbucket_ = d_buf[0];
+            img->gnu_symndx_ = d_buf[1];
+            img->gnu_bloom_size_ = d_buf[2];
+            img->gnu_shift2_ = d_buf[3];
+
+            size_t expected_min_size = 4 * sizeof(ElfW(Word)) +
+                                      img->gnu_bloom_size_ * sizeof(uintptr_t) +
+                                      img->gnu_nbucket_ * sizeof(uint32_t);
+
+            if (img->gnu_nbucket_ > 0 && img->gnu_bloom_size_ > 0 && section_h->sh_size >= expected_min_size) {
+              img->gnu_bloom_filter_ = (uintptr_t *)(d_buf + 4);
+              img->gnu_bucket_ = (uint32_t *)(img->gnu_bloom_filter_ + img->gnu_bloom_size_);
+              img->gnu_chain_ = img->gnu_bucket_ + img->gnu_nbucket_;
+
+              uintptr_t chain_start_offset = (uintptr_t)img->gnu_chain_ - (uintptr_t)img->header;
+              if (chain_start_offset < section_h->sh_offset || chain_start_offset >= section_h->sh_offset + section_h->sh_size) {
+                LOGW("Calculated GNU hash chain seems out of bounds for section %s", sname);
+
+                img->gnu_nbucket_ = 0;
+              }
+            } else {
+              LOGW("Invalid SHT_GNU_HASH size or parameters in section %s", sname);
+
+              img->gnu_nbucket_ = 0;
+            }
+          } else {
+            LOGW("SHT_GNU_HASH section %s too small", sname);
+          }
+
+          break;
+        }
      }
-      case SHT_GNU_HASH: {
-        ElfW(Word) *d_buf = (ElfW(Word) *)(((size_t)img->header) + section_h->sh_offset);
-        img->gnu_nbucket_ = d_buf[0];
-        img->gnu_symndx_ = d_buf[1];
-        img->gnu_bloom_size_ = d_buf[2];
-        img->gnu_shift2_ = d_buf[3];
-        img->gnu_bloom_filter_ = (uintptr_t *)(d_buf + 4);
-        img->gnu_bucket_ = (uint32_t *)(img->gnu_bloom_filter_ + img->gnu_bloom_size_);
-        img->gnu_chain_ = img->gnu_bucket_ + img->gnu_nbucket_ - img->gnu_symndx_;
+    }
+  }
+
+  ElfW(Shdr) *shdr_base = img->section_header;
+
+  if (dynsym_shdr && shdr_base) {
+    img->dynsym = dynsym_shdr;
+
+    if (dynsym_shdr->sh_link < img->header->e_shnum) {
+      ElfW(Shdr) *linked_strtab = shdr_base + dynsym_shdr->sh_link;
+
+      if (linked_strtab->sh_type == SHT_STRTAB) {
+        img->strtab = linked_strtab;
+        img->symstr_offset = linked_strtab->sh_offset;
+        img->strtab_start = (void *)offsetOf_char(img->header, img->symstr_offset);
+      } else {
+        LOGW("Section %u linked by .dynsym is not SHT_STRTAB (type %u)", dynsym_shdr->sh_link, linked_strtab->sh_type);
+      }
+    } else {
+      LOGE(".dynsym sh_link (%u) is out of bounds (%u)", dynsym_shdr->sh_link, img->header->e_shnum);
+    }
+  } else {
+    LOGW("No .dynsym section found or section headers missing");
+  }
+
+  if (symtab_shdr && shdr_base) {
+    img->symtab = symtab_shdr;
+
+    if (symtab_shdr->sh_link < img->header->e_shnum) {
+      ElfW(Shdr) *linked_strtab = shdr_base + symtab_shdr->sh_link;
+
+      if (linked_strtab->sh_type == SHT_STRTAB) {
+        /* INFO: For linear lookup */
+        img->symstr_offset_for_symtab = linked_strtab->sh_offset;
+      } else {
+        LOGW("Section %u linked by .symtab is not SHT_STRTAB (type %u)", symtab_shdr->sh_link, linked_strtab->sh_type);
+
+        img->symstr_offset_for_symtab = 0;
+      }
+    } else {
+      LOGE(".symtab sh_link (%u) is out of bounds (%u)", symtab_shdr->sh_link, img->header->e_shnum);
+
+      img->symstr_offset_for_symtab = 0;
+    }
+  } else {
+    LOGD("No .symtab section found or section headers missing");
+
+    img->symtab_start = NULL;
+    img->symtab_count = 0;
+    img->symstr_offset_for_symtab = 0;
+  }
+
+  bool bias_calculated = false;
+  if (img->header->e_phoff > 0 && img->header->e_phnum > 0) {
+    ElfW(Phdr) *phdr = (ElfW(Phdr) *)((uintptr_t)img->header + img->header->e_phoff);
+
+    for (int i = 0; i < img->header->e_phnum; ++i) {
+      if (phdr[i].p_type == PT_LOAD && phdr[i].p_offset == 0) {
+        img->bias = phdr[i].p_vaddr - phdr[i].p_offset;
+        bias_calculated = true;
+
+        LOGD("Calculated bias %ld from PT_LOAD segment %d (vaddr %lx)", (long)img->bias, i, (unsigned long)phdr[i].p_vaddr);

        break;
      }
    }
+
+    if (!bias_calculated) for (int i = 0; i < img->header->e_phnum; ++i) {
+      if (phdr[i].p_type != PT_LOAD) continue;
+
+      img->bias = phdr[i].p_vaddr - phdr[i].p_offset;
+      bias_calculated = true;
+
+      LOGD("Calculated bias %ld from first PT_LOAD segment %d (vaddr %lx, offset %lx)",
+          (long)img->bias, i, (unsigned long)phdr[i].p_vaddr, (unsigned long)phdr[i].p_offset);
+
+      break;
+    }
  }

+  if (!bias_calculated)
+    LOGE("Failed to calculate bias for %s. Assuming bias is 0.", elf);
+
+  if (!img->dynsym_start || !img->strtab_start) {
+    if (img->header->e_type == ET_DYN) LOGE("Failed to find .dynsym or its string table (.dynstr) in %s", elf);
+    else LOGW("No .dynsym or .dynstr found in %s (might be expected for ET_EXEC)", elf);
+  }
+
+  if (!img->gnu_bucket_ && !img->bucket_)
+    LOGW("No hash table (.gnu.hash or .hash) found in %s. Dynamic symbol lookup might be slow or fail.", elf);
+
  return img;
 }

-ElfW(Addr) ElfLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash) {
-  if (img->nbucket_ == 0)
-    return 0;
-
-  char *strings = (char *)img->strtab_start;
-
-  for (size_t n = img->bucket_[hash % img->nbucket_]; n != 0; n = img->chain_[n]) {
-    ElfW(Sym) *sym = img->dynsym_start + n;
-
-    if (strncmp(name, strings + sym->st_name, strlen(name)) == 0)
-      return sym->st_value;
-  }
-  return 0;
-}
-
-ElfW(Addr) GnuLookup(ElfImg *restrict img, const char *name, uint32_t hash) {
-  static size_t bloom_mask_bits = sizeof(ElfW(Addr)) * 8;
-
-  if (img->gnu_nbucket_ == 0 || img->gnu_bloom_size_ == 0)
-    return 0;
-
-  size_t bloom_word =
-      img->gnu_bloom_filter_[(hash / bloom_mask_bits) % img->gnu_bloom_size_];
-  uintptr_t mask = 0 | (uintptr_t)1 << (hash % bloom_mask_bits) |
-                   (uintptr_t)1 << ((hash >> img->gnu_shift2_) % bloom_mask_bits);
-  if ((mask & bloom_word) == mask) {
-    size_t sym_index = img->gnu_bucket_[hash % img->gnu_nbucket_];
-    if (sym_index >= img->gnu_symndx_) {
-      char *strings = (char *)img->strtab_start;
-      do {
-        ElfW(Sym) *sym = img->dynsym_start + sym_index;
-
-        if (((img->gnu_chain_[sym_index] ^ hash) >> 1) == 0 &&
-            name == strings + sym->st_name) {
-          return sym->st_value;
-        }
-      } while ((img->gnu_chain_[sym_index++] & 1) == 0);
-    }
-  }
-
-  return 0;
-}
-
 bool _load_symtabs(ElfImg *img) {
  if (img->symtabs_) return true;

+  if (!img->symtab_start || img->symstr_offset_for_symtab == 0 || img->symtab_count == 0) {
+    LOGE("Cannot load symtabs: .symtab section or its string table not found/valid.");
+
+    return false;
+  }
+
  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
-  if (valid_symtabs_amount == 0) return false;
+  if (valid_symtabs_amount == 0) {
+    LOGW("No valid symbols (FUNC/OBJECT with size > 0) found in .symtab for %s", img->elf);

-  img->symtabs_ = (struct symtabs *)malloc(sizeof(struct symtabs) * valid_symtabs_amount);
-  if (!img->symtabs_) return false;
+    return false;
+  }

-  if (img->symtab_start != NULL && img->symstr_offset_for_symtab != 0) {
-    ElfW(Off) i = 0;
-    for (ElfW(Off) pos = 0; pos < img->symtab_count; pos++) {
-      unsigned int st_type = ELF_ST_TYPE(img->symtab_start[pos].st_info);
-      const char *st_name = offsetOf_char(img->header, img->symstr_offset_for_symtab + img->symtab_start[pos].st_name);
+  img->symtabs_ = (struct symtabs *)calloc(valid_symtabs_amount, sizeof(struct symtabs));
+  if (!img->symtabs_) {
+    LOGE("Failed to allocate memory for symtabs array");

-      if ((st_type == STT_FUNC || st_type == STT_OBJECT) && img->symtab_start[pos].st_size) {
-        img->symtabs_[i].name = strdup(st_name);
-        img->symtabs_[i].sym = &img->symtab_start[pos];
+    return false;
+  }

-        i++;
+  char *symtab_strings = offsetOf_char(img->header, img->symstr_offset_for_symtab);
+  size_t current_valid_index = 0;
+
+  for (ElfW(Off) pos = 0; pos < img->symtab_count; pos++) {
+    ElfW(Sym) *current_sym = &img->symtab_start[pos];
+    unsigned int st_type = ELF_ST_TYPE(current_sym->st_info);
+
+    if ((st_type == STT_FUNC || st_type == STT_OBJECT) && current_sym->st_size > 0 && current_sym->st_name != 0) {
+      const char *st_name = symtab_strings + current_sym->st_name;
+      if (!st_name)
+        continue;
+
+      ElfW(Shdr) *symtab_str_shdr = img->section_header + img->symtab->sh_link;
+      if (current_sym->st_name >= symtab_str_shdr->sh_size) {
+        LOGE("Symbol name offset out of bounds");
+
+        continue;
      }
+
+      img->symtabs_[current_valid_index].name = strdup(st_name);
+      if (!img->symtabs_[current_valid_index].name) {
+        LOGE("Failed to duplicate symbol name: %s", st_name);
+
+        for(size_t k = 0; k < current_valid_index; ++k) {
+          free(img->symtabs_[k].name);
+        }
+
+        free(img->symtabs_);
+        img->symtabs_ = NULL;
+
+        return false;
+      }
+
+      img->symtabs_[current_valid_index].sym = current_sym;
+
+      current_valid_index++;
+      if (current_valid_index == valid_symtabs_amount) break;
    }
  }

  return true;
 }

-ElfW(Addr) LinearLookup(ElfImg *img, const char *restrict name) {
-  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
-  if (valid_symtabs_amount == 0) return 0;
+ElfW(Addr) GnuLookup(ElfImg *restrict img, const char *name, uint32_t hash, unsigned char *sym_type) {
+  if (img->gnu_nbucket_ == 0 || img->gnu_bloom_size_ == 0 || !img->gnu_bloom_filter_ || !img->gnu_bucket_ || !img->gnu_chain_ || !img->dynsym_start || !img->strtab_start)
+    return 0;

+  static const size_t bloom_mask_bits = sizeof(uintptr_t) * 8;
+
+  size_t bloom_idx = (hash / bloom_mask_bits) % img->gnu_bloom_size_;
+  uintptr_t bloom_word = img->gnu_bloom_filter_[bloom_idx];
+  uintptr_t mask = ((uintptr_t)1 << (hash % bloom_mask_bits)) |
+                   ((uintptr_t)1 << ((hash >> img->gnu_shift2_) % bloom_mask_bits));
+
+  if ((mask & bloom_word) != mask) {
+    /* INFO: Very loggy -- generates too much noise. GNU is rarely used for Zygisk context. */
+    /* LOGW("Symbol '%s' (hash %u) filtered out by GNU Bloom Filter (idx %zu, mask 0x%lx, word 0x%lx)",
+           name, hash, bloom_idx, (unsigned long)mask, (unsigned long)bloom_word);
+    */
+
+    return 0;
+  }
+
+  uint32_t sym_index = img->gnu_bucket_[hash % img->gnu_nbucket_];
+  if (sym_index < img->gnu_symndx_) {
+    LOGW("Symbol %s hash %u maps to bucket %u index %u (below gnu_symndx %u), not exported?", name, hash, hash % img->gnu_nbucket_, sym_index, img->gnu_symndx_);
+
+    return 0;
+  }
+
+  char *strings = (char *)img->strtab_start;
+  uint32_t chain_val = img->gnu_chain_[sym_index - img->gnu_symndx_];
+
+  ElfW(Word) dynsym_count = img->dynsym->sh_size / img->dynsym->sh_entsize;
+  if (sym_index >= dynsym_count) {
+    LOGE("Symbol index %u out of bounds", sym_index);
+
+    return 0;
+  }
+
+  ElfW(Sym) *sym = img->dynsym_start + sym_index;
+
+  if (sym->st_name >= img->strtab->sh_size) {
+    LOGE("Symbol name offset %u out of bounds", sym->st_name);
+
+    return 0;
+  }
+
+  if ((((chain_val ^ hash) >> 1) == 0 && strcmp(name, strings + sym->st_name) == 0) && sym->st_shndx != SHN_UNDEF) {
+    unsigned int type = ELF_ST_TYPE(sym->st_info);
+    if (sym_type) *sym_type = type;
+
+    return sym->st_value;
+  }
+
+  while ((chain_val & 1) == 0) {
+    sym_index++;
+
+    if (sym_index >= dynsym_count) {
+      LOGE("Symbol index %u out of bounds during chain walk", sym_index);
+
+      return 0;
+    }
+
+    chain_val = img->gnu_chain_[sym_index - img->gnu_symndx_];
+    sym = img->dynsym_start + sym_index;
+
+    if (sym->st_name >= img->strtab->sh_size) {
+      LOGE("Symbol name offset %u out of bounds", sym->st_name);
+
+      break;
+    }
+
+    if ((((chain_val ^ hash) >> 1) == 0 && strcmp(name, strings + sym->st_name) == 0) && sym->st_shndx != SHN_UNDEF) {
+      unsigned int type = ELF_ST_TYPE(sym->st_info);
+      if (sym_type) *sym_type = type;
+
+      return sym->st_value;
+    }
+  }
+
+  return 0;
+}
+
+ElfW(Addr) ElfLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash, unsigned char *sym_type) {
+  if (img->nbucket_ == 0 || !img->bucket_ || !img->chain_ || !img->dynsym_start || !img->strtab_start)
+    return 0;
+
+  char *strings = (char *)img->strtab_start;
+
+  for (size_t n = img->bucket_[hash % img->nbucket_]; n != STN_UNDEF; n = img->chain_[n]) {
+    ElfW(Sym) *sym = img->dynsym_start + n;
+
+    if (strcmp(name, strings + sym->st_name) == 0 && sym->st_shndx != SHN_UNDEF) {
+      unsigned int type = ELF_ST_TYPE(sym->st_info);
+      if (sym_type) *sym_type = type;
+
+      return sym->st_value;
+    }
+  }
+
+  return 0;
+}
+
+ElfW(Addr) LinearLookup(ElfImg *img, const char *restrict name, unsigned char *sym_type) {
  if (!_load_symtabs(img)) {
-    LOGE("Failed to load symtabs");
+    LOGE("Failed to load symtabs for linear lookup of %s", name);
+
+    return 0;
+  }
+
+  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
+  if (valid_symtabs_amount == 0) {
+    LOGW("No valid symbols (FUNC/OBJECT with size > 0) found in .symtab for %s", img->elf);

    return 0;
  }

  for (size_t i = 0; i < valid_symtabs_amount; i++) {
-    if (strcmp(name, img->symtabs_[i].name) != 0) continue;
+    if (!img->symtabs_[i].name || strcmp(name, img->symtabs_[i].name) != 0)
+      continue;
+
+    if (img->symtabs_[i].sym->st_shndx == SHN_UNDEF)
+      continue;
+
+    unsigned int type = ELF_ST_TYPE(img->symtabs_[i].sym->st_info);
+    if (sym_type) *sym_type = type;

    return img->symtabs_[i].sym->st_value;
  }
@@ -336,54 +634,186 @@ ElfW(Addr) LinearLookup(ElfImg *img, const char *restrict name) {
  return 0;
 }

-ElfW(Addr) LinearLookupByPrefix(ElfImg *img, const char *name) {
-  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
-  if (valid_symtabs_amount == 0) return 0;
-
+ElfW(Addr) LinearLookupByPrefix(ElfImg *img, const char *prefix, unsigned char *sym_type) {
  if (!_load_symtabs(img)) {
-    LOGE("Failed to load symtabs");
+    LOGE("Failed to load symtabs for linear lookup by prefix of %s", prefix);

    return 0;
  }

+  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
+  if (valid_symtabs_amount == 0) {
+    LOGW("No valid symbols (FUNC/OBJECT with size > 0) found in .symtab for %s", img->elf);
+
+    return 0;
+  }
+
+  size_t prefix_len = strlen(prefix);
+  if (prefix_len == 0) return 0;
+
  for (size_t i = 0; i < valid_symtabs_amount; i++) {
-    if (strlen(img->symtabs_[i].name) < strlen(name))
+    if (!img->symtabs_[i].name || strlen(img->symtabs_[i].name) < prefix_len)
      continue;

-    if (strncmp(img->symtabs_[i].name, name, strlen(name)) != 0)
+    if (strncmp(img->symtabs_[i].name, prefix, prefix_len) != 0)
      continue;

+    if (img->symtabs_[i].sym->st_shndx == SHN_UNDEF)
+      continue;
+
+    unsigned int type = ELF_ST_TYPE(img->symtabs_[i].sym->st_info);
+    if (sym_type) *sym_type = type;
+
    return img->symtabs_[i].sym->st_value;
  }

  return 0;
 }

-ElfW(Addr) getSymbOffset(ElfImg *img, const char *name) {
-  ElfW(Addr) offset = GnuLookup(img, name, GnuHash(name));
-  if (offset > 0) return offset;
+ElfW(Addr) getSymbOffset(ElfImg *img, const char *name, unsigned char *sym_type) {
+  ElfW(Addr) offset = 0;

-  offset = ElfLookup(img, name, ElfHash(name));
-  if (offset > 0) return offset;
+  offset = GnuLookup(img, name, GnuHash(name), sym_type);
+  if (offset != 0) return offset;

-  offset = LinearLookup(img, name);
-  if (offset > 0) return offset;
+  offset = ElfLookup(img, name, ElfHash(name), sym_type);
+  if (offset != 0) return offset;
+
+  offset = LinearLookup(img, name, sym_type);
+  if (offset != 0) return offset;

  return 0;
 }

+#ifdef __aarch64__
+  /* INFO: Struct containing information about hardware capabilities used in resolver. This
+             struct information is pulled directly from the AOSP code.
+
+     SOURCES:
+      - https://android.googlesource.com/platform/bionic/+/refs/tags/android-16.0.0_r1/libc/include/sys/ifunc.h#53
+  */
+  struct __ifunc_arg_t {
+    unsigned long _size;
+    unsigned long _hwcap;
+    unsigned long _hwcap2;
+  };
+
+  /* INFO: This is a constant used in the AOSP code to indicate that the struct __ifunc_arg_t
+             contains hardware capabilities.
+
+     SOURCES:
+      - https://android.googlesource.com/platform/bionic/+/refs/tags/android-16.0.0_r1/libc/include/sys/ifunc.h#74
+  */
+  #define _IFUNC_ARG_HWCAP (1ULL << 62)
+#elif defined(__riscv)
+  /* INFO: Struct used in Linux RISC-V architecture to probe hardware capabilities.
+
+     SOURCES:
+      - https://android.googlesource.com/platform/bionic/+/refs/tags/android-16.0.0_r1/libc/kernel/uapi/asm-riscv/asm/hwprobe.h#10
+  */
+  struct riscv_hwprobe {
+    int64_t key;
+    uint64_t value;
+  };
+
+  /* INFO: This function is used in the AOSP code to probe hardware capabilities on RISC-V architecture
+             by calling the syscall __NR_riscv_hwprobe and passing the parameters that will filled with
+             the device hardware capabilities.
+
+     SOURCES:
+      - https://android.googlesource.com/platform/bionic/+/refs/tags/android-16.0.0_r1/libc/bionic/vdso.cpp#86
+  */
+  int __riscv_hwprobe(struct riscv_hwprobe *pairs, size_t pair_count, size_t cpu_count, unsigned long *cpus, unsigned flags) {
+    register long a0 __asm__("a0") = (long)pairs;
+    register long a1 __asm__("a1") = pair_count;
+    register long a2 __asm__("a2") = cpu_count;
+    register long a3 __asm__("a3") = (long)cpus;
+    register long a4 __asm__("a4") = flags;
+    register long a7 __asm__("a7") = __NR_riscv_hwprobe;
+
+    __asm__ volatile(
+      "ecall"
+      : "=r"(a0)
+      : "r"(a0), "r"(a1), "r"(a2), "r"(a3), "r"(a4), "r"(a7)
+    );
+
+    return -a0;
+  }
+
+  /* INFO: This is a function pointer type that points how the signature of the __riscv_hwprobe
+             function is.
+
+     SOURCES:
+      - https://android.googlesource.com/platform/bionic/+/refs/tags/android-16.0.0_r1/libc/include/sys/hwprobe.h#62
+  */
+  typedef int (*__riscv_hwprobe_t)(struct riscv_hwprobe *__pairs, size_t __pair_count, size_t __cpu_count, unsigned long *__cpus, unsigned __flags);
+#endif
+
+/* INFO: GNU ifuncs (indirect functions) are functions that does not execute the code by itself,
+           but instead lead to other functions that may very according to hardware capabilities,
+           or other reasons, depending of the architecture.
+
+         This function is based on AOSP's (Android Open Source Project) code, and resolves the
+           indirect symbol, leading to the correct, most appropriate for the hardware, symbol.
+
+    SOURCES: 
+     - https://android.googlesource.com/platform/bionic/+/refs/tags/android-16.0.0_r1/linker/linker.cpp#2594
+     - https://android.googlesource.com/platform/bionic/+/tags/android-16.0.0_r1/libc/bionic/bionic_call_ifunc_resolver.cpp#41
+*/
+static ElfW(Addr) handle_indirect_symbol(ElfImg *img, ElfW(Off) offset) {
+  ElfW(Addr) resolver_addr = (ElfW(Addr))((uintptr_t)img->base + offset - img->bias);
+
+  #ifdef __aarch64__
+    typedef ElfW(Addr) (*ifunc_resolver_t)(uint64_t, struct __ifunc_arg_t *);
+
+    struct __ifunc_arg_t args = {
+      ._size = sizeof(struct __ifunc_arg_t),
+      ._hwcap = getauxval(AT_HWCAP),
+      ._hwcap2 = getauxval(AT_HWCAP2)
+    };
+
+    return ((ifunc_resolver_t)resolver_addr)(args._hwcap | _IFUNC_ARG_HWCAP, &args);
+  #elif defined(__arm__)
+      typedef ElfW(Addr) (*ifunc_resolver_t)(unsigned long);
+
+      return ((ifunc_resolver_t)resolver_addr)(getauxval(AT_HWCAP));
+  #elif defined(__riscv)
+    typedef ElfW(Addr) (*ifunc_resolver_t)(uint64_t, __riscv_hwprobe_t, void *);
+
+    return ((ifunc_resolver_t)resolver_addr)(getauxval(AT_HWCAP), __riscv_hwprobe, NULL);
+  #else
+    typedef ElfW(Addr) (*ifunc_resolver_t)(void);
+
+    return ((ifunc_resolver_t)resolver_addr)();
+  #endif
+}
+
 ElfW(Addr) getSymbAddress(ElfImg *img, const char *name) {
-  ElfW(Addr) offset = getSymbOffset(img, name);
+  unsigned char sym_type = 0;
+  ElfW(Addr) offset = getSymbOffset(img, name, &sym_type);

  if (offset == 0 || !img->base) return 0;

-  return ((uintptr_t)img->base + offset - img->bias);
+  if (sym_type == STT_GNU_IFUNC) {
+    LOGD("Resolving STT_GNU_IFUNC symbol %s", name);
+
+    return handle_indirect_symbol(img, offset);
+  }
+
+  return (ElfW(Addr))((uintptr_t)img->base + offset - img->bias);
 }

 ElfW(Addr) getSymbAddressByPrefix(ElfImg *img, const char *prefix) {
-  ElfW(Addr) offset = LinearLookupByPrefix(img, prefix);
+  unsigned char sym_type = 0;
+  ElfW(Addr) offset = LinearLookupByPrefix(img, prefix, &sym_type);

-  if (offset < 0 || !img->base) return 0;
+  if (offset == 0 || !img->base) return 0;
+
+  if (sym_type == STT_GNU_IFUNC) {
+    LOGD("Resolving STT_GNU_IFUNC symbol by prefix %s", prefix);
+
+    return handle_indirect_symbol(img, offset);
+  }

  return (ElfW(Addr))((uintptr_t)img->base + offset - img->bias);
 }
--- a/loader/src/common/socket_utils.c
+++ b/loader/src/common/socket_utils.c
@@ -8,6 +8,50 @@

 #include "socket_utils.h"

+ssize_t write_loop(int fd, const void *buf, size_t count) {
+  ssize_t written = 0;
+  while (written < (ssize_t)count) {
+    ssize_t ret = write(fd, (const char *)buf + written, count - written);
+    if (ret == -1) {
+      if (errno == EINTR || errno == EAGAIN) continue;
+
+      PLOGE("write");
+    }
+
+    if (ret == 0) {
+      LOGE("write: 0 bytes written");
+
+      return -1;
+    }
+
+    written += ret;
+  }
+
+  return written;
+}
+
+ssize_t read_loop(int fd, void *buf, size_t count) {
+  ssize_t read_bytes = 0;
+  while (read_bytes < (ssize_t)count) {
+    ssize_t ret = read(fd, (char *)buf + read_bytes, count - read_bytes);
+    if (ret == -1) {
+      if (errno == EINTR || errno == EAGAIN) continue;
+
+      PLOGE("read");
+    }
+
+    if (ret == 0) {
+      LOGE("read: 0 bytes read");
+
+      return -1;
+    }
+
+    read_bytes += ret;
+  }
+
+  return read_bytes;
+}
+
 /* TODO: Standardize how to log errors */
 int read_fd(int fd) {
  char cmsgbuf[CMSG_SPACE(sizeof(int))];
@@ -25,7 +69,7 @@ int read_fd(int fd) {
    .msg_controllen = sizeof(cmsgbuf)
  };

-  ssize_t ret = recvmsg(fd, &msg, MSG_WAITALL);
+  ssize_t ret = TEMP_FAILURE_RETRY(recvmsg(fd, &msg, MSG_WAITALL));
  if (ret == -1) {
    PLOGE("recvmsg");

@@ -45,9 +89,28 @@ int read_fd(int fd) {
  return sendfd;
 }

+ssize_t write_string(int fd, const char *str) {
+  size_t str_len = strlen(str);
+  ssize_t write_bytes = write_loop(fd, &str_len, sizeof(size_t));
+  if (write_bytes != (ssize_t)sizeof(size_t)) {
+    LOGE("Failed to write string length: Not all bytes were written (%zd != %zu).\n", write_bytes, sizeof(size_t));
+
+    return -1;
+  }
+
+  write_bytes = write_loop(fd, str, str_len);
+  if (write_bytes != (ssize_t)str_len) {
+    LOGE("Failed to write string: Promised bytes doesn't exist (%zd != %zu).\n", write_bytes, str_len);
+
+    return -1;
+  }
+
+  return write_bytes;
+}
+
 char *read_string(int fd) {
  size_t str_len = 0;
-  ssize_t read_bytes = read(fd, &str_len, sizeof(size_t));
+  ssize_t read_bytes = read_loop(fd, &str_len, sizeof(size_t));
  if (read_bytes != (ssize_t)sizeof(size_t)) {
    LOGE("Failed to read string length: Not all bytes were read (%zd != %zu).\n", read_bytes, sizeof(size_t));

@@ -61,7 +124,7 @@ char *read_string(int fd) {
    return NULL;
  }

-  read_bytes = read(fd, buf, str_len);
+  read_bytes = read_loop(fd, buf, str_len);
  if (read_bytes != (ssize_t)str_len) {
    LOGE("Failed to read string: Promised bytes doesn't exist (%zd != %zu).\n", read_bytes, str_len);

@@ -75,14 +138,14 @@ char *read_string(int fd) {
  return buf;
 }

-#define write_func(type)                    \
-  ssize_t write_## type(int fd, type val) { \
-    return write(fd, &val, sizeof(type));   \
+#define write_func(type)                       \
+  ssize_t write_## type(int fd, type val) {    \
+    return write_loop(fd, &val, sizeof(type)); \
  }

-#define read_func(type)                     \
-  ssize_t read_## type(int fd, type *val) { \
-    return read(fd, val, sizeof(type));     \
+#define read_func(type)                      \
+  ssize_t read_## type(int fd, type *val) {  \
+    return read_loop(fd, val, sizeof(type)); \
  }

 write_func(uint8_t)
--- a/loader/src/external/CMakeLists.txt
+++ b/loader/src/external/CMakeLists.txt
@@ -2,7 +2,3 @@ project(external)

 OPTION(LSPLT_BUILD_SHARED OFF)
 add_subdirectory(lsplt/lsplt/src/main/jni)
-
-add_library(phmap INTERFACE)
-target_include_directories(phmap INTERFACE parallel-hashmap)
-target_compile_options(phmap INTERFACE -Wno-unused-value)
--- a/loader/src/external/lsplt
+++ b/loader/src/external/lsplt
--- a/loader/src/include/api.hpp
+++ b/loader/src/include/api.hpp
@@ -1,395 +0,0 @@
-/* Copyright 2022 John "topjohnwu" Wu
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-// This is the public API for Zygisk modules.
-// DO NOT MODIFY ANY CODE IN THIS HEADER.
-
-// WARNING: this file may contain changes that are not finalized.
-// Always use the following published header for development:
-// https://github.com/topjohnwu/zygisk-module-sample/blob/master/module/jni/zygisk.hpp
-
-#pragma once
-
-#include <jni.h>
-
-#define ZYGISK_API_VERSION 4
-
-/*
-
-***************
-* Introduction
-***************
-
-On Android, all app processes are forked from a special daemon called "Zygote".
-For each new app process, zygote will fork a new process and perform "specialization".
-This specialization operation enforces the Android security sandbox on the newly forked
-process to make sure that 3rd party application code is only loaded after it is being
-restricted within a sandbox.
-
-On Android, there is also this special process called "system_server". This single
-process hosts a significant portion of system services, which controls how the
-Android operating system and apps interact with each other.
-
-The Zygisk framework provides a way to allow developers to build modules and run custom
-code before and after system_server and any app processes' specialization.
-This enable developers to inject code and alter the behavior of system_server and app processes.
-
-Please note that modules will only be loaded after zygote has forked the child process.
-THIS MEANS ALL OF YOUR CODE RUNS IN THE APP/SYSTEM_SERVER PROCESS, NOT THE ZYGOTE DAEMON!
-
-*********************
-* Development Guide
-*********************
-
-Define a class and inherit zygisk::ModuleBase to implement the functionality of your module.
-Use the macro REGISTER_ZYGISK_MODULE(className) to register that class to Zygisk.
-
-Example code:
-
-static jint (*orig_logger_entry_max)(JNIEnv *env);
-static jint my_logger_entry_max(JNIEnv *env) { return orig_logger_entry_max(env); }
-
-class ExampleModule : public zygisk::ModuleBase {
-public:
-    void onLoad(zygisk::Api *api, JNIEnv *env) override {
-        this->api = api;
-        this->env = env;
-    }
-    void preAppSpecialize(zygisk::AppSpecializeArgs *args) override {
-        JNINativeMethod methods[] = {
-            { "logger_entry_max_payload_native", "()I", (void*) my_logger_entry_max },
-        };
-        api->hookJniNativeMethods(env, "android/util/Log", methods, 1);
-        *(void **) &orig_logger_entry_max = methods[0].fnPtr;
-    }
-private:
-    zygisk::Api *api;
-    JNIEnv *env;
-};
-
-REGISTER_ZYGISK_MODULE(ExampleModule)
-
-----------------------------------------------------------------------------------------
-
-Since your module class's code runs with either Zygote's privilege in pre[XXX]Specialize,
-or runs in the sandbox of the target process in post[XXX]Specialize, the code in your class
-never runs in a true superuser environment.
-
-If your module require access to superuser permissions, you can create and register
-a root companion handler function. This function runs in a separate root companion
-daemon process, and an Unix domain socket is provided to allow you to perform IPC between
-your target process and the root companion process.
-
-Example code:
-
-static void example_handler(int socket) { ... }
-
-REGISTER_ZYGISK_COMPANION(example_handler)
-
-*/
-
-namespace zygisk {
-
-    struct Api;
-    struct AppSpecializeArgs;
-    struct ServerSpecializeArgs;
-
-    class ModuleBase {
-    public:
-
-        // This method is called as soon as the module is loaded into the target process.
-        // A Zygisk API handle will be passed as an argument.
-        virtual void onLoad([[maybe_unused]] Api *api, [[maybe_unused]] JNIEnv *env) {}
-
-        // This method is called before the app process is specialized.
-        // At this point, the process just got forked from zygote, but no app specific specialization
-        // is applied. This means that the process does not have any sandbox restrictions and
-        // still runs with the same privilege of zygote.
-        //
-        // All the arguments that will be sent and used for app specialization is passed as a single
-        // AppSpecializeArgs object. You can read and overwrite these arguments to change how the app
-        // process will be specialized.
-        //
-        // If you need to run some operations as superuser, you can call Api::connectCompanion() to
-        // get a socket to do IPC calls with a root companion process.
-        // See Api::connectCompanion() for more info.
-        virtual void preAppSpecialize([[maybe_unused]] AppSpecializeArgs *args) {}
-
-        // This method is called after the app process is specialized.
-        // At this point, the process has all sandbox restrictions enabled for this application.
-        // This means that this method runs with the same privilege of the app's own code.
-        virtual void postAppSpecialize([[maybe_unused]] const AppSpecializeArgs *args) {}
-
-        // This method is called before the system server process is specialized.
-        // See preAppSpecialize(args) for more info.
-        virtual void preServerSpecialize([[maybe_unused]] ServerSpecializeArgs *args) {}
-
-        // This method is called after the system server process is specialized.
-        // At this point, the process runs with the privilege of system_server.
-        virtual void postServerSpecialize([[maybe_unused]] const ServerSpecializeArgs *args) {}
-    };
-
-    struct AppSpecializeArgs {
-        // Required arguments. These arguments are guaranteed to exist on all Android versions.
-        jint &uid;
-        jint &gid;
-        jintArray &gids;
-        jint &runtime_flags;
-        jobjectArray &rlimits;
-        jint &mount_external;
-        jstring &se_info;
-        jstring &nice_name;
-        jstring &instruction_set;
-        jstring &app_data_dir;
-
-        // Optional arguments. Please check whether the pointer is null before de-referencing
-        jintArray *const fds_to_ignore;
-        jboolean *const is_child_zygote;
-        jboolean *const is_top_app;
-        jobjectArray *const pkg_data_info_list;
-        jobjectArray *const whitelisted_data_info_list;
-        jboolean *const mount_data_dirs;
-        jboolean *const mount_storage_dirs;
-        jboolean *const mount_sysprop_overrides;
-
-        AppSpecializeArgs() = delete;
-    };
-
-    struct ServerSpecializeArgs {
-        jint &uid;
-        jint &gid;
-        jintArray &gids;
-        jint &runtime_flags;
-        jlong &permitted_capabilities;
-        jlong &effective_capabilities;
-
-        ServerSpecializeArgs() = delete;
-    };
-
-    namespace internal {
-        struct api_table;
-        template <class T> void entry_impl(api_table *, JNIEnv *);
-    }
-
-// These values are used in Api::setOption(Option)
-    enum Option : int {
-        // Force Magisk's denylist unmount routines to run on this process.
-        //
-        // Setting this option only makes sense in preAppSpecialize.
-        // The actual unmounting happens during app process specialization.
-        //
-        // Set this option to force all Magisk and modules' files to be unmounted from the
-        // mount namespace of the process, regardless of the denylist enforcement status.
-        FORCE_DENYLIST_UNMOUNT = 0,
-
-        // When this option is set, your module's library will be dlclose-ed after post[XXX]Specialize.
-        // Be aware that after dlclose-ing your module, all of your code will be unmapped from memory.
-        // YOU MUST NOT ENABLE THIS OPTION AFTER HOOKING ANY FUNCTIONS IN THE PROCESS.
-        DLCLOSE_MODULE_LIBRARY = 1,
-    };
-
-// Bit masks of the return value of Api::getFlags()
-    enum StateFlag : uint32_t {
-        // The user has granted root access to the current process
-        PROCESS_GRANTED_ROOT = (1u << 0),
-
-        // The current process was added on the denylist
-        PROCESS_ON_DENYLIST = (1u << 1),
-    };
-
-// All API methods will stop working after post[XXX]Specialize as Zygisk will be unloaded
-// from the specialized process afterwards.
-    struct Api {
-
-        // Connect to a root companion process and get a Unix domain socket for IPC.
-        //
-        // This API only works in the pre[XXX]Specialize methods due to SELinux restrictions.
-        //
-        // The pre[XXX]Specialize methods run with the same privilege of zygote.
-        // If you would like to do some operations with superuser permissions, register a handler
-        // function that would be called in the root process with REGISTER_ZYGISK_COMPANION(func).
-        // Another good use case for a companion process is that if you want to share some resources
-        // across multiple processes, hold the resources in the companion process and pass it over.
-        //
-        // The root companion process is ABI aware; that is, when calling this method from a 32-bit
-        // process, you will be connected to a 32-bit companion process, and vice versa for 64-bit.
-        //
-        // Returns a file descriptor to a socket that is connected to the socket passed to your
-        // module's companion request handler. Returns -1 if the connection attempt failed.
-        int connectCompanion();
-
-        // Get the file descriptor of the root folder of the current module.
-        //
-        // This API only works in the pre[XXX]Specialize methods.
-        // Accessing the directory returned is only possible in the pre[XXX]Specialize methods
-        // or in the root companion process (assuming that you sent the fd over the socket).
-        // Both restrictions are due to SELinux and UID.
-        //
-        // Returns -1 if errors occurred.
-        int getModuleDir();
-
-        // Set various options for your module.
-        // Please note that this method accepts one single option at a time.
-        // Check zygisk::Option for the full list of options available.
-        void setOption(Option opt);
-
-        // Get information about the current process.
-        // Returns bitwise-or'd zygisk::StateFlag values.
-        uint32_t getFlags();
-
-        // Exempt the provided file descriptor from being automatically closed.
-        //
-        // This API only make sense in preAppSpecialize; calling this method in any other situation
-        // is either a no-op (returns true) or an error (returns false).
-        //
-        // When false is returned, the provided file descriptor will eventually be closed by zygote.
-        bool exemptFd(int fd);
-
-        // Hook JNI native methods for a class
-        //
-        // Lookup all registered JNI native methods and replace it with your own methods.
-        // The original function pointer will be saved in each JNINativeMethod's fnPtr.
-        // If no matching class, method name, or signature is found, that specific JNINativeMethod.fnPtr
-        // will be set to nullptr.
-        void hookJniNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, int numMethods);
-
-        // Hook functions in the PLT (Procedure Linkage Table) of ELFs loaded in memory.
-        //
-        // Parsing /proc/[PID]/maps will give you the memory map of a process. As an example:
-        //
-        //       <address>       <perms>  <offset>   <dev>  <inode>           <pathname>
-        // 56b4346000-56b4347000  r-xp    00002000   fe:00    235       /system/bin/app_process64
-        // (More details: https://man7.org/linux/man-pages/man5/proc.5.html)
-        //
-        // The `dev` and `inode` pair uniquely identifies a file being mapped into memory.
-        // For matching ELFs loaded in memory, replace function `symbol` with `newFunc`.
-        // If `oldFunc` is not nullptr, the original function pointer will be saved to `oldFunc`.
-        void pltHookRegister(dev_t dev, ino_t inode, const char *symbol, void *newFunc, void **oldFunc);
-
-        // Commit all the hooks that was previously registered.
-        // Returns false if an error occurred.
-        bool pltHookCommit();
-
-    private:
-        internal::api_table *tbl;
-        template <class T> friend void internal::entry_impl(internal::api_table *, JNIEnv *);
-    };
-
-// Register a class as a Zygisk module
-
-#define REGISTER_ZYGISK_MODULE(clazz) \
-void zygisk_module_entry(zygisk::internal::api_table *table, JNIEnv *env) { \
-    zygisk::internal::entry_impl<clazz>(table, env);                        \
-}
-
-// Register a root companion request handler function for your module
-//
-// The function runs in a superuser daemon process and handles a root companion request from
-// your module running in a target process. The function has to accept an integer value,
-// which is a Unix domain socket that is connected to the target process.
-// See Api::connectCompanion() for more info.
-//
-// NOTE: the function can run concurrently on multiple threads.
-// Be aware of race conditions if you have globally shared resources.
-
-#define REGISTER_ZYGISK_COMPANION(func) \
-void zygisk_companion_entry(int client) { func(client); }
-
-/*********************************************************
- * The following is internal ABI implementation detail.
- * You do not have to understand what it is doing.
- *********************************************************/
-
-    namespace internal {
-
-        struct module_abi {
-            long api_version;
-            ModuleBase *impl;
-
-            void (*preAppSpecialize)(ModuleBase *, AppSpecializeArgs *);
-            void (*postAppSpecialize)(ModuleBase *, const AppSpecializeArgs *);
-            void (*preServerSpecialize)(ModuleBase *, ServerSpecializeArgs *);
-            void (*postServerSpecialize)(ModuleBase *, const ServerSpecializeArgs *);
-
-            module_abi(ModuleBase *module) : api_version(ZYGISK_API_VERSION), impl(module) {
-                preAppSpecialize = [](auto m, auto args) { m->preAppSpecialize(args); };
-                postAppSpecialize = [](auto m, auto args) { m->postAppSpecialize(args); };
-                preServerSpecialize = [](auto m, auto args) { m->preServerSpecialize(args); };
-                postServerSpecialize = [](auto m, auto args) { m->postServerSpecialize(args); };
-            }
-        };
-
-        struct api_table {
-            // Base
-            void *impl;
-            bool (*registerModule)(api_table *, module_abi *);
-
-            void (*hookJniNativeMethods)(JNIEnv *, const char *, JNINativeMethod *, int);
-            void (*pltHookRegister)(dev_t, ino_t, const char *, void *, void **);
-            bool (*exemptFd)(int);
-            bool (*pltHookCommit)();
-            int  (*connectCompanion)(void * /* impl */);
-            void (*setOption)(void * /* impl */, Option);
-            int  (*getModuleDir)(void * /* impl */);
-            uint32_t (*getFlags)(void * /* impl */);
-        };
-
-        template <class T>
-        void entry_impl(api_table *table, JNIEnv *env) {
-            ModuleBase *module = new T();
-            if (!table->registerModule(table, new module_abi(module)))
-                return;
-            auto api = new Api();
-            api->tbl = table;
-            module->onLoad(api, env);
-        }
-
-    } // namespace internal
-
-    inline int Api::connectCompanion() {
-        return tbl->connectCompanion ? tbl->connectCompanion(tbl->impl) : -1;
-    }
-    inline int Api::getModuleDir() {
-        return tbl->getModuleDir ? tbl->getModuleDir(tbl->impl) : -1;
-    }
-    inline void Api::setOption(Option opt) {
-        if (tbl->setOption) tbl->setOption(tbl->impl, opt);
-    }
-    inline uint32_t Api::getFlags() {
-        return tbl->getFlags ? tbl->getFlags(tbl->impl) : 0;
-    }
-    inline bool Api::exemptFd(int fd) {
-        return tbl->exemptFd != nullptr && tbl->exemptFd(fd);
-    }
-    inline void Api::hookJniNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, int numMethods) {
-        if (tbl->hookJniNativeMethods) tbl->hookJniNativeMethods(env, className, methods, numMethods);
-    }
-    inline void Api::pltHookRegister(dev_t dev, ino_t inode, const char *symbol, void *newFunc, void **oldFunc) {
-        if (tbl->pltHookRegister) tbl->pltHookRegister(dev, inode, symbol, newFunc, oldFunc);
-    }
-    inline bool Api::pltHookCommit() {
-        return tbl->pltHookCommit != nullptr && tbl->pltHookCommit();
-    }
-
-} // namespace zygisk
-
-extern "C" {
-
-[[gnu::visibility("default")]] [[gnu::used]]
-void zygisk_module_entry(zygisk::internal::api_table *, JNIEnv *);
-
-[[gnu::visibility("default")]] [[gnu::used]]
-void zygisk_companion_entry(int);
-
-} // extern "C"
--- a/loader/src/include/daemon.h
+++ b/loader/src/include/daemon.h
@@ -42,7 +42,7 @@ enum root_impl {
 };

 struct rezygisk_info {
-  struct zygisk_modules *modules;
+  struct zygisk_modules modules;
  enum root_impl root_impl;
  pid_t pid;
  bool running;
@@ -63,7 +63,7 @@ int rezygiskd_connect(uint8_t retry);

 bool rezygiskd_ping();

-uint32_t rezygiskd_get_process_flags(uid_t uid);
+uint32_t rezygiskd_get_process_flags(uid_t uid, const char *const process);

 void rezygiskd_get_info(struct rezygisk_info *info);

--- a/loader/src/include/elf_util.h
+++ b/loader/src/include/elf_util.h
@@ -1,13 +1,20 @@
 #ifndef ELF_UTIL_H
 #define ELF_UTIL_H

+#include <stdbool.h>
 #include <string.h>
 #include <link.h>
-#include <linux/elf.h>
 #include <sys/types.h>
+#include <pthread.h> // Added for threading primitives

 #define SHT_GNU_HASH 0x6ffffff6

+// Function pointer types for constructors and destructors
+typedef void (*linker_simple_func_t)(void);
+typedef void (*linker_ctor_function_t)(int, char**, char**);
+typedef void (*linker_dtor_function_t)(void);
+
+
 struct symtabs {
  char *name;
  ElfW(Sym) *sym;
@@ -16,23 +23,17 @@ struct symtabs {
 typedef struct {
  char *elf;
  void *base;
-  char *buffer;
-  off_t size;
-  off_t bias;
  ElfW(Ehdr) *header;
+  size_t size;
+  off_t bias;
  ElfW(Shdr) *section_header;
-  ElfW(Shdr) *symtab;
-  ElfW(Shdr) *strtab;
+
  ElfW(Shdr) *dynsym;
-  ElfW(Sym) *symtab_start;
-  ElfW(Sym) *dynsym_start;
-  ElfW(Sym) *strtab_start;
-  ElfW(Off) symtab_count;
-  ElfW(Off) symstr_offset;
-  ElfW(Off) symstr_offset_for_symtab;
-  ElfW(Off) symtab_offset;
  ElfW(Off) dynsym_offset;
-  ElfW(Off) symtab_size;
+  ElfW(Sym) *dynsym_start;
+  ElfW(Shdr) *strtab;
+  ElfW(Off) symstr_offset;
+  void *strtab_start;

  uint32_t nbucket_;
  uint32_t *bucket_;
@@ -46,24 +47,21 @@ typedef struct {
  uint32_t *gnu_bucket_;
  uint32_t *gnu_chain_;

+  ElfW(Shdr) *symtab;
+  ElfW(Off) symtab_offset;
+  size_t symtab_size;
+  size_t symtab_count;
+  ElfW(Sym) *symtab_start;
+  ElfW(Off) symstr_offset_for_symtab;
+
  struct symtabs *symtabs_;
 } ElfImg;

 void ElfImg_destroy(ElfImg *img);

-ElfImg *ElfImg_create(const char *elf);
+ElfImg *ElfImg_create(const char *elf, void *base);

-ElfW(Addr) ElfLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash);
-
-ElfW(Addr) GnuLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash);
-
-ElfW(Addr) LinearLookup(ElfImg *restrict img, const char *restrict name);
-
-ElfW(Addr) LinearLookupByPrefix(ElfImg *restrict img, const char *name);
-
-int dl_cb(struct dl_phdr_info *info, size_t size, void *data);
-
-ElfW(Addr) getSymbOffset(ElfImg *img, const char *name);
+ElfW(Addr) getSymbOffset(ElfImg *img, const char *name, unsigned char *sym_type);

 ElfW(Addr) getSymbAddress(ElfImg *img, const char *name);

--- a/loader/src/include/misc.h
+++ b/loader/src/include/misc.h
@@ -1,9 +1,13 @@
 #ifndef MISC_H
+#define MISC_H

 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

+#define IS_ISOLATED_SERVICE(uid)      \
+  ((uid) >= 90000 && (uid) < 1000000)
+
 /*
 * Bionic's atoi runs through strtol().
 * Use our own implementation for faster conversion.
--- a/loader/src/include/socket_utils.h
+++ b/loader/src/include/socket_utils.h
@@ -3,7 +3,13 @@

 #include <stdint.h>

+ssize_t write_loop(int fd, const void *buf, size_t count);
+
+ssize_t read_loop(int fd, void *buf, size_t count);
+
 int read_fd(int fd);
+
+ssize_t write_string(int fd, const char *str);
  
 char *read_string(int fd);

--- a/loader/src/injector/art_method.h
+++ b/loader/src/injector/art_method.h
@@ -0,0 +1,107 @@
+#ifndef ART_METHOD_H
+#define ART_METHOD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "logging.h"
+
+inline static jfieldID art_method_field = nullptr;
+inline static size_t art_method_size = 0;
+inline static size_t entry_point_offset = 0;
+inline static size_t data_offset = 0;
+
+void *amethod_from_reflected_method(JNIEnv *env, jobject method);
+
+bool amethod_init(JNIEnv *env) {
+  jclass clazz = env->FindClass("java/lang/reflect/Executable");
+  if (!clazz) {
+    LOGE("Failed to found Executable");
+
+    return false;
+  }
+
+  if (art_method_field = env->GetFieldID(clazz, "artMethod", "J"); !art_method_field) {
+    LOGE("Failed to find artMethod field");
+
+    env->DeleteLocalRef(clazz);
+
+    return false;
+  }
+
+  jclass throwable = env->FindClass("java/lang/Throwable");
+  if (!throwable) {
+    LOGE("Failed to found Executable");
+
+    env->DeleteLocalRef(clazz);
+
+    return false;
+  }
+
+  jclass clz = env->FindClass("java/lang/Class");
+  if (!clz) {
+    LOGE("Failed to found Class");
+
+    env->DeleteLocalRef(clazz);
+    env->DeleteLocalRef(throwable);
+
+    return false;
+  }
+
+  jmethodID get_declared_constructors = env->GetMethodID(clz, "getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;");
+  env->DeleteLocalRef(clz);
+
+  const auto constructors = (jobjectArray) env->CallObjectMethod(throwable, get_declared_constructors);
+  env->DeleteLocalRef(throwable);
+  if (!constructors || env->GetArrayLength(constructors) < 2) {
+    LOGE("Throwable has less than 2 constructors");
+
+    env->DeleteLocalRef(clazz);
+
+    return false;
+  }
+
+  jobject first_ctor = env->GetObjectArrayElement(constructors, 0);
+  jobject second_ctor = env->GetObjectArrayElement(constructors, 1);
+
+  uintptr_t first = (uintptr_t)amethod_from_reflected_method(env, first_ctor);
+  uintptr_t second = (uintptr_t)amethod_from_reflected_method(env, second_ctor);
+
+  env->DeleteLocalRef(first_ctor);
+  env->DeleteLocalRef(second_ctor);
+  env->DeleteLocalRef(constructors);
+
+  art_method_size = (size_t)(second - first);
+  LOGD("ArtMethod size: %zu", art_method_size);
+  if ((4 * 9 + 3 * sizeof(void *)) < art_method_size) {
+    LOGE("ArtMethod size exceeds maximum assume. There may be something wrong.");
+
+    return false;
+  }
+
+  entry_point_offset = art_method_size - sizeof(void *);
+  data_offset = entry_point_offset - sizeof(void *);
+  LOGD("ArtMethod entrypoint offset: %zu", entry_point_offset);
+  LOGD("ArtMethod data offset: %zu", data_offset);
+
+  return true;
+}
+
+void *amethod_get_data(uintptr_t self) {
+  return *(void **)((uintptr_t)self + data_offset);
+}
+
+void *amethod_from_reflected_method(JNIEnv *env, jobject method) {
+  if (art_method_field) {
+    return (void *)env->GetLongField(method, art_method_field);
+  } else {
+    return (void *)env->FromReflectedMethod(method);
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* ART_METHOD_H */
--- a/loader/src/injector/art_method.hpp
+++ b/loader/src/injector/art_method.hpp
@@ -1,83 +0,0 @@
-#pragma once
-
-#include "logging.h"
-#include "jni_helper.hpp"
-
-template <typename T>
-constexpr inline auto RoundUpTo(T v, size_t size) {
-    return v + size - 1 - ((v + size - 1) & (size - 1));
-}
-
-inline static constexpr auto kPointerSize = sizeof(void *);
-
-namespace lsplant::art {
-
-    class ArtMethod {
-
-    public:
-        void *GetData() {
-            return *reinterpret_cast<void **>(reinterpret_cast<uintptr_t>(this) + data_offset);
-        }
-
-        static art::ArtMethod *FromReflectedMethod(JNIEnv *env, jobject method) {
-            if (art_method_field) [[likely]] {
-                return reinterpret_cast<art::ArtMethod *>(
-                        JNI_GetLongField(env, method, art_method_field));
-            } else {
-                return reinterpret_cast<art::ArtMethod *>(env->FromReflectedMethod(method));
-            }
-        }
-
-        static bool Init(JNIEnv *env) {
-            ScopedLocalRef<jclass> executable{env, nullptr};
-            executable = JNI_FindClass(env, "java/lang/reflect/Executable");
-            if (!executable) {
-                LOGE("Failed to found Executable");
-                return false;
-            }
-
-            if (art_method_field = JNI_GetFieldID(env, executable, "artMethod", "J");
-                    !art_method_field) {
-                LOGE("Failed to find artMethod field");
-                return false;
-            }
-
-            auto throwable = JNI_FindClass(env, "java/lang/Throwable");
-            if (!throwable) {
-                LOGE("Failed to found Executable");
-                return false;
-            }
-            auto clazz = JNI_FindClass(env, "java/lang/Class");
-            static_assert(std::is_same_v<decltype(clazz)::BaseType, jclass>);
-            jmethodID get_declared_constructors = JNI_GetMethodID(env, clazz, "getDeclaredConstructors",
-                                                                  "()[Ljava/lang/reflect/Constructor;");
-            const auto constructors =
-                    JNI_Cast<jobjectArray>(JNI_CallObjectMethod(env, throwable, get_declared_constructors));
-            if (constructors.size() < 2) {
-                LOGE("Throwable has less than 2 constructors");
-                return false;
-            }
-            auto &first_ctor = constructors[0];
-            auto &second_ctor = constructors[1];
-            auto *first = FromReflectedMethod(env, first_ctor.get());
-            auto *second = FromReflectedMethod(env, second_ctor.get());
-            art_method_size = reinterpret_cast<uintptr_t>(second) - reinterpret_cast<uintptr_t>(first);
-            LOGD("ArtMethod size: %zu", art_method_size);
-            if (RoundUpTo(4 * 9, kPointerSize) + kPointerSize * 3 < art_method_size) [[unlikely]] {
-                LOGW("ArtMethod size exceeds maximum assume. There may be something wrong.");
-            }
-            entry_point_offset = art_method_size - kPointerSize;
-            data_offset = entry_point_offset - kPointerSize;
-            LOGD("ArtMethod::entrypoint offset: %zu", entry_point_offset);
-            LOGD("ArtMethod::data offset: %zu", data_offset);
-            return true;
-        }
-
-    private:
-        inline static jfieldID art_method_field = nullptr;
-        inline static size_t art_method_size = 0;
-        inline static size_t entry_point_offset = 0;
-        inline static size_t data_offset = 0;
-    };
-
-}  // namespace lsplant::art
--- a/loader/src/injector/clear.c
+++ b/loader/src/injector/clear.c
@@ -0,0 +1,97 @@
+#include <linux/seccomp.h>
+#include <linux/filter.h>
+#include <linux/audit.h>
+#include <sys/prctl.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "logging.h"
+
+static bool seccomp_filters_visible() {
+    FILE *status_file = fopen("/proc/self/status", "r");
+    if (!status_file) {
+        return true;
+    }
+
+    const char *needle = "Seccomp_filters:";
+    char line[256];
+
+    while (fgets(line, sizeof(line), status_file)) {
+        if (strncmp(line, needle, strlen(needle)) == 0) {
+            fclose(status_file);
+            return true;
+        }
+    }
+
+    fclose(status_file);
+    return false;
+}
+
+void send_seccomp_event() {
+    if (seccomp_filters_visible()) {
+        return;
+    }
+
+    __u32 args[4] = {0};
+
+    int rnd_fd = open("/dev/urandom", O_RDONLY);
+    if (rnd_fd == -1) {
+        PLOGE("send_seccomp_event: open(/dev/urandom)");
+        return;
+    }
+
+    if (read(rnd_fd, &args, sizeof(args)) != sizeof(args)) {
+        PLOGE("send_seccomp_event: read(rnd_fd)");
+        close(rnd_fd);
+        return;
+    }
+
+    close(rnd_fd);
+
+    args[0] |= 0x10000;
+
+    struct sock_filter filter[] = {
+            /* INFO: Check syscall number */
+            BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, nr)),
+            BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, __NR_exit_group, 0, 9),
+
+            /* INFO: Load and check arg0 (lower 32 bits) */
+            BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, args[0])),
+            BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, args[0], 0, 7),
+
+            /* INFO: Load and check arg1 (lower 32 bits) */
+            BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, args[1])),
+            BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, args[1], 0, 5),
+
+            /* INFO: Load and check arg2 (lower 32 bits) */
+            BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, args[2])),
+            BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, args[2], 0, 3),
+
+            /* INFO: Load and check arg3 (lower 32 bits) */
+            BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, args[3])),
+            BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, args[3], 0, 1),
+
+            /* INFO: All match: return TRACE => will trigger PTRACE_EVENT_SECCOMP */
+            BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_TRACE),
+
+            /* INFO: Default: allow */
+            BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
+    };
+
+    struct sock_fprog prog = {
+            .len = (unsigned short)(sizeof(filter)/sizeof(filter[0])),
+            .filter = filter,
+    };
+
+    if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog)) {
+        PLOGE("send_seccomp_event: prctl(SECCOMP)");
+        return;
+    }
+
+    /* INFO: This will trigger a ptrace event, syscall will not execute due to tracee_skip_syscall */
+    syscall(__NR_exit_group, args[0], args[1], args[2], args[3]);
+}
--- a/loader/src/injector/entry.cpp
+++ b/loader/src/injector/entry.cpp
@@ -1,5 +1,6 @@
 #include "daemon.h"
 #include "logging.h"
+#include "solist.h"
 #include "zygisk.hpp"

 using namespace std;
@@ -8,7 +9,7 @@ void *start_addr = nullptr;
 size_t block_size = 0;

 extern "C" [[gnu::visibility("default")]]
-void entry(void* addr, size_t size, const char* path) {
+void entry(void *addr, size_t size) {
    LOGD("Zygisk library injected, version %s", ZKSU_VERSION);

    start_addr = addr;
@@ -22,5 +23,11 @@ void entry(void* addr, size_t size, const char* path) {

    LOGD("start plt hooking");
    hook_functions();
-    clean_trace(path, 1, 0, false);
+
+    solist_drop_so_path(addr, true);
+    solist_reset_counters(1, 1);
+
+    send_seccomp_event();
+
+    LOGD("Zygisk library execution done, addr: %p, size: %zu", addr, size);
 }
--- a/loader/src/injector/gen_jni_hooks.py
+++ b/loader/src/injector/gen_jni_hooks.py
@@ -88,7 +88,7 @@ class ForkAndSpec(JNIHook):
        return 'nativeForkAndSpecialize'

    def init_args(self):
-        return 'AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);'
+        return 'struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);'

    def body(self):
        decl = ''
@@ -117,7 +117,7 @@ class ForkServer(ForkAndSpec):
        return 'nativeForkSystemServer'

    def init_args(self):
-        return 'ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);'
+        return 'struct server_specialize_args_v1 args(&uid, &gid, &gids, &runtime_flags, &permitted_capabilities, &effective_capabilities);'

 # Common args
 uid = Argument('uid', jint)
--- a/loader/src/injector/hook.cpp
+++ b/loader/src/injector/hook.cpp
--- a/loader/src/injector/jni_helper.hpp
+++ b/loader/src/injector/jni_helper.hpp
--- a/loader/src/injector/jni_hooks.hpp
+++ b/loader/src/injector/jni_hooks.hpp
@@ -4,7 +4,7 @@ namespace {

 void *nativeForkAndSpecialize_orig = nullptr;
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_l(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    ZygiskContext ctx(env, &args);
    ctx.nativeForkAndSpecialize_pre();
    reinterpret_cast<decltype(&nativeForkAndSpecialize_l)>(nativeForkAndSpecialize_orig)(
@@ -14,7 +14,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_o(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    ZygiskContext ctx(env, &args);
    ctx.nativeForkAndSpecialize_pre();
@@ -25,7 +25,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_p(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    args.is_child_zygote = &is_child_zygote;
    ZygiskContext ctx(env, &args);
@@ -37,7 +37,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_q_alt(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
@@ -50,7 +50,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_r(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
@@ -67,7 +67,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
@@ -85,7 +85,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_m(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _0, jint _1, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    ZygiskContext ctx(env, &args);
    ctx.nativeForkAndSpecialize_pre();
    reinterpret_cast<decltype(&nativeForkAndSpecialize_samsung_m)>(nativeForkAndSpecialize_orig)(
@@ -95,7 +95,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_n(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _2, jint _3, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir, jint _4) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    ZygiskContext ctx(env, &args);
    ctx.nativeForkAndSpecialize_pre();
    reinterpret_cast<decltype(&nativeForkAndSpecialize_samsung_n)>(nativeForkAndSpecialize_orig)(
@@ -105,7 +105,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_o(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _5, jint _6, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    ZygiskContext ctx(env, &args);
    ctx.nativeForkAndSpecialize_pre();
@@ -116,7 +116,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_p(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _7, jint _8, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    args.is_child_zygote = &is_child_zygote;
    ZygiskContext ctx(env, &args);
@@ -128,7 +128,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _13) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.fds_to_ignore = &fds_to_ignore;
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
@@ -205,7 +205,7 @@ std::array nativeForkAndSpecialize_methods = {

 void *nativeSpecializeAppProcess_orig = nullptr;
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_q(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.is_child_zygote = &is_child_zygote;
    ZygiskContext ctx(env, &args);
    ctx.nativeSpecializeAppProcess_pre();
@@ -215,7 +215,7 @@ void *nativeSpecializeAppProcess_orig = nullptr;
    ctx.nativeSpecializeAppProcess_post();
 }
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_q_alt(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
    ZygiskContext ctx(env, &args);
@@ -226,7 +226,7 @@ void *nativeSpecializeAppProcess_orig = nullptr;
    ctx.nativeSpecializeAppProcess_post();
 }
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_r(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
    args.pkg_data_info_list = &pkg_data_info_list;
@@ -241,7 +241,7 @@ void *nativeSpecializeAppProcess_orig = nullptr;
    ctx.nativeSpecializeAppProcess_post();
 }
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
    args.pkg_data_info_list = &pkg_data_info_list;
@@ -257,7 +257,7 @@ void *nativeSpecializeAppProcess_orig = nullptr;
    ctx.nativeSpecializeAppProcess_post();
 }
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_samsung_q(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _9, jint _10, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.is_child_zygote = &is_child_zygote;
    ZygiskContext ctx(env, &args);
    ctx.nativeSpecializeAppProcess_pre();
@@ -267,7 +267,7 @@ void *nativeSpecializeAppProcess_orig = nullptr;
    ctx.nativeSpecializeAppProcess_post();
 }
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _14) {
-    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    struct app_specialize_args_v5 args(&uid, &gid, &gids, &runtime_flags, &rlimits, &mount_external, &se_info, &nice_name, &instruction_set, &app_data_dir);
    args.is_child_zygote = &is_child_zygote;
    args.is_top_app = &is_top_app;
    args.pkg_data_info_list = &pkg_data_info_list;
@@ -317,7 +317,7 @@ std::array nativeSpecializeAppProcess_methods = {

 void *nativeForkSystemServer_orig = nullptr;
 [[clang::no_stack_protector]] jint nativeForkSystemServer_l(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) {
-    ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);
+    struct server_specialize_args_v1 args(&uid, &gid, &gids, &runtime_flags, &permitted_capabilities, &effective_capabilities);
    ZygiskContext ctx(env, &args);
    ctx.nativeForkSystemServer_pre();
    reinterpret_cast<decltype(&nativeForkSystemServer_l)>(nativeForkSystemServer_orig)(
@@ -327,7 +327,7 @@ void *nativeForkSystemServer_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkSystemServer_samsung_q(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jint _11, jint _12, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) {
-    ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);
+    struct server_specialize_args_v1 args(&uid, &gid, &gids, &runtime_flags, &permitted_capabilities, &effective_capabilities);
    ZygiskContext ctx(env, &args);
    ctx.nativeForkSystemServer_pre();
    reinterpret_cast<decltype(&nativeForkSystemServer_samsung_q)>(nativeForkSystemServer_orig)(
@@ -337,7 +337,7 @@ void *nativeForkSystemServer_orig = nullptr;
    return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkSystemServer_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) {
-    ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);
+    struct server_specialize_args_v1 args(&uid, &gid, &gids, &runtime_flags, &permitted_capabilities, &effective_capabilities);
    ZygiskContext ctx(env, &args);
    ctx.nativeForkSystemServer_pre();
    reinterpret_cast<decltype(&nativeForkSystemServer_grapheneos_u)>(nativeForkSystemServer_orig)(
--- a/loader/src/injector/module.h
+++ b/loader/src/injector/module.h
@@ -0,0 +1,252 @@
+#ifndef MODULE_H
+#define MODULE_H
+
+#include "logging.h"
+
+#define REZYGISK_API_VERSION 5
+
+enum rezygiskd_flags : uint32_t {
+    PROCESS_GRANTED_ROOT = (1u << 0),
+    PROCESS_ON_DENYLIST = (1u << 1),
+
+    PROCESS_IS_MANAGER = (1u << 27),
+    PROCESS_ROOT_IS_APATCH = (1u << 28),
+    PROCESS_ROOT_IS_KSU = (1u << 29),
+    PROCESS_ROOT_IS_MAGISK = (1u << 30),
+    PROCESS_IS_FIRST_STARTED = (1u << 31),
+
+    PRIVATE_MASK = PROCESS_IS_FIRST_STARTED
+};
+
+struct app_specialize_args_v1 {
+    jint *uid;
+    jint *gid;
+    jintArray *gids;
+    jint *runtime_flags;
+    jint *mount_external;
+    jstring *se_info;
+    jstring *nice_name;
+    jstring *instruction_set;
+    jstring *app_data_dir;
+
+    jboolean *is_child_zygote;
+    jboolean *is_top_app;
+    jobjectArray *pkg_data_info_list;
+    jobjectArray *whitelisted_data_info_list;
+    jboolean *mount_data_dirs;
+    jboolean *mount_storage_dirs;
+};
+
+struct app_specialize_args_v4 {
+    jint *uid;
+    jint *gid;
+    jintArray *gids;
+    jint *runtime_flags;
+    jobjectArray *rlimits;
+    jint *mount_external;
+    jstring *se_info;
+    jstring *nice_name;
+    jstring *instruction_set;
+    jstring *app_data_dir;
+
+    jintArray *fds_to_ignore;
+    jboolean *is_child_zygote;
+    jboolean *is_top_app;
+    jobjectArray *pkg_data_info_list;
+    jobjectArray *whitelisted_data_info_list;
+    jboolean *mount_data_dirs;
+    jboolean *mount_storage_dirs;
+};
+
+struct app_specialize_args_v5 {
+    jint *uid;
+    jint *gid;
+    jintArray *gids;
+    jint *runtime_flags;
+    jobjectArray *rlimits;
+    jint *mount_external;
+    jstring *se_info;
+    jstring *nice_name;
+    jstring *instruction_set;
+    jstring *app_data_dir;
+
+    jintArray *fds_to_ignore;
+    jboolean *is_child_zygote;
+    jboolean *is_top_app;
+    jobjectArray *pkg_data_info_list;
+    jobjectArray *whitelisted_data_info_list;
+    jboolean *mount_data_dirs;
+    jboolean *mount_storage_dirs;
+
+    jboolean *mount_sysprop_overrides;
+};
+
+struct server_specialize_args_v1 {
+    jint *uid;
+    jint *gid;
+    jintArray *gids;
+    jint *runtime_flags;
+    jlong *permitted_capabilities;
+    jlong *effective_capabilities;
+};
+
+enum rezygisk_options : uint32_t {
+    /* INFO: Force ReZygisk to umount the root related mounts on this process. This option
+               will only take effect if set in pre...Specialize, as ReZygisk umounts at
+               that point.
+
+             ReZygisk Umount System will not umount all root related mounts, read ReZygiskd
+               umount_root function in utils.c file to understand how it selects the ones
+               to umount.
+    */
+    FORCE_DENYLIST_UNMOUNT = 0,
+
+    /* INFO: Once set, ReZygisk will dlclose your library from the process, this is assured to
+               happen after post...Specialize, but not at a specific moment due to different
+               implementations.
+
+             You should not use this option if you leave references in the process such as hooks,
+               which will try to execute unitialized memory.
+    */
+    DLCLOSE_MODULE_LIBRARY = 1
+};
+
+struct rezygisk_api {
+    void *impl;
+    bool (*register_module)(struct rezygisk_api *, struct rezygisk_abi *);
+
+    void (*hook_jni_native_methods)(JNIEnv *, const char *, JNINativeMethod *, int);
+    union {
+        void (*plt_hook_register)(const char *, const char *, void *, void **);    /* INFO: v3 and below */
+        void (*plt_hook_register_v4)(dev_t, ino_t, const char *, void *, void **); /* INFO: v4 */
+    };
+    union {
+        void (*plt_hook_exclude)(const char *, const char *); /* INFO: v3 and below */
+        void (*exempt_fd)(int);                               /* INFO: v4 */
+    };
+    bool (*plt_hook_commit)();
+    int (*connect_companion)(void *);
+    void (*set_option)(void *, enum rezygisk_options opt);
+    int (*get_module_dir)(void *);
+    uint32_t (*get_flags)();
+};
+
+struct rezygisk_abi {
+    long api_version;
+    void *impl;
+
+    void (*pre_app_specialize)(void *, void *);
+    void (*post_app_specialize)(void *, const void *);
+    void (*pre_server_specialize)(void *, void *);
+    void (*post_server_specialize)(void *, const void *);
+};
+
+struct rezygisk_module {
+  struct rezygisk_abi abi;
+  struct rezygisk_api api;
+
+  void *handle;
+  void (*zygisk_module_entry)(void *, void *);
+
+  bool unload;
+};
+
+void rezygisk_module_call_on_load(struct rezygisk_module *m, void *env) {
+    m->zygisk_module_entry((void *)&m->api, env);
+}
+
+void rezygisk_module_call_pre_app_specialize(struct rezygisk_module *m, struct app_specialize_args_v5 *args) {
+    switch (m->abi.api_version) {
+        case 1:
+        case 2: {
+            struct app_specialize_args_v1 versioned_args = {
+                .uid = args->uid,
+                .gid = args->gid,
+                .gids = args->gids,
+                .runtime_flags = args->runtime_flags,
+                .mount_external = args->mount_external,
+                .se_info = args->se_info,
+                .nice_name = args->nice_name,
+                .instruction_set = args->instruction_set,
+                .app_data_dir = args->app_data_dir,
+                .is_child_zygote = args->is_child_zygote,
+                .is_top_app = args->is_top_app,
+                .pkg_data_info_list = args->pkg_data_info_list,
+                .whitelisted_data_info_list = args->whitelisted_data_info_list,
+                .mount_data_dirs = args->mount_data_dirs,
+                .mount_storage_dirs = args->mount_storage_dirs
+            };
+
+            m->abi.pre_app_specialize(m->abi.impl, &versioned_args);
+
+            break;
+        }
+        case 3:
+        case 4: {
+            struct app_specialize_args_v4 versioned_args;
+            memcpy(&versioned_args, args, sizeof(struct app_specialize_args_v4));
+
+            m->abi.pre_app_specialize(m->abi.impl, &versioned_args);
+
+            break;
+        }
+        case 5: {
+            m->abi.pre_app_specialize(m->abi.impl, args);
+
+            break;
+        }
+    }
+}
+
+void rezygisk_module_call_post_app_specialize(struct rezygisk_module *m, const struct app_specialize_args_v5 *args) {
+    switch (m->abi.api_version) {
+        case 1:
+        case 2: {
+            struct app_specialize_args_v1 versioned_args = {
+                .uid = args->uid,
+                .gid = args->gid,
+                .gids = args->gids,
+                .runtime_flags = args->runtime_flags,
+                .mount_external = args->mount_external,
+                .se_info = args->se_info,
+                .nice_name = args->nice_name,
+                .instruction_set = args->instruction_set,
+                .app_data_dir = args->app_data_dir,
+                .is_child_zygote = args->is_child_zygote,
+                .is_top_app = args->is_top_app,
+                .pkg_data_info_list = args->pkg_data_info_list,
+                .whitelisted_data_info_list = args->whitelisted_data_info_list,
+                .mount_data_dirs = args->mount_data_dirs,
+                .mount_storage_dirs = args->mount_storage_dirs
+            };
+
+            m->abi.post_app_specialize(m->abi.impl, &versioned_args);
+
+            break;
+        }
+        case 3:
+        case 4: {
+            struct app_specialize_args_v4 versioned_args;
+            memcpy(&versioned_args, args, sizeof(struct app_specialize_args_v4));
+
+            m->abi.post_app_specialize(m->abi.impl, &versioned_args);
+
+            break;
+        }
+        case 5: {
+            m->abi.post_app_specialize(m->abi.impl, args);
+
+            break;
+        }
+    }
+}
+
+void rezygisk_module_call_pre_server_specialize(struct rezygisk_module *m, struct server_specialize_args_v1 *args) {
+    m->abi.pre_server_specialize(m->abi.impl, args);
+}
+
+void rezygisk_module_call_post_server_specialize(struct rezygisk_module *m, const struct server_specialize_args_v1 *args) {
+    m->abi.post_server_specialize(m->abi.impl, args);
+}
+
+#endif /* MODULE_H */
--- a/loader/src/injector/module.hpp
+++ b/loader/src/injector/module.hpp
@@ -1,239 +0,0 @@
-#pragma once
-
-#include <cstring>
-#include <dlfcn.h>
-#include "api.hpp"
-
-namespace {
-
-    struct ZygiskContext;
-    struct ZygiskModule;
-
-    struct AppSpecializeArgs_v1;
-    using  AppSpecializeArgs_v2 = AppSpecializeArgs_v1;
-    struct AppSpecializeArgs_v3;
-    using  AppSpecializeArgs_v4 = AppSpecializeArgs_v3;
-    struct AppSpecializeArgs_v5;
-
-    struct module_abi_v1;
-    using  module_abi_v2 = module_abi_v1;
-    using  module_abi_v3 = module_abi_v1;
-    using  module_abi_v4 = module_abi_v1;
-    using  module_abi_v5 = module_abi_v1;
-
-    struct api_abi_v1;
-    struct api_abi_v2;
-    using  api_abi_v3 = api_abi_v2;
-    struct api_abi_v4;
-    using  api_abi_v5 = api_abi_v4;
-
-    union ApiTable;
-
-    struct AppSpecializeArgs_v3 {
-        jint &uid;
-        jint &gid;
-        jintArray &gids;
-        jint &runtime_flags;
-        jobjectArray &rlimits;
-        jint &mount_external;
-        jstring &se_info;
-        jstring &nice_name;
-        jstring &instruction_set;
-        jstring &app_data_dir;
-
-        jintArray *fds_to_ignore = nullptr;
-        jboolean *is_child_zygote = nullptr;
-        jboolean *is_top_app = nullptr;
-        jobjectArray *pkg_data_info_list = nullptr;
-        jobjectArray *whitelisted_data_info_list = nullptr;
-        jboolean *mount_data_dirs = nullptr;
-        jboolean *mount_storage_dirs = nullptr;
-
-        AppSpecializeArgs_v3(
-                jint &uid, jint &gid, jintArray &gids, jint &runtime_flags,
-                jobjectArray &rlimits, jint &mount_external, jstring &se_info, jstring &nice_name,
-                jstring &instruction_set, jstring &app_data_dir) :
-                uid(uid), gid(gid), gids(gids), runtime_flags(runtime_flags), rlimits(rlimits),
-                mount_external(mount_external), se_info(se_info), nice_name(nice_name),
-                instruction_set(instruction_set), app_data_dir(app_data_dir) {}
-    };
-
-    struct AppSpecializeArgs_v5 : public AppSpecializeArgs_v3 {
-      jboolean *mount_sysprop_overrides = nullptr;
-
-      AppSpecializeArgs_v5(
-              jint &uid, jint &gid, jintArray &gids, jint &runtime_flags,
-              jobjectArray &rlimits, jint &mount_external, jstring &se_info, jstring &nice_name,
-              jstring &instruction_set, jstring &app_data_dir) : AppSpecializeArgs_v3(
-                      uid, gid, gids, runtime_flags, rlimits, mount_external,
-                      se_info, nice_name, instruction_set, app_data_dir) {}
-    };
-
-    struct AppSpecializeArgs_v1 {
-        jint &uid;
-        jint &gid;
-        jintArray &gids;
-        jint &runtime_flags;
-        jint &mount_external;
-        jstring &se_info;
-        jstring &nice_name;
-        jstring &instruction_set;
-        jstring &app_data_dir;
-
-        jboolean *const is_child_zygote;
-        jboolean *const is_top_app;
-        jobjectArray *const pkg_data_info_list;
-        jobjectArray *const whitelisted_data_info_list;
-        jboolean *const mount_data_dirs;
-        jboolean *const mount_storage_dirs;
-
-        AppSpecializeArgs_v1(const AppSpecializeArgs_v5 *a) :
-                uid(a->uid), gid(a->gid), gids(a->gids), runtime_flags(a->runtime_flags),
-                mount_external(a->mount_external), se_info(a->se_info), nice_name(a->nice_name),
-                instruction_set(a->instruction_set), app_data_dir(a->app_data_dir),
-                is_child_zygote(a->is_child_zygote), is_top_app(a->is_top_app),
-                pkg_data_info_list(a->pkg_data_info_list),
-                whitelisted_data_info_list(a->whitelisted_data_info_list),
-                mount_data_dirs(a->mount_data_dirs), mount_storage_dirs(a->mount_storage_dirs) {}
-    };
-
-    struct ServerSpecializeArgs_v1 {
-        jint &uid;
-        jint &gid;
-        jintArray &gids;
-        jint &runtime_flags;
-        jlong &permitted_capabilities;
-        jlong &effective_capabilities;
-
-        ServerSpecializeArgs_v1(
-                jint &uid, jint &gid, jintArray &gids, jint &runtime_flags,
-                jlong &permitted_capabilities, jlong &effective_capabilities) :
-                uid(uid), gid(gid), gids(gids), runtime_flags(runtime_flags),
-                permitted_capabilities(permitted_capabilities),
-                effective_capabilities(effective_capabilities) {}
-    };
-
-    struct module_abi_v1 {
-        long api_version;
-        void *impl;
-        void (*preAppSpecialize)(void *, void *);
-        void (*postAppSpecialize)(void *, const void *);
-        void (*preServerSpecialize)(void *, void *);
-        void (*postServerSpecialize)(void *, const void *);
-    };
-
-    enum : uint32_t {
-        PROCESS_GRANTED_ROOT = zygisk::StateFlag::PROCESS_GRANTED_ROOT,
-        PROCESS_ON_DENYLIST = zygisk::StateFlag::PROCESS_ON_DENYLIST,
-
-        PROCESS_IS_MANAGER = (1u << 27),
-        PROCESS_ROOT_IS_APATCH = (1u << 28),
-        PROCESS_ROOT_IS_KSU = (1u << 29),
-        PROCESS_ROOT_IS_MAGISK = (1u << 30),
-        PROCESS_IS_FIRST_STARTED = (1u << 31),
-
-        PRIVATE_MASK = PROCESS_IS_FIRST_STARTED
-    };
-
-    struct api_abi_base {
-        ZygiskModule *impl;
-        bool (*registerModule)(ApiTable *, long *);
-    };
-
-    struct api_abi_v1 : public api_abi_base {
-        /* 0 */ void (*hookJniNativeMethods)(JNIEnv *, const char *, JNINativeMethod *, int);
-        /* 1 */ void (*pltHookRegister)(const char *, const char *, void *, void **);
-        /* 2 */ void (*pltHookExclude)(const char *, const char *);
-        /* 3 */ bool (*pltHookCommit)();
-        /* 4 */ int (*connectCompanion)(ZygiskModule *);
-        /* 5 */ void (*setOption)(ZygiskModule *, zygisk::Option);
-    };
-
-    struct api_abi_v2 : public api_abi_v1 {
-        /* 6 */ int (*getModuleDir)(ZygiskModule *);
-        /* 7 */ uint32_t (*getFlags)(ZygiskModule *);
-    };
-
-    struct api_abi_v4 : public api_abi_base {
-        /* 0 */ void (*hookJniNativeMethods)(JNIEnv *, const char *, JNINativeMethod *, int);
-        /* 1 */ void (*pltHookRegister)(dev_t, ino_t, const char *, void *, void **);
-        /* 2 */ bool (*exemptFd)(int);
-        /* 3 */ bool (*pltHookCommit)();
-        /* 4 */ int (*connectCompanion)(ZygiskModule *);
-        /* 5 */ void (*setOption)(ZygiskModule *, zygisk::Option);
-        /* 6 */ int (*getModuleDir)(ZygiskModule *);
-        /* 7 */ uint32_t (*getFlags)(ZygiskModule *);
-    };
-
-    union ApiTable {
-        api_abi_base base;
-        api_abi_v1 v1;
-        api_abi_v2 v2;
-        api_abi_v4 v4;
-    };
-
-#define call_app(method)               \
-switch (*mod.api_version) {            \
-case 1:                                \
-case 2: {                              \
-    AppSpecializeArgs_v1 a(args);      \
-    mod.v1->method(mod.v1->impl, &a);  \
-    break;                             \
-}                                      \
-case 3:                                \
-case 4:                                \
-case 5:                                \
-    mod.v1->method(mod.v1->impl, args);\
-    break;                             \
-}
-
-    struct ZygiskModule {
-
-        void onLoad(void *env) {
-            entry.fn(&api, env);
-        }
-        void preAppSpecialize(AppSpecializeArgs_v5 *args) const {
-            call_app(preAppSpecialize)
-        }
-        void postAppSpecialize(const AppSpecializeArgs_v5 *args) const {
-            call_app(postAppSpecialize)
-        }
-        void preServerSpecialize(ServerSpecializeArgs_v1 *args) const {
-            mod.v1->preServerSpecialize(mod.v1->impl, args);
-        }
-        void postServerSpecialize(const ServerSpecializeArgs_v1 *args) const {
-            mod.v1->postServerSpecialize(mod.v1->impl, args);
-        }
-
-        bool valid() const;
-        int connectCompanion() const;
-        int getModuleDir() const;
-        void setOption(zygisk::Option opt);
-        static uint32_t getFlags();
-        bool tryUnload() const { return unload && dlclose(handle) == 0; };
-        void clearApi() { memset(&api, 0, sizeof(api)); }
-        int getId() const { return id; }
-
-        ZygiskModule(int id, void *handle, void *entry);
-
-        static bool RegisterModuleImpl(ApiTable *api, long *module);
-
-    private:
-        const int id;
-        bool unload = false;
-
-        void * const handle;
-        union {
-            void * const ptr;
-            void (* const fn)(void *, void *);
-        } entry;
-
-        ApiTable api;
-
-        union {
-            long *api_version;
-            module_abi_v1 *v1;
-        } mod;
-    };
-
-} // namespace
--- a/loader/src/injector/solist.c
+++ b/loader/src/injector/solist.c
@@ -1,28 +1,30 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
+#include <dlfcn.h>
+
+#include <linux/limits.h>

 #include "elf_util.h"
 #include "logging.h"

 #include "solist.h"

+/* TODO: Is offset for realpath necessary? It seems to have the function
+           available anywhere. */
 #ifdef __LP64__
  size_t solist_size_offset = 0x18;
-  size_t solist_next_offset = 0x30;
  size_t solist_realpath_offset = 0x1a8;
 #else
  size_t solist_size_offset = 0x90;
-  size_t solist_next_offset = 0xa4;
  size_t solist_realpath_offset = 0x174;
 #endif

 static const char *(*get_realpath_sym)(SoInfo *) = NULL;
 static void (*soinfo_free)(SoInfo *) = NULL;
-
-static inline SoInfo *get_next(SoInfo *self) {
-  return *(SoInfo **)((uintptr_t)self + solist_next_offset);
-}
+static SoInfo *(*find_containing_library)(const void *p) = NULL;
+static void (*purge_unused_memory)(void) = NULL;
+struct link_map *r_debug_tail = NULL;

 static inline const char *get_path(SoInfo *self) {
  if (get_realpath_sym)
@@ -35,11 +37,7 @@ static inline void set_size(SoInfo *self, size_t size) {
  *(size_t *) ((uintptr_t)self + solist_size_offset) = size;
 }

-static inline size_t get_size(SoInfo *self) {
-  return *(size_t *) ((uintptr_t)self + solist_size_offset);
-}
-
-struct pdg ppdg;
+struct pdg ppdg = { 0 };

 static bool pdg_setup(ElfImg *img) {
  ppdg.ctor = (void *(*)())getSymbAddress(img,  "__dl__ZN18ProtectedDataGuardC2Ev");
@@ -48,35 +46,33 @@ static bool pdg_setup(ElfImg *img) {
  return ppdg.ctor != NULL && ppdg.dtor != NULL;
 }

-static void pdg_protect() {
-  if (ppdg.ctor != NULL)
-    (*(ppdg.ctor))();
-}
-
+/* INFO: Allow data to be written to the areas. */
 static void pdg_unprotect() {
-  if (ppdg.dtor != NULL)
-    (*(ppdg.dtor))();
+  (*ppdg.ctor)();
 }

-static SoInfo *solist = NULL;
-static SoInfo *somain = NULL;
-static SoInfo **sonext = NULL;
+/* INFO: Block write and only allow read access to the areas. */
+static void pdg_protect() {
+  (*ppdg.dtor)();
+}

-static uint64_t *g_module_load_counter = NULL;
-static uint64_t *g_module_unload_counter = NULL;
+static SoInfo *somain = NULL;
+
+static size_t *g_module_load_counter = NULL;
+static size_t *g_module_unload_counter = NULL;

 static bool solist_init() {
-  ElfImg *linker = ElfImg_create("/linker");
+  #ifdef __LP64__
+    ElfImg *linker = ElfImg_create("/system/bin/linker64", NULL);
+  #else
+    ElfImg *linker = ElfImg_create("/system/bin/linker", NULL);
+  #endif
  if (linker == NULL) {
    LOGE("Failed to load linker");

    return false;
  }

-  ppdg = (struct pdg) {
-    .ctor = NULL,
-    .dtor = NULL
-  };
  if (!pdg_setup(linker)) {
    LOGE("Failed to setup pdg");

@@ -92,17 +88,6 @@ static bool solist_init() {

      See #63 for more information.
  */
-  solist = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL6solist");
-  if ((void *)solist == NULL) {
-    LOGE("Failed to find solist __dl__ZL6solist*");
-
-    ElfImg_destroy(linker);
-
-    return false;
-  }
-
-  LOGD("%p is solist", (void *)solist);
-
  somain = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL6somain");
  if (somain == NULL) {
    LOGE("Failed to find somain __dl__ZL6somain*");
@@ -114,26 +99,14 @@ static bool solist_init() {

  LOGD("%p is somain", (void *)somain);

-  sonext = (SoInfo **)getSymbAddressByPrefix(linker, "__dl__ZL6sonext");
-  if (sonext == NULL) {
-    LOGE("Failed to find sonext __dl__ZL6sonext*");
-
-    ElfImg_destroy(linker);
-
-    return false;
-  }
-
-  LOGD("%p is sonext", (void *)sonext);
-
-  SoInfo *vdso = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL4vdso");
-  if (vdso != NULL) LOGD("%p is vdso", (void *)vdso);
-
  get_realpath_sym = (const char *(*)(SoInfo *))getSymbAddress(linker, "__dl__ZNK6soinfo12get_realpathEv");
  if (get_realpath_sym == NULL) {
    LOGE("Failed to find get_realpath __dl__ZNK6soinfo12get_realpathEv");

    ElfImg_destroy(linker);

+    somain = NULL;
+
    return false;
  }

@@ -145,30 +118,63 @@ static bool solist_init() {

    ElfImg_destroy(linker);

+    somain = NULL;
+
    return false;
  }

  LOGD("%p is soinfo_free", (void *)soinfo_free);

-  g_module_load_counter = (uint64_t *)getSymbAddress(linker, "__dl__ZL21g_module_load_counter");
+  find_containing_library = (SoInfo *(*)(const void *))getSymbAddress(linker, "__dl__Z23find_containing_libraryPKv");
+  if (find_containing_library == NULL) {
+    LOGE("Failed to find find_containing_library __dl__Z23find_containing_libraryPKv");
+
+    ElfImg_destroy(linker);
+
+    somain = NULL;
+
+    return false;
+  }
+
+  LOGD("%p is find_containing_library", (void *)find_containing_library);
+
+  purge_unused_memory = (void (*)())getSymbAddress(linker, "__dl__Z19purge_unused_memoryv");
+  if (purge_unused_memory == NULL) {
+    LOGE("Failed to find purge_unused_memory __dl__Z19purge_unused_memoryv");
+
+    ElfImg_destroy(linker);
+
+    somain = NULL;
+
+    return false;
+  }
+
+  LOGD("%p is purge_unused_memory", (void *)purge_unused_memory);
+
+  r_debug_tail = (struct link_map *)getSymbValueByPrefix(linker, "__dl__ZL12r_debug_tail");
+  if (r_debug_tail == NULL) {
+    LOGE("Failed to find r_debug_tail __dl__ZL10r_debug_tail");
+
+    ElfImg_destroy(linker);
+
+    somain = NULL;
+
+    return false;
+  }
+
+  g_module_load_counter = (size_t *)getSymbAddress(linker, "__dl__ZL21g_module_load_counter");
  if (g_module_load_counter != NULL) LOGD("found symbol g_module_load_counter");

-  g_module_unload_counter = (uint64_t *)getSymbAddress(linker, "__dl__ZL23g_module_unload_counter");
+  g_module_unload_counter = (size_t *)getSymbAddress(linker, "__dl__ZL23g_module_unload_counter");
  if (g_module_unload_counter != NULL) LOGD("found symbol g_module_unload_counter");

  for (size_t i = 0; i < 1024 / sizeof(void *); i++) {
-    uintptr_t possible_field = (uintptr_t)solist + i * sizeof(void *);
    size_t possible_size_of_somain = *(size_t *)((uintptr_t)somain + i * sizeof(void *));

    if (possible_size_of_somain < 0x100000 && possible_size_of_somain > 0x100) {
      solist_size_offset = i * sizeof(void *);

      LOGD("solist_size_offset is %zu * %zu = %p", i, sizeof(void *), (void *)solist_size_offset);
-    }
-
-    if (*(void **)possible_field == somain || (vdso != NULL && *(void **)possible_field == vdso)) {
-      solist_next_offset = i * sizeof(void *);
-      LOGD("solist_next_offset is %zu * %zu = %p", i, sizeof(void *), (void *)solist_next_offset);

      break;
    }
@@ -179,36 +185,144 @@ static bool solist_init() {
  return true;
 }

-bool solist_drop_so_path(const char *target_path) {
-  if (solist == NULL && !solist_init()) {
+/* INFO: This is an AOSP function to remove a link map from
+           the link map list.
+
+   SOURCES:
+    - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker_gdb_support.cpp#63
+*/
+static void remove_link_map_from_debug_map(struct link_map *map) {
+  if (r_debug_tail == map) {
+    r_debug_tail = map->l_prev;
+  }
+
+  if (map->l_prev) {
+    map->l_prev->l_next = map->l_next;
+  }
+
+  if (map->l_next) {
+    map->l_next->l_prev = map->l_prev;
+  }
+}
+
+static struct link_map *find_link_map(SoInfo *si) {
+  const char *path = get_path(si);
+  if (path == NULL) {
+    LOGE("Failed to get path for SoInfo %p", (void *)si);
+
+    return NULL;
+  }
+
+  LOGD("Searching for link_map for %s", path);
+
+  struct link_map *map = r_debug_tail;
+  while (map) {
+    /* INFO: l_name uses the same pointer as realpath function of SoInfo, allowing us
+               to directly compare the pointers instead of the strings.
+
+       SOURCES:
+        - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#283
+    */
+    if (map->l_name && (uintptr_t)map->l_name == (uintptr_t)path) {
+      LOGD("Found link_map for %s: %p", path, (void *)map);
+
+      return map;
+    }
+
+    map = map->l_next;
+  }
+
+  LOGE("Failed to find link_map for %s", path);
+
+  return NULL;
+}
+
+/* INFO: find_containing_library returns the SoInfo for the library that contains
+           that memory inside its limits, hence why named "lib_memory" in ReZygisk. */
+bool solist_drop_so_path(void *lib_memory, bool unload) {
+  if (somain == NULL && !solist_init()) {
    LOGE("Failed to initialize solist");

    return false;
  }

-  for (SoInfo *iter = solist; iter; iter = get_next(iter)) {
-    if (get_path(iter) && strstr(get_path(iter), target_path)) {
-      pdg_protect();
+  SoInfo *found = (*find_containing_library)(lib_memory);
+  if (found == NULL) {
+    LOGD("Could not find containing library for %p", lib_memory);

-      LOGV("dropping solist record loaded at %s with size %zu", get_path(iter), get_size(iter));
-      if (get_size(iter) > 0) {
-        set_size(iter, 0);
-        soinfo_free(iter);
+    purge_unused_memory();

-        pdg_unprotect();
-
-        return true;
-      }
-
-      pdg_unprotect();
-    }
+    return false;
  }

-  return false;
+  LOGD("Found so path for %p: %s", lib_memory, get_path(found));
+
+  char path[PATH_MAX];
+  if (get_path(found) == NULL) {
+    LOGE("Failed to get path for %p", found);
+
+    return false;
+  }
+  strncpy(path, get_path(found), sizeof(path) - 1);
+
+  /* INFO: This area is guarded. Must unprotect first. */
+  pdg_unprotect();
+  set_size(found, 0);
+  if (unload) pdg_protect();
+
+  LOGD("Set size of %p to 0", (void *)found);
+
+  /* INFO: We know that as libzygisk.so our limits, but modules are arbitrary, so
+             calling deconstructors might break them. To avoid that, we manually call
+             the separated structures, that however won't clean all traces in soinfo,
+             not for now, at least. */
+  if (unload && dlclose((void *)found) == -1) {
+    LOGE("Failed to dlclose so path for %s: %s", path, dlerror());
+
+    return false;
+  } else if (!unload) {
+    LOGD("Not unloading so path for %s, only dropping it", path);
+
+    /* 
+       INFO: If the link map is not removed from the list, it gets inconsistent, resulting
+               in a loop when listing through it, which can be detected. To fix that, we
+               can remove the map, like expected.
+
+             We cannot use the notify_gdb_of_unload function as it is static, and not available
+               in all linker binaries.
+    */
+    struct link_map *map = find_link_map(found);
+    if (!map) {
+      LOGE("Failed to find link map for %s", path);
+
+      pdg_protect();
+
+      return false;
+    }
+
+    remove_link_map_from_debug_map(map);
+    /* INFO: unregister_soinfo_tls cannot be used since module might use JNI which may
+               require TLS, so we cannot remove it. */
+    soinfo_free(found);
+
+    pdg_protect();
+  }
+
+  LOGD("Successfully hidden soinfo traces for %s", path);
+
+  /* INFO: Avoid leaks by ensuring the freed places are munmapped */
+  purge_unused_memory();
+
+  LOGD("Purged unused memory successfully");
+
+  /* INFO: Let's avoid trouble regarding detections */
+  memset(path, strlen(path), 0);
+
+  return true;
 }

 void solist_reset_counters(size_t load, size_t unload) {
-  if (solist == NULL && !solist_init()) {
+  if (somain == NULL && !solist_init()) {
    LOGE("Failed to initialize solist");

    return;
@@ -220,18 +334,18 @@ void solist_reset_counters(size_t load, size_t unload) {
    return;
  }

-  uint64_t loaded_modules = *g_module_load_counter;
-  uint64_t unloaded_modules = *g_module_unload_counter;
+  size_t loaded_modules = *g_module_load_counter;
+  size_t unloaded_modules = *g_module_unload_counter;

  if (loaded_modules >= load) {
-    *g_module_load_counter = loaded_modules - load;
+    *g_module_load_counter -= load;

-    LOGD("reset g_module_load_counter to %zu", (size_t) *g_module_load_counter);
+    LOGD("reset g_module_load_counter to %zu", *g_module_load_counter);
  }

  if (unloaded_modules >= unload) {
-    *g_module_unload_counter = unloaded_modules - unload;
+    *g_module_unload_counter -= unload;

-    LOGD("reset g_module_unload_counter to %zu", (size_t) *g_module_unload_counter);
+    LOGD("reset g_module_unload_counter to %zu", *g_module_unload_counter);
  }
 }
--- a/loader/src/injector/solist.h
+++ b/loader/src/injector/solist.h
@@ -5,11 +5,7 @@
 extern "C" {
 #endif /* __cplusplus */

-typedef struct SoInfo SoInfo;
-
-struct SoInfo {
-  char data[0];
-};
+typedef void SoInfo;

 #define FuncType(name) void (*name)

@@ -24,18 +20,24 @@ struct pdg {
          called solist, a list with the information of opened objects.

        Due to special handling in ptracer, however, it won't heave gaps in the
-          memory of the list since we will close there, not loading a library creating
-          this gap. However, the previously loaded library would remain in the solist,
-          requiring ReZygisk to clean those up.
+          memory of the list since we will remove the info immediatly after loading
+          libzygisk.so, so that it doesn't create gaps between current module info
+          and the next (soinfo).

-        To do that, we use 2 functions: soinfo_free, and set_size, which will
-          zero the region size, and then remove all traces of that library (libzygisk.so)
-          which was previously loaded.
+        To do that, we use 2 functions: set_size and dlclose, which will first zero
+          zero the size that the linker believes the shared library is, and then dlclose.
+          Because the size is 0, it won't munmap the library, allowing us to keep loaded while
+          having all other traces removed.
+
+        For the case of modules, which are arbitrary, we won't call dlclose, as it could break
+          the module. Instead of using dlclose, we separately call soinfo_free, which will free
+          the soinfo structure. That will allow to keep the data initialized by constructors
+          mmaped, hence properly dropping most traces without breaking the module.

  SOURCES:
   - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#1712
 */
-bool solist_drop_so_path(const char *target_path);
+bool solist_drop_so_path(void *lib_memory, bool unload);

 /* 
  INFO: When dlopen'ing a library, the system will increment 1 to a global
--- a/loader/src/injector/zygisk.hpp
+++ b/loader/src/injector/zygisk.hpp
@@ -7,4 +7,4 @@ extern size_t block_size;

 void hook_functions();

-void clean_trace(const char* path, size_t load = 1, size_t unload = 0, bool spoof_maps = false);
+extern "C" void send_seccomp_event();
--- a/loader/src/ptracer/main.c
+++ b/loader/src/ptracer/main.c
@@ -77,11 +77,11 @@ int main(int argc, char **argv) {
      }
    }

-    if (info.modules->modules_count != 0) {
-      printf("Modules: %zu\n", info.modules->modules_count);
+    if (info.modules.modules_count != 0) {
+      printf("Modules: %zu\n", info.modules.modules_count);

-      for (size_t i = 0; i < info.modules->modules_count; i++) {
-        printf(" - %s\n", info.modules->modules[i]);
+      for (size_t i = 0; i < info.modules.modules_count; i++) {
+        printf(" - %s\n", info.modules.modules[i]);
      }
    } else {
      printf("Modules: N/A\n");
--- a/loader/src/ptracer/monitor.c
+++ b/loader/src/ptracer/monitor.c
@@ -17,6 +17,7 @@
 #include "utils.h"
 #include "daemon.h"
 #include "misc.h"
+#include "socket_utils.h"

 #include "monitor.h"

@@ -29,6 +30,15 @@ static bool update_status(const char *message);

 char monitor_stop_reason[32];

+struct environment_information {
+  char *root_impl;
+  char **modules;
+  uint32_t modules_len;
+};
+
+static struct environment_information environment_information64;
+static struct environment_information environment_information32;
+
 enum ptracer_tracing_state {
  TRACING,
  STOPPING,
@@ -48,14 +58,25 @@ struct rezygiskd_status {
 };

 struct rezygiskd_status status64 = {
-  .daemon_pid = -1
+  .supported = false,
+  .zygote_injected = false,
+  .daemon_running = false,
+  .daemon_pid = -1,
+  .daemon_info = NULL,
+  .daemon_error_info = NULL
 };
 struct rezygiskd_status status32 = {
-  .daemon_pid = -1
+  .supported = false,
+  .zygote_injected = false,
+  .daemon_running = false,
+  .daemon_pid = -1,
+  .daemon_info = NULL,
+  .daemon_error_info = NULL
 };

 int monitor_epoll_fd;
 bool monitor_events_running = true;
+typedef void (*monitor_event_callback_t)();

 bool monitor_events_init() {
  monitor_epoll_fd = epoll_create(1);
@@ -68,14 +89,9 @@ bool monitor_events_init() {
  return true;
 }

-struct monitor_event_cbs {
-  void (*callback)();
-  void (*stop_callback)();
-};
-
-bool monitor_events_register_event(struct monitor_event_cbs *event_cbs, int fd, uint32_t events) {
+bool monitor_events_register_event(monitor_event_callback_t event_cb, int fd, uint32_t events) {
  struct epoll_event ev = {
-    .data.ptr = event_cbs,
+    .data.ptr = (void *)event_cb,
    .events = events
  };

@@ -106,15 +122,16 @@ void monitor_events_loop() {
  struct epoll_event events[2];
  while (monitor_events_running) {
    int nfds = epoll_wait(monitor_epoll_fd, events, 2, -1);
-    if (nfds == -1) {
-      if (errno != EINTR) PLOGE("epoll_wait");
+    if (nfds == -1 && errno != EINTR) {
+      PLOGE("epoll_wait");

-      continue;
+      monitor_events_running = false;
+
+      break;
    }

-    for (int i = 0; i < nfds; i++) {
-      struct monitor_event_cbs *event_cbs = (struct monitor_event_cbs *)events[i].data.ptr;
-      event_cbs->callback();
+    for (int i = 0; i < nfds; i++) { 
+      ((monitor_event_callback_t)events[i].data.ptr)();

      if (!monitor_events_running) break;
    }
@@ -122,11 +139,6 @@ void monitor_events_loop() {

  if (monitor_epoll_fd >= 0) close(monitor_epoll_fd);
  monitor_epoll_fd = -1;
-
-  for (int i = 0; i < (int)(sizeof(events) / sizeof(events[0])); i++) {
-    struct monitor_event_cbs *event_cbs = (struct monitor_event_cbs *)events[i].data.ptr;
-    event_cbs->stop_callback();
-  }
 }

 int monitor_sock_fd;
@@ -157,69 +169,25 @@ bool rezygiskd_listener_init() {
 }

 void rezygiskd_listener_callback() {
-  struct [[gnu::packed]] MsgHead {
-    enum rezygiskd_command cmd;
-    int length;
-    char data[0];
-  };
-
  while (1) {
-    struct MsgHead *msg = (struct MsgHead *)malloc(sizeof(struct MsgHead));
-
-    ssize_t real_size;
-    ssize_t nread = recv(monitor_sock_fd, msg, sizeof(struct MsgHead), MSG_PEEK);
+    uint8_t cmd;
+    ssize_t nread = TEMP_FAILURE_RETRY(read(monitor_sock_fd, &cmd, sizeof(cmd)));
    if (nread == -1) {
-      if (errno == EAGAIN) break;
-
      PLOGE("read socket");
-    }
-
-    if ((size_t)nread < sizeof(enum rezygiskd_command)) {
-      LOGE("read %zu < %zu", nread, sizeof(enum rezygiskd_command));
-      continue;
-    }
-
-    if (msg->cmd >= DAEMON64_SET_INFO && msg->cmd != SYSTEM_SERVER_STARTED) {
-      if (nread != sizeof(msg)) {
-        LOGE("cmd %d size %zu != %zu", msg->cmd, nread, sizeof(struct MsgHead));
-
-        continue;
-      }
-
-      real_size = sizeof(struct MsgHead) + msg->length;
-    } else {
-      if (nread != sizeof(enum rezygiskd_command)) {
-        LOGE("cmd %d size %zu != %zu", msg->cmd, nread, sizeof(enum rezygiskd_command));
-
-        continue;
-      }
-
-      real_size = sizeof(enum rezygiskd_command);
-    }
-
-    msg = (struct MsgHead *)realloc(msg, real_size);
-    nread = recv(monitor_sock_fd, msg, real_size, 0);
-
-    if (nread == -1) {
-      if (errno == EAGAIN) break;
-
-      PLOGE("recv");
-      continue;
-    }
-
-    if (nread != real_size) {
-      LOGE("real size %zu != %zu", real_size, nread);

      continue;
    }

-    switch (msg->cmd) {
+    switch (cmd) {
      case START: {
-        if (tracing_state == STOPPING) tracing_state = TRACING;
-        else if (tracing_state == STOPPED) {
-          ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK);
+        if (tracing_state == STOPPING) {
+          LOGI("Continue tracing init");

-          LOGI("start tracing init");
+          tracing_state = TRACING;
+        } else if (tracing_state == STOPPED) {
+          LOGI("Start tracing init");
+
+          ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK);

          tracing_state = TRACING;
        }
@@ -230,7 +198,7 @@ void rezygiskd_listener_callback() {
      }
      case STOP: {
        if (tracing_state == TRACING) {
-          LOGI("stop tracing requested");
+          LOGI("Stop tracing requested");

          tracing_state = STOPPING;
          strcpy(monitor_stop_reason, "user requested");
@@ -242,7 +210,7 @@ void rezygiskd_listener_callback() {
        break;
      }
      case EXIT: {
-        LOGI("prepare for exit ...");
+        LOGI("Prepare for exit ...");

        tracing_state = EXITING;
        strcpy(monitor_stop_reason, "user requested");
@@ -252,104 +220,166 @@ void rezygiskd_listener_callback() {

        break;
      }
-      case ZYGOTE64_INJECTED: {
-        status64.zygote_injected = true;
-
-        update_status(NULL);
-
-        break;
-      }
+      case ZYGOTE64_INJECTED: 
      case ZYGOTE32_INJECTED: {
-        status32.zygote_injected = true;
-
-        update_status(NULL);
-
-        break;
-      }
-      case DAEMON64_SET_INFO: {
-        LOGD("received daemon64 info %s", msg->data);
-
-        /* Will only happen if somehow the daemon restarts */
-        if (status64.daemon_info) {
-          free(status64.daemon_info);
-          status64.daemon_info = NULL;
-        }
-
-        status64.daemon_info = (char *)malloc(msg->length);
-        if (!status64.daemon_info) {
-          PLOGE("malloc daemon64 info");
-
-          break;
-        }
-
-        strcpy(status64.daemon_info, msg->data);
+        LOGI("Received Zygote%s injected command", cmd == ZYGOTE64_INJECTED ? "64" : "32");
+
+        struct rezygiskd_status *status = cmd == ZYGOTE64_INJECTED ? &status64 : &status32;
+        status->zygote_injected = true;

        update_status(NULL);

        break;
      }
+      case DAEMON64_SET_INFO:
      case DAEMON32_SET_INFO: {
-        LOGD("received daemon32 info %s", msg->data);
+        LOGD("Received ReZygiskd%s info", cmd == DAEMON64_SET_INFO ? "64" : "32");

-        if (status32.daemon_info) {
-          free(status32.daemon_info);
-          status32.daemon_info = NULL;
-        }
-
-        status32.daemon_info = (char *)malloc(msg->length);
-        if (!status32.daemon_info) {
-          PLOGE("malloc daemon32 info");
+        uint32_t root_impl_len;
+        if (read_uint32_t(monitor_sock_fd, &root_impl_len) != sizeof(root_impl_len)) {
+          LOGE("read ReZygiskd%s root impl len", cmd == DAEMON64_SET_INFO ? "64" : "32");

          break;
        }

-        strcpy(status32.daemon_info, msg->data);
-
-        update_status(NULL);
-
-        break;
-      }
-      case DAEMON64_SET_ERROR_INFO: {
-        LOGD("received daemon64 error info %s", msg->data);
-
-        status64.daemon_running = false;
-
-        if (status64.daemon_error_info) {
-          free(status64.daemon_error_info);
-          status64.daemon_error_info = NULL;
-        }
-
-        status64.daemon_error_info = (char *)malloc(msg->length);
-        if (!status64.daemon_error_info) {
-          PLOGE("malloc daemon64 error info");
-
-          break;
-        }
-
-        strcpy(status64.daemon_error_info, msg->data);
+        struct environment_information *environment_information = cmd == DAEMON64_SET_INFO ? &environment_information64 : &environment_information32;
+        if (environment_information->root_impl) {
+          LOGD("freeing old ReZygiskd%s root impl", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+          free((void *)environment_information->root_impl);
+          environment_information->root_impl = NULL;
+        }
+
+        environment_information->root_impl = malloc(root_impl_len + 1);
+        if (environment_information->root_impl == NULL) {
+          PLOGE("malloc ReZygiskd%s root impl", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+          break;
+        }
+
+        if (read_loop(monitor_sock_fd, (void *)environment_information->root_impl, root_impl_len) != (ssize_t)root_impl_len) {
+          LOGE("read ReZygiskd%s root impl", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+          free((void *)environment_information->root_impl);
+          environment_information->root_impl = NULL;
+
+          break;
+        }
+
+        environment_information->root_impl[root_impl_len] = '\0';
+        LOGD("ReZygiskd%s root impl: %s", cmd == DAEMON64_SET_INFO ? "64" : "32", environment_information->root_impl);
+
+        if (read_uint32_t(monitor_sock_fd, &environment_information->modules_len) != sizeof(environment_information->modules_len)) {
+          LOGE("read ReZygiskd%s modules len", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+          free((void *)environment_information->root_impl);
+          environment_information->root_impl = NULL;
+
+          break;
+        }
+
+        if (environment_information->modules) {
+          LOGD("freeing old ReZygiskd%s modules", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+          for (size_t i = 0; i < environment_information->modules_len; i++) {
+            free((void *)environment_information->modules[i]);
+          }
+
+          free((void *)environment_information->modules);
+          environment_information->modules = NULL;
+        }
+
+        environment_information->modules = malloc(environment_information->modules_len * sizeof(char *));
+        if (environment_information->modules == NULL) {
+          PLOGE("malloc ReZygiskd%s modules", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+          free((void *)environment_information->root_impl);
+          environment_information->root_impl = NULL;
+
+          break;
+        }
+
+        for (size_t i = 0; i < environment_information->modules_len; i++) {
+          uint32_t module_name_len;
+          if (read_uint32_t(monitor_sock_fd, &module_name_len) != sizeof(module_name_len)) {
+            LOGE("read ReZygiskd%s module name len", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+            goto rezygiskd64_set_info_modules_cleanup;
+          }
+
+          environment_information->modules[i] = malloc(module_name_len + 1);
+          if (environment_information->modules[i] == NULL) {
+            PLOGE("malloc ReZygiskd%s module name", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+            goto rezygiskd64_set_info_modules_cleanup;
+          }
+
+          if (read_loop(monitor_sock_fd, (void *)environment_information->modules[i], module_name_len) != (ssize_t)module_name_len) {
+            LOGE("read ReZygiskd%s module name", cmd == DAEMON64_SET_INFO ? "64" : "32");
+
+            goto rezygiskd64_set_info_modules_cleanup;
+          }
+
+          environment_information->modules[i][module_name_len] = '\0';
+          LOGD("ReZygiskd%s module %zu: %s", cmd == DAEMON64_SET_INFO ? "64" : "32", i, environment_information->modules[i]);
+
+          continue;
+
+          rezygiskd64_set_info_modules_cleanup:
+            free((void *)environment_information->root_impl);
+            environment_information->root_impl = NULL;
+
+            for (size_t j = 0; j < i; j++) {
+              free((void *)environment_information->modules[j]);
+            }
+
+            free((void *)environment_information->modules);
+            environment_information->modules = NULL;
+
+            break;
+        }

        update_status(NULL);

        break;
      }
+      case DAEMON64_SET_ERROR_INFO:
      case DAEMON32_SET_ERROR_INFO: {
-        LOGD("received daemon32 error info %s", msg->data);
+        LOGD("Received ReZygiskd%s error info", cmd == DAEMON64_SET_ERROR_INFO ? "64" : "32");

-        status32.daemon_running = false;
-
-        if (status32.daemon_error_info) {
-          free(status32.daemon_error_info);
-          status32.daemon_error_info = NULL;
-        }
-
-        status32.daemon_error_info = (char *)malloc(msg->length);
-        if (!status32.daemon_error_info) {
-          PLOGE("malloc daemon32 error info");
+        uint32_t error_info_len;
+        if (read_uint32_t(monitor_sock_fd, &error_info_len) != sizeof(error_info_len)) {
+          LOGE("read ReZygiskd%s error info len", cmd == DAEMON64_SET_ERROR_INFO ? "64" : "32");

          break;
        }

-        strcpy(status32.daemon_error_info, msg->data);
+        struct rezygiskd_status *status = cmd == DAEMON64_SET_ERROR_INFO ? &status64 : &status32;
+        if (status->daemon_error_info) {
+          LOGD("freeing old ReZygiskd%s error info", cmd == DAEMON64_SET_ERROR_INFO ? "64" : "32");
+
+          free(status->daemon_error_info);
+          status->daemon_error_info = NULL;
+        }
+
+        status->daemon_error_info = malloc(error_info_len + 1);
+        if (status->daemon_error_info == NULL) {
+          PLOGE("malloc ReZygiskd%s error info", cmd == DAEMON64_SET_ERROR_INFO ? "64" : "32");
+
+          break;
+        }
+
+        if (read_loop(monitor_sock_fd, status->daemon_error_info, error_info_len) != (ssize_t)error_info_len) {
+          LOGE("read ReZygiskd%s error info", cmd == DAEMON64_SET_ERROR_INFO ? "64" : "32");
+
+          free(status->daemon_error_info);
+          status->daemon_error_info = NULL;
+
+          break;
+        }
+
+        status->daemon_error_info[error_info_len] = '\0';
+        LOGD("ReZygiskd%s error info: %s", cmd == DAEMON64_SET_ERROR_INFO ? "64" : "32", status->daemon_error_info);

        update_status(NULL);

@@ -358,7 +388,7 @@ void rezygiskd_listener_callback() {
      case SYSTEM_SERVER_STARTED: {
        LOGD("system server started, mounting prop");

-        if (mount(PROP_PATH, "/data/adb/modules/zygisksu/module.prop", NULL, MS_BIND, NULL) == -1) {
+        if (mount(PROP_PATH, "/data/adb/modules/rezygisk/module.prop", NULL, MS_BIND, NULL) == -1) {
          PLOGE("failed to mount prop");
        }

@@ -366,7 +396,7 @@ void rezygiskd_listener_callback() {
      }
    }

-    free(msg);
+    break;
  }
 }

@@ -402,86 +432,87 @@ CREATE_ZYGOTE_START_COUNTER(32)

 static bool ensure_daemon_created(bool is_64bit) {
  struct rezygiskd_status *status = is_64bit ? &status64 : &status32;
-  if (is_64bit) {
+
+  if (is_64bit || (!is_64bit && !status64.supported)) {
    LOGD("new zygote started.");

-    umount2("/data/adb/modules/zygisksu/module.prop", MNT_DETACH);
+    umount2("/data/adb/modules/rezygisk/module.prop", MNT_DETACH);
  }

-  status->zygote_injected = false;
+  if (status->daemon_pid != -1) {
+    LOGI("daemon%s already running", is_64bit ? "64" : "32");

-  if (status->daemon_pid == -1) {
-    pid_t pid = fork();
-    if (pid < 0) {
-      PLOGE("create daemon%s", is_64bit ? "64" : "32");
-
-      return false;
-    } else if (pid == 0) {
-      char daemon_name[PATH_MAX] = "./bin/zygiskd";
-      strcat(daemon_name, is_64bit ? "64" : "32");
-
-      execl(daemon_name, daemon_name, NULL);
-
-      PLOGE("exec daemon %s failed", daemon_name);
-
-      exit(1);
-    } else {
-      status->supported = true;
-      status->daemon_pid = pid;
-      status->daemon_running = true;
-
-      return true;
-    }
-  } else {
    return status->daemon_running;
  }
-}

-#define CHECK_DAEMON_EXIT(abi)                                                   \
-  if (status##abi.supported && pid == status##abi.daemon_pid) {                  \
-    char status_str[64];                                                         \
-    parse_status(sigchld_status, status_str, sizeof(status_str));                \
-                                                                                 \
-    LOGW("daemon" #abi " pid %d exited: %s", pid, status_str);                   \
-    status##abi.daemon_running = false;                                          \
-                                                                                 \
-    if (!status##abi.daemon_error_info) {                                        \
-      status##abi.daemon_error_info = (char *)malloc(strlen(status_str) + 1);    \
-      if (!status##abi.daemon_error_info) {                                      \
-        LOGE("malloc daemon" #abi " error info failed");                         \
-                                                                                 \
-        return;                                                                  \
-      }                                                                          \
-                                                                                 \
-      memcpy(status##abi.daemon_error_info, status_str, strlen(status_str) + 1); \
-    }                                                                            \
-                                                                                 \
-    update_status(NULL);                                                         \
-    continue;                                                                    \
+  pid_t pid = fork();
+  if (pid < 0) {
+    PLOGE("create daemon%s", is_64bit ? "64" : "32");
+
+    return false;
  }

-#define PRE_INJECT(abi, is_64)                                                         \
-  if (strcmp(program, "/system/bin/app_process" # abi) == 0) {                         \
-    tracer = "./bin/zygisk-ptrace" # abi;                                              \
-                                                                                       \
-    if (should_stop_inject ## abi()) {                                                 \
-      LOGW("zygote" # abi " restart too much times, stop injecting");                  \
-                                                                                       \
-      tracing_state = STOPPING;                                                        \
-      memcpy(monitor_stop_reason, "zygote crashed", sizeof("zygote crashed"));         \
-      ptrace(PTRACE_INTERRUPT, 1, 0, 0);                                               \
-                                                                                       \
-      break;                                                                           \
-    }                                                                                  \
-    if (!ensure_daemon_created(is_64)) {                                               \
-      LOGW("daemon" #abi " not running, stop injecting");                              \
-                                                                                       \
-      tracing_state = STOPPING;                                                        \
-      memcpy(monitor_stop_reason, "daemon not running", sizeof("daemon not running")); \
-      ptrace(PTRACE_INTERRUPT, 1, 0, 0);                                               \
-                                                                                       \
-      break;                                                                           \
-    }                                                                                  \
+  if (pid == 0) {
+    char daemon_name[PATH_MAX] = "./bin/zygiskd";
+    strcat(daemon_name, is_64bit ? "64" : "32");
+
+    execl(daemon_name, daemon_name, NULL);
+
+    PLOGE("exec daemon %s failed", daemon_name);
+
+    exit(1);
+  }
+
+  status->supported = true;
+  status->daemon_pid = pid;
+  status->daemon_running = true;
+
+  return true;
+}
+
+#define CHECK_DAEMON_EXIT(abi)                                    \
+  if (status##abi.supported && pid == status##abi.daemon_pid) {   \
+    char status_str[64];                                          \
+    parse_status(sigchld_status, status_str, sizeof(status_str)); \
+                                                                  \
+    LOGW("daemon" #abi " pid %d exited: %s", pid, status_str);    \
+    status##abi.daemon_running = false;                           \
+                                                                  \
+    if (!status##abi.daemon_error_info) {                         \
+      status##abi.daemon_error_info = strdup(status_str);         \
+      if (!status##abi.daemon_error_info) {                       \
+        LOGE("malloc daemon" #abi " error info failed");          \
+                                                                  \
+        return;                                                   \
+      }                                                           \
+    }                                                             \
+                                                                  \
+    continue;                                                     \
+  }
+
+#define PRE_INJECT(abi, is_64)                                        \
+  if (strcmp(program, "/system/bin/app_process" # abi) == 0) {        \
+    tracer = "./bin/zygisk-ptrace" # abi;                             \
+                                                                      \
+    if (should_stop_inject ## abi()) {                                \
+      LOGW("Zygote" # abi " restart too much times, stop injecting"); \
+                                                                      \
+      tracing_state = STOPPING;                                       \
+      strcpy(monitor_stop_reason, "Zygote crashed");                  \
+      ptrace(PTRACE_INTERRUPT, 1, 0, 0);                              \
+                                                                      \
+      break;                                                          \
+    }                                                                 \
+                                                                      \
+    if (!ensure_daemon_created(is_64)) {                              \
+      LOGW("ReZygiskd " #abi "-bit not running, stop injecting");     \
+                                                                      \
+      tracing_state = STOPPING;                                       \
+      strcpy(monitor_stop_reason, "ReZygiskd not running");           \
+      ptrace(PTRACE_INTERRUPT, 1, 0, 0);                              \
+                                                                      \
+      break;                                                          \
+    }                                                                 \
  }

 int sigchld_signal_fd;
@@ -675,8 +706,6 @@ void sigchld_listener_callback() {
              }
            }
          } while (false);
-
-          update_status(NULL);
        } else {
          char status_str[64];
          parse_status(sigchld_status, status_str, sizeof(status_str));
@@ -716,27 +745,20 @@ static char post_section[1024];

 #define WRITE_STATUS_ABI(suffix)                                                     \
  if (status ## suffix.supported) {                                                  \
-    strcat(status_text, " zygote" # suffix ": ");                                    \
-    if (tracing_state != TRACING) strcat(status_text, "❓ unknown, ");               \
-    else if (status ## suffix.zygote_injected) strcat(status_text, "😋 injected, "); \
-    else strcat(status_text, "❌ not injected, ");                                   \
+    strcat(status_text, ", ReZygisk " # suffix "-bit: ");                            \
                                                                                     \
-    strcat(status_text, "daemon" # suffix ": ");                                     \
-    if (status ## suffix.daemon_running) {                                           \
-      strcat(status_text, "😋 running ");                                            \
+    if (tracing_state != TRACING) strcat(status_text, "❌");                         \
+    else if (status ## suffix.zygote_injected && status ## suffix.daemon_running)    \
+      strcat(status_text, "✅");                                                     \
+    else strcat(status_text, "⚠️");                                                  \
                                                                                     \
-      if (status ## suffix.daemon_info != NULL) {                                    \
-        strcat(status_text, "(");                                                    \
-        strcat(status_text, status ## suffix.daemon_info);                           \
-        strcat(status_text, ")");                                                    \
-      }                                                                              \
-    } else {                                                                         \
-      strcat(status_text, "❌ crashed ");                                            \
-                                                                                     \
-      if (status ## suffix.daemon_error_info != NULL) {                              \
-        strcat(status_text, "(");                                                    \
+    if (!status ## suffix.daemon_running) {                                          \
+      if (status ## suffix.daemon_error_info) {                                      \
+        strcat(status_text, "(ReZygiskd: ");                                         \
        strcat(status_text, status ## suffix.daemon_error_info);                     \
        strcat(status_text, ")");                                                    \
+      } else {                                                                       \
+        strcat(status_text, "(ReZygiskd: not running)");                             \
      }                                                                              \
    }                                                                                \
  }
@@ -756,41 +778,106 @@ static bool update_status(const char *message) {
    return true;
  }

-  char status_text[1024] = "monitor: ";
-
+  char status_text[256] = "Monitor: ";
  switch (tracing_state) {
    case TRACING: {
-      strcat(status_text, "😋 tracing");
+      strcat(status_text, "✅");

      break;
    }
    case STOPPING: [[fallthrough]];
    case STOPPED: {
-      strcat(status_text, "❌ stopped");
+      strcat(status_text, "⛔");

      break;
    }
    case EXITING: {
-      strcat(status_text, "❌ exited");
+      strcat(status_text, "❌");

      break;
    }
  }

-  if (tracing_state != TRACING && monitor_stop_reason[0] != '\0') {
-    strcat(status_text, " (");
-    strcat(status_text, monitor_stop_reason);
-    strcat(status_text, ")");
-  }
-  strcat(status_text, ",");
-
  WRITE_STATUS_ABI(64)
  WRITE_STATUS_ABI(32)

  fprintf(prop, "%s[%s] %s", pre_section, status_text, post_section);
-
  fclose(prop);

+  if (environment_information64.root_impl || environment_information32.root_impl) {
+    FILE *json = fopen("/data/adb/rezygisk/state.json", "w");
+    if (json == NULL) {
+      PLOGE("failed to open state.json");
+
+      return false;
+    }
+
+    fprintf(json, "{\n");
+    fprintf(json, "  \"root\": \"%s\",\n", environment_information64.root_impl ? environment_information64.root_impl : environment_information32.root_impl);
+
+    fprintf(json, "  \"monitor\": {\n");
+    fprintf(json, "    \"state\": \"%d\"", tracing_state);
+    if (monitor_stop_reason[0] != '\0') fprintf(json, ",\n    \"reason\": \"%s\",\n", monitor_stop_reason);
+    else fprintf(json, "\n");
+    fprintf(json, "  },\n");
+
+
+    fprintf(json, "  \"rezygiskd\": {\n");
+    if (status64.supported) {
+      fprintf(json, "    \"64\": {\n");
+      fprintf(json, "      \"state\": %d,\n", status64.daemon_running);
+      if (status64.daemon_error_info) fprintf(json, "      \"reason\": \"%s\",\n", status64.daemon_error_info);
+      fprintf(json, "      \"modules\": [");
+
+      if (environment_information64.modules) for (uint32_t i = 0; i < environment_information64.modules_len; i++) {
+        if (i > 0) fprintf(json, ", ");
+        fprintf(json, "\"%s\"", environment_information64.modules[i]);
+      }
+
+      fprintf(json, "]\n");
+      fprintf(json, "    }");
+      if (status32.supported) fprintf(json, ",\n");
+      else fprintf(json, "\n");
+    }
+
+    if (status32.supported) {
+      fprintf(json, "    \"32\": {\n");
+      fprintf(json, "      \"state\": %d,\n", status32.daemon_running);
+      if (status32.daemon_error_info) fprintf(json, "      \"reason\": \"%s\",\n", status32.daemon_error_info);
+      fprintf(json, "      \"modules\": [");
+
+      if (environment_information32.modules) for (uint32_t i = 0; i < environment_information32.modules_len; i++) {
+        if (i > 0) fprintf(json, ", ");
+        fprintf(json, "\"%s\"", environment_information32.modules[i]);
+      }
+
+      fprintf(json, "]\n");
+      fprintf(json, "    }\n");
+    }
+
+    fprintf(json, "  },\n");
+
+    fprintf(json, "  \"zygote\": {\n");
+    if (status64.supported) {
+      fprintf(json, "    \"64\": %d", status64.zygote_injected);
+      if (status32.zygote_injected) fprintf(json, ",\n");
+      else fprintf(json, "\n");
+    }
+    if (status32.zygote_injected) {
+      fprintf(json, "    \"32\": %d\n", status32.zygote_injected);
+    }
+    fprintf(json, "  }\n");
+    fprintf(json, "}\n");
+
+    fclose(json);
+  } else {
+    if (remove("/data/adb/rezygisk/state.json") == -1) {
+      PLOGE("failed to remove state.json");
+    }
+  }
+
+  LOGI("status updated: %s", status_text);
+
  return true;
 }

@@ -798,7 +885,7 @@ static bool prepare_environment() {
  /* INFO: We need to create the file first, otherwise the mount will fail */
  close(open(PROP_PATH, O_WRONLY | O_CREAT | O_TRUNC, 0644));

-  FILE *orig_prop = fopen("/data/adb/modules/zygisksu/module.prop", "r");
+  FILE *orig_prop = fopen("/data/adb/modules/rezygisk/module.prop", "r");
  if (orig_prop == NULL) {
    PLOGE("failed to open orig prop");

@@ -835,7 +922,7 @@ static bool prepare_environment() {
    return false;
  }

-  return update_status(NULL);
+  return true;
 }

 void init_monitor() {
@@ -845,30 +932,56 @@ void init_monitor() {

  monitor_events_init();

-  rezygiskd_listener_init();
+  if (!rezygiskd_listener_init()) {
+    LOGE("failed to create socket");

-  struct monitor_event_cbs listener_cbs = {
-    .callback = rezygiskd_listener_callback,
-    .stop_callback = rezygiskd_listener_stop
-  };
-  monitor_events_register_event(&listener_cbs, monitor_sock_fd, EPOLLIN | EPOLLET);
+    close(monitor_epoll_fd);

-  sigchld_listener_init();
+    exit(1);
+  }

-  struct monitor_event_cbs sigchld_cbs = {
-    .callback = sigchld_listener_callback,
-    .stop_callback = sigchld_listener_stop
-  };
-  monitor_events_register_event(&sigchld_cbs, sigchld_signal_fd, EPOLLIN | EPOLLET);
+  monitor_events_register_event(rezygiskd_listener_callback, monitor_sock_fd, EPOLLIN | EPOLLET);
+
+  if (sigchld_listener_init() == false) {
+    LOGE("failed to create signalfd");
+
+    rezygiskd_listener_stop();
+    close(monitor_epoll_fd);
+
+    exit(1);
+  }
+
+  monitor_events_register_event(sigchld_listener_callback, sigchld_signal_fd, EPOLLIN | EPOLLET);

  monitor_events_loop();

+  /* INFO: Once it stops the loop, we cannot access the epool data, so we
+             either manually call the stops or save to a structure. */
+  rezygiskd_listener_stop();
+  sigchld_listener_stop();
+
  if (status64.daemon_info) free(status64.daemon_info);
  if (status64.daemon_error_info) free(status64.daemon_error_info);
  if (status32.daemon_info) free(status32.daemon_info);
  if (status32.daemon_error_info) free(status32.daemon_error_info);

-  LOGI("exit");
+  if (environment_information64.root_impl) free((void *)environment_information64.root_impl);
+  if (environment_information64.modules) {
+    for (uint32_t i = 0; i < environment_information64.modules_len; i++) {
+      free((void *)environment_information64.modules[i]);
+    }
+    free((void *)environment_information64.modules);
+  }
+
+  if (environment_information32.root_impl) free((void *)environment_information32.root_impl);
+  if (environment_information32.modules) {
+    for (uint32_t i = 0; i < environment_information32.modules_len; i++) {
+      free((void *)environment_information32.modules[i]);
+    }
+    free((void *)environment_information32.modules);
+  }
+
+  LOGI("Terminating ReZygisk monitor");
 }

 int send_control_command(enum rezygiskd_command cmd) {
@@ -884,9 +997,10 @@ int send_control_command(enum rezygiskd_command cmd) {

  socklen_t socklen = sizeof(sa_family_t) + sun_path_len;

-  ssize_t nsend = sendto(sockfd, (void *)&cmd, sizeof(cmd), 0, (struct sockaddr *)&addr, socklen);
+  uint8_t cmd_op = cmd;
+  ssize_t nsend = sendto(sockfd, (void *)&cmd_op, sizeof(cmd_op), 0, (struct sockaddr *)&addr, socklen);

  close(sockfd);

-  return nsend != sizeof(cmd) ? -1 : 0;
+  return nsend != sizeof(cmd_op) ? -1 : 0;
 }
--- a/loader/src/ptracer/ptracer.c
+++ b/loader/src/ptracer/ptracer.c
@@ -159,9 +159,56 @@ bool inject_on_main(int pid, const char *lib_path) {
    void *libc_return_addr = find_module_return_addr(map, "libc.so");
    LOGD("libc return addr %p", libc_return_addr);

+    const char *libdl_path = NULL;
+    const char *libc_path = NULL;
+    for (size_t i = 0; i < map->size; i++) {
+      if (map->maps[i].path == NULL) continue;
+
+      const char *filename = position_after(map->maps[i].path, '/');
+
+      if (!libdl_path && strcmp(filename, "libdl.so") == 0) {
+        libdl_path = map->maps[i].path;
+
+        LOGD("found libdl.so at %s", libdl_path);
+
+        /* INFO: If we had found libc.so too, no need to continue searching */
+        if (libc_path) break;
+
+        continue;
+      }
+
+      if (!libc_path && strcmp(filename, "libc.so") == 0) {
+        libc_path = map->maps[i].path;
+
+        LOGD("found libc.so at %s", libc_path);
+
+        /* INFO: If we had found libdl.so too, no need to continue searching */
+        if (libdl_path) break;
+
+        continue;
+      }
+    }
+
    /* call dlopen */
-    void *dlopen_addr = find_func_addr(local_map, map, "libdl.so", "dlopen");
-    if (dlopen_addr == NULL) return false;
+    void *dlopen_addr = NULL;
+    if (!libdl_path || (dlopen_addr = find_func_addr(local_map, map, libdl_path, "dlopen")) == NULL) {
+      /* INFO: Android 7.1 and below doesn't have libdl.so loaded in Zygote */
+      LOGW("Failed to find dlopen from libdl.so, will load from linker");
+
+      #ifdef __LP64__
+        dlopen_addr = find_func_addr(local_map, map, "/system/bin/linker64", "__dl_dlopen");
+      #else
+        dlopen_addr = find_func_addr(local_map, map, "/system/bin/linker", "__dl_dlopen");
+      #endif
+      if (dlopen_addr == NULL) {
+        PLOGE("Find __dl_dlopen");
+
+        free_maps(local_map);
+        free_maps(map);
+
+        return false;
+      }
+    }

    long *args = (long *)malloc(3 * sizeof(long));
    if (args == NULL) {
@@ -181,13 +228,25 @@ bool inject_on_main(int pid, const char *lib_path) {
      LOGE("handle is null");

      /* call dlerror */
-      void *dlerror_addr = find_func_addr(local_map, map, "libdl.so", "dlerror");
-      if (dlerror_addr == NULL) {
-        LOGE("find dlerror");
+      void *dlerror_addr = NULL;
+      if (!libdl_path || (dlerror_addr = find_func_addr(local_map, map, libdl_path, "dlerror")) == NULL) {
+        /* INFO: Android 7.1 and below doesn't have libdl.so loaded in Zygote */
+        LOGW("Failed to find dlerror from libdl.so, will load from linker");

-        free(args);
+        #ifdef __LP64__
+          dlerror_addr = find_func_addr(local_map, map, "/system/bin/linker64", "__dl_dlerror");
+        #else
+          dlerror_addr = find_func_addr(local_map, map, "/system/bin/linker", "__dl_dlerror");
+        #endif
+        if (dlerror_addr == NULL) {
+          LOGE("Find __dl_dlerror");

-        return false;
+          free(args);
+          free_maps(local_map);
+          free_maps(map);
+
+          return false;
+        }
      }

      uintptr_t dlerror_str_addr = remote_call(pid, &regs, (uintptr_t)dlerror_addr, (uintptr_t)libc_return_addr, args, 0);
@@ -196,15 +255,19 @@ bool inject_on_main(int pid, const char *lib_path) {
        LOGE("dlerror str is null");

        free(args);
+        free_maps(local_map);
+        free_maps(map);

        return false;
      }

-      void *strlen_addr = find_func_addr(local_map, map, "libc.so", "strlen");
+      void *strlen_addr = find_func_addr(local_map, map, libc_path, "strlen");
      if (strlen_addr == NULL) {
        LOGE("find strlen");

        free(args);
+        free_maps(local_map);
+        free_maps(map);

        return false;
      }
@@ -216,6 +279,8 @@ bool inject_on_main(int pid, const char *lib_path) {
        LOGE("dlerror len <= 0");

        free(args);
+        free_maps(local_map);
+        free_maps(map);

        return false;
      }
@@ -225,6 +290,8 @@ bool inject_on_main(int pid, const char *lib_path) {
        LOGE("malloc err");

        free(args);
+        free_maps(local_map);
+        free_maps(map);

        return false;
      }
@@ -236,12 +303,33 @@ bool inject_on_main(int pid, const char *lib_path) {
      free(err);
      free(args);

+      free_maps(local_map);
+      free_maps(map);
+
      return false;
    }

    /* call dlsym(handle, "entry") */
-    void *dlsym_addr = find_func_addr(local_map, map, "libdl.so", "dlsym");
-    if (dlsym_addr == NULL) return false;
+    void *dlsym_addr = NULL;
+    if (!libdl_path || (dlsym_addr = find_func_addr(local_map, map, libdl_path, "dlsym")) == NULL) {
+      /* INFO: Android 7.1 and below doesn't have libdl.so loaded in Zygote */
+      LOGW("Failed to find dlsym from libdl.so, will load from linker");
+
+      #ifdef __LP64__
+        dlsym_addr = find_func_addr(local_map, map, "/system/bin/linker64", "__dl_dlsym");
+      #else
+        dlsym_addr = find_func_addr(local_map, map, "/system/bin/linker", "__dl_dlsym");
+      #endif
+      if (dlsym_addr == NULL) {
+        LOGE("find __dl_dlsym");
+
+        free(args);
+        free_maps(local_map);
+        free_maps(map);
+
+        return false;
+      }
+    }

    free_maps(local_map);

@@ -280,10 +368,8 @@ bool inject_on_main(int pid, const char *lib_path) {
    /* call injector entry(start_addr, block_size, path) */
    args[0] = (uintptr_t)start_addr;
    args[1] = block_size;
-    str = push_string(pid, &regs, rezygiskd_get_path());
-    args[2] = (uintptr_t)str;

-    remote_call(pid, &regs, injector_entry, (uintptr_t)libc_return_addr, args, 3);
+    remote_call(pid, &regs, injector_entry, (uintptr_t)libc_return_addr, args, 2);

    free(args);

@@ -319,7 +405,7 @@ bool trace_zygote(int pid) {

  int status;

-  if (ptrace(PTRACE_SEIZE, pid, 0, PTRACE_O_EXITKILL) == -1) {
+  if (ptrace(PTRACE_SEIZE, pid, 0, PTRACE_O_EXITKILL | PTRACE_O_TRACESECCOMP) == -1) {
    PLOGE("seize");

    return false;
@@ -354,6 +440,16 @@ bool trace_zygote(int pid) {
      if (STOPPED_WITH(SIGCONT, 0)) {
        LOGD("received SIGCONT");

+        /* INFO: Due to kernel bugs, fixed in 5.16+, ptrace_message (msg of
+             PTRACE_GETEVENTMSG) may not represent the current state of
+             the process. Because we set some options, which alters the
+             ptrace_message, we need to call PTRACE_SYSCALL to reset the
+             ptrace_message to 0, the default/normal state.
+        */
+        ptrace(PTRACE_SYSCALL, pid, 0, 0);
+
+        WAIT_OR_DIE
+
        ptrace(PTRACE_DETACH, pid, 0, SIGCONT);
      }
    } else {
--- a/loader/src/ptracer/utils.c
+++ b/loader/src/ptracer/utils.c
@@ -6,6 +6,7 @@
 #include <sys/sysmacros.h>
 #include <sys/ptrace.h>
 #include <sys/mman.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/auxv.h>
@@ -19,10 +20,9 @@
 #include <unistd.h>
 #include <linux/limits.h>

-#include "utils.h"
+#include "elf_util.h"

-/* INFO: utils.h must be before logging.h so that it defined LOG_TAG first */
-#include "logging.h"
+#include "utils.h"

 bool switch_mnt_ns(int pid, int *fd) {
  int nsfd, old_nsfd = -1;
@@ -119,8 +119,8 @@ struct maps *parse_maps(const char *filename) {
      path_offset++;
    }

-    maps->maps = (struct map *)realloc(maps->maps, (i + 1) * sizeof(struct map));
-    if (!maps->maps) {
+    struct map *tmp_maps = (struct map *)realloc(maps->maps, (i + 1) * sizeof(struct map));
+    if (!tmp_maps) {
      LOGE("Failed to allocate memory for maps->maps");

      maps->size = i;
@@ -130,6 +130,7 @@ struct maps *parse_maps(const char *filename) {

      return NULL;
    }
+    maps->maps = tmp_maps;

    maps->maps[i].start = addr_start;
    maps->maps[i].end = addr_end;
@@ -312,15 +313,13 @@ void *find_module_return_addr(struct maps *map, const char *suffix) {
  return NULL;
 }

-void *find_module_base(struct maps *map, const char *suffix) {
+void *find_module_base(struct maps *map, const char *file) {
  for (size_t i = 0; i < map->size; i++) {
-    /* TODO: Make it NULL in 1 length path */
    if (map->maps[i].path == NULL) continue;

-    const char *file_name = position_after(map->maps[i].path, '/');
-    if (!file_name) continue;
+    const char *file_path = map->maps[i].path;

-    if (strlen(file_name) < strlen(suffix) || map->maps[i].offset != 0 || strncmp(file_name, suffix, strlen(suffix)) != 0) continue;
+    if (strlen(file_path) != strlen(file) || map->maps[i].offset != 0 || strncmp(file_path, file, strlen(file)) != 0) continue;

    return (void *)map->maps[i].start;
  }
@@ -329,26 +328,6 @@ void *find_module_base(struct maps *map, const char *suffix) {
 }

 void *find_func_addr(struct maps *local_info, struct maps *remote_info, const char *module, const char *func) {
-  void *lib = dlopen(module, RTLD_NOW);
-  if (lib == NULL) {
-    LOGE("failed to open lib %s: %s", module, dlerror());
-
-    return NULL;
-  }
-
-  uint8_t *sym = (uint8_t *)dlsym(lib, func);
-  if (sym == NULL) {
-    LOGE("failed to find sym %s in %s: %s", func, module, dlerror());
-
-    dlclose(lib);
-
-    return NULL;
-  }
-
-  LOGD("sym %s: %p", func, sym);
-
-  dlclose(lib);
-
  uint8_t *local_base = (uint8_t *)find_module_base(local_info, module);
  if (local_base == NULL) {
    LOGE("failed to find local base for module %s", module);
@@ -365,10 +344,30 @@ void *find_func_addr(struct maps *local_info, struct maps *remote_info, const ch

  LOGD("found local base %p remote base %p", local_base, remote_base);

-  uint8_t *addr = (sym - local_base) + remote_base;
-  LOGD("addr %p", addr);
+  ElfImg *mod = ElfImg_create(module, local_base);
+  if (mod == NULL) {
+    LOGE("failed to create elf img %s", module);

-  return addr;
+    return NULL;
+  }
+
+  uint8_t *sym = (uint8_t *)getSymbAddress(mod, func);
+  if (sym == NULL) {
+    LOGE("failed to find symbol %s in %s", func, module);
+
+    ElfImg_destroy(mod);
+
+    return NULL;
+  }
+
+  LOGD("found symbol %s in %s: %p", func, module, sym);
+
+  uintptr_t addr = (uintptr_t)(sym - local_base) + (uintptr_t)remote_base;
+  LOGD("addr %p", (void *)addr);
+
+  ElfImg_destroy(mod);
+
+  return (void *)addr;
 }

 void align_stack(struct user_regs_struct *regs, long preserve) {
@@ -524,6 +523,32 @@ int fork_dont_care() {
  return pid;
 }

+void tracee_skip_syscall(int pid) {
+  struct user_regs_struct regs;
+  if (!get_regs(pid, &regs)) {
+    LOGE("failed to get seccomp regs");
+    exit(1);
+  }
+  regs.REG_SYSNR = -1;
+  if (!set_regs(pid, &regs)) {
+    LOGE("failed to set seccomp regs");
+    exit(1);
+  }
+
+  /* INFO: It might not work, don't check for error */
+#if defined(__aarch64__)
+  int sysnr = -1;
+  struct iovec iov = {
+    .iov_base = &sysnr,
+    .iov_len = sizeof (int),
+  };
+  ptrace(PTRACE_SETREGSET, pid, NT_ARM_SYSTEM_CALL, &iov);
+#elif defined(__arm__)
+  ptrace(PTRACE_SET_SYSCALL, pid, 0, (void*) -1);
+#endif
+
+}
+
 void wait_for_trace(int pid, int *status, int flags) {
  while (1) {
    pid_t result = waitpid(pid, status, flags);
@@ -534,7 +559,21 @@ void wait_for_trace(int pid, int *status, int flags) {
      exit(1);
    }

-    if (!WIFSTOPPED(*status)) {
+    /* INFO: We'll fork there. This will signal SIGCHLD. We just ignore and continue
+               to avoid blocking/not continuing. */
+    if (WSTOPSIG(*status) == SIGCHLD) {
+      LOGI("process %d stopped by SIGCHLD, continue", pid);
+
+      ptrace(PTRACE_CONT, pid, 0, 0);
+
+      continue;
+    } else if (*status >> 8 == (SIGTRAP | (PTRACE_EVENT_SECCOMP << 8))) {
+      tracee_skip_syscall(pid);
+
+      ptrace(PTRACE_CONT, pid, 0, 0);
+
+      continue;
+    } else if (!WIFSTOPPED(*status)) {
      char status_str[64];
      parse_status(*status, status_str, sizeof(status_str));

--- a/loader/src/ptracer/utils.h
+++ b/loader/src/ptracer/utils.h
@@ -37,18 +37,22 @@ void free_maps(struct maps *maps);
  #define REG_SP rsp
  #define REG_IP rip
  #define REG_RET rax
+  #define REG_SYSNR orig_rax
 #elif defined(__i386__)
  #define REG_SP esp
  #define REG_IP eip
  #define REG_RET eax
+  #define REG_SYSNR orig_eax
 #elif defined(__aarch64__)
  #define REG_SP sp
  #define REG_IP pc
  #define REG_RET regs[0]
+  #define REG_SYSNR regs[8]
 #elif defined(__arm__)
  #define REG_SP uregs[13]
  #define REG_IP uregs[15]
  #define REG_RET uregs[0]
+  #define REG_SYSNR uregs[7]
  #define user_regs_struct user_regs
 #endif

@@ -62,6 +66,8 @@ bool set_regs(int pid, struct user_regs_struct *regs);

 void get_addr_mem_region(struct maps *map, uintptr_t addr, char *buf, size_t buf_size);

+const char *position_after(const char *str, const char needle);
+
 void *find_module_return_addr(struct maps *map, const char *suffix);

 void *find_func_addr(struct maps *local_info, struct maps *remote_info, const char *module, const char *func);
--- a/module/build.gradle.kts
+++ b/module/build.gradle.kts
@@ -85,12 +85,14 @@ androidComponents.onVariants { variant ->
        into("lib") {
            from(project(":loader").layout.buildDirectory.file("intermediates/stripped_native_libs/$variantLowered/out/lib"))
        }
+        into("webroot") {
+            from("${rootProject.projectDir}/webroot")
+        }

        val root = moduleDir.get()

        doLast {
            if (file("private_key").exists()) {
-                println("=== Guards the peace of Machikado ===")
                val privateKey = file("private_key").readBytes()
                val publicKey = file("public_key").readBytes()
                val namedSpec = NamedParameterSpec("ed25519")
@@ -112,51 +114,67 @@ androidComponents.onVariants { variant ->
                    }
                }

-                fun getSign(name: String, abi32: String, abi64: String) {
+                /* INFO: Misaki is the file that holds signed hash of
+                           all files of ReZygisk module, to ensure the
+                           zip (runtime and non-runtime) files hasn't
+                           been tampered with.
+                */
+                fun misakiSign() {
+                    sig.initSign(privKey)
+
+                    val filesToProcess = TreeSet<File> { f1, f2 ->
+                        f1.path.replace("\\", "/")
+                            .compareTo(f2.path.replace("\\", "/"))
+                    }
+
+                    root.asFile.walkTopDown().forEach { file ->
+                        if (!file.isFile) return@forEach
+
+                        val fileName = file.name
+                        if (fileName == "misaki.sig") return@forEach
+
+                        filesToProcess.add(file)
+                    }
+
+                    filesToProcess.forEach { file -> file.sha(file) }
+
+                    val misakiSignatureFile = root.file("misaki.sig").asFile
+                    misakiSignatureFile.writeBytes(sig.sign())
+                    misakiSignatureFile.appendBytes(publicKey)
+                }
+
+                fun getSign(name: String, abi: String, is64Bit: Boolean) {
                    val set = TreeSet<Pair<File, File?>> { o1, o2 ->
                        o1.first.path.replace("\\", "/")
                            .compareTo(o2.first.path.replace("\\", "/"))
                    }
+
+                    val archSuffix = if (is64Bit) "64" else "32"
+                    val pathSuffix = if (is64Bit) "lib64" else "lib"
+
                    set.add(Pair(root.file("module.prop").asFile, null))
                    set.add(Pair(root.file("sepolicy.rule").asFile, null))
                    set.add(Pair(root.file("post-fs-data.sh").asFile, null))
                    set.add(Pair(root.file("service.sh").asFile, null))
                    set.add(
                        Pair(
-                            root.file("lib/libzygisk.so").asFile,
-                            root.file("lib/$abi32/libzygisk.so").asFile
+                            root.file("$pathSuffix/libzygisk.so").asFile,
+                            root.file("lib/$abi/libzygisk.so").asFile
                        )
                    )
                    set.add(
                        Pair(
-                            root.file("lib64/libzygisk.so").asFile,
-                            root.file("lib/$abi64/libzygisk.so").asFile
+                            root.file("bin/zygisk-ptrace$archSuffix").asFile,
+                            root.file("lib/$abi/libzygisk_ptrace.so").asFile
                        )
                    )
                    set.add(
                        Pair(
-                            root.file("bin/zygisk-ptrace32").asFile,
-                            root.file("lib/$abi32/libzygisk_ptrace.so").asFile
-                        )
-                    )
-                    set.add(
-                        Pair(
-                            root.file("bin/zygisk-ptrace64").asFile,
-                            root.file("lib/$abi64/libzygisk_ptrace.so").asFile
-                        )
-                    )
-                    set.add(
-                        Pair(
-                            root.file("bin/zygiskd32").asFile,
-                            root.file("bin/$abi32/zygiskd").asFile
-                        )
-                    )
-                    set.add(
-                        Pair(
-                            root.file("bin/zygiskd64").asFile,
-                            root.file("bin/$abi64/zygiskd").asFile
+                            root.file("bin/zygiskd$archSuffix").asFile,
+                            root.file("bin/$abi/zygiskd").asFile
                        )
                    )
+
                    sig.initSign(privKey)
                    set.forEach { it.first.sha(it.second) }
                    val signFile = root.file(name).asFile
@@ -164,21 +182,53 @@ androidComponents.onVariants { variant ->
                    signFile.appendBytes(publicKey)
                }

-                getSign("machikado.arm", "armeabi-v7a", "arm64-v8a")
-                getSign("machikado.x86", "x86", "x86_64")
+                /* INFO: Machikado is the name of files that holds signed hash of
+                           all runtime files of ReZygisk module, to ensure the
+                           runtime files hasn't been tampered with.
+                */
+                println("=== Guards the peace of Machikado ===")
+
+                getSign("machikado.arm64", "arm64-v8a", true)
+                getSign("machikado.arm", "armeabi-v7a", false)
+
+                getSign("machikado.x86_64", "x86_64", true)
+                getSign("machikado.x86", "x86", false)
+
+                fileTree(moduleDir).visit {
+                    if (isDirectory) return@visit
+
+                    val md = MessageDigest.getInstance("SHA-256")
+                    file.forEachBlock(4096) { bytes, size ->
+                        md.update(bytes, 0, size)
+                    }
+
+                    file(file.path + ".sha256").writeText(Hex.encodeHexString(md.digest()))
+                }
+
+                println("===   At the kitsune's wedding   ===")
+
+                misakiSign()
            } else {
                println("no private_key found, this build will not be signed")
-                root.file("machikado.arm").asFile.createNewFile()
-                root.file("machikado.x86").asFile.createNewFile()
-            }

-            fileTree(moduleDir).visit {
-                if (isDirectory) return@visit
-                val md = MessageDigest.getInstance("SHA-256")
-                file.forEachBlock(4096) { bytes, size ->
-                    md.update(bytes, 0, size)
+                root.file("machikado.arm64").asFile.createNewFile()
+                root.file("machikado.arm").asFile.createNewFile()
+
+                root.file("machikado.x86_64").asFile.createNewFile()
+                root.file("machikado.x86").asFile.createNewFile()
+
+                fileTree(moduleDir).visit {
+                    if (isDirectory) return@visit
+
+                    val md = MessageDigest.getInstance("SHA-256")
+                    file.forEachBlock(4096) { bytes, size ->
+                        md.update(bytes, 0, size)
+                    }
+
+                    file(file.path + ".sha256").writeText(Hex.encodeHexString(md.digest()))
                }
-                file(file.path + ".sha256").writeText(Hex.encodeHexString(md.digest()))
+
+                root.file("misaki.sig").asFile.createNewFile()
            }
        }
    }
--- a/module/src/customize.sh
+++ b/module/src/customize.sh
@@ -107,49 +107,91 @@ extract "$ZIPFILE" 'uninstall.sh'    "$MODPATH"
 mv "$TMPDIR/sepolicy.rule" "$MODPATH"

 mkdir "$MODPATH/bin"
-mkdir "$MODPATH/lib"
-mkdir "$MODPATH/lib64"
+mkdir "$MODPATH/webroot"
+
+ui_print "- Extracting webroot"
+unzip -o "$ZIPFILE" "webroot/*" -x "*.sha256" -d "$MODPATH"
+
+CPU_ABIS=$(getprop ro.system.product.cpu.abilist)
+CPU_ABIS=${CPU_ABIS:-$(getprop ro.product.cpu.abilist)}
+
+SUPPORTS_32BIT=false
+SUPPORTS_64BIT=false
+
+if [[ "$CPU_ABIS" == *"x86"* && "$CPU_ABIS" != "x86_64" || "$CPU_ABIS" == *"armeabi"* ]]; then
+  SUPPORTS_32BIT=true
+  ui_print "- Device supports 32-bit"
+fi
+
+if [[ "$CPU_ABIS" == *"x86_64"* || "$CPU_ABIS" == *"arm64-v8a"* ]]; then
+  SUPPORTS_64BIT=true
+  ui_print "- Device supports 64-bit"
+fi
+
+if [ "$SUPPORTS_32BIT" = true ]; then
+  mkdir "$MODPATH/lib"
+fi
+
+if [ "$SUPPORTS_64BIT" = true ]; then
+  mkdir "$MODPATH/lib64"
+fi

 if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then
-  ui_print "- Extracting x86 libraries"
-  extract "$ZIPFILE" 'bin/x86/zygiskd' "$MODPATH/bin" true
-  mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
-  extract "$ZIPFILE" 'lib/x86/libzygisk.so' "$MODPATH/lib" true
-  extract "$ZIPFILE" 'lib/x86/libzygisk_ptrace.so' "$MODPATH/bin" true
-  mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace32"
+  if [ "$SUPPORTS_32BIT" = true ]; then
+    ui_print "- Extracting x86 libraries"
+    extract "$ZIPFILE" 'bin/x86/zygiskd' "$MODPATH/bin" true
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
+    extract "$ZIPFILE" 'lib/x86/libzygisk.so' "$MODPATH/lib" true
+    extract "$ZIPFILE" 'lib/x86/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace32"

-  ui_print "- Extracting x64 libraries"
-  extract "$ZIPFILE" 'bin/x86_64/zygiskd' "$MODPATH/bin" true
-  mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
-  extract "$ZIPFILE" 'lib/x86_64/libzygisk.so' "$MODPATH/lib64" true
-  extract "$ZIPFILE" 'lib/x86_64/libzygisk_ptrace.so' "$MODPATH/bin" true
-  mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace64"
+    extract "$ZIPFILE" 'machikado.x86' "$MODPATH" true
+  fi

-  extract "$ZIPFILE" 'machikado.x86' "$MODPATH" true
-  mv "$MODPATH/machikado.x86" "$MODPATH/machikado"
+  if [ "$SUPPORTS_64BIT" = true ]; then
+    ui_print "- Extracting x64 libraries"
+    extract "$ZIPFILE" 'bin/x86_64/zygiskd' "$MODPATH/bin" true
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
+    extract "$ZIPFILE" 'lib/x86_64/libzygisk.so' "$MODPATH/lib64" true
+    extract "$ZIPFILE" 'lib/x86_64/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace64"
+
+    extract "$ZIPFILE" 'machikado.x86_64' "$MODPATH" true
+  fi
 else
-  ui_print "- Extracting arm libraries"
-  extract "$ZIPFILE" 'bin/armeabi-v7a/zygiskd' "$MODPATH/bin" true
-  mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
-  extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk.so' "$MODPATH/lib" true
-  extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk_ptrace.so' "$MODPATH/bin" true
-  mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace32"
+  if [ "$SUPPORTS_32BIT" = true ]; then
+    ui_print "- Extracting arm libraries"
+    extract "$ZIPFILE" 'bin/armeabi-v7a/zygiskd' "$MODPATH/bin" true
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
+    extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk.so' "$MODPATH/lib" true
+    extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace32"

-  ui_print "- Extracting arm64 libraries"
-  extract "$ZIPFILE" 'bin/arm64-v8a/zygiskd' "$MODPATH/bin" true
-  mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
-  extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk.so' "$MODPATH/lib64" true
-  extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk_ptrace.so' "$MODPATH/bin" true
-  mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace64"
+    extract "$ZIPFILE" 'machikado.arm' "$MODPATH" true
+  fi

-  extract "$ZIPFILE" 'machikado.arm' "$MODPATH" true
-  mv "$MODPATH/machikado.arm" "$MODPATH/machikado"
+  if [ "$SUPPORTS_64BIT" = true ]; then
+    ui_print "- Extracting arm64 libraries"
+    extract "$ZIPFILE" 'bin/arm64-v8a/zygiskd' "$MODPATH/bin" true
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
+    extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk.so' "$MODPATH/lib64" true
+    extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace64"
+
+    extract "$ZIPFILE" 'machikado.arm64' "$MODPATH" true
+  fi
 fi

 ui_print "- Setting permissions"
 set_perm_recursive "$MODPATH/bin" 0 0 0755 0755
-set_perm_recursive "$MODPATH/lib" 0 0 0755 0644 u:object_r:system_lib_file:s0
-set_perm_recursive "$MODPATH/lib64" 0 0 0755 0644 u:object_r:system_lib_file:s0
+
+if [ "$SUPPORTS_32BIT" = true ]; then
+  set_perm_recursive "$MODPATH/lib" 0 0 0755 0644 u:object_r:system_lib_file:s0
+fi
+
+if [ "$SUPPORTS_64BIT" = true ]; then
+  set_perm_recursive "$MODPATH/lib64" 0 0 0755 0644 u:object_r:system_lib_file:s0
+fi

 # If Huawei's Maple is enabled, system_server is created with a special way which is out of Zygisk's control
 HUAWEI_MAPLE_ENABLED=$(grep_prop ro.maple.enable)
--- a/module/src/post-fs-data.sh
+++ b/module/src/post-fs-data.sh
@@ -46,5 +46,13 @@ if [ -f $MODDIR/lib/libzygisk.so ];then
  chcon u:object_r:system_file:s0 $TMP_PATH/lib/libzygisk.so
 fi

-[ "$DEBUG" = true ] && export RUST_BACKTRACE=1
-./bin/zygisk-ptrace64 monitor &
+CPU_ABIS=$(getprop ro.system.product.cpu.abilist)
+CPU_ABIS=${CPU_ABIS:-$(getprop ro.product.cpu.abilist)}
+
+if [[ "$CPU_ABIS" == *"arm64-v8a"* || "$CPU_ABIS" == *"x86_64"* ]]; then
+  ./bin/zygisk-ptrace64 monitor &
+else
+  # INFO: Device is 32-bit only
+
+  ./bin/zygisk-ptrace32 monitor &
+fi
--- a/module/src/sepolicy.rule
+++ b/module/src/sepolicy.rule
@@ -10,6 +10,8 @@ allow zygote su {lnk_file file} read

 allow zygote adb_data_file dir search
 allow zygote adb_data_file file *
+allow zygote proc file {read open}
+allow zygote nsfs file {read open}
 allow zygote zygote process execmem
 allow system_server system_server process execmem
 allow zygote tmpfs file *
--- a/webroot/LICENSE
+++ b/webroot/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
--- a/webroot/assets/action.svg
+++ b/webroot/assets/action.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M240-160q-33 0-56.5-23.5T160-240q0-33 23.5-56.5T240-320q33 0 56.5 23.5T320-240q0 33-23.5 56.5T240-160Zm240 0q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm240 0q-33 0-56.5-23.5T640-240q0-33 23.5-56.5T720-320q33 0 56.5 23.5T800-240q0 33-23.5 56.5T720-160ZM240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400ZM240-640q-33 0-56.5-23.5T160-720q0-33 23.5-56.5T240-800q33 0 56.5 23.5T320-720q0 33-23.5 56.5T240-640Zm240 0q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Zm240 0q-33 0-56.5-23.5T640-720q0-33 23.5-56.5T720-800q33 0 56.5 23.5T800-720q0 33-23.5 56.5T720-640Z"/></svg>
--- a/webroot/assets/back.svg
+++ b/webroot/assets/back.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="36px" viewBox="0 -960 960 960" width="36px" fill="#e8eaed"><path d="m287-446.67 240 240L480-160 160-480l320-320 47 46.67-240 240h513v66.66H287Z"/></svg>
--- a/webroot/assets/close.svg
+++ b/webroot/assets/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#e8eaed"><path d="m256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z"/></svg>
--- a/webroot/assets/content.svg
+++ b/webroot/assets/content.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#e8eaed"><path d="M320-213.33q-27 0-46.83-19.84Q253.33-253 253.33-280v-533.33q0-27 19.84-46.84Q293-880 320-880h413.33q27 0 46.84 19.83Q800-840.33 800-813.33V-280q0 27-19.83 46.83-19.84 19.84-46.84 19.84H320Zm0-66.67h413.33v-533.33H320V-280ZM186.67-80q-27 0-46.84-19.83Q120-119.67 120-146.67v-600h66.67v600h480V-80h-480ZM320-280v-533.33V-280Z"/></svg>
--- a/webroot/assets/delete.svg
+++ b/webroot/assets/delete.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#e8eaed"><path d="M267.33-120q-27.5 0-47.08-19.58-19.58-19.59-19.58-47.09V-740H160v-66.67h192V-840h256v33.33h192V-740h-40.67v553.33q0 27-19.83 46.84Q719.67-120 692.67-120H267.33Zm425.34-620H267.33v553.33h425.34V-740Zm-328 469.33h66.66v-386h-66.66v386Zm164 0h66.66v-386h-66.66v386ZM267.33-740v553.33V-740Z"/></svg>
--- a/webroot/assets/ec-icon.svg
+++ b/webroot/assets/ec-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="60px" viewBox="0 -960 960 960" width="60px" fill="#ba1a1a"><path d="M92-120q-9 0-15.65-4.13Q69.7-128.25 66-135q-4.17-6.6-4.58-14.3Q61-157 66-165l388-670q5-8 11.5-11.5T480-850q8 0 14.5 3.5T506-835l388 670q5 8 4.58 15.7-.41 7.7-4.58 14.3-3.7 6.75-10.35 10.87Q877-120 868-120H92Zm392.18-117q12.82 0 21.32-8.68 8.5-8.67 8.5-21.5 0-12.82-8.68-21.32-8.67-8.5-21.5-8.5-12.82 0-21.32 8.68-8.5 8.67-8.5 21.5 0 12.82 8.68 21.32 8.67 8.5 21.5 8.5Zm0-111q12.82 0 21.32-8.63 8.5-8.62 8.5-21.37v-164q0-12.75-8.68-21.38-8.67-8.62-21.5-8.62-12.82 0-21.32 8.62-8.5 8.63-8.5 21.38v164q0 12.75 8.68 21.37 8.67 8.63 21.5 8.63Z"/></svg>
--- a/webroot/assets/error.svg
+++ b/webroot/assets/error.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M480-280q17 0 28.5-11.5T520-320q0-17-11.5-28.5T480-360q-17 0-28.5 11.5T440-320q0 17 11.5 28.5T480-280Zm-40-160h80v-240h-80v240Zm40 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
--- a/webroot/assets/expand.svg
+++ b/webroot/assets/expand.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="m480-340 180-180-57-56-123 123-123-123-57 56 180 180Zm0 260q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
--- a/webroot/assets/home.svg
+++ b/webroot/assets/home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M240-200h120v-240h240v240h120v-360L480-740 240-560v360Zm-80 80v-480l320-240 320 240v480H520v-240h-80v240H160Zm320-350Z"/></svg>
--- a/webroot/assets/mark.svg
+++ b/webroot/assets/mark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q54 0 104-17.5t92-50.5L228-676q-33 42-50.5 92T160-480q0 134 93 227t227 93Zm252-124q33-42 50.5-92T800-480q0-134-93-227t-227-93q-54 0-104 17.5T284-732l448 448Z"/></svg>
--- a/webroot/assets/module.svg
+++ b/webroot/assets/module.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M627-520h133v-160H627v160Zm-214 0h133v-160H413v160Zm-213 0h133v-160H200v160Zm0 240h133v-160H200v160Zm213 0h133v-160H413v160Zm214 0h133v-160H627v160Zm-507 0v-400q0-33 23.5-56.5T200-760h560q33 0 56.5 23.5T840-680v400q0 33-23.5 56.5T760-200H200q-33 0-56.5-23.5T120-280Z"/></svg>
--- a/webroot/assets/settings.svg
+++ b/webroot/assets/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm70-80h79l14-106q31-8 57.5-23.5T639-327l99 41 39-68-86-65q5-14 7-29.5t2-31.5q0-16-2-31.5t-7-29.5l86-65-39-68-99 42q-22-23-48.5-38.5T533-694l-13-106h-79l-14 106q-31 8-57.5 23.5T321-633l-99-41-39 68 86 64q-5 15-7 30t-2 32q0 16 2 31t7 30l-86 65 39 68 99-42q22 23 48.5 38.5T427-266l13 106Zm42-180q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Zm-2-140Z"/></svg>
--- a/webroot/assets/tick.svg
+++ b/webroot/assets/tick.svg
@@ -0,0 +1,3 @@
+<svg class="brightc" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+  <path d="m424-296 282-282-56-56-226 226-114-114-56 56 170 170Zm56 216q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/>
+</svg>
--- a/webroot/assets/warn.svg
+++ b/webroot/assets/warn.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M480-280q17 0 28.5-11.5T520-320q0-17-11.5-28.5T480-360q-17 0-28.5 11.5T440-320q0 17 11.5 28.5T480-280Zm-40-160h80v-240h-80v240Zm40 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
--- a/webroot/assets_light/action.svg
+++ b/webroot/assets_light/action.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="M240-160q-33 0-56.5-23.5T160-240q0-33 23.5-56.5T240-320q33 0 56.5 23.5T320-240q0 33-23.5 56.5T240-160Zm240 0q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm240 0q-33 0-56.5-23.5T640-240q0-33 23.5-56.5T720-320q33 0 56.5 23.5T800-240q0 33-23.5 56.5T720-160ZM240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400ZM240-640q-33 0-56.5-23.5T160-720q0-33 23.5-56.5T240-800q33 0 56.5 23.5T320-720q0 33-23.5 56.5T240-640Zm240 0q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Zm240 0q-33 0-56.5-23.5T640-720q0-33 23.5-56.5T720-800q33 0 56.5 23.5T800-720q0 33-23.5 56.5T720-640Z"/>
+</svg>
--- a/webroot/assets_light/home.svg
+++ b/webroot/assets_light/home.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="M240-200h120v-240h240v240h120v-360L480-740 240-560v360Zm-80 80v-480l320-240 320 240v480H520v-240h-80v240H160Zm320-350Z"/>
+</svg>
--- a/webroot/assets_light/module.svg
+++ b/webroot/assets_light/module.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="M627-520h133v-160H627v160Zm-214 0h133v-160H413v160Zm-213 0h133v-160H200v160Zm0 240h133v-160H200v160Zm213 0h133v-160H413v160Zm214 0h133v-160H627v160Zm-507 0v-400q0-33 23.5-56.5T200-760h560q33 0 56.5 23.5T840-680v400q0 33-23.5 56.5T760-200H200q-33 0-56.5-23.5T120-280Z"/>
+</svg>
--- a/webroot/assets_light/settings.svg
+++ b/webroot/assets_light/settings.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm70-80h79l14-106q31-8 57.5-23.5T639-327l99 41 39-68-86-65q5-14 7-29.5t2-31.5q0-16-2-31.5t-7-29.5l86-65-39-68-99 42q-22-23-48.5-38.5T533-694l-13-106h-79l-14 106q-31 8-57.5 23.5T321-633l-99-41-39 68 86 64q-5 15-7 30t-2 32q0 16 2 31t7 30l-86 65 39 68 99-42q22 23 48.5 38.5T427-266l13 106Zm42-180q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Zm-2-140Z"/>
+</svg>
--- a/webroot/css/error.css
+++ b/webroot/css/error.css
@@ -0,0 +1,56 @@
+.e-container {
+  background-color: black;
+  z-index: 30;
+  position: fixed;
+  top: 0;
+  bottom: 0; 
+  left: 0; 
+  right: 0; 
+  color: #fff;
+}
+
+.e-main {
+  background-color: black;
+  color: #fff;
+}
+
+.e-wrap {
+  display: flex;
+  align-items: center;
+  overflow: auto;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+} 
+
+.e-bg {
+  background-color: black;
+  color: #fff;
+}
+
+.e-card {
+  margin: 30px;
+  color: #fff;
+}
+
+.e-font {
+  color: #ba1a1a;
+}
+
+.e-button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 120px;
+  height: 40px;
+  border-radius: 30px;
+  background-color: #ba1a1a;
+  color: black;
+  transition: transform 0.1s ease-in-out;
+}
+
+.e-button:active {
+  transform: scale(90%) 
+}
--- a/webroot/css/icons.css
+++ b/webroot/css/icons.css
@@ -0,0 +1,62 @@
+/* Dark */
+#ni_home {
+  background: url(../assets/home.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
+
+#ni_modules {
+  background: url(../assets/module.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
+
+#ni_actions {
+  background: url(../assets/action.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
+
+#ni_settings {
+  background: url(../assets/settings.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
+
+#ec_icon {
+  background: url(../assets/ec-icon.svg);
+  z-index: 40;
+}
+
+/* Light */
+#ni_home.light {
+  background: url(../assets_light/home.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
+
+#ni_modules.light {
+  background: url(../assets_light/module.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
+
+#ni_actions.light {
+  background: url(../assets_light/action.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
+
+#ni_settings.light {
+  background: url(../assets_light/settings.svg);
+  width: 24px;
+  height: 24px;
+  z-index: 10;
+}
--- a/webroot/css/index.css
+++ b/webroot/css/index.css
@@ -0,0 +1,514 @@
+:root {
+  --background: #181c20;
+  --font: #fff;
+  --desc: #c9c9c9;
+  --bright: #8d1d19;
+  --dim: #1d2327;
+  --error: #8d1d19;
+  --icon: #48565e;
+  --icon-bc: #2b3338;
+  --small-card: var(--icon-bc);
+  --button: var(--background);
+  --desktop-navbar: #252b31;
+  --desktop-navicon: #333d42;
+  /* Locked Color */
+  --lock-desc: #c9c9c9;
+  --lock: #fff;
+  --font-family: 'Poppins', sans-serif;
+}
+
+* {
+  background-color: var(--background);
+  color: var(--font);
+  font-family: var(--font-family)
+}
+
+body {
+  margin: 0;
+}
+
+a {
+  text-decoration: none !important;
+}
+
+/* Components */
+.radios input[type=radio] {
+  display: none;
+}
+
+.radio input[type=radio] {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.not_avaliable {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 1.2em;
+  text-align: center;
+  top: 0; left: 30px; right: 30px; bottom: 0;
+}
+
+.load_screen {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  background: var(--background);
+  z-index: 10;
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
+
+.full_screen {
+  position: fixed;
+  overflow-y: scroll;
+  z-index: 10;
+  top: 0; bottom: 0; left: 0; right: 0;
+  transition: top 0.35s ease-in-out;
+}
+
+.loader {
+  border: 6px solid var(--icon-bc);
+  border-top: 6px solid var(--icon);
+  border-radius: 50%;
+  width: 3em;
+  height: 3em;
+  animation: spin 0.8s linear infinite;
+}
+
+.header {
+  display: flex;
+  position: fixed;
+  align-items: center;
+  justify-content: space-between;
+  left: 0;
+  right: 0;
+  padding: 20px 25px;
+  font-size: 20px;
+  border-bottom: #585b5d solid 1px;
+  z-index: 5;
+}
+
+.panel {
+  display: none;
+  animation: fade-out 0.2s;
+}
+
+.navbar {
+  display: flex;
+  position: fixed;
+  align-items: center;
+  justify-content: space-between;
+  background-color: var(--dim);
+  left: 0; right: 0; bottom: 0;
+  padding: 25px 25px;
+  font-size: 20px;
+}
+
+.navtitle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: small;
+  margin-top: 8px;
+  opacity: 1;
+}
+
+.navhidden {
+  visibility: hidden;
+}
+
+.navicon {
+  background: var(--small-card);
+  display: flex;
+  width: 0;
+  height: 30px;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50px;
+  animation: closeNav 0.15s;
+}
+
+.card {
+  margin: 0 15px 10px 15px;
+  padding: 15px 15px;
+  border-radius: 15px;
+  color: var(--lock);
+}
+
+.content {
+  padding-bottom: 5px;
+}
+
+.desc {
+  color: var(--desc);
+}
+
+.liste {
+  justify-content: space-between;
+  align-self: center;
+  display: flex;
+}
+
+.center {
+  justify-content: center;
+  align-self: center;
+  display: flex;
+}
+
+.list {
+  max-height: 25px;
+  overflow-y: hidden; 
+  transition: max-height 0.25s ease;
+}
+
+.full {
+  max-height: 100%;
+}
+
+.expander {
+  transform: rotate(0deg);
+  transition: 0.2s ease-out;
+}
+
+.button_list {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  column-gap: 20px;
+}
+
+.button {
+  padding: 1em 0 1em 0;
+  border-radius: 30px;
+  transition: transform 0.1s ease-in-out;
+  background-color: var(--button);
+}
+
+.button:active {
+  transform: scale(90%) 
+}
+
+.small_card {
+  background: var(--small-card);
+  border-radius: 15px;
+  padding: 5px 15px 0 15px;
+  margin: 15px 15px 0 15px;
+  padding-bottom: 5px;
+}
+
+.small_card_bg {
+  background: var(--small-card);
+}
+
+.icon_animation {
+  transition: transform 0.05s ease-in-out;
+}
+
+.icon_animation:active {
+  transform: scale(80%) 
+}
+
+.element_animation {
+  transition: transform 0.15s ease-in-out;
+}
+
+.element_animation:active {
+  transform: scale(95%) 
+}
+
+.card_animation {
+  transition: transform 0.05s ease-in-out;
+}
+
+.card_animation:active {
+  transform: scale(95%) 
+}
+
+.errorh_textarea {
+  resize: none; 
+  border: none;
+  outline: none;
+  font-size: 14px;
+  padding-bottom: 25px;
+  font-family: monospace, monospace;
+  position: fixed;
+  bottom: 7em;
+  top: 15.2em;
+  left: 1em;
+  right: 1em;
+}
+
+.errorh_button_container {
+  position: fixed;
+  top: 5.75em;
+  left: 1em;
+  right: 1em;
+  display: grid;
+  grid-template-columns: 1fr;
+  column-gap: 1em;
+}
+
+.errorh_button {
+  border-radius: 25px;
+  background: var(--small-card);
+  display: flex;
+  padding: 0.7em;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 1em;
+  cursor: pointer;
+  transition: transform 0.05s ease-in-out;
+  user-select: none;
+}
+
+#errorh_small_panel_header {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+}
+
+.errorh_button:active {
+  transform: scale(80%) 
+}
+
+/* Card type */
+.bright {
+  border: 5px solid var(--bright);
+  background: var(--bright);
+}
+
+.brightc {
+  background: var(--bright);
+  word-break: break-word;
+}
+
+.dim {
+  border: 5px solid var(--dim);
+  background: var(--dim);
+}
+
+.dimc {
+  background: var(--dim);
+  word-break: break-word;
+}
+
+.nav_dimc {
+  background: var(--dim);
+  word-break: break-word;
+}
+
+/* Locked */
+.lock {
+  color: var(--lock);
+}
+
+.lockd {
+  color: var(--lock-desc);
+}
+
+/* Switch */
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 60px;
+  height: 34px;
+  margin-left: 10px;
+}
+
+.switch input { 
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0; left: 0; right: 0; bottom: 0;
+  background-color: var(--button);
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+.slider:before {
+  position: absolute;
+  content: "";
+  height: 23px;
+  width: 23px;
+  left: 6px;
+  bottom: 6px;
+  background-color: var(--desc);
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+input:checked + .slider:before {
+  -webkit-transform: translateX(26px);
+  -ms-transform: translateX(26px);
+  transform: translateX(26px);
+}
+
+/* Rounded sliders */
+.slider.round {
+  border-radius: 34px;
+}
+
+.slider.round:before {
+  border-radius: 50%;
+}
+
+/* Responsive CSS */
+@media only screen and (max-width: 600px) {
+  .button_list {
+    display: grid;
+    grid-template-columns: 1fr;
+    column-gap: 20px;
+  }
+  .button {
+    padding: 1em 0 1em 0;
+    border-radius: 30px;
+    margin: 0.6em 0 0.6em;
+    transition: transform 0.15s ease-in-out;
+    background-color: var(--button);
+  }
+}
+
+/* Show set */
+.panel.show {
+  margin-bottom: 119px;
+  display: block;
+  animation: fade-in 0.2s;
+}
+
+.panel.showback {
+  margin-bottom: 119px;
+  display: block;
+  animation: fade-in 0.2s;
+  z-index: 30;
+}
+
+.navicon.show {
+  width: 65px;
+  animation: openNav 0.15s;
+}
+
+@media (min-width:961px)  {
+  .navbar {
+    background-color: var(--desktop-navbar);
+    transform: scale(0.85);
+    left: auto; 
+    right: auto;
+    margin-bottom: 15px;
+    border-radius: 60px;
+    padding: 10px 10px;
+  }
+  .navtitle {
+    display: none;
+  }
+  .navicon_support {
+    border-radius: 60px;
+  }
+  #navbar_support_div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .navicon {
+    background: var(--desktop-navicon);
+    height: 65px;
+    animation: closeNavDesktop 0.15s;
+  }
+  .navicon.show {
+    animation: openNavDesktop 0.15s;
+  }
+  .nav_dimc {
+    background: var(--desktop-navbar);
+  }
+  .errorh_button_container {
+    grid-template-columns: 1fr 1fr;
+  }
+  .errorh_textarea {
+    top: 11em;
+  }
+  .errorh_button {
+    margin-bottom: 0;
+  }
+}
+
+/* Animation KeyFrames */
+@keyframes fade-in {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes fade-out {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+@keyframes closeNav {
+  0% {
+    width: 65px;
+  }
+  75% {
+    opacity: 0;
+  }
+  100% {
+    width: 0px;
+  }
+}
+
+@keyframes openNav {
+  0% {
+    width: 0px;
+  }
+  75% {
+    opacity: 1;
+  }
+  100% {
+    width: 65px;
+  }
+}
+
+@keyframes closeNavDesktop {
+  0% {
+    transform: scale(1);
+  }
+  75% {
+    opacity: 0;
+  }
+  100% {
+    transform: scale(0);
+  }
+}
+@keyframes openNavDesktop {
+  0% {
+    transform: scale(0);
+  }
+  75% {
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+  }
+}
--- a/webroot/fonts/header.css
+++ b/webroot/fonts/header.css
@@ -0,0 +1,4 @@
+@font-face {
+  font-family: "Poppins";
+  src: url("./poppins.ttf");
+}
--- a/webroot/fonts/poppins.ttf
+++ b/webroot/fonts/poppins.ttf
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -0,0 +1,381 @@
+<!DOCTYPE html>
+<html id="main_html" lang="en" dir="none">
+  <head>
+    <meta name="viewport" content="initial-scale=1, width=device-width" />
+    <meta name="viewport" content="viewport-fit=cover" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <meta id="cache-navbar-previous" />
+    <meta id="cache-page-small-previous" />
+    <meta id="cache-fallback-open" />
+
+    <link rel="stylesheet" href="fonts/header.css">
+    <link rel="stylesheet" href="css/index.css">
+    <link rel="stylesheet" href="css/error.css">
+    <link rel="stylesheet" href="css/icons.css">
+
+    <script>
+      localStorage.setItem('/system/boot-time', String(Date.now()))
+    </script>
+    <script src="js/errorCatcher.js" type="module"></script>
+    <script src="js/errorScreen.js" type="module"></script>
+    <script src="js/browserRedirect.js" type="module"></script>
+    <script src="js/smallPage/theme.js" type="module"></script>
+    <script src="js/smallPage/language.js" type="module"></script>
+    <script src="js/smallPage/errorHistory.js" type="module"></script>
+    <script src="js/restoreError.js" type="module"></script>
+    <script src="js/navbar.js" type="module"></script>
+    <script src="js/monitorActions.js" type="module"></script>
+    <script src="js/switcher/fontChanger.js" type="module"></script>
+    <script src="js/main.js" type="module"></script>
+  </head>
+  <body id="main_body">
+    <!-- INFO: Error screen -->
+    <div id="fatal-error-screen" class="e-container" style="display: none;">
+      <div class="e-bg e-wrap">
+        <div class="e-bg e-card e-main">
+          <img class="e-bg" src="./assets/ec-icon.svg" style="margin-bottom: 10px;"/>
+          <div class="e-bg">
+            Your WebUI is corrupt. It can't be trusted and may not work properly.
+          </div>
+  
+          <div class="e-bg" style="margin-top: 15px;">
+            Please click the copy log button below and visit
+            <div class="e-bg e-font" credit-link="t.me/performancorg">t.me/performancorg</div>
+            for support.
+          </div>
+  
+          <div id="esc-copy-button" class="e-button" style="margin-top: 25px;">COPY LOG</div>
+          <textarea id="esc-log" style="display: none;"></textarea>
+        </div>
+      </div>
+    </div>
+
+    <!-- INFO: Loading screen -->
+    <div id="loading_screen" class="load_screen">
+      <div id="backport_errorh" class="loader"></div>
+    </div>
+
+    <!-- INFO: Home page -->
+    <div id="panel_home" class="panel">
+      <div class="header">ReZygisk</div>
+      <div style="padding: 45px 0px;"></div>
+
+      <!-- INFO: Status card -->
+      <div id="info_card" class="bright card list">
+        <div class="brightc" style="display: flex; align-items: center;">
+          <div id="rezygisk_icon_state" class="brightc" style="margin-bottom: 1px;">
+            <img class="brightc" src="assets/mark.svg">
+          </div>
+          <div id="rezygisk_state" class="brightc content lock" style="font-size: 1.2em; padding-bottom: 4px; padding-left: 5px;">
+            Unknown
+          </div>
+        </div>
+      </div>
+
+      <!-- INFO: Info card -->
+      <div class="dim card">
+        <div class="dimc" style="margin-bottom: 14px;">
+          <div class="dimc" style="font-size: 0.8em">ROM / Kernel</div>
+        </div>
+
+        <div id="android_version" class="dimc">
+          <div class="dimc" style="font-size: 1.1em;">Android</div>
+          <div class="dimc desc" id="android_version_div" style="font-size: 0.9em; line-height: 1.05em;">Unknown</div>
+        </div>
+        <div id="kernel_version" class="dimc" style="margin-top: 4px;">
+          <div class="dimc" style="font-size: 1.1em;">Kernel</div>
+          <div class="dimc desc" id="kernel_version_div" style="font-size: 0.9em; line-height: 1.05em;">Unknown</div>
+        </div>
+
+        <div class="dimc" style="margin-top: 18px; margin-bottom: 14px;">
+          <div class="dimc" style="font-size: 0.8em;">Root / ReZygisk</div>
+        </div>
+
+        <div class="dimc content">
+          <div id="version_info_title" class="dimc" style="font-size: 1.1em;">Version</div>
+          <div class="dimc desc" id="version" style="font-size: 0.9em; line-height: 1.05em;">Unknown</div>
+        </div>
+        <div class="dimc content">
+          <div id="root_info_title" class="dimc" style="font-size: 1.1em;">Root Implementation</div>
+          <div class="dimc desc" id="root_impl" style="font-size: 0.9em; line-height: 1.05em;">Unknown</div>
+        </div>
+
+        <div class="dimc" style="margin-top: 12px; margin-bottom: 14px;">
+          <div class="dimc" style="font-size: 0.8em">Zygotes</div>
+        </div>
+
+        <div id="zygote32" class="dimc content">
+          <div class="dimc" style="font-size: 1.1em;">Zygote32</div>
+          <div class="dimc desc" id="zygote32_status" style="font-size: 0.9em; line-height: 1.05em;">Unknown</div>
+        </div>
+        <div id="zygote64" class="dimc">
+          <div class="dimc" style="font-size: 1.1em;">Zygote64</div>
+          <div class="dimc desc" id="zygote64_status" style="font-size: 0.9em; line-height: 1.05em;">Unknown</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- INFO: Module page -->
+    <div id="panel_modules" class="panel">
+      <div id="panel_modules_header" class="header">Modules</div>
+      <div style="padding: 45px 0px;"></div>
+      <div id="modules_list" style="width: 100%; height: fit-content; display: grid;">
+        <div id="modules_list_not_avaliable" class="not_avaliable">
+          No modules using Zygisk here.
+        </div>
+        <!-- N/A -->
+      </div>
+    </div>
+
+    <!-- INFO: Action page -->
+    <div id="panel_actions" class="panel">
+      <div id="panel_actions_header" class="header">Actions</div>
+      <div style="padding: 45px 0px;"></div>
+      <!-- INFO: Settings card body (monitor) -->
+      <div id="monitor" class="dimc" style="display: block; margin: 0 15px 0 15px; border-radius: 20px;">
+        <div class="dimc liste" style="padding: 30px 22px 30px; border-radius: 20px;">
+          <div id="monitor_title" class="dimc" style="font-size: 1.22em;">Monitor</div>
+          <div id="monitor_status" class="dimc" style="font-size: 1.1em;">Unknown</div>
+        </div>
+
+        <div class="small_card_bg" style="padding: 25px 20px 25px 20px; border-radius: 20px;">
+          <div class="small_card_bg button_list">
+            <div id="monitor_stop_button" class="center button">Stop</div>
+            <div id="monitor_start_button" class="center button">Start</div>
+            <div id="monitor_pause_button" class="center button">Pause</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- INFO: Settings page -->
+    <div id="panel_settings" class="panel">
+      <div id="panel_settings_header" class="header">Settings</div>
+      <div style="padding: 40px 0px;"></div>
+      <!-- INFO: Enable system font option -->
+      <div class="small_card dimc" style="margin-top: 15px; justify-content: space-between; display: flex; align-items: center;">
+        <div class="dimc" style="display: inline-block; width: 80%;">
+          <div id="sys_font_option_title" class="dimc content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 2px;">
+            Enable system font
+          </div>
+          <div id="sys_font_option_desc" class="dimc desc" style="font-size: 0.9em; padding-left: 5px; padding-bottom: 6px;">
+            This option will enable system font in current WebUI. NOTE: May not be compatible with FlipFont
+          </div>
+        </div>
+
+        <label class="switch dimc">
+          <input id="font_switcher" type="checkbox">
+          <span class="slider round"></span>
+        </label>
+      </div>
+
+      <!-- INFO: Enable light theme option -->
+      <div id="theme_page_toggle" class="small_card dimc card_animation" style="margin-top: 15px; justify-content: space-between; display: flex; align-items: center;">
+        <div class="dimc" style="display: inline-block;">
+          <div id="sys_theme_option_title" class="dimc content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 2px;">
+            System theme
+          </div>
+          <div id="sys_theme_option_desc" class="dimc desc" style="font-size: 0.9em; padding-left: 5px; padding-bottom: 6px;">
+            Choose your system theme for current WebUI
+          </div>
+        </div>
+      </div>
+
+      <!-- INFO: Change language -->
+      <div id="lang_page_toggle" class="small_card dimc card_animation" style="margin-top: 15px; justify-content: space-between; display: flex; align-items: center;">
+        <div class="dimc" style="display: inline-block;">
+          <div id="sys_lang_option_title" class="dimc content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 2px;">
+            Change language
+          </div>
+          <div id="sys_lang_option_desc" class="dimc desc" style="font-size: 0.9em; padding-left: 5px; padding-bottom: 6px;">
+            Change to your new language
+          </div>
+        </div>
+      </div>
+
+      <!-- INFO: Error history -->
+      <div id="errorh_page_toggle" class="small_card dimc card_animation" style="margin-top: 15px; justify-content: space-between; display: flex; align-items: center;">
+        <div class="dimc" style="display: inline-block;">
+          <div id="sys_errorh_title" class="dimc content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 2px;">
+            Error History
+          </div>
+          <div id="sys_errorh_desc" class="dimc desc" style="font-size: 0.9em; padding-left: 5px; padding-bottom: 6px;">
+            View all of your error log
+          </div>
+        </div>
+      </div>
+
+      <!-- INFO: Credit card -->
+      <div class="dim card" style="margin-top: 15px;">
+        <div class="dimc content">
+          <div id="mcre_title" class="dimc" style="font-size: 1.1em">Module Developer</div>
+          <div  credit-link="github.com/PerformanC" class="dimc desc" style="font-size: 0.9em; margin-top: 3px; cursor: pointer;">
+            The PerformanC Organization
+          </div>
+        </div>
+
+        <div class="dimc content" style="margin-top: 6px;">
+          <div id="omcre_title" class="dimc" style="font-size: 1.1em">Original Module Developer</div>
+          <div class="dimc" style="font-size: 0.9em; margin-top: 3px; align-items: center; display: flex;">
+            <div credit-link="github.com/Dr-TSNG" class="dimc desc" style="cursor: pointer;">
+              Nullptr
+            </div>
+            <div class="dimc desc">,</div>
+            <div credit-link="github.com/5ec1cff" class="dimc desc" style="margin-left: 2px; cursor: pointer;">
+              5ec1cff
+            </div>
+          </div>
+        </div>
+
+        <div class="dimc" style="margin-top: 6px;">
+          <div id="webcre_title" class="dimc" style="font-size: 1.1em">WebUI Developer</div>
+          <div credit-link="github.com/RainyXeon" class="dimc desc" style="font-size: 0.9em; margin-top: 3px; cursor: pointer;">
+            RainyXeon
+          </div>
+        </div>
+      </div>
+
+      <!-- INFO: License card -->
+      <div class="dim card" style="margin-top: 15px;">
+        <div class="dimc content">
+          <div id="mlic_title" class="dimc" style="font-size: 1.1em">Module License</div>
+          <div class="dimc desc" style="font-size: 0.9em; margin-top: 3px;">GPL (Nullptr), BSD 2-Clause</div>
+        </div>
+
+        <div class="dimc" style="margin-top: 6px;">
+          <div id="mweb_title" class="dimc" style="font-size: 1.1em">WebUI License</div>
+          <div class="dimc desc" style="font-size: 0.9em; margin-top: 3px;">BSD 2-Clause</div>
+        </div>
+      </div>
+
+    </div>
+
+    <!-- INFO: System theme small page -->
+    <div id="small_panel_theme" class="panel">
+      <div class="header" style="padding-left: 20px; display: flex; align-items: center; justify-content: initial;">
+        <div id="sp_theme_close" style="width: 36px; height: 36px; margin-right: 6px;">
+          <img src="./assets/back.svg"/>
+        </div>
+        <div id="small_panel_theme_title">Theme</div>
+      </div>
+      <div style="padding: 47px 0px;"></div>
+      <div style="width: 100%; height: fit-content;">
+        <div theme-data="amoled" class="dim card card_animation" style="padding: 25px 15px; cursor: pointer;">
+          <div theme-data="amoled" id="small_panel_theme_amoled_option" class="dimc" style="font-size: 1.1em;">Amoled</div>
+        </div>
+        <div theme-data="dark" class="dim card card_animation" style="padding: 25px 15px; cursor: pointer;">
+          <div theme-data="dark" id="small_panel_theme_dark_option" class="dimc" style="font-size: 1.1em;">Dark</div>
+        </div>
+        <div theme-data="light" class="dim card card_animation" style="padding: 25px 15px; cursor: pointer;">
+          <div theme-data="light" id="small_panel_theme_light_option" class="dimc" style="font-size: 1.1em;">Light</div>
+        </div>
+        <div theme-data="monochrome" class="dim card card_animation" style="padding: 25px 15px; cursor: pointer;">
+          <div theme-data="monochrome" id="small_panel_theme_monochrome_option" class="dimc" style="font-size: 1.1em;">Monochrome</div>
+        </div>
+        <div theme-data="system" class="dim card card_animation" style="padding: 25px 15px; cursor: pointer;">
+          <div theme-data="system" id="small_panel_theme_system_option" class="dimc" style="font-size: 1.1em;">System Based</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- INFO: Language small page -->
+    <div id="small_panel_language" class="panel">
+      <div class="header" style="padding-left: 20px; display: flex; align-items: center; justify-content: initial;">
+        <div id="sp_lang_close" style="width: 36px; height: 36px; margin-right: 6px;">
+          <img src="./assets/back.svg"/>
+        </div>
+        <div id="small_panel_lang_title">Choose your new language</div>
+      </div>
+      <div style="padding: 47px 0px;"></div>
+      <div id="lang_modal_list" style="width: 100%; height: fit-content;">
+        <!-- N/A -->
+      </div>
+    </div>
+
+    <!-- INFO: Error small page -->
+    <div id="small_panel_errorh" class="panel">
+      <div id="errorh_small_panel_header" class="header" style="padding-left: 20px; display: flex; align-items: center; justify-content: initial;">
+        <div id="sp_errorh_close" style="width: 36px; height: 36px; margin-right: 6px;">
+          <img src="./assets/back.svg"/>
+        </div>
+        <div id="small_panel_errorh_title">Error History</div>
+      </div>
+      <div style="display: block; height: 100%;">
+        <div class="errorh_button_container">
+          <div id="errorh_copy" class="errorh_button">COPY</div>
+          <div id="errorh_clear_all" class="errorh_button">CLEAR ALL LOG</div>
+        </div>
+        <textarea id="errorh_panel" class="errorh_textarea" placeholder="No error log recorded here!" disabled></textarea>
+      </div>
+    </div>
+        
+
+    <!-- INFO: Bottom navbar -->
+    <div id="navbar_support_div" style="display: none;">
+      <div id="navbar" class="navbar radios">
+        <div class="navicon_support nav_dimc">
+          <input id="n_home" type="radio" name="navbutton" value="home" checked/>
+          <label class="navicon_support radio nav_dimc" for="n_home">
+  
+            <div class="navicon_support nav_dimc" style="display: grid; place-items: center;">
+              <div class="navicon_support nav_dimc" style="display: grid; place-items: center; width: 65px;">
+                <div style="grid-area: 1 / 1;" id="ni_home"></div>
+                <div style="grid-area: 1 / 1;" id="nibg_home" class="navicon"></div>
+              </div>
+              <div id="nav_home_title" class="navtitle nav_dimc">Home</div>
+            </div>
+  
+          </label>
+        </div>
+  
+        <div class="nav_dimc">
+          <input id="n_modules" type="radio" name="navbutton" value="modules"/>
+          <label class="radio nav_dimc" for="n_modules">
+  
+            <div class="nav_dimc" style="display: grid; place-items: center;">
+              <div class="nav_dimc" style="display: grid; place-items: center; width: 65px;">
+                <div style="grid-area: 1 / 1;" id="ni_modules"></div>
+                <div style="grid-area: 1 / 1;" id="nibg_modules" class="navicon"></div>
+              </div>
+              <div id="nav_modules_title" class="navtitle nav_dimc">Modules</div>
+            </div>
+  
+          </label>
+        </div>
+  
+        <div class="nav_dimc">
+          <input id="n_actions" type="radio" name="navbutton" value="actions"/>
+          <label class="radio nav_dimc" for="n_actions">
+  
+            <div class="nav_dimc" style="display: grid; place-items: center;">
+              <div class="nav_dimc" style="display: grid; place-items: center; width: 65px;">
+                <div style="grid-area: 1 / 1;" id="ni_actions"></div>
+                <div style="grid-area: 1 / 1;" id="nibg_actions" class="navicon"></div>
+              </div>
+              <div id="nav_actions_title" class="navtitle nav_dimc">Actions</div>
+            </div>
+  
+          </label>
+        </div>
+  
+        <div class="navicon_support nav_dimc">
+          <input id="n_settings" type="radio" name="navbutton" value="settings"/>
+          <label class="navicon_support radio nav_dimc" for="n_settings">
+  
+            <div class="navicon_support nav_dimc" style="display: grid; place-items: center;">
+              <div class="navicon_support nav_dimc" style="display: grid; place-items: center; width: 65px;">
+                <div style="grid-area: 1 / 1;" id="ni_settings"></div>
+                <div style="grid-area: 1 / 1;" id="nibg_settings" class="navicon"></div>
+              </div>
+              <div id="nav_settings_title" class="navtitle nav_dimc">Settings</div>
+            </div>
+  
+          </label>
+        </div>
+      </div>
+
+    </div>
+    
+  </body>
+</html>
--- a/webroot/js/browserRedirect.js
+++ b/webroot/js/browserRedirect.js
@@ -0,0 +1,11 @@
+import { exec } from './kernelsu.js'
+
+document.addEventListener('click', async (event) => {
+  const getLink = event.target.getAttribute('credit-link')
+  if (!getLink || typeof getLink !== 'string') return;
+
+  const ptrace64Cmd = await exec(`am start -a android.intent.action.VIEW -d https://${getLink}`).catch(() => {
+    return window.open(`https://${getLink}`, "_blank", 'toolbar=0,location=0,menubar=0')
+  })
+  if (ptrace64Cmd.errno !== 0) return window.open(`https://${getLink}`, "_blank", 'toolbar=0,location=0,menubar=0')
+}, false)
--- a/webroot/js/errorCatcher.js
+++ b/webroot/js/errorCatcher.js
@@ -0,0 +1,16 @@
+function setError(place, issue) {
+  const fullErrorLog = setErrorData(`${place}: ${issue}`)
+  document.getElementById('errorh_panel').innerHTML = fullErrorLog
+}
+
+function setErrorData(errorLog) {
+  const getPrevious = localStorage.getItem('/system/error')
+  const finalLog = getPrevious && getPrevious.length !== 0 ? getPrevious + `\n` + errorLog : errorLog
+
+  localStorage.setItem('/system/error', finalLog)
+  return finalLog
+}
+
+if (window.onerror) window.onerror = (err) => { 
+  setError('WebUI', err.stack ? err.stack : err.message) 
+}
--- a/webroot/js/errorScreen.js
+++ b/webroot/js/errorScreen.js
@@ -0,0 +1,6 @@
+const button = document.getElementById('esc-copy-button')
+const log = document.getElementById('esc-log')
+
+button.addEventListener('click', () => {
+  navigator.clipboard.writeText(log.innerHTML)
+})
--- a/webroot/js/kernelsu.js
+++ b/webroot/js/kernelsu.js
@@ -0,0 +1,117 @@
+/* https://github.com/tiann/KernelSU/tree/main/js / https://www.npmjs.com/package/kernelsu */
+
+let callbackCounter = 0;
+function getUniqueCallbackName(prefix) {
+  return `${prefix}_callback_${Date.now()}_${callbackCounter++}`;
+}
+
+export function exec(command, options) {
+  if (typeof options === "undefined") {
+    options = {};
+  }
+
+  return new Promise((resolve, reject) => {
+    // Generate a unique callback function name
+    const callbackFuncName = getUniqueCallbackName("exec");
+
+    // Define the success callback function
+    window[callbackFuncName] = (errno, stdout, stderr) => {
+      resolve({ errno, stdout, stderr });
+      cleanup(callbackFuncName);
+    };
+
+    function cleanup(successName) {
+      delete window[successName];
+    }
+
+    try {
+      ksu.exec(command, JSON.stringify(options), callbackFuncName);
+    } catch (error) {
+      reject(error);
+      cleanup(callbackFuncName);
+    }
+  });
+}
+
+function Stdio() {
+    this.listeners = {};
+  }
+  
+  Stdio.prototype.on = function (event, listener) {
+    if (!this.listeners[event]) {
+      this.listeners[event] = [];
+    }
+    this.listeners[event].push(listener);
+  };
+  
+  Stdio.prototype.emit = function (event, ...args) {
+    if (this.listeners[event]) {
+      this.listeners[event].forEach((listener) => listener(...args));
+    }
+  };
+  
+  function ChildProcess() {
+    this.listeners = {};
+    this.stdin = new Stdio();
+    this.stdout = new Stdio();
+    this.stderr = new Stdio();
+  }
+  
+  ChildProcess.prototype.on = function (event, listener) {
+    if (!this.listeners[event]) {
+      this.listeners[event] = [];
+    }
+    this.listeners[event].push(listener);
+  };
+  
+  ChildProcess.prototype.emit = function (event, ...args) {
+    if (this.listeners[event]) {
+      this.listeners[event].forEach((listener) => listener(...args));
+    }
+  };
+  
+  export function spawn(command, args, options) {
+    if (typeof args === "undefined") {
+      args = [];
+    } else if (!(args instanceof Array)) {
+        // allow for (command, options) signature
+        options = args;
+    }
+    
+    if (typeof options === "undefined") {
+      options = {};
+    }
+  
+    const child = new ChildProcess();
+    const childCallbackName = getUniqueCallbackName("spawn");
+    window[childCallbackName] = child;
+  
+    function cleanup(name) {
+      delete window[name];
+    }
+
+    child.on("exit", code => {
+        cleanup(childCallbackName);
+    });
+
+    try {
+      ksu.spawn(
+        command,
+        JSON.stringify(args),
+        JSON.stringify(options),
+        childCallbackName
+      );
+    } catch (error) {
+      child.emit("error", error);
+      cleanup(childCallbackName);
+    }
+    return child;
+  }
+
+export function fullScreen(isFullScreen) {
+  ksu.fullScreen(isFullScreen);
+}
+
+export function toast(message) {
+  ksu.toast(message);
+}
--- a/webroot/js/language.js
+++ b/webroot/js/language.js
@@ -0,0 +1,63 @@
+import { exec } from './kernelsu.js'
+
+import { setError } from './main.js'
+import { translateActionsPage } from './translate/actions.js'
+import { translateHomePage } from './translate/home.js'
+import { translateModulesPage } from './translate/modules.js'
+import { translateSettingsPage } from './translate/settings.js'
+
+export async function setNewLanguage(locate, initialize) {
+  const main_html = document.getElementById('main_html')
+  const old_translations = await getTranslations(initialize ? 'en_US' : localStorage.getItem('/system/language'))
+  const new_translations = await getTranslations(locate)
+
+  if (locate.includes('ar_')) main_html.setAttribute("dir", "rtl");
+  else main_html.setAttribute("dir", "none");
+
+  translateHomePage(old_translations, new_translations)
+  translateModulesPage(new_translations)
+  translateActionsPage(old_translations, new_translations)
+  translateSettingsPage(new_translations)
+
+  /* INFO: navbar info */
+  document.getElementById('nav_home_title').innerHTML = new_translations.page.home.header
+  document.getElementById('nav_modules_title').innerHTML = new_translations.page.modules.header
+  document.getElementById('nav_actions_title').innerHTML = new_translations.page.actions.header
+  document.getElementById('nav_settings_title').innerHTML = new_translations.page.settings.header
+
+  /* INFO: Language small page */
+  document.getElementById('small_panel_lang_title').innerHTML = new_translations.smallPage.language.header
+
+  /* INFO: Theme small page */
+  document.getElementById('small_panel_theme_title').innerHTML = new_translations.smallPage.theme.header
+  document.getElementById('small_panel_theme_dark_option').innerHTML = new_translations.smallPage.theme.dark
+  document.getElementById('small_panel_theme_light_option').innerHTML = new_translations.smallPage.theme.light
+  document.getElementById('small_panel_theme_system_option').innerHTML = new_translations.smallPage.theme.system
+
+  /* INFO: Error history small page */
+  document.getElementById('errorh_copy').innerHTML = new_translations.smallPage.errorh.buttons.copy
+  document.getElementById('errorh_clear_all').innerHTML = new_translations.smallPage.errorh.buttons.clear
+  document.getElementById('small_panel_errorh_title').innerHTML = new_translations.smallPage.errorh.header
+  document.getElementById('errorh_panel').placeholder = new_translations.smallPage.errorh.placeholder
+}
+
+export async function getTranslations(locate) {
+  const translateData = await fetch(`./lang/${locate}.json`)
+    .catch((err) => setError('WebUI', err.stack ? err.stack : err.message))
+
+  return translateData.json()
+}
+
+export async function getAvailableLanguages() {
+  const lsCmd = await exec('ls /data/adb/modules/rezygisk/webroot/lang')
+
+  if (lsCmd.errno !== 0) return setError('WebUI', lsCmd.stderr)
+
+  const languages = []
+  lsCmd.stdout.split('\n').forEach((lang) => {
+    if (lang.length !== 0)
+      languages.push(lang.replace('.json', ''))
+  })
+
+  return languages
+}
--- a/webroot/js/main.js
+++ b/webroot/js/main.js
@@ -0,0 +1,262 @@
+import { fullScreen, exec, toast } from './kernelsu.js'
+
+import { setNewLanguage, getTranslations } from './language.js'
+
+export function setError(place, issue) {
+  const fullErrorLog = setErrorData(`${place}: ${issue}`)
+  document.getElementById('errorh_panel').innerHTML = fullErrorLog
+
+  toast(`${place}: ${issue}`)
+}
+
+export function setLangData(mode) {
+  localStorage.setItem('/system/language', mode)
+
+  return localStorage.getItem('/system/language')
+}
+
+export function setErrorData(errorLog) {
+  const getPrevious = localStorage.getItem('/system/error')
+  const finalLog = getPrevious && getPrevious.length !== 0 ? getPrevious + `\n` + errorLog : errorLog
+
+  localStorage.setItem('/system/error', finalLog)
+
+  return finalLog
+}
+
+async function getModuleNames(modules) {
+  const fullCommand = modules.map((mod) => {
+    let propPath = `/data/adb/modules/${mod.id}/module.prop`
+
+    return `printf % ; if test -f "${propPath}"; then /system/bin/grep '^name=' "${propPath}" | /system/bin/cut -d '=' -f 2- 2>/dev/null || true; else true; fi ; printf "\\n"`
+  }).join(' ; ')
+
+  const result = await exec(fullCommand)
+  if (result.errno !== 0) {
+    setError('getModuleNames', 'Failed to execute command to retrieve module list names')
+
+    return null
+  }
+
+  return result.stdout.split('\n\n')
+}
+
+(async () => {
+  /* INFO: Test ksu module availability */
+  exec('echo "Hello world!"')
+    .then(() => console.log('[kernelsu.js] Package is ready!'))
+    .catch(err => {
+      console.log('[kernelsu.js] Package is not ready! Below is error:')
+      console.error(err)
+    })
+
+  fullScreen(true)
+
+  let sys_lang = localStorage.getItem('/system/language')
+
+  if (!sys_lang) sys_lang = setLangData('en_US')
+  if (sys_lang !== 'en_US') await setNewLanguage(sys_lang, true)
+
+  const translations = await getTranslations(sys_lang)
+
+  const loading_screen = document.getElementById('loading_screen')
+  const bottom_nav = document.getElementById('navbar_support_div')
+
+  const rootCss = document.querySelector(':root')
+
+  const rezygisk_state = document.getElementById('rezygisk_state')
+  const rezygisk_icon_state = document.getElementById('rezygisk_icon_state')
+
+  const version = document.getElementById('version')
+  const root_impl = document.getElementById('root_impl')
+
+  const monitor_status = document.getElementById('monitor_status')
+
+  const zygote_divs = [
+    document.getElementById('zygote64'),
+    document.getElementById('zygote32')
+  ]
+
+  const zygote_status_divs = [
+    document.getElementById('zygote64_status'),
+    document.getElementById('zygote32_status')
+  ]
+
+  const androidVersionCmd = await exec('/system/bin/getprop ro.build.version.release')
+  if (androidVersionCmd.errno !== 0) return setError('WebUI', androidVersionCmd.stderr)
+
+  document.getElementById('android_version_div').innerHTML = androidVersionCmd.stdout
+  console.log('[rezygisk.js] Android version: ', androidVersionCmd.stdout)
+
+  const unameCmd = await exec('/system/bin/uname -r')
+  if (unameCmd.errno !== 0) return setError('WebUI', unameCmd.stderr)
+
+  document.getElementById('kernel_version_div').innerHTML = unameCmd.stdout.trim()
+  console.log('[rezygisk.js] Kernel version: ', unameCmd.stdout.trim())
+
+  const catCmd = await exec('/system/bin/cat /data/adb/rezygisk/module.prop')
+  console.log(`[rezygisk.js] ReZygisk module infomation:\n${catCmd.stdout}`)
+
+  if (catCmd.errno !== 0) {
+    console.error('[rezygisk.js] Failed to retrieve ReZygisk module information:', catCmd.stderr)
+
+    rezygisk_state.innerHTML = translations.page.home.status.notWorking
+    rezygisk_icon_state.innerHTML = '<img class="dimc" src="assets/cross.svg">'
+
+    rootCss.style.setProperty('--bright', '#766000')
+
+    /* INFO: Hide zygote divs */
+    zygote_divs.forEach((zygote_div) => {
+      zygote_div.style.display = 'none'
+    })
+
+    loading_screen.style.display = 'none'
+    bottom_nav.style.display = 'flex'
+
+    return;
+  }
+
+  /* INFO: Just ensure that they won't appear unless there's info */
+  zygote_divs.forEach((zygote_div) => {
+    zygote_div.style.display = 'none'
+  })
+
+  version.innerHTML = catCmd.stdout.split('\n').find((line) => line.startsWith('version=')).substring('version='.length).trim()
+
+  const stateCmd = await exec('/system/bin/cat /data/adb/rezygisk/state.json')
+  if (stateCmd.errno !== 0) {
+    console.error('[rezygisk.js] Failed to retrieve ReZygisk state information:', stateCmd.stderr)
+
+    rezygisk_state.innerHTML = translations.page.home.status.notWorking
+    rezygisk_icon_state.innerHTML = '<img class="dimc" src="assets/cross.svg">'
+
+    rootCss.style.setProperty('--bright', '#766000')
+
+    /* INFO: Hide zygote divs */
+    zygote_divs.forEach((zygote_div) => {
+      zygote_div.style.display = 'none'
+    })
+
+    loading_screen.style.display = 'none'
+    bottom_nav.style.display = 'flex'
+
+    return;
+  }
+
+  const ReZygiskState = JSON.parse(stateCmd.stdout)
+
+  root_impl.innerHTML = ReZygiskState.root
+
+  switch (ReZygiskState.monitor.state) {
+    case 0: monitor_status.innerHTML = translations.page.actions.status.tracing; break;
+    case 1: monitor_status.innerHTML = translations.page.actions.status.stopping; break;
+    case 2: monitor_status.innerHTML = translations.page.actions.status.stopped; break;
+    case 3: monitor_status.innerHTML = translations.page.actions.status.exiting; break;
+    default: monitor_status.innerHTML = translations.page.actions.status.unknown;
+  }
+
+  const expectedWorking = (ReZygiskState.zygote['64'] !== undefined ? 1 : 0) + (ReZygiskState.zygote['32'] !== undefined ? 1 : 0)
+  let actuallyWorking = 0
+
+  if (ReZygiskState.zygote['64'] !== undefined) {
+    const zygote64 = ReZygiskState.zygote['64']
+
+    zygote_divs[0].style.display = 'block'
+
+    switch (zygote64) {
+      case 1: {
+        zygote_status_divs[0].innerHTML = translations.page.home.info.zygote.injected
+
+        actuallyWorking++
+
+        break
+      }
+      case 0: zygote_status_divs[0].innerHTML = translations.page.home.info.zygote.notInjected; break
+      default: zygote_status_divs[0].innerHTML = translations.page.home.info.zygote.unknown
+    }
+  }
+
+  if (ReZygiskState.zygote['32'] !== undefined) {
+    const zygote32 = ReZygiskState.zygote['32']
+
+    zygote_divs[1].style.display = 'block'
+
+    switch (zygote32) {
+      case 1: {
+        zygote_status_divs[1].innerHTML = translations.page.home.info.zygote.injected
+
+        actuallyWorking++
+
+        break
+      }
+      case 0: zygote_status_divs[1].innerHTML = translations.page.home.info.zygote.notInjected; break
+      default: zygote_status_divs[1].innerHTML = translations.page.home.info.zygote.unknown
+    }
+  }
+
+  if (expectedWorking === 0 || actuallyWorking === 0) {
+    rezygisk_state.innerHTML = translations.page.home.status.notWorking
+  } else if (expectedWorking === actuallyWorking) {
+    rezygisk_state.innerHTML = translations.page.home.status.ok
+
+    rootCss.style.setProperty('--bright', '#3a4857')
+    rezygisk_icon_state.innerHTML = '<img class="brightc" src="assets/tick.svg">'
+  } else {
+    rezygisk_state.innerHTML = translations.page.home.status.partially
+
+    rootCss.style.setProperty('--bright', '#766000')
+    rezygisk_icon_state.innerHTML = '<img class="brightc" src="assets/warn.svg">'
+  }
+
+  const all_modules = []
+  Object.keys(ReZygiskState.rezygiskd).forEach((daemon_bit) => {
+    const daemon = ReZygiskState.rezygiskd[daemon_bit]
+
+    if (daemon.modules && daemon.modules.length > 0) {
+      daemon.modules.forEach((module_id) => {
+        const module = all_modules.find((mod) => mod.id === module_id)
+        if (module) {
+          module.bitsUsed.push(daemon_bit)
+        } else {
+          all_modules.push({
+            id: module_id,
+            name: null,
+            bitsUsed: [ daemon_bit ]
+          })
+        }
+      })
+    }
+  })
+
+  if (all_modules.length !== 0) {
+    document.getElementById('modules_list_not_avaliable').style.display = 'none'
+
+    const module_names = await getModuleNames(all_modules)
+    module_names.forEach((module_name, i) => all_modules[i].name = module_name)
+
+    console.log(`[rezygisk.js] Module list:`)
+    console.log(all_modules)
+
+    const modules_list = document.getElementById('modules_list')
+
+    all_modules.forEach((module) => {
+      modules_list.innerHTML += 
+        `<div class="dim card" style="padding: 25px 15px; cursor: pointer;">
+          <div class="dimc" style="font-size: 1.1em;">${module.name}</div>
+          <div class="dimc desc" style="font-size: 0.9em; margin-top: 3px; white-space: nowrap; align-items: center; display: flex;">
+            <div class="dimc arch_desc">${translations.page.modules.arch}</div>
+            <div class="dimc" style="margin-left: 5px;">${module.bitsUsed.join(' / ')}</div>
+          </div>
+        </div>`
+    })
+  
+  }
+
+  /* INFO: This hides the throbber screen */
+  loading_screen.style.display = 'none'
+  bottom_nav.style.display = 'flex'
+
+  const start_time = Number(localStorage.getItem('/system/boot-time'))
+  console.log('[rezygisk.js] boot time: ', Date.now() - start_time, 'ms')
+  localStorage.removeItem('/system/boot_time')
+})().catch((err) => setError('WebUI', err.stack ? err.stack : err.message))
--- a/webroot/js/monitorActions.js
+++ b/webroot/js/monitorActions.js
@@ -0,0 +1,38 @@
+import { exec, toast } from './kernelsu.js'
+
+import { getTranslations } from './language.js'
+
+const monitor_start = document.getElementById('monitor_start_button')
+const monitor_stop = document.getElementById('monitor_stop_button')
+const monitor_pause = document.getElementById('monitor_pause_button')
+
+const monitor_status = document.getElementById('monitor_status');
+
+(async () => {
+  const sys_lang = localStorage.getItem('/system/language')
+  const translations = await getTranslations(sys_lang || 'en_US')
+
+  if (monitor_start) {
+    monitor_start.addEventListener('click', () => {
+      if (![ translations.page.actions.status.tracing, translations.page.actions.status.stopping, translations.page.actions.status.stopped ].includes(monitor_status.innerHTML)) return;
+
+      monitor_status.innerHTML = translations.page.actions.status.tracing
+
+      exec('/data/adb/modules/rezygisk/bin/zygisk-ptrace64 ctl start')
+    })
+
+    monitor_stop.addEventListener('click', () => {
+      monitor_status.innerHTML = translations.page.actions.status.exiting
+
+      exec('/data/adb/modules/rezygisk/bin/zygisk-ptrace64 ctl exit')
+    })
+
+    monitor_pause.addEventListener('click', () => {
+      if (![ translations.page.actions.status.tracing, translations.page.actions.status.stopping, translations.page.actions.status.stopped ].includes(monitor_status.innerHTML)) return;
+
+      monitor_status.innerHTML = translations.page.actions.status.stopped
+
+      exec('/data/adb/modules/rezygisk/bin/zygisk-ptrace64 ctl stop')
+    })
+  }
+})()
--- a/webroot/js/navbar.js
+++ b/webroot/js/navbar.js
@@ -0,0 +1,52 @@
+const navbar_data_tag = document.getElementById('cache-navbar-previous')
+const small_panel_data_tag = document.getElementById('cache-page-small-previous')
+
+setData('home', navbar_data_tag)
+
+document.getElementById('panel_home').classList.toggle('show')
+document.getElementById(`nibg_home`).classList.toggle('show')
+
+document.querySelectorAll('[name=navbutton]').forEach((element) => {
+  element.addEventListener('click', (event) => {
+    let smallPagePass = false
+
+    const value = event.target.value
+    const previous = !navbar_data_tag.getAttribute('content') 
+      ? setData('home', navbar_data_tag) 
+      : navbar_data_tag.getAttribute('content')
+
+    const small_panel = small_panel_data_tag.getAttribute('content')
+
+    if (small_panel && small_panel.length !== 0) {
+      document.getElementById(`small_panel_${small_panel}`).classList.remove('show')
+      small_panel_data_tag.removeAttribute('content')
+      smallPagePass = true
+    }
+
+    if (previous === value && !smallPagePass) return;
+
+    /* INFO: Disable icon on old state */
+    const pre_input = document.getElementById(`n_${previous}`)
+    const pre_background = document.getElementById(`nibg_${previous}`)
+
+    document.getElementById(`panel_${previous}`).classList.remove('show')
+    pre_input.removeAttribute('checked')
+    pre_background.classList.remove('show')
+
+    /* INFO: Enable icon on new state */
+    const curr_input = document.getElementById(`n_${value}`)
+    const i_background = document.getElementById(`nibg_${value}`)
+
+    document.getElementById(`panel_${value}`).classList.toggle('show')
+    curr_input.setAttribute('checked', '')
+    i_background.classList.toggle('show')
+
+    setData(value, navbar_data_tag)
+  })
+})
+
+function setData(data, tag) {
+  tag.setAttribute('content', data)
+
+  return data
+}
--- a/webroot/js/restoreError.js
+++ b/webroot/js/restoreError.js
@@ -0,0 +1,10 @@
+const errorh_panel = document.getElementById('errorh_panel')
+let sys_error = localStorage.getItem('/system/error')
+
+if (!sys_error) {
+  localStorage.setItem('/system/error', '')
+
+  sys_error = localStorage.getItem('/system/error')
+}
+
+if (sys_error.length !== 0) errorh_panel.innerHTML = sys_error
--- a/webroot/js/smallPage/errorHistory.js
+++ b/webroot/js/smallPage/errorHistory.js
@@ -0,0 +1,47 @@
+import { smallPageDisabler } from '../smallPageDesabler.js'
+const panel = document.getElementById('errorh_panel')
+
+/* INFO: Event setup */
+const navbar_data_tag = document.getElementById('cache-navbar-previous')
+const small_panel_data_tag = document.getElementById('cache-page-small-previous')
+const fallback_open = document.getElementById('cache-fallback-open')
+
+document.getElementById('errorh_page_toggle').addEventListener('click', () => {
+  const previous = !navbar_data_tag.getAttribute('content') ? setData('home', small_panel_data_tag) : navbar_data_tag.getAttribute('content')
+  document.getElementById(`panel_${previous}`).classList.remove('show')
+  document.getElementById('small_panel_errorh').classList.toggle('show')
+  small_panel_data_tag.setAttribute('content', 'errorh')
+})
+
+document.getElementById('backport_errorh').addEventListener('click', () => {
+  const previous = !navbar_data_tag.getAttribute('content') ? setData('home', small_panel_data_tag) : navbar_data_tag.getAttribute('content')
+  document.getElementById(`panel_${previous}`).classList.remove('show')
+  document.getElementById('loading_screen').style.display = 'none'
+  document.getElementById('small_panel_errorh').classList.toggle('show')
+  document.getElementById('errorh_panel').style.bottom = '1em'
+  fallback_open.setAttribute('content', 'opened')
+  small_panel_data_tag.setAttribute('content', 'errorh')
+})
+
+document.getElementById('sp_errorh_close').addEventListener('click', () => {
+  const is_fallback = fallback_open.getAttribute('content')
+  if (is_fallback) {
+    document.getElementById('errorh_panel').style.bottom = '1em'
+    document.getElementById('loading_screen').style.display = 'flex'
+  }
+  smallPageDisabler('errorh', is_fallback ? 'home' : 'settings', is_fallback ? 'home' : null)
+})
+document.getElementById('errorh_copy').addEventListener('click', () => {
+  navigator.clipboard.writeText(panel.innerHTML)
+})
+
+document.getElementById('errorh_clear_all').addEventListener('click', () => {
+  panel.innerHTML = ''
+  localStorage.setItem('/system/error', '')
+})
+
+function setData(mode, tag) {
+  tag.setAttribute('content', mode)
+
+  return mode
+}
--- a/webroot/js/smallPage/language.js
+++ b/webroot/js/smallPage/language.js
@@ -0,0 +1,54 @@
+import { 
+  getTranslations, 
+  setNewLanguage,
+  getAvailableLanguages
+} from '../language.js'
+import { smallPageDisabler } from '../smallPageDesabler.js'
+
+/* INFO: Initial setup */
+let index = 0
+
+async function setAvailableLanguage() {
+  const availableLanguages = await getAvailableLanguages()
+
+  for (index; index < availableLanguages.length; index++) {
+    const langCode = availableLanguages[index]
+    const langData = await getTranslations(langCode)
+
+    document.getElementById('lang_modal_list').innerHTML += `
+    <div lang-data="${langCode}" class="dim card card_animation" style="padding: 25px 15px; cursor: pointer;">
+      <div lang-data="${langCode}" class="dimc" style="font-size: 1.1em;">${langData.langName}</div>
+    </div>
+    `
+  }
+}
+setAvailableLanguage()
+
+/* INFO: Event setup */
+const navbar_data_tag = document.getElementById('cache-navbar-previous')
+const small_panel_data_tag = document.getElementById('cache-page-small-previous')
+
+document.getElementById('lang_page_toggle').addEventListener('click', () => {
+  const previous = !navbar_data_tag.getAttribute('content') ? setData('home', small_panel_data_tag) : navbar_data_tag.getAttribute('content')
+  document.getElementById(`panel_${previous}`).classList.remove('show')
+  document.getElementById('small_panel_language').classList.toggle('show')
+  small_panel_data_tag.setAttribute('content', 'language')
+})
+
+document.getElementById('sp_lang_close').addEventListener('click', () => smallPageDisabler('language', 'settings'))
+
+document.addEventListener('click', async (event) => {
+  const getLangLocate = event.target.getAttribute('lang-data')
+  if (!getLangLocate || typeof getLangLocate !== 'string') return
+
+  smallPageDisabler('language', 'settings')
+  await setNewLanguage(getLangLocate)
+
+  localStorage.setItem('/system/language', getLangLocate)
+}, false)
+
+function setData(data, tag) {
+  tag.setAttribute('content', data)
+
+  return data
+}
--- a/webroot/js/smallPage/theme.js
+++ b/webroot/js/smallPage/theme.js
@@ -0,0 +1,75 @@
+import { smallPageDisabler } from '../smallPageDesabler.js'
+import { setAmoled } from '../themes/amoled.js'
+import { setDark } from '../themes/dark.js'
+import { setLight } from '../themes/light.js'
+import { setMonochrome } from '../themes/monochrome.js'
+
+// INFO: requirement variables
+let sys_theme
+const page_toggle = document.getElementById('theme_page_toggle')
+const themeList = {
+  amoled: () => setAmoled(true),
+  dark: () => setDark(true),
+  light: () => setLight(true),
+  monochrome: () => setMonochrome(true),
+  system: (unavaliable) => {
+    const isDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
+    if (isDark && unavaliable) setDark() 
+    else setLight()
+  },
+}
+const setData = (mode) => {
+  localStorage.setItem('/system/theme', mode)
+  return mode
+}
+
+// INFO: Initial open logic
+sys_theme = localStorage.getItem('/system/theme')
+if (!sys_theme) sys_theme = setData('dark')
+themeList[sys_theme](true)
+
+// INFO: Event logic
+const navbar_data_tag = document.getElementById('cache-navbar-previous')
+const small_panel_data_tag = document.getElementById('cache-page-small-previous')
+
+document.getElementById('sp_theme_close').addEventListener('click', () => smallPageDisabler('theme', 'settings'))
+
+document.addEventListener('click', async (event) => {
+  const themeListKey = Object.keys(themeList)
+  const getThemeMode = event.target.getAttribute('theme-data')
+
+  if (!getThemeMode || typeof getThemeMode !== 'string' || !themeListKey.includes(getThemeMode)) return
+
+  themeList[getThemeMode](true)
+
+  smallPageDisabler('theme', 'settings')
+
+  sys_theme = setData(getThemeMode)
+}, false)
+
+page_toggle.addEventListener('click', () => {
+  const previous = !navbar_data_tag.getAttribute('content') ? setTagData('home', small_panel_data_tag) : navbar_data_tag.getAttribute('content')
+  document.getElementById(`panel_${previous}`).classList.remove('show')
+  document.getElementById('small_panel_theme').classList.toggle('show')
+    small_panel_data_tag.setAttribute('content', 'theme')
+})
+
+window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', event => {
+  if (sys_theme !== "system") return
+  const newColorScheme = event.matches ? "dark" : "light";
+
+  switch (newColorScheme) {
+    case 'dark':
+      setDark()
+      break
+    case 'light':
+      setLight()
+      break
+  }
+});
+
+function setTagData(data, tag) {
+  tag.setAttribute('content', data)
+
+  return data
+}
--- a/webroot/js/smallPageDesabler.js
+++ b/webroot/js/smallPageDesabler.js
@@ -0,0 +1,26 @@
+export function smallPageDisabler(page_name, new_page, custom_page) {
+  const navbar_data_tag = document.getElementById('cache-navbar-previous')
+  const small_panel_data_tag = document.getElementById('cache-page-small-previous')
+
+  document.getElementById(`small_panel_${page_name}`).classList.remove('show')
+  small_panel_data_tag.removeAttribute('content')
+
+  const previous = navbar_data_tag.getAttribute('content')
+
+  /* INFO: Disable icon on old state */
+  const pre_input = document.getElementById(`n_${previous}`)
+  const pre_background = document.getElementById(`nibg_${previous}`)
+
+  pre_input.removeAttribute('checked')
+  pre_background.classList.remove('show')
+
+  /* INFO: Enable icon on new state */
+  const curr_input = document.getElementById(`n_${new_page}`)
+  const i_background = document.getElementById(`nibg_${new_page}`)
+
+  document.getElementById(`panel_${new_page}`).classList.toggle('show')
+  curr_input.setAttribute('checked', '')
+  i_background.classList.toggle('show')
+
+  navbar_data_tag.setAttribute('content', custom_page ? custom_page : 'settings')
+}
--- a/webroot/js/switcher/fontChanger.js
+++ b/webroot/js/switcher/fontChanger.js
@@ -0,0 +1,34 @@
+const switcher = document.getElementById('font_switcher')
+const rootCss = document.querySelector(':root')
+
+let sys_font = localStorage.getItem('/system/font')
+if (!sys_font) sys_font = setData('false')
+if (sys_font === 'true') {
+  switcher.setAttribute('checked', '')
+
+  setSystemFont()
+}
+
+switcher.addEventListener('click', () => {
+  sys_font = setData(String(switcher.checked))
+
+  switcher.checked ? setSystemFont() : document.getElementById('font-tag').remove()
+})
+
+function setSystemFont() {
+  const headTag = document.getElementsByTagName('head')[0]
+  const styleTag = document.createElement('style')
+
+  styleTag.id = 'font-tag'
+  headTag.appendChild(styleTag)
+  styleTag.innerHTML = `
+    :root {
+      --font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif
+    }`
+}
+
+function setData(mode) {
+  localStorage.setItem('/system/font', mode)
+
+  return mode
+}
--- a/webroot/js/themes/amoled.js
+++ b/webroot/js/themes/amoled.js
@@ -0,0 +1,41 @@
+import { setDarkNav } from './darkNavbar.js'
+
+const rootCss = document.querySelector(':root')
+
+/* INFO: Changes the icons to match the theme */
+const close_icons = document.getElementsByClassName('close_icon')
+const expand_icons = document.getElementsByClassName('expander')
+const sp_lang_close = document.getElementById('sp_lang_close')
+const sp_theme_close = document.getElementById('sp_theme_close')
+
+export function setAmoled(chooseSet) {
+  rootCss.style.setProperty('--background', '#000000')
+  rootCss.style.setProperty('--font', '#d9d9d9')
+  rootCss.style.setProperty('--desc', '#a9a9a9')
+  rootCss.style.setProperty('--dim', '#0b0d0f')
+  rootCss.style.setProperty('--icon', '#22292d')
+  rootCss.style.setProperty('--icon-bc', '#171b1d')
+  rootCss.style.setProperty('--desktop-navbar', '#111417')
+  rootCss.style.setProperty('--desktop-navicon', '#1c2225')
+  rootCss.style.setProperty('--button', 'var(--background)')
+
+  if (chooseSet) setData('amoled')
+
+  for (const close_icon of close_icons) {
+    close_icon.innerHTML = '<img src="assets/close.svg">'
+  }
+
+  for (const expand_icon of expand_icons) {
+    expand_icon.innerHTML = '<img class="dimc" src="assets/expand.svg">'
+  }
+
+  sp_lang_close.innerHTML = '<img src="./assets/back.svg"/>'
+  sp_theme_close.innerHTML = '<img src="./assets/back.svg"/>'
+  setDarkNav()
+}
+
+function setData(mode) {
+  localStorage.setItem('/system/theme', mode)
+
+  return mode
+}
--- a/webroot/js/themes/dark.js
+++ b/webroot/js/themes/dark.js
@@ -0,0 +1,43 @@
+import { setDarkNav } from './darkNavbar.js'
+
+const rootCss = document.querySelector(':root')
+
+/* INFO: Changes the icons to match the theme */
+const close_icons = document.getElementsByClassName('close_icon')
+const expand_icons = document.getElementsByClassName('expander')
+const sp_lang_close = document.getElementById('sp_lang_close')
+const sp_theme_close = document.getElementById('sp_theme_close')
+const sp_errorh_close = document.getElementById('sp_errorh_close')
+
+export function setDark(chooseSet) {
+  rootCss.style.setProperty('--background', '#181c20')
+  rootCss.style.setProperty('--font', '#ffffff')
+  rootCss.style.setProperty('--desc', '#c9c9c9')
+  rootCss.style.setProperty('--dim', '#1d2327')
+  rootCss.style.setProperty('--icon', '#48565e')
+  rootCss.style.setProperty('--icon-bc', '#313a3f')
+  rootCss.style.setProperty('--desktop-navbar', '#252b31')
+  rootCss.style.setProperty('--desktop-navicon', '#333d42')
+  rootCss.style.setProperty('--button', 'var(--background)')
+
+  if (chooseSet) setData('dark')
+
+  for (const close_icon of close_icons) {
+    close_icon.innerHTML = '<img src="assets/close.svg">'
+  }
+
+  for (const expand_icon of expand_icons) {
+    expand_icon.innerHTML = '<img class="dimc" src="assets/expand.svg">'
+  }
+
+  sp_lang_close.innerHTML = '<img src="./assets/back.svg"/>'
+  sp_theme_close.innerHTML = '<img src="./assets/back.svg"/>'
+  sp_errorh_close.innerHTML = '<img src="./assets/back.svg"/>'
+  setDarkNav()
+}
+
+function setData(mode) {
+  localStorage.setItem('/system/theme', mode)
+
+  return mode
+}
--- a/webroot/js/themes/darkNavbar.js
+++ b/webroot/js/themes/darkNavbar.js
@@ -0,0 +1,6 @@
+export function setDarkNav() {
+  document.getElementById('ni_home').classList.remove('light')
+  document.getElementById('ni_modules').classList.remove('light')
+  document.getElementById('ni_actions').classList.remove('light')
+  document.getElementById('ni_settings').classList.remove('light')
+}
--- a/webroot/js/themes/light.js
+++ b/webroot/js/themes/light.js
@@ -0,0 +1,48 @@
+import { 
+  light_close_icon,
+  light_expand_icon,
+  light_page_exit_icon,
+} from './lightIcon.js'
+import { setLightNav } from './lightNavbar.js'
+
+const rootCss = document.querySelector(':root')
+
+/* INFO: Changes the icons to match the theme */
+const close_icons = document.getElementsByClassName('close_icon')
+const expand_icons = document.getElementsByClassName('expander')
+const sp_lang_close = document.getElementById('sp_lang_close')
+const sp_theme_close = document.getElementById('sp_theme_close')
+const sp_errorh_close = document.getElementById('sp_errorh_close')
+
+export function setLight(chooseSet) {
+  rootCss.style.setProperty('--background', '#f2f2f2')
+  rootCss.style.setProperty('--font', '#181c20')
+  rootCss.style.setProperty('--desc', '#484d53')
+  rootCss.style.setProperty('--dim', '#e0e0e0')
+  rootCss.style.setProperty('--icon', '#acacac')
+  rootCss.style.setProperty('--desktop-navbar', '#fefefe')
+  rootCss.style.setProperty('--desktop-navicon', '#eeeeee')
+  rootCss.style.setProperty('--icon-bc', '#c9c9c9')
+  rootCss.style.setProperty('--button', '#b3b3b3')
+
+  if (chooseSet) setData('light')
+
+  for (const close_icon of close_icons) {
+    close_icon.innerHTML = light_close_icon
+  }
+
+  for (const expand_icon of expand_icons) {
+    expand_icon.innerHTML = light_expand_icon
+  }
+
+  sp_lang_close.innerHTML = light_page_exit_icon
+  sp_theme_close.innerHTML = light_page_exit_icon
+  sp_errorh_close.innerHTML = light_page_exit_icon
+  setLightNav()
+}
+
+function setData(mode) {
+  localStorage.setItem('/system/theme', mode)
+
+  return mode
+}
--- a/webroot/js/themes/lightIcon.js
+++ b/webroot/js/themes/lightIcon.js
@@ -0,0 +1,20 @@
+export const light_expand_icon = `
+  <svg class="dimc" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+    <path d="m480-340 180-180-57-56-123 123-123-123-57 56 180 180Zm0 260q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/>
+  </svg>
+`
+export const light_close_icon = `
+  <svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#2c2c2c">
+    <path d="m256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z"/>
+  </svg>
+`
+export const light_logs_icon = `
+  <svg class="dimc" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+    <path d="M480-280q17 0 28.5-11.5T520-320q0-17-11.5-28.5T480-360q-17 0-28.5 11.5T440-320q0 17 11.5 28.5T480-280Zm-40-160h80v-240h-80v240Zm40 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/>
+  </svg>
+`
+export const light_page_exit_icon = `
+  <svg xmlns="http://www.w3.org/2000/svg" height="36px" viewBox="0 -960 960 960" width="36px" fill="#2c2c2c">
+    <path d="m287-446.67 240 240L480-160 160-480l320-320 47 46.67-240 240h513v66.66H287Z"/>
+  </svg>
+`
--- a/webroot/js/themes/lightNavbar.js
+++ b/webroot/js/themes/lightNavbar.js
@@ -0,0 +1,6 @@
+export function setLightNav() {
+  document.getElementById('ni_home').classList.add('light')
+  document.getElementById('ni_modules').classList.add('light')
+  document.getElementById('ni_actions').classList.add('light')
+  document.getElementById('ni_settings').classList.add('light')
+}
--- a/webroot/js/themes/monochrome.js
+++ b/webroot/js/themes/monochrome.js
@@ -0,0 +1,41 @@
+import { setDarkNav } from './darkNavbar.js'
+
+const rootCss = document.querySelector(':root')
+
+/* INFO: Changes the icons to match the theme */
+const close_icons = document.getElementsByClassName('close_icon')
+const expand_icons = document.getElementsByClassName('expander')
+const sp_lang_close = document.getElementById('sp_lang_close')
+const sp_theme_close = document.getElementById('sp_theme_close')
+
+export function setMonochrome(chooseSet) {
+  rootCss.style.setProperty('--background', '#141414')
+  rootCss.style.setProperty('--font', '#ffffff')
+  rootCss.style.setProperty('--desc', '#c9c9c9')
+  rootCss.style.setProperty('--dim', '#1c1c1c')
+  rootCss.style.setProperty('--icon', '#494949')
+  rootCss.style.setProperty('--icon-bc', '#292929')
+  rootCss.style.setProperty('--desktop-navbar', '#252525')
+  rootCss.style.setProperty('--desktop-navicon', '#3a3a3a')
+  rootCss.style.setProperty('--button', 'var(--background)')
+
+  if (chooseSet) setData('monochrome')
+
+  for (const close_icon of close_icons) {
+    close_icon.innerHTML = '<img src="assets/close.svg">'
+  }
+
+  for (const expand_icon of expand_icons) {
+    expand_icon.innerHTML = '<img class="dimc" src="assets/expand.svg">'
+  }
+
+  sp_lang_close.innerHTML = '<img src="./assets/back.svg"/>'
+  sp_theme_close.innerHTML = '<img src="./assets/back.svg"/>'
+  setDarkNav()
+}
+
+function setData(mode) {
+  localStorage.setItem('/system/theme', mode)
+
+  return mode
+}
--- a/webroot/js/translate/actions.js
+++ b/webroot/js/translate/actions.js
@@ -0,0 +1,38 @@
+export function translateActionsPage(old_translations, new_translations) {
+  /* INFO: actions card */
+  document.getElementById('panel_actions_header').innerHTML = new_translations.page.actions.header
+
+  /* INFO: monitor small card */
+  document.getElementById('monitor_title').innerHTML = new_translations.page.actions.monitor
+  if (document.getElementById('monitor_stop_button')) { /* INFO: Not all devices have 32-bit support */
+    document.getElementById('monitor_stop_button').innerHTML = new_translations.page.actions.monitorButton.stop
+    document.getElementById('monitor_start_button').innerHTML = new_translations.page.actions.monitorButton.start
+    document.getElementById('monitor_pause_button').innerHTML = new_translations.page.actions.monitorButton.pause
+  }
+
+  /* INFO: monitor status card */
+  const monitor_status = document.getElementById('monitor_status')
+  switch (monitor_status.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim()) {
+    case old_translations.page.actions.status.tracing: {
+      monitor_status.innerHTML = new_translations.page.actions.status.tracing
+
+      break
+    }
+    case old_translations.page.actions.status.stopping: {
+      monitor_status.innerHTML = new_translations.page.actions.status.stopping
+
+      break
+    }
+    case old_translations.page.actions.status.stopped: {
+      monitor_status.innerHTML = new_translations.page.actions.status.stopped
+
+      break
+    }
+    case old_translations.page.actions.status.exiting: {
+      monitor_status.innerHTML = new_translations.page.actions.status.exiting
+
+      break
+    }
+    default: monitor_status.innerHTML = new_translations.page.actions.status.unknown
+  }
+}
--- a/webroot/js/translate/home.js
+++ b/webroot/js/translate/home.js
@@ -0,0 +1,90 @@
+export function translateHomePage(old_translations, new_translations) {
+  /* INFO: Translate variables */
+  const rezygisk_state = document.getElementById('rezygisk_state')
+  const zygote32_status_div = document.getElementById('zygote32_status')
+  const zygote64_status_div = document.getElementById('zygote64_status')
+
+  switch (rezygisk_state.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim()) {
+    case old_translations.page.home.status.ok: {
+      rezygisk_state.innerHTML = new_translations.page.home.status.ok
+
+      break
+    }
+    case old_translations.page.home.status.partially: {
+      rezygisk_state.innerHTML = new_translations.page.home.status.partially
+
+      break
+    }
+    case old_translations.page.home.status.notWorking: {
+      rezygisk_state.innerHTML = new_translations.page.home.status.notWorking
+
+      break
+    }
+    case old_translations.page.home.status.unknown: {
+      rezygisk_state.innerHTML = new_translations.global.unknown
+
+      break
+    }
+  }
+
+  if (zygote32_status_div) {
+    switch (zygote32_status_div.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim()) {
+      case old_translations.page.home.info.zygote.injected: {
+        zygote32_status_div.innerHTML = new_translations.page.home.info.zygote.injected
+
+        break
+      }
+      case old_translations.page.home.info.zygote.notInjected: {
+        zygote32_status_div.innerHTML = new_translations.page.home.info.zygote.notInjected
+
+        break
+      }
+      case old_translations.page.home.info.zygote.unknown: {
+        zygote32_status_div.innerHTML = new_translations.global.unknown
+
+        break
+      }
+    }
+  }
+
+  if (zygote64_status_div) {
+    switch (zygote64_status_div.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim()) {
+      case old_translations.page.home.info.zygote.injected: {
+        zygote64_status_div.innerHTML = new_translations.page.home.info.zygote.injected
+
+        break
+      }
+      case old_translations.page.home.info.zygote.notInjected: {
+        zygote64_status_div.innerHTML = new_translations.page.home.info.zygote.notInjected
+
+        break
+      }
+      case old_translations.page.home.info.zygote.unknown: {
+        zygote64_status_div.innerHTML = new_translations.global.unknown
+
+        break
+      }
+    }
+  }
+
+  const android_version_div = document.getElementById('android_version_div')
+  if (android_version_div.innerHTML === old_translations.global.unknown) 
+    android_version_div.innerHTML = new_translations.global.unknown
+
+  const kernel_version_div = document.getElementById('kernel_version_div')
+  if (kernel_version_div.innerHTML === old_translations.global.unknown) 
+    kernel_version_div.innerHTML = new_translations.global.unknown
+
+  /* INFO: info card */
+  document.getElementById('version_info_title').innerHTML = new_translations.page.home.info.version
+  document.getElementById('root_info_title').innerHTML = new_translations.page.home.info.root
+
+  // const version_code = document.getElementById('version_code')
+  // const root_impl = document.getElementById('root_impl')
+
+  // if (version_code.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim() === old_translations.global.unknown)
+  //   version_code.innerHTML = new_translations.global.unknown
+
+  // if (root_impl.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim() === old_translations.global.unknown)
+  //   root_impl.innerHTML = new_translations.global.unknown
+}
--- a/webroot/js/translate/modules.js
+++ b/webroot/js/translate/modules.js
@@ -0,0 +1,10 @@
+export function translateModulesPage(new_translations) {
+  document.getElementById('panel_modules_header').innerHTML = new_translations.page.modules.header
+  document.getElementById('modules_list_not_avaliable').innerHTML = new_translations.page.modules.notAvaliable
+
+  /* INFO: arch type */
+  const module_element_arch = document.getElementsByClassName('arch_desc')
+  for (const module of module_element_arch) {
+    module.innerHTML = new_translations.page.modules.arch
+  }
+}
--- a/webroot/js/translate/settings.js
+++ b/webroot/js/translate/settings.js
@@ -0,0 +1,27 @@
+export function translateSettingsPage(new_translations) {
+  document.getElementById('panel_settings_header').innerHTML = new_translations.page.settings.header
+
+  /* INFO: Change font option */
+  document.getElementById('sys_font_option_title').innerHTML = new_translations.page.settings.font.header
+  document.getElementById('sys_font_option_desc').innerHTML = new_translations.page.settings.font.description
+  
+  /* INFO: Change font option */
+  document.getElementById('sys_theme_option_title').innerHTML = new_translations.page.settings.theme.header
+  document.getElementById('sys_theme_option_desc').innerHTML = new_translations.page.settings.theme.description
+
+  /* INFO: Change font option */
+  document.getElementById('sys_lang_option_title').innerHTML = new_translations.page.settings.language.header
+  document.getElementById('sys_lang_option_desc').innerHTML = new_translations.page.settings.language.description
+
+  /* INFO: Change font option */
+  document.getElementById('sys_errorh_title').innerHTML = new_translations.page.settings.logs.header
+  document.getElementById('sys_errorh_desc').innerHTML = new_translations.page.settings.logs.description
+
+  /* INFO: Credit card */
+  document.getElementById('mcre_title').innerHTML = new_translations.page.settings.credits.module
+  document.getElementById('omcre_title').innerHTML = new_translations.page.settings.credits.original
+  document.getElementById('webcre_title').innerHTML = new_translations.page.settings.credits.web
+  /* INFO: License card */
+  document.getElementById('mlic_title').innerHTML = new_translations.page.settings.license.module
+  document.getElementById('mweb_title').innerHTML = new_translations.page.settings.license.web
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M240-160q-33 0-56.5-23.5T160-240q0-33 23.5-56.5T240-320q33 0 56.5 23.5T320-240q0 33-23.5 56.5T240-160Zm240 0q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm240 0q-33 0-56.5-23.5T640-240q0-33 23.5-56.5T720-320q33 0 56.5 23.5T800-240q0 33-23.5 56.5T720-160ZM240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400ZM240-640q-33 0-56.5-23.5T160-720q0-33 23.5-56.5T240-800q33 0 56.5 23.5T320-720q0 33-23.5 56.5T240-640Zm240 0q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Zm240 0q-33 0-56.5-23.5T640-720q0-33 23.5-56.5T720-800q33 0 56.5 23.5T800-720q0 33-23.5 56.5T720-640Z"/></svg>
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" height="36px" viewBox="0 -960 960 960" width="36px" fill="#e8eaed"><path d="m287-446.67 240 240L480-160 160-480l320-320 47 46.67-240 240h513v66.66H287Z"/></svg>`