diff --git a/Xiaomi/Civi4Pro-SystemUI/Android.mk b/Xiaomi/Civi4Pro-SystemUI/Android.mk
new file mode 100644
index 000000000..59307dfc2
--- /dev/null
+++ b/Xiaomi/Civi4Pro-SystemUI/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-civi4pro-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/Civi4Pro-SystemUI/AndroidManifest.xml b/Xiaomi/Civi4Pro-SystemUI/AndroidManifest.xml
new file mode 100644
index 000000000..d7cbe685c
--- /dev/null
+++ b/Xiaomi/Civi4Pro-SystemUI/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.xiaomi.civi4pro.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:requiredSystemPropertyName="ro.boot.hardware.sku"
+                android:requiredSystemPropertyValue="chenfeng"
+        android:priority="1244"
+        android:isStatic="true" />
+</manifest>
diff --git a/Xiaomi/Civi4Pro-SystemUI/res/values-land/config.xml b/Xiaomi/Civi4Pro-SystemUI/res/values-land/config.xml
new file mode 100644
index 000000000..537482456
--- /dev/null
+++ b/Xiaomi/Civi4Pro-SystemUI/res/values-land/config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
+    <dimen name="large_screen_shade_header_height">28dp</dimen>
+    <dimen name="large_screen_shade_header_min_height">28dp</dimen>
+</resources>
diff --git a/Xiaomi/Civi4Pro-SystemUI/res/values-v31/config.xml b/Xiaomi/Civi4Pro-SystemUI/res/values-v31/config.xml
new file mode 100644
index 000000000..87d970b81
--- /dev/null
+++ b/Xiaomi/Civi4Pro-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">1266px</dimen>
+</resources>
diff --git a/Xiaomi/Civi4Pro-SystemUI/res/values/config.xml b/Xiaomi/Civi4Pro-SystemUI/res/values/config.xml
new file mode 100644
index 000000000..f032f2f81
--- /dev/null
+++ b/Xiaomi/Civi4Pro-SystemUI/res/values/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_padding_start">57px</dimen>
+    <dimen name="status_bar_padding_end">57px</dimen>
+    <dimen name="status_bar_header_height_keyguard">172px</dimen>
+    <dimen name="keyguard_carrier_text_margin">57px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">57px</dimen>
+    <dimen name="large_screen_shade_header_height">172px</dimen>
+    <dimen name="large_screen_shade_header_min_height">172px</dimen>
+</resources>
diff --git a/Xiaomi/Civi4Pro/Android.mk b/Xiaomi/Civi4Pro/Android.mk
new file mode 100644
index 000000000..b2a5dc97d
--- /dev/null
+++ b/Xiaomi/Civi4Pro/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-civi4pro
+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/Civi4Pro/AndroidManifest.xml b/Xiaomi/Civi4Pro/AndroidManifest.xml
new file mode 100644
index 000000000..6c97922c1
--- /dev/null
+++ b/Xiaomi/Civi4Pro/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.xiaomi.civi4pro"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.boot.hardware.sku"
+                android:requiredSystemPropertyValue="chenfeng"
+        android:priority="1244"
+        android:isStatic="true" />
+</manifest>
diff --git a/Xiaomi/Civi4Pro/res/values-land/config.xml b/Xiaomi/Civi4Pro/res/values-land/config.xml
new file mode 100644
index 000000000..fb1bc7e5c
--- /dev/null
+++ b/Xiaomi/Civi4Pro/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/Xiaomi/Civi4Pro/res/values/config.xml b/Xiaomi/Civi4Pro/res/values/config.xml
new file mode 100644
index 000000000..fbc66135b
--- /dev/null
+++ b/Xiaomi/Civi4Pro/res/values/config.xml
@@ -0,0 +1,22 @@
+<?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_default">172px</dimen>
+    <dimen name="status_bar_height">172px</dimen>
+    <dimen name="status_bar_height_portrait">172px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
+    <dimen name="quick_qs_offset_height">172px</dimen>
+
+    <integer name="config_screenBrightnessDoze">4</integer>
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <string name="config_mainBuiltInDisplayCutout">M -138,0 L -138,129 L 138,129 L 138,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -138,0 L -138,129 L 138,129 L 138,0 Z</string>
+</resources>
diff --git a/overlay.mk b/overlay.mk
index 7bf0eade9..f1579ee71 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -348,6 +348,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-wifi5g \
 	treble-overlay-xiaomi-civi \
 	treble-overlay-xiaomi-civi-systemui \
+	treble-overlay-xiaomi-civi4pro \
+	treble-overlay-xiaomi-civi4pro-systemui \
 	treble-overlay-xiaomi-mi11lite5g \
 	treble-overlay-xiaomi-mi11lite5g-systemui \
 	treble-overlay-xiaomi-mi11tpro \