diff --git a/Samsung/A31-SystemUI/Android.mk b/Samsung/A31-SystemUI/Android.mk
new file mode 100644
index 0000000..e9abb46
--- /dev/null
+++ b/Samsung/A31-SystemUI/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-samsung-a31-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/Samsung/A31-SystemUI/AndroidManifest.xml b/Samsung/A31-SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..065fd4e
--- /dev/null
+++ b/Samsung/A31-SystemUI/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.samsung.a31.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+*samsung/a31*"
+                android:priority="367"
+                android:isStatic="true" />
+</manifest>
\ No newline at end of file
diff --git a/Samsung/A31-SystemUI/res/values/bools.xml b/Samsung/A31-SystemUI/res/values/bools.xml
new file mode 100644
index 0000000..2cb6902
--- /dev/null
+++ b/Samsung/A31-SystemUI/res/values/bools.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="doze_display_state_supported">true</bool>
+    <bool name="doze_long_press_uses_prox">false</bool>
+    <bool name="doze_proximity_check_before_pulse">false</bool>
+    <bool name="doze_pulse_on_notifications">true</bool>
+    <bool name="doze_single_tap_uses_prox">false</bool>
+    <bool name="doze_suspend_display_state_supported">true</bool>
+</resources>
\ No newline at end of file
diff --git a/Samsung/A31-SystemUI/res/values/dimens.xml b/Samsung/A31-SystemUI/res/values/dimens.xml
new file mode 100644
index 0000000..10ecdeb
--- /dev/null
+++ b/Samsung/A31-SystemUI/res/values/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="notch_status_bar_padding_top">14dp</dimen>
+    <dimen name="rounded_corner_content_padding">8dp</dimen>
+    <dimen name="status_bar_padding_end">6dp</dimen>
+    <dimen name="status_bar_padding_start">16dp</dimen>
+    <dimen name="status_bar_icon_padding">2dp</dimen>
+    <dimen name="status_bar_padding_top">4dp</dimen>
+    <item name="proximity_sensor_threshold" translatable="false" format="float" type="dimen">5</item>
+</resources>
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index 85f34b0..199774e 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -152,6 +152,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-samsung-a20s-systemui \
 	treble-overlay-samsung-a30 \
 	treble-overlay-samsung-a31 \
+	treble-overlay-samsung-a31-systemui \
 	treble-overlay-samsung-a33 \
 	treble-overlay-samsung-a33-systemui \
 	treble-overlay-samsung-a40 \