diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5e13457
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk
diff --git a/Android.mk b/Android.mk
index 9d64234..5824a91 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter lisa munch vayu marble fuxi,$(TARGET_DEVICE)),)
+ifneq ($(filter fuxi,$(TARGET_DEVICE)),)
 
 CAMERA_LIBRARIES := libcamera_algoup_jni.xiaomi.so libcamera_mianode_jni.xiaomi.so
 
diff --git a/README.md b/README.md
index b4480d7..e64506c 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,8 @@
 # proprietary_vendor_xiaomi_camera
 
-Prebuilt MIUI Leica Camera to include in custom ROM builds.
+Prebuilt MIUI Camera to include in custom ROM builds.
 
 ### Supported devices
-* POCO F4/Redmi K40S (munch)
-* POCO X3 Pro (vayu)
-* Xiaomi 11 Lite NE (lisa)
-* Redmi Note 12 Turbo / POCO F5 (marble)
 * Xiaomi 13 (fuxi)
 
 ### How to use?
@@ -19,11 +15,3 @@ Prebuilt MIUI Leica Camera to include in custom ROM builds.
 # Camera
 $(call inherit-product-if-exists, vendor/xiaomi/camera/miuicamera.mk)
 ```
-
-3. Set `ro.product.mod_device` according to stock, and `ro.miui.notch=1` if the device has a display cutout, for example:
-
-```
-PRODUCT_SYSTEM_PROPERTIES += \
-    ro.miui.notch=1 \
-    ro.product.mod_device=lisa
-```
diff --git a/camera-vendor.mk b/camera-vendor.mk
index d1839f6..4e859e1 100644
--- a/camera-vendor.mk
+++ b/camera-vendor.mk
@@ -6,9 +6,9 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/xiaomi/camera
 
 PRODUCT_COPY_FILES += \
+    vendor/xiaomi/camera/proprietary/system/lib64/libgui-xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libgui-xiaomi.so \
     vendor/xiaomi/camera/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_algoup_jni.xiaomi.so \
     vendor/xiaomi/camera/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcamera_mianode_jni.xiaomi.so \
-    vendor/xiaomi/camera/proprietary/system/lib64/libgui-xiaomi.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libgui-xiaomi.so \
     vendor/xiaomi/camera/proprietary/system/lib64/libmicampostproc_client.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmicampostproc_client.so \
     vendor/xiaomi/camera/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
 
diff --git a/configs/permissions/privapp-permissions-miuicamera.xml b/configs/permissions/privapp-permissions-miuicamera.xml
index eaf600b..4f06726 100644
--- a/configs/permissions/privapp-permissions-miuicamera.xml
+++ b/configs/permissions/privapp-permissions-miuicamera.xml
@@ -4,9 +4,11 @@
       <permission name="android.permission.WRITE_MEDIA_STORAGE" />
       <permission name="android.permission.WRITE_SECURE_SETTINGS" />
       <permission name="android.permission.INTERACT_ACROSS_USERS" />
+      <permission name="mediatek.permission.ACCESS_APU_SYS" />
       <permission name="android.permission.LOG_COMPAT_CHANGE" />
       <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
       <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
       <permission name="android.permission.SYSTEM_CAMERA" />
+      <permission name="android.permission.TURN_SCREEN_ON" />
    </privapp-permissions>
 </permissions>
diff --git a/extract-files.sh b/extract-files.sh
index c59762d..3507424 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -58,7 +58,7 @@ function blob_fixup() {
         system/lib64/libgui-xiaomi.so)
             patchelf --set-soname libgui-xiaomi.so "${2}"
             ;;
-        system/lib64/libcamera_algoup_jni.xiaomi.so|system/lib64/libcamera_mianode_jni.xiaomi.so)
+        system_ext/lib64/libcamera_algoup_jni.xiaomi.so|system_ext/lib64/libcamera_mianode_jni.xiaomi.so)
             patchelf --replace-needed libgui.so libgui-xiaomi.so "${2}"
             ;;
     esac
@@ -70,3 +70,5 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 
 "${MY_DIR}/setup-makefiles.sh"
+
+split -b 20M proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk proprietary/system/priv-app/MiuiCamera/MiuiCamera.part
diff --git a/miuicamera.mk b/miuicamera.mk
index 310fac6..983848b 100644
--- a/miuicamera.mk
+++ b/miuicamera.mk
@@ -14,6 +14,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SYSTEM_PROPERTIES += \
     persist.vendor.camera.privapp.list=org.codeaurora.snapcam,com.android.camera \
     ro.com.google.lens.oem_camera_package=com.android.camera \
+    ro.hardware.camera=xiaomi \
+    ro.miui.notch=1 \
+    ro.product.mod_device=fuxi_global \
     vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera
 
 # Sepolicy
diff --git a/proprietary-files.txt b/proprietary-files.txt
index ec7d3b1..d901adf 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,9 +1,8 @@
-# From lisa MIUI V14.0.3.0.TKOMIXM package
-system/lib64/libcamera_algoup_jni.xiaomi.so
-system/lib64/libcamera_mianode_jni.xiaomi.so
+# Unpinned blobs from fuxi_global-user 13 TKQ1.221114.001 V14.0.5.0.UMCMIXM release-keys
 system/lib64/libgui.so:system/lib64/libgui-xiaomi.so
-system/lib64/libmicampostproc_client.so
-system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
-
-# Patched MIUI Leica camera package
--product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=Aperture,Camera,Camera2,GoogleCameraGo|1eb82ca99df9a4442133cdc6573491b8ca092740
+system_ext/lib64/libcamera_algoup_jni.xiaomi.so:system/lib64/libcamera_algoup_jni.xiaomi.so
+system_ext/lib64/libcamera_mianode_jni.xiaomi.so:system/lib64/libcamera_mianode_jni.xiaomi.so
+system_ext/lib64/libmicampostproc_client.so:system/lib64/libmicampostproc_client.so
+system_ext/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
+product/overlay/MiuiCameraOverlayLeicaed/MiuiCameraOverlayLeicaed.apk
+-product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=Aperture,Camera,Camera2,GoogleCameraGo
diff --git a/proprietary/product/overlay/MiuiCameraOverlayLeicaed/MiuiCameraOverlayLeicaed.apk b/proprietary/product/overlay/MiuiCameraOverlayLeicaed/MiuiCameraOverlayLeicaed.apk
new file mode 100644
index 0000000..b99b1e7
Binary files /dev/null and b/proprietary/product/overlay/MiuiCameraOverlayLeicaed/MiuiCameraOverlayLeicaed.apk differ
diff --git a/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so b/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so
index c2e0a96..03f48d3 100644
Binary files a/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so and b/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so differ
diff --git a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so b/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so
index e58c787..4070e29 100644
Binary files a/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so and b/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so differ
diff --git a/proprietary/system/lib64/libgui-xiaomi.so b/proprietary/system/lib64/libgui-xiaomi.so
index c657501..4eee938 100644
Binary files a/proprietary/system/lib64/libgui-xiaomi.so and b/proprietary/system/lib64/libgui-xiaomi.so differ
diff --git a/proprietary/system/lib64/libmicampostproc_client.so b/proprietary/system/lib64/libmicampostproc_client.so
index 4da94ce..063400d 100644
Binary files a/proprietary/system/lib64/libmicampostproc_client.so and b/proprietary/system/lib64/libmicampostproc_client.so differ
diff --git a/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so b/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
index 299ae0b..866a81f 100644
Binary files a/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so and b/proprietary/system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk
deleted file mode 100644
index a00e25a..0000000
Binary files a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk and /dev/null differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaa b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaa
new file mode 100644
index 0000000..7e750c8
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaa differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partab b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partab
new file mode 100644
index 0000000..12f932a
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partab differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partac b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partac
new file mode 100644
index 0000000..b57e925
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partac differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partad b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partad
new file mode 100644
index 0000000..c431b70
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partad differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partae b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partae
new file mode 100644
index 0000000..7e8422a
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partae differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaf b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaf
new file mode 100644
index 0000000..e563cfd
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaf differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partag b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partag
new file mode 100644
index 0000000..977c9c5
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partag differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partah b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partah
new file mode 100644
index 0000000..b591954
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partah differ
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partai b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partai
new file mode 100644
index 0000000..6214116
Binary files /dev/null and b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partai differ
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 80b6dd1..2195fb5 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -29,7 +29,7 @@ source "${HELPER}"
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" true
 
 # Warning headers and guards
-write_headers "lisa munch vayu marble fuxi"
+write_headers "fuxi"
 sed -i 's|device/|vendor/|g' "$ANDROIDBP" "$ANDROIDMK" "$BOARDMK" "$PRODUCTMK"
 
 cat << 'EOF' >> "$ANDROIDMK"
diff --git a/vendorsetup.sh b/vendorsetup.sh
new file mode 100644
index 0000000..817053a
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1,3 @@
+# Lets assemble MiuiCamera.apk from its split parts
+
+cat vendor/xiaomi/camera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.part* > vendor/xiaomi/camera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk
\ No newline at end of file