diff --git a/device.mk b/device.mk
index b7f82bb..b3617af 100644
--- a/device.mk
+++ b/device.mk
@@ -223,12 +223,12 @@ PRODUCT_COPY_FILES += \
 
 # Keylayouts
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/keylayout/ft5x06_ts.kl:system/usr/keylayout/ft5x06_ts.kl \
-    $(LOCAL_PATH)/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \
-    $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:system/usr/keylayout/synaptics_dsx.kl \
-    $(LOCAL_PATH)/keylayout/synaptics_dsxv26.kl:system/usr/keylayout/synaptics_dsxv26.kl \
-    $(LOCAL_PATH)/keylayout/synaptics_rmi4_i2c.kl:system/usr/keylayout/synaptics_rmi4_i2c.kl \
-    $(LOCAL_PATH)/keylayout/uinput-fpc.kl:system/usr/keylayout/uinput-fpc.kl
+    $(LOCAL_PATH)/keylayout/ft5x06_ts.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/ft5x06_ts.kl \
+    $(LOCAL_PATH)/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \
+    $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/synaptics_dsx.kl \
+    $(LOCAL_PATH)/keylayout/synaptics_dsxv26.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/synaptics_dsxv26.kl \
+    $(LOCAL_PATH)/keylayout/synaptics_rmi4_i2c.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/synaptics_rmi4_i2c.kl \
+    $(LOCAL_PATH)/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl
 
 # Keymaster HAL
 PRODUCT_PACKAGES += \
@@ -362,6 +362,10 @@ PRODUCT_PACKAGES += \
     ims-ext-common \
     telephony-ext
 
+# IMS
+PRODUCT_PACKAGES += \
+com.android.ims.rcsmanager
+
 # Sensors
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
@@ -388,6 +392,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     vndk-sp
 
+# RCS
+PRODUCT_PACKAGES += \
+    rcs_service_aidl \
+    rcs_service_aidl.xml \
+    rcs_service_api \
+    rcs_service_api.xml
+
 # Wifi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \
diff --git a/keylayout/uinput-fpc.kl b/keylayout/uinput-fpc.kl
index 946d58d..ac413c9 100644
--- a/keylayout/uinput-fpc.kl
+++ b/keylayout/uinput-fpc.kl
@@ -9,11 +9,7 @@
 #
 
 # fpc1020 "finger present"
-key 614   FPS_ONENAV_DOWN
-key 615   FPS_ONENAV_UP
-key 616   FPS_ONENAV_TAP
-key 617   FPS_ONENAV_HOLD
-key 618   FPS_ONENAV_YPLUS
-key 619   FPS_ONENAV_YMINUS
-key 620   FPS_ONENAV_XPLUS
-key 621   FPS_ONENAV_XMINUS
+key 616   HOME         VIRTUAL
+key 617   VOICE_ASSIST VIRTUAL
+key 620   APP_SWITCH   VIRTUAL
+key 621   BACK         VIRTUAL