diff --git a/Moto/G31/Android.mk b/Moto/G31/Android.mk
new file mode 100644
index 0000000..18c786b
--- /dev/null
+++ b/Moto/G31/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-moto-g31
+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/G31/AndroidManifest.xml b/Moto/G31/AndroidManifest.xml
new file mode 100644
index 0000000..46a2e5f
--- /dev/null
+++ b/Moto/G31/AndroidManifest.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/Moto/G31/res/values/arrays.xml b/Moto/G31/res/values/arrays.xml
new file mode 100644
index 0000000..a6bf910
--- /dev/null
+++ b/Moto/G31/res/values/arrays.xml
@@ -0,0 +1,79 @@
+
+
+
+ - 5
+ - 16
+ - 40
+ - 79
+ - 92
+ - 124
+ - 165
+ - 214
+ - 296
+ - 346
+ - 450
+
+
+ - 5
+ - 10
+ - 40
+ - 100
+ - 325
+ - 1250
+ - 3500
+ - 5500
+ - 10000
+ - 20000
+
+
+ - 0
+ - 2
+
+
+ - /system/framework/arm/boot-framework.oat
+ - /system/framework/framework.jar
+ - /system/framework/services.jar
+ - /apex/com.android.media/javalib/updatable-media.jar
+ - /system/lib64/libsurfaceflinger.so
+
+
+ - 0
+ - 26
+
+
+ - 0
+ - 43
+
+
+ - 0
+ - 3
+ - 9
+ - 24
+ - 47
+ - 56
+ - 76
+ - 101
+ - 128
+ - 182
+ - 213
+ - 255
+
+
+ - 0
+ - 5
+ - 16
+ - 40
+ - 79
+ - 92
+ - 124
+ - 165
+ - 214
+ - 296
+ - 346
+ - 450
+
+
+ - 0
+ - 30
+
+
diff --git a/Moto/G31/res/values/bools.xml b/Moto/G31/res/values/bools.xml
new file mode 100644
index 0000000..8bfd8b5
--- /dev/null
+++ b/Moto/G31/res/values/bools.xml
@@ -0,0 +1,6 @@
+
+
+ true
+ true
+ true
+
diff --git a/Moto/G31/res/values/integers.xml b/Moto/G31/res/values/integers.xml
new file mode 100644
index 0000000..a6024e6
--- /dev/null
+++ b/Moto/G31/res/values/integers.xml
@@ -0,0 +1,11 @@
+
+
+ 500
+ 500
+ 65540
+ 60
+ 3
+ 3
+ 109
+ 3
+
diff --git a/Moto/G31/res/values/strings.xml b/Moto/G31/res/values/strings.xml
new file mode 100644
index 0000000..e241785
--- /dev/null
+++ b/Moto/G31/res/values/strings.xml
@@ -0,0 +1,5 @@
+
+
+ com.motorola.sensor.camera_activate
+ M 35,0 L -35,0 L -35,100 L 35,100 Z
+
diff --git a/Moto/G31/res/xml/power_profile.xml b/Moto/G31/res/xml/power_profile.xml
new file mode 100644
index 0000000..8ffb912
--- /dev/null
+++ b/Moto/G31/res/xml/power_profile.xml
@@ -0,0 +1,106 @@
+
+
+ - 0
+ - 144.926
+ - 191.801
+ - 0.017
+ - 55.58
+ - 205.677
+ - 320.182
+ - 510.246
+ - 28.046
+ - 233.72
+ - 70.41
+
+ 35
+ 30
+ 25
+ 20
+ 15
+ 10
+ 5
+ 3.14
+
+
+ 6
+ 2
+
+
+ 500000
+ 774000
+ 850000
+ 900000
+ 950000
+ 999000
+ 1050000
+ 1100000
+ 1175000
+ 1275000
+ 1325000
+ 1375000
+ 1450000
+ 1500000
+ 1625000
+ 1800000
+
+
+ 850000
+ 909000
+ 998000
+ 1087000
+ 1176000
+ 1295000
+ 1354000
+ 1443000
+ 1532000
+ 1621000
+ 1710000
+ 1800000
+ 1850000
+ 1900000
+ 1950000
+ 2000000
+
+
+ 52.566
+ 56.535
+ 58.92
+ 58.5
+ 59.984
+ 61.934
+ 64.13
+ 65.004
+ 67.049
+ 71.74
+ 74.219
+ 76.282
+ 78.998
+ 80.561
+ 90.106
+ 101.117
+
+
+ 87.21
+ 91.097
+ 97.375
+ 109.839
+ 119.657
+ 135.66
+ 143.41
+ 155.73
+ 157.113
+ 169.932
+ 186.811
+ 232.18
+ 240.73
+ 253.868
+ 272.877
+ 283.774
+
+ - 34.95
+ - 33.438
+ - 3
+ - 4.407
+ - 3.477
+ - 5000
+
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index 1890558..a1651cd 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -71,8 +71,8 @@ PRODUCT_PACKAGES += \
treble-overlay-misc-minimal-brightness \
treble-overlay-moto-e5 \
treble-overlay-moto-e5plus \
- treble-overlay-moto-e6plus \
treble-overlay-moto-g6 \
+ treble-overlay-moto-g31 \
treble-overlay-moto-g6play \
treble-overlay-moto-g6plus \
treble-overlay-moto-g7play \
@@ -131,8 +131,6 @@ PRODUCT_PACKAGES += \
treble-overlay-realme-x2pro \
treble-overlay-samsung-S10pq \
treble-overlay-samsung-S10q \
- treble-overlay-samsung-S20fe \
- treble-overlay-samsung-S20fe-systemui \
treble-overlay-samsung-a20 \
treble-overlay-samsung-a20s \
treble-overlay-samsung-a20s-systemui \