diff --git a/BoardConfig.mk b/BoardConfig.mk
index 466893f..fcf9e91 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -26,6 +26,7 @@ TARGET_BOOTLOADER_BOARD_NAME := G8341
 
 ### KERNEL
 TARGET_KERNEL_CONFIG := lineage-msm8998-yoshino-poplar_defconfig
+TARGET_KERNEL_CONFIG += vendor/debugfs.config
 
 BOARD_KERNEL_CMDLINE += androidboot.hardware=poplar
 
diff --git a/README.md b/README.md
index fbbc3a0..4063004 100644
--- a/README.md
+++ b/README.md
@@ -16,22 +16,22 @@ How to build LineageOS
 
 * Initialize the repo:
 
-        repo init -u git://github.com/LineageOS/android.git -b lineage-20.0
+        repo init -u git://github.com/LineageOS/android.git -b lineage-21.0 --git-lfs
 
 * Create a local manifest:
 
-        vim .repo/local_manifests/roomservice.xml
+        mkdir .repo/local_manifests && nano .repo/local_manifests/roomservice.xml
 
         <?xml version="1.0" encoding="UTF-8"?>
         <manifest>
             <!-- SONY -->
-            <project name="whatawurst/android_kernel_sony_msm8998" path="kernel/sony/msm8998" remote="github" revision="lineage-20" />
-            <project name="whatawurst/android_device_sony_yoshino-common" path="device/sony/yoshino-common" remote="github" revision="lineage-20" />
-            <project name="whatawurst/android_device_sony_poplar" path="device/sony/poplar" remote="github" revision="lineage-20" />
+            <project name="whatawurst/android_kernel_sony_msm8998" path="kernel/sony/msm8998" revision="lineage-21" />
+            <project name="whatawurst/android_device_sony_yoshino-common" path="device/sony/yoshino-common" revision="lineage-21" />
+            <project name="whatawurst/android_device_sony_poplar" path="device/sony/poplar" revision="lineage-21" />
 
             <!-- blobs for poplar -->
-            <project name="whatawurst/android_vendor_sony_yoshino-common" path="vendor/sony/yoshino-common" remote="github" revision="lineage-20" />
-            <project name="whatawurst/android_vendor_sony_poplar" path="vendor/sony/poplar" remote="github" revision="lineage-20" />
+            <project name="whatawurst/android_vendor_sony_yoshino-common" path="vendor/sony/yoshino-common" revision="lineage-21" />
+            <project name="whatawurst/android_vendor_sony_poplar" path="vendor/sony/poplar" revision="lineage-21" />
         </manifest>
 
 * Sync the repo:
@@ -41,8 +41,8 @@ How to build LineageOS
 * Setup the environment
 
         source build/envsetup.sh
-        lunch lineage_poplar-userdebug
+        breakfast poplar
 
 * Build LineageOS
 
-        make -j8 bacon
+        m bacon
diff --git a/device/hardware.mk b/device/hardware.mk
index 7d387d8..c4b4325 100644
--- a/device/hardware.mk
+++ b/device/hardware.mk
@@ -14,4 +14,4 @@
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.1-service
+    android.hardware.nfc@1.2-service
diff --git a/lineage_poplar.mk b/lineage_poplar.mk
index c32db4b..9bd7911 100644
--- a/lineage_poplar.mk
+++ b/lineage_poplar.mk
@@ -1,6 +1,5 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/sony/poplar/device.mk)
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 143cb41..ee59dd8 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -41,7 +41,7 @@
         <value>128.0</value>
         <value>143.9</value>
     </array>
-    <array name="cpu.speeds.cluster0">
+    <array name="cpu.core_speeds.cluster0">
         <value>300000</value>
         <value>364800</value>
         <value>441600</value>
@@ -65,7 +65,7 @@
         <value>1824000</value>
         <value>1900800</value>
     </array>
-    <array name="cpu.speeds.cluster1">
+    <array name="cpu.core_speeds.cluster1">
         <value>300000</value>
         <value>345600</value>
         <value>422400</value>
@@ -99,7 +99,7 @@
         <value>2457600</value>
     </array>
     <item name="cpu.idle">3.92</item>
-    <array name="cpu.active.cluster0">
+    <array name="cpu.core_power.cluster0">
         <value>22</value>
         <value>23</value>
         <value>23</value>
@@ -123,7 +123,7 @@
         <value>43</value>
         <value>47</value>
     </array>
-    <array name="cpu.active.cluster1">
+    <array name="cpu.core_power.cluster1">
         <value>26</value>
         <value>27</value>
         <value>27</value>