diff --git a/.github/actions/build-kernel/action.yml b/.github/actions/build-kernel/action.yml
index f7959801a..e34910f1f 100644
--- a/.github/actions/build-kernel/action.yml
+++ b/.github/actions/build-kernel/action.yml
@@ -984,7 +984,66 @@ runs:
         echo "ReSukiSU Version: $KSU_VERSION"
         echo "✅ ReSukiSU added (commit: ${KSU_COMMIT_SHA:0:8})"
         echo "::endgroup::"
+        
+    - name: Apply recovery-skip patch to ReSukiSU
+      shell: bash
+      if: ${{ inputs.ksu_type == 'ReSukiSU' }}
+      run: |
+        set -euo pipefail
+        echo "::group::Apply recovery-skip patch"
+        
+        # The patch file lives in the workflow repo (action-source/), NOT in
+        # WildKernels/kernel_patches — so we use action-source as the source root.
+        
+        PATCH="$GITHUB_WORKSPACE/action-source/patches/resukisu-skip-recovery.patch"
+        if [ ! -f "$PATCH" ]; then
+          echo "::warning::resukisu-skip-recovery.patch not found at $PATCH — skipping"
+        else
+          cd "$KSU_FOLDER"
+          echo "Applying recovery-skip patch against ReSukiSU source..."
+          if ! patch -p1 --fuzz=3 --forward < "$PATCH"; then
+            echo "::error::ReSukiSU recovery-skip patch failed. Rejects:"
+            find . -name "*.rej" -exec echo "=== {} ===" \; -exec cat {} \;
+            exit 1
+          fi
+          echo "✅ recovery-skip patch applied"
+        fi
+        echo "::endgroup::"
+        
+    - name: Verify recovery-skip patch landed correctly
+      if: ${{ inputs.ksu_type == 'ReSukiSU' }}
+      shell: bash
+      run: |
+        set -euo pipefail
+        f="$KSU_FOLDER/kernel/core/init.c"
+        echo "::group::Patched init.c — recovery-skip region"
 
+        # 1) Helper exists and sits ABOVE kernelsu_init
+        helper_line=$(grep -nE '^[[:space:]]*static bool __init ksu_is_recovery_boot\b' "$f" | head -1 | cut -d: -f1)
+        init_line=$(grep -nE '^[[:space:]]*int __init kernelsu_init\b'                 "$f" | head -1 | cut -d: -f1)
+        if [ -z "$helper_line" ]; then echo "::error::ksu_is_recovery_boot() helper missing"; exit 1; fi
+        if [ -z "$init_line" ];   then echo "::error::kernelsu_init() not found";               exit 1; fi
+        if [ "$helper_line" -ge "$init_line" ]; then
+          echo "::error::helper at line $helper_line is not above kernelsu_init at line $init_line"
+          exit 1
+        fi
+        echo "  helper at line $helper_line  |  kernelsu_init at line $init_line"
+
+        # 2) Guard is the FIRST statement inside kernelsu_init()
+        region=$(sed -n "${init_line},$((init_line+15))p" "$f")
+        first_stmt=$(printf '%s\n' "$region" \
+                     | sed -e '1d' -e '/^[[:space:]]*$/d' -e '/^[[:space:]]*{/d' \
+                     | head -1)
+        if ! printf '%s' "$first_stmt" | grep -qE '^[[:space:]]*if[[:space:]]*\(ksu_is_recovery_boot'; then
+          echo "::error::guard is NOT the first statement in kernelsu_init():"
+          printf '%s\n' "$region" | sed -n '1,8p'
+          exit 1
+        fi
+        echo "  ✅ guard is first statement inside kernelsu_init()"
+
+        sed -n "$((helper_line-1)),$((init_line+6))p" "$f"
+        echo "::endgroup::"
+        
     - name: Apply SUSFS Patches
       shell: bash
       if: ${{ env.OP_SUSFS == 'true' }}
diff --git a/.github/workflows/build-kernel-release.yml b/.github/workflows/build-kernel-release.yml
index a35cf52bb..c32d994fd 100644
--- a/.github/workflows/build-kernel-release.yml
+++ b/.github/workflows/build-kernel-release.yml
@@ -917,7 +917,7 @@ jobs:
                 susfs_ver="none"
               fi
               full_model="${model}_${os_version}_${kernel_version}"
-              device_info["$full_model"]="$model|$os_version|$kernel_version|$ksu_type|$ksu_ver|$susfs_ver"
+              device_info["$full_model"]="$model|$os_version|$kernel_version|$ksu_type|$ksu_ver|$susfs_ver|$zipname"
             fi
           done
           
