diff --git a/system.prop b/system.prop
index 0a750a3..5b7e440 100644
--- a/system.prop
+++ b/system.prop
@@ -1,4 +1,49 @@
 # Audio
+media.stagefright.audio.sink=384
+af.fast.track.multiplier=2
+vendor.audio_hal.period_multiplier=3
+audio.offload.buffer.size.kb=384
+vendor.mm.enable.qcom_parser=80255037
+persist.mm.enable.prefetch=true
+ro.mediacodec.min_sample_rate=7350
+ro.mediacodec.max_sample_rate=2822400
+audio.sys.noisy.broadcast.delay=600
+audio.sys.offload.pstimeout.secs=3
+audio.volume.headset.gain.depcal=true
+vendor.audio.offload.gapless.enabled=false
+vendor.audio.offload.multiaac.enable=false
+vendor.audio.offload.multiple.enabled=false
+vendor.audio.offload.passthrough=false
+vendor.audio.offload.track.enable=false
+debug.stagefright.omx_default_rank=0
+mpq.audio.decode=true
+lpa.decode=false
+audio.decoder_override_check=true
+use.non-omx.mp3.decoder=false
+use.non-omx.aac.decoder=false
+lpa.use-stagefright=false
+lpa.releaselock=false
+vendor.audio.flac.sw.decoder.24bit=true
+vendor.audio.aac.sw.decoder.24bit=true
+vendor.audio.use.sw.alac.decoder=true
+vendor.audio.flac.sw.encoder.24bit=true
+vendor.audio.aac.sw.encoder.24bit=true
+vendor.audio.use.sw.ape.decoder=true
+qcom.hw.aac.encoder=true
+audio.hw.aac.decoder=true
+qcom.hw.aac.decoder=true
+persist.audio.format.24bit=true
+ro.qc.sdk.audio.ssr=false
+ro.vendor.audio.sdk.ssr=false
+ro.audio.hifi=true
+persist.audio.hifi=true
+persist.audio.hifi.volume=74
+persist.vendor.audio.hifi=true
+persist.audio.hifi.int_codec=true
+vendor.audio.feature.hifi_audio.enable=true
+ro.vendor.audio.hifi=true
+persist.vendor.audio.hifi.int_codec=true
+ro.hardware.hifi.support=true
 audio.deep_buffer.media=true
 audio.offload.buffer.size.kb=32
 audio.offload.gapless.enabled=true
@@ -12,9 +57,56 @@ ro.qc.sdk.audio.fluencetype=none
 
 # Bluetooth
 persist.vendor.btstack.aac_frm_ctl.enabled=true
-persist.vendor.btstack.enable.twsplus=true
 persist.vendor.service.bdroid.soc.alwayson=true
 ro.bluetooth.library_name=libbluetooth_qti.so
+persist.service.btui.use_aptx=1
+persist.bt.enableAptXHD=true
+persist.bt.a2dp.aptx_disable=false
+persist.bt.a2dp.aptx_hd_disable=false
+persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+persist.bluetooth.a2dp_offload.disabled=false
+persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
+persist.vendor.btstack.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
+persist.vendor.btstack.enable.splita2dp=true
+persist.vendor.btstack.enable.twsplus=true
+persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptive
+persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
+persist.vendor.qcom.bluetooth.enable.splita2dp=true
+persist.vendor.qcom.bluetooth.twsp_state.enabled=false
+ro.bluetooth.emb_wp_mode=false
+ro.bluetooth.wipower=false
+ro.vendor.bluetooth.wipower=false
+persist.vendor.bt.soc.scram_freqs=192
+persist.bt.a2dp.aac_disable=false
+persist.vendor.bt.aac_frm_ctl.enabled=true
+audio.effect.a2dp.enable=1
+vendor.audio.effect.a2dp.enable=1
+vendor.btstack.absolute_volume=true
+persist.vendor.btstack.absolute_volume=true
+persist.bluetooth.avrcpversion=avrcp16
+persist.vendor.btstack.avrcp.pos_time=1000
+persist.bluetooth.enabledelayreports=true
+vendor.bt.pts.pbap=true
+persist.vendor.bt.a2dp.aac_whitelist=false
+persist.vendor.bt.a2dp.addr_check_enabled_for_aac=true
+persist.audio.lowlatency.rec=true
+audio.safx.pbe.enabled=false
+audio.playback.mch.downsample=false
+effect.reverb.pcm=1
+vendor.audio.playback.mch.downsample=false
+persist.vendor.audio.playback.mch.downsample=false
+vendor.audio.matrix.limiter.enable=0
+persist.vendor.audio.ambisonic.auto.profile=true
+vendor.audio.tunnel.encode=false
+tunnel.audio.encode=false
+qc.tunnel.audio.encode=false
+vendor.av.offload.enable=false
+av.offload.enable=false
+qc.av.offload.enable=false
+ro.audioprofile.more=yes
+persist.sys.media.use-awesome=1
+ro.audio.samplerate=48000
+ro.audio.pcm.samplerate=48000
 
 # CNE
 persist.vendor.cne.feature=1