diff --git a/prebuilt/system/etc/permissions/privapp-permissions-ASUS_I01WD.xml b/prebuilt/system/etc/permissions/privapp-permissions-ASUS_I01WD.xml
new file mode 100644
index 0000000..f9220b3
--- /dev/null
+++ b/prebuilt/system/etc/permissions/privapp-permissions-ASUS_I01WD.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.asus.camera">
+        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="com.asus.permission.HARDWARE_PROPERTIES"/>
+    </privapp-permissions>
+</permissions>
\ No newline at end of file
diff --git a/prebuilt/system/etc/permissions/qti_libpermissions.xml b/prebuilt/system/etc/permissions/qti_libpermissions.xml
index 7cfc520..4756f67 100644
--- a/prebuilt/system/etc/permissions/qti_libpermissions.xml
+++ b/prebuilt/system/etc/permissions/qti_libpermissions.xml
@@ -5,8 +5,6 @@
     Confidential and Proprietary - Qualcomm Technologies, Inc.
  -->
 <permissions>
-    <library name="android.hidl.manager-V1.0-java"
-          file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
     <library name="android.hidl.manager@1.0-java"
           file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
 </permissions>
diff --git a/prebuilt/system/product/etc/permissions/privapp-permissions-google_edited.xml b/prebuilt/system/product/etc/permissions/privapp-permissions-google_edited.xml
new file mode 100644
index 0000000..663eb7d
--- /dev/null
+++ b/prebuilt/system/product/etc/permissions/privapp-permissions-google_edited.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.android.hotwordenrollment.okgoogle">
+        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.hotwordenrollment.xgoogle">
+        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.hotwordenrollment.tgoogle">
+        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    </privapp-permissions>
+
+</permissions>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7740a8b..fc367b8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,32 +1,19 @@
 # ANT+
-lib64/com.qualcomm.qti.ant@1.0.so
--lib64/libantradio.so
-lib/com.qualcomm.qti.ant@1.0.so
 -lib/libantradio.so
+-lib64/libantradio.so
+product/lib/com.qualcomm.qti.ant@1.0.so
+product/lib64/com.qualcomm.qti.ant@1.0.so
 
 # Bluetooth (aptX)
 -app/aptxals/aptxals.apk
+-app/aptxalsOverlay/aptxalsOverlay.apk
 lib64/libaptX_encoder.so|0cebad28afcf29f931bdc2d24fce2730dc882ecf
 lib64/libaptXHD_encoder.so|90f47f10af28b3ead143200cb4370b847c513127
 
 # Camera
-etc/permissions/privapp-permissions-ASUS_I01WD.xml
 lib/DataSet/ispDB/ASUS_UNDI.bin
-lib64/libAsusMotorDriverHAL.so
+lib/DataSet/ispDB/ASUS_UNDI_ZOOM.bin
 lib64/libAsusRGBSensorHAL.so
--priv-app/AsusCamera/AsusCamera.apk
-priv-app/AsusCamera/lib/arm64/libarcsoft_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_selfiepano.so
-priv-app/AsusCamera/lib/arm64/libtensorflowlite_jni.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_burstcapture.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_undistort.so
-priv-app/AsusCamera/lib/arm64/libUndistort.so
-priv-app/AsusCamera/lib/arm64/libmpbase.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_panorama.so
-priv-app/AsusCamera/lib/arm64/libyuv_util.so
-priv-app/AsusCamera/lib/arm64/libbitmap.so
-priv-app/AsusCamera/lib/arm64/libasusundistort.so
 -priv-app/MotorService/MotorService.apk
 priv-app/MotorService/lib/arm64/libAsusLaserSensorHAL.so
 priv-app/MotorService/lib/arm64/libAsusMotorDriverHAL.so
@@ -34,88 +21,92 @@
 priv-app/MotorService/lib/arm64/libjni_motor.so
 
 # CNE
