diff --git a/OnePlus/OP8-SystemUI/Android.mk b/OnePlus/OP8-SystemUI/Android.mk
new file mode 100755
index 0000000..cb40d6f
--- /dev/null
+++ b/OnePlus/OP8-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-op8-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/OP8-SystemUI/AndroidManifest.xml b/OnePlus/OP8-SystemUI/AndroidManifest.xml
new file mode 100755
index 0000000..705d956
--- /dev/null
+++ b/OnePlus/OP8-SystemUI/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.oneplus.op8.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:requiredSystemPropertyName="ro.product.odm.device"
+                android:requiredSystemPropertyValue="+(OnePlus8|OnePlus8TMO)"
+        android:priority="1982"
+        android:isStatic="true" />
+</manifest>
diff --git a/OnePlus/OP8-SystemUI/res/values-land/config.xml b/OnePlus/OP8-SystemUI/res/values-land/config.xml
new file mode 100755
index 0000000..0356339
--- /dev/null
+++ b/OnePlus/OP8-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/OP8-SystemUI/res/values-v31/config.xml b/OnePlus/OP8-SystemUI/res/values-v31/config.xml
new file mode 100755
index 0000000..72521e5
--- /dev/null
+++ b/OnePlus/OP8-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">810px</dimen>
+</resources>
diff --git a/OnePlus/OP8-SystemUI/res/values/config.xml b/OnePlus/OP8-SystemUI/res/values/config.xml
new file mode 100755
index 0000000..89c4e4c
--- /dev/null
+++ b/OnePlus/OP8-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">35px</dimen>
+    <dimen name="status_bar_header_height_keyguard">132px</dimen>
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
+    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+</resources>
diff --git a/OnePlus/OP8/Android.mk b/OnePlus/OP8/Android.mk
new file mode 100755
index 0000000..1cad4d7
--- /dev/null
+++ b/OnePlus/OP8/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-oneplus-op8
+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/OP8/AndroidManifest.xml b/OnePlus/OP8/AndroidManifest.xml
new file mode 100755
index 0000000..85f6efb
--- /dev/null
+++ b/OnePlus/OP8/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.oneplus.op8"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.product.odm.device"
+                android:requiredSystemPropertyValue="+(OnePlus8|OnePlus8TMO)"
+        android:priority="1982"
+        android:isStatic="true" />
+</manifest>
diff --git a/OnePlus/OP8/res/values-land/config.xml b/OnePlus/OP8/res/values-land/config.xml
new file mode 100755
index 0000000..9d6de4c
--- /dev/null
+++ b/OnePlus/OP8/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+</resources>
diff --git a/OnePlus/OP8/res/values/config.xml b/OnePlus/OP8/res/values/config.xml
new file mode 100755
index 0000000..540ee59
--- /dev/null
+++ b/OnePlus/OP8/res/values/config.xml
@@ -0,0 +1,19 @@
+<?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_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_portrait">132px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
+    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+
+    <integer name="config_screenBrightnessDoze">3</integer>
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,100 L -409,100 L -409,0 Z</string>
+</resources>
diff --git a/OnePlus/OP8/res/xml/power_profile.xml b/OnePlus/OP8/res/xml/power_profile.xml
new file mode 100755
index 0000000..3fe06bb
--- /dev/null
+++ b/OnePlus/OP8/res/xml/power_profile.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="none">0</item>
+    <item name="screen.on">119.79</item>
+    <item name="screen.full">430</item>
+    <array name="cpu.clusters.cores">
+        <value>4</value>
+        <value>4</value>
+    </array>
+    <array name="cpu.core_speeds.cluster0">
+        <value>518400</value>
+        <value>614400</value>
+        <value>691200</value>
+        <value>787200</value>
+        <value>883200</value>
+        <value>979200</value>
+        <value>1075200</value>
+        <value>1171200</value>
+        <value>1248000</value>
+        <value>1344000</value>
+        <value>1420800</value>
+        <value>1516800</value>
+        <value>1612800</value>
+        <value>1708800</value>
+        <value>1804800</value>
+    </array>
+    <array name="cpu.core_power.cluster0">
+        <value>7</value>
+        <value>8</value>
+        <value>10</value>
+        <value>11</value>
+        <value>12</value>
+        <value>13</value>
+        <value>15</value>
+        <value>16</value>
+        <value>17</value>
+        <value>19</value>
+        <value>21</value>
+        <value>23</value>
+        <value>25</value>
+        <value>29</value>
+        <value>31</value>
+    </array>
+    <array name="cpu.core_speeds.cluster1">
+        <value>710400</value>
+        <value>825600</value>
+        <value>844800</value>
+        <value>940800</value>
+        <value>960000</value>
+        <value>1056000</value>
+        <value>1075200</value>
+        <value>1171200</value>
+        <value>1190400</value>
+        <value>1286400</value>
+        <value>1305600</value>
+        <value>1382400</value>
+        <value>1401600</value>
+        <value>1478400</value>
+        <value>1516800</value>
+        <value>1574400</value>
+        <value>1632000</value>
+        <value>1670400</value>
+        <value>1747200</value>
+        <value>1766400</value>
+        <value>1862400</value>
+        <value>1958400</value>
+        <value>1977600</value>
+        <value>2054400</value>
+        <value>2073600</value>
+        <value>2150400</value>
+        <value>2169600</value>
+        <value>2246400</value>
+        <value>2265600</value>
+        <value>2342400</value>
+        <value>2361600</value>
+        <value>2419200</value>
+        <value>2457600</value>
+        <value>2553600</value>
+        <value>2649600</value>
+        <value>2745600</value>
+        <value>2841600</value>
+    </array>
+    <array name="cpu.core_power.cluster1">
+        <value>30</value>
+        <value>37</value>
+        <value>53</value>
+        <value>45</value>
+        <value>61</value>
+        <value>51</value>
+        <value>67</value>
+        <value>60</value>
+        <value>76</value>
+        <value>68</value>
+        <value>88</value>
+        <value>72</value>
+        <value>92</value>
+        <value>81</value>
+        <value>102</value>
+        <value>94</value>
+        <value>116</value>
+        <value>100</value>
+        <value>129</value>
+        <value>109</value>
+        <value>133</value>
+        <value>141</value>
+        <value>168</value>
+        <value>149</value>
+        <value>182</value>
+        <value>163</value>
+        <value>224</value>
+        <value>180</value>
+        <value>233</value>
+        <value>198</value>
+        <value>240</value>
+        <value>209</value>
+        <value>249</value>
+        <value>272</value>
+        <value>295</value>
+        <value>330</value>
+        <value>366</value>
+    </array>
+    <item name="cpu.active">7.6</item>
+    <item name="cpu.idle">0.1</item>
+    <item name="cpu.suspend">0</item>
+    <item name="battery.capacity">3550</item>
+    <item name="wifi.on">0.1</item>
+    <item name="wifi.active">168</item>
+    <item name="wifi.scan">1.3</item>
+    <item name="dsp.audio">24</item>
+    <item name="dsp.video">63</item>
+    <item name="camera.flashlight">650</item>
+    <item name="camera.avg">380</item>
+    <item name="gps.on">10</item>
+    <item name="radio.active">168</item>
+    <item name="radio.scanning">6</item>
+    <array name="radio.on">
+        <value>88</value>
+        <value>8</value>
+    </array>
+    <item name="modem.controller.idle">6</item>
+    <item name="modem.controller.rx">180</item>
+    <item name="modem.controller.tx">186</item>
+    <item name="modem.controller.voltage">3700</item>
+    <array name="memory.bandwidths">
+        <value>17</value>
+    </array>
+    <item name="wifi.controller.idle">1</item>
+    <item name="wifi.controller.rx">152</item>
+    <item name="wifi.controller.tx">190</item>
+    <array name="wifi.controller.tx_levels">1 </array>
+    <item name="wifi.controller.voltage">3700</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">135</item>
+    <item name="bluetooth.on">0.6</item>
+    <item name="bluetooth.controller.voltage">3700</item>
+</device>
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index 5b5053a..228696d 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -96,6 +96,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-oneplus-op6 \
 	treble-overlay-oneplus-op6t \
 	treble-overlay-oneplus-op6t-systemui \
+	treble-overlay-oneplus-op8 \
+	treble-overlay-oneplus-op8-systemui \
 	treble-overlay-oppo-peqm00 \
 	treble-overlay-oppo-peqm00-systemui \
 	treble-overlay-oukitel-wp8pro \