diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 074e7e0..75dd90a 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -70,7 +70,8 @@ TARGET_BOARD_PLATFORM := kona
 
 # Properties
 TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop
-TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
+TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
+TARGET_SYSTEM_EXT_PROP += $(COMMON_PATH)/system_ext.prop
 TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 
 # A/B
diff --git a/common.mk b/common.mk
index 446a182..886a4a6 100644
--- a/common.mk
+++ b/common.mk
@@ -473,8 +473,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.surface_flinger.force_hwc_copy_for_virtual_displays=true \
     ro.surface_flinger.has_HDR_display=true \
     ro.surface_flinger.has_wide_color_display=true \
-    ro.surface_flinger.max_virtual_display_dimension=4096 \
+    ro.surface_flinger.max_frame_buffer_acquired_buffers=3 \
     ro.surface_flinger.protected_contents=true \
-    ro.surface_flinger.set_touch_timer_ms=200 \
+    ro.surface_flinger.set_touch_timer_ms=0 \
     ro.surface_flinger.use_color_management=true \
     ro.surface_flinger.wcg_composition_dataspace=143261696
diff --git a/odm.prop b/odm.prop
index fab6c31..9f0be09 100644
--- a/odm.prop
+++ b/odm.prop
@@ -1,2 +1,6 @@
 # Audio
+ro.audio.monitorRotation=true
+ro.config.media_vol_steps=30
+ro.config.vc_call_vol_steps=9
+ro.vendor.audio.sdk.fluencetype=fluence
 ro.vendor.qti.va_odm.support=1
diff --git a/product.prop b/product.prop
new file mode 100644
index 0000000..0ab9d51
--- /dev/null
+++ b/product.prop
@@ -0,0 +1,2 @@
+# Audio
+af.fast_track_multiplier=1
diff --git a/system.prop b/system_ext.prop
similarity index 56%
rename from system.prop
rename to system_ext.prop
index 8f7654b..0ed8148 100644
--- a/system.prop
+++ b/system_ext.prop
@@ -1,8 +1,12 @@
 # Audio
 audio.offload.min.duration.secs=30
-persist.vendor.audio.hac.enable=false
 persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
 
+# Bluetooth
+persist.bluetooth.bqr.choppy_threshold=9,6
+persist.bluetooth.bqr.event_mask=0x8000000E
+persist.bluetooth.bqr.min_interval_ms=60000
+
 # Camera
 camera.disable_zsl_mode=true
 
@@ -10,10 +14,8 @@ camera.disable_zsl_mode=true
 ro.charger.disable_init_blank=true
 
 # Display
-debug.gralloc.gfx_ubwc_disable=0
 debug.sf.enable_hwc_vds=1
 debug.sf.latch_unsignaled=1
-persist.vendor.color.matrix=2
 
 # CNE
 persist.vendor.cne.feature=1
@@ -26,33 +28,22 @@ persist.dbg.volte_avail_ovr=1
 persist.dbg.vt_avail_ovr=1
 persist.dbg.wfc_avail_ovr=1
 
-# IOP
-vendor.iop.enable_prefetch_ofr=1
-vendor.iop.enable_uxe=0
-
 # Media
 media.settings.xml=/vendor/etc/media_profiles_vendor.xml
-
-# Netflix
-ro.netflix.bsp_rev=Q8250-19134-1
-
-# Perf
-ro.vendor.qti.core_ctl_max_cpu=4
-ro.vendor.qti.core_ctl_min_cpu=2
-
-# Radio
-ro.telephony.default_network=33,22
-
-# Touchscreen
-persist.vendor.qti.inputopts.enable=true
-persist.vendor.qti.inputopts.movetouchslop=0.6
+media.stagefright.thumbnail.prefer_hw_codecs=true
+ro.media.recorder-max-base-layer-fps=60
 
 # Netmgr
-persist.vendor.data.iwlan.enable=true
+persist.data.df.agg.dl_pkt=10
+persist.data.df.agg.dl_size=4096
 persist.vendor.data.mode=concurrent
 
-# SSR
-persist.vendor.ssr.restart_level=ALL_ENABLE
+# Radio
+ril.subscription.types=NV,RUIM
+ro.telephony.default_network=33,22
+
+# Sensors
+persist.vendor.sensors.enable.mag_filter=true
 
 # Vendor
 ro.vendor.qti.va_aosp.support=1
diff --git a/vendor.prop b/vendor.prop
index 3a7bf5c..5f8752e 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -3,7 +3,6 @@ aaudio.hw_burst_min_usec=2000
 aaudio.mmap_exclusive_policy=2
 aaudio.mmap_policy=2
 audio.deep_buffer.media=true
