diff --git a/.github/scripts/create-repo.py b/.github/scripts/create-repo.py
new file mode 100644
index 0000000000..09c31c2ce4
--- /dev/null
+++ b/.github/scripts/create-repo.py
@@ -0,0 +1,108 @@
+import json
+import os
+import re
+import subprocess
+from pathlib import Path
+from zipfile import ZipFile
+
+PACKAGE_NAME_REGEX = re.compile(r"package: name='([^']+)'")
+VERSION_CODE_REGEX = re.compile(r"versionCode='([^']+)'")
+VERSION_NAME_REGEX = re.compile(r"versionName='([^']+)'")
+IS_NSFW_REGEX = re.compile(r"'tachiyomi.animeextension.nsfw' value='([^']+)'")
+APPLICATION_LABEL_REGEX = re.compile(r"^application-label:'([^']+)'", re.MULTILINE)
+APPLICATION_ICON_320_REGEX = re.compile(
+    r"^application-icon-320:'([^']+)'", re.MULTILINE
+)
+LANGUAGE_REGEX = re.compile(r"aniyomi-([^\.]+)")
+
+*_, ANDROID_BUILD_TOOLS = (Path(os.environ["ANDROID_HOME"]) / "build-tools").iterdir()
+REPO_DIR = Path("repo")
+REPO_APK_DIR = REPO_DIR / "apk"
+REPO_ICON_DIR = REPO_DIR / "icon"
+
+REPO_ICON_DIR.mkdir(parents=True, exist_ok=True)
+
+with open("output.json", encoding="utf-8") as f:
+    inspector_data = json.load(f)
+
+index_data = []
+index_min_data = []
+
+for apk in REPO_APK_DIR.iterdir():
+    badging = subprocess.check_output(
+        [
+            ANDROID_BUILD_TOOLS / "aapt",
+            "dump",
+            "--include-meta-data",
+            "badging",
+            apk,
+        ]
+    ).decode()
+
+    package_info = next(x for x in badging.splitlines() if x.startswith("package: "))
+    package_name = PACKAGE_NAME_REGEX.search(package_info).group(1)    
+    application_icon = APPLICATION_ICON_320_REGEX.search(badging).group(1)
+
+    with ZipFile(apk) as z, z.open(application_icon) as i, (
+        REPO_ICON_DIR / f"{package_name}.png"
+    ).open("wb") as f:
+        f.write(i.read())
+
+    language = LANGUAGE_REGEX.search(apk.name).group(1)
+    sources = inspector_data[package_name]
+
+    if len(sources) == 1:
+        source_language = sources[0]["lang"]
+
+        if (
+            source_language != language
+            and source_language not in {"all", "other"}
+            and language not in {"all", "other"}
+        ):
+            language = source_language
+
+    common_data = {
+        "name": APPLICATION_LABEL_REGEX.search(badging).group(1),
+        "pkg": package_name,
+        "apk": apk.name,
+        "lang": language,
+        "code": int(VERSION_CODE_REGEX.search(package_info).group(1)),
+        "version": VERSION_NAME_REGEX.search(package_info).group(1),
+        "nsfw": int(IS_NSFW_REGEX.search(badging).group(1)),
+    }
+    min_data = {
+        **common_data,
+        "sources": [],
+    }
+
+    for source in sources:
+        min_data["sources"].append(
+            {
+                "name": source["name"],
+                "lang": source["lang"],
+                "id": source["id"],
+                "baseUrl": source["baseUrl"],
+            }
+        )
+
+    index_min_data.append(min_data)
+    index_data.append(
+        {
+            **common_data,
+            "hasReadme": 0,
+            "hasChangelog": 0,
+            "sources": sources,
+        }
+    )
+
+index_data.sort(key=lambda x: x["pkg"])
+index_min_data.sort(key=lambda x: x["pkg"])
+
+with (REPO_DIR / "index.json").open("w", encoding="utf-8") as f:
+    index_data_str = json.dumps(index_data, ensure_ascii=False, indent=2)
+
+    print(index_data_str)
+    f.write(index_data_str)
+
+with (REPO_DIR / "index.min.json").open("w", encoding="utf-8") as f:
+    json.dump(index_min_data, f, ensure_ascii=False, separators=(",", ":"))
diff --git a/.github/scripts/create-repo.sh b/.github/scripts/create-repo.sh
deleted file mode 100755
index 3547226880..0000000000
--- a/.github/scripts/create-repo.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-set -e
-
-TOOLS="$(ls -d ${ANDROID_HOME}/build-tools/* | tail -1)"
-
-mkdir -p repo/apk
-mkdir -p repo/icon
-
-cp -f apk/* repo/apk
-
-cd repo
-
-APKS=( ../apk/*".apk" )
-
-for APK in ${APKS[@]}; do
-    FILENAME=$(basename ${APK})
-    BADGING="$(${TOOLS}/aapt dump --include-meta-data badging $APK)"
-
-    PACKAGE=$(echo "$BADGING" | grep package:)
-    PKGNAME=$(echo $PACKAGE | grep -Po "package: name='\K[^']+")
-    VCODE=$(echo $PACKAGE | grep -Po "versionCode='\K[^']+")
-    VNAME=$(echo $PACKAGE | grep -Po "versionName='\K[^']+")
-    NSFW=$(echo $BADGING | grep -Po "tachiyomi.animeextension.nsfw' value='\K[^']+")
-    HASREADME=$(echo $BADGING | grep -Po "tachiyomi.animeextension.hasReadme' value='\K[^']+")
-    HASCHANGELOG=$(echo $BADGING | grep -Po "tachiyomi.animeextension.hasChangelog' value='\K[^']+")
-
-    APPLICATION=$(echo "$BADGING" | grep application:)
-    LABEL=$(echo $APPLICATION | grep -Po "label='\K[^']+")
-
-    LANG=$(echo $APK | grep -Po "aniyomi-\K[^\.]+")
-
-    ICON=$(echo "$BADGING" | grep -Po "application-icon-320.*'\K[^']+")
-    unzip -p $APK $ICON > icon/${PKGNAME}.png
-
-    # TODO: legacy icons; remove after a while
-    cp icon/${PKGNAME}.png icon/${FILENAME%.*}.png
-
-    SOURCE_INFO=$(jq ".[\"$PKGNAME\"]" < ../output.json)
-
-    # Fixes the language code without needing to update the packages.
-    SOURCE_LEN=$(echo $SOURCE_INFO | jq length)
-
-    if [ $SOURCE_LEN = "1" ]; then
-        SOURCE_LANG=$(echo $SOURCE_INFO | jq -r '.[0].lang')
-
-        if [ $SOURCE_LANG != $LANG ] && [ $SOURCE_LANG != "all" ] && [ $SOURCE_LANG != "other" ] && [ $LANG != "all" ] && [ $LANG != "other" ]; then
-            LANG=$SOURCE_LANG
-        fi
-    fi
-
-    jq -n \
-        --arg name "$LABEL" \
-        --arg pkg "$PKGNAME" \
-        --arg apk "$FILENAME" \
-        --arg lang "$LANG" \
-        --argjson code $VCODE \
-        --arg version "$VNAME" \
-        --argjson nsfw $NSFW \
-        --argjson hasReadme $HASREADME \
-        --argjson hasChangelog $HASCHANGELOG \
-        --argjson sources "$SOURCE_INFO" \
-        '{name:$name, pkg:$pkg, apk:$apk, lang:$lang, code:$code, version:$version, nsfw:$nsfw, hasReadme:$hasReadme, hasChangelog:$hasChangelog, sources:$sources}'
-
-done | jq -sr '[.[]]' > index.json
-
-# Alternate minified copy
-jq -c '.' < index.json > index.min.json
-
-cat index.json
\ No newline at end of file
diff --git a/.github/scripts/move-apks.py b/.github/scripts/move-apks.py
new file mode 100644
index 0000000000..b354a33a33
--- /dev/null
+++ b/.github/scripts/move-apks.py
@@ -0,0 +1,16 @@
+from pathlib import Path
+import shutil
+
+REPO_APK_DIR = Path("repo/apk")
+
+try:
+    shutil.rmtree(REPO_APK_DIR)
+except FileNotFoundError:
+    pass
+
+REPO_APK_DIR.mkdir(parents=True, exist_ok=True)
+
+for apk in (Path.home() / "apk-artifacts").glob("**/*.apk"):
+    apk_name = apk.name.replace("-release.apk", ".apk")
+
+    shutil.move(apk, REPO_APK_DIR / apk_name)
diff --git a/.github/scripts/move-apks.sh b/.github/scripts/move-apks.sh
deleted file mode 100755
index 6ec1b90346..0000000000
--- a/.github/scripts/move-apks.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -e
-shopt -s globstar nullglob extglob
-
-# Get APKs from previous jobs' artifacts
-cp -R ~/apk-artifacts/ $PWD
-APKS=( **/*".apk" )
-
-# Fail if too little extensions seem to have been built
-if [ "${#APKS[@]}" -le "50" ]; then
-    echo "Insufficient amount of APKs found. Please check the project configuration."
-    exit 1
-else
-    echo "Moving ${#APKS[@]} APKs"
-fi
-
-DEST=$PWD/apk
-rm -rf $DEST && mkdir -p $DEST
-
-for APK in ${APKS[@]}; do
-    BASENAME=$(basename $APK)
-    APKNAME="${BASENAME%%+(-release*)}.apk"
-    APKDEST="$DEST/$APKNAME"
-
-    cp $APK $APKDEST
-done
diff --git a/.github/workflows/batch_close_issues.yml b/.github/workflows/batch_close_issues.yml
index 4f987fab81..2e5ac860a8 100644
--- a/.github/workflows/batch_close_issues.yml
+++ b/.github/workflows/batch_close_issues.yml
@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         # Close everything older than ~6 months
diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index 3efb5344f2..618cd53018 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -2,9 +2,11 @@ name: PR build check
 
 on:
   pull_request:
-    paths-ignore:
-      - '**.md'
-      - '.github/workflows/issue_moderator.yml'
+    paths:
+      - '**'
+      - '!**.md'
+      - '!.github/**'
+      - '.github/workflows/build_pull_request.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -26,20 +28,20 @@ jobs:
       CI_MODULE_GEN: true
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
-          distribution: adopt
+          distribution: temurin
 
       - id: get-changed-files
         name: Get changed files
-        uses: Ana06/get-changed-files@v2.2.0
+        uses: Ana06/get-changed-files@e0c398b7065a8d84700c471b6afc4116d1ba4e96 # v2.2.0
 
       - id: parse-changed-files
         name: Parse changed files
@@ -64,11 +66,12 @@ jobs:
           echo "isIndividualChanged=$isIndividualChanged" >> $GITHUB_OUTPUT
           echo "isMultisrcChanged=$isMultisrcChanged" >> $GITHUB_OUTPUT
 
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
+
       - name: Generate multisrc sources
         if: ${{ steps.parse-changed-files.outputs.isMultisrcChanged == '1' }}
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: :multisrc:generateExtensions
+        run: ./gradlew :multisrc:generateExtensions
 
       - name: Get number of modules
         run: |
@@ -80,7 +83,7 @@ jobs:
 
       - id: generate-matrices
         name: Create output matrices
-        uses: actions/github-script@v7
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES;
@@ -105,30 +108,29 @@ jobs:
       matrix: ${{ fromJSON(needs.prepare.outputs.multisrcMatrix) }}
     steps:
       - name: Checkout PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
-          distribution: adopt
+          distribution: temurin
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
+        with:
+          cache-read-only: true
 
       - name: Generate sources from the multi-source library
-        uses: gradle/gradle-build-action@v2
         env:
           CI_MODULE_GEN: "true"
-        with:
-          arguments: :multisrc:generateExtensions
-          cache-read-only: true
+        run: ./gradlew :multisrc:generateExtensions
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "true"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
-        with:
-          arguments: assembleDebug
-          cache-read-only: true
+        run: ./gradlew assembleDebug
 
   build_individual:
     name: Build individual modules
@@ -139,19 +141,21 @@ jobs:
       matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }}
     steps:
       - name: Checkout PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
-          distribution: adopt
+          distribution: temurin
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
+        with:
+          cache-read-only: true
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "false"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
-        with:
-          arguments: assembleDebug
-          cache-read-only: true
+        run: ./gradlew assembleDebug
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 1194a9b495..9b7cde3456 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -4,9 +4,12 @@ on:
   push:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
-      - '.github/workflows/issue_moderator.yml'
+    paths:
+      - '**'
+      - '!**.md'
+      - '!.github/**'
+      - '.github/scripts/**'
+      - '.github/workflows/build_push.yml'
 
 concurrency:
   group: ${{ github.workflow }}
@@ -26,46 +29,48 @@ jobs:
       CI_MODULE_GEN: true
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           ref: master
           token: ${{ secrets.ANIYOMIORG_BOT_PAT }}
 
       - name: Find lib changes
         id: modified-libs
-        uses: tj-actions/changed-files@v40
+        uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959 #v42
         with:
-          files: lib/**
+          files: lib/
           files_ignore: lib/**.md
           files_separator: " "
-        # This step is going to commit, but this will not trigger another workflow.
+          safe_output: false
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
           git_user_signingkey: true
           git_commit_gpgsign: true
 
+        # This step is going to commit, but this will not trigger another workflow.
       - name: Bump extensions that uses a modified lib
         if: steps.modified-libs.outputs.any_changed == 'true'
         run: |
           ./.github/scripts/bump-versions.sh ${{ steps.modified-libs.outputs.all_changed_files }}
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
-          distribution: adopt
+          distribution: temurin
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
 
       - name: Generate multisrc sources
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: :multisrc:generateExtensions
+        run: ./gradlew :multisrc:generateExtensions
 
       - name: Get number of modules
         run: |
@@ -77,7 +82,7 @@ jobs:
 
       - id: generate-matrices
         name: Create output matrices
-        uses: actions/github-script@v7
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             const numIndividualModules = process.env.NUM_INDIVIDUAL_MODULES;
@@ -101,40 +106,39 @@ jobs:
       matrix: ${{ fromJSON(needs.prepare.outputs.multisrcMatrix) }}
     steps:
       - name: Checkout master branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           ref: master
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
-          distribution: adopt
+          distribution: temurin
 
       - name: Prepare signing key
         run: |
           echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
 
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
+
       - name: Generate sources from the multi-source library
-        uses: gradle/gradle-build-action@v2
         env:
           CI_MODULE_GEN: "true"
-        with:
-          arguments: :multisrc:generateExtensions
+        run: ./gradlew :multisrc:generateExtensions
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "true"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
           ALIAS: ${{ secrets.ALIAS }}
           KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        with:
-          arguments: assembleRelease
+        run: ./gradlew assembleRelease
 
       - name: Upload APKs (chunk ${{ matrix.chunk }})
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
         if: "github.repository == 'aniyomiorg/aniyomi-extensions'"
         with:
           name: "multisrc-apks-${{ matrix.chunk }}"
@@ -152,33 +156,34 @@ jobs:
       matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }}
     steps:
       - name: Checkout master branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           ref: master
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
-          distribution: adopt
+          distribution: temurin
 
       - name: Prepare signing key
         run: |
           echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
 
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
+
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "false"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
           ALIAS: ${{ secrets.ALIAS }}
           KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        with:
-          arguments: assembleRelease
+        run: ./gradlew assembleRelease
 
       - name: Upload APKs (chunk ${{ matrix.chunk }})
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
         if: "github.repository == 'aniyomiorg/aniyomi-extensions'"
         with:
           name: "individual-apks-${{ matrix.chunk }}"
@@ -197,18 +202,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download APK artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4
         with:
           path: ~/apk-artifacts
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
         with:
           java-version: 17
-          distribution: adopt
+          distribution: temurin
 
       - name: Checkout master branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           ref: master
           path: master
@@ -216,21 +221,22 @@ jobs:
       - name: Create repo artifacts
         run: |
           cd master
-          ./.github/scripts/move-apks.sh
+          python ./.github/scripts/move-apks.py
           INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')"
           curl -L "$INSPECTOR_LINK" -o ./Inspector.jar
-          java -jar ./Inspector.jar "apk" "output.json" "tmp"
-          ./.github/scripts/create-repo.sh
+          java -jar ./Inspector.jar "repo/apk" "output.json" "tmp"
+          python ./.github/scripts/create-repo.py
 
       - name: Checkout repo branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
+          repository: aniyomiorg/aniyomi-extensions
+          token: ${{ secrets.ANIYOMIORG_BOT_PAT }}
           ref: repo
           path: repo
-          token: ${{ secrets.ANIYOMIORG_BOT_PAT }}
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index 3379bd6726..9736e440c3 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -14,9 +14,8 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '2'
           pr-inactive-days: '2'
-          process-only: 'issues, prs'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5259989892..117780d3ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -184,7 +184,7 @@ The simplest extension structure looks like this:
 ```console
 $ tree src/<lang>/<mysourcename>/
 src/<lang>/<mysourcename>/
-├── AndroidManifest.xml
+├── AndroidManifest.xml (optional)
 ├── build.gradle
 ├── build.gradle
 ├── res
@@ -215,18 +215,19 @@ src/<lang>/<mysourcename>/
 should be adapted from the site name, and can only contain lowercase ASCII letters and digits.
 Your extension code must be placed in the package `eu.kanade.tachiyomi.animeextension.<lang>.<mysourcename>`.
 
-#### AndroidManifest.xml
-A minimal [Android manifest file](https://developer.android.com/guide/topics/manifest/manifest-intro) is needed for Android to recognize a extension when it's compiled into an APK file. You can also add intent filters inside this file (see [URL intent filter](#url-intent-filter) for more information).
+#### AndroidManifest.xml (optional)
+You only need to create this file if you want to add deep linking to your extension.
+See [URL intent filter](#url-intent-filter) for more information.
 
 #### build.gradle
 Make sure that your new extension's `build.gradle` file follows the following structure:
 
-```gradle
+```groovy
 ext {
     extName = '<My source name>'
     extClass = '.<MySourceName>'
     extVersionCode = 1
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
@@ -237,10 +238,9 @@ apply from: "$rootDir/common.gradle"
 | `extName` | The name of the extension. Should be romanized if site name is not in English.|
 | `extClass` | Points to the class that implements `AnimeSource`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). |
 | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code. |
-| `libVersion` | (Optional, defaults to `14`) The version of the [extensions library](https://github.com/aniyomiorg/extensions-lib) used. |
-| `containsNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. |
+| `isNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. |
 
-The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `14`.
+The extension's version name is generated automatically by concatenating `14` and `extVersionCode`. With the example used above, the version would be `14.1`.
 
 ### Core dependencies
 
@@ -250,31 +250,31 @@ Extensions rely on [extensions-lib](https://github.com/aniyomiorg/extensions-lib
 
 #### CryptoAES library
 
-The [`lib-cryptoaes`](https://github.com/aniyomiorg/aniyomi-extensions/tree/master/lib/cryptoaes) provides utilities for decrypting AES-encrypted data, like data encrypted with AES+EvpKDF (The key-derivation algorithm used by the [cryptojs](https://cryptojs.gitbook.io/docs/) library). It also includes some utilities to decrypt strings in the [jsfuck](https://jsfuck.com/) format.
+The [`cryptoaes`](https://github.com/aniyomiorg/aniyomi-extensions/tree/master/lib/cryptoaes) provides utilities for decrypting AES-encrypted data, like data encrypted with AES+EvpKDF (The key-derivation algorithm used by the [cryptojs](https://cryptojs.gitbook.io/docs/) library). It also includes some utilities to decrypt strings in the [jsfuck](https://jsfuck.com/) format.
 
-```gradle
+```groovy
 dependencies {
-    implementation(project(":lib-cryptoaes"))
+    implementation(project(":lib:cryptoaes"))
 }
 ```
 
 #### Unpacker library
 
-The [`lib-unpacker`](https://github.com/aniyomiorg/aniyomi-extensions/tree/master/lib/unpacker) library provides a deobfuscator(unpacker) for javascript code obfuscated with the [jspacker](http://dean.edwards.name/packer/) algorithm.
+The [`unpacker`](https://github.com/aniyomiorg/aniyomi-extensions/tree/master/lib/unpacker) library provides a deobfuscator(unpacker) for javascript code obfuscated with the [jspacker](http://dean.edwards.name/packer/) algorithm.
 
-```gradle
+```groovy
 dependencies {
-    implementation(project(":lib-unpacker"))
+    implementation(project(":lib:unpacker"))
 }
 ```
 
 #### Synchrony library
 
-[`lib-synchrony`](https://github.com/aniyomiorg/aniyomi-extensions/tree/master/lib/synchrony) is a library that bundles and runs the [synchrony](https://github.com/relative/synchrony) deobfuscator with your extension to help when deobfuscating obfuscated javascript. Useful to get data on highly obfuscated javascript code.
+[`synchrony`](https://github.com/aniyomiorg/aniyomi-extensions/tree/master/lib/synchrony) is a library that bundles and runs the [synchrony](https://github.com/relative/synchrony) deobfuscator with your extension to help when deobfuscating obfuscated javascript. Useful to get data on highly obfuscated javascript code.
 
-```gradle
+```groovy
 dependencies {
-    implementation(project(":lib-synchrony"))
+    implementation(project(":lib:synchrony"))
 }
 ```
 
@@ -707,6 +707,6 @@ Please **do test your changes by compiling it through Android Studio** before su
 - Update `extVersionCode` value in `build.gradle` for individual extensions
 - Update `overrideVersionCode` or `baseVersionCode` as needed for all multisrc extensions
 - Reference all related issues in the PR body (e.g. "Closes #xyz")
-- Add the `containsNsfw = true` flag in `build.gradle` when appropriate
+- Add the `isNsfw = true` flag in `build.gradle` when appropriate
 - Explicitly kept the `id` if a source's name or language were changed
 - Test the modifications by compiling and running the extension through Android Studio
diff --git a/common.gradle b/common.gradle
index 043b135401..77d38ccfb6 100644
--- a/common.gradle
+++ b/common.gradle
@@ -3,6 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'org.jmailen.kotlinter'
 
+assert !ext.has("pkgNameSuffix")
+assert !ext.has("libVersion")
+
+assert extName.chars().max().asInt < 0x180 : "Extension name should be romanized"
+
 android {
     compileSdkVersion AndroidConfig.compileSdk
     namespace AndroidConfig.namespace
@@ -26,27 +31,15 @@ android {
         targetSdkVersion AndroidConfig.targetSdk
         applicationIdSuffix project.parent.name + "." + project.name
         versionCode extVersionCode
-        versionName project.ext.properties.getOrDefault("libVersion", "14") + ".$extVersionCode"
+        versionName "14.$extVersionCode"
         base {
             archivesName = "aniyomi-$applicationIdSuffix-v$versionName"
         }
-        def readmes = project.projectDir.listFiles({ File file ->
-            file.name.equals("README.md") ||
-                    file.name.equals("CHANGELOG.md")
-        } as FileFilter)
-        def hasReadme = readmes != null && readmes.any { File file ->
-            file.name.startsWith("README")
-        }
-        def hasChangelog = readmes != null && readmes.any { File file ->
-            file.name.startsWith("CHANGELOG")
-        }
+        assert extClass.startsWith(".")
         manifestPlaceholders = [
                 appName : "Aniyomi: $extName",
                 extClass: extClass,
-                extFactory: project.ext.properties.getOrDefault("extFactory", ""),
-                nsfw: project.ext.properties.getOrDefault("containsNsfw", false) ? 1 : 0,
-                hasReadme: hasReadme ? 1 : 0,
-                hasChangelog: hasChangelog ? 1 : 0,
+                nsfw: project.ext.find("isNsfw") ? 1 : 0,
         ]
     }
 
@@ -104,6 +97,20 @@ configurations.all {
     }
 }
 
+tasks.register("writeManifestFile") {
+    doLast {
+        def manifest = android.sourceSets.getByName("main").manifest
+        if (!manifest.srcFile.exists()) {
+            File tempFile = layout.buildDirectory.get().file("tempAndroidManifest.xml").getAsFile()
+            if (!tempFile.exists()) {
+                tempFile.withWriter {
+                    it.write('<?xml version="1.0" encoding="utf-8"?>\n<manifest />\n')
+                }
+            }
+            manifest.srcFile(tempFile.path)
+        }
+    }
+}
 
-preBuild.dependsOn(lintKotlin)
+preBuild.dependsOn(writeManifestFile, lintKotlin)
 lintKotlin.dependsOn(formatKotlin)
diff --git a/core/AndroidManifest.xml b/core/AndroidManifest.xml
index 69d20672a7..6972ec620d 100644
--- a/core/AndroidManifest.xml
+++ b/core/AndroidManifest.xml
@@ -6,10 +6,7 @@
     <application android:icon="@mipmap/ic_launcher" android:allowBackup="false" android:label="${appName}">
 
         <meta-data android:name="tachiyomi.animeextension.class" android:value="${extClass}" />
-        <meta-data android:name="tachiyomi.animeextension.factory" android:value="${extFactory}" />
         <meta-data android:name="tachiyomi.animeextension.nsfw" android:value="${nsfw}" />
-        <meta-data android:name="tachiyomi.animeextension.hasReadme" android:value="${hasReadme}" />
-        <meta-data android:name="tachiyomi.animeextension.hasChangelog" android:value="${hasChangelog}" />
 
     </application>
 
diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
index 4423aa85a9..5413024d0c 100644
--- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
+++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
@@ -51,7 +51,7 @@ interface ThemeSourceGenerator {
             return listOf("eu", "kanade", "tachiyomi", "multisrc", themePkg).joinToString(separator)
         }
 
-        private fun writeGradle(gradle: File, source: ThemeSourceData, themePkg: String, baseVersionCode: Int, defaultAdditionalGradlePath: String, additionalGradleOverridePath: String) {
+        private fun writeGradle(gradle: File, source: ThemeSourceData, baseVersionCode: Int, defaultAdditionalGradlePath: String, additionalGradleOverridePath: String) {
             fun File.readTextOrEmptyString(): String = if (exists()) readText(Charsets.UTF_8) else ""
 
             val defaultAdditionalGradleText = File(defaultAdditionalGradlePath).readTextOrEmptyString()
@@ -72,9 +72,8 @@ interface ThemeSourceGenerator {
                 |ext {
                 |    extName = '${source.name}'
                 |    extClass = '.${source.className}'
-                |    extFactory = '$themePkg'
                 |    extVersionCode = ${baseVersionCode + source.overrideVersionCode + MULTISRC_LIBRARY_VERSION}
-                |    ${if (source.isNsfw) "containsNsfw = true\n" else ""}
+                |    ${if (source.isNsfw) "isNsfw = true\n" else ""}
                 |}
                 |
                 |apply from: "${'$'}rootDir/common.gradle"
@@ -100,14 +99,6 @@ interface ThemeSourceGenerator {
                 androidManifestOverride.copyTo(androidManifestFile)
             } else if (defaultAndroidManifest.exists()) {
                 defaultAndroidManifest.copyTo(androidManifestFile)
-            } else {
-                androidManifestFile.writeText(
-                    """
-                    |<?xml version="1.0" encoding="utf-8"?>
-                    |<!-- THIS FILE IS AUTO-GENERATED; DO NOT EDIT -->
-                    |<manifest />
-                    """.trimMargin(),
-                )
             }
         }
 
@@ -133,7 +124,7 @@ interface ThemeSourceGenerator {
                 projectRootFile.deleteRecursively()
                 projectRootFile.mkdirs()
 
-                writeGradle(projectGradleFile, source, themePkg, baseVersionCode, defaultAdditionalGradlePath, additionalGradleOverridePath)
+                writeGradle(projectGradleFile, source, baseVersionCode, defaultAdditionalGradlePath, additionalGradleOverridePath)
                 writeAndroidManifest(projectAndroidManifestFile, manifestOverridePath, defaultAndroidManifestPath)
 
                 writeSourceClasses(projectSrcPath, srcOverridePath, source, themePkg, themeClass)
diff --git a/src/all/animeonsen/AndroidManifest.xml b/src/all/animeonsen/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/src/all/animeonsen/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/src/all/animeworldindia/AndroidManifest.xml b/src/all/animeworldindia/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/all/animeworldindia/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/all/googledrive/AndroidManifest.xml b/src/all/googledrive/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/all/googledrive/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/all/googledriveindex/AndroidManifest.xml b/src/all/googledriveindex/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/all/googledriveindex/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/all/javguru/build.gradle b/src/all/javguru/build.gradle
index 4146261963..6bb358715d 100644
--- a/src/all/javguru/build.gradle
+++ b/src/all/javguru/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Jav Guru'
     extClass = '.JavGuru'
     extVersionCode = 10
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/jellyfin/AndroidManifest.xml b/src/all/jellyfin/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/all/jellyfin/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/all/kamyroll/AndroidManifest.xml b/src/all/kamyroll/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/all/kamyroll/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/all/missav/AndroidManifest.xml b/src/all/missav/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/src/all/missav/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/src/all/missav/build.gradle b/src/all/missav/build.gradle
index 11266c304f..2daac610f6 100644
--- a/src/all/missav/build.gradle
+++ b/src/all/missav/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'MissAV'
     extClass = '.MissAV'
     extVersionCode = 6
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/supjav/build.gradle b/src/all/supjav/build.gradle
index c3182d2b76..e743d1f6ed 100644
--- a/src/all/supjav/build.gradle
+++ b/src/all/supjav/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'SupJav'
     extClass = '.SupJavFactory'
     extVersionCode = 2
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/akwam/AndroidManifest.xml b/src/ar/akwam/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/akwam/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/akwam/build.gradle b/src/ar/akwam/build.gradle
index 175be6ee4a..fed8424f7c 100644
--- a/src/ar/akwam/build.gradle
+++ b/src/ar/akwam/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    extName = 'أكوام'
+    extName = 'Akwam'
     extClass = '.Akwam'
     extVersionCode = 9
 }
diff --git a/src/ar/anime4up/AndroidManifest.xml b/src/ar/anime4up/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/anime4up/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/animeblkom/AndroidManifest.xml b/src/ar/animeblkom/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/animeblkom/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/animeblkom/build.gradle b/src/ar/animeblkom/build.gradle
index 88fd61e7d6..48bc17bbeb 100644
--- a/src/ar/animeblkom/build.gradle
+++ b/src/ar/animeblkom/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    extName = 'أنمي بالكوم'
+    extName = 'Anime Blkom'
     extClass = '.AnimeBlkom'
     extVersionCode = 17
 }
diff --git a/src/ar/animeiat/AndroidManifest.xml b/src/ar/animeiat/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/animeiat/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/animelek/AndroidManifest.xml b/src/ar/animelek/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/animelek/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/animerco/AndroidManifest.xml b/src/ar/animerco/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/animerco/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/arabanime/AndroidManifest.xml b/src/ar/arabanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/arabanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/arabseed/AndroidManifest.xml b/src/ar/arabseed/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/arabseed/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/arabseed/build.gradle b/src/ar/arabseed/build.gradle
index e37755ed44..ec0e5571df 100644
--- a/src/ar/arabseed/build.gradle
+++ b/src/ar/arabseed/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    extName = 'عرب سيد'
+    extName = 'Arab Seed'
     extClass = '.ArabSeed'
     extVersionCode = 10
 }
@@ -10,4 +10,4 @@ dependencies {
     implementation(project(":lib:dood-extractor"))
     implementation(project(":lib:voe-extractor"))
     implementation(project(":lib:streamwish-extractor"))
-}
\ No newline at end of file
+}
diff --git a/src/ar/asia2tv/AndroidManifest.xml b/src/ar/asia2tv/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/asia2tv/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/egydead/AndroidManifest.xml b/src/ar/egydead/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/egydead/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/faselhd/AndroidManifest.xml b/src/ar/faselhd/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/faselhd/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/faselhd/build.gradle b/src/ar/faselhd/build.gradle
index 2a22252f62..117af3b0d2 100644
--- a/src/ar/faselhd/build.gradle
+++ b/src/ar/faselhd/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    extName = 'فاصل اعلاني'
+    extName = 'FASELHD'
     extClass = '.FASELHD'
     extVersionCode = 14
 }
diff --git a/src/ar/mycima/AndroidManifest.xml b/src/ar/mycima/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/mycima/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/tuktukcinema/AndroidManifest.xml b/src/ar/tuktukcinema/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/tuktukcinema/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/tuktukcinema/build.gradle b/src/ar/tuktukcinema/build.gradle
index 744e1e40b5..7c7d90a0a7 100644
--- a/src/ar/tuktukcinema/build.gradle
+++ b/src/ar/tuktukcinema/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    extName = 'توك توك سينما'
+    extName = 'Tuktuk Cinema'
     extClass = '.Tuktukcinema'
     extVersionCode = 16
 }
@@ -14,4 +14,4 @@ dependencies {
     implementation(project(':lib:vidbom-extractor'))
     implementation(project(':lib:playlist-utils'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
-}
\ No newline at end of file
+}
diff --git a/src/ar/witanime/AndroidManifest.xml b/src/ar/witanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/witanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/xsanime/AndroidManifest.xml b/src/ar/xsanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/xsanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ar/xsmovie/AndroidManifest.xml b/src/ar/xsmovie/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ar/xsmovie/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/aniflix/AndroidManifest.xml b/src/de/aniflix/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/aniflix/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/aniking/AndroidManifest.xml b/src/de/aniking/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/aniking/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/animebase/AndroidManifest.xml b/src/de/animebase/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/animebase/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/animebase/build.gradle b/src/de/animebase/build.gradle
index 91b7c261fe..209db7e599 100644
--- a/src/de/animebase/build.gradle
+++ b/src/de/animebase/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Anime-Base'
     extClass = '.AnimeBase'
     extVersionCode = 19
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animeloads/AndroidManifest.xml b/src/de/animeloads/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/animeloads/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/animeloads/build.gradle b/src/de/animeloads/build.gradle
index 4055b4295d..8e4c237c2b 100644
--- a/src/de/animeloads/build.gradle
+++ b/src/de/animeloads/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Anime-Loads'
     extClass = '.AnimeLoads'
     extVersionCode = 12
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animestream/AndroidManifest.xml b/src/de/animestream/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/animestream/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/animetoast/AndroidManifest.xml b/src/de/animetoast/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/animetoast/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/aniworld/AndroidManifest.xml b/src/de/aniworld/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/aniworld/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/cineclix/AndroidManifest.xml b/src/de/cineclix/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/cineclix/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/filmpalast/AndroidManifest.xml b/src/de/filmpalast/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/filmpalast/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/kool/AndroidManifest.xml b/src/de/kool/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/kool/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/moflixstream/AndroidManifest.xml b/src/de/moflixstream/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/moflixstream/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/movie2k/AndroidManifest.xml b/src/de/movie2k/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/movie2k/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/movie4k/AndroidManifest.xml b/src/de/movie4k/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/movie4k/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/serienstream/AndroidManifest.xml b/src/de/serienstream/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/serienstream/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/de/streamcloud/AndroidManifest.xml b/src/de/streamcloud/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/de/streamcloud/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/allanime/AndroidManifest.xml b/src/en/allanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/allanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/allanimechi/AndroidManifest.xml b/src/en/allanimechi/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/allanimechi/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/allmovies/AndroidManifest.xml b/src/en/allmovies/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/allmovies/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/animeflix/AndroidManifest.xml b/src/en/animeflix/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/animeflix/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/animension/AndroidManifest.xml b/src/en/animension/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/animension/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/animeowl/AndroidManifest.xml b/src/en/animeowl/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/animeowl/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/animepahe/AndroidManifest.xml b/src/en/animepahe/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/animepahe/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/animeparadise/AndroidManifest.xml b/src/en/animeparadise/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/animeparadise/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/animetake/AndroidManifest.xml b/src/en/animetake/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/animetake/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/animetake/build.gradle b/src/en/animetake/build.gradle
index e20f3b74e3..84e37b9621 100644
--- a/src/en/animetake/build.gradle
+++ b/src/en/animetake/build.gradle
@@ -2,7 +2,6 @@ ext {
     extName = 'AnimeTake'
     extClass = '.AnimeTake'
     extVersionCode = 4
-    containsNsfw = false
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +11,4 @@ dependencies {
     implementation(project(":lib:mp4upload-extractor"))
     implementation(project(":lib:filemoon-extractor"))
     implementation(project(":lib:gogostream-extractor"))
-}
\ No newline at end of file
+}
diff --git a/src/en/animeui/AndroidManifest.xml b/src/en/animeui/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/animeui/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/asiaflix/AndroidManifest.xml b/src/en/asiaflix/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/src/en/asiaflix/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/src/en/asianload/AndroidManifest.xml b/src/en/asianload/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/asianload/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/ask4movie/AndroidManifest.xml b/src/en/ask4movie/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/ask4movie/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/bestdubbedanime/AndroidManifest.xml b/src/en/bestdubbedanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/bestdubbedanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/dramacool/AndroidManifest.xml b/src/en/dramacool/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/dramacool/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/edytjedhgmdhm/AndroidManifest.xml b/src/en/edytjedhgmdhm/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/edytjedhgmdhm/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/fmovies/AndroidManifest.xml b/src/en/fmovies/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/fmovies/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/genoanime/AndroidManifest.xml b/src/en/genoanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/genoanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/gogoanime/AndroidManifest.xml b/src/en/gogoanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/gogoanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/hahomoe/AndroidManifest.xml b/src/en/hahomoe/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/hahomoe/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/hahomoe/build.gradle b/src/en/hahomoe/build.gradle
index 3bf5fde2b3..79234385a8 100644
--- a/src/en/hahomoe/build.gradle
+++ b/src/en/hahomoe/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'haho.moe'
     extClass = '.HahoMoe'
     extVersionCode = 10
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/hanime/AndroidManifest.xml b/src/en/hanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/hanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/hanime/build.gradle b/src/en/hanime/build.gradle
index 17e8a1fe17..01ed60c3c2 100644
--- a/src/en/hanime/build.gradle
+++ b/src/en/hanime/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'hanime.tv'
     extClass = '.Hanime'
     extVersionCode = 17
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/en/hentaimama/AndroidManifest.xml b/src/en/hentaimama/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/hentaimama/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/hentaimama/build.gradle b/src/en/hentaimama/build.gradle
index b9b08d7ac9..76c0997158 100644
--- a/src/en/hentaimama/build.gradle
+++ b/src/en/hentaimama/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'HentaiMama'
     extClass = '.HentaiMama'
     extVersionCode = 7
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/hstream/build.gradle b/src/en/hstream/build.gradle
index 9b82c44649..2d1d078cff 100644
--- a/src/en/hstream/build.gradle
+++ b/src/en/hstream/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Hstream'
     extClass = '.Hstream'
     extVersionCode = 7
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/kawaiifu/AndroidManifest.xml b/src/en/kawaiifu/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/kawaiifu/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/kawaiifu/build.gradle b/src/en/kawaiifu/build.gradle
index 12f2228c84..acd537336f 100644
--- a/src/en/kawaiifu/build.gradle
+++ b/src/en/kawaiifu/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Kawaiifu'
     extClass = '.Kawaiifu'
     extVersionCode = 4
-    containsNsfw = true
+    isNsfw = true
 }
 
 
diff --git a/src/en/kayoanime/AndroidManifest.xml b/src/en/kayoanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/kayoanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/kimoitv/AndroidManifest.xml b/src/en/kimoitv/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/kimoitv/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/kissanime/AndroidManifest.xml b/src/en/kissanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/kissanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/kisskh/AndroidManifest.xml b/src/en/kisskh/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/kisskh/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/myanime/AndroidManifest.xml b/src/en/myanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/myanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/nineanime/AndroidManifest.xml b/src/en/nineanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/nineanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/nollyverse/AndroidManifest.xml b/src/en/nollyverse/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/nollyverse/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/nollyverse/build.gradle b/src/en/nollyverse/build.gradle
index 2bd94f69c6..97bdc44dbf 100644
--- a/src/en/nollyverse/build.gradle
+++ b/src/en/nollyverse/build.gradle
@@ -1,9 +1,5 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
 ext {
     extName = 'NollyVerse'
-    pkgNameSuffix = 'en.nollyverse'
     extClass = '.NollyVerse'
     extVersionCode = 3
 }
diff --git a/src/en/noobsubs/AndroidManifest.xml b/src/en/noobsubs/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/noobsubs/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/oppaistream/AndroidManifest.xml b/src/en/oppaistream/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/oppaistream/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/oppaistream/build.gradle b/src/en/oppaistream/build.gradle
index c6b199c7ca..e2a10f04f4 100644
--- a/src/en/oppaistream/build.gradle
+++ b/src/en/oppaistream/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Oppai Stream'
     extClass = '.OppaiStream'
     extVersionCode = 3
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/putlocker/AndroidManifest.xml b/src/en/putlocker/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/putlocker/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/ripcrabbyanime/AndroidManifest.xml b/src/en/ripcrabbyanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/ripcrabbyanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/rule34video/build.gradle b/src/en/rule34video/build.gradle
index 99f9bd545d..1ab31bdb1a 100644
--- a/src/en/rule34video/build.gradle
+++ b/src/en/rule34video/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Rule34Video'
     extClass = '.Rule34Video'
     extVersionCode = 8
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/seez/AndroidManifest.xml b/src/en/seez/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/seez/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/superstream/AndroidManifest.xml b/src/en/superstream/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/superstream/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/tokuzilla/AndroidManifest.xml b/src/en/tokuzilla/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/src/en/tokuzilla/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/src/en/tokuzilla/build.gradle b/src/en/tokuzilla/build.gradle
index c551478d48..d145237a28 100644
--- a/src/en/tokuzilla/build.gradle
+++ b/src/en/tokuzilla/build.gradle
@@ -2,11 +2,10 @@ ext {
     extName = 'Tokuzilla'
     extClass = '.Tokuzilla'
     extVersionCode = 15
-    containsNsfw = false
 }
 
 apply from: "$rootDir/common.gradle"
 
 dependencies {
     implementation(project(':lib:chillx-extractor'))
-}
\ No newline at end of file
+}
diff --git a/src/en/uhdmovies/AndroidManifest.xml b/src/en/uhdmovies/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/uhdmovies/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/wcofun/AndroidManifest.xml b/src/en/wcofun/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/wcofun/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/en/wcostream/AndroidManifest.xml b/src/en/wcostream/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/en/wcostream/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/animefenix/AndroidManifest.xml b/src/es/animefenix/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/animefenix/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/animeflv/AndroidManifest.xml b/src/es/animeflv/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/animeflv/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/animeid/AndroidManifest.xml b/src/es/animeid/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/animeid/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/animelatinohd/AndroidManifest.xml b/src/es/animelatinohd/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/animelatinohd/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/animemovil/AndroidManifest.xml b/src/es/animemovil/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/animemovil/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/animeyt/AndroidManifest.xml b/src/es/animeyt/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/animeyt/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/asialiveaction/AndroidManifest.xml b/src/es/asialiveaction/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/asialiveaction/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/cuevana/AndroidManifest.xml b/src/es/cuevana/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/cuevana/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/doramasflix/AndroidManifest.xml b/src/es/doramasflix/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/doramasflix/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/doramasyt/AndroidManifest.xml b/src/es/doramasyt/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/doramasyt/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/ennovelas/AndroidManifest.xml b/src/es/ennovelas/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/ennovelas/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/fanpelis/AndroidManifest.xml b/src/es/fanpelis/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/fanpelis/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/gnula/AndroidManifest.xml b/src/es/gnula/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/gnula/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/hackstore/AndroidManifest.xml b/src/es/hackstore/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/hackstore/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/hentaijk/AndroidManifest.xml b/src/es/hentaijk/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/hentaijk/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/hentaijk/build.gradle b/src/es/hentaijk/build.gradle
index a00f5a82f2..8bf9830d1b 100644
--- a/src/es/hentaijk/build.gradle
+++ b/src/es/hentaijk/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Hentaijk'
     extClass = '.Hentaijk'
     extVersionCode = 12
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/hentaila/AndroidManifest.xml b/src/es/hentaila/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/hentaila/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index 8a0f098c43..28439efea6 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'HentaiLA'
     extClass = '.Hentaila'
     extVersionCode = 20
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/jkanime/AndroidManifest.xml b/src/es/jkanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/jkanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/jkhentai/AndroidManifest.xml b/src/es/jkhentai/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/jkhentai/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/jkhentai/build.gradle b/src/es/jkhentai/build.gradle
index 4de7f5cd92..9f262d2069 100644
--- a/src/es/jkhentai/build.gradle
+++ b/src/es/jkhentai/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Jkhentai'
     extClass = '.Jkhentai'
     extVersionCode = 9
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/latanime/AndroidManifest.xml b/src/es/latanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/latanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/legionanime/AndroidManifest.xml b/src/es/legionanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/legionanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/locopelis/AndroidManifest.xml b/src/es/locopelis/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/locopelis/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/metroseries/AndroidManifest.xml b/src/es/metroseries/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/metroseries/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/monoschinos/AndroidManifest.xml b/src/es/monoschinos/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/monoschinos/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/mundodonghua/AndroidManifest.xml b/src/es/mundodonghua/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/mundodonghua/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/pelisflix/AndroidManifest.xml b/src/es/pelisflix/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/pelisflix/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/pelisforte/AndroidManifest.xml b/src/es/pelisforte/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/pelisforte/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/pelisplushd/AndroidManifest.xml b/src/es/pelisplushd/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/pelisplushd/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/es/tioanimeh/AndroidManifest.xml b/src/es/tioanimeh/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/es/tioanimeh/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/fr/animesama/build.gradle b/src/fr/animesama/build.gradle
index e31c9136d2..4b95422306 100644
--- a/src/fr/animesama/build.gradle
+++ b/src/fr/animesama/build.gradle
@@ -2,7 +2,6 @@ ext {
     extName = 'Anime-Sama'
     extClass = '.AnimeSama'
     extVersionCode = 8
-    containsNsfw = false
 }
 
 apply from: "$rootDir/common.gradle"
@@ -11,4 +10,4 @@ dependencies {
     implementation(project(':lib:sibnet-extractor'))
     implementation(project(':lib:vk-extractor'))
     implementation(project(':lib:sendvid-extractor'))
-}
\ No newline at end of file
+}
diff --git a/src/fr/animevostfr/AndroidManifest.xml b/src/fr/animevostfr/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/src/fr/animevostfr/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/src/fr/empirestreaming/AndroidManifest.xml b/src/fr/empirestreaming/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/fr/empirestreaming/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/fr/franime/AndroidManifest.xml b/src/fr/franime/AndroidManifest.xml
index 0c612a2391..51c2c34a17 100644
--- a/src/fr/franime/AndroidManifest.xml
+++ b/src/fr/franime/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.animeextension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity
                 android:name=".fr.franime.FrAnimeUrlActivity"
@@ -19,4 +19,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/src/fr/franime/build.gradle b/src/fr/franime/build.gradle
index 287e4750ed..cf770479f5 100644
--- a/src/fr/franime/build.gradle
+++ b/src/fr/franime/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'FrAnime'
     extClass = '.FrAnime'
     extVersionCode = 11
-    containsNsfw = true
+    isNsfw = true
 }
 apply from: "$rootDir/common.gradle"
 
diff --git a/src/fr/nekosama/AndroidManifest.xml b/src/fr/nekosama/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/fr/nekosama/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/fr/nekosama/build.gradle b/src/fr/nekosama/build.gradle
index 071a79a798..58fb064b66 100644
--- a/src/fr/nekosama/build.gradle
+++ b/src/fr/nekosama/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'NekoSama'
     extClass = '.NekoSama'
     extVersionCode = 9
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/otakufr/AndroidManifest.xml b/src/fr/otakufr/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/fr/otakufr/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/fr/vostfree/AndroidManifest.xml b/src/fr/vostfree/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/fr/vostfree/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/hi/yomovies/AndroidManifest.xml b/src/hi/yomovies/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/hi/yomovies/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/hi/yomovies/build.gradle b/src/hi/yomovies/build.gradle
index 8ac6d6f66e..184650b380 100644
--- a/src/hi/yomovies/build.gradle
+++ b/src/hi/yomovies/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'YoMovies'
     extClass = '.YoMovies'
     extVersionCode = 8
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/id/kuramanime/AndroidManifest.xml b/src/id/kuramanime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/id/kuramanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/id/kuronime/AndroidManifest.xml b/src/id/kuronime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/id/kuronime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/id/neonime/AndroidManifest.xml b/src/id/neonime/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/id/neonime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/id/oploverz/AndroidManifest.xml b/src/id/oploverz/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/id/oploverz/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/id/otakudesu/AndroidManifest.xml b/src/id/otakudesu/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/id/otakudesu/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/id/samehadaku/AndroidManifest.xml b/src/id/samehadaku/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/id/samehadaku/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/it/animesaturn/AndroidManifest.xml b/src/it/animesaturn/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/it/animesaturn/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/it/animeunity/AndroidManifest.xml b/src/it/animeunity/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/it/animeunity/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/it/animeworld/AndroidManifest.xml b/src/it/animeworld/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/it/animeworld/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/it/hentaisaturn/AndroidManifest.xml b/src/it/hentaisaturn/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/it/hentaisaturn/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/it/hentaisaturn/build.gradle b/src/it/hentaisaturn/build.gradle
index df2b3ad799..b88185b222 100644
--- a/src/it/hentaisaturn/build.gradle
+++ b/src/it/hentaisaturn/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Hentai Saturn'
     extClass = '.HentaiSaturn'
     extVersionCode = 5
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/streamingcommunity/AndroidManifest.xml b/src/it/streamingcommunity/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/it/streamingcommunity/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/it/toonitalia/AndroidManifest.xml b/src/it/toonitalia/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/it/toonitalia/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/it/vvvvid/AndroidManifest.xml b/src/it/vvvvid/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/it/vvvvid/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/ko/aniweek/AndroidManifest.xml b/src/ko/aniweek/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ko/aniweek/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/pl/wbijam/AndroidManifest.xml b/src/pl/wbijam/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/pl/wbijam/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/pt/animesorion/build.gradle b/src/pt/animesorion/build.gradle
index 2c085ce0fd..2454f1b4dd 100644
--- a/src/pt/animesorion/build.gradle
+++ b/src/pt/animesorion/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Animes Órion'
     extClass = '.AnimesOrion'
     extVersionCode = 1
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animeszone/AndroidManifest.xml b/src/pt/animeszone/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/pt/animeszone/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/pt/animeszone/build.gradle b/src/pt/animeszone/build.gradle
index 401d68a39f..0c6c0fd788 100644
--- a/src/pt/animeszone/build.gradle
+++ b/src/pt/animeszone/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'AnimesZone'
     extClass = '.AnimesZone'
     extVersionCode = 6
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/anitube/AndroidManifest.xml b/src/pt/anitube/AndroidManifest.xml
deleted file mode 100644
index 5c3d3655b5..0000000000
--- a/src/pt/anitube/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest/>
diff --git a/src/pt/hentaistube/build.gradle b/src/pt/hentaistube/build.gradle
index 40799b2088..88906215f4 100644
--- a/src/pt/hentaistube/build.gradle
+++ b/src/pt/hentaistube/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'HentaisTube'
     extClass = '.HentaisTube'
     extVersionCode = 1
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/listadeanimes/AndroidManifest.xml b/src/pt/listadeanimes/AndroidManifest.xml
deleted file mode 100644
index 2ef98dca1c..0000000000
--- a/src/pt/listadeanimes/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="eu.kanade.tachiyomi.animeextension"/>
\ No newline at end of file
diff --git a/src/pt/megaflix/build.gradle b/src/pt/megaflix/build.gradle
index 2279a8a8a8..77a44fc4cd 100644
--- a/src/pt/megaflix/build.gradle
+++ b/src/pt/megaflix/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Megaflix'
     extClass = '.Megaflix'
     extVersionCode = 12
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/muitohentai/AndroidManifest.xml b/src/pt/muitohentai/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/pt/muitohentai/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/pt/muitohentai/build.gradle b/src/pt/muitohentai/build.gradle
index f25adbf255..3210a92b37 100644
--- a/src/pt/muitohentai/build.gradle
+++ b/src/pt/muitohentai/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Muito Hentai'
     extClass = '.MuitoHentai'
     extVersionCode = 2
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/vizer/build.gradle b/src/pt/vizer/build.gradle
index e88c7e2eb6..b37fbf00fc 100644
--- a/src/pt/vizer/build.gradle
+++ b/src/pt/vizer/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'Vizer.tv'
     extClass = '.Vizer'
     extVersionCode = 12
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ru/animevost/AndroidManifest.xml b/src/ru/animevost/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/ru/animevost/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/tr/hdfilmcehennemi/build.gradle b/src/tr/hdfilmcehennemi/build.gradle
index 3dd47d92a7..cbdd0bc454 100644
--- a/src/tr/hdfilmcehennemi/build.gradle
+++ b/src/tr/hdfilmcehennemi/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'HDFilmCehennemi'
     extClass = '.HDFilmCehennemi'
     extVersionCode = 9
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/hentaizm/build.gradle b/src/tr/hentaizm/build.gradle
index e2acd5eff3..400447f5ac 100644
--- a/src/tr/hentaizm/build.gradle
+++ b/src/tr/hentaizm/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'HentaiZM'
     extClass = '.HentaiZM'
     extVersionCode = 1
-    containsNsfw = true
+    isNsfw = true
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/turkanime/AndroidManifest.xml b/src/tr/turkanime/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/src/tr/turkanime/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/src/uk/uakino/AndroidManifest.xml b/src/uk/uakino/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/uk/uakino/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file
diff --git a/src/uk/ufdub/AndroidManifest.xml b/src/uk/ufdub/AndroidManifest.xml
deleted file mode 100644
index 568741e54f..0000000000
--- a/src/uk/ufdub/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
\ No newline at end of file