diff --git a/Moto/E5Plus/Android.mk b/Moto/E5Plus/Android.mk
new file mode 100644
index 0000000..eea139e
--- /dev/null
+++ b/Moto/E5Plus/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-moto-e5plus
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Moto/E5Plus/AndroidManifest.xml b/Moto/E5Plus/AndroidManifest.xml
new file mode 100644
index 0000000..9b34e23
--- /dev/null
+++ b/Moto/E5Plus/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.moto.e5plus"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="motorola/hannah_sprint/hannah:8.0.0/OCPS27.91-32-4/4:user/release-keys"
+		android:priority="88"
+		android:isStatic="true" />
+</manifest>
diff --git a/Moto/E5Plus/res/values/config.xml b/Moto/E5Plus/res/values/config.xml
new file mode 100644
index 0000000..e19256f
--- /dev/null
+++ b/Moto/E5Plus/res/values/config.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<bool name="config_enableAutoPowerModes">true</bool>
+	<integer name="config_autoPowerModeAnyMotionSensor">30</integer>
+	<bool name="config_wifi_dual_band_support">false</bool>
+	<bool name="config_wifi_fast_bss_transition_enabled">true</bool>
+	<bool name="config_wifi_background_scan_support">true</bool>
+	<bool name="config_wifi_enable_disconnection_debounce">true</bool>
+	<bool name="config_automatic_brightness_available">true</bool>
+	<integer name="config_brightness_ramp_rate_fast">200</integer>
+	<integer name="config_brightness_ramp_rate_slow">40</integer>
+	<bool name="config_setColorTransformAccelerated">true</bool>
+	<bool name="config_nightDisplayAvailable">false</bool>
+	<bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
+
+	<integer-array name="config_longPressVibePattern">
+		<item>0</item>
+		<item>25</item>
+	</integer-array>
+	<integer-array name="config_virtualKeyVibePattern">
+		<item>0</item>
+		<item>34</item>
+	</integer-array>
+	<integer-array name="config_keyboardTapVibePattern">
+		<item>0</item>
+		<item>25</item>
+	</integer-array>
+	<bool name="config_hotswapCapable">true</bool>
+	<integer name="config_screenBrightnessSettingMinimum">3</integer>
+	<integer name="config_screenBrightnessSettingDefault">90</integer>
+	<integer name="config_screenBrightnessDoze">17</integer>
+	<integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
+	<integer name="config_screenBrightnessDark">2</integer>
+	<integer-array name="config_autoBrightnessLcdBacklightValues">
+		<item>3</item>
+		<item>10</item>
+		<item>35</item>
+		<item>55</item>
+		<item>65</item>
+		<item>75</item>
+		<item>90</item>
+		<item>90</item>
+		<item>90</item>
+		<item>90</item>
+		<item>112</item>
+		<item>135</item>
+		<item>151</item>
+		<item>159</item>
+		<item>215</item>
+		<item>255</item>
+		<item>255</item>
+		<item>255</item>
+		<item>256</item>
+	</integer-array>
+	<integer-array name="config_autoBrightnessLevels">
+		<item>2</item>
+		<item>10</item>
+		<item>50</item>
+		<item>90</item>
+		<item>100</item>
+		<item>150</item>
+		<item>200</item>
+		<item>300</item>
+		<item>400</item>
+		<item>500</item>
+		<item>800</item>
+		<item>1000</item>
+		<item>1300</item>
+		<item>2000</item>
+		<item>3000</item>
+		<item>4000</item>
+		<item>8000</item>
+		<item>20000</item>
+	</integer-array>
+	<bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
+	<integer name="config_bluetooth_operating_voltage_mv">3300</integer>
+	<bool name="skip_restoring_network_selection">true</bool>
+	<bool name="config_showNavigationBar">true</bool>
+
+	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
+	<bool name="config_dozeAfterScreenOff">true</bool>
+	<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
+	<bool name="config_cellBroadcastAppLinks">true</bool>
+
+	<integer name="config_mobile_mtu">1410</integer>
+	<bool name="config_speed_up_audio_on_mt_calls">true</bool>
+	<bool name="config_auto_attach_data_on_creation">false</bool>
+	<string-array name="config_gpsParameters">
+        	<item>XTRA_SERVER_1=https://xtrapath1.izatcloud.net/xtra2.bin</item>
+        	<item>XTRA_SERVER_2=https://xtrapath2.izatcloud.net/xtra2.bin</item>
+        	<item>XTRA_SERVER_3=https://xtrapath3.izatcloud.net/xtra2.bin</item>
+        	<item>NTP_SERVER=north-america.pool.ntp.org</item>
+        	<item>SUPL_MODE=0</item>
+        	<item>SUPL_HOST=NONE</item>
+        	<item>SUPL_PORT=7275</item>
+        	<item>SUPL_VER=0x20000</item>
+        	<item>LPP_PROFILE=3</item>
+        	<item>NMEA_PROVIDER=0</item>
+        	<item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+        	<item>ERR_ESTIMATE=0</item>
+        	<item>INTERMEDIATE_POS=0</item>
+        	<item>SUPL_ES=1</item>
+        	<item>GPS_LOCK=1</item>
+	</string-array>
+	<bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
+	<bool name="config_use_sim_language_file">true</bool>
+	<integer name="config_cameraLaunchGestureSensorType">-1</integer>
+	<string name="config_cameraLaunchGestureSensorStringType" />
+
+
+	<!-- big ram -->
+	<integer name="config_multiuserMaximumUsers">4</integer>
+	<bool name="config_enableMultiUserUI">true</bool>
+	<bool name="config_pinnerCameraApp">false</bool>
+	<string-array name="config_defaultPinnerServiceFiles">
+        	<item>/system/framework/arm/boot-framework.oat</item>
+        	<item>/system/framework/arm/boot-framework.vdex</item>
+        	<item>/system/framework/oat/arm/services.odex</item>
+        	<item>/system/framework/oat/arm/services.vdex</item>
+        	<item>/system/framework/arm/boot.oat</item>
+        	<item>/system/framework/arm/boot.vdex</item>
+        	<item>/system/framework/arm/boot-core-libart.oat</item>
+        	<item>/system/framework/arm/boot-core-libart.vdex</item>
+	</string-array>
+</resources>
diff --git a/Moto/E5Plus/res/xml/apns.xml b/Moto/E5Plus/res/xml/apns.xml
new file mode 100644
index 0000000..327290a
--- /dev/null
+++ b/Moto/E5Plus/res/xml/apns.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<apns version="8" />
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/audio_assets.xml b/Moto/E5Plus/res/xml/audio_assets.xml
new file mode 100644
index 0000000..0368008
--- /dev/null
+++ b/Moto/E5Plus/res/xml/audio_assets.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<audio_assets version="1.0">
+    <group name="touch_sounds">
+        <asset file="Effect_Tick.ogg" id="FX_KEY_CLICK" />
+        <asset file="Effect_Tick.ogg" id="FX_FOCUS_NAVIGATION_UP" />
+        <asset file="Effect_Tick.ogg" id="FX_FOCUS_NAVIGATION_DOWN" />
+        <asset file="Effect_Tick.ogg" id="FX_FOCUS_NAVIGATION_LEFT" />
+        <asset file="Effect_Tick.ogg" id="FX_FOCUS_NAVIGATION_RIGHT" />
+        <asset file="KeypressStandard.ogg" id="FX_KEYPRESS_STANDARD" />
+        <asset file="KeypressSpacebar.ogg" id="FX_KEYPRESS_SPACEBAR" />
+        <asset file="KeypressDelete.ogg" id="FX_KEYPRESS_DELETE" />
+        <asset file="KeypressReturn.ogg" id="FX_KEYPRESS_RETURN" />
+        <asset file="KeypressInvalid.ogg" id="FX_KEYPRESS_INVALID" />
+    </group>
+</audio_assets>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/autotext.xml b/Moto/E5Plus/res/xml/autotext.xml
new file mode 100644
index 0000000..51f284f
--- /dev/null
+++ b/Moto/E5Plus/res/xml/autotext.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<words />
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/bookmarks.xml b/Moto/E5Plus/res/xml/bookmarks.xml
new file mode 100644
index 0000000..5ed71b2
--- /dev/null
+++ b/Moto/E5Plus/res/xml/bookmarks.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bookmarks>
+    <bookmark category="android.intent.category.APP_CALCULATOR" shortcut="a" />
+    <bookmark class="com.google.android.apps.chrome.Main" package="com.android.chrome" shortcut="b" />
+    <bookmark category="android.intent.category.APP_CONTACTS" shortcut="c" />
+    <bookmark category="android.intent.category.APP_EMAIL" shortcut="e" />
+    <bookmark class="com.google.android.gm.ConversationListActivityGmail" package="com.google.android.gm" shortcut="g" />
+    <bookmark category="android.intent.category.APP_CALENDAR" shortcut="l" />
+    <bookmark category="android.intent.category.APP_MAPS" shortcut="m" />
+    <bookmark category="android.intent.category.APP_MUSIC" shortcut="p" />
+    <bookmark category="android.intent.category.APP_MESSAGING" shortcut="s" />
+    <bookmark class="com.google.android.talk.SigningInActivity" package="com.google.android.talk" shortcut="t" />
+    <bookmark class="com.google.android.youtube.HomeActivity" package="com.google.android.youtube" shortcut="y" />
+</bookmarks>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/color_extraction.xml b/Moto/E5Plus/res/xml/color_extraction.xml
new file mode 100644
index 0000000..fe9d5c3
--- /dev/null
+++ b/Moto/E5Plus/res/xml/color_extraction.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<colorextraction>
+    <palettes>
+        <palette h="0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f" l="0.08f, 0.11f, 0.14901960784313725f, 0.2f, 0.2980392156862745f, 0.4f,                 0.4980392156862745f, 0.6196078431372549f, 0.7176470588235294f,                 0.8196078431372549f, 0.9176470588235294f, 0.9490196078431372f" s="0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f" />
+        <palette h="1,1,0.991,0.991,0.9833333333333333,0,0,0,                 0.01134380453752181,0.015625000000000003,0.024193548387096798,                 0.027397260273972573,0.017543859649122865" l="0.04,0.09,0.14,0.2,0.27450980392156865,                 0.34901960784313724,0.4235294117647059,0.5490196078431373,                 0.6254901960784314,0.6862745098039216,0.7568627450980392,                 0.8568627450980393,0.9254901960784314" s="1,1,1,1,1,1,1,0.8434782608695652,1,1,1,1,1" />
+        <palette h="0.638,0.638,0.6385767790262171,0.6301169590643275,                 0.6223958333333334,0.6151079136690647,0.6065400843881856,                 0.5986964618249534,0.5910746812386157,0.5833333333333334,                 0.5748031496062993,0.5582010582010583" l="0.05,0.12,0.17450980392156862,0.2235294117647059,                 0.2784313725490196,0.3352941176470588,0.388235294117647,                 0.44901960784313727,0.5392156862745098,0.6509803921568628,                 0.7509803921568627,0.8764705882352941" s="1,1,1,1,0.9014084507042253,0.8128654970760234,                 0.7979797979797981,0.7816593886462883,0.778723404255319,1,1,1" />
+        <palette h="0.563,0.569,0.5666,0.5669934640522876,0.5748031496062993,                 0.5595238095238095,0.5473118279569893,0.5393258426966292,                 0.5315955766192734,0.524031007751938,0.5154711673699016,                 0.508080808080808,0.5" l="0.07,0.12,0.16,0.2,0.24901960784313726,                 0.27450980392156865,0.30392156862745096,0.34901960784313724,                 0.4137254901960784,0.47647058823529415,0.5352941176470588,                 0.6764705882352942,0.8" s="1,1,1,1,1,1,1,1,1,0.8847736625514403,1,1,1" />
+        <palette h="0.508,0.511,0.508,0.508,0.5082304526748972,                 0.5069444444444444,0.5,0.5,0.5,0.48724954462659376,                 0.4800347222222222,0.4755134281200632,0.4724409448818897,                 0.4671052631578947" l="0.04,0.06,0.08,0.12,0.1588235294117647,                 0.21176470588235297,0.25882352941176473,0.3,0.34901960784313724,                 0.44117647058823534,0.5215686274509804,0.5862745098039216,                 0.7509803921568627,0.8509803921568627" s="1,1,1,1,1,0.8888888888888887,0.9242424242424242,1,                 1,0.8133333333333332,0.7868852459016393,1,1,1" />
+        <palette h="0.333,0.333,0.333,0.3333333333333333,0.3333333333333333,                 0.34006734006734,0.34006734006734,0.34006734006734,                 0.34259259259259256,0.3475783475783476,0.34767025089605735,                 0.3467741935483871,0.3703703703703704" l="0.05,0.08,0.14,0.1784313725490196,0.23137254901960785,                 0.3431372549019608,0.38235294117647056,0.49215686274509807,                 0.6588235294117647,0.7431372549019608,0.8176470588235294,                 0.8784313725490196,0.9294117647058824" s="0.70,0.72,0.69,0.6703296703296703,0.728813559322034,                 0.5657142857142856,0.5076923076923077,0.3944223107569721,                 0.6206896551724138,0.8931297709923666,1,1,1" />
+        <palette h="0.161,0.163,0.163,0.162280701754386,0.15032679738562088,                 0.15879265091863518,0.16236559139784948,0.17443868739205526,                 0.17824074074074076,0.18674698795180725,0.18692449355432778,                 0.1946778711484594,0.18604651162790695" l="0.05,0.08,0.11,0.14901960784313725,0.2,                 0.24901960784313726,0.30392156862745096,0.3784313725490196,                 0.4235294117647059,0.48823529411764705,0.6450980392156863,                 0.7666666666666666,0.8313725490196078" s="1,1,1,1,1,1,1,1,1,1,1,1,1" />
+        <palette h="0.108,0.105,0.105,0.105,0.10619469026548674,                 0.11924686192468618,0.13046448087431692,0.14248366013071895,                 0.1506024096385542,0.16220238095238093,0.16666666666666666,                 0.16666666666666666,0.162280701754386,0.15686274509803924" l="0.17,0.22,0.28,0.35,0.44313725490196076,                 0.46862745098039216,0.47843137254901963,0.5,0.5117647058823529,                 0.5607843137254902,0.6509803921568628,0.7509803921568627,                 0.8509803921568627,0.9" s="1,1,1,1,1,1,1,1,1,1,1,1,1,1" />
+        <palette h="0.036,0.036,0.036,0.036,0.03561253561253561,                 0.05098039215686275,0.07516339869281045,0.09477124183006536,                 0.1150326797385621,0.134640522875817,0.14640522875816991,                 0.1582397003745319,0.15773809523809523,0.15359477124183002" l="0.19,0.26,0.34,0.39,0.4588235294117647,0.5,0.5,0.5,                 0.5,0.5,0.5,0.6509803921568628,0.7803921568627451,0.9" s="1,1,1,1,1,1,1,1,1,1,1,1,1,1" />
+        <palette h="0.955,0.961,0.958,0.9596491228070175,0.9593837535014005,                 0.9514767932489452,0.943859649122807,0.9396825396825397,                 0.9395424836601307,0.9393939393939394,0.9362745098039216,                 0.9754098360655739,0.9824561403508771" l="0.06,0.11,0.16,0.22156862745098038,0.2843137254901961,                 0.388235294117647,0.48627450980392156,0.5450980392156863,                 0.6,0.6764705882352942,0.8,0.8803921568627451,                 0.9254901960784314" s="0.87,0.85,0.85,0.84070796460177,0.8206896551724138,                 0.7979797979797981,0.7661290322580644,0.9051724137931036,                 1,1,1,1,1" />
+        <palette h="0.866,0.855,0.841025641025641,0.8333333333333334,                 0.8285256410256411,0.821522309711286,0.8083333333333333,                 0.8046594982078853,0.8005822416302766,0.7842377260981912,                 0.7771084337349398,0.7747747747747749" l="0.05,0.08,0.12745098039215685,0.15490196078431373,                 0.20392156862745098,0.24901960784313726,0.3137254901960784,                 0.36470588235294116,0.44901960784313727,0.6568627450980392,                 0.7470588235294118,0.8450980392156863" s="1,1,1,1,1,1,1,1,1,                 0.737142857142857,0.6434108527131781,0.46835443037974644" />
+        <palette h="0.925,0.93,0.938,0.947,0.955952380952381,                 0.9681069958847737,0.9760479041916167,0.9873563218390804,0,0,                 0.009057971014492771,0.026748971193415648,                 0.041666666666666616,0.05303030303030304" l="0.10,0.13,0.17,0.2,0.27450980392156865,                 0.3803921568627451,0.4725490196078432,0.5549019607843138,                 0.6313725490196078,0.707843137254902,0.7764705882352941,                 0.8294117647058823,0.9058823529411765,0.9568627450980391" s="1,1,1,1,1,0.8350515463917526,0.6929460580912863,                 0.6387665198237885,0.6914893617021276,0.7583892617449666,                 0.8070175438596495,0.9310344827586209,1,1" />
+        <palette h="0.733,0.736,0.744,0.7514619883040936,0.7679738562091503,                 0.7802083333333333,0.7844311377245509,0.796875,                 0.8165618448637316,0.8487179487179487,0.8582375478927203,                 0.8562091503267975,0.8666666666666667" l="0.07,0.12,0.17,0.2235294117647059,0.3,                 0.38431372549019605,0.492156862745098,0.5843137254901961,                 0.6647058823529411,0.7333333333333334,0.8215686274509804,0.9,                 0.9411764705882353" s="1,1,1,1,1,0.8163265306122449,0.6653386454183268,                 0.7547169811320753,0.929824561403509,0.9558823529411766,                 0.9560439560439562,1,1" />
+        <palette h="0.6666666666666666,0.6666666666666666,0.6666666666666666,                 0.6666666666666666,0.6666666666666666,0.6666666666666666,                 0.6666666666666666,0.6666666666666666,0.6666666666666666,                 0.6666666666666666,0.6666666666666666" l="0.18,0.2392156862745098,0.296078431372549,                 0.34901960784313724,0.4274509803921569,0.5392156862745098,                 0.6372549019607843,0.7490196078431373,0.8196078431372549,                 0.8823529411764706,0.9372549019607843" s="0.25,0.24590163934426232,0.17880794701986752,                 0.14606741573033713,0.13761467889908252,0.14893617021276592,                 0.16756756756756758,0.20312500000000017,0.26086956521739135,                 0.29999999999999966,0.5000000000000004" />
+        <palette h="0.938,0.944,0.952,0.961,0.9678571428571429,                 0.9944812362030905,0,0,                 0.0047348484848484815,0.00316455696202532,0,                 0.9980392156862745,0.9814814814814816,0.9722222222222221" l="0.08,0.13,0.18,0.23,0.27450980392156865,                 0.4215686274509804,                 0.4666666666666667,0.503921568627451,0.5529411764705883,                 0.6274509803921569,0.6745098039215687,0.7705882352941176,                 0.892156862745098,0.9568627450980391" s="1,1,1,1,1,0.7023255813953488,0.6638655462184874,                 0.6521739130434782,0.7719298245614035,0.8315789473684211,                 0.6867469879518071,0.7264957264957265,0.8181818181818182,                 0.8181818181818189" />
+        <palette h="0.88,0.888,0.897,0.9052287581699346,0.9112021857923498,                 0.9270152505446624,0.9343137254901961,0.9391534391534391,                 0.9437984496124031,0.943661971830986,0.9438943894389439,                 0.9426229508196722,0.9444444444444444" l="0.08,0.12,0.16,0.2,0.29411764705882354,                 0.3784313725490196,0.42745098039215684,0.4764705882352941,                 0.5882352941176471,0.6627450980392157,0.7588235294117647,                 0.8529411764705882,0.9411764705882353" s="1,1,1,1,0.8133333333333332,0.7927461139896375,                 0.7798165137614679,0.7777777777777779,0.8190476190476191,                 0.8255813953488372,0.8211382113821142,0.8133333333333336,                 0.8000000000000006" />
+        <palette h="0.669,0.680,0.6884057971014492,0.6974789915966387,                 0.7079889807162534,0.7154471544715447,0.7217741935483872,                 0.7274143302180687,0.7272727272727273,0.7258064516129031,                 0.7252252252252251,0.7333333333333333" l="0.12,0.16,0.2196078431372549,0.33921568627450976,                 0.39019607843137255,0.4176470588235294,0.45098039215686275,                 0.5509803921568628,0.6313725490196078,0.7372549019607844,                 0.8411764705882353,0.9352941176470588" s="0.81,0.81,0.8214285714285715,0.6878612716763006,                 0.6080402010050251,0.5774647887323943,0.5391304347826086,                 0.46724890829694316,0.4680851063829788,0.462686567164179,                 0.45679012345678977,0.4545454545454551" />
+        <palette h="0.6470588235294118,0.6516666666666667,0.6464174454828661,                 0.6441441441441442,0.6432748538011696,0.6416666666666667,                 0.6402439024390243,0.6412429378531074,0.6435185185185186,                 0.6428571428571429" l="0.16470588235294117,0.2980392156862745,0.36666666666666664,                 0.40588235294117647,0.44705882352941173,                 0.5568627450980392,0.6352941176470588,0.7392156862745098,                 0.8431372549019608,0.9372549019607843" s="0.8095238095238095,0.6578947368421053,0.5721925133689839,                 0.5362318840579711,0.5,0.4424778761061947,0.44086021505376327,                 0.44360902255639095,0.4499999999999997,0.4375000000000006" />
+        <palette h="0.469,0.46732026143790845,0.4718614718614719,                 0.4793650793650794,0.48071625344352614,0.4829683698296837,                 0.484375,0.4841269841269842,0.48444444444444457,                 0.48518518518518516,0.4907407407407408" l="0.07,0.1,0.15098039215686274,0.20588235294117646,                 0.2372549019607843,0.26862745098039215,0.4,0.5078431372549019,                 0.6490196078431372,0.7862745098039216,0.9137254901960784" s="1,1,1,1,1,1,0.6274509803921569,0.41832669322709176,                 0.41899441340782106,0.4128440366972478,0.4090909090909088" />
+        <palette h="0.542,0.5444444444444444,0.5555555555555556,                 0.5555555555555556,0.553763440860215,0.5526315789473684,                 0.5555555555555556,0.5555555555555555,0.5555555555555556,                 0.5512820512820514,0.5666666666666667" l="0.05,0.1196078431372549,0.1843137254901961,                 0.2627450980392157,                 0.33137254901960783,0.403921568627451,0.5411764705882354,                 0.6235294117647059,0.7313725490196079,0.8372549019607843,                 0.9352941176470588" s="0.25,0.24590163934426232,0.19148936170212766,                 0.1791044776119403,0.18343195266272191,0.18446601941747576,                 0.1538461538461539,0.15625000000000003,0.15328467153284678,                 0.15662650602409653,0.151515151515151" />
+        <palette h="0.022222222222222223,0.02469135802469136,0.031249999999999997,                 0.03947368421052631,0.04166666666666668,                 0.043650793650793655,0.04411764705882352,0.04166666666666652,                 0.04444444444444459,0.05555555555555529" l="0.08823529411764705,0.19019607843137254,0.2431372549019608,                 0.2901960784313725,0.3411764705882353,0.47058823529411764,                 0.5647058823529412,0.6901960784313725,0.8137254901960784,                 0.9254901960784314" s="0.33333333333333337,0.2783505154639175,0.2580645161290323,                 0.25675675675675674,0.2528735632183908,0.17500000000000002,                 0.15315315315315312,0.15189873417721522,                 0.15789473684210534,0.15789473684210542" />
+        <palette h="0.027,0.03,0.038,0.044,0.050884955752212385,                 0.07254901960784313,0.0934640522875817,                 0.10457516339869281,0.11699346405228758,                 0.1255813953488372,0.1268939393939394,0.12533333333333332,                 0.12500000000000003,0.12777777777777777" l="0.25,0.3,0.35,0.4,0.44313725490196076,0.5,0.5,0.5,                 0.5,0.5784313725490196,                 0.6549019607843137,0.7549019607843137,0.8509803921568627,                 0.9411764705882353" s="1,1,1,1,1,1,1,1,1,1,1,1,1,1" />
+    </palettes>
+    <blacklist>
+        <range h="0, 20" l="0.21, 0.79" s="0.7, 1" />
+        <range h="0, 20" l="0.355, 0.653" s="0.3, 0.7" />
+        <range h="20, 40" l="0.28, 0.643" s="0.7, 1" />
+        <range h="20, 40" l="0.414, 0.561" s="0.3, 0.7" />
+        <range h="20, 40" l="0.343, 0.584" s="0, 3" />
+        <range h="40, 60" l="0.173, 0.349" s="0.7, 1" />
+        <range h="40, 60" l="0.233, 0.427" s="0.3, 0.7" />
+        <range h="40, 60" l="0.231, 0.484" s="0, 0.3" />
+        <range h="60, 80" l="0.488, 0.737" s="0.7, 1" />
+        <range h="60, 80" l="0.673, 0.837" s="0.3, 0.7" />
+        <range h="80, 100" l="0.469, 0.61" s="0.7, 1" />
+        <range h="100, 120" l="0.388, 0.612" s="0.7, 1" />
+        <range h="100, 120" l="0.424, 0.541" s="0.3, 0.7" />
+        <range h="120, 140" l="0.375, 0.52" s="0.7, 1" />
+        <range h="120, 140" l="0.435, 0.524" s="0.3, 0.7" />
+        <range h="140, 160" l="0.496, 0.641" s="0.7, 1" />
+        <range h="160, 180" l="0.496, 0.567" s="0.7, 1" />
+        <range h="180, 200" l="0.52, 0.729" s="0.7, 1" />
+        <range h="220, 240" l="0.396, 0.571" s="0.7, 1" />
+        <range h="220, 240" l="0.425, 0.551" s="0.3, 0.7" />
+        <range h="240, 260" l="0.418, 0.639" s="0.7, 1" />
+        <range h="220, 240" l="0.441, 0.576" s="0.3, 0.7" />
+        <range h="260, 280" l="0.461, 0.553" s="0.3, 1" />
+        <range h="300, 320" l="0.484, 0.588" s="0.7, 1" />
+        <range h="300, 320" l="0.48, 0.592" s="0.3, 0.7" />
+        <range h="320, 340" l="0.466, 0.629" s="0.7, 1" />
+        <range h="340, 360" l="0.437, 0.596" s="0.7, 1" />
+    </blacklist>
+</colorextraction>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/config_webview_packages.xml b/Moto/E5Plus/res/xml/config_webview_packages.xml
new file mode 100644
index 0000000..d79c74c
--- /dev/null
+++ b/Moto/E5Plus/res/xml/config_webview_packages.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<webviewproviders>
+    <webviewprovider availableByDefault="true" description="Chrome Stable" packageName="com.android.chrome" />
+    <webviewprovider availableByDefault="true" description="Google WebView" isFallback="true" packageName="com.google.android.webview" />
+    <webviewprovider description="Chrome Beta" packageName="com.chrome.beta">
+        <signature>MIIDwzCCAqugAwIBAgIJAOoj9MXoVhH6MA0GCSqGSIb3DQEBBQUAMHgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEUMBIGA1UEAwwLY2hyb21lX2JldGEwHhcNMTYwMjI5MTUxNTIzWhcNNDMwNzE3MTUxNTIzWjB4MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQxFDASBgNVBAMMC2Nocm9tZV9iZXRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo/wW27nRxVqGbFOyXr8jtv2pc2Ke8XMr6Sfs+3JK2licVaAljGFpLtWH4wUdb50w/QQSPALNLSSyuK/94rtp5Jjs4RSJI+whuewV/R6El+mFXBO3Ek5/op4UrOsR91IM4emvS67Ji2u8gp5EmttVgJtllFZCbtZLPmKuTaOkOB+EdWIxrYiHVEEaAcQpEHa9UgWUZ0bMfPj8j3F0w+Ak2ttmTjoFGLaZjuBAYwfdctN1b0sdLT9Lif45kMCb8QwPp0F9/ozs0rrTc+I6vnTS8kfFQfk7GIE4Hgm+cYQEHkIA6gLJxUVWvPZGdulAZw7wPt/neOkazHNZPcV4pYuNLQIDAQABo1AwTjAdBgNVHQ4EFgQU5t7dhcZfOSixRsiJ1E46JhzPlwowHwYDVR0jBBgwFoAU5t7dhcZfOSixRsiJ1E46JhzPlwowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAZO2jB8P1d8ki3KZILvp27a2VM3DInlp8I8UgG3gh7nBQfTrnZr5M1PL8eFHqX7MEvAiGCMTcrPklEhjtcHK/c7BcdeCWq6oL56UK3JTl33RxJcjmjrz3e3VI6ehRSm1feNAkMD0Nr2RWr2LCYheAEmwTPtluLOJS+i7WhnXJzBtg5UpUFEbdFYenqUbDzya+cUVp0197k7hUTs8/Hxs0wf79o/TZXzTBq9eYQkiITonRN8+5QCBl1XmZKV0IHkzGFES1RP+fTiZpIjZT+W4tasHgs9QTTks4CCpyHBAy+uy7tApe1AxCzihgecCfUN1hWIltKwGZS6EE0bu0OXPzaQ==</signature>
+    </webviewprovider>
+    <webviewprovider description="Chrome Dev" packageName="com.chrome.dev">
+        <signature>MIIDwTCCAqmgAwIBAgIJAOSN+O0cdii5MA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDETMBEGA1UEAwwKY2hyb21lX2RldjAeFw0xNjAyMjkxNzUwMDdaFw00MzA3MTcxNzUwMDdaMHcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDETMBEGA1UEAwwKY2hyb21lX2RldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOYPj6Y9rVt8xizSHDYjDEkDfFZAgSiZ9T6tevkQXsFyfaq3Gk3h2qssi29G6cTPJ2VXFKlVB71wSXv5p9/LEcDQPWQiO3Q2cLmgUXxyhJWXI3g96tPAhZQX2q6SC37ZQdiBR/raMO70DAkvCyBGtNplsvutzSE3oZ7LYfzB8vTbe7zCh3fDYSS/7xb3ZVvFqydHS40uVq1qqg1S80Pge7tW3pDGsPMZN7yA4yfmsvA1rbHm9N8t3Rc9hqzh6OxNAAgRB535YcsWL7iF+mpdFILXk3jLYT0nMvMnB83rsdgnRREjlGQYHl2mh8+6CqujsW/eICDq/LR6BYDyqHhk0ECAwEAAaNQME4wHQYDVR0OBBYEFKzsl07JglgpbeYDYGqsgqRDo+01MB8GA1UdIwQYMBaAFKzsl07JglgpbeYDYGqsgqRDo+01MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACka6SFF6xAcj8L8O6R36++E09DTiGZEjvKT8eIycgcQQ+p1WUmPb6M2EJpN6zvvSE62ussmXdzf8rIyc0JXA8jbViZt62Y39epNENFxPTLN9QzXlT+w8AW73Ka3cnbOuL5EgoDl8fM79WVlARY3X+wB/jGNrkiGIdRm2IZIeAodWgC2mtXMiferyYBKz2/F2bhnU6DwgCbegS8trFjEWviijWdJ+lBdobn7LRc3orZCtHl8UyvRDi7cye3sK9y3BM39k0g20F21wTNHAonnvL6zbuNgpd+UEsVxDpOeWrEdBFN7Md0CI2wnu8eA8ljJD45v0WWMEoxsIi131g5piNM=</signature>
+    </webviewprovider>
+    <webviewprovider description="Chrome Canary" packageName="com.chrome.canary">
+        <signature>MIIDxzCCAq+gAwIBAgIJAML7APITsgV7MA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEWMBQGA1UEAwwNY2hyb21lX2NhbmFyeTAeFw0xNjAyMjkxOTA5MDdaFw00MzA3MTcxOTA5MDdaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEWMBQGA1UEAwwNY2hyb21lX2NhbmFyeTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXfeAoZlr0ya1HBzIfAz/nLLjpPJeAPvuX5dueaxmiQgv2hNG22acriFuiiJI6TU0t8AIVJD5Ifbc4OOuA0zeFhdzWWGnmTRH6x27WI7bzOKnAqOvv21ZBmE9i8Vo++K13xWdTs3qVn1bn9oUONxFu0wKDzXYZhoj1Jom0RZGjXm16xuPlEuOzMcjiNBDoYuxPAXkMcK/G1gP4P4nAV8Rd/GGIjKRS/SUtcShhoAMOQhs4WIEkUrvEVRwhBDIbpM87oFbCVdBH38r0XS6F6CdhPJsKFhoEfq4c01HZqNmDpCPA8AAcCuSWqmXoTIqs7OqkWgduE2bInbWU7WMaTl+kCAwEAAaNQME4wHQYDVR0OBBYEFB/AsC4iPAqaLoNytNSx29qByI7+MB8GA1UdIwQYMBaAFB/AsC4iPAqaLoNytNSx29qByI7+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMb2Td3ro/+MGVnCPAbwBSOZMVLUKGqt6zr8CShW9mtFHnmy29EaWSYYAj1M4+6Vpkq85NsgBEck7rnUjV8A3Q0NKdTys1KRKJqVvQRBN6SwqQenSf/abxQCa8Z+69rh+3BkIU1HLtu5lrMDZwon5H91L5mpORn6vItd20uW132lwSDeUEW2CHslTrodoFuTUcSUlRiq/URfUH3baO1QHXkxpQwrBPKL5deJfcZnxh5MAtAGSQL7gHvayEFlDppETXdDO7vgGTH2dEK2TjKWALbGiKkxSqjRyTNt4/FOj10TqNRdUamj+ydVJgzGQ8bki4Vc6NnKm/r4asusxapkVR4=</signature>
+    </webviewprovider>
+    <webviewprovider description="Chrome Debug" packageName="com.google.android.apps.chrome" />
+</webviewproviders>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/default_zen_mode_config.xml b/Moto/E5Plus/res/xml/default_zen_mode_config.xml
new file mode 100644
index 0000000..7e190aa
--- /dev/null
+++ b/Moto/E5Plus/res/xml/default_zen_mode_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<zen version="2">
+    <allow calls="true" events="true" messages="false" reminders="true" />
+</zen>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/global_keys.xml b/Moto/E5Plus/res/xml/global_keys.xml
new file mode 100644
index 0000000..3b10dec
--- /dev/null
+++ b/Moto/E5Plus/res/xml/global_keys.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<global_keys version="1" />
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/power_profile.xml b/Moto/E5Plus/res/xml/power_profile.xml
new file mode 100644
index 0000000..e00f2f0
--- /dev/null
+++ b/Moto/E5Plus/res/xml/power_profile.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="none">0</item>
+    <item name="screen.on">79.469</item>
+    <item name="screen.full">187.191</item>
+    <item name="wifi.on">0.632</item>
+    <item name="wifi.active">70.226</item>
+    <item name="wifi.scan">48.42</item>
+    <item name="camera.flashlight">103.532</item>
+    <item name="camera.avg">443.782</item>
+    <item name="gps.on">75.64</item>
+    <item name="radio.active">386.311</item>
+    <item name="radio.scanning">32.937</item>
+    <array name="radio.on">
+        <value>30.1</value>
+        <value>30</value>
+        <value>25</value>
+        <value>20</value>
+        <value>15</value>
+        <value>10</value>
+        <value>5</value>
+        <value>1.3</value>
+    </array>
+    <array name="cpu.clusters.cores">
+        <value>4</value>
+        <value>4</value>
+    </array>
+    <array name="cpu.speeds.cluster0">
+        <value>960000</value>
+        <value>1094400</value>
+        <value>1209600</value>
+        <value>1248000</value>
+        <value>1344000</value>
+        <value>1401000</value>
+    </array>
+    <array name="cpu.speeds.cluster1">
+        <value>768000</value>
+        <value>902400</value>
+        <value>998400</value>
+        <value>1094400</value>
+    </array>
+    <array name="cpu.active.cluster0">
+        <value>118.434</value>
+        <value>177.981</value>
+        <value>218.685</value>
+        <value>227.246</value>
+        <value>255.368</value>
+        <value>292.237</value>
+    </array>
+    <array name="cpu.active.cluster0">
+        <value>145.062</value>
+        <value>178.358</value>
+        <value>179.853</value>
+        <value>182.287</value>
+    </array>
+    <item name="cpu.idle">3.663</item>
+    <item name="cpu.awake">1.719</item>
+    <item name="battery.capacity">5000</item>
+</device>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/sms_7bit_translation_table.xml b/Moto/E5Plus/res/xml/sms_7bit_translation_table.xml
new file mode 100644
index 0000000..6016db4
--- /dev/null
+++ b/Moto/E5Plus/res/xml/sms_7bit_translation_table.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SmsEnforce7BitTranslationTable>
+    <TranslationType Type="common">
+        <Character from="0x000000C1" to="0x00000041" />
+        <Character from="0x000000C2" to="0x00000041" />
+        <Character from="0x000000C3" to="0x00000041" />
+        <Character from="0x000000CA" to="0x00000045" />
+        <Character from="0x000000CB" to="0x00000045" />
+        <Character from="0x000000CD" to="0x00000049" />
+        <Character from="0x000000CE" to="0x00000049" />
+        <Character from="0x000000CF" to="0x00000049" />
+        <Character from="0x000000D3" to="0x0000004F" />
+        <Character from="0x000000D4" to="0x0000004F" />
+        <Character from="0x000000D5" to="0x0000004F" />
+        <Character from="0x000000D7" to="0x00000078" />
+        <Character from="0x000000DA" to="0x00000055" />
+        <Character from="0x000000DB" to="0x00000055" />
+        <Character from="0x000000E1" to="0x00000061" />
+        <Character from="0x000000E2" to="0x00000061" />
+        <Character from="0x000000E3" to="0x00000061" />
+        <Character from="0x000000EA" to="0x00000065" />
+        <Character from="0x000000EB" to="0x00000065" />
+        <Character from="0x000000ED" to="0x00000069" />
+        <Character from="0x000000EE" to="0x00000069" />
+        <Character from="0x000000EF" to="0x00000069" />
+        <Character from="0x000000F3" to="0x0000006F" />
+        <Character from="0x000000F4" to="0x0000006F" />
+        <Character from="0x000000F5" to="0x0000006F" />
+        <Character from="0x000000FA" to="0x00000075" />
+        <Character from="0x000000FB" to="0x00000075" />
+        <Character from="0x00000104" to="0x00000041" />
+        <Character from="0x00000105" to="0x00000061" />
+        <Character from="0x00000106" to="0x00000043" />
+        <Character from="0x00000107" to="0x00000063" />
+        <Character from="0x00000110" to="0x00000044" />
+        <Character from="0x00000118" to="0x00000045" />
+        <Character from="0x00000119" to="0x00000065" />
+        <Character from="0x0000011E" to="0x00000047" />
+        <Character from="0x0000011F" to="0x00000067" />
+        <Character from="0x00000131" to="0x00000069" />
+        <Character from="0x00000139" to="0x0000004C" />
+        <Character from="0x0000013A" to="0x0000006C" />
+        <Character from="0x00000141" to="0x0000004C" />
+        <Character from="0x00000142" to="0x0000006C" />
+        <Character from="0x00000143" to="0x0000004E" />
+        <Character from="0x00000144" to="0x0000006E" />
+        <Character from="0x00000150" to="0x0000004F" />
+        <Character from="0x00000151" to="0x0000006F" />
+        <Character from="0x0000015A" to="0x00000053" />
+        <Character from="0x0000015B" to="0x00000073" />
+        <Character from="0x0000015E" to="0x00000053" />
+        <Character from="0x0000015F" to="0x00000073" />
+        <Character from="0x00000170" to="0x00000055" />
+        <Character from="0x00000171" to="0x00000075" />
+        <Character from="0x00000179" to="0x0000005A" />
+        <Character from="0x0000017A" to="0x0000007A" />
+        <Character from="0x0000017B" to="0x0000005A" />
+        <Character from="0x0000017C" to="0x0000007A" />
+        <Character from="0x00000386" to="0x00000041" />
+        <Character from="0x00000388" to="0x00000045" />
+        <Character from="0x00000389" to="0x00000048" />
+        <Character from="0x0000038A" to="0x00000049" />
+        <Character from="0x0000038C" to="0x0000004F" />
+        <Character from="0x0000038E" to="0x00000059" />
+        <Character from="0x0000038F" to="0x000003A9" />
+        <Character from="0x00000390" to="0x00000049" />
+        <Character from="0x00000391" to="0x00000041" />
+        <Character from="0x00000392" to="0x00000042" />
+        <Character from="0x00000395" to="0x00000045" />
+        <Character from="0x00000396" to="0x0000005A" />
+        <Character from="0x00000397" to="0x00000048" />
+        <Character from="0x00000399" to="0x00000049" />
+        <Character from="0x0000039A" to="0x0000004B" />
+        <Character from="0x0000039C" to="0x0000004D" />
+        <Character from="0x0000039D" to="0x0000004E" />
+        <Character from="0x0000039F" to="0x0000004F" />
+        <Character from="0x000003A1" to="0x00000050" />
+        <Character from="0x000003A4" to="0x00000054" />
+        <Character from="0x000003A5" to="0x00000059" />
+        <Character from="0x000003A7" to="0x00000058" />
+        <Character from="0x000003AA" to="0x00000049" />
+        <Character from="0x000003AB" to="0x00000059" />
+        <Character from="0x000003AC" to="0x00000041" />
+        <Character from="0x000003AD" to="0x00000045" />
+        <Character from="0x000003AE" to="0x00000048" />
+        <Character from="0x000003AF" to="0x00000049" />
+        <Character from="0x000003B0" to="0x00000059" />
+        <Character from="0x000003B1" to="0x00000041" />
+        <Character from="0x000003B2" to="0x00000042" />
+        <Character from="0x000003B3" to="0x00000393" />
+        <Character from="0x000003B4" to="0x00000394" />
+        <Character from="0x000003B5" to="0x00000045" />
+        <Character from="0x000003B6" to="0x0000005A" />
+        <Character from="0x000003B7" to="0x00000048" />
+        <Character from="0x000003B8" to="0x00000398" />
+        <Character from="0x000003B9" to="0x00000049" />
+        <Character from="0x000003BA" to="0x0000004B" />
+        <Character from="0x000003BB" to="0x0000039B" />
+        <Character from="0x000003BC" to="0x0000004D" />
+        <Character from="0x000003BD" to="0x0000004E" />
+        <Character from="0x000003BE" to="0x0000039E" />
+        <Character from="0x000003BF" to="0x0000004F" />
+        <Character from="0x000003C0" to="0x000003A0" />
+        <Character from="0x000003C1" to="0x00000050" />
+        <Character from="0x000003C2" to="0x000003A3" />
+        <Character from="0x000003C3" to="0x000003A3" />
+        <Character from="0x000003C4" to="0x00000054" />
+        <Character from="0x000003C5" to="0x00000059" />
+        <Character from="0x000003C6" to="0x000003A6" />
+        <Character from="0x000003C7" to="0x00000058" />
+        <Character from="0x000003C8" to="0x000003A8" />
+        <Character from="0x000003C9" to="0x000003A9" />
+        <Character from="0x000003CA" to="0x00000049" />
+        <Character from="0x000003CB" to="0x00000059" />
+        <Character from="0x000003CC" to="0x0000004F" />
+        <Character from="0x000003CD" to="0x00000059" />
+        <Character from="0x000003CE" to="0x000003A9" />
+        <Character from="0x00002010" to="0x0000002D" />
+        <Character from="0x000000D0" to="0x00000044" />
+        <Character from="0x000000DD" to="0x00000059" />
+        <Character from="0x000000FD" to="0x00000079" />
+        <Character from="0x000000FF" to="0x00000079" />
+        <Character from="0x00000100" to="0x00000041" />
+        <Character from="0x00000101" to="0x00000061" />
+        <Character from="0x0000010C" to="0x00000043" />
+        <Character from="0x0000010D" to="0x00000063" />
+        <Character from="0x0000010E" to="0x00000044" />
+        <Character from="0x0000010F" to="0x00000064" />
+        <Character from="0x00000111" to="0x00000064" />
+        <Character from="0x00000112" to="0x00000045" />
+        <Character from="0x00000113" to="0x00000065" />
+        <Character from="0x0000011A" to="0x00000045" />
+        <Character from="0x0000011B" to="0x00000065" />
+        <Character from="0x0000012A" to="0x00000049" />
+        <Character from="0x0000012B" to="0x00000069" />
+        <Character from="0x00000132" to="0x0000004A" />
+        <Character from="0x00000133" to="0x0000006A" />
+        <Character from="0x0000013D" to="0x0000004C" />
+        <Character from="0x0000013E" to="0x0000006C" />
+        <Character from="0x00000147" to="0x0000004E" />
+        <Character from="0x00000148" to="0x0000006E" />
+        <Character from="0x0000014C" to="0x0000004F" />
+        <Character from="0x0000014D" to="0x0000006F" />
+        <Character from="0x00000152" to="0x0000004F" />
+        <Character from="0x00000153" to="0x0000006F" />
+        <Character from="0x00000154" to="0x00000052" />
+        <Character from="0x00000155" to="0x00000072" />
+        <Character from="0x00000158" to="0x00000052" />
+        <Character from="0x00000159" to="0x00000072" />
+        <Character from="0x00000160" to="0x00000053" />
+        <Character from="0x00000161" to="0x00000073" />
+        <Character from="0x00000164" to="0x00000054" />
+        <Character from="0x00000165" to="0x00000074" />
+        <Character from="0x0000016A" to="0x00000055" />
+        <Character from="0x0000016B" to="0x00000075" />
+        <Character from="0x0000016E" to="0x00000055" />
+        <Character from="0x0000016F" to="0x00000075" />
+        <Character from="0x00000178" to="0x00000079" />
+        <Character from="0x0000017D" to="0x0000005A" />
+        <Character from="0x0000017E" to="0x0000007A" />
+        <Character from="0x00000060" to="0x00000027" />
+        <Character from="0x000000A9" to="0x00000063" />
+        <Character from="0x000000AB" to="0x0000003C" />
+        <Character from="0x000000AE" to="0x00000052" />
+        <Character from="0x000000AF" to="0x0000002D" />
+        <Character from="0x000000B0" to="0x0000006F" />
+        <Character from="0x000000BB" to="0x0000003E" />
+        <Character from="0x000002DD" to="0x00000022" />
+        <Character from="0x00002013" to="0x0000002D" />
+        <Character from="0x00002014" to="0x0000002D" />
+        <Character from="0x0000201A" to="0x00000027" />
+        <Character from="0x0000201C" to="0x00000022" />
+        <Character from="0x0000201D" to="0x00000022" />
+        <Character from="0x0000201E" to="0x00000022" />
+        <Character from="0x00002020" to="0x0000002B" />
+        <Character from="0x00002021" to="0x0000002B" />
+        <Character from="0x00002022" to="0x0000002E" />
+        <Character from="0x00002026" to="0x0000002E" />
+        <Character from="0x00002030" to="0x00000025" />
+        <Character from="0x00002039" to="0x0000003C" />
+        <Character from="0x0000203A" to="0x0000003E" />
+        <Character from="0x000020A3" to="0x00000023" />
+        <Character from="0x000020A4" to="0x00000023" />
+        <Character from="0x000020B1" to="0x00000023" />
+        <Character from="0x00002264" to="0x0000003C" />
+        <Character from="0x00002265" to="0x0000003E" />
+        <Character from="0x00000102" to="0x00000041" />
+        <Character from="0x00000103" to="0x00000061" />
+        <Character from="0x00000162" to="0x00000054" />
+        <Character from="0x00000163" to="0x00000074" />
+    </TranslationType>
+    <TranslationType Type="gsm">
+        <Character from="0x000000C0" to="0x000000E0" />
+        <Character from="0x000000C8" to="0x000000E8" />
+        <Character from="0x000000CC" to="0x000000EC" />
+        <Character from="0x000000D2" to="0x000000F2" />
+        <Character from="0x000000D9" to="0x000000F9" />
+        <Character from="0x000000E7" to="0x000000C7" />
+        <Character from="0x000000A2" to="0x0000003F" />
+        <Character from="0x000000A6" to="0x0000003F" />
+        <Character from="0x000000B1" to="0x0000003F" />
+        <Character from="0x000000B6" to="0x0000003F" />
+        <Character from="0x000000F7" to="0x0000003F" />
+        <Character from="0x00000192" to="0x0000003F" />
+        <Character from="0x00002122" to="0x0000003F" />
+        <Character from="0x0000221A" to="0x0000003F" />
+        <Character from="0x0000221E" to="0x0000003F" />
+        <Character from="0x00002248" to="0x0000003F" />
+        <Character from="0x00002260" to="0x0000003F" />
+    </TranslationType>
+    <TranslationType Type="cdma">
+        <Character from="0x000000A1" to="0x00000021" />
+        <Character from="0x000000BF" to="0x00000020" />
+        <Character from="0x000000C0" to="0x00000041" />
+        <Character from="0x000000C4" to="0x00000041" />
+        <Character from="0x000000C5" to="0x00000041" />
+        <Character from="0x000000C6" to="0x00000020" />
+        <Character from="0x000000C7" to="0x00000043" />
+        <Character from="0x000000C8" to="0x00000045" />
+        <Character from="0x000000C9" to="0x00000045" />
+        <Character from="0x000000CC" to="0x00000049" />
+        <Character from="0x000000D1" to="0x0000004E" />
+        <Character from="0x000000D2" to="0x0000004F" />
+        <Character from="0x000000D6" to="0x0000004F" />
+        <Character from="0x000000D8" to="0x00000020" />
+        <Character from="0x000000D9" to="0x00000055" />
+        <Character from="0x000000DC" to="0x00000055" />
+        <Character from="0x000000DD" to="0x00000059" />
+        <Character from="0x000000DF" to="0x00000020" />
+        <Character from="0x000000E0" to="0x00000061" />
+        <Character from="0x000000E4" to="0x00000061" />
+        <Character from="0x000000E5" to="0x00000061" />
+        <Character from="0x000000E6" to="0x00000020" />
+        <Character from="0x000000E7" to="0x00000063" />
+        <Character from="0x000000E8" to="0x00000065" />
+        <Character from="0x000000E9" to="0x00000065" />
+        <Character from="0x000000EC" to="0x00000069" />
+        <Character from="0x000000F1" to="0x0000006F" />
+        <Character from="0x000000F2" to="0x0000006F" />
+        <Character from="0x000000F6" to="0x0000006F" />
+        <Character from="0x000000F8" to="0x00000020" />
+        <Character from="0x000000F9" to="0x00000075" />
+        <Character from="0x000000FC" to="0x00000075" />
+        <Character from="0x000000A2" to="0x00000023" />
+        <Character from="0x000000A6" to="0x00000020" />
+        <Character from="0x000000B1" to="0x00000020" />
+        <Character from="0x000000B6" to="0x00000020" />
+        <Character from="0x000000F7" to="0x00000020" />
+        <Character from="0x00000192" to="0x00000020" />
+        <Character from="0x00002122" to="0x00000020" />
+        <Character from="0x0000221A" to="0x00000020" />
+        <Character from="0x0000221E" to="0x00000020" />
+        <Character from="0x00002248" to="0x00000020" />
+        <Character from="0x00002260" to="0x00000020" />
+    </TranslationType>
+</SmsEnforce7BitTranslationTable>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/sms_short_codes.xml b/Moto/E5Plus/res/xml/sms_short_codes.xml
new file mode 100644
index 0000000..9ea9938
--- /dev/null
+++ b/Moto/E5Plus/res/xml/sms_short_codes.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcodes>
+    <shortcode country="ae" free="3214|1017" />
+    <shortcode country="al" pattern="\\d{5}" premium="15191|55[56]00" />
+    <shortcode country="am" free="10[123]" pattern="\\d{3,4}" premium="11[2456]1|3024" />
+    <shortcode country="at" free="116\\d{3}" pattern="11\\d{4}" premium="09.*" />
+    <shortcode country="au" pattern="19(?:\\d{4}|\\d{6})" premium="19998882|19944444" />
+    <shortcode country="az" pattern="\\d{4,5}" premium="330[12]|87744|901[234]|93(?:94|101)|9426|9525" />
+    <shortcode country="be" free="8\\d{3}|116\\d{3}" premium="\\d{4}" />
+    <shortcode country="bg" free="116\\d{3}" pattern="\\d{4,5}" premium="18(?:16|423)|19(?:1[56]|35)" />
+    <shortcode country="bh" free="81181" pattern="\\d{1,5}" />
+    <shortcode country="br" free="6000[012]\\d" pattern="\\d{1,5}" />
+    <shortcode country="by" pattern="\\d{4}" premium="3336|4161|444[4689]|501[34]|7781" />
+    <shortcode country="ca" pattern="\\d{5,6}" premium="60999|88188|43030" />
+    <shortcode country="ch" free="98765" pattern="[2-9]\\d{2,4}" premium="543|83111|30118" />
+    <shortcode country="cn" free="1065.*" premium="1066.*" />
+    <shortcode country="cy" free="116\\d{3}" pattern="\\d{4,6}" premium="7510" />
+    <shortcode country="cz" free="116\\d{3}" premium="9\\d{6,7}" />
+    <shortcode country="de" free="116\\d{3}|81214|81215|47529|70296|83782" pattern="\\d{4,5}|1232\\d{3}" premium="11(?:111|833)|1232(?:013|021|060|075|286|358)|118(?:44|80|86)|20[25]00|220(?:21|22|88|99)|221(?:14|21)|223(?:44|53|77)|224[13]0|225(?:20|59|90)|226(?:06|10|20|26|30|40|56|70)|227(?:07|33|39|66|76|78|79|88|99)|228(?:08|11|66|77)|23300|30030|3[12347]000|330(?:33|55|66)|33(?:233|331|366|533)|34(?:34|567)|37000|40(?:040|123|444|[3568]00)|41(?:010|414)|44(?:000|044|344|44[24]|544)|50005|50100|50123|50555|51000|52(?:255|783)|54(?:100|2542)|55(?:077|[24]00|222|333|55|[12369]55)|56(?:789|886)|60800|6[13]000|66(?:[12348]66|566|766|777|88|999)|68888|70(?:07|123|777)|76766|77(?:007|070|222|444|[567]77)|80(?:008|123|888)|82(?:002|[378]00|323|444|472|474|488|727)|83(?:005|[169]00|333|830)|84(?:141|300|32[34]|343|488|499|777|888)|85888|86(?:188|566|640|644|650|677|868|888)|870[24]9|871(?:23|[49]9)|872(?:1[0-8]|49|99)|87499|875(?:49|55|99)|876(?:0[1367]|1[1245678]|54|99)|877(?:00|99)|878(?:15|25|3[567]|8[12])|87999|880(?:08|44|55|77|99)|88688|888(?:03|10|8|89)|8899|90(?:009|999)|99999" />
+    <shortcode country="dk" free="116\\d{3}|4665" pattern="\\d{4,5}" premium="1\\d{3}" />
+    <shortcode country="ee" free="116\\d{3}|95034" pattern="1\\d{2,4}" premium="90\\d{5}|15330|1701[0-3]" />
+    <shortcode country="es" free="116\\d{3}|22791|222145" premium="[23][57]\\d{3}|280\\d{2}|[79]9[57]\\d{3}" />
+    <shortcode country="fi" free="116\\d{3}|14789" pattern="\\d{5,6}" premium="0600.*|0700.*|171(?:59|63)" />
+    <shortcode country="fr" free="3\\d{4}|116\\d{3}|21101" premium="[4-8]\\d{4}" />
+    <shortcode country="gb" free="116\\d{3}|2020|35890|61002|61202|887|83669|34664|40406" pattern="\\d{4,6}" premium="[5-8]\\d{4}" />
+    <shortcode country="ge" pattern="\\d{4}" premium="801[234]|888[239]" />
+    <shortcode country="gr" free="116\\d{3}|12115" pattern="\\d{5}" premium="54\\d{3}|19[0-5]\\d{2}" />
+    <shortcode country="hu" free="116\\d{3}" pattern="[01](?:\\d{3}|\\d{9})" premium="0691227910|1784" />
+    <shortcode country="in" free="59336" pattern="\\d{1,5}" />
+    <shortcode country="id" free="99477|6006|46645" pattern="\\d{1,5}" />
+    <shortcode country="ie" free="50\\d{3}|116\\d{3}" pattern="\\d{5}" premium="5[3-9]\\d{3}" standard="5[12]\\d{3}" />
+    <shortcode country="il" pattern="\\d{4}" premium="4422|4545" />
+    <shortcode country="it" free="116\\d{3}|4112503" pattern="\\d{5}" premium="4\\d{4}" standard="43\\d{3}" />
+    <shortcode country="jp" free="8083" />
+    <shortcode country="kg" pattern="\\d{4}" premium="415[2367]|444[69]" />
+    <shortcode country="kr" free="\\*9712|\\*9090|##900" pattern="\\d{4,7}" />
+    <shortcode country="kz" pattern="\\d{4}" premium="335[02]|4161|444[469]|77[2359]0|8444|919[3-5]|968[2-5]" />
+    <shortcode country="kw" free="1378|50420|94006" pattern="\\d{1,5}" />
+    <shortcode country="lt" free="116\\d{3}" pattern="\\d{3,5}" premium="13[89]1|1394|16[34]5" />
+    <shortcode country="lu" free="116\\d{3}" premium="6\\d{4}" />
+    <shortcode country="lv" free="116\\d{3}" pattern="\\d{4}" premium="18(?:19|63|7[1-4])" />
+    <shortcode country="mx" free="46645|5050|26259|50025|50052" pattern="\\d{4,5}" premium="53035|7766" />
+    <shortcode country="my" free="22099" pattern="\\d{5}" premium="32298|33776" />
+    <shortcode country="nl" free="116\\d{3}|2223|6225" pattern="\\d{4}" premium="4466|5040" />
+    <shortcode country="no" pattern="\\d{4,5}" premium="2201|222[67]" />
+    <shortcode country="nz" pattern="\\d{3,4}" premium="3903|8995|4679" />
+    <shortcode country="ph" free="2147|5495|5496" />
+    <shortcode country="pl" free="116\\d{3}|8012|80921" pattern="\\d{4,5}" premium="74240|79(?:10|866)|92525" />
+    <shortcode country="pt" free="116\\d{3}" premium="6[1289]\\d{3}" />
+    <shortcode country="qa" free="92451" pattern="\\d{1,5}" />
+    <shortcode country="ro" free="116\\d{3}|3654" pattern="\\d{4}" premium="12(?:63|66|88)|13(?:14|80)" />
+    <shortcode country="ru" pattern="\\d{4}" premium="1(?:1[56]1|899)|2(?:09[57]|322|47[46]|880|990)|3[589]33|4161|44(?:4[3-9]|81)|77(?:33|81)|8424" />
+    <shortcode country="sa" free="8145" />
+    <shortcode country="se" free="116\\d{3}" premium="72\\d{3}" />
+    <shortcode country="sg" pattern="7\\d{4}" premium="73800" standard="74688|70134" />
+    <shortcode country="si" free="116\\d{3}" pattern="\\d{4}" premium="[368]\\d{3}" />
+    <shortcode country="sk" free="116\\d{3}|8000" premium="\\d{4}" />
+    <shortcode country="th" free="4186001" />
+    <shortcode country="tj" pattern="\\d{4}" premium="11[3-7]1|4161|4333|444[689]" />
+    <shortcode country="tr" free="7529|5528" />
+    <shortcode country="ua" pattern="\\d{4}" premium="444[3-9]|70[579]4|7540" />
+    <shortcode country="us" free="122|87902|21696|24614|28003|30356|33669|40196|41064|41270|43753|44034|46645|52413|56139|57969|61785|66975|75136|76227|81398|83952|85140|86566|86799|95737|96684|99245" pattern="\\d{5,6}" premium="20433|21(?:344|472)|22715|23(?:333|847)|24(?:15|28)0|25209|27(?:449|606|663)|28498|305(?:00|83)|32(?:340|941)|33(?:166|786|849)|34746|35(?:182|564)|37975|38(?:135|146|254)|41(?:366|463)|42335|43(?:355|500)|44(?:578|711|811)|45814|46(?:157|173|327)|46666|47553|48(?:221|277|669)|50(?:844|920)|51(?:062|368)|52944|54(?:723|892)|55928|56483|57370|59(?:182|187|252|342)|60339|61(?:266|982)|62478|64(?:219|898)|65(?:108|500)|69(?:208|388)|70877|71851|72(?:078|087|465)|73(?:288|588|882|909|997)|74(?:034|332|815)|76426|79213|81946|83177|84(?:103|685)|85797|86(?:234|236|666)|89616|90(?:715|842|938)|91(?:362|958)|94719|95297|96(?:040|666|835|969)|97(?:142|294|688)|99(?:689|796|807)" standard="44567" />
+    <shortcode country="vn" free="5001|9055" pattern="\\d{1,5}" />
+</shortcodes>
\ No newline at end of file
diff --git a/Moto/E5Plus/res/xml/time_zones_by_country.xml b/Moto/E5Plus/res/xml/time_zones_by_country.xml
new file mode 100644
index 0000000..273239c
--- /dev/null
+++ b/Moto/E5Plus/res/xml/time_zones_by_country.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8"?>
+<timezones>
+    <timezone code="ad">Europe/Andorra</timezone>
+    <timezone code="ae">Asia/Dubai</timezone>
+    <timezone code="af">Asia/Kabul</timezone>
+    <timezone code="ag">America/Antigua</timezone>
+    <timezone code="ai">America/Anguilla</timezone>
+    <timezone code="al">Europe/Tirane</timezone>
+    <timezone code="am">Asia/Yerevan</timezone>
+    <timezone code="ao">Africa/Luanda</timezone>
+    <timezone code="aq">Antarctica/McMurdo</timezone>
+    <timezone code="aq">Antarctica/DumontDUrville</timezone>
+    <timezone code="aq">Antarctica/Casey</timezone>
+    <timezone code="aq">Antarctica/Davis</timezone>
+    <timezone code="aq">Antarctica/Mawson</timezone>
+    <timezone code="aq">Antarctica/Vostok</timezone>
+    <timezone code="aq">Antarctica/Syowa</timezone>
+    <timezone code="aq">Antarctica/Troll</timezone>
+    <timezone code="aq">Antarctica/Rothera</timezone>
+    <timezone code="aq">Antarctica/Palmer</timezone>
+    <timezone code="ar">America/Argentina/Buenos_Aires</timezone>
+    <timezone code="ar">America/Argentina/Cordoba</timezone>
+    <timezone code="ar">America/Argentina/Salta</timezone>
+    <timezone code="ar">America/Argentina/Jujuy</timezone>
+    <timezone code="ar">America/Argentina/Tucuman</timezone>
+    <timezone code="ar">America/Argentina/Catamarca</timezone>
+    <timezone code="ar">America/Argentina/La_Rioja</timezone>
+    <timezone code="ar">America/Argentina/San_Juan</timezone>
+    <timezone code="ar">America/Argentina/Mendoza</timezone>
+    <timezone code="ar">America/Argentina/San_Luis</timezone>
+    <timezone code="ar">America/Argentina/Rio_Gallegos</timezone>
+    <timezone code="ar">America/Argentina/Ushuaia</timezone>
+    <timezone code="as">Pacific/Pago_Pago</timezone>
+    <timezone code="at">Europe/Vienna</timezone>
+    <timezone code="au">Australia/Sydney</timezone>
+    <timezone code="au">Australia/Melbourne</timezone>
+    <timezone code="au">Australia/Brisbane</timezone>
+    <timezone code="au">Australia/Hobart</timezone>
+    <timezone code="au">Australia/Currie</timezone>
+    <timezone code="au">Australia/Lindeman</timezone>
+    <timezone code="au">Antarctica/Macquarie</timezone>
+    <timezone code="au">Australia/Lord_Howe</timezone>
+    <timezone code="au">Australia/Adelaide</timezone>
+    <timezone code="au">Australia/Broken_Hill</timezone>
+    <timezone code="au">Australia/Darwin</timezone>
+    <timezone code="au">Australia/Perth</timezone>
+    <timezone code="au">Australia/Eucla</timezone>
+    <timezone code="aw">America/Aruba</timezone>
+    <timezone code="ax">Europe/Mariehamn</timezone>
+    <timezone code="az">Asia/Baku</timezone>
+    <timezone code="ba">Europe/Sarajevo</timezone>
+    <timezone code="bb">America/Barbados</timezone>
+    <timezone code="bd">Asia/Dhaka</timezone>
+    <timezone code="be">Europe/Brussels</timezone>
+    <timezone code="bf">Africa/Ouagadougou</timezone>
+    <timezone code="bg">Europe/Sofia</timezone>
+    <timezone code="bh">Asia/Bahrain</timezone>
+    <timezone code="bi">Africa/Bujumbura</timezone>
+    <timezone code="bj">Africa/Porto-Novo</timezone>
+    <timezone code="bl">America/St_Barthelemy</timezone>
+    <timezone code="bm">Atlantic/Bermuda</timezone>
+    <timezone code="bn">Asia/Brunei</timezone>
+    <timezone code="bo">America/La_Paz</timezone>
+    <timezone code="bq">America/Kralendijk</timezone>
+    <timezone code="br">America/Noronha</timezone>
+    <timezone code="br">America/Sao_Paulo</timezone>
+    <timezone code="br">America/Belem</timezone>
+    <timezone code="br">America/Fortaleza</timezone>
+    <timezone code="br">America/Recife</timezone>
+    <timezone code="br">America/Araguaina</timezone>
+    <timezone code="br">America/Maceio</timezone>
+    <timezone code="br">America/Bahia</timezone>
+    <timezone code="br">America/Santarem</timezone>
+    <timezone code="br">America/Manaus</timezone>
+    <timezone code="br">America/Campo_Grande</timezone>
+    <timezone code="br">America/Cuiaba</timezone>
+    <timezone code="br">America/Porto_Velho</timezone>
+    <timezone code="br">America/Boa_Vista</timezone>
+    <timezone code="br">America/Eirunepe</timezone>
+    <timezone code="br">America/Rio_Branco</timezone>
+    <timezone code="bs">America/Nassau</timezone>
+    <timezone code="bt">Asia/Thimphu</timezone>
+    <timezone code="bw">Africa/Gaborone</timezone>
+    <timezone code="by">Europe/Minsk</timezone>
+    <timezone code="bz">America/Belize</timezone>
+    <timezone code="ca">America/St_Johns</timezone>
+    <timezone code="ca">America/Halifax</timezone>
+    <timezone code="ca">America/Glace_Bay</timezone>
+    <timezone code="ca">America/Moncton</timezone>
+    <timezone code="ca">America/Goose_Bay</timezone>
+    <timezone code="ca">America/Blanc-Sablon</timezone>
+    <timezone code="ca">America/Toronto</timezone>
+    <timezone code="ca">America/Nipigon</timezone>
+    <timezone code="ca">America/Thunder_Bay</timezone>
+    <timezone code="ca">America/Iqaluit</timezone>
+    <timezone code="ca">America/Pangnirtung</timezone>
+    <timezone code="ca">America/Atikokan</timezone>
+    <timezone code="ca">America/Winnipeg</timezone>
+    <timezone code="ca">America/Regina</timezone>
+    <timezone code="ca">America/Rankin_Inlet</timezone>
+    <timezone code="ca">America/Rainy_River</timezone>
+    <timezone code="ca">America/Swift_Current</timezone>
+    <timezone code="ca">America/Resolute</timezone>
+    <timezone code="ca">America/Edmonton</timezone>
+    <timezone code="ca">America/Cambridge_Bay</timezone>
+    <timezone code="ca">America/Yellowknife</timezone>
+    <timezone code="ca">America/Inuvik</timezone>
+    <timezone code="ca">America/Dawson_Creek</timezone>
+    <timezone code="ca">America/Creston</timezone>
+    <timezone code="ca">America/Fort_Nelson</timezone>
+    <timezone code="ca">America/Vancouver</timezone>
+    <timezone code="ca">America/Whitehorse</timezone>
+    <timezone code="ca">America/Dawson</timezone>
+    <timezone code="cc">Indian/Cocos</timezone>
+    <timezone code="cd">Africa/Lubumbashi</timezone>
+    <timezone code="cd">Africa/Kinshasa</timezone>
+    <timezone code="cf">Africa/Bangui</timezone>
+    <timezone code="cg">Africa/Brazzaville</timezone>
+    <timezone code="ch">Europe/Zurich</timezone>
+    <timezone code="ci">Africa/Abidjan</timezone>
+    <timezone code="ck">Pacific/Rarotonga</timezone>
+    <timezone code="cl">America/Punta_Arenas</timezone>
+    <timezone code="cl">America/Santiago</timezone>
+    <timezone code="cl">Pacific/Easter</timezone>
+    <timezone code="cm">Africa/Douala</timezone>
+    <timezone code="cn">Asia/Shanghai</timezone>
+    <timezone code="cn">Asia/Urumqi</timezone>
+    <timezone code="co">America/Bogota</timezone>
+    <timezone code="cr">America/Costa_Rica</timezone>
+    <timezone code="cu">America/Havana</timezone>
+    <timezone code="cv">Atlantic/Cape_Verde</timezone>
+    <timezone code="cw">America/Curacao</timezone>
+    <timezone code="cx">Indian/Christmas</timezone>
+    <timezone code="cy">Asia/Nicosia</timezone>
+    <timezone code="cy">Asia/Famagusta</timezone>
+    <timezone code="cz">Europe/Prague</timezone>
+    <timezone code="de">Europe/Berlin</timezone>
+    <timezone code="de">Europe/Busingen</timezone>
+    <timezone code="dj">Africa/Djibouti</timezone>
+    <timezone code="dk">Europe/Copenhagen</timezone>
+    <timezone code="dm">America/Dominica</timezone>
+    <timezone code="do">America/Santo_Domingo</timezone>
+    <timezone code="dz">Africa/Algiers</timezone>
+    <timezone code="ec">America/Guayaquil</timezone>
+    <timezone code="ec">Pacific/Galapagos</timezone>
+    <timezone code="ee">Europe/Tallinn</timezone>
+    <timezone code="eg">Africa/Cairo</timezone>
+    <timezone code="eh">Africa/El_Aaiun</timezone>
+    <timezone code="er">Africa/Asmara</timezone>
+    <timezone code="es">Europe/Madrid</timezone>
+    <timezone code="es">Africa/Ceuta</timezone>
+    <timezone code="es">Atlantic/Canary</timezone>
+    <timezone code="et">Africa/Addis_Ababa</timezone>
+    <timezone code="fi">Europe/Helsinki</timezone>
+    <timezone code="fj">Pacific/Fiji</timezone>
+    <timezone code="fk">Atlantic/Stanley</timezone>
+    <timezone code="fm">Pacific/Pohnpei</timezone>
+    <timezone code="fm">Pacific/Kosrae</timezone>
+    <timezone code="fm">Pacific/Chuuk</timezone>
+    <timezone code="fo">Atlantic/Faroe</timezone>
+    <timezone code="fr">Europe/Paris</timezone>
+    <timezone code="ga">Africa/Libreville</timezone>
+    <timezone code="gb">Europe/London</timezone>
+    <timezone code="gd">America/Grenada</timezone>
+    <timezone code="ge">Asia/Tbilisi</timezone>
+    <timezone code="gf">America/Cayenne</timezone>
+    <timezone code="gg">Europe/Guernsey</timezone>
+    <timezone code="gh">Africa/Accra</timezone>
+    <timezone code="gi">Europe/Gibraltar</timezone>
+    <timezone code="gl">America/Danmarkshavn</timezone>
+    <timezone code="gl">America/Scoresbysund</timezone>
+    <timezone code="gl">America/Godthab</timezone>
+    <timezone code="gl">America/Thule</timezone>
+    <timezone code="gm">Africa/Banjul</timezone>
+    <timezone code="gn">Africa/Conakry</timezone>
+    <timezone code="gp">America/Guadeloupe</timezone>
+    <timezone code="gq">Africa/Malabo</timezone>
+    <timezone code="gr">Europe/Athens</timezone>
+    <timezone code="gs">Atlantic/South_Georgia</timezone>
+    <timezone code="gt">America/Guatemala</timezone>
+    <timezone code="gu">Pacific/Guam</timezone>
+    <timezone code="gw">Africa/Bissau</timezone>
+    <timezone code="gy">America/Guyana</timezone>
+    <timezone code="hk">Asia/Hong_Kong</timezone>
+    <timezone code="hn">America/Tegucigalpa</timezone>
+    <timezone code="hr">Europe/Zagreb</timezone>
+    <timezone code="ht">America/Port-au-Prince</timezone>
+    <timezone code="hu">Europe/Budapest</timezone>
+    <timezone code="id">Asia/Jayapura</timezone>
+    <timezone code="id">Asia/Makassar</timezone>
+    <timezone code="id">Asia/Jakarta</timezone>
+    <timezone code="id">Asia/Pontianak</timezone>
+    <timezone code="ie">Europe/Dublin</timezone>
+    <timezone code="il">Asia/Jerusalem</timezone>
+    <timezone code="im">Europe/Isle_of_Man</timezone>
+    <timezone code="in">Asia/Kolkata</timezone>
+    <timezone code="io">Indian/Chagos</timezone>
+    <timezone code="iq">Asia/Baghdad</timezone>
+    <timezone code="ir">Asia/Tehran</timezone>
+    <timezone code="is">Atlantic/Reykjavik</timezone>
+    <timezone code="it">Europe/Rome</timezone>
+    <timezone code="je">Europe/Jersey</timezone>
+    <timezone code="jm">America/Jamaica</timezone>
+    <timezone code="jo">Asia/Amman</timezone>
+    <timezone code="jp">Asia/Tokyo</timezone>
+    <timezone code="ke">Africa/Nairobi</timezone>
+    <timezone code="kg">Asia/Bishkek</timezone>
+    <timezone code="kh">Asia/Phnom_Penh</timezone>
+    <timezone code="ki">Pacific/Kiritimati</timezone>
+    <timezone code="ki">Pacific/Enderbury</timezone>
+    <timezone code="ki">Pacific/Tarawa</timezone>
+    <timezone code="km">Indian/Comoro</timezone>
+    <timezone code="kn">America/St_Kitts</timezone>
+    <timezone code="kp">Asia/Pyongyang</timezone>
+    <timezone code="kr">Asia/Seoul</timezone>
+    <timezone code="kw">Asia/Kuwait</timezone>
+    <timezone code="ky">America/Cayman</timezone>
+    <timezone code="kz">Asia/Almaty</timezone>
+    <timezone code="kz">Asia/Qyzylorda</timezone>
+    <timezone code="kz">Asia/Aqtau</timezone>
+    <timezone code="kz">Asia/Oral</timezone>
+    <timezone code="kz">Asia/Aqtobe</timezone>
+    <timezone code="kz">Asia/Atyrau</timezone>
+    <timezone code="la">Asia/Vientiane</timezone>
+    <timezone code="lb">Asia/Beirut</timezone>
+    <timezone code="lc">America/St_Lucia</timezone>
+    <timezone code="li">Europe/Vaduz</timezone>
+    <timezone code="lk">Asia/Colombo</timezone>
+    <timezone code="lr">Africa/Monrovia</timezone>
+    <timezone code="ls">Africa/Maseru</timezone>
+    <timezone code="lt">Europe/Vilnius</timezone>
+    <timezone code="lu">Europe/Luxembourg</timezone>
+    <timezone code="lv">Europe/Riga</timezone>
+    <timezone code="ly">Africa/Tripoli</timezone>
+    <timezone code="ma">Africa/Casablanca</timezone>
+    <timezone code="mc">Europe/Monaco</timezone>
+    <timezone code="md">Europe/Chisinau</timezone>
+    <timezone code="me">Europe/Podgorica</timezone>
+    <timezone code="mf">America/Marigot</timezone>
+    <timezone code="mg">Indian/Antananarivo</timezone>
+    <timezone code="mh">Pacific/Majuro</timezone>
+    <timezone code="mh">Pacific/Kwajalein</timezone>
+    <timezone code="mk">Europe/Skopje</timezone>
+    <timezone code="ml">Africa/Bamako</timezone>
+    <timezone code="mm">Asia/Yangon</timezone>
+    <timezone code="mn">Asia/Choibalsan</timezone>
+    <timezone code="mn">Asia/Ulaanbaatar</timezone>
+    <timezone code="mn">Asia/Hovd</timezone>
+    <timezone code="mo">Asia/Macau</timezone>
+    <timezone code="mp">Pacific/Saipan</timezone>
+    <timezone code="mq">America/Martinique</timezone>
+    <timezone code="mr">Africa/Nouakchott</timezone>
+    <timezone code="ms">America/Montserrat</timezone>
+    <timezone code="mt">Europe/Malta</timezone>
+    <timezone code="mu">Indian/Mauritius</timezone>
+    <timezone code="mv">Indian/Maldives</timezone>
+    <timezone code="mw">Africa/Blantyre</timezone>
+    <timezone code="mx">America/Mexico_City</timezone>
+    <timezone code="mx">America/Merida</timezone>
+    <timezone code="mx">America/Monterrey</timezone>
+    <timezone code="mx">America/Matamoros</timezone>
+    <timezone code="mx">America/Bahia_Banderas</timezone>
+    <timezone code="mx">America/Cancun</timezone>
+    <timezone code="mx">America/Chihuahua</timezone>
+    <timezone code="mx">America/Hermosillo</timezone>
+    <timezone code="mx">America/Mazatlan</timezone>
+    <timezone code="mx">America/Ojinaga</timezone>
+    <timezone code="mx">America/Tijuana</timezone>
+    <timezone code="my">Asia/Kuala_Lumpur</timezone>
+    <timezone code="my">Asia/Kuching</timezone>
+    <timezone code="mz">Africa/Maputo</timezone>
+    <timezone code="na">Africa/Windhoek</timezone>
+    <timezone code="nc">Pacific/Noumea</timezone>
+    <timezone code="ne">Africa/Niamey</timezone>
+    <timezone code="nf">Pacific/Norfolk</timezone>
+    <timezone code="ng">Africa/Lagos</timezone>
+    <timezone code="ni">America/Managua</timezone>
+    <timezone code="nl">Europe/Amsterdam</timezone>
+    <timezone code="no">Europe/Oslo</timezone>
+    <timezone code="np">Asia/Kathmandu</timezone>
+    <timezone code="nr">Pacific/Nauru</timezone>
+    <timezone code="nu">Pacific/Niue</timezone>
+    <timezone code="nz">Pacific/Auckland</timezone>
+    <timezone code="nz">Pacific/Chatham</timezone>
+    <timezone code="om">Asia/Muscat</timezone>
+    <timezone code="pa">America/Panama</timezone>
+    <timezone code="pe">America/Lima</timezone>
+    <timezone code="pf">Pacific/Gambier</timezone>
+    <timezone code="pf">Pacific/Marquesas</timezone>
+    <timezone code="pf">Pacific/Tahiti</timezone>
+    <timezone code="pg">Pacific/Port_Moresby</timezone>
+    <timezone code="pg">Pacific/Bougainville</timezone>
+    <timezone code="ph">Asia/Manila</timezone>
+    <timezone code="pk">Asia/Karachi</timezone>
+    <timezone code="pl">Europe/Warsaw</timezone>
+    <timezone code="pm">America/Miquelon</timezone>
+    <timezone code="pn">Pacific/Pitcairn</timezone>
+    <timezone code="pr">America/Puerto_Rico</timezone>
+    <timezone code="ps">Asia/Gaza</timezone>
+    <timezone code="ps">Asia/Hebron</timezone>
+    <timezone code="pt">Europe/Lisbon</timezone>
+    <timezone code="pt">Atlantic/Madeira</timezone>
+    <timezone code="pt">Atlantic/Azores</timezone>
+    <timezone code="pw">Pacific/Palau</timezone>
+    <timezone code="py">America/Asuncion</timezone>
+    <timezone code="qa">Asia/Qatar</timezone>
+    <timezone code="re">Indian/Reunion</timezone>
+    <timezone code="ro">Europe/Bucharest</timezone>
+    <timezone code="rs">Europe/Belgrade</timezone>
+    <timezone code="ru">Asia/Kamchatka</timezone>
+    <timezone code="ru">Asia/Anadyr</timezone>
+    <timezone code="ru">Asia/Magadan</timezone>
+    <timezone code="ru">Asia/Sakhalin</timezone>
+    <timezone code="ru">Asia/Srednekolymsk</timezone>
+    <timezone code="ru">Asia/Vladivostok</timezone>
+    <timezone code="ru">Asia/Ust-Nera</timezone>
+    <timezone code="ru">Asia/Yakutsk</timezone>
+    <timezone code="ru">Asia/Chita</timezone>
+    <timezone code="ru">Asia/Khandyga</timezone>
+    <timezone code="ru">Asia/Irkutsk</timezone>
+    <timezone code="ru">Asia/Krasnoyarsk</timezone>
+    <timezone code="ru">Asia/Novosibirsk</timezone>
+    <timezone code="ru">Asia/Barnaul</timezone>
+    <timezone code="ru">Asia/Novokuznetsk</timezone>
+    <timezone code="ru">Asia/Tomsk</timezone>
+    <timezone code="ru">Asia/Omsk</timezone>
+    <timezone code="ru">Asia/Yekaterinburg</timezone>
+    <timezone code="ru">Europe/Samara</timezone>
+    <timezone code="ru">Europe/Astrakhan</timezone>
+    <timezone code="ru">Europe/Ulyanovsk</timezone>
+    <timezone code="ru">Europe/Saratov</timezone>
+    <timezone code="ru">Europe/Moscow</timezone>
+    <timezone code="ru">Europe/Volgograd</timezone>
+    <timezone code="ru">Europe/Kirov</timezone>
+    <timezone code="ru">Europe/Simferopol</timezone>
+    <timezone code="ru">Europe/Kaliningrad</timezone>
+    <timezone code="rw">Africa/Kigali</timezone>
+    <timezone code="sa">Asia/Riyadh</timezone>
+    <timezone code="sb">Pacific/Guadalcanal</timezone>
+    <timezone code="sc">Indian/Mahe</timezone>
+    <timezone code="sd">Africa/Khartoum</timezone>
+    <timezone code="se">Europe/Stockholm</timezone>
+    <timezone code="sg">Asia/Singapore</timezone>
+    <timezone code="sh">Atlantic/St_Helena</timezone>
+    <timezone code="si">Europe/Ljubljana</timezone>
+    <timezone code="sj">Arctic/Longyearbyen</timezone>
+    <timezone code="sk">Europe/Bratislava</timezone>
+    <timezone code="sl">Africa/Freetown</timezone>
+    <timezone code="sm">Europe/San_Marino</timezone>
+    <timezone code="sn">Africa/Dakar</timezone>
+    <timezone code="so">Africa/Mogadishu</timezone>
+    <timezone code="sr">America/Paramaribo</timezone>
+    <timezone code="ss">Africa/Juba</timezone>
+    <timezone code="st">Africa/Sao_Tome</timezone>
+    <timezone code="sv">America/El_Salvador</timezone>
+    <timezone code="sx">America/Lower_Princes</timezone>
+    <timezone code="sy">Asia/Damascus</timezone>
+    <timezone code="sz">Africa/Mbabane</timezone>
+    <timezone code="tc">America/Grand_Turk</timezone>
+    <timezone code="td">Africa/Ndjamena</timezone>
+    <timezone code="tf">Indian/Kerguelen</timezone>
+    <timezone code="tg">Africa/Lome</timezone>
+    <timezone code="th">Asia/Bangkok</timezone>
+    <timezone code="tj">Asia/Dushanbe</timezone>
+    <timezone code="tk">Pacific/Fakaofo</timezone>
+    <timezone code="tl">Asia/Dili</timezone>
+    <timezone code="tm">Asia/Ashgabat</timezone>
+    <timezone code="tn">Africa/Tunis</timezone>
+    <timezone code="to">Pacific/Tongatapu</timezone>
+    <timezone code="tr">Europe/Istanbul</timezone>
+    <timezone code="tt">America/Port_of_Spain</timezone>
+    <timezone code="tv">Pacific/Funafuti</timezone>
+    <timezone code="tw">Asia/Taipei</timezone>
+    <timezone code="tz">Africa/Dar_es_Salaam</timezone>
+    <timezone code="ua">Europe/Kiev</timezone>
+    <timezone code="ua">Europe/Uzhgorod</timezone>
+    <timezone code="ua">Europe/Zaporozhye</timezone>
+    <timezone code="ug">Africa/Kampala</timezone>
+    <timezone code="um">Pacific/Wake</timezone>
+    <timezone code="um">Pacific/Midway</timezone>
+    <timezone code="us">America/New_York</timezone>
+    <timezone code="us">America/Detroit</timezone>
+    <timezone code="us">America/Kentucky/Louisville</timezone>
+    <timezone code="us">America/Kentucky/Monticello</timezone>
+    <timezone code="us">America/Indiana/Indianapolis</timezone>
+    <timezone code="us">America/Indiana/Vincennes</timezone>
+    <timezone code="us">America/Indiana/Winamac</timezone>
+    <timezone code="us">America/Indiana/Marengo</timezone>
+    <timezone code="us">America/Indiana/Petersburg</timezone>
+    <timezone code="us">America/Indiana/Vevay</timezone>
+    <timezone code="us">America/Chicago</timezone>
+    <timezone code="us">America/Indiana/Knox</timezone>
+    <timezone code="us">America/Menominee</timezone>
+    <timezone code="us">America/North_Dakota/Center</timezone>
+    <timezone code="us">America/North_Dakota/New_Salem</timezone>
+    <timezone code="us">America/Indiana/Tell_City</timezone>
+    <timezone code="us">America/Denver</timezone>
+    <timezone code="us">America/North_Dakota/Beulah</timezone>
+    <timezone code="us">America/Boise</timezone>
+    <timezone code="us">America/Phoenix</timezone>
+    <timezone code="us">America/Los_Angeles</timezone>
+    <timezone code="us">America/Anchorage</timezone>
+    <timezone code="us">America/Juneau</timezone>
+    <timezone code="us">America/Yakutat</timezone>
+    <timezone code="us">America/Nome</timezone>
+    <timezone code="us">America/Metlakatla</timezone>
+    <timezone code="us">America/Sitka</timezone>
+    <timezone code="us">Pacific/Honolulu</timezone>
+    <timezone code="us">America/Adak</timezone>
+    <timezone code="uy">America/Montevideo</timezone>
+    <timezone code="uz">Asia/Tashkent</timezone>
+    <timezone code="uz">Asia/Samarkand</timezone>
+    <timezone code="va">Europe/Vatican</timezone>
+    <timezone code="vc">America/St_Vincent</timezone>
+    <timezone code="ve">America/Caracas</timezone>
+    <timezone code="vg">America/Tortola</timezone>
+    <timezone code="vi">America/St_Thomas</timezone>
+    <timezone code="vn">Asia/Ho_Chi_Minh</timezone>
+    <timezone code="vu">Pacific/Efate</timezone>
+    <timezone code="wf">Pacific/Wallis</timezone>
+    <timezone code="ws">Pacific/Apia</timezone>
+    <timezone code="ye">Asia/Aden</timezone>
+    <timezone code="yt">Indian/Mayotte</timezone>
+    <timezone code="za">Africa/Johannesburg</timezone>
+    <timezone code="zm">Africa/Lusaka</timezone>
+    <timezone code="zw">Africa/Harare</timezone>
+</timezones>
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index a451e12..cddc8c8 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -34,6 +34,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-lenovo-z5 \
 	treble-overlay-lg-g7 \
 	treble-overlay-lg-v40 \
+	treble-overlay-moto-e5plus \
 	treble-overlay-moto-g6 \
 	treble-overlay-moto-g6plus \
 	treble-overlay-moto-g7power \