-audio.offload.video=false
 persist.vendor.audio.ambisonic.auto.profile=false
 persist.vendor.audio.ambisonic.capture=false
 persist.vendor.audio.apptype.multirec.enabled=false
@@ -12,20 +11,15 @@ persist.vendor.audio.fluence.speaker=true
 persist.vendor.audio.fluence.tmic.enabled=false
 persist.vendor.audio.fluence.voicecall=true
 persist.vendor.audio.fluence.voicecomm=true
-persist.vendor.audio.fluence.voicerec=true
+persist.vendor.audio.fluence.voicerec=false
 persist.vendor.audio.ras.enabled=false
 persist.vendor.audio.spv3.enable=true
 persist.vendor.audio.voicecall.speaker.stereo=true
-persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
-ro.audio.monitorRotation=true
-ro.config.media_vol_steps=30
-ro.vendor.audio.sdk.fluencetype=fluence
+ro.vendor.audio.sdk.fluencetype=none
 ro.vendor.audio.sdk.ssr=false
-ro.vendor.dolby.dax.version=DAX3_3.5.6.11_r1
 vendor.audio.adm.buffering.ms=2
 vendor.audio.dolby.ds2.enabled=false
 vendor.audio.dolby.ds2.hardbypass=false
-vendor.audio.dtmf.volume=35
 vendor.audio.enable.mirrorlink=false
 vendor.audio.feature.a2dp_offload.enable=true
 vendor.audio.feature.afe_proxy.enable=true
@@ -61,7 +55,7 @@ vendor.audio.feature.multi_voice_session.enable=true
 vendor.audio.feature.ras.enable=true
 vendor.audio.feature.record_play_concurency.enable=false
 vendor.audio.feature.snd_mon.enable=true
-vendor.audio.feature.spkr_prot.enable=false
+vendor.audio.feature.spkr_prot.enable=true
 vendor.audio.feature.src_trkn.enable=true
 vendor.audio.feature.ssrec.enable=true
 vendor.audio.feature.usb_offload.enable=true
@@ -70,7 +64,8 @@ vendor.audio.feature.usb_offload_sidetone_volume.enable=false
 vendor.audio.feature.vbat.enable=true
 vendor.audio.feature.wsa.enable=false
 vendor.audio.flac.sw.decoder.24bit=true
-vendor.audio.hal.output.suspend.supported=false
+vendor.audio.hal.boot.timeout.ms=20000
+vendor.audio.hal.output.suspend.supported=true
 vendor.audio.hw.aac.encoder=true
 vendor.audio.offload.buffer.size.kb=32
 vendor.audio.offload.gapless.enabled=true
@@ -94,15 +89,14 @@ vendor.voice.path.for.pcm.voip=true
 persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
 persist.bluetooth.a2dp_offload.disabled=false
 persist.sys.fflag.override.settings_bluetooth_hearing_aid=true
-persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
+persist.vendor.bluetooth.modem_nv_support=true
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
-persist.vendor.oneplus.bt.asd.chain=0
-persist.vendor.oneplus.bt.asd.firmware=false
 persist.vendor.qcom.bluetooth.a2dp_mcast_test.enabled=false
 persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptiver2
 persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=true
+persist.vendor.qcom.bluetooth.aptxadaptiver2_1_support=false
 persist.vendor.qcom.bluetooth.enable.splita2dp=true
 persist.vendor.qcom.bluetooth.scram.enabled=false
 persist.vendor.qcom.bluetooth.soc=hastings
@@ -111,34 +105,30 @@ ro.bluetooth.a2dp_offload.supported=true
 ro.vendor.bluetooth.wipower=false
 vendor.qcom.bluetooth.soc=hastings
 
-# Camera
-persist.vendor.camera.privapp.list=com.oneplus.camera,com.oem.autotest,com.oneplus.factorymode
-vendor.arcsoft.sn_isHardCopy=0
-vendor.camera.algo.jpeghwencode=1
-vendor.camera.aux.packagelist=com.oem.autotest,com.oneplus.factorymode,com.oneplus.camera,com.oneplus.healthcheck
-
 # Chipset
-ro.soc.manufacturer=Qualcomm
+ro.soc.manufacturer=QTI
 ro.soc.model=SM8250
 
 # Crypto
-ro.crypto.allow_encrypt_override=true
 ro.crypto.volume.filenames_mode=aes-256-cts
 
 # Display
-ro.vendor.display.sensortype=2
-vendor.display.comp_mask=0
-vendor.display.disable_excl_rect=0
-vendor.display.disable_excl_rect_partial_fb=1
 vendor.display.disable_hw_recovery_dump=1
 vendor.display.disable_offline_rotator=1
