diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c060cdd..1874866 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -85,6 +85,9 @@ TARGET_KERNEL_CLANG_VERSION := r353983c
 
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
+TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 
 # Partitions
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
diff --git a/odm.prop b/odm.prop
new file mode 100644
index 0000000..fab6c31
--- /dev/null
+++ b/odm.prop
@@ -0,0 +1,2 @@
+# Audio
+ro.vendor.qti.va_odm.support=1
diff --git a/sdm660.mk b/sdm660.mk
index 47713d9..93d245f 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -26,9 +26,6 @@ $(call inherit-product, vendor/nokia/sdm660-common/sdm660-common-vendor.mk)
 DEVICE_PACKAGE_OVERLAYS += \
     $(COMMON_PATH)/overlay
 
-# Properties
--include $(COMMON_PATH)/system_prop.mk
-
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/handheld_core_hardware.xml \
diff --git a/system.prop b/system.prop
new file mode 100644
index 0000000..e1be77a
--- /dev/null
+++ b/system.prop
@@ -0,0 +1,174 @@
+# system.prop for nokia_sdm660
+#
+
+# Audio
+audio.offload.min.duration.secs=30
+audio.offload.video=false
+audio.deep_buffer.media=true
+ro.af.client_heap_size_kbyte=7168
+ro.vendor.audio.sdk.fluencetype=fluence
+persist.sys.smartamp=1
+persist.vendor.audio.fluence.voicecall=true
+persist.vendor.audio.fluence.voicerec=false
+persist.vendor.audio.fluence.speaker=true
+
+# Bluetooth
+bt.max.hfpclient.connections=1
+persist.bt.a2dp.aac_disable=true
+persist.sys.bt_debug_log_enable=false
+persist.sys.wbg.bt.service=false
+persist.sys.wbg.bt=btstop
+persist.vendor.btstack.a2dp_offload_cap=sbc-aptx-aptxhd-aac
+persist.vendor.btstack.enable.splita2dp=true
+ro.bluetooth.emb_wp_mode=true
+ro.bluetooth.wipower=true
+vendor.bluetooth.soc=cherokee
+
+# CABL
+ro.qualcomm.cabl=2
+ro.vendor.display.cabl=2
+
+# Camera
+camera.aux.packagelist=com.hmdglobal.camera2,cameratest,com.evenwell.fqc,com.tools.alt,com.siui.android.camera
+camera.hal1.packagelist=com.dw.btime
+persist.camera.awbdefine=1
+persist.camera.debug_img_exif=1
+persist.camera.debug_img_exif=1
+persist.camera.privapp.list=org.codeaurora.snapcam
+persist.vendor.camera.preview.ubwc=0
+persist.vendor.camera.privapp.list=org.codeaurora.snapcam
+vendor.camera.aux.packagelist=org.codeaurora.snapcam
+
+# Charging
+persist.chg.max_volt_mv=9000
+
+# CNE
+persist.vendor.cne.feature=1
+
+# GPS
+persist.vendor.overlay.izat.optin=rro
+
+# Graphics
+debug.gralloc.enable_fb_ubwc=1
+debug.sf.disable_backpressure=1
+debug.sf.enable_hwc_vds=1
+debug.sf.hw=1
+debug.sf.latch_unsignaled=1
+debug.sf.recomputecrop=0
+dev.pm.dyn_samplingrate=1
+qemu.hw.mainkeys=0
+ro.qualcomm.cabl=0
+ro.surface_flinger.has_HDR_display=false
+ro.surface_flinger.has_wide_color_display=false
+ro.surface_flinger.use_color_management=false
+sdm.debug.disable_skip_validate=1
+vendor.display.disable_skip_validate=1
+vendor.display.enable_default_color_mode=1
+vendor.gralloc.enable_fb_ubwc=1
+
+# HWUI
+ro.hwui.drop_shadow_cache_size=6
+ro.hwui.gradient_cache_size=1
+ro.hwui.layer_cache_size=48
+ro.hwui.path_cache_size=32
+ro.hwui.r_buffer_cache_size=8
+ro.hwui.text_large_cache_height=2048
+ro.hwui.text_large_cache_width=2048
+ro.hwui.text_small_cache_height=1024
+ro.hwui.text_small_cache_width=1024
+ro.hwui.texture_cache_flushrate=0.4
+ro.hwui.texture_cache_size=72
+
+# IMS
+persist.data.iwlan.enable=true
+persist.dbg.ims_volte_enable=1
+persist.dbg.volte_avail_ovr=1
+persist.dbg.vt_avail_ovr=1
+persist.ims.enableADBLogs=1
+persist.ims.enableDebugLogs=1
+persist.rcs.supported=0
+
+# Logging
+persist.debug.coresight.config=stm-events
+ro.logd.kernel=true
+
+# Media
+media.aac_51_output_enabled=true
+media.stagefright.enable-aac=true
+media.stagefright.enable-http=true
+media.stagefright.enable-player=true
+media.stagefright.enable-qcp=true
+media.stagefright.enable-scan=true
+media.stagefright.thumbnail.prefer_hw_codecs=true
+mm.enable.smoothstreaming=true
+mmp.enable.3g2=true
+persist.mm.enable.prefetch=true
+ro.netflix.bsp_rev=Q660-13149-1
+vendor.mm.enable.qcom_parser=13623022
+vendor.vidc.dec.enable.downscalar=0
+vendor.vidc.enc.disable_bframes=1
+vidc.enc.dcvs.extra-buff-count=2
+vidc.enc.target_support_bframe=1
+
+# NFC
+ro.nfc.port=I2C
+
+# Power
+persist.env.fastdorm.enabled=true
+
+# RIL
+DEVICE_PROVISIONED=1
+net.tethering.noprovisioning=true
+persist.data.df.dev_name=rmnet_usb0
+persist.data.tcp_rst_drop=true
+persist.radio.VT_CAM_INTERFACE=2
+persist.radio.VT_HYBRID_ENABLE=1
+persist.radio.adb_log_on=3
+persist.radio.apm_sim_not_pwdn=1
+persist.radio.flexmap_type=nw_mode
+persist.radio.oem_socket=true
+persist.radio.qcom_ext_enable=true
+persist.rild.nitz_long_ons_0=
+persist.rild.nitz_long_ons_1=
+persist.rild.nitz_long_ons_2=
+persist.rild.nitz_long_ons_3=
+persist.rild.nitz_plmn=
+persist.rild.nitz_short_ons_0=
+persist.rild.nitz_short_ons_1=
+persist.rild.nitz_short_ons_2=
+persist.rild.nitz_short_ons_3=
+persist.sys.MNC=UNKNOW
+persist.vendor.data.mode=concurrent
+persist.vendor.radio.atfwd.start=true
+persist.vendor.radio.cs_srv_type=1
+persist.vendor.radio.custom_ecc=1
+persist.vendor.radio.lte_vrte_ltd=1
+persist.vendor.radio.oem_socket=true
+persist.vendor.radio.report_codec=1
+ril.subscription.types=NV,RUIM
+rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
+ro.telephony.default_network=22
+ro.telephony.default_network=22,20
+ro.telephony.default_network=22,22
+ro.vendor.use_data_netmgrd=true
+telephony.lteOnCdmaDevice=1
+
+# Sensors
+ro.qti.sensors.dev_ori=false
+ro.vendor.sensors.dev_ori=false
+ro.vendor.sensors.dev_ori=true
+ro.vendor.sensors.mot_detect=true
+ro.vendor.sensors.pmd=true
+ro.vendor.sensors.sta_detect=true
+
+# Time
+persist.timed.enable=true
+
+# WFD
+persist.debug.wfd.enable=1
+persist.hwc.enable_vds=1
+persist.sys.wfd.virtual=0
+
+# Wi-Fi
+persist.sys.wifi_log_enable=false
+ro.wifi.power.reduction=1
diff --git a/system_prop.mk b/system_prop.mk
deleted file mode 100644
index 4e6a55f..0000000
--- a/system_prop.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2019 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Audio
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.config.vc_call_vol_steps=7 \
-    ro.config.media_vol_steps=25
-
-# IMS
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.dbg.volte_avail_ovr=1 \
-    persist.dbg.vt_avail_ovr=1 \
-    persist.dbg.wfc_avail_ovr=1
-
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-     media.settings.xml=/system/etc/media_profiles_vendor.xml
-
-# Memory optimizations
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.vendor.qti.sys.fw.bservice_enable=true
-
-# OTG
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.sys.oem.otg_support=true
-
-# Radio
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.radio.add_power_save=1
-
-# UI
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    sys.use_fifo_ui=1
diff --git a/vendor.prop b/vendor.prop
new file mode 100644
index 0000000..5327e5d
--- /dev/null
+++ b/vendor.prop
@@ -0,0 +1,189 @@
+# Audio
+af.fast_track_multiplier=1
+audio.deep_buffer.media=true
+audio.offload.min.duration.secs=30
+audio.offload.video=true
+audio.sys.noisy.broadcast.delay=600
+audio.sys.offload.pstimeout.secs=3
+persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+persist.bluetooth.a2dp_offload.disabled=true
+persist.vendor.audio.fluence.speaker=true
+persist.vendor.audio.fluence.voicecall=true
+persist.vendor.audio.fluence.voicerec=false
+persist.vendor.audio.hifi.int_codec=true
+persist.vendor.audio.hw.binder.size_kbyte=1024
+persist.vendor.audio.ras.enabled=false
+persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac
+persist.vendor.bt.aac_frm_ctl.enabled=true
+ro.af.client_heap_size_kbyte=7168
+ro.bluetooth.a2dp_offload.supported=false
+ro.vendor.audio.sdk.fluencetype=fluence
+ro.vendor.audio.sdk.ssr=false
+tunnel.audiovideo.decode=false
+tunnel.decode=false
+vendor.audio.dolby.ds2.enabled=false
+vendor.audio.dolby.ds2.hardbypass=false
+vendor.audio.feature.a2dp_offload.enable=false
+vendor.audio.feature.afe_proxy.enable=true
+vendor.audio.feature.anc_headset.enable=true
+vendor.audio.feature.audiozoom.enable=false
+vendor.audio.feature.battery_listener.enable=false
+vendor.audio.feature.compr_cap.enable=false
+vendor.audio.feature.compr_voip.enable=true
+vendor.audio.feature.compress_in.enable=false
+vendor.audio.feature.compress_meta_data.enable=true
+vendor.audio.feature.concurrent_capture.enable=false
+vendor.audio.feature.custom_stereo.enable=true
+vendor.audio.feature.deepbuffer_as_primary.enable=false
+vendor.audio.feature.display_port.enable=true
+vendor.audio.feature.dsm_feedback.enable=false
+vendor.audio.feature.dynamic_ecns.enable=false
+vendor.audio.feature.ext_hw_plugin.enable=false
+vendor.audio.feature.external_dsp.enable=false
+vendor.audio.feature.external_speaker.enable=false
+vendor.audio.feature.external_speaker_tfa.enable=false
+vendor.audio.feature.fluence.enable=true
+vendor.audio.feature.fm.enable=true
+vendor.audio.feature.hdmi_edid.enable=true
+vendor.audio.feature.hdmi_passthrough.enable=true
+vendor.audio.feature.hfp.enable=true
+vendor.audio.feature.hifi_audio.enable=true
+vendor.audio.feature.hwdep_cal.enable=false
+vendor.audio.feature.incall_music.enable=true
+vendor.audio.feature.keep_alive.enable=false
+vendor.audio.feature.kpi_optimize.enable=true
+vendor.audio.feature.maxx_audio.enable=false
+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=true
+vendor.audio.feature.src_trkn.enable=true
+vendor.audio.feature.ssrec.enable=true
+vendor.audio.feature.usb_offload.enable=true
+vendor.audio.feature.usb_offload_burst_mode.enable=false
+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.hw.aac.encoder=true
+vendor.audio.offload.buffer.size.kb=64
+vendor.audio.offload.gapless.enabled=true
+vendor.audio.offload.multiaac.enable=true
+vendor.audio.offload.multiple.enabled=false
+vendor.audio.offload.passthrough=false
+vendor.audio.offload.track.enable=true
+vendor.audio.parser.ip.buffer.size=262144
+vendor.audio.safx.pbe.enabled=false
+vendor.audio.spkr_prot.tx.sampling_rate=48000
+vendor.audio.tunnel.encode=false
+vendor.audio.use.sw.alac.decoder=true
+vendor.audio.use.sw.ape.decoder=true
+vendor.audio.volume.headset.gain.depcal=true
+vendor.audio_hal.period_size=192
+vendor.voice.path.for.pcm.voip=true
+
+# Bluetooth
+persist.bt.enable.splita2dp=false
+persist.vendor.bt.enable.splita2dp=true
+persist.vendor.bt.splita2dp.44_1_war=false
+persist.vendor.btstack.enable.splita2dp=true
+persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
+persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
+persist.vendor.qcom.bluetooth.enable.splita2dp=true
+persist.vendor.qcom.bluetooth.enable.splita2dp=true
+ro.bluetooth.emb_wp_mode=false
+ro.bluetooth.wipower=false
+ro.bt.bdaddr_path=/proc/bt_mac
+ro.vendor.bluetooth.wipower=false
+vendor.qcom.bluetooth.soc=cherokee
+
+# Camera
+camera.aux.packagelist=net.sourceforge.opencamera,org.codeaurora.snapcam,com.fihtdc.fqc
+camera.disable_zsl_mode=0
+camera.panorama.quality=middle
+persist.vendor.camera.fdvideo=1
+persist.vendor.camera.ven_hdr=0
+ro.camera.record.anim.delay=200
+ro.camera.switch.anim.delay=300
+vendor.camera.aux.packagelist=com.hmdglobal.camera2,com.evenwell.fqc,com.tools.alt,com.fihtdc.fap,org.codeaurora.snapcam
+vendor.camera.c2d.rotation=1
+
+# Dalvik
+dalvik.vm.heapgrowthlimit=256m
+dalvik.vm.heapmaxfree=8m
+dalvik.vm.heapminfree=512k
+dalvik.vm.heapsize=512m
+dalvik.vm.heapstartsize=8m
+dalvik.vm.heaptargetutilization=0.75
+
+# Display
+qemu.hw.mainkeys=0
+
+# DRM
+drm.service.enabled=true
+ro.com.widevine.cachesize=16777216
+persist.env.fastdorm.enabled=true
+persist.gsmapp.ezincall.video=false
+persist.sys.screenmode=1
+persist.vendor.dpm.feature=11
+
+# FM
+vendor.hw.fm.init=0
+
+# FRP
+ro.frp.pst=/dev/block/bootdevice/by-name/frp
+
+# GL
+ro.hardware.egl=adreno
+ro.hardware.vulkan=adreno
+ro.opengles.version=196610
+
+# GPS
+persist.backup.ntpServer=0.pool.ntp.org
+
+# Logging
+persist.vendor.stbDebugCtlEnable=1
+ro.logdumpd.enabled=0
+
+# Miscellaneous
+persist.sys.bbsys=on
+persist.vendor.qcomsysd.enabled=1
+ro.cp_system_other_odex=1
+sys.vendor.shutdown.waittime=500
+
+# OEM Unlock
+ro.oem_unlock_supported=1
+
+# Perf
+ro.vendor.extension_library=libqti-perfd-client.so
+
+# Power
+vendor.power.pasr.enabled=true
+
+# Radio
+keyguard.no_require_sim=true
+persist.radio.multisim.config=dsds
+persist.vendor.radio.apm_sim_not_pwdn=1
+persist.vendor.radio.custom_ecc=1
+persist.vendor.radio.procedure_bytes=SKIP
+persist.vendor.radio.rat_on=combine
+persist.vendor.radio.sib16_support=1
+rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
+ro.carrier=unknown
+ro.com.android.dataroaming=true
+ro.telephony.iwlan_operation_mode=legacy
+ro.vendor.qti.va_aosp.support=1
+
+# Sensors
+ro.vendor.sdk.sensors.gestures=false
+ro.vendor.sensors.cmc=false
+ro.vendor.sensors.facing=false
+
+# Stagefright
+debug.stagefright.omx_default_rank.sw-audio=1
+debug.stagefright.omx_default_rank=0
+vendor.video.disable.ubwc=1
+
+# Wi-Fi
+ro.boot.wificountrycode=US