diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 9f3d059..cb8a123 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -4,4 +4,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_milanf.mk
+    $(LOCAL_DIR)/derp_milanf.mk
diff --git a/lineage_milanf.mk b/derp_milanf.mk
similarity index 90%
rename from lineage_milanf.mk
rename to derp_milanf.mk
index 66e1a59..2a47e7b 100644
--- a/lineage_milanf.mk
+++ b/derp_milanf.mk
@@ -14,7 +14,10 @@ $(call inherit-product, device/motorola/milanf/device.mk)
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_milanf
+# Maintainer Overlay
+PRODUCT_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+
+PRODUCT_NAME := derp_milanf
 PRODUCT_DEVICE := milanf
 PRODUCT_MANUFACTURER := motorola
 PRODUCT_BRAND := motorola
diff --git a/device.mk b/device.mk
index e29d13e..38cb2ed 100644
--- a/device.mk
+++ b/device.mk
@@ -57,7 +57,7 @@ PRODUCT_PACKAGES += \
     android.hardware.light-service.lineage
 
 # LiveDisplay
-$(call soong_config_set_bool,livedisplay_sysfs,enable_ab,true)
+$(call soong_config_set,livedisplay_sysfs,enable_ab,true)
 
 # NFC
 PRODUCT_PACKAGES += \
diff --git a/init/init.mmi.overlay.rc b/init/init.mmi.overlay.rc
index 474d948..43a08e9 100644
--- a/init/init.mmi.overlay.rc
+++ b/init/init.mmi.overlay.rc
@@ -1,8 +1,52 @@
+on post-fs
+    chown system system /sys/devices/platform/soc/4804000.ufshc/clkgate_enable
+    chown system system /sys/devices/platform/soc/4804000.ufshc/devfreq/4804000.ufshc/min_freq
+
+    # Sensors
+    chown system system /sys/devices/platform/soc/4a80000.spi/spi_master/spi0/spi0.0/touchscreen/primary/double_tap_enabled
+    chown system system /sys/devices/platform/soc/4a80000.spi/spi_master/spi0/spi0.0/touchscreen/primary/double_tap_pressed
+
+#fps dual sensor
+service chipone_ident /vendor/bin/hw/chipone_ident
+    class late_start
+    user system
+    group system
+    oneshot
+    disabled
+
+service vendor.ident-fps-overlay-sh /vendor/bin/init.oem.fingerprint.overlay.sh
+    class core
+    user root
+    group drmrpc system
+    oneshot
+    disabled
+
 on post-fs-data
-    # touch
+    exec_start vendor.ident-fps-overlay-sh
+    chown system system /dev/fpsensor
+    chmod 0660 /dev/fpsensor
+    chown system system /sys/devices/platform/soc/soc:fm_wcn39x0/elna_en
+
+    # touch api
+    chown system system /sys/class/touchscreen/primary/interpolation
+    chmod 0660 /sys/class/touchscreen/primary/interpolation
+    chown system system /sys/class/touchscreen/primary/first_filter
+    chmod 0660 /sys/class/touchscreen/primary/first_filter
+    chown system system /sys/class/touchscreen/primary/edge
+    chmod 0660 /sys/class/touchscreen/primary/edge
     chown system system /sys/class/touchscreen/primary/gesture
     chmod 0660 /sys/class/touchscreen/primary/gesture
 
+    # change permission for stylus
+    chown system system /sys/class/touchscreen/primary/palm_settings
+    chmod 0444 /dev/moto_penraw
+
+    # Change ownership and permission for cp-standalone factory testing
+    chown system system /sys/class/power_supply/cp-standalone/voltage_now
+    chown system system /sys/bus/iio/devices/iio:device5/in_index_sc8549_cp_enable_input
+    chmod 0644 /sys/class/power_supply/cp-standalone/voltage_now
+    chmod 0664 /sys/bus/iio/devices/iio:device5/in_index_sc8549_cp_enable_input
+
 on early-init
    insmod /vendor/lib/modules/leds_aw99703.ko
    insmod /vendor/lib/modules/mcDrvModule.ko
@@ -10,6 +54,9 @@ on early-init
 on init
     insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/nova_0flash_mmi.ko
 
+on boot && property:ro.vendor.mot.gki.path=5.4-gki
+    insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/nfc_i2c.ko
+
 on late-init
     insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_charger.ko
     insmod /vendor/lib/modules/${ro.vendor.mot.gki.path}/mmi_discrete_charger_class.ko
diff --git a/overlay/packages/apps/Settings/res/values/derp_strings.xml b/overlay/packages/apps/Settings/res/values/derp_strings.xml
new file mode 100644
index 0000000..b84f968
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/derp_strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- # "Version" -->
+    <string name="derpfest_version">A-Team</string>
+    <!-- DerpFest maintainer -->
+    <string name="derpfest_summary">b@k3d by BOBtheBlinker</string>
+    <string name="derpfest_maintainer">BOBtheBlinker</string>
+</resources>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 087800c..59c3fdf 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -74,6 +74,7 @@ vendor/lib64/libofflinedump.so
 vendor/lib64/libofflinelog.so
 vendor/lib64/libopencv.so
 vendor/lib64/libopestriping.so
+vendor/lib64/libpowercore.so
 vendor/lib64/libremosaic_wrapper.so
 vendor/lib64/libswregistrationalgo.so
 vendor/lib64/libtfestriping.so
diff --git a/resource-overlay/device/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml
index 24e8126..57318aa 100644
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
@@ -264,4 +264,10 @@
          rates are available from hardware composer. Only has an effect if the value is
          non-zero. -->
     <integer name="config_defaultPeakRefreshRate">120</integer>
+
+    <!-- Whether this device is supporting the software microphone toggle -->
+    <bool name="config_supportsMicToggle">true</bool>
+
+    <!-- Whether this device is supporting the camera toggle -->
+    <bool name="config_supportsCamToggle">true</bool>
 </resources>