rog3: rog2 --> rog3
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 518fa47..59fedb5 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,6 +1,3 @@
-# Android Auto
--product/priv-app/AndroidAutoStub/AndroidAutoStub.apk;PRESIGNED
-
 # Asus Game
 -app/FocusAppListener/FocusAppListener.apk;PRESIGNED
 -app/GameBroadcasterService/GameBroadcasterService.apk;PRESIGNED
@@ -9,7 +6,8 @@
 etc/hardcore_X1.json
 etc/hardcore_X2.json
 etc/hardcore_X3.json
-etc/permissions/asus.software.gamewidget.zenui.rog2.xml
+etc/x3_comb.json
+etc/permissions/asus.software.gamewidget.zenui.rog3.xml
 etc/permissions/asus.software.zenui.rog.xml
 etc/permissions/asus.software.zenui.xml
 etc/sysconfig/ims-hiddenapi-package-whitelist.xml
@@ -17,37 +15,7 @@
 priv-app/GameBroadcaster/lib/arm64/libJniModule.so
 -priv-app/ROGGameCenter/ROGGameCenter.apk;PRESIGNED
 
-# ANT+
--lib/libantradio.so
--lib64/libantradio.so
-product/lib/com.qualcomm.qti.ant@1.0.so
-product/lib64/com.qualcomm.qti.ant@1.0.so
-
-# Audio
-etc/cdma_call_conf.xml
-lib/libadsprpc_system.so
-lib/libcdsprpc_system.so
-lib/libmdsprpc_system.so
-lib/libsdsprpc_system.so
-lib64/libadsprpc_system.so
-lib64/libcdsprpc_system.so
-lib64/libmdsprpc_system.so
-lib64/libsdsprpc_system.so
-
-# Bluetooth
--app/aptxals/aptxals.apk
-etc/bluetooth/bt_profile.conf
-etc/bluetooth/interop_database.conf
-etc/permissions/audiosphere.xml
--framework/audiosphere.jar
-lib/libbluetooth_qti.so
-lib64/libbluetooth_qti.so
-product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
-product/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e
-
 # Camera
-lib/DataSet/ispDB/ASUS_UNDI.bin
-lib/DataSet/ispDB/ASUS_UNDI_ZOOM.bin
 lib64/DataSet/arch/DIT_List.cfg
 lib64/DataSet/ditSCidGen/msgchk.db
 lib64/DataSet/ispDB/ParameterDB.db
@@ -60,102 +28,48 @@
 lib64/libxditk_ditBSP_JNI.so
 -priv-app/AsusCamera/AsusCamera.apk;PRESIGNED
 priv-app/AsusCamera/lib/arm64/libasus_camera_panorama.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_panorama.so
+priv-app/AsusCamera/lib/arm64/libyuv_camera.so
+priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_interval_capture.so
 priv-app/AsusCamera/lib/arm64/libbitmap.so
 priv-app/AsusCamera/lib/arm64/libmpbase.so
 priv-app/AsusCamera/lib/arm64/libtensorflowlite_jni.so
 priv-app/AsusCamera/lib/arm64/libasus_camera_selfiepano.so
 priv-app/AsusCamera/lib/arm64/libasus_camera_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_distortion_correction.so
+priv-app/AsusCamera/lib/arm64/libasus_camera_interval_panorama.so
 priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_burstcapture.so
+priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_zf7.so
+priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_rog3.so
 priv-app/AsusCamera/lib/arm64/libyuv_util.so
 priv-app/AsusCamera/lib/arm64/libUndistort.so
 priv-app/AsusCamera/lib/arm64/libasusundistort.so
 priv-app/AsusCamera/lib/arm64/libarcsoft_object_tracking.so
 
-# CNE
-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
-
-# DPM
--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
-lib64/fm_helium.so
-lib64/libfm-hci.so
-product/lib/vendor.qti.hardware.fm@1.0.so
-product/lib64/vendor.qti.hardware.fm@1.0.so
-
 # Gallery
 -priv-app/AsusGallery/AsusGallery.apk;PRESIGNED
