diff --git a/properties/system.prop b/properties/system.prop
index 0c5ffef9..66d116aa 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -1,3 +1,7 @@
+# ART
+ro.vendor.qti.am.reschedule_service=true
+ro.sys.fw.dex2oat_thread_count=8
+
 # Audio
 audio.safemedia.bypass=true
 audio.offload.min.duration.secs=30
@@ -6,15 +10,18 @@ persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
 ro.config.media_vol_steps=25
 ro.config.vc_call_vol_steps=7
 
-# Bluetooth
+# Bluetooth & FM
 persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
 vendor.bluetooth.soc=cherokee
+bt.max.hfpclient.connections=1
+vendor.hw.fm.init=0
 
 # Blur
 ro.surface_flinger.supports_background_blur=0
 
 # Camera
 persist.vendor.camera.privapp.list=org.codeaurora.snapcam
+camera.aux.packagelist=com.google.android.GoogleCamera,com.android.camera,org.codeaurora.snapcam
 
 # Charger
 ro.charger.enable_suspend=true
@@ -49,6 +56,9 @@ renderthread.skia.reduceopstasksplitting=true
 ro.qualcomm.cabl=0
 sdm.debug.disable_skip_validate=1
 
+# DPM
+persist.vendor.dpm.loglevel=0
+
 # Surfaceflinger
 debug.sf.hw=1
 debug.sf.enable_hwc_vds=0
@@ -68,6 +78,13 @@ persist.sys.fuse.passthrough.enable=true
 # Gboard
 ro.com.google.ime.kb_pad_port_b=1
 
+# GPS
+persist.backup.ntpServer="0.pool.ntp.org"
+persist.vendor.overlay.izat.optin=rro
+
+# HAL1 app list
+camera.hal1.packagelist=com.android.camera,com.android.camera2,com.instagram.android
+
 # IMS
 persist.vendor.ims.disableUserAgent=0
 
@@ -95,6 +112,7 @@ media.stagefright.enable-scan=true
 media.stagefright.thumbnail.prefer_hw_codecs=true
 mmp.enable.3g2=true
 persist.mm.enable.prefetch=true
+ro.media.recorder-max-base-layer-fps=60
 vidc.dec.enable.downscalar=0
 vidc.enc.target_support_bframe=1
 vendor.mm.enable.qcom_parser=16777213
@@ -102,6 +120,8 @@ vendor.vidc.dec.enable.downscalar=0
 vendor.vidc.enc.disable_bframes=1
 vendor.vidc.enc.disable.pq=false
 
+# Misc
+ro.vendor.qti.sys.fw.bservice_enable=true
 # Netflix
 ro.netflix.bsp_rev=Q660-13149-1
 
@@ -122,6 +142,7 @@ persist.radio.VT_CAM_INTERFACE=2
 persist.radio.data_con_rprt=1
 persist.vendor.ims.disableADBLogs=1
 persist.vendor.ims.disableIMSLogs=1
+persist.vendor.qti.telephony.vt_cam_interface=2
 persist.vendor.radio.enable_temp_dds=true
 persist.vendor.radio.force_on_dc=true
 ril.subscription.types=RUIM
@@ -132,6 +153,9 @@ ro.build.selinux=1
 #Storaged
 ro.storaged.event.interval=99999
 
+# System restart
+ro.build.shutdown_timeout=2
+
 # Zygote preforking
 persist.device_config.runtime_native.usap_pool_enabled=true
 
diff --git a/properties/vendor.prop b/properties/vendor.prop
index b440de61..70c3d80e 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -1,8 +1,6 @@
 # ART
 pm.dexopt.ab-ota=speed-profile
 dalvik.vm.dex2oat64.enabled=true
-ro.vendor.qti.am.reschedule_service=true
-ro.sys.fw.dex2oat_thread_count=8
 dalvik.vm.boot-dex2oat-cpu-set=0,1,2,3,4,5,6,7
 dalvik.vm.boot-dex2oat-threads=8
 dalvik.vm.dex2oat-cpu-set=0,1,2,3,4,5,6,7
@@ -98,9 +96,7 @@ persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.enable.splita2dp=false
 ro.vendor.bluetooth.wipower=false
 vendor.qcom.bluetooth.soc=cherokee
-bt.max.hfpclient.connections=1
 ro.vendor.fm.use_audio_session=true
-vendor.hw.fm.init=0
 
 # Camera
 persist.vendor.camera.dual.isp.sync=0
@@ -108,8 +104,6 @@ persist.vendor.camera.HAL3.enabled=1
 persist.vendor.camera.exif.make=Xiaomi
 persist.vendor.camera.perflock.enable=0
 vendor.camera.aux.packageblacklist=com.discord
-camera.aux.packagelist=com.google.android.GoogleCamera,com.android.camera,org.codeaurora.snapcam
-vendor.camera.aux.packagelist=com.google.android.GoogleCamera,com.android.camera,org.codeaurora.snapcam
 
 # Codec2 switch
 debug.media.codec2=2
@@ -121,7 +115,6 @@ ro.telephony.iwlan_operation_mode=legacy
 ro.vendor.use_data_netmgrd=true
 
 # DPM
-persist.vendor.dpm.loglevel=0
 persist.vendor.dpmhalservice.enable=1
 
 # DRM
@@ -148,30 +141,20 @@ ro.vendor.qti.va_aosp.support=1
 # Fwk detect
 ro.vendor.qti.va_aosp.support=1
 
-# GPS
-persist.backup.ntpServer="0.pool.ntp.org"
-persist.vendor.overlay.izat.optin=rro
-
 # Graphics
 ro.hardware.egl=adreno
 ro.hardware.vulkan=adreno
 vendor.opengles.version=196610
 
-# HAL1 app list
-camera.hal1.packagelist=com.android.camera,com.android.camera2,com.instagram.android
-vendor.camera.hal1.packagelist= com.android.camera,com.android.camera2,com.instagram.android
-
 # Media
 debug.stagefright.omx_default_rank=0
 vidc.enc.dcvs.extra-buff-count=2
-ro.media.recorder-max-base-layer-fps=60
 
 # Misc
 keyguard.no_require_sim=true
 persist.vendor.delta_time.enable=true
 qemu.hw.mainkeys=0
 ro.com.android.dataroaming=false
-ro.vendor.qti.sys.fw.bservice_enable=true
 ro.frp.pst=/dev/block/bootdevice/by-name/frp
 
 # QCOM
@@ -187,7 +170,6 @@ persist.dbg.volte_avail_ovr=1
 persist.dbg.vt_avail_ovr=1
 persist.dbg.wfc_avail_ovr=1
 persist.sys.fflag.override.settings_provider_model=false
-persist.vendor.qti.telephony.vt_cam_interface=2
 persist.vendor.radio.aosp_usr_pref_sel=true
 persist.vendor.radio.add_power_save=1
 persist.vendor.radio.apm_sim_not_pwdn=1
@@ -228,9 +210,6 @@ ro.soc.model=SDM660
 # SSR
 persist.vendor.ssr.restart_level=ALL_ENABLE
 
-# System restart
-ro.build.shutdown_timeout=2
-
 # USB
 vendor.usb.diag.func.name=diag
 vendor.usb.use_ffs_mtp=0