diff --git a/vendor.prop b/vendor.prop
index b54ef2a..74046f5 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,22 +1,73 @@
+ro.surface_flinger.has_wide_color_display=true
+ro.surface_flinger.has_HDR_display=true
+ro.surface_flinger.use_color_management=true
+ro.surface_flinger.wcg_composition_dataspace=143261696
+ro.surface_flinger.protected_contents=true
+ro.surface_flinger.use_content_detection_for_refresh_rate=true
+ro.surface_flinger.set_touch_timer_ms=1500
+ro.surface_flinger.force_hwc_copy_for_virtual_displays=true
+ro.surface_flinger.max_frame_buffer_acquired_buffers=3
+ro.surface_flinger.max_virtual_display_dimension=4096
+ro.surface_flinger.supports_background_blur=0
+####################################
+# from variable PRODUCT_PROPERTY_OVERRIDES
+####################################
+ro.soc.manufacturer=QTI
+ro.control_privapp_permissions=enforce
 vendor.gatekeeper.disable_spu=true
 persist.vendor.qcomsysd.enabled=0
 persist.vendor.radio.data_ltd_sys_ind=1
-sys.tcpdump.num=5
+sys.tcpdump.num=10
 sys.tcpdump.size=40
 sys.tcpdump.file=/data/logcat_log/capture.pcap
 ro.internal.tcpdump.file=/data/logcat_log/capture.pcap
 persist.vendor.dpm.loglevel=0
 persist.vendor.dpmhalservice.loglevel=0
-persist.vendor.dpm.feature=3
+persist.vendor.dpm.feature=11
 persist.vendor.data.mode=test
-vendor.pasr.activemode.enabled=false
-ro.com.android.dataroaming=false
+persist.vendor.data.profile_update=true
+persist.logd.qxdmlog.maxfiles=20
+persist.logd.qxdmlog.filter=/system/etc/qxdm/PS_GeneralTest_513102.cfg
+persist.logd.qxdmlog.ipath=/data/vendor/ramdump/diag_logs/QXDM_logs
+persist.logd.qxdmlog.sd1mmc0=0
+persist.logd.qxdmlog.enable=0
+persist.logd.qxdmlog.parm=3
+persist.logd.qxdmlog.type=0
+log.qxdm.qcomsysd=0
+persist.logd.modem.restart=28
+persist.vendor.mdm_helper.fail_action=cold_reset,s3_reset,panic
 persist.backup.ntpServer=0.pool.ntp.org
 sys.vendor.shutdown.waittime=500
 ro.frp.pst=/dev/block/bootdevice/by-name/frp
+dalvik.vm.heapstartsize=8m
+dalvik.vm.heapsize=512m
+dalvik.vm.heapgrowthlimit=256m
+dalvik.vm.heaptargetutilization=0.75
+dalvik.vm.heapminfree=512k
+dalvik.vm.heapmaxfree=8m
+dalvik.vm.heapstartsize.large=16m
+dalvik.vm.heaptargetutilization.large=0.5
+dalvik.vm.heapminfree.large=8m
+dalvik.vm.heapmaxfree.large=32m
+ro.vendor.beluga.p=0x3
+ro.vendor.beluga.c=0x4800
+ro.vendor.beluga.s=0x900
+ro.vendor.beluga.t=0x240
 wifi.aware.interface=wifi-aware0
-persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
+ro.incremental.enable=yes
+persist.vendor.qfp=true
+ro.vendor.qspm.enable=true
+persist.vendor.radio.enableadvancedscan=true
+persist.sys.fuse.passthrough.enable=true
+vendor.hw.fm.init=0
+vendor.mm.enable.qcom_parser=16777215
+ro.hardware.vulkan=adreno
+ro.hardware.egl=adreno
+ro.opengles.version=196610
+af.fast_track_multiplier=1
+ro.audio.flinger_standbytime_ms=2000
 vendor.audio_hal.period_size=192
+vendor.audio.ull_record_period_multiplier=2
 persist.vendor.audio.ambisonic.capture=false
 persist.vendor.audio.ambisonic.auto.profile=false
 persist.vendor.audio.apptype.multirec.enabled=false
@@ -25,15 +76,19 @@
 persist.vendor.audio.fluence.voicerec=false
 persist.vendor.audio.fluence.speaker=true
 persist.vendor.audio.fluence.tmic.enabled=false
