diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9775eb6..5f9b367 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,8 +14,12 @@
 # limitations under the License.
 #
 
-# Inherit from motorola sdm660-common
--include device/motorola/sdm660-common/BoardConfigCommon.mk
+# Must set these before including common config
+TARGET_BOARD_PLATFORM := sdm660
+TARGET_BOOTLOADER_BOARD_NAME := SDM660
+
+# Inherit from motorola msm8998-common
+include device/motorola/msm8998-common/BoardConfigCommon.mk
 
 DEVICE_PATH := device/motorola/payton
 
@@ -38,7 +42,7 @@ TARGET_SCREEN_DENSITY := 420
 TARGET_KERNEL_CONFIG := lineageos_payton_defconfig
 
 # HIDL
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/touch.xml
+DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/payton_manifest.xml
 
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
diff --git a/device.mk b/device.mk
index 8ea48f6..554fea4 100644
--- a/device.mk
+++ b/device.mk
@@ -74,7 +74,7 @@ PRODUCT_PACKAGES += \
 
 # Lineage hardware
 PRODUCT_PACKAGES += \
-    vendor.lineage.touch@1.0-service.sdm660
+    vendor.lineage.touch@1.0-service.msm8998
 
 # NFC
 PRODUCT_PACKAGES += \
@@ -117,5 +117,6 @@ PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/c0c4000.sdhci/by-name
 PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc/c0c4000.sdhci/by-name/oem
 $(call inherit-product, build/target/product/verity.mk)
 
-# Inherit from motorola sdm660-common
-$(call inherit-product, device/motorola/sdm660-common/common.mk)
+# Inherit from motorola msm8998-common
+TARGET_MOTO_PLATFORM := sdm660
+$(call inherit-product, device/motorola/msm8998-common/common.mk)
diff --git a/extract-files.sh b/extract-files.sh
index 34c3109..197ec07 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -32,7 +32,7 @@ fi
 set -e
 
 export DEVICE=payton
-export DEVICE_COMMON=sdm660-common
+export DEVICE_COMMON=msm8998-common
 export VENDOR=motorola
 
 "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/lineage.dependencies b/lineage.dependencies
index 5ab4ba9..3a8fb23 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,6 +1,6 @@
 [
   {
-    "repository": "android_device_motorola_sdm660-common",
-    "target_path": "device/motorola/sdm660-common"
+    "repository": "android_device_motorola_msm8998-common",
+    "target_path": "device/motorola/msm8998-common"
   }
 ]
diff --git a/lineage_payton.mk b/lineage_payton.mk
index b4156bb..bfd1d30 100644
--- a/lineage_payton.mk
+++ b/lineage_payton.mk
@@ -53,7 +53,7 @@ PRODUCT_PACKAGES += \
 ifeq ($(WITH_TWRP),true)
     $(call inherit-product, device/motorola/payton/twrp/twrp.mk)
 else
-    TARGET_RECOVERY_FSTAB := device/motorola/sdm660-common/rootdir/etc/fstab.qcom
+    TARGET_RECOVERY_FSTAB := device/motorola/msm8998-common/rootdir/etc/fstab.qcom
 endif
 
 # Device identifiers
diff --git a/touch.xml b/payton_manifest.xml
similarity index 72%
rename from touch.xml
rename to payton_manifest.xml
index 7da9120..8065033 100644
--- a/touch.xml
+++ b/payton_manifest.xml
@@ -32,6 +32,23 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.lineage.livedisplay</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IPictureAdjustment</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ISunlightEnhancement</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IAdaptiveBacklight</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.lineage.touch</name>
         <transport>hwbinder</transport>
diff --git a/rootdir/etc/init.payton.rc b/rootdir/etc/init.payton.rc
index 1745ff1..3b6b521 100644
--- a/rootdir/etc/init.payton.rc
+++ b/rootdir/etc/init.payton.rc
@@ -31,3 +31,6 @@ on post-fs
 
 on post-fs-data
     mkdir /data/.fps 0770 system system
+
+on moto-charger
+    setprop ro.board.platform sdm660
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 37a006b..24ff1d7 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -9,7 +9,7 @@
 set -e
 
 export DEVICE=payton
-export DEVICE_COMMON=sdm660-common
+export DEVICE_COMMON=msm8998-common
 export VENDOR=motorola
 
 "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"
diff --git a/vendor.prop b/vendor.prop
index 73c9a43..136ffda 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -10,10 +10,17 @@ persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Handset_cal.acdb
 persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb
 persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb
 persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Speaker_cal.acdb
+vendor.audio.feature.fm.enable=true
+vendor.audio.feature.incall_music.enable=false
+vendor.audio.offload.gapless.enabled=false
+vendor.voice.path.for.pcm.voip=false
 
 # Bluetooth
 bluetooth.device.default_name=Moto X4
 
+# Display
+ro.hardware.vulkan=sdm660
+
 # Fluence
 persist.vendor.audio.dualmic.config=endfire
 persist.vendor.audio.fluence.audiorec=false
@@ -40,3 +47,6 @@ ro.vendor.sensors.pmd=false
 ro.vendor.sensors.rmd=false
 ro.vendor.sensors.scrn_ortn=false
 ro.vendor.sensors.sta_detect=true
+
+# SOC
+ro.soc.model=SDM660