-#etc/permissions/cneapiclient.xml
-#etc/permissions/com.quicinc.cne.xml
-#framework/cneapiclient.jar
-#framework/com.quicinc.cne.api-V1.0-java.jar
-#framework/com.quicinc.cne.api-V1.1-java.jar
-#framework/com.quicinc.cne.constants-V1.0-java.jar
-#framework/com.quicinc.cne.constants-V2.0-java.jar
-#framework/com.quicinc.cne.constants-V2.1-java.jar
-#framework/com.quicinc.cne.jar
-#framework/com.quicinc.cne.server-V1.0-java.jar
-#framework/com.quicinc.cne.server-V2.0-java.jar
-#framework/com.quicinc.cne.server-V2.1-java.jar
-#framework/com.quicinc.cne.server-V2.2-java.jar
-#framework/com.quicinc.cne.server-V2.3-java.jar
-#framework/vendor.qti.hardware.data.latency-V1.0-java.jar
-#framework/vendor.qti.hardware.data.qmi-V1.0-java.jar
-#lib/com.quicinc.cne.server@1.0.so
-#lib/com.quicinc.cne.server@2.3.so
-#lib/vendor.qti.hardware.data.latency@1.0.so
-#lib64/com.quicinc.cne.server@1.0.so
-#lib64/com.quicinc.cne.server@2.3.so
-#lib64/vendor.qti.hardware.data.latency@1.0.so
-#-priv-app/CNEService/CNEService.apk
+etc/cne/Nexus/ATT/ATT_profiles.xml
+etc/cne/Nexus/ROW/ROW_profiles.xml
+etc/cne/Nexus/VZW/VZW_profiles.xml
+product/framework/com.quicinc.cne.api-V1.1-java.jar
+product/framework/com.quicinc.cne.constants-V1.0-java.jar
+product/framework/com.quicinc.cne.constants-V2.0-java.jar
+product/framework/com.quicinc.cne.constants-V2.1-java.jar
+product/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar
+product/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar
+product/lib/com.quicinc.cne.api@1.0.so
+product/lib/com.quicinc.cne.api@1.1.so
+product/lib/com.quicinc.cne.constants@1.0.so
+product/lib/com.quicinc.cne.constants@2.0.so
+product/lib/com.quicinc.cne.constants@2.1.so
+product/lib64/com.quicinc.cne.api@1.0.so
+product/lib64/com.quicinc.cne.api@1.1.so
+product/lib64/com.quicinc.cne.constants@1.0.so
+product/lib64/com.quicinc.cne.constants@2.0.so
+product/lib64/com.quicinc.cne.constants@2.1.so
+product/lib/vendor.qti.hardware.data.cne.internal.api@1.0.so
+product/lib/vendor.qti.hardware.data.cne.internal.constants@1.0.so
+product/lib/vendor.qti.hardware.data.cne.internal.server@1.0.so
+product/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so
+product/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so
+product/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so
 
 # Display api
-lib/libsdm-disp-apis.so
-lib/libsd_sdk_display.so
-lib64/libsdm-disp-apis.so
-lib64/libsd_sdk_display.so
-lib/vendor.display.color@1.0.so
-lib/vendor.display.color@1.1.so
-lib/vendor.display.color@1.2.so
-lib/vendor.display.postproc@1.0.so
-lib64/vendor.display.color@1.0.so
-lib64/vendor.display.color@1.1.so
-lib64/vendor.display.color@1.2.so
-lib64/vendor.display.postproc@1.0.so
+product/lib/libsdm-disp-apis.qti.so
+product/lib/libsd_sdk_display.qti.so
+product/lib64/libsdm-disp-apis.qti.so
+product/lib64/libsd_sdk_display.qti.so
+product/lib/vendor.display.color@1.0.so
+product/lib/vendor.display.color@1.1.so
+product/lib/vendor.display.color@1.2.so
+product/lib/vendor.display.color@1.3.so
+product/lib/vendor.display.postproc@1.0.so
+product/lib64/vendor.display.color@1.0.so
+product/lib64/vendor.display.color@1.1.so
+product/lib64/vendor.display.color@1.2.so
+product/lib64/vendor.display.color@1.3.so
+product/lib64/vendor.display.postproc@1.0.so
 
 # DPM