-persist.vendor.audio.speaker.prot.enable=false
-persist.vendor.audio.spv4.enable=true
-persist.vendor.audio.avs.afe_api_version=9
-persist.vendor.audio.vbat.enabled=false
-persist.vendor.audio.bcl.enabled=false
+ro.qc.sdk.audio.ssr=false
+ro.qc.sdk.audio.fluencetype=none
+persist.audio.fluence.voicecall=true
+persist.audio.fluence.voicerec=false
+persist.audio.fluence.speaker=true
+persist.vendor.audio.spv3.enable=true
+persist.vendor.audio.avs.afe_api_version=2
 vendor.audio.tunnel.encode=false
 persist.vendor.audio.ras.enabled=false
 vendor.audio.offload.buffer.size.kb=32
+audio.offload.video=false
 vendor.audio.offload.track.enable=true
+audio.deep_buffer.media=true
 vendor.voice.path.for.pcm.voip=true
 vendor.audio.offload.multiaac.enable=true
 vendor.audio.dolby.ds2.enabled=false
@@ -49,16 +104,23 @@
 persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
 ro.bluetooth.a2dp_offload.supported=true
 persist.bluetooth.a2dp_offload.disabled=false
-persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-lc3
+persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
 vendor.audio.use.sw.alac.decoder=true
 vendor.audio.use.sw.ape.decoder=true
 vendor.audio.use.sw.mpegh.decoder=true
-vendor.audio.hw.aac.encoder=true
+vendor.audio.hw.aac.encoder=false
+audio.sys.noisy.broadcast.delay=600
+audio.sys.offload.pstimeout.secs=3
+ro.af.client_heap_size_kbyte=7168
 vendor.audio_hal.in_period_size=144
 vendor.audio_hal.period_multiplier=3
 vendor.audio.adm.buffering.ms=2
 vendor.audio.volume.headset.gain.depcal=true
 persist.audio.fluence.voicecomm=true
+vendor.audio.c2.preferred=true
+debug.c2.use_dmabufheaps=1
+vendor.qc2audio.suspend.enabled=true
+vendor.qc2audio.per_frame.flac.dec.enabled=true
 debug.stagefright.omx_default_rank=0
 vendor.audio.hal.output.suspend.supported=true
 aaudio.mmap_policy=2
@@ -67,7 +129,6 @@
 vendor.audio.enable.mirrorlink=false
 persist.vendor.audio.voicecall.speaker.stereo=true
 persist.vendor.bt.aac_frm_ctl.enabled=true
-vendor.audio.spkr_prot.tx.sampling_rate=48000
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
 persist.vendor.audio.ha_proxy.enabled=true
 vendor.audio.feature.a2dp_offload.enable=true
@@ -112,46 +173,116 @@
 vendor.audio.feature.wsa.enable=false
 vendor.audio.feature.audiozoom.enable=false
 vendor.audio.feature.snd_mon.enable=true
-vendor.audio.feature.power_mode.enable=true
-ro.incremental.enable=yes
-ro.soc.manufacturer=QTI
-persist.vendor.qfp=true
-ro.vendor.qspm.enable=true
-persist.vendor.radio.enableadvancedscan=true
-vendor.hw.fm.init=0
-persist.vendor.dpm.idletimer.mode=default
-vendor.mm.enable.qcom_parser=16777215
-ro.vendor.extension_library=libqti-perfd-client.so
-ro.hardware.vulkan=adreno
-ro.hardware.egl=adreno
-ro.gfx.driver.1=com.qualcomm.qti.gpudrivers.lahaina.api30
-ro.opengles.version=196610
-persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptiver2
+vendor.audio.feature.dmabuf.cma.memory.enable=true
+vendor.audio.hdr.record.enable=true
+persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac-aptxadaptiver2
 persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.twsp_state.enabled=false
 persist.vendor.qcom.bluetooth.a2dp_mcast_test.enabled=false
 persist.vendor.qcom.bluetooth.scram.enabled=false
 persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=true
 persist.vendor.qcom.bluetooth.aptxadaptiver2_1_support=true
+persist.vendor.qcom.bluetooth.aptxadaptiver2_2_support=true
 persist.sys.fflag.override.settings_bluetooth_hearing_aid=true
