diff --git a/Fairphone/FP4/Android.mk b/Fairphone/FP4/Android.mk
new file mode 100644
index 0000000..7d5c64c
--- /dev/null
+++ b/Fairphone/FP4/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-fairphone-fp4
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Fairphone/FP4/AndroidManifest.xml b/Fairphone/FP4/AndroidManifest.xml
new file mode 100644
index 0000000..0eee6ac
--- /dev/null
+++ b/Fairphone/FP4/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.fairphone.fp4"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+Fairphone/FP4*"
+                android:priority="1871"
+                android:isStatic="true" />
+</manifest>
diff --git a/Fairphone/FP4/res/values/arrays.xml b/Fairphone/FP4/res/values/arrays.xml
new file mode 100644
index 0000000..2969151
--- /dev/null
+++ b/Fairphone/FP4/res/values/arrays.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2020, The LineageOS Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Device-specific array of SIM slot indexes which are are embedded eUICCs.
+         e.g. If a device has two physical slots with indexes 0, 1, and slot 1 is an
+         eUICC, then the value of this array should be:
+             <integer-array name="non_removable_euicc_slots">
+                 <item>1</item>
+             </integer-array>
+         If a device has three physical slots and slot 1 and 2 are eUICCs, then the value of
+         this array should be:
+             <integer-array name="non_removable_euicc_slots">
+                <item>1</item>
+                <item>2</item>
+             </integer-array>
+         This is used to differentiate between removable eUICCs and built in eUICCs, and should
+         be set by OEMs for devices which use eUICCs. -->
+    <integer-array name="non_removable_euicc_slots">
+        <item>1</item>
+    </integer-array>
+</resources>
diff --git a/FalseLocks/Android.mk b/FalseLocks/Android.mk
index 008c0b4..bc9f6ab 100644
--- a/FalseLocks/Android.mk
+++ b/FalseLocks/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-SystemUI-FalseLocks
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/NavBar/Android.mk b/NavBar/Android.mk
index 4e8a116..660b652 100644
--- a/NavBar/Android.mk
+++ b/NavBar/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-NavBar
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Nokia/PNX-8.1-X7-SystemUI/Android.mk b/Nokia/PNX-8.1-X7-SystemUI/Android.mk
index 8689b05..ef3a893 100644
--- a/Nokia/PNX-8.1-X7-SystemUI/Android.mk
+++ b/Nokia/PNX-8.1-X7-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-nokia-pnx-8.1-x7-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/OnePlus/OP6T-SystemUI/Android.mk b/OnePlus/OP6T-SystemUI/Android.mk
index 017cc4b..efb3e86 100644
--- a/OnePlus/OP6T-SystemUI/Android.mk
+++ b/OnePlus/OP6T-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-oneplus-op6t-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Sony/pdx206/res/values/config.xml b/Sony/pdx206/res/values/config.xml
index b42db23..4fc58f4 100644
--- a/Sony/pdx206/res/values/config.xml
+++ b/Sony/pdx206/res/values/config.xml
@@ -44,7 +44,7 @@
     <integer name="config_defaultPeakRefreshRate">0</integer>
     <integer name="config_screenBrightnessDark">1</integer>
     <integer name="config_screenBrightnessDim">10</integer>
-    <integer name="config_screenBrightnessDoze">10</integer>
+    <integer name="config_screenBrightnessDoze">5</integer>
     <integer name="config_screenBrightnessForVrSettingDefault">86</integer>
     <integer name="config_screenBrightnessForVrSettingMaximum">255</integer>
     <integer name="config_screenBrightnessForVrSettingMinimum">79</integer>
diff --git a/Sony/pdx206/res/xml/power_profile.xml b/Sony/pdx206/res/xml/power_profile.xml
index 18f5ad4..e37bf82 100644
--- a/Sony/pdx206/res/xml/power_profile.xml
+++ b/Sony/pdx206/res/xml/power_profile.xml
@@ -1,46 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <device name="Android">
-    <item name="ambient.on">0.1</item>
-    <item name="screen.on">0.1</item>
-    <item name="screen.full">0.1</item>
+    <item name="ambient.on">41.4</item>
+    <item name="screen.on">59.29</item>
+    <item name="screen.full">190.00</item>
     <item name="bluetooth.active">0.1</item>
-    <item name="bluetooth.on">0.1</item>
-    <item name="wifi.on">0.1</item>
-    <item name="wifi.active">0.1</item>
-    <item name="wifi.scan">0.1</item>
-    <item name="audio">0.1</item>
-    <item name="video">0.1</item>
-    <item name="camera.flashlight">0.1</item>
-    <item name="camera.avg">0.1</item>
-    <item name="gps.on">0.1</item>
-    <item name="radio.active">0.1</item>
-    <item name="radio.scanning">0.1</item>
+    <item name="bluetooth.on">0.8</item>
+    <item name="wifi.on">5.00</item>
+    <item name="wifi.active">35.84</item>
+    <item name="wifi.scan">87.99</item>
+    <item name="audio">20.52</item>
+    <item name="video">159.96</item>
+    <item name="camera.flashlight">62.56</item>
+    <item name="camera.avg">573.58</item>
+    <item name="radio.active">108.48</item>
+    <item name="radio.scanning">24.74</item>
     <array name="radio.on">
-        <value>0.2</value>
-        <value>0.1</value>
-    </array>
-    <array name="cpu.active">
-        <value>0.1</value>
+        <value>4.68</value>
+        <value>4.68</value>
+        <value>4.68</value>
+        <value>4.68</value>
+        <value>4.68</value>
     </array>
     <array name="cpu.clusters.cores">
-        <value>1</value>
+        <value>4</value>
+        <value>4</value>
     </array>
-    <array name="cpu.speeds.cluster0">
-        <value>400000</value>
+    <array name="cpu.core_speeds.cluster0">
+        <value>300000.0</value>
+        <value>614400.0</value>
+        <value>864000.0</value>
+        <value>1017600.0</value>
+        <value>1305600.0</value>
+        <value>1420800.0</value>
+        <value>1612800.0</value>
+        <value>1804800.0</value>
     </array>
-    <array name="cpu.active.cluster0">
-        <value>0.1</value>
+    <array name="cpu.core_speeds.cluster1">
+        <value>300000.0</value>
+        <value>652800.0</value>
+        <value>902400.0</value>
+        <value>1056000.0</value>
+        <value>1401060.0</value>
+        <value>1536000.0</value>
+        <value>1804800.0</value>
+        <value>2016000.0</value>
     </array>
-    <item name="cpu.idle">0.1</item>
+    <array name="cpu.core_power.cluster0">
+        <value>30.87</value>
+        <value>30.99</value>
+        <value>31.93</value>
+        <value>32.14</value>
+        <value>36.22</value>
+        <value>40.38</value>
+        <value>44.19</value>
+        <value>50.58</value>
+    </array>
+    <array name="cpu.core_power.cluster1">
+        <value>38.14</value>
+        <value>38.38</value>
+        <value>38.98</value>
+        <value>40.36</value>
+        <value>49.39</value>
+        <value>54.23</value>
+        <value>68.45</value>
+        <value>81.50</value>
+    </array>
+    <item name="cpu.suspend">2.90</item>
+    <item name="cpu.idle">28.88</item>
+    <item name="cpu.active">0.01</item>
     <array name="memory.bandwidths">
         <value>22.7</value>
     </array>
-    <item name="battery.capacity">1000</item>
-    <item name="wifi.controller.idle">0</item>
-    <item name="wifi.controller.rx">0</item>
-    <item name="wifi.controller.tx">0</item>
+    <item name="battery.capacity">3460</item>
+    <item name="wifi.controller.idle">0.19</item>
+    <item name="wifi.controller.rx">148.18</item>
+    <item name="wifi.controller.tx">395.03</item>
     <array name="wifi.controller.tx_levels" />
-    <item name="wifi.controller.voltage">0</item>
+    <item name="wifi.controller.voltage">3700</item>
     <array name="wifi.batchedscan">
         <value>.0002</value>
         <value>.002</value>
@@ -49,19 +85,23 @@
         <value>2</value>
     </array>
     <item name="modem.controller.sleep">0</item>
-    <item name="modem.controller.idle">0</item>
-    <item name="modem.controller.rx">0</item>
+    <item name="modem.controller.idle">0.22</item>
+    <item name="modem.controller.rx">84.82</item>
     <array name="modem.controller.tx">
-        <value>0</value>
-        <value>0</value>
-        <value>0</value>
-        <value>0</value>
-        <value>0</value>
+        <value>84.19</value>
+        <value>84.19</value>
+        <value>84.19</value>
+        <value>84.19</value>
+        <value>84.19</value>
     </array>
-    <item name="modem.controller.voltage">0</item>
+    <item name="modem.controller.voltage">620</item>
+    <item name="bluetooth.controller.idle">0</item>
+    <item name="bluetooth.controller.rx">66.01</item>
+    <item name="bluetooth.controller.tx">71.79</item>
+    <item name="bluetooth.controller.voltage">3700</item>
     <array name="gps.signalqualitybased">
-        <value>0</value>
-        <value>0</value>
+        <value>58.28</value>
+        <value>12.49</value>
     </array>
-    <item name="gps.voltage">0</item>
-</device>
\ No newline at end of file
+    <item name="gps.voltage">3.70</item>
+</device>
diff --git a/Sony/pdx206_kddi/res/values/config.xml b/Sony/pdx206_kddi/res/values/config.xml
new file mode 100644
index 0000000..2baf51f
--- /dev/null
+++ b/Sony/pdx206_kddi/res/values/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Most configuration options are specified in the pdx206 overlay -->
+</resources>
diff --git a/Telephony-LTE/Android.mk b/Telephony-LTE/Android.mk
index ae4fd92..a77f9f3 100644
--- a/Telephony-LTE/Android.mk
+++ b/Telephony-LTE/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-Telephony-LTE
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/CAF-IMS/Android.mk b/Telephony/CAF-IMS/Android.mk
index 7785cc3..416f501 100644
--- a/Telephony/CAF-IMS/Android.mk
+++ b/Telephony/CAF-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-caf-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/HW-IMS/Android.mk b/Telephony/HW-IMS/Android.mk
index 0232235..090f8a2 100644
--- a/Telephony/HW-IMS/Android.mk
+++ b/Telephony/HW-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-hw-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/MTK-IMS/Android.mk b/Telephony/MTK-IMS/Android.mk
index 314b1a9..d08cb5a 100644
--- a/Telephony/MTK-IMS/Android.mk
+++ b/Telephony/MTK-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-mtk-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/SLSI-IMS/Android.mk b/Telephony/SLSI-IMS/Android.mk
index fdaccdf..b5ffd1b 100644
--- a/Telephony/SLSI-IMS/Android.mk
+++ b/Telephony/SLSI-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-slsi-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Telephony/SPRD-IMS/Android.mk b/Telephony/SPRD-IMS/Android.mk
index f6ecead..813db69 100644
--- a/Telephony/SPRD-IMS/Android.mk
+++ b/Telephony/SPRD-IMS/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-telephony-sprd-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Xiaomi/MiMix3-SystemUI/Android.mk b/Xiaomi/MiMix3-SystemUI/Android.mk
index 9834ca2..f5b027d 100644
--- a/Xiaomi/MiMix3-SystemUI/Android.mk
+++ b/Xiaomi/MiMix3-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-mimix3-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk b/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
index 0b7ba2a..6e33d9c 100644
--- a/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
+++ b/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-redminote6pro-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/overlay.mk b/overlay.mk
index 82dcd81..65e1811 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -18,6 +18,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-duoqin-qin2pro \
 	treble-overlay-essential-ph_1 \
 	treble-overlay-fairphone-fp3 \
+	treble-overlay-fairphone-fp4 \
 	treble-overlay-gestures \
 	treble-overlay-google-sunfish \
 	treble-overlay-highpriomisc \