@@ -1029,7 +1029,7 @@ jobs:
           
           if [ ${#device_info[@]} -gt 0 ]; then
             first_entry=$(printf '%s\n' "${!device_info[@]}" | sort | head -n1)
-            IFS='|' read -r _ _ _ _ _ ksu_ver_global _ <<< "${device_info["$first_entry"]}"
+            IFS='|' read -r _ _ _ _ ksu_ver_global _ _ <<< "${device_info["$first_entry"]}"
           else
             echo "::error::No device info found!" >&2
             exit 1
diff --git a/configs/oos14/OP-ACE-2V.json b/configs/oos14/OP-ACE-2V.json
index b2947ce02..e85236375 100644
--- a/configs/oos14/OP-ACE-2V.json
+++ b/configs/oos14/OP-ACE-2V.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP-ACE-3-PRO.json b/configs/oos14/OP-ACE-3-PRO.json
index 0e36ce15c..d683217f8 100644
--- a/configs/oos14/OP-ACE-3-PRO.json
+++ b/configs/oos14/OP-ACE-3-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP-ACE-RACE.json b/configs/oos14/OP-ACE-RACE.json
index 69b276ce7..f4f4708dc 100644
--- a/configs/oos14/OP-ACE-RACE.json
+++ b/configs/oos14/OP-ACE-RACE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP-ACE.json b/configs/oos14/OP-ACE.json
index 7faa6b769..33a4c3257 100644
--- a/configs/oos14/OP-ACE.json
+++ b/configs/oos14/OP-ACE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP-NORD-3.json b/configs/oos14/OP-NORD-3.json
index e6d6e8b05..0e94b7dc6 100644
--- a/configs/oos14/OP-NORD-3.json
+++ b/configs/oos14/OP-NORD-3.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP-PAD-GO.json b/configs/oos14/OP-PAD-GO.json
index 03addfc5a..8bd081563 100644
--- a/configs/oos14/OP-PAD-GO.json
+++ b/configs/oos14/OP-PAD-GO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP-PAD-MT6983.json b/configs/oos14/OP-PAD-MT6983.json
index a53d4857f..f616bbcc5 100644
--- a/configs/oos14/OP-PAD-MT6983.json
+++ b/configs/oos14/OP-PAD-MT6983.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP-PAD-PRO.json b/configs/oos14/OP-PAD-PRO.json
index 30aab0981..04900a464 100644
--- a/configs/oos14/OP-PAD-PRO.json
+++ b/configs/oos14/OP-PAD-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP10pro.json b/configs/oos14/OP10pro.json
index 6183f4176..08307b816 100644
--- a/configs/oos14/OP10pro.json
+++ b/configs/oos14/OP10pro.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP10r.json b/configs/oos14/OP10r.json
index dc211251f..5ec4a3482 100644
--- a/configs/oos14/OP10r.json
+++ b/configs/oos14/OP10r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP11.json b/configs/oos14/OP11.json
index 29902dd14..6a2faa802 100644
--- a/configs/oos14/OP11.json
+++ b/configs/oos14/OP11.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP11r.json b/configs/oos14/OP11r.json
index bafa9e743..6fdd541f1 100644
--- a/configs/oos14/OP11r.json
+++ b/configs/oos14/OP11r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos14/OP12.json b/configs/oos14/OP12.json
index 8e0f75c27..b154999ac 100644
--- a/configs/oos14/OP12.json
+++ b/configs/oos14/OP12.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-2-5.10.209.json b/configs/oos15/OP-ACE-2-5.10.209.json
index d13422c5f..863b7c6b1 100644
--- a/configs/oos15/OP-ACE-2-5.10.209.json
+++ b/configs/oos15/OP-ACE-2-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-2-PRO-5.15.149.json b/configs/oos15/OP-ACE-2-PRO-5.15.149.json
index c3c794026..96f50c06e 100644
--- a/configs/oos15/OP-ACE-2-PRO-5.15.149.json
+++ b/configs/oos15/OP-ACE-2-PRO-5.15.149.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-2-PRO.json b/configs/oos15/OP-ACE-2-PRO.json
index f7d9f5335..8b5b88489 100644
--- a/configs/oos15/OP-ACE-2-PRO.json
+++ b/configs/oos15/OP-ACE-2-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-2.json b/configs/oos15/OP-ACE-2.json
index 0d92194ca..f8b81dd5a 100644
--- a/configs/oos15/OP-ACE-2.json
+++ b/configs/oos15/OP-ACE-2.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-2V-5.10.209.json b/configs/oos15/OP-ACE-2V-5.10.209.json
index 57e74bb86..4021e365f 100644
--- a/configs/oos15/OP-ACE-2V-5.10.209.json
+++ b/configs/oos15/OP-ACE-2V-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-2V.json b/configs/oos15/OP-ACE-2V.json
index 7d69b6dd1..399ede95d 100644
--- a/configs/oos15/OP-ACE-2V.json
+++ b/configs/oos15/OP-ACE-2V.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-3-5.15.149.json b/configs/oos15/OP-ACE-3-5.15.149.json
index 4ab438c78..5bfba2819 100644
--- a/configs/oos15/OP-ACE-3-5.15.149.json
+++ b/configs/oos15/OP-ACE-3-5.15.149.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-3-PRO-6.1.75.json b/configs/oos15/OP-ACE-3-PRO-6.1.75.json
index e5b5bf800..cfabc4fba 100644
--- a/configs/oos15/OP-ACE-3-PRO-6.1.75.json
+++ b/configs/oos15/OP-ACE-3-PRO-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-3-PRO.json b/configs/oos15/OP-ACE-3-PRO.json
index a5b0ffc83..9dc8f0323 100644
--- a/configs/oos15/OP-ACE-3-PRO.json
+++ b/configs/oos15/OP-ACE-3-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-3.json b/configs/oos15/OP-ACE-3.json
index 6cb757b85..0f3c59bf0 100644
--- a/configs/oos15/OP-ACE-3.json
+++ b/configs/oos15/OP-ACE-3.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-3V-6.1.75.json b/configs/oos15/OP-ACE-3V-6.1.75.json
index e37f7a28c..627e4f4a4 100644
--- a/configs/oos15/OP-ACE-3V-6.1.75.json
+++ b/configs/oos15/OP-ACE-3V-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-3V.json b/configs/oos15/OP-ACE-3V.json
index e4a40a205..a0aad9471 100644
--- a/configs/oos15/OP-ACE-3V.json
+++ b/configs/oos15/OP-ACE-3V.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5-6.1.75.json b/configs/oos15/OP-ACE-5-6.1.75.json
index 0dc11be24..ad39d4089 100644
--- a/configs/oos15/OP-ACE-5-6.1.75.json
+++ b/configs/oos15/OP-ACE-5-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5-PRO-6.6.30.json b/configs/oos15/OP-ACE-5-PRO-6.6.30.json
index f1c8a5b91..1c83a65c8 100644
--- a/configs/oos15/OP-ACE-5-PRO-6.6.30.json
+++ b/configs/oos15/OP-ACE-5-PRO-6.6.30.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5-PRO.json b/configs/oos15/OP-ACE-5-PRO.json
index 9272541a2..f5b61fd0c 100644
--- a/configs/oos15/OP-ACE-5-PRO.json
+++ b/configs/oos15/OP-ACE-5-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5-RACE.json b/configs/oos15/OP-ACE-5-RACE.json
index 04ab03b15..93dc471b3 100644
--- a/configs/oos15/OP-ACE-5-RACE.json
+++ b/configs/oos15/OP-ACE-5-RACE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5-ULTRA-6.6.50.json b/configs/oos15/OP-ACE-5-ULTRA-6.6.50.json
index e33ba6d20..7e2fe6578 100644
--- a/configs/oos15/OP-ACE-5-ULTRA-6.6.50.json
+++ b/configs/oos15/OP-ACE-5-ULTRA-6.6.50.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5-ULTRA.json b/configs/oos15/OP-ACE-5-ULTRA.json
index 3cc1d422f..bfb4070b0 100644
--- a/configs/oos15/OP-ACE-5-ULTRA.json
+++ b/configs/oos15/OP-ACE-5-ULTRA.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5.10.209.json b/configs/oos15/OP-ACE-5.10.209.json
index ebeaf927f..41ba112fe 100644
--- a/configs/oos15/OP-ACE-5.10.209.json
+++ b/configs/oos15/OP-ACE-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5.10.226.json b/configs/oos15/OP-ACE-5.10.226.json
index 5701ca2f1..2b2e87383 100644
--- a/configs/oos15/OP-ACE-5.10.226.json
+++ b/configs/oos15/OP-ACE-5.10.226.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-5.json b/configs/oos15/OP-ACE-5.json
index 762ecedac..e1f0fff11 100644
--- a/configs/oos15/OP-ACE-5.json
+++ b/configs/oos15/OP-ACE-5.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-RACE-5.10.209.json b/configs/oos15/OP-ACE-RACE-5.10.209.json
index 84335ad63..58ae0a080 100644
--- a/configs/oos15/OP-ACE-RACE-5.10.209.json
+++ b/configs/oos15/OP-ACE-RACE-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-RACE-5.10.226.json b/configs/oos15/OP-ACE-RACE-5.10.226.json
index 6cba5b9a9..713dc51d4 100644
--- a/configs/oos15/OP-ACE-RACE-5.10.226.json
+++ b/configs/oos15/OP-ACE-RACE-5.10.226.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE-RACE.json b/configs/oos15/OP-ACE-RACE.json
index abd294cd6..ec502df30 100644
--- a/configs/oos15/OP-ACE-RACE.json
+++ b/configs/oos15/OP-ACE-RACE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-ACE.json b/configs/oos15/OP-ACE.json
index 63bc86fa3..ee206a3b2 100644
--- a/configs/oos15/OP-ACE.json
+++ b/configs/oos15/OP-ACE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-3-5.10.209.json b/configs/oos15/OP-NORD-3-5.10.209.json
index c2f3f1185..2228eba34 100644
--- a/configs/oos15/OP-NORD-3-5.10.209.json
+++ b/configs/oos15/OP-NORD-3-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-3.json b/configs/oos15/OP-NORD-3.json
index 38de4d65d..c166e7771 100644
--- a/configs/oos15/OP-NORD-3.json
+++ b/configs/oos15/OP-NORD-3.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-4-6.1.75.json b/configs/oos15/OP-NORD-4-6.1.75.json
index 16043e905..1318fff28 100644
--- a/configs/oos15/OP-NORD-4-6.1.75.json
+++ b/configs/oos15/OP-NORD-4-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-4-CE-5.15.149.json b/configs/oos15/OP-NORD-4-CE-5.15.149.json
index a68318770..6c576158a 100644
--- a/configs/oos15/OP-NORD-4-CE-5.15.149.json
+++ b/configs/oos15/OP-NORD-4-CE-5.15.149.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-4-CE-5.15.167.json b/configs/oos15/OP-NORD-4-CE-5.15.167.json
index 4798ee87d..95df52adc 100644
--- a/configs/oos15/OP-NORD-4-CE-5.15.167.json
+++ b/configs/oos15/OP-NORD-4-CE-5.15.167.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-4-CE.json b/configs/oos15/OP-NORD-4-CE.json
index f3a1bce14..9593fa589 100644
--- a/configs/oos15/OP-NORD-4-CE.json
+++ b/configs/oos15/OP-NORD-4-CE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-4.json b/configs/oos15/OP-NORD-4.json
index beec08ec8..bd10aec19 100644
--- a/configs/oos15/OP-NORD-4.json
+++ b/configs/oos15/OP-NORD-4.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-5.json b/configs/oos15/OP-NORD-5.json
index b0472ce3f..15aa5f276 100644
--- a/configs/oos15/OP-NORD-5.json
+++ b/configs/oos15/OP-NORD-5.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-CE-5.json b/configs/oos15/OP-NORD-CE-5.json
index 0a750cbd6..7a5e714d4 100644
--- a/configs/oos15/OP-NORD-CE-5.json
+++ b/configs/oos15/OP-NORD-CE-5.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-CE4-LITE.json b/configs/oos15/OP-NORD-CE4-LITE.json
index 9adeab4a7..c4b72d98a 100644
--- a/configs/oos15/OP-NORD-CE4-LITE.json
+++ b/configs/oos15/OP-NORD-CE4-LITE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-NORD-N30-SE.json b/configs/oos15/OP-NORD-N30-SE.json
index 6500d4dc0..5e6584c08 100644
--- a/configs/oos15/OP-NORD-N30-SE.json
+++ b/configs/oos15/OP-NORD-N30-SE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-OPEN-5.15.149.json b/configs/oos15/OP-OPEN-5.15.149.json
index 99bdf550e..b3e14d2e2 100644
--- a/configs/oos15/OP-OPEN-5.15.149.json
+++ b/configs/oos15/OP-OPEN-5.15.149.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-OPEN.json b/configs/oos15/OP-OPEN.json
index b60bcdc11..c1b294f74 100644
--- a/configs/oos15/OP-OPEN.json
+++ b/configs/oos15/OP-OPEN.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-2-PRO-6.6.30.json b/configs/oos15/OP-PAD-2-PRO-6.6.30.json
index 2e40ad917..28dc8e5e6 100644
--- a/configs/oos15/OP-PAD-2-PRO-6.6.30.json
+++ b/configs/oos15/OP-PAD-2-PRO-6.6.30.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-2-PRO.json b/configs/oos15/OP-PAD-2-PRO.json
index 1afc3064a..453edeafb 100644
--- a/configs/oos15/OP-PAD-2-PRO.json
+++ b/configs/oos15/OP-PAD-2-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-2-SM8650-6.1.75.json b/configs/oos15/OP-PAD-2-SM8650-6.1.75.json
index 1fe068bc8..c82b0f78d 100644
--- a/configs/oos15/OP-PAD-2-SM8650-6.1.75.json
+++ b/configs/oos15/OP-PAD-2-SM8650-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-2-SM8650.json b/configs/oos15/OP-PAD-2-SM8650.json
index f4f8e54d9..8fd511017 100644
--- a/configs/oos15/OP-PAD-2-SM8650.json
+++ b/configs/oos15/OP-PAD-2-SM8650.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-3-MT6897-6.1.75.json b/configs/oos15/OP-PAD-3-MT6897-6.1.75.json
index 108d8ad54..c87d14318 100644
--- a/configs/oos15/OP-PAD-3-MT6897-6.1.75.json
+++ b/configs/oos15/OP-PAD-3-MT6897-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-3-MT6897.json b/configs/oos15/OP-PAD-3-MT6897.json
index fe8987be8..824a400e5 100644
--- a/configs/oos15/OP-PAD-3-MT6897.json
+++ b/configs/oos15/OP-PAD-3-MT6897.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-3-SM8750-6.6.30.json b/configs/oos15/OP-PAD-3-SM8750-6.6.30.json
index f69c9dd6b..255338383 100644
--- a/configs/oos15/OP-PAD-3-SM8750-6.6.30.json
+++ b/configs/oos15/OP-PAD-3-SM8750-6.6.30.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-3-SM8750.json b/configs/oos15/OP-PAD-3-SM8750.json
index 70221bc76..a8c7735aa 100644
--- a/configs/oos15/OP-PAD-3-SM8750.json
+++ b/configs/oos15/OP-PAD-3-SM8750.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-LITE.json b/configs/oos15/OP-PAD-LITE.json
index 06ed3777a..07b38e370 100644
--- a/configs/oos15/OP-PAD-LITE.json
+++ b/configs/oos15/OP-PAD-LITE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-MT6983-5.10.209.json b/configs/oos15/OP-PAD-MT6983-5.10.209.json
index 52e8a9c99..b73f6e8e0 100644
--- a/configs/oos15/OP-PAD-MT6983-5.10.209.json
+++ b/configs/oos15/OP-PAD-MT6983-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-MT6983.json b/configs/oos15/OP-PAD-MT6983.json
index e5fa04429..6c9383f4e 100644
--- a/configs/oos15/OP-PAD-MT6983.json
+++ b/configs/oos15/OP-PAD-MT6983.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-PRO-6.1.75.json b/configs/oos15/OP-PAD-PRO-6.1.75.json
index 3e2b45484..9f14849d9 100644
--- a/configs/oos15/OP-PAD-PRO-6.1.75.json
+++ b/configs/oos15/OP-PAD-PRO-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP-PAD-PRO.json b/configs/oos15/OP-PAD-PRO.json
index 8c850a64d..2a3a81174 100644
--- a/configs/oos15/OP-PAD-PRO.json
+++ b/configs/oos15/OP-PAD-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP10pro-5.10.209.json b/configs/oos15/OP10pro-5.10.209.json
index ac84e7436..2b9ea83ec 100644
--- a/configs/oos15/OP10pro-5.10.209.json
+++ b/configs/oos15/OP10pro-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP10pro.json b/configs/oos15/OP10pro.json
index 8383a5d7c..a0e4f0096 100644
--- a/configs/oos15/OP10pro.json
+++ b/configs/oos15/OP10pro.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP10r.json b/configs/oos15/OP10r.json
index 57ede4982..bd1772aaa 100644
--- a/configs/oos15/OP10r.json
+++ b/configs/oos15/OP10r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP10t-5.10.209.json b/configs/oos15/OP10t-5.10.209.json
index ef3d6876b..ad9f86fc8 100644
--- a/configs/oos15/OP10t-5.10.209.json
+++ b/configs/oos15/OP10t-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP10t-5.10.226.json b/configs/oos15/OP10t-5.10.226.json
index ce44bbfc2..732c8ab64 100644
--- a/configs/oos15/OP10t-5.10.226.json
+++ b/configs/oos15/OP10t-5.10.226.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP10t.json b/configs/oos15/OP10t.json
index 66839f28a..f977d38cb 100644
--- a/configs/oos15/OP10t.json
+++ b/configs/oos15/OP10t.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP11-5.15.149.json b/configs/oos15/OP11-5.15.149.json
index c4ef9c392..380fa0cad 100644
--- a/configs/oos15/OP11-5.15.149.json
+++ b/configs/oos15/OP11-5.15.149.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP11.json b/configs/oos15/OP11.json
index dd9328eb5..c481f5390 100644
--- a/configs/oos15/OP11.json
+++ b/configs/oos15/OP11.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP11r-5.10.209.json b/configs/oos15/OP11r-5.10.209.json
index 529abe860..2d7a941a9 100644
--- a/configs/oos15/OP11r-5.10.209.json
+++ b/configs/oos15/OP11r-5.10.209.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP11r.json b/configs/oos15/OP11r.json
index f95dbc94e..83b3a05ce 100644
--- a/configs/oos15/OP11r.json
+++ b/configs/oos15/OP11r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP12-6.1.75.json b/configs/oos15/OP12-6.1.75.json
index d7b9643f5..d2e3f6a85 100644
--- a/configs/oos15/OP12-6.1.75.json
+++ b/configs/oos15/OP12-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP12.json b/configs/oos15/OP12.json
index 8d1b3b48b..5e366ff58 100644
--- a/configs/oos15/OP12.json
+++ b/configs/oos15/OP12.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP12r-5.15.149.json b/configs/oos15/OP12r-5.15.149.json
index 10b28fbb4..dbe55efd9 100644
--- a/configs/oos15/OP12r-5.15.149.json
+++ b/configs/oos15/OP12r-5.15.149.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP12r.json b/configs/oos15/OP12r.json
index 153ca7022..c09d297ed 100644
--- a/configs/oos15/OP12r.json
+++ b/configs/oos15/OP12r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13-6.6.30.json b/configs/oos15/OP13-6.6.30.json
index 96c75967e..6af22bcd9 100644
--- a/configs/oos15/OP13-6.6.30.json
+++ b/configs/oos15/OP13-6.6.30.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13-CPH-6.6.56.json b/configs/oos15/OP13-CPH-6.6.56.json
index b19b75bb2..813a166e1 100644
--- a/configs/oos15/OP13-CPH-6.6.56.json
+++ b/configs/oos15/OP13-CPH-6.6.56.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13-CPH.json b/configs/oos15/OP13-CPH.json
index 210b34879..29529fc7c 100644
--- a/configs/oos15/OP13-CPH.json
+++ b/configs/oos15/OP13-CPH.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13-PJZ.json b/configs/oos15/OP13-PJZ.json
index e8b5679bc..eb61d63a0 100644
--- a/configs/oos15/OP13-PJZ.json
+++ b/configs/oos15/OP13-PJZ.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13S.json b/configs/oos15/OP13S.json
index c52fcaa2a..b1c02315a 100644
--- a/configs/oos15/OP13S.json
+++ b/configs/oos15/OP13S.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13T-6.6.56.json b/configs/oos15/OP13T-6.6.56.json
index d0cba7d82..5618f3b49 100644
--- a/configs/oos15/OP13T-6.6.56.json
+++ b/configs/oos15/OP13T-6.6.56.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13T.json b/configs/oos15/OP13T.json
index 47cd8b331..77eadd0e3 100644
--- a/configs/oos15/OP13T.json
+++ b/configs/oos15/OP13T.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13r-6.1.75.json b/configs/oos15/OP13r-6.1.75.json
index 34f989c4a..9816e1270 100644
--- a/configs/oos15/OP13r-6.1.75.json
+++ b/configs/oos15/OP13r-6.1.75.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos15/OP13r.json b/configs/oos15/OP13r.json
index 5f570d868..b708d9d1c 100644
--- a/configs/oos15/OP13r.json
+++ b/configs/oos15/OP13r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-2-PRO.json b/configs/oos16/OP-ACE-2-PRO.json
index 557b70969..8cbca5b15 100644
--- a/configs/oos16/OP-ACE-2-PRO.json
+++ b/configs/oos16/OP-ACE-2-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-2.json b/configs/oos16/OP-ACE-2.json
index c87fa5661..be66489ac 100644
--- a/configs/oos16/OP-ACE-2.json
+++ b/configs/oos16/OP-ACE-2.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-2V.json b/configs/oos16/OP-ACE-2V.json
index 66a8ffa8e..d8b9b816a 100644
--- a/configs/oos16/OP-ACE-2V.json
+++ b/configs/oos16/OP-ACE-2V.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-3-5.15.167.json b/configs/oos16/OP-ACE-3-5.15.167.json
index 0e24479b9..39bc2642a 100644
--- a/configs/oos16/OP-ACE-3-5.15.167.json
+++ b/configs/oos16/OP-ACE-3-5.15.167.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-3-PRO.json b/configs/oos16/OP-ACE-3-PRO.json
index cd34efbcd..b9be22679 100644
--- a/configs/oos16/OP-ACE-3-PRO.json
+++ b/configs/oos16/OP-ACE-3-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-3.json b/configs/oos16/OP-ACE-3.json
index f7eed27c1..7e89089fa 100644
--- a/configs/oos16/OP-ACE-3.json
+++ b/configs/oos16/OP-ACE-3.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-3V-6.1.118.json b/configs/oos16/OP-ACE-3V-6.1.118.json
index e73aa11b7..7d17547ec 100644
--- a/configs/oos16/OP-ACE-3V-6.1.118.json
+++ b/configs/oos16/OP-ACE-3V-6.1.118.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-3V.json b/configs/oos16/OP-ACE-3V.json
index 98f2ef4c8..33d965963 100644
--- a/configs/oos16/OP-ACE-3V.json
+++ b/configs/oos16/OP-ACE-3V.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-5-6.1.118.json b/configs/oos16/OP-ACE-5-6.1.118.json
index ff0901ff2..aa212e2d4 100644
--- a/configs/oos16/OP-ACE-5-6.1.118.json
+++ b/configs/oos16/OP-ACE-5-6.1.118.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-5-PRO.json b/configs/oos16/OP-ACE-5-PRO.json
index 321814bf1..f81dbb0a5 100644
--- a/configs/oos16/OP-ACE-5-PRO.json
+++ b/configs/oos16/OP-ACE-5-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-5-RACE.json b/configs/oos16/OP-ACE-5-RACE.json
index 7857379d8..ec245645f 100644
--- a/configs/oos16/OP-ACE-5-RACE.json
+++ b/configs/oos16/OP-ACE-5-RACE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-5-ULTRA.json b/configs/oos16/OP-ACE-5-ULTRA.json
index c5632ae74..1afce7c88 100644
--- a/configs/oos16/OP-ACE-5-ULTRA.json
+++ b/configs/oos16/OP-ACE-5-ULTRA.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-5.json b/configs/oos16/OP-ACE-5.json
index 8d34266d8..6619b21cb 100644
--- a/configs/oos16/OP-ACE-5.json
+++ b/configs/oos16/OP-ACE-5.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-6-ULTRA.json b/configs/oos16/OP-ACE-6-ULTRA.json
index e90ece07d..92e85c49a 100644
--- a/configs/oos16/OP-ACE-6-ULTRA.json
+++ b/configs/oos16/OP-ACE-6-ULTRA.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-6.json b/configs/oos16/OP-ACE-6.json
index d948791b8..2b4565376 100644
--- a/configs/oos16/OP-ACE-6.json
+++ b/configs/oos16/OP-ACE-6.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-ACE-6T.json b/configs/oos16/OP-ACE-6T.json
index a4669c806..323ff6ada 100644
--- a/configs/oos16/OP-ACE-6T.json
+++ b/configs/oos16/OP-ACE-6T.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-4-6.1.118.json b/configs/oos16/OP-NORD-4-6.1.118.json
index 557290326..9584c9928 100644
--- a/configs/oos16/OP-NORD-4-6.1.118.json
+++ b/configs/oos16/OP-NORD-4-6.1.118.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-4-CE.json b/configs/oos16/OP-NORD-4-CE.json
index 15a4917a5..635df02fb 100644
--- a/configs/oos16/OP-NORD-4-CE.json
+++ b/configs/oos16/OP-NORD-4-CE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-4.json b/configs/oos16/OP-NORD-4.json
index 1a50a1d59..975e93a4a 100644
--- a/configs/oos16/OP-NORD-4.json
+++ b/configs/oos16/OP-NORD-4.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-5-6.1.118.json b/configs/oos16/OP-NORD-5-6.1.118.json
index 06f92d70d..34ffcbc0e 100644
--- a/configs/oos16/OP-NORD-5-6.1.118.json
+++ b/configs/oos16/OP-NORD-5-6.1.118.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-5.json b/configs/oos16/OP-NORD-5.json
index 1eb014467..0682f9bcc 100644
--- a/configs/oos16/OP-NORD-5.json
+++ b/configs/oos16/OP-NORD-5.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-6.json b/configs/oos16/OP-NORD-6.json
index 6c4121245..b1370cb4b 100644
--- a/configs/oos16/OP-NORD-6.json
+++ b/configs/oos16/OP-NORD-6.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-CE-5.json b/configs/oos16/OP-NORD-CE-5.json
index 49575ce7d..aabd2b51d 100644
--- a/configs/oos16/OP-NORD-CE-5.json
+++ b/configs/oos16/OP-NORD-CE-5.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-CE4-LITE-6.1.118.json b/configs/oos16/OP-NORD-CE4-LITE-6.1.118.json
new file mode 100644
index 000000000..c6bc068a9
--- /dev/null
+++ b/configs/oos16/OP-NORD-CE4-LITE-6.1.118.json
@@ -0,0 +1,28 @@
+{
+  "model": "OP-NORD-CE4-LITE",
+  "soc": "blair",
+  "branch": "wild/sm6375",
+  "manifest": "oneplus_nord_ce4_lite_5g_6.1.118_w.xml",
+  "android_version": "android14",
+  "kernel_version": "6.1",
+  "os_version": "OOS16",
+  "lto": "thin",
+  "zyc_compiler": "",
+  "c_compiler": "kernel_platform/prebuilts/clang/host/linux-x86/clang-r487747c/bin",
+  "rust_compiler": "",
+  "bindgen": "",
+  "rust_build": false,
+  "disk_cleanup": false,
+  "hmbird": false,
+  "susfs": true,
+  "opt": true,
+  "ds": true,
+  "bbg": true,
+  "bbr": true,
+  "bbr3": true,
+  "ttl": true,
+  "ip_set": true,
+  "unicode": true,
+  "ntsync": true,
+  "uname": "OP-RESUKISU"
+}
diff --git a/configs/oos16/OP-NORD-CE4-LITE.json b/configs/oos16/OP-NORD-CE4-LITE.json
index 3a15a3850..f3d8dcb39 100644
--- a/configs/oos16/OP-NORD-CE4-LITE.json
+++ b/configs/oos16/OP-NORD-CE4-LITE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-NORD-CE6-LITE.json.disabled b/configs/oos16/OP-NORD-CE6-LITE.json.disabled
index 8b35c32c5..a09ed0806 100644
--- a/configs/oos16/OP-NORD-CE6-LITE.json.disabled
+++ b/configs/oos16/OP-NORD-CE6-LITE.json.disabled
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-OPEN-5.15.167.json b/configs/oos16/OP-OPEN-5.15.167.json
index 0331b8833..91fdbc403 100644
--- a/configs/oos16/OP-OPEN-5.15.167.json
+++ b/configs/oos16/OP-OPEN-5.15.167.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-OPEN.json b/configs/oos16/OP-OPEN.json
index 40d583507..daf6cd5d8 100644
--- a/configs/oos16/OP-OPEN.json
+++ b/configs/oos16/OP-OPEN.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-2-MT6991.json b/configs/oos16/OP-PAD-2-MT6991.json
index 7ddfede8f..f6839e828 100644
--- a/configs/oos16/OP-PAD-2-MT6991.json
+++ b/configs/oos16/OP-PAD-2-MT6991.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-2-PRO.json b/configs/oos16/OP-PAD-2-PRO.json
index e2eb10c95..b3468aed2 100644
--- a/configs/oos16/OP-PAD-2-PRO.json
+++ b/configs/oos16/OP-PAD-2-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-2-SM8650.json b/configs/oos16/OP-PAD-2-SM8650.json
index fc7f83c60..5a1787a10 100644
--- a/configs/oos16/OP-PAD-2-SM8650.json
+++ b/configs/oos16/OP-PAD-2-SM8650.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-3-MT6897.json b/configs/oos16/OP-PAD-3-MT6897.json
index a301a38b0..31203a1b2 100644
--- a/configs/oos16/OP-PAD-3-MT6897.json
+++ b/configs/oos16/OP-PAD-3-MT6897.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-3-PRO.json b/configs/oos16/OP-PAD-3-PRO.json
index 4cac2d41f..c3468bac1 100644
--- a/configs/oos16/OP-PAD-3-PRO.json
+++ b/configs/oos16/OP-PAD-3-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-3-SM8750.json b/configs/oos16/OP-PAD-3-SM8750.json
index 0f89e8de4..88c9ab456 100644
--- a/configs/oos16/OP-PAD-3-SM8750.json
+++ b/configs/oos16/OP-PAD-3-SM8750.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-4.json b/configs/oos16/OP-PAD-4.json
index 68899b584..81c4ff0a8 100644
--- a/configs/oos16/OP-PAD-4.json
+++ b/configs/oos16/OP-PAD-4.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-GO-2.json b/configs/oos16/OP-PAD-GO-2.json
index 95849394a..146932226 100644
--- a/configs/oos16/OP-PAD-GO-2.json
+++ b/configs/oos16/OP-PAD-GO-2.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-LITE.json b/configs/oos16/OP-PAD-LITE.json
index c25f78093..4c21c7cbb 100644
--- a/configs/oos16/OP-PAD-LITE.json
+++ b/configs/oos16/OP-PAD-LITE.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-MT6983.json b/configs/oos16/OP-PAD-MT6983.json
index 1e3ffcd41..3e58a6563 100644
--- a/configs/oos16/OP-PAD-MT6983.json
+++ b/configs/oos16/OP-PAD-MT6983.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-PAD-PRO.json b/configs/oos16/OP-PAD-PRO.json
index 477870524..5c0c4647b 100644
--- a/configs/oos16/OP-PAD-PRO.json
+++ b/configs/oos16/OP-PAD-PRO.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-TURBO-6.json b/configs/oos16/OP-TURBO-6.json
index 47a0240ca..31fffe9d5 100644
--- a/configs/oos16/OP-TURBO-6.json
+++ b/configs/oos16/OP-TURBO-6.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP-TURBO-6V.json b/configs/oos16/OP-TURBO-6V.json
index f3add58fd..4af9ca671 100644
--- a/configs/oos16/OP-TURBO-6V.json
+++ b/configs/oos16/OP-TURBO-6V.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP10pro.json b/configs/oos16/OP10pro.json
index 1690cd676..adc764b0b 100644
--- a/configs/oos16/OP10pro.json
+++ b/configs/oos16/OP10pro.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP11-5.15.167.json b/configs/oos16/OP11-5.15.167.json
index d66e682a3..6a90331e1 100644
--- a/configs/oos16/OP11-5.15.167.json
+++ b/configs/oos16/OP11-5.15.167.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP11.json b/configs/oos16/OP11.json
index 8658b858d..c07f52b6b 100644
--- a/configs/oos16/OP11.json
+++ b/configs/oos16/OP11.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP11r.json b/configs/oos16/OP11r.json
index 58f75608f..6b3673675 100644
--- a/configs/oos16/OP11r.json
+++ b/configs/oos16/OP11r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP12-6.1.118.json b/configs/oos16/OP12-6.1.118.json
index b3058eccd..474a5969b 100644
--- a/configs/oos16/OP12-6.1.118.json
+++ b/configs/oos16/OP12-6.1.118.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP12.json b/configs/oos16/OP12.json
index 695216f39..9ea1e2641 100644
--- a/configs/oos16/OP12.json
+++ b/configs/oos16/OP12.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP12r-5.15.167.json b/configs/oos16/OP12r-5.15.167.json
index 837b115a1..8d00b5d37 100644
--- a/configs/oos16/OP12r-5.15.167.json
+++ b/configs/oos16/OP12r-5.15.167.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP12r.json b/configs/oos16/OP12r.json
index 0522307fa..2ee0c95d2 100644
--- a/configs/oos16/OP12r.json
+++ b/configs/oos16/OP12r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP13.json b/configs/oos16/OP13.json
index 9801c1c26..d04cbfd05 100644
--- a/configs/oos16/OP13.json
+++ b/configs/oos16/OP13.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP13S.json b/configs/oos16/OP13S.json
index d65aace0e..950b6d496 100644
--- a/configs/oos16/OP13S.json
+++ b/configs/oos16/OP13S.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP13T.json b/configs/oos16/OP13T.json
index ecc13c3c9..4a5f3ea0e 100644
--- a/configs/oos16/OP13T.json
+++ b/configs/oos16/OP13T.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": true,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP13r-6.1.118.json b/configs/oos16/OP13r-6.1.118.json
index d9c1a182b..bdb42e935 100644
--- a/configs/oos16/OP13r-6.1.118.json
+++ b/configs/oos16/OP13r-6.1.118.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP13r.json b/configs/oos16/OP13r.json
index 89661576f..fa1e455d4 100644
--- a/configs/oos16/OP13r.json
+++ b/configs/oos16/OP13r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": false,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP15.json b/configs/oos16/OP15.json
index 096293c76..00315ac94 100644
--- a/configs/oos16/OP15.json
+++ b/configs/oos16/OP15.json
@@ -15,10 +15,11 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
-  "bbr3": false,
+  "bbr3": true,
   "ttl": true,
   "ip_set": true,
   "unicode": true,
diff --git a/configs/oos16/OP15T.json b/configs/oos16/OP15T.json
index ea142e2d5..7ec3a7c8e 100644
--- a/configs/oos16/OP15T.json
+++ b/configs/oos16/OP15T.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/configs/oos16/OP15r.json b/configs/oos16/OP15r.json
index 5fcbb7229..8cd9f6a7e 100644
--- a/configs/oos16/OP15r.json
+++ b/configs/oos16/OP15r.json
@@ -15,6 +15,7 @@
   "disk_cleanup": true,
   "hmbird": false,
   "susfs": true,
+  "opt": true,
   "ds": true,
   "bbg": true,
   "bbr": true,
diff --git a/manifests/oos16/oneplus_12_w.xml b/manifests/oos16/oneplus_12_w.xml
index 9adf9e42b..51990f5de 100644
--- a/manifests/oos16/oneplus_12_w.xml
+++ b/manifests/oos16/oneplus_12_w.xml
@@ -5,10 +5,10 @@
   <remote fetch="https://github.com/OnePlusOSS" name="origin"/>
   <remote fetch="https://github.com/huangdihd" name="wild"/>
   <project remote="wild" name="AnyKernel3" path="AnyKernel3" revision="gki-2.0"/>
-  <project remote="origin" name="android_kernel_common_oneplus_sm8650" path="kernel_platform/common" revision="oneplus/sm8650_b_16.0.0_oneplus12">
+  <project remote="origin" name="android_kernel_common_oneplus_sm8650" path="kernel_platform/common" revision="54b18d5b7877bebe6d2e26d90f52472ec8283985">
     <linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
   </project>
-  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8650" path="./" revision="oneplus/sm8650_b_16.0.0_oneplus12"/>
+  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8650" path="./" revision="71860b2a0a78e139edaf0db85935d87c46bcb2ca"/>
   <project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="d153b7ab4a4956198957e258d4f370e875c53059" upstream="refs/heads/ks-kernel.lnx.3.0.r1-rel" clone-depth="1">
     <linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
   </project>
diff --git a/manifests/oos16/oneplus_13r_w.xml b/manifests/oos16/oneplus_13r_w.xml
index 9edb77a5c..6abfb0563 100644
--- a/manifests/oos16/oneplus_13r_w.xml
+++ b/manifests/oos16/oneplus_13r_w.xml
@@ -5,10 +5,10 @@
   <remote fetch="https://github.com/OnePlusOSS" name="origin"/>
   <remote fetch="https://github.com/huangdihd" name="wild"/>
   <project remote="wild" name="AnyKernel3" path="AnyKernel3" revision="gki-2.0"/>
-  <project remote="origin" name="android_kernel_common_oneplus_sm8650" path="kernel_platform/common" revision="oneplus/sm8650_b_16.0.0_oneplus_13r">
+  <project remote="origin" name="android_kernel_common_oneplus_sm8650" path="kernel_platform/common" revision="cce121851ca0d7d383b11122776901ef74f3af03">
     <linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
   </project>
-  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8650" path="./" revision="oneplus/sm8650_b_16.0.0_oneplus_13r"/>
+  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8650" path="./" revision="794b47d09d11c3a965333dad92f0379a0c4b23ac"/>
   <project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="d153b7ab4a4956198957e258d4f370e875c53059" upstream="refs/heads/ks-kernel.lnx.3.0.r1-rel" clone-depth="1">
     <linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
   </project>
diff --git a/manifests/oos16/oneplus_ace5_w.xml b/manifests/oos16/oneplus_ace5_w.xml
index 6706a70f5..d29c956e9 100644
--- a/manifests/oos16/oneplus_ace5_w.xml
+++ b/manifests/oos16/oneplus_ace5_w.xml
@@ -5,10 +5,10 @@
   <remote fetch="https://github.com/OnePlusOSS" name="origin"/>
   <remote fetch="https://github.com/huangdihd" name="wild"/>
   <project remote="wild" name="AnyKernel3" path="AnyKernel3" revision="gki-2.0"/>
-  <project remote="origin" name="android_kernel_common_oneplus_sm8650" path="kernel_platform/common" revision="oneplus/sm8650_b_16.0.0_ace_5">
+  <project remote="origin" name="android_kernel_common_oneplus_sm8650" path="kernel_platform/common" revision="086936b3387b4018805500fa4069d09637fdb89b">
     <linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
   </project>
-  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8650" path="./" revision="oneplus/sm8650_b_16.0.0_ace_5"/>
+  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8650" path="./" revision="21a5694f721d3826ac9e101e5d65919f2a8e739e"/>
   <project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="d153b7ab4a4956198957e258d4f370e875c53059" upstream="refs/heads/ks-kernel.lnx.3.0.r1-rel" clone-depth="1">
     <linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
   </project>
diff --git a/manifests/oos16/oneplus_nord_ce4_lite_5g_6.1.118_w.xml b/manifests/oos16/oneplus_nord_ce4_lite_5g_6.1.118_w.xml
new file mode 100644
index 000000000..a9bc07a1f
--- /dev/null
+++ b/manifests/oos16/oneplus_nord_ce4_lite_5g_6.1.118_w.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote fetch="https://git.codelinaro.org/clo/la" name="clo-la"/>
+  <remote fetch="https://github.com/OnePlusOSS" name="origin"/>
+  <remote fetch="https://github.com/huangdihd" name="wild"/>
+  <project remote="wild" name="AnyKernel3" path="AnyKernel3" revision="gki-2.0"/>
+  <default remote="clo-la" revision="dummy_revision" sync-c="true" sync-tags="false"/>
+  <project remote="origin" name="android_kernel_common_oneplus_sm6375" path="kernel_platform/common" revision="7c7d652e3120ea29fd7b1428f541090788ba16e5">
+    <linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
+  </project>
+  <project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm6375" path="./" revision="60eecf7422d7915c0efcf005c184e0adaae882a2"/>
+  <project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="3892d2c393135d568c9140c801623530eea4104c" upstream="refs/heads/ks-kernel.lnx.3.0.r6-rel">
+    <linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
+  </project>
+  <project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="01ca564af4c025f35caa9781787b968b5051c0e2" upstream="refs/heads/ks-kernel.lnx.3.0.r6-rel"/>
+</manifest>
diff --git a/patches/resukisu-skip-recovery.patch b/patches/resukisu-skip-recovery.patch
new file mode 100644
index 000000000..94138a3b0
--- /dev/null
+++ b/patches/resukisu-skip-recovery.patch
@@ -0,0 +1,35 @@
+--- a/kernel/core/init.c
++++ b/kernel/core/init.c
+@@ -55,6 +55,32 @@
+ bool ksu_no_custom_rc = false;
+ module_param_named(norc, ksu_no_custom_rc, bool, 0);
+ 
++/*
++ * Skip KSU init on recovery boots: the recovery ramdisk's sepolicy lacks the
++ * anchor types KSU's sepolicy.rule expects, so applying them here null-derefs.
++ * Detection is a substring scan of saved_command_line.
++ */
++static bool __init ksu_is_recovery_boot(void)
++{
++	const char *cmd = saved_command_line;
++	if (!cmd)
++		return false;
++	/* Primary token: emitted by Xiaomi ABL on BCB-driven recovery boots. */
++	if (strstr(cmd, "androidboot.mode=recovery") != NULL)
++		return true;
++	/* Secondary tokens: key-combo / eng-bootloader cases where mode= is absent
++	 * but boot_mode= or bootreason= is set to "recovery".
++	 */
++	if (strstr(cmd, "androidboot.boot_mode=recovery") != NULL ||
++	    strstr(cmd, "androidboot.bootreason=recovery") != NULL)
++		return true;
++	return false;
++}
++
+ int __init kernelsu_init(void)
+ {
++	if (ksu_is_recovery_boot()) {
++		pr_info("KernelSU: recovery boot detected, skipping init\n");
++		return 0;
++	}
+ 	pr_info("Initialized on: %s (%s) with driver version: %u\n", UTS_RELEASE, UTS_MACHINE, KSU_VERSION);