-ro.crypto.dm_default_key.options_format.version=2
-ro.crypto.volume.metadata.method=dm-default-key
+ro.vendor.bluetooth.csip_qti=true
+ro.camera.enableCamera1MaxZsl=1
+drm.service.enabled=true
+persist.sys.sf.color_mode=0
+persist.demo.hdmirotationlock=false
+persist.sys.sf.color_saturation=1.0
+debug.sf.hw=0
+debug.egl.hw=0
+debug.sf.latch_unsignaled=1
+debug.sf.high_fps_late_app_phase_offset_ns=1000000
+debug.mdpcomp.logs=0
+vendor.gralloc.disable_ubwc=0
+vendor.display.disable_scaler=0
+vendor.display.disable_excl_rect=0
+vendor.display.disable_excl_rect_partial_fb=1
+vendor.display.comp_mask=0
+vendor.display.enable_optimize_refresh=0
+vendor.display.use_smooth_motion=1
+vendor.display.disable_stc_dimming=1
+vendor.display.enable_dpps_dynamic_fps=1
+debug.sf.high_fps_late_sf_phase_offset_ns=-2000000
+debug.sf.high_fps_early_phase_offset_ns=-4000000
+debug.sf.high_fps_early_gl_phase_offset_ns=-2000000
+debug.sf.disable_client_composition_cache=1
+debug.sf.enable_gl_backpressure=1
+debug.sf.enable_hwc_vds=1
+debug.sf.enable_advanced_sf_phase_offset=1
+vendor.display.vds_allow_hwc=0
+vendor.display.enable_async_vds_creation=1
+vendor.display.enable_rounded_corner=1
+vendor.display.disable_3d_adaptive_tm=1
+vendor.display.disable_sdr_dimming=1
+vendor.display.enable_rc_support=1
+vendor.display.disable_sdr_histogram=1
+vendor.display.enable_hdr10_gpu_target=1
+vendor.display.disable_offline_rotator=1
+vendor.display.enable_async_powermode=0
+vendor.display.disable_hw_recovery_dump=1
+vendor.display.enable_early_wakeup=1
+persist.vendor.dpm.vndr.idletimer.mode=default
+persist.vendor.dpm.vndr.halservice.enable=1
+persist.vendor.dpm.vndr.feature=11
+persist.vendor.rcs.singlereg.feature=1
 debug.stagefright.c2inputsurface=-1
-persist.vendor.sensors.sync_request=true
-persist.vendor.sensors.allow_non_default_discovery=true
-persist.vendor.sensors.on_change_sample_period=true
+ro.vendor.extension_library=libqti-perfd-client.so
+ro.vendor.perf-hal.ver=2.3
 persist.vendor.radio.apm_sim_not_pwdn=1
 persist.vendor.radio.sib16_support=1
-rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
 persist.vendor.radio.procedure_bytes=SKIP
 persist.radio.multisim.config=dsds
+vendor.usb.use_gadget_hal=1
+vendor.usb.rndis.func.name=gsi
+vendor.usb.rmnet.func.name=gsi
+vendor.usb.rmnet.inst.name=rmnet
+vendor.usb.dpl.inst.name=dpl
+vendor.usb.qdss.inst.name=qdss_sw
 vendor.usb.diag.func.name=ffs
 vendor.usb.use_ffs_mtp=1
+sys.usb.mtp.batchcancel=1
 debug.stagefright.ccodec=4
 persist.sys.rogbootanimation.enable=0
+ro.config.ringtone=Joy.ogg
+ro.config.notification_sound=NewMessage.ogg
+ro.config.newmail_sound=NewMail.ogg
+ro.config.calendaralert_sound=CalendarEvent.ogg
+ro.config.alarm_alert=BusyBugs.ogg
 ro.additionalbutton.operation=0
+ro.config.sentmail_sound=SentMail.ogg
 ro.ril.ecclist=112,911
+persist.sys.optiflex.enable=true
+persist.sys.nextappcore.enable=false
+persist.sys.optiflex.maxlist.4gb=4
+persist.sys.optiflex.maxlist.5gb=5
+persist.sys.optiflex.maxlist.6gb=5
+persist.sys.optiflex.upbound.4gb=700
+persist.sys.optiflex.upbound.6gb=700
+persist.sys.optiflex.lowbound.4gb=450
+persist.sys.optiflex.lowbound.6gb=450
+persist.sys.optiflex.uplevel.4gb=200
+persist.sys.optiflex.uplevel.6gb=200
+persist.sys.optiflex.mem.cache=true
+persist.sys.predict.upbound.4gb=700
+persist.sys.predict.upbound.6gb=700
+persist.sys.predict.lowbound.4gb=600
+persist.sys.predict.lowbound.6gb=600
+persist.sys.optiflex.minfree.bound=true
+persist.sys.skiprecent=true
+dalvik.vm.lockprof.threshold=500
+persist.sys.mm.wapn.show=0
+persist.sys.godoverlay.enable=1
+persist.sys.fpsctrl.enable=1
+persist.sys.autofps.mode=2
+persist.sys.cpulimit.enable=true
+persist.sys.thermal_policy_update=1
+persist.sys.notchui.enable=1
+ro.surface_flinger.set_idle_timer_ms=1500
 ro.hardware.fingerprint=goodixfp