-priv-app/AsusGallery/lib/arm/libmpbase.so
-priv-app/AsusGallery/lib/arm/libjni_filter_show.so
-priv-app/AsusGallery/lib/arm/libtensorflowlite_jni.so
-priv-app/AsusGallery/lib/arm/libjni_face_effect.so
-priv-app/AsusGallery/lib/arm/librs.vignette.so
-priv-app/AsusGallery/lib/arm/libtensorflow_inference.so
-priv-app/AsusGallery/lib/arm/librs.convolve3x3.so
-priv-app/AsusGallery/lib/arm/libpanorenderer.so
-priv-app/AsusGallery/lib/arm/libpano_video_renderer.so
-priv-app/AsusGallery/lib/arm/librsjni_androidx.so
-priv-app/AsusGallery/lib/arm/librsjni.so
-priv-app/AsusGallery/lib/arm/libgif.so
-priv-app/AsusGallery/lib/arm/librs.grey.so
-priv-app/AsusGallery/lib/arm/libarcsoft_beautyshot.so
-priv-app/AsusGallery/lib/arm/librs.saturation.so
-priv-app/AsusGallery/lib/arm/libblur.so
-priv-app/AsusGallery/lib/arm/librs.grad.so
-priv-app/AsusGallery/lib/arm/librs.blur.so
-priv-app/AsusGallery/lib/arm/libRSSupport.so
-priv-app/AsusGallery/lib/arm/libjni_wide_angle_undistort.so
-priv-app/AsusGallery/lib/arm/libgvr.so
-priv-app/AsusGallery/lib/arm/libjni_cvface_api.so
-priv-app/AsusGallery/lib/arm/libcvface_api.so
-priv-app/AsusGallery/lib/arm/libarcsoft_undistort.so
-priv-app/AsusGallery/lib/arm/libopencv_java3.so
+priv-app/AsusGallery/lib/arm64/libmpbase.so
+priv-app/AsusGallery/lib/arm64/libjni_filter_show.so
+priv-app/AsusGallery/lib/arm64/libtensorflowlite_jni.so
+priv-app/AsusGallery/lib/arm64/libjni_face_effect.so
+priv-app/AsusGallery/lib/arm64/librs.vignette.so
+priv-app/AsusGallery/lib/arm64/libtensorflow_inference.so
+priv-app/AsusGallery/lib/arm64/librs.convolve3x3.so
+priv-app/AsusGallery/lib/arm64/libpanorenderer.so
+priv-app/AsusGallery/lib/arm64/libpano_video_renderer.so
+priv-app/AsusGallery/lib/arm64/librsjni_androidx.so
+priv-app/AsusGallery/lib/arm64/librsjni.so
+priv-app/AsusGallery/lib/arm64/libgif.so
+priv-app/AsusGallery/lib/arm64/librs.grey.so
+priv-app/AsusGallery/lib/arm64/libarcsoft_beautyshot.so
+priv-app/AsusGallery/lib/arm64/librs.saturation.so
+priv-app/AsusGallery/lib/arm64/libblur.so
+priv-app/AsusGallery/lib/arm64/librs.grad.so
+priv-app/AsusGallery/lib/arm64/librs.blur.so
+priv-app/AsusGallery/lib/arm64/libRSSupport.so
+priv-app/AsusGallery/lib/arm64/libjni_wide_angle_undistort.so
+priv-app/AsusGallery/lib/arm64/libgvr.so
+priv-app/AsusGallery/lib/arm64/libjni_cvface_api.so
+priv-app/AsusGallery/lib/arm64/libcvface_api.so
+priv-app/AsusGallery/lib/arm64/libarcsoft_undistort.so
 
 # GalleryBurst
 -priv-app/AsusGalleryBurst/AsusGalleryBurst.apk;PRESIGNED
@@ -169,220 +83,3 @@
 etc/videoeditor/Graceful.mfim
 etc/videoeditor/Happy.mfim
 etc/videoeditor/Dynamic.mfim