-vendor.display.disable_scaler=0
+vendor.display.disable_system_load_check=1
 vendor.display.enable_async_powermode=0
-vendor.display.enable_optimize_refresh=1
-vendor.display.enable_posted_start_dyn=1
+vendor.display.enable_camera_smooth=1
+vendor.display.not_switch_qhd_120hz=1
+vendor.display.primary_mixer_stages=9
+vendor.display.show_memc_tomast=true
+vendor.display.smomo_camera_support=1
+vendor.display.smomo_game_support=0
 vendor.display.use_layer_ext=1
 vendor.display.use_smooth_motion=1
 
+# DPM
+persist.vendor.dpmhalservice.enable=1
+
 # DRM
 drm.service.enabled=true
 
@@ -146,7 +136,7 @@ drm.service.enabled=true
 persist.vendor.qfp=true
 
 # FRP
-ro.frp.pst=/dev/block/bootdevice/by-name/config
+ro.frp.pst=/dev/block/bootdevice/by-name/frp
 
 # Gatekeeper
 vendor.gatekeeper.disable_spu=true
@@ -155,44 +145,30 @@ vendor.gatekeeper.disable_spu=true
 persist.backup.ntpServer=0.pool.ntp.org
 
 # Graphics
-debug.egl.hw=0
-debug.mdpcomp.logs=0
+debug.sf.disable_backpressure=1
 debug.sf.enable_advanced_sf_phase_offset=1
 debug.sf.enable_gl_backpressure=1
 debug.sf.high_fps_early_gl_phase_offset_ns=-4000000
 debug.sf.high_fps_early_phase_offset_ns=-4000000
-debug.sf.high_fps_late_app_phase_offset_ns=1000000
 debug.sf.high_fps_late_sf_phase_offset_ns=-4000000
-debug.sf.hw=0
 debug.sf.latch_unsignaled=1
-persist.demo.hdmirotationlock=false
-persist.sys.sf.color_mode=0
 persist.sys.sf.color_saturation=1.0
-persist.sys.sf.native_mode=0
-ro.gfx.driver.0=com.oplus.gpudrivers.sm8250.api30
-ro.gfx.driver.1=com.qualcomm.qti.gpudrivers.kona.api30
 ro.hardware.egl=adreno
 ro.hardware.vulkan=adreno
-ro.opengles.version=196610
-vendor.gralloc.disable_ubwc=0
+vendor.opengles.version=196610
 
 # Incremental FS
-ro.incremental.enable=true
-
-# Keystore
-ro.hardware.keystore_desede=true
+ro.incremental.enable=yes
 
 # Media
 debug.stagefright.ccodec=4
 debug.stagefright.omx_default_rank=0
 
-# NFC
-ro.camera.notify_nfc=1
-
-# OTG
-persist.sys.oem.otg_support=true
+# Netflix
+ro.netflix.bsp_rev=Q8250-19134-1
 
 # PASR
+vendor.pasr.activemode.enabled=true
 vendor.power.pasr.enabled=false
 
 # Perf
@@ -201,29 +177,17 @@ ro.vendor.extension_library=libqti-perfd-client.so
 # Qualcomm System Daemon
 persist.vendor.qcomsysd.enabled=1
 
+# QSPM
+ro.vendor.qspm.enable=true
+
 # Radio
-persist.radio.snapshot_enabled=0
-persist.radio.snapshot_timer=0
-persist.rcs.otp_sms_port=0
-persist.rcs.supported=1
-persist.vendor.data.iwlan.enable=true
-persist.vendor.radio.5g_mode_pref=1
 persist.vendor.radio.apm_sim_not_pwdn=1
-persist.vendor.radio.arfcn_test_mode=3
-persist.vendor.radio.bar_fake_gcell=1
 persist.vendor.radio.custom_ecc=1
-persist.vendor.radio.data_con_rprt=1
-persist.vendor.radio.data_ltd_sys_ind=1
-persist.vendor.radio.efssync=true
 persist.vendor.radio.enableadvancedscan=true
-persist.vendor.radio.force_on_dc=true
-persist.vendor.radio.ignore_dom_time=10
 persist.vendor.radio.procedure_bytes=SKIP
-persist.vendor.radio.process_sups_ind=1
 persist.vendor.radio.rat_on=combine
 persist.vendor.radio.sib16_support=1
-persist.vendor.radio.uicc_se_enabled=true
-ro.com.android.dataroaming=false
+ro.com.android.dataroaming=true
 
 # Sensors
 persist.vendor.sensors.allow_non_default_discovery=true