diff --git a/BoardConfig.mk b/BoardConfig.mk
index 22dc998..c29637f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -185,7 +185,8 @@ TARGET_TAP_TO_WAKE_NODE := "/proc/touchpanel/double_tap_enable"
 
 # Properties
 TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop
-TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
+TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop
+TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
 # Recovery
diff --git a/odm.prop b/odm.prop
index fab6c31..68404c8 100644
--- a/odm.prop
+++ b/odm.prop
@@ -1,2 +1,5 @@
 # Audio
 ro.vendor.qti.va_odm.support=1
+
+# Radio
+ro.vendor.oplus.radio.project=2
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 67%
rename from system.prop
rename to system_ext.prop
index b95b123..95df115 100644
--- a/system.prop
+++ b/system_ext.prop
@@ -1,9 +1,11 @@
 # 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
 persist.vendor.bt.a2dp.aac_whitelist=false
 ro.bluetooth.library_name=libbluetooth_qti.so
 
@@ -14,10 +16,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
@@ -30,26 +30,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
-
-# Radio
-ro.telephony.default_network=33,33
-
-# 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,33
+
+# 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 d7e1506..06b944e 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -3,14 +3,12 @@ aaudio.hw_burst_min_usec=2000
 aaudio.mmap_exclusive_policy=2
 aaudio.mmap_policy=2
 audio.deep_buffer.media=true
-audio.offload.video=false
+audio.offload.video=true
 persist.audio.fluence.voicecomm=true
 persist.vendor.audio.ambisonic.auto.profile=false
 persist.vendor.audio.ambisonic.capture=false
 persist.vendor.audio.apptype.multirec.enabled=false
 persist.vendor.audio.avs.afe_api_version=2
-persist.vendor.audio.bcl.enabled=false
-persist.vendor.audio.fluence.audiorec=true
 persist.vendor.audio.fluence.speaker=true
 persist.vendor.audio.fluence.tmic.enabled=false
 persist.vendor.audio.fluence.voicecall=true
@@ -20,7 +18,7 @@ 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
+tunnel.audio.encode=true
 ro.config.media_vol_steps=30
 ro.config.vc_call_vol_steps=9
 ro.vendor.audio.sdk.fluencetype=fluence
@@ -72,7 +70,7 @@ vendor.audio.feature.vbat.enable=true
 vendor.audio.feature.wsa.enable=false
 vendor.audio.flac.sw.decoder.24bit=true
 vendor.audio.hal.boot.timeout.ms=20000
-vendor.audio.hal.output.suspend.supported=false
+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
@@ -96,49 +94,43 @@ 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.a2dp.hal.implementation=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.btstack.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
-persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=true
-persist.vendor.qcom.bluetooth.enable.splita2dp=true
+persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=false
 persist.vendor.qcom.bluetooth.scram.enabled=false
 persist.vendor.qcom.bluetooth.twsp_state.enabled=false
 ro.bluetooth.a2dp_offload.supported=true
-ro.vendor.bluetooth.wipower=false
-vendor.qcom.bluetooth.soc=hastings
 
 # Camera
-persist.vendor.camera.privapp.list=com.oneplus.factorymode,com.oneplus.camera,com.oem.autotest,com.oneplus.healthcheck
-vendor.arcsoft.sn_isHardCopy=0
-vendor.camera.algo.jpeghwencode=1
-vendor.camera.aux.packagelist=com.oneplus.factorymode,com.oplus.camera,com.oem.autotest,com.oneplus.healthcheck
+persist.vendor.camera.privapp.list=com.oneplus.camera,com.oppo.camera,com.oppo.engineermode,com.oplus.camera
+vendor.camera.algo.jpeghwencode=0
+vendor.camera.aux.packagelist=android,com.oneplus.camera,com.oppo.camera,com.oppo.engineermode,com.oplus.camera
 
 # Chipset
 ro.soc.manufacturer=Qualcomm
 ro.soc.model=SM4350
 
 # Crypto
-ro.crypto.allow_encrypt_override=true
 ro.crypto.dm_default_key.options_format.version=2
-ro.crypto.volume.filenames_mode=aes-256-cts
 ro.crypto.volume.metadata.method=dm-default-key
 
+# DPM
+persist.vendor.dpm.idletimer.mode=default
+persist.vendor.dpmhalservice.enable=1
+
 # 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_offline_rotator=0
+vendor.display.enable_camera_smooth=1
 vendor.display.enable_async_powermode=0
 vendor.display.enable_early_wakeup=1
 vendor.display.enable_optimize_refresh=1
 vendor.display.enable_posted_start_dyn=1
-vendor.display.secure_preview_buffer_format=420_sp
 vendor.display.use_layer_ext=1
 vendor.display.use_smooth_motion=1
 
@@ -153,27 +145,18 @@ vendor.gatekeeper.disable_spu=true
 
 # GPS
 persist.backup.ntpServer=0.pool.ntp.org
+persist.vendor.overlay.izat.optin=rro
 
 # Graphics
-debug.egl.hw=0
-debug.mdpcomp.logs=0
-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.disable_backpressure=1
 debug.sf.latch_unsignaled=1
-persist.demo.hdmirotationlock=false
-persist.sys.sf.color_mode=0
 persist.sys.sf.color_saturation=1.0
 ro.hardware.egl=adreno
 ro.hardware.vulkan=adreno
 ro.opengles.version=196610
 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.has_HDR_display=false
+ro.surface_flinger.has_wide_color_display=false
 ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 ro.surface_flinger.max_virtual_display_dimension=4096
 ro.surface_flinger.protected_contents=true
@@ -181,7 +164,7 @@ ro.surface_flinger.refresh_rate_switching=true
 ro.surface_flinger.set_idle_timer_ms=80
 ro.surface_flinger.set_touch_timer_ms=200
 ro.surface_flinger.set_display_power_timer_ms=1000
-ro.surface_flinger.use_color_management=true
+ro.surface_flinger.use_color_management=false
 ro.surface_flinger.use_content_detection_for_refresh_rate=true
 ro.surface_flinger.wcg_composition_dataspace=143261696
 vendor.gralloc.disable_ubwc=0
@@ -189,45 +172,40 @@ vendor.gralloc.secure_preview_buffer_format=420_sp
 vendor.gralloc.secure_preview_only=1
 
 # 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
+vendor.media.vpp.enable=0
+vendor.media.vpp.oplus.version=2
+vendor.media.vpp.osie.enable=0
+vendor.media.vpp.sr.enable=0
+vendor.mm.enable.qcom_parser=4044018
 
 # PASR
+vendor.pasr.activemode.enabled=true
 vendor.power.pasr.enabled=false
 
 # Perf
 ro.vendor.extension_library=libqti-perfd-client.so
 
 # 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.poweron_opt=1
 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
+persist.vendor.radio.stack_id_0=0
+persist.vendor.radio.stack_id_1=1
 ro.com.android.dataroaming=false
 
+# QSPM
+ro.vendor.qspm.enable=true
+
 # Sensors
 persist.vendor.sensors.debug.ssc_qmi_debug=true
 persist.vendor.sensors.enable.mag_filter=true