diff --git a/Samsung/M31s-SystemUI/Android.mk b/Samsung/M31s-SystemUI/Android.mk
new file mode 100755
index 0000000..1a86672
--- /dev/null
+++ b/Samsung/M31s-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-m31s-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/Samsung/M31s-SystemUI/AndroidManifest.xml b/Samsung/M31s-SystemUI/AndroidManifest.xml
new file mode 100755
index 0000000..7a5e766
--- /dev/null
+++ b/Samsung/M31s-SystemUI/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.samsung.m31s.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+        	android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+        	android:requiredSystemPropertyValue="+*samsung/m31s*"
+		android:priority="345"
+		android:isStatic="true" />
+</manifest>
diff --git a/Samsung/M31s-SystemUI/res/values/config.xml b/Samsung/M31s-SystemUI/res/values/config.xml
new file mode 100755
index 0000000..f339834
--- /dev/null
+++ b/Samsung/M31s-SystemUI/res/values/config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="keyguard_carrier_text_margin">45px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
+    <dimen name="rounded_corner_content_padding">4dp</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">890px</dimen>
+</resources>
diff --git a/Samsung/M31s/Android.mk b/Samsung/M31s/Android.mk
old mode 100644
new mode 100755
diff --git a/Samsung/M31s/AndroidManifest.xml b/Samsung/M31s/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/Samsung/M31s/res/values/config.xml b/Samsung/M31s/res/values/config.xml
old mode 100644
new mode 100755
index d650fc0..6ed2766
--- a/Samsung/M31s/res/values/config.xml
+++ b/Samsung/M31s/res/values/config.xml
@@ -586,14 +586,12 @@
         <item>420</item>
         <item>600</item>
     </integer-array>
-    <string-array name="config_tether_usb_regexs">
-        <item>rndis0</item>
-    </string-array>
     
     
     <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
-    <bool name="config_hotswapCapable">true</bool>
     <bool name="config_showNavigationBar">true</bool>
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+    <bool name="config_hotswapCapable">true</bool>
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_wifi_dual_band_support">true</bool>
     <bool name="config_wifi_fast_bss_transition_enabled">true</bool>
@@ -602,8 +600,14 @@
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
     <bool name="config_supportDoubleTapWake">true</bool>
     <bool name="config_displayBlanksAfterDoze">false</bool>
+    <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
+    <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     
     
+    <item type="dimen" name="config_screenBrightnessSettingMaximumFloat">1.0</item>
+    <item type="dimen" name="config_screenBrightnessSettingMinimumFloat">0.0</item>
+    
+    <dimen name="status_bar_height_portrait">87.0px</dimen>
     <dimen name="rounded_corner_radius_top">70.0px</dimen>
     <dimen name="rounded_corner_radius_bottom">70.0px</dimen>
     <dimen name="rounded_corner_radius">50.0px</dimen>
@@ -611,7 +615,7 @@
     
     <integer name="config_screenBrightnessDim">15</integer>
     <integer name="config_screenBrightnessSettingDefault">128</integer>
-    <integer name="config_screenBrightnessSettingMaximum">255</integer>
+    <integer name="config_screenBrightnessSettingMaximum">365</integer>
     <integer name="config_screenBrightnessSettingMinimum">0</integer>
     
     <integer name="config_screenBrightnessDoze">17</integer>
diff --git a/Samsung/M31s/res/xml/power_profile.xml b/Samsung/M31s/res/xml/power_profile.xml
old mode 100644
new mode 100755
diff --git a/overlay.mk b/overlay.mk
index e465559..8727640 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -172,6 +172,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-samsung-m31 \
 	treble-overlay-samsung-m31-systemui \
 	treble-overlay-samsung-m31s \
+	treble-overlay-samsung-m31s-systemui \
 	treble-overlay-samsung-n9q \
 	treble-overlay-samsung-o1s \
 	treble-overlay-samsung-p3s \