+ro.vendor.asus.phone.dual_nt_sup=5
+ro.vendor.odm.tel.endc_off=1
 ro.telephony.default_network=26,26
 ril.subscription.types=RUIM,RUIM
 persist.vendor.radio.flexmap_type=none
@@ -161,36 +292,41 @@
 persist.vendor.radio.custom_ecc=0
 persist.vendor.radio.do_not_use_ril_optr_db=1
 persist.vendor.data.iwlan.enable=true
+persist.vendor.cne.logging.qxdm=4242
 drm.service.enabled=true
 
 # Camera
+vendor.camera.asus.system=1
 vendor.camera.expTimeMax=0
-vendor.camera.cam5.crop_region=2:0,0,4032,3024;3:728,546,3304,2478
+vendor.camera.cam5.crop_region=2:0,0,4032,3024;3:562,421,3470,2603
 vendor.camera.preview_beauty=4:1;1:1;2:1;3:1;5:1
 vendor.camera.preview_portrait=4:0;1:1;2:0;3:0
-vendor.camera.cam3.video_fps=HD@60,FHD@60,4K@60,8K@30
-vendor.camera.cam1.video_fps=HD@30,FHD@60,4K@30
-vendor.camera.cam2.video_fps=HD@30,FHD@60,4K@60
-vendor.camera.cam5.video_fps=HD@30,FHD@60,4K@60,8K@30
+vendor.camera.cam3.video_fps=HD@60,FHD@60,4K@60,8K@24
+vendor.camera.cam1.video_fps=HD@60,FHD@60,4K@30
+vendor.camera.cam2.video_fps=HD@60,FHD@60,4K@60
+vendor.camera.cam5.video_fps=HD@60,FHD@60,4K@60,8K@24
 vendor.camera.dual_bokeh=4:1;1:0;2:0;3:0;5:0
 vendor.camera.lens_type=1:std;2:wid;3:std;4:vir;5:sat
 vendor.camera.use_frame_processor=0
-vendor.camera.ai_scene_mode=4:0;1:1;2:1;3:1;5:1
-vendor.camera.undistortion.preview=4:0;1:0;2:1;3:0;5:1
-vendor.camera.undistortion.video=4:0;1:0;2:0;3:0;5:0
 vendor.camera.capture.override_max_digital_zoom=3:8
+vendor.camera.cam2.bokeh_prefer_size=2944x2208,2944x1656,2208x2208,2896x1304
+vendor.camera.cam1.max_analog_gain=binning:200.0;full:200.0
+vendor.camera.cam2.max_analog_gain=binning:200.0;full:200.0
+vendor.camera.cam3.max_analog_gain=binning:1600.0;full:396.0
 vendor.camera.cam1.stream_list=1P/2Y/1J
 vendor.camera.cam2.stream_list=1P/2Y/1J
 vendor.camera.cam3.stream_list=1P/2Y/1J
 vendor.camera.cam3.exposure_time_range=100000,32000000000
 vendor.camera.cam1.exposure_time_range=100000,16000000000
 vendor.camera.cam2.exposure_time_range=100000,32000000000
-vendor.camera.cam3.eis.sup_list=HD@60,FHD@60,4K@60,8K@30
-vendor.camera.cam1.eis.sup_list=HD@30,FHD@60,4K@30
-vendor.camera.cam2.eis.sup_list=HD@30,FHD@60,4K@60
-vendor.camera.cam5.eis.sup_list=HD@30,FHD@60,4K@60,8K@30
-vendor.camera.fovc=0:0;1:1;2:1;3:1;4:0;5:0
-vendor.camera.night=2:1;3:1;5:1
-vendor.camera.atdtest=3:9;2:4;1:0
-vendor.camera.asus.system=1
+vendor.camera.cam0.eis.sup_list=HD@60,FHD@60,4K@30,4K@60,8K@24
+vendor.camera.cam3.eis.sup_list=HD@60,FHD@60,4K@30,4K@60,8K@24
+vendor.camera.cam1.eis.sup_list=HD@30,HD@60,FHD@60,4K@30
+vendor.camera.cam2.eis.sup_list=HD@30,HD@60,FHD@60,4K@60
+vendor.camera.cam5.eis.sup_list=HD@30,HD@60,FHD@60,4K@60,8K@24
 vendor.camera.eis_ois.sup_list=8K@24,4K@60,4K@30,FHD@60,FHD@30,HD@60,HD@30
+vendor.camera.fovc=0:1;1:1;2:1;3:1;4:1;5:1
+vendor.camera.night=1:1;2:1;3:1;5:1
+vendor.camera.light_art=0:1;1:0;2:1;3:1
+
+import /vendor/build_${ro.boot.country_code}.prop