-#bin/dpmd
-#etc/dpm/dpm.conf
-#etc/init/dpmd.rc
-#etc/permissions/com.qti.dpmframework.xml
-#etc/permissions/dpmapi.xml
-#framework/com.qti.dpmframework.jar
-#framework/dpmapi.jar
-#framework/tcmclient.jar
-#lib/com.qualcomm.qti.dpm.api@1.0.so
-#lib/libdpmctmgr.so
-#lib/libdpmfdmgr.so
-#lib/libdpmframework.so
-#lib/libdpmtcm.so
-#lib64/com.qualcomm.qti.dpm.api@1.0.so
-#lib64/libdpmctmgr.so
-#lib64/libdpmfdmgr.so
-#lib64/libdpmframework.so
-#lib64/libdpmtcm.so
-#-priv-app/dpmserviceapp/dpmserviceapp.apk
+framework/tcmclient.jar
+product/bin/dpmd
+product/etc/dpm/dpm.conf
+product/etc/init/dpmd.rc
+product/etc/permissions/com.qti.dpmframework.xml
+product/etc/permissions/dpmapi.xml
+product/framework/com.qti.dpmframework.jar
+product/framework/dpmapi.jar
+product/lib/com.qualcomm.qti.dpm.api@1.0.so
+product/lib/libdpmctmgr.so
+product/lib/libdpmfdmgr.so
+product/lib/libdpmframework.so
+product/lib/libdpmtcm.so
+product/lib64/com.qualcomm.qti.dpm.api@1.0.so
+product/lib64/libdpmctmgr.so
+product/lib64/libdpmfdmgr.so
+product/lib64/libdpmframework.so
+product/lib64/libdpmtcm.so
+-product/priv-app/dpmserviceapp/dpmserviceapp.apk
 
 # FM
 lib/fm_helium.so
 lib/libfm-hci.so
--lib/vendor.qti.hardware.fm@1.0.so
 lib64/fm_helium.so
 lib64/libfm-hci.so
--lib64/vendor.qti.hardware.fm@1.0.so
+product/lib/vendor.qti.hardware.fm@1.0.so
+product/lib64/vendor.qti.hardware.fm@1.0.so
 
 # HotwordEnrollment
--priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk
--priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk
+-product/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk;PRESIGNED
 
 # IMS
-#-priv-app/ims/ims.apk
-#lib64/libdiag_system.so
-#lib64/libimscamera_jni.so
-#lib64/libimsmedia_jni.so
-#lib64/lib-imsvideocodec.so
-#lib64/lib-imsvtextutils.so
-#lib64/lib-imsvt.so
-#lib64/lib-imsvtutils.so
-#lib64/librcc.so
-#lib64/vendor.qti.imsrtpservice@1.0.so
+lib64/libdiag_system.so
+product/lib64/libimscamera_jni.so
+product/lib64/libimsmedia_jni.so
+product/lib64/lib-imsvideocodec.so
+product/lib64/lib-imsvtextutils.so
+product/lib64/lib-imsvt.so
+product/lib64/lib-imsvtutils.so
+product/lib64/vendor.qti.imsrtpservice@2.0.so
+product/lib64/vendor.qti.imsrtpservice@2.1.so
+-product/priv-app/ims/ims.apk
 
 # NFC
 #-app/NQNfcNci/NQNfcNci.apk
@@ -132,13 +123,17 @@
 #lib64/libnqnfc_nci_jni.so
 
 # Telephony
--app/QtiTelephonyService/QtiTelephonyService.apk
-etc/permissions/qcrilhook.xml
 etc/permissions/qti_libpermissions.xml
 etc/permissions/qti_permissions.xml
-etc/permissions/telephonyservice.xml
-etc/permissions/privapp-permissions-qti.xml
 etc/sysconfig/qti_whitelist.xml
-framework/qcrilhook.jar
-framework/QtiTelephonyServicelibrary.jar
--priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
\ No newline at end of file
+product/etc/permissions/qcrilhook.xml
+product/etc/permissions/telephony_product_privapp-permissions-qti.xml
+product/etc/permissions/telephonyservice.xml
+product/framework/QtiTelephonyServicelibrary.jar
+product/framework/qcrilhook.jar
+-product/app/QtiTelephonyService/QtiTelephonyService.apk
+-product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+
+# TEMP WEBVIEW
+-product/app/TrichromeLibrary/TrichromeLibrary.apk;PRESIGNED
+-product/app/WebViewGoogle/WebViewGoogle.apk;PRESIGNED
\ No newline at end of file