diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 339b14a..615b90e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -67,6 +67,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth
 TARGET_USES_QTI_CAMERA_DEVICE := true
 
 # Display
+TARGET_SCREEN_DENSITY := 440
 TARGET_USES_GRALLOC1 := true
 TARGET_USES_HWC2 := true
 TARGET_USES_ION := true
@@ -104,7 +105,7 @@ TARGET_USERIMAGES_USE_EXT4 := true
 
 # Properties
 TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop
-TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
+TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
 TARGET_SYSTEM_EXT_PROP += $(COMMON_PATH)/system_ext.prop
 TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 
diff --git a/system.prop b/product.prop
similarity index 58%
rename from system.prop
rename to product.prop
index af151f7..171c84a 100644
--- a/system.prop
+++ b/product.prop
@@ -14,49 +14,31 @@ ro.charger.enable_suspend=true
 persist.vendor.cne.feature=1
 persist.vendor.dpmhalservice.enable=1
 
-# Display
-ro.sf.lcd_density=440
-
 # Dex2oat
 dalvik.vm.dex2oat64.enabled=true
-dalvik.vm.image-dex2oat-filter=quicken
-dalvik.vm.image-dex2oat-threads=8
-dalvik.vm.image-dex2oat-cpu-set=0,1,2,3,4,5,6,7
-dalvik.vm.dex2oat-filter=quicken
-dalvik.vm.dex2oat-threads=8
-dalvik.vm.dex2oat-cpu-set=0,1,2,3,4,5,6,7
-dalvik.vm.boot-dex2oat-threads=8
-dalvik.vm.boot-dex2oat-cpu-set=0,1,2,3,4,5,6,7
 
 # FM
 vendor.bluetooth.soc=cherokee
 ro.vendor.fm.use_audio_session=true
 
-# Graphics
-debug.sf.enable_hwc_vds=1
-debug.sf.disable_backpressure=1
-debug.sf.latch_unsignaled=1
-debug.sf.use_phase_offsets_as_durations=1
-debug.sf.late.sf.duration=10500000
-debug.sf.late.app.duration=20500000
-debug.sf.early.sf.duration=21000000
-debug.sf.early.app.duration=16500000
-debug.sf.earlyGl.sf.duration=13500000
-debug.sf.earlyGl.app.duration=21000000
-ro.surface_flinger.max_frame_buffer_acquired_buffers=3
-
 # Media
 media.settings.xml=/vendor/etc/media_profiles_vendor.xml
 
-# Telephony
+# Netflix
+ro.netflix.bsp_rev=Q670-14477-1
+
+# RIL
 ro.telephony.default_network=22,20
 persist.dbg.volte_avail_ovr=1
 persist.dbg.vt_avail_ovr=1
 persist.dbg.wfc_avail_ovr=1
 
-# WiFi Display
+# SurfaceFlinger
 debug.sf.enable_hwc_vds=1
-persist.vendor.radio.atfwd.start=false
+debug.sf.disable_backpressure=1
+debug.sf.latch_unsignaled=1
+debug.sf.enable_hwc_vds=1
+ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 
 # Zygote
 persist.device_config.runtime_native.usap_pool_enabled=true
diff --git a/sdm710.mk b/sdm710.mk
index 44f06cc..9f237b0 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -9,8 +9,11 @@ $(call inherit-product-if-exists, vendor/lenovo/sdm710-common/sdm710-common-vend
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
+# Setup dalvik vm configs
+$(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
+
 # Boot animation
-TARGET_SCREEN_HEIGHT := 2244
+TARGET_SCREEN_HEIGHT := 2340
 TARGET_SCREEN_WIDTH := 1080
 
 # Device uses high-density artwork where available
diff --git a/vendor.prop b/vendor.prop
index ad9b71b..5c88ab0 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -102,14 +102,6 @@ ro.vendor.bluetooth.wipower=false
 persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.twsp_state.enabled=false
 
-# Dalvik
-dalvik.vm.heapgrowthlimit=256m
-dalvik.vm.heapstartsize=8m
-dalvik.vm.heapsize=512m
-dalvik.vm.heaptargetutilization=0.75
-dalvik.vm.heapminfree=512k
-dalvik.vm.heapmaxfree=8m
-
 # Display
 ro.vendor.display.cabl=2
 vendor.display.enable_default_color_mode=1