diff --git a/Moto/hiphi-SystemUI/Android.mk b/Moto/hiphi-SystemUI/Android.mk
new file mode 100644
index 0000000..09cf309
--- /dev/null
+++ b/Moto/hiphi-SystemUI/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-moto-hiphi-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/Moto/hiphi-SystemUI/AndroidManifest.xml b/Moto/hiphi-SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..e569609
--- /dev/null
+++ b/Moto/hiphi-SystemUI/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.moto.hiphi.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:requiredSystemPropertyName="ro.product.vendor.device"
+                android:requiredSystemPropertyValue="+(hiphi|hiphic)"
+        android:priority="222"
+        android:isStatic="true" />
+</manifest>
diff --git a/Moto/hiphi-SystemUI/res/values-land/config.xml b/Moto/hiphi-SystemUI/res/values-land/config.xml
new file mode 100644
index 0000000..0356339
--- /dev/null
+++ b/Moto/hiphi-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/Moto/hiphi-SystemUI/res/values-v31/config.xml b/Moto/hiphi-SystemUI/res/values-v31/config.xml
new file mode 100644
index 0000000..40690d4
--- /dev/null
+++ b/Moto/hiphi-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">693px</dimen>
+</resources>
diff --git a/Moto/hiphi-SystemUI/res/values/config.xml b/Moto/hiphi-SystemUI/res/values/config.xml
new file mode 100644
index 0000000..7627375
--- /dev/null
+++ b/Moto/hiphi-SystemUI/res/values/config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_padding_start">35px</dimen>
+    <dimen name="status_bar_padding_end">35px</dimen>
+    <dimen name="status_bar_header_height_keyguard">102px</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>
+
+    <!-- Moto please no -->
+    <dimen name="rounded_corner_content_padding">4dp</dimen>
+</resources>
diff --git a/Moto/hiphi/Android.mk b/Moto/hiphi/Android.mk
new file mode 100644
index 0000000..0142fb8
--- /dev/null
+++ b/Moto/hiphi/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-moto-hiphi
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Moto/hiphi/AndroidManifest.xml b/Moto/hiphi/AndroidManifest.xml
new file mode 100644
index 0000000..76f824b
--- /dev/null
+++ b/Moto/hiphi/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.moto.hiphi"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.product.vendor.device"
+                android:requiredSystemPropertyValue="+(hiphi|hiphic)"
+        android:priority="222"
+        android:isStatic="true" />
+</manifest>
diff --git a/Moto/hiphi/res/values-land/config.xml b/Moto/hiphi/res/values-land/config.xml
new file mode 100644
index 0000000..9d6de4c
--- /dev/null
+++ b/Moto/hiphi/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/Moto/hiphi/res/values/config.xml b/Moto/hiphi/res/values/config.xml
new file mode 100644
index 0000000..4cab3ed
--- /dev/null
+++ b/Moto/hiphi/res/values/config.xml
@@ -0,0 +1,84 @@
+<?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">102px</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">6</integer>
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <integer-array name="config_autoBrightnessLevels">
+        <item>2</item>
+        <item>4</item>
+        <item>5</item>
+        <item>10</item>
+        <item>40</item>
+        <item>100</item>
+        <item>325</item>
+        <item>1250</item>
+        <item>3500</item>
+        <item>5500</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>
+    <integer-array name="config_autoBrightnessDisplayValuesNits">
+        <item>5</item>
+        <item>7</item>
+        <item>10</item>
+        <item>12</item>
+        <item>24</item>
+        <item>95</item>
+        <item>111</item>
+        <item>149</item>
+        <item>192</item>
+        <item>252</item>
+        <item>500</item>
+    </integer-array>
+    <integer-array name="config_screenBrightnessNits">
+        <item>0</item>
+        <item>5</item>
+        <item>7</item>
+        <item>10</item>
+        <item>12</item>
+        <item>24</item>
+        <item>95</item>
+        <item>111</item>
+        <item>149</item>
+        <item>192</item>
+        <item>252</item>
+        <item>500</item>
+    </integer-array>
+    <integer-array name="config_screenBrightnessBacklight">
+        <item>0</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>13</item>
+        <item>51</item>
+        <item>59</item>
+        <item>82</item>
+        <item>102</item>
+        <item>138</item>
+        <item>255</item>
+    </integer-array>
+
+    <string name="config_mainBuiltInDisplayCutout">M -31,0 L -31,82 L 31,82 L 31,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -31,0 L -31,82 L 31,82 L 31,0 Z</string>
+</resources>
diff --git a/Moto/hiphi/res/xml/power_profile.xml b/Moto/hiphi/res/xml/power_profile.xml
new file mode 100644
index 0000000..64c569e
--- /dev/null
+++ b/Moto/hiphi/res/xml/power_profile.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="none">0</item>
+    <item name="screen.on">104.64</item>
+    <item name="screen.full">171.75</item>
+    <item name="wifi.on">1.189</item>
+    <item name="wifi.active">80.689</item>
+    <item name="wifi.scan">250.59</item>
+    <item name="camera.avg">634.17</item>
+    <item name="camera.flashlight">224.175</item>
+    <item name="gps.on">8.65</item>
+    <item name="radio.active">257.53</item>
+    <item name="radio.scanning">72.7</item>
+    <array name="radio.on">
+        <value>33.079</value>
+        <value>30</value>
+        <value>25</value>
+        <value>20</value>
+        <value>15</value>
+        <value>10</value>
+        <value>5</value>
+        <value>4.3</value>
+    </array>
+    <array name="cpu.clusters.cores">
+        <value>4</value>
+        <value>3</value>
+        <value>1</value>
+    </array>
+    <array name="cpu.core_speeds.cluster0">
+        <value>307200</value>
+        <value>403200</value>
+        <value>518400</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_speeds.cluster1">
+        <value>633600</value>
+        <value>768000</value>
+        <value>833200</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_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.cluster0">
+        <value>6</value>
+        <value>7</value>
+        <value>10</value>
+        <value>11</value>
+        <value>12</value>
+        <value>17</value>
+        <value>21</value>
+        <value>23</value>
+        <value>30</value>
+        <value>33</value>
+        <value>37</value>
+        <value>43</value>
+        <value>55</value>
+        <value>61</value>
+        <value>65</value>
+    </array>
+    <array name="cpu.core_power.cluster1">
+        <value>33</value>
+        <value>41</value>
+        <value>51</value>
+        <value>59</value>
+        <value>68</value>
+        <value>75</value>
+        <value>87</value>
+        <value>100</value>
+        <value>113</value>
+        <value>121</value>
+        <value>155</value>
+        <value>175</value>
+        <value>207</value>
+        <value>235</value>
+        <value>260</value>
+        <value>301</value>
+        <value>309</value>
+    </array>
+    <array name="cpu.core_power.cluster2">
+        <value>68</value>
+        <value>82</value>
+        <value>105</value>
+        <value>127</value>
+        <value>152</value>
+        <value>179</value>
+        <value>192</value>
+        <value>219</value>
+        <value>247</value>
+        <value>297</value>
+        <value>321</value>
+        <value>376</value>
+        <value>425</value>
+        <value>430</value>
+        <value>440</value>
+        <value>455</value>
+        <value>475</value>
+        <value>502</value>
+        <value>514</value>
+        <value>516</value>
+    </array>
+    <item name="cpu.cluster_power.cluster0">1.13</item>
+    <item name="cpu.cluster_power.cluster1">1.13</item>
+    <item name="cpu.cluster_power.cluster2">1.13</item>
+    <item name="cpu.suspend">6.5</item>
+    <item name="cpu.idle">22.71</item>
+    <item name="cpu.active">6.9</item>
+    <item name="battery.capacity">5069</item>
+</device>
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index 73ef602..fc58a5f 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -79,6 +79,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-moto-g8 \
 	treble-overlay-moto-g8plus \
 	treble-overlay-moto-g8power \
+	treble-overlay-moto-hiphi \
+	treble-overlay-moto-hiphi-systemui \
 	treble-overlay-moto-one \
 	treble-overlay-moto-one-action \
 	treble-overlay-moto-onehyper \