-
-# GPS
-etc/permissions/com.qti.location.sdk.xml
-etc/permissions/com.qualcomm.location.xml
-etc/permissions/izat.xt.srv.xml
-etc/permissions/privapp-permissions-com.qualcomm.location.xml
--framework/com.qti.location.sdk.jar
--framework/izat.xt.srv.jar
-lib64/liblocationservice_jni.so
-lib64/libxt_native.so
--priv-app/com.qualcomm.location/com.qualcomm.location.apk
-product/lib64/vendor.qti.gnss@1.0.so
-product/lib64/vendor.qti.gnss@1.1.so
-product/lib64/vendor.qti.gnss@1.2.so
-product/lib64/vendor.qti.gnss@2.0.so
-product/lib64/vendor.qti.gnss@2.1.so
-product/lib64/vendor.qti.gnss@3.0.so
-
-# HotwordEnrollment
--product/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk;PRESIGNED
--product/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk;PRESIGNED
-
-# MirarCast
-bin/sigma_miracasthalservice
-etc/init/com.qualcomm.qti.sigma_miracast@1.0-service.rc
-lib/libmiracastsystem.so
-lib/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so
-lib/hw/vendor.qti.hardware.sigma_miracast@1.0-impl.so
-lib64/libmiracastsystem.so
-lib64/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so
-lib64/hw/vendor.qti.hardware.sigma_miracast@1.0-impl.so
-product/lib/vendor.qti.hardware.sigma_miracast@1.0.so
-product/lib64/vendor.qti.hardware.sigma_miracast@1.0.so
-
-# NFC
-#-app/NQNfcNci/NQNfcNci.apk
-#-framework/com.nxp.nfc.nq.jar
-#-framework/com.gsma.services.nfc.jar
-#etc/permissions/com.nxp.nfc.nq.xml
-#etc/permissions/com.gsma.services.nfc.xml
-#etc/nqnfcee_access.xml
-#etc/nqnfcse_access.xml
-#lib/vendor.nxp.hardware.nfc@1.0.so
-#lib64/vendor.nxp.hardware.nfc@1.0.so
-#lib/libnqnfc-nci.so
-#lib64/libnqnfc-nci.so
-#lib64/libnqnfc_nci_jni.so
-
-# QVR
-bin/qvrservice
-etc/qvr/qvrservice_config.txt
-lib/libqvrcamera_client.qti.so
-lib/libqvrservice.so
-lib/libqvrservice_client.qti.so
-lib/rfsa/adsp/libdsp_streamer_qvrcam_receiver.so
-lib/rfsa/adsp/libeye_tracking_dsp_sample_skel.so
-lib/rfsa/adsp/libqvr_cam_dsp_driver_skel.so
-lib/rfsa/adsp/libqvr_dsp_driver_skel.so
-lib/rfsa/adsp/libsns_device_mode_skel.so
-lib/rfsa/adsp/libsns_low_lat_stream_skel.so
-lib/rfsa/adsp/libtracker_6dof_skel.so
-lib/libqvr_cam_cdsp_driver_stub.so
-lib/libqvr_eyetracking_plugin.so
-lib/libqvr_cdsp_driver_stub.so
-lib64/libqvrcamera_client.qti.so
-lib64/libqvrservice_client.qti.so
-
-# Sensors
-etc/sensors/proto/nanopb.proto
-etc/sensors/proto/sns_physical_sensor_test.proto
-etc/sensors/proto/sns_ccd_ttw.proto
-etc/sensors/proto/sns_std_sensor.proto
-etc/sensors/proto/sns_async_com_port.proto
-etc/sensors/proto/sns_tilt.proto
-etc/sensors/proto/sns_cmd.proto
-etc/sensors/proto/sns_interrupt.proto
-etc/sensors/proto/sns_basic_gestures.proto
-etc/sensors/proto/sns_game_rv.proto
-etc/sensors/proto/sns_accel_cal.proto
-etc/sensors/proto/sns_dae.proto
-etc/sensors/proto/sns_gyro_rot_matrix.proto
-etc/sensors/proto/sns_sensor_temperature.proto
-etc/sensors/proto/sns_pedometer_wrist.proto
-etc/sensors/proto/sns_wrist_tilt_gesture.proto
-etc/sensors/proto/sns_humidity.proto
-etc/sensors/proto/sns_heart_beat.proto
-etc/sensors/proto/sns_remote_proc_state.proto
-etc/sensors/proto/sns_oem1.proto
-etc/sensors/proto/sns_ext_svc.proto
-etc/sensors/proto/sns_diag.proto
-etc/sensors/proto/sns_rotv.proto
-etc/sensors/proto/sns_sim.proto
-etc/sensors/proto/sns_aont.proto
-etc/sensors/proto/sns_heart_rate.proto
-etc/sensors/proto/sns_accel.proto
-etc/sensors/proto/sns_device_orient.proto
-etc/sensors/proto/sns_bring_to_ear.proto
-etc/sensors/proto/sns_std.proto
-etc/sensors/proto/sns_registry.proto
-etc/sensors/proto/sns_gravity.proto
-etc/sensors/proto/sns_rgb.proto
-etc/sensors/proto/sns_offbody_detect.proto
-etc/sensors/proto/sns_data_acquisition_engine.proto
-etc/sensors/proto/sns_cmc.proto
-etc/sensors/proto/sns_distance_bound.proto
-etc/sensors/proto/sns_std_type.proto
-etc/sensors/proto/sns_pose_6dof.proto
-etc/sensors/proto/sns_sim_legacy.proto
-etc/sensors/proto/sns_sar.proto
-etc/sensors/proto/sns_threshold.proto
-etc/sensors/proto/sns_std_event_gated_sensor.proto
-etc/sensors/proto/sns_timer.proto
-etc/sensors/proto/sns_cal.proto
-etc/sensors/proto/sns_hall.proto
-etc/sensors/proto/sns_proximity.proto
-etc/sensors/proto/sns_mag_cal.proto
-etc/sensors/proto/sns_multishake.proto
-etc/sensors/proto/sns_diag_sensor.proto
-etc/sensors/proto/descriptor.proto
-etc/sensors/proto/sns_client.proto
-etc/sensors/proto/sns_thermopile.proto
-etc/sensors/proto/sns_psmd.proto
-etc/sensors/proto/sns_ultra_violet.proto
-etc/sensors/proto/sns_mag.proto
-etc/sensors/proto/sns_signal_sensor.proto
-etc/sensors/proto/sns_amd.proto
-etc/sensors/proto/sns_da_test.proto
-etc/sensors/proto/sns_dpc.proto
-etc/sensors/proto/sns_suid.proto
-etc/sensors/proto/sns_resampler.proto
-etc/sensors/proto/qti_gravity.proto
-etc/sensors/proto/sns_tilt_to_wake.proto
-etc/sensors/proto/sns_device_mode.proto
-etc/sensors/proto/sns_sig_motion.proto
-etc/sensors/proto/sns_gyro.proto
-etc/sensors/proto/sns_ambient_light.proto
-etc/sensors/proto/sns_pressure.proto
-etc/sensors/proto/sns_mcmd.proto
-etc/sensors/proto/sns_fw.proto
-etc/sensors/proto/sns_ppg.proto
-etc/sensors/proto/sns_geomag_rv.proto
-etc/sensors/proto/sns_facing.proto
-etc/sensors/proto/sns_gyro_cal.proto
-etc/sensors/proto/sns_pedometer.proto
-etc/sensors/proto/sns_fmv.proto
-etc/sensors/proto/sns_rmd.proto
-etc/sensors/proto/sns_ccd_walk.proto
-etc/sensors/proto/sns_motion_detect.proto
-etc/sensors/proto/sns_ambient_temperature.proto
-
-# Telephony
-etc/permissions/qti_libpermissions.xml
-etc/permissions/qti_permissions.xml
-etc/sysconfig/qti_whitelist.xml
-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
-
-# Wfd
-bin/wfdservice
-etc/init/wfdservice.rc
-etc/wfdconfigsink.xml
--framework/WfdCommon.jar
--priv-app/WfdService/WfdService.apk
-lib/com.qualcomm.qti.wifidisplayhal@1.0.so
-lib/libFileMux.so
-lib/libmmparser_lite.so
-lib/libmmosal.so
-lib/libmmrtpdecoder.so
-lib/libmmrtpencoder.so
-lib/libOmxMux.so
-lib/libwfdaac.so
-lib/libwfdavenhancements.so
-lib/libwfdcommonutils.so
-lib/libwfdconfigutils.so
-lib/libwfdclient.so
-lib/libwfdmminterface.so
-lib/libwfdmmsink.so
-lib/libwfdrtsp.so
-lib/libwfdservice.so
-lib/libwfdsm.so
-lib/libwfdsinksm.so
-lib/libwfduibcinterface.so
-lib/libwfduibcsink.so
-lib/libwfduibcsinkinterface.so
-lib/libwfduibcsrc.so
-lib/libwfduibcsrcinterface.so
-lib/libwfdmmsrc_system.so
-lib64/libFileMux.so
-lib64/libmmparser_lite.so
-lib64/libmmrtpdecoder.so
-lib64/libmmrtpencoder.so
-lib64/libmmosal.so
-lib64/libwfdclient.so
-lib64/libwfdcommonutils.so
-lib64/libwfdconfigutils.so
-lib64/libwfdmminterface.so
-lib64/libwfdmmsink.so
-lib64/libwfdnative.so
-lib64/libwfdrtsp.so
-lib64/libwfdsinksm.so
-lib64/libwfdsm.so
-lib64/libwfduibcinterface.so
-lib64/libwfduibcsinkinterface.so
-lib64/libwfduibcsink.so
-lib64/libwfduibcsrcinterface.so
-lib64/libwfduibcsrc.so
-product/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
-product/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
-product/lib64/vendor.qti.hardware.wifi.keystore@1.0.so
-
-# Wlan
--product/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar