diff --git a/OnePlus/N20-SystemUI/Android.mk b/OnePlus/N20-SystemUI/Android.mk
new file mode 100644
index 0000000..52e729f
--- /dev/null
+++ b/OnePlus/N20-SystemUI/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-oneplus-n20-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/N20-SystemUI/AndroidManifest.xml b/OnePlus/N20-SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..a3cd612
--- /dev/null
+++ b/OnePlus/N20-SystemUI/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.oneplus.n20.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:requiredSystemPropertyName="ro.boot.prjname"
+                android:requiredSystemPropertyValue="+(20825|20826)"
+        android:priority="2082"
+        android:isStatic="true" />
+</manifest>
diff --git a/OnePlus/N20-SystemUI/res/values-land/config.xml b/OnePlus/N20-SystemUI/res/values-land/config.xml
new file mode 100644
index 0000000..0356339
--- /dev/null
+++ b/OnePlus/N20-SystemUI/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
+</resources>
diff --git a/OnePlus/N20-SystemUI/res/values-v31/config.xml b/OnePlus/N20-SystemUI/res/values-v31/config.xml
new file mode 100644
index 0000000..dc3ee4f
--- /dev/null
+++ b/OnePlus/N20-SystemUI/res/values-v31/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="physical_power_button_center_screen_location_y">945px</dimen>
+</resources>
diff --git a/OnePlus/N20-SystemUI/res/values/config.xml b/OnePlus/N20-SystemUI/res/values/config.xml
new file mode 100644
index 0000000..b3c4f5c
--- /dev/null
+++ b/OnePlus/N20-SystemUI/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_padding_start">25px</dimen>
+    <dimen name="status_bar_padding_end">50px</dimen>
+    <dimen name="status_bar_header_height_keyguard">139px</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">50px</dimen>
+</resources>
diff --git a/OnePlus/N20/Android.mk b/OnePlus/N20/Android.mk
new file mode 100644
index 0000000..854bfa3
--- /dev/null
+++ b/OnePlus/N20/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-oneplus-n20
+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/N20/AndroidManifest.xml b/OnePlus/N20/AndroidManifest.xml
new file mode 100644
index 0000000..df010b3
--- /dev/null
+++ b/OnePlus/N20/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.oneplus.n20"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.boot.prjname"
+                android:requiredSystemPropertyValue="+(20825|20826)"
+        android:priority="2082"
+        android:isStatic="true" />
+</manifest>
diff --git a/OnePlus/N20/res/values-land/config.xml b/OnePlus/N20/res/values-land/config.xml
new file mode 100644
index 0000000..fb1bc7e
--- /dev/null
+++ b/OnePlus/N20/res/values-land/config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
+</resources>
diff --git a/OnePlus/N20/res/values/config.xml b/OnePlus/N20/res/values/config.xml
new file mode 100644
index 0000000..1a3b0a7
--- /dev/null
+++ b/OnePlus/N20/res/values/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+    <bool name="config_showNavigationBar">true</bool>
+    <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
+    <bool name="config_automatic_brightness_available">true</bool>
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+    <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
+    <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
+    <bool name="config_enableBurnInProtection">true</bool>
+
+    <dimen name="status_bar_height_default">139px</dimen>
+    <dimen name="status_bar_height">139px</dimen>
+    <dimen name="status_bar_height_portrait">139px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
+    <dimen name="quick_qs_offset_height">139px</dimen>
+
+    <integer name="config_screenBrightnessDoze">30</integer>
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <integer-array name="config_autoBrightnessLevels">
+        <item>10</item>
+        <item>30</item>
+        <item>60</item>
+        <item>100</item>
+        <item>150</item>
+        <item>210</item>
+        <item>255</item>
+    </integer-array>
+    <integer-array name="config_autoBrightnessLcdBacklightValues">
+        <item>10</item>
+        <item>20</item>
+        <item>40</item>
+        <item>70</item>
+        <item>110</item>
+        <item>160</item>
+        <item>200</item>
+        <item>255</item>
+    </integer-array>
+
+    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,102 L -405,102 L -405,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,102 L -405,102 L -405,0 Z</string>
+</resources>
diff --git a/OnePlus/N20/res/xml/power_profile.xml b/OnePlus/N20/res/xml/power_profile.xml
new file mode 100644
index 0000000..4023999
--- /dev/null
+++ b/OnePlus/N20/res/xml/power_profile.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="none">0</item>
+    <item name="screen.on">100</item>
+    <item name="screen.full">580</item>
+    <array name="cpu.clusters.cores">
+        <value>4</value>
+        <value>3</value>
+        <value>1</value>
+    </array>
+    <array name="cpu.core_speeds.cluster0">
+        <value>300000</value>
+        <value>403200</value>
+        <value>499200</value>
+        <value>614400</value>
+        <value>729600</value>
+        <value>844800</value>
+        <value>960000</value>
+        <value>1075200</value>
+        <value>1171200</value>
+        <value>1267200</value>
+        <value>1363200</value>
+        <value>1478400</value>
+        <value>1574400</value>
+        <value>1689600</value>
+        <value>1785600</value>
+    </array>
+    <array name="cpu.core_power.cluster0">
+        <value>5</value>
+        <value>7</value>
+        <value>8</value>
+        <value>12</value>
+        <value>16</value>
+        <value>21</value>
+        <value>22</value>
+        <value>26</value>
+        <value>29</value>
+        <value>34</value>
+        <value>40</value>
+        <value>41</value>
+        <value>54</value>
+        <value>58</value>
+        <value>65</value>
+    </array>
+    <array name="cpu.core_speeds.cluster1">
+        <value>633600</value>
+        <value>768000</value>
+        <value>883200</value>
+        <value>998400</value>
+        <value>1113600</value>
+        <value>1209600</value>
+        <value>1324800</value>
+        <value>1440000</value>
+        <value>1555200</value>
+        <value>1651200</value>
+        <value>1766400</value>
+        <value>1881600</value>
+        <value>1996800</value>
+        <value>2112000</value>
+        <value>2227200</value>
+        <value>2342400</value>
+        <value>2419200</value>
+    </array>
+    <array name="cpu.core_power.cluster1">
+        <value>33</value>
+        <value>42</value>
+        <value>51</value>
+        <value>59</value>
+        <value>70</value>
+        <value>75</value>
+        <value>88</value>
+        <value>101</value>
+        <value>122</value>
+        <value>130</value>
+        <value>151</value>
+        <value>181</value>
+        <value>207</value>
+        <value>233</value>
+        <value>278</value>
+        <value>314</value>
+        <value>335</value>
+    </array>
+    <array name="cpu.core_speeds.cluster2">
+        <value>806400</value>
+        <value>940800</value>
+        <value>1056000</value>
+        <value>1171200</value>
+        <value>1286400</value>
+        <value>1401600</value>
+        <value>1497600</value>
+        <value>1612800</value>
+        <value>1728000</value>
+        <value>1843200</value>
+        <value>1958400</value>
+        <value>2054400</value>
+        <value>2169600</value>
+        <value>2284800</value>
+        <value>2400000</value>
+        <value>2515200</value>
+        <value>2630400</value>
+        <value>2726400</value>
+        <value>2822400</value>
+        <value>2841600</value>
+    </array>
+    <array name="cpu.core_power.cluster2">
+        <value>86</value>
+        <value>96</value>
+        <value>109</value>
+        <value>127</value>
+        <value>142</value>
+        <value>158</value>
+        <value>169</value>
+        <value>190</value>
+        <value>207</value>
+        <value>231</value>
+        <value>270</value>
+        <value>290</value>
+        <value>333</value>
+        <value>386</value>
+        <value>428</value>
+        <value>487</value>
+        <value>554</value>
+        <value>616</value>
+        <value>684</value>
+        <value>686</value>
+    </array>
+    <item name="cpu.active">8.5</item>
+    <item name="cpu.idle">0.1</item>
+    <item name="cpu.suspend">0</item>
+    <item name="battery.capacity">4040</item>
+    <item name="wifi.on">0.1</item>
+    <item name="wifi.active">173</item>
+    <item name="wifi.scan">0.5</item>
+    <item name="dsp.audio">25</item>
+    <item name="dsp.video">81</item>
+    <item name="camera.flashlight">550</item>
+    <item name="camera.avg">390</item>
+    <item name="gps.on">13.5</item>
+    <item name="radio.active">170</item>
+    <item name="radio.scanning">5.8</item>
+    <array name="radio.on">
+        <value>95</value>
+        <value>8</value>
+    </array>
+    <item name="modem.controller.idle">6</item>
+    <item name="modem.controller.rx">204</item>
+    <item name="modem.controller.tx">220</item>
+    <item name="modem.controller.voltage">4000</item>
+    <array name="memory.bandwidths">
+        <value>21</value>
+    </array>
+    <item name="wifi.controller.idle">1</item>
+    <item name="wifi.controller.rx">170</item>
+    <item name="wifi.controller.tx">210</item>
+    <array name="wifi.controller.tx_levels">1 </array>
+    <item name="wifi.controller.voltage">4000</item>
+    <array name="wifi.batchedscan">
+        <value>.0001</value>
+        <value>.001</value>
+        <value>.01</value>
+        <value>.1</value>
+        <value>1</value>
+    </array>
+    <item name="bluetooth.active">130</item>
+    <item name="bluetooth.on">0.8</item>
+    <item name="bluetooth.controller.voltage">4000</item>
+</device>
diff --git a/overlay.mk b/overlay.mk
index 727a8e6..b010216 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -107,6 +107,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-nubia-z18mini \
 	treble-overlay-oneplus-n2 \
 	treble-overlay-oneplus-n2-systemui \
+	treble-overlay-oneplus-n20 \
+	treble-overlay-oneplus-n20-systemui \
 	treble-overlay-oneplus-n200 \
 	treble-overlay-oneplus-n200-systemui \
 	treble-overlay-oneplus-op10pro \