diff --git a/system_ext.prop b/system_ext.prop
index 95df115..6fa8572 100644
--- a/system_ext.prop
+++ b/system_ext.prop
@@ -1,12 +1,15 @@
 # Audio
 audio.offload.min.duration.secs=30
 persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
+tunnel.audio.encode=true
 
 # 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
+persist.vendor.bt.a2dp.hal.implementation=true
+persist.vendor.btstack.aac_frm_ctl.enabled=true
 ro.bluetooth.library_name=libbluetooth_qti.so
 
 # Camera
@@ -25,6 +28,10 @@ persist.vendor.cne.feature=1
 # DPM
 persist.vendor.dpm.feature=11
 
+# GPS
+persist.backup.ntpServer=0.pool.ntp.org
+persist.vendor.overlay.izat.optin=rro
+
 # IMS
 persist.dbg.volte_avail_ovr=1
 persist.dbg.vt_avail_ovr=1
@@ -34,6 +41,7 @@ persist.dbg.wfc_avail_ovr=1
 media.settings.xml=/vendor/etc/media_profiles_vendor.xml
 media.stagefright.thumbnail.prefer_hw_codecs=true
 ro.media.recorder-max-base-layer-fps=60
+vendor.mm.enable.qcom_parser=4044018
 
 # Netmgr
 persist.data.df.agg.dl_pkt=10
diff --git a/vendor.prop b/vendor.prop
index 06b944e..ec190c3 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -4,7 +4,6 @@ aaudio.mmap_exclusive_policy=2
 aaudio.mmap_policy=2
 audio.deep_buffer.media=true
 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
@@ -18,7 +17,6 @@ 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
-tunnel.audio.encode=true
 ro.config.media_vol_steps=30
 ro.config.vc_call_vol_steps=9
 ro.vendor.audio.sdk.fluencetype=fluence
@@ -95,10 +93,8 @@ 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.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.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=false
 persist.vendor.qcom.bluetooth.scram.enabled=false
@@ -143,10 +139,6 @@ ro.frp.pst=/dev/block/bootdevice/by-name/frp
 # Gatekeeper
 vendor.gatekeeper.disable_spu=true
 
-# GPS
-persist.backup.ntpServer=0.pool.ntp.org
-persist.vendor.overlay.izat.optin=rro
-
 # Graphics
 debug.sf.disable_backpressure=1
 debug.sf.latch_unsignaled=1
@@ -181,7 +173,6 @@ 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