diff --git a/resource-overlay/rtwo/Frameworks/res/values/config.xml b/resource-overlay/rtwo/Frameworks/res/values/config.xml
index cd8d95a..b85f45f 100644
--- a/resource-overlay/rtwo/Frameworks/res/values/config.xml
+++ b/resource-overlay/rtwo/Frameworks/res/values/config.xml
@@ -24,7 +24,7 @@
          backlight values for LUX levels between these control points.
 
          Must be overridden in platform specific overlays -->
-    <array name="config_autoBrightnessLevels">
+    <integer-array name="config_autoBrightnessLevels">
         <item>2</item>
         <item>4</item>
         <item>5</item>
@@ -35,7 +35,10 @@
         <item>1250</item>
         <item>3500</item>
         <item>5500</item>
-    </array>
+        <item>10000</item>
+        <item>50000</item>
+        <item>100000</item>
+    </integer-array>
 
     <!-- Array of desired screen brightness in nits corresponding to the lux values
          in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
@@ -50,8 +53,8 @@
          This array should have size one greater than the size of the config_autoBrightnessLevels
          array. The brightness values must be non-negative and non-decreasing. This must be
          overridden in platform specific overlays -->
-    <array name="config_autoBrightnessDisplayValuesNits">
-        <item>2</item>
+    <integer-array name="config_autoBrightnessDisplayValuesNits">
+        <item>3</item>
         <item>7</item>
         <item>10</item>
         <item>12</item>
@@ -60,28 +63,33 @@
         <item>111</item>
         <item>149</item>
         <item>192</item>
-        <item>252</item>
+        <item>325</item>
         <item>500</item>
-    </array>
+        <item>700</item>
+        <item>800</item>
+        <item>1000</item>
+    </integer-array>
 
     <!-- An array describing the screen's backlight values corresponding to the brightness
          values in the config_screenBrightnessNits array.
 
          This array should be equal in size to config_screenBrightnessBacklight. -->
-    <array name="config_screenBrightnessBacklight">
-        <item>0</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>12</item>
-        <item>48</item>
-        <item>57</item>
-        <item>76</item>
-        <item>98</item>
-        <item>129</item>
+    <integer-array name="config_screenBrightnessBacklight">
+        <item>7</item>
+        <item>27</item>
+        <item>33</item>
+        <item>37</item>
+        <item>52</item>
+        <item>102</item>
+        <item>111</item>
+        <item>127</item>
+        <item>141</item>
+        <item>182</item>
+        <item>219</item>
+        <item>233</item>
+        <item>241</item>
         <item>255</item>
-    </array>
+    </integer-array>
 
     <!-- An array of floats describing the screen brightness in nits corresponding to the backlight
          values in the config_screenBrightnessBacklight array.  On OLED displays these  values
@@ -90,9 +98,8 @@
          brightness modes but only the maximum brightness value obtainable in a sustainable manner.
 
          This array should be equal in size to config_screenBrightnessBacklight -->
-    <array name="config_screenBrightnessNits">
-        <item>0</item>
-        <item>5</item>
+    <integer-array name="config_screenBrightnessNits">
+        <item>3</item>
         <item>7</item>
         <item>10</item>
         <item>12</item>
@@ -101,9 +108,12 @@
         <item>111</item>
         <item>149</item>
         <item>192</item>
-        <item>252</item>
+        <item>325</item>
         <item>500</item>
-    </array>
+        <item>700</item>
+        <item>800</item>
+        <item>1000</item>
+    </integer-array>
 
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
          for debouncing the light sensor.  Different constants are used to debounce the light sensor
@@ -137,8 +147,8 @@
     <string translatable="false" name="config_mainBuiltInDisplayCutout">
         M -35,0
         L 35,0
-		L 35,105
-		L -35,105
+		L 35,112
+		L -35,112
 		Z
 	</string>
 
@@ -199,14 +209,14 @@
     <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
     <array name="config_udfps_sensor_props" translatable="false" >
         <item>540</item> <!-- sensorLocationX -->
-        <item>2164</item> <!-- sensorLocationY -->
+        <item>2141</item> <!-- sensorLocationY -->
         <item>91</item> <!-- sensorRadius -->
     </array>
 
     <!-- Screen brightness used to dim the screen when the user activity
          timeout expires.  May be less than the minimum allowed brightness setting
          that can be set by the user. -->
-    <integer name="config_screenBrightnessDim">2</integer>
+    <integer name="config_screenBrightnessDim">1</integer>
 
     <!-- Minimum screen brightness setting allowed by the power manager.
          The user is forbidden from setting the brightness below this level. -->
@@ -261,7 +271,7 @@
     </array>
 
     <!-- MMS user agent string -->
-    <string name="config_mms_user_agent" translatable="false">motorolaedge30ultra</string>
+    <string name="config_mms_user_agent" translatable="false">motorolaedge40pro</string>
     <!-- MMS user agent profile url -->
     <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf</string>
 
diff --git a/resource-overlay/rtwo/Frameworks/res/values/dimens.xml b/resource-overlay/rtwo/Frameworks/res/values/dimens.xml
index 10588f9..7c43296 100644
--- a/resource-overlay/rtwo/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/rtwo/Frameworks/res/values/dimens.xml
@@ -11,8 +11,25 @@
 
     <!-- Height of the status bar in portrait. The height should be
          Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height_portrait">90.0px</dimen>
+    <dimen name="status_bar_height_portrait">112.0px</dimen>
     <dimen name="status_bar_height_landscape">24.0dip</dimen>
 
     <dimen name="status_bar_padding_top_portrait">10.0px</dimen>
+
+    <!-- Minimum screen brightness setting allowed by power manager.
+         -2 is invalid so setting will resort to int value specified above.
+         Set this to 0.0 to allow screen to go to minimal brightness.
+         The user is forbidden from setting the brightness below this level. -->
+    <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.026506964</item>
+
+    <!-- Maximum screen brightness allowed by the power manager.
+         -2 is invalid so setting will resort to int value specified above.
+         Set this to 1.0 for maximum brightness range.
+         The user is forbidden from setting the brightness above this level. -->
+    <item name="config_screenBrightnessSettingMaximumFloat" format="float" type="dimen">1.0</item>
+
+    <!-- Default screen brightness setting set.
+         -2 is invalid so setting will resort to int value specified above.
+         Must be in the range specified by minimum and maximum. -->
+    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.38188976</item>
 </resources>
diff --git a/resource-overlay/rtwo/Frameworks/res/xml/power_profile.xml b/resource-overlay/rtwo/Frameworks/res/xml/power_profile.xml
index dddf879..f0667c1 100644
--- a/resource-overlay/rtwo/Frameworks/res/xml/power_profile.xml
+++ b/resource-overlay/rtwo/Frameworks/res/xml/power_profile.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <device name="Android">
     <item name="none">0</item>
-    <item name="screen.on">107.3</item>
-    <item name="screen.full">67.68</item>
-    <item name="wifi.on">2.05</item>
-    <item name="wifi.active">82.23</item>
-    <item name="wifi.scan">18.95</item>
-    <item name="camera.avg">879.99</item>
-    <item name="camera.flashlight">304.34</item>
+    <item name="screen.on">56.64</item>
+    <item name="screen.full">242.36</item>
+    <item name="wifi.on">0.21</item>
+    <item name="wifi.active">79.86</item>
+    <item name="wifi.scan">166.35</item>
+    <item name="camera.avg">498.16</item>
+    <item name="camera.flashlight">126.08</item>
     <item name="gps.on">8.65</item>
-    <item name="radio.active">97.64</item>
-    <item name="radio.scanning">63.7</item>
+    <item name="radio.active">215</item>
+    <item name="radio.scanning">53.5</item>
     <array name="radio.on">
         <value>33.079</value>
         <value>30</value>
@@ -22,135 +22,139 @@
         <value>4.3</value>
     </array>
     <array name="cpu.clusters.cores">
-        <value>4</value>
         <value>3</value>
+        <value>4</value>
         <value>1</value>
     </array>
     <array name="cpu.core_speeds.cluster0">
         <value>307200</value>
         <value>441600</value>
         <value>556800</value>
-        <value>691200</value>
-        <value>806400</value>
-        <value>940800</value>
-        <value>1056000</value>
-        <value>1132800</value>
+        <value>672000</value>
+        <value>787200</value>
+        <value>902400</value>
+        <value>1017600</value>
+        <value>1113600</value>
         <value>1228800</value>
-        <value>1324800</value>
-        <value>1440000</value>
+        <value>1344000</value>
+        <value>1459200</value>
         <value>1555200</value>
         <value>1670400</value>
-        <value>1804800</value>
+        <value>1785600</value>
+        <value>1900800</value>
+        <value>2016000</value>
     </array>
     <array name="cpu.core_speeds.cluster1">
-        <value>633600</value>
-        <value>768000</value>
-        <value>833200</value>
-        <value>998400</value>
-        <value>1113600</value>
-        <value>1209600</value>
-        <value>1324800</value>
-        <value>1440000</value>
-        <value>1555200</value>
-        <value>1651200</value>
-        <value>1766400</value>
-        <value>1881600</value>
-        <value>1996800</value>
-        <value>2112000</value>
-        <value>2227200</value>
-        <value>2342400</value>
-        <value>2457600</value>
-        <value>2572800</value>
-        <value>2649600</value>
-        <value>2745600</value>
-    </array>
-    <array name="cpu.core_speeds.cluster2">
-        <value>787200</value>
-        <value>921600</value>
-        <value>1036800</value>
+        <value>499200</value>
+        <value>614400</value>
+        <value>729600</value>
+        <value>844800</value>
+        <value>940800</value>
+        <value>1056000</value>
         <value>1171200</value>
         <value>1286400</value>
         <value>1401600</value>
         <value>1536000</value>
         <value>1651200</value>
-        <value>1766400</value>
-        <value>1881600</value>
-        <value>1996800</value>
-        <value>2131200</value>
-        <value>2246400</value>
-        <value>2361600</value>
-        <value>2476800</value>
+        <value>1785600</value>
+        <value>1920000</value>
+        <value>2054400</value>
+        <value>2188800</value>
+        <value>2323200</value>
+        <value>2457600</value>
         <value>2592000</value>
         <value>2707200</value>
-        <value>2822400</value>
-        <value>2918400</value>
-        <value>2995200</value>
+        <value>2803200</value>
+    </array>
+    <array name="cpu.core_speeds.cluster2">
+        <value>595200</value>
+        <value>729600</value>
+        <value>864000</value>
+        <value>998400</value>
+        <value>1132800</value>
+        <value>1248000</value>
+        <value>1363200</value>
+        <value>1478400</value>
+        <value>1593600</value>
+        <value>1708800</value>
+        <value>1843200</value>
+        <value>1977600</value>
+        <value>2092800</value>
+        <value>2227200</value>
+        <value>2342400</value>
+        <value>2476800</value>
+        <value>2592000</value>
+        <value>2726400</value>
+        <value>2841600</value>
+        <value>2956800</value>
     </array>
     <array name="cpu.core_power.cluster0">
-        <value>11</value>
-        <value>11</value>
-        <value>9</value>
-        <value>10</value>
-        <value>9</value>
-        <value>10</value>
-        <value>10</value>
-        <value>10</value>
-        <value>12</value>
-        <value>12</value>
+        <value>13</value>
+        <value>14</value>
+        <value>16</value>
         <value>19</value>
-        <value>25</value>
-        <value>30</value>
-        <value>40</value>
+        <value>22</value>
+        <value>29</value>
+        <value>32</value>
+        <value>34</value>
+        <value>38</value>
+        <value>42</value>
+        <value>46</value>
+        <value>50</value>
+        <value>55</value>
+        <value>59</value>
+        <value>60</value>
+        <value>62</value>
     </array>
     <array name="cpu.core_power.cluster1">
-        <value>23</value>
         <value>29</value>
-        <value>35</value>
         <value>42</value>
         <value>47</value>
-        <value>54</value>
-        <value>63</value>
-        <value>83</value>
-        <value>93</value>
+        <value>55</value>
+        <value>60</value>
+        <value>69</value>
+        <value>77</value>
+        <value>88</value>
+        <value>99</value>
+        <value>112</value>
+        <value>126</value>
+        <value>145</value>
+        <value>162</value>
+        <value>186</value>
+        <value>211</value>
+        <value>240</value>
+        <value>270</value>
+        <value>309</value>
+        <value>343</value>
+        <value>369</value>
+    </array>
+    <array name="cpu.core_power.cluster2">
+        <value>66</value>
+        <value>73</value>
         <value>90</value>
         <value>104</value>
         <value>116</value>
-        <value>134</value>
-        <value>149</value>
+        <value>136</value>
+        <value>150</value>
         <value>166</value>
-        <value>186</value>
-        <value>202</value>
-        <value>221</value>
-        <value>237</value>
-        <value>257</value>
+        <value>185</value>
+        <value>200</value>
+        <value>228</value>
+        <value>259</value>
+        <value>305</value>
+        <value>345</value>
+        <value>382</value>
+        <value>456</value>
+        <value>486</value>
+        <value>564</value>
+        <value>630</value>
+        <value>730</value>
     </array>
-    <array name="cpu.core_power.cluster2">
-        <value>45</value>
-        <value>58</value>
-        <value>68</value>
-        <value>83</value>
-        <value>97</value>
-        <value>107</value>
-        <value>129</value>
-        <value>149</value>
-        <value>171</value>
-        <value>195</value>
-        <value>225</value>
-        <value>261</value>
-        <value>289</value>
-        <value>319</value>
-        <value>348</value>
-        <value>356</value>
-        <value>429</value>
-        <value>460</value>
-        <value>536</value>
-        <value>577</value>
-    </array>
-    <item name="cpu.cluster_power.cluster0">8</item>
-    <item name="cpu.cluster_power.cluster1">5</item>
-    <item name="cpu.cluster_power.cluster2">7</item>
+    <item name="cpu.cluster_power.cluster0">1.2</item>
+    <item name="cpu.cluster_power.cluster1">1.2</item>
+    <item name="cpu.cluster_power.cluster2">1.2</item>
     <item name="cpu.suspend">6.5</item>
-    <item name="cpu.idle">15.7</item>
+    <item name="cpu.idle">7.32</item>
     <item name="cpu.active">6.9</item>
-    <item name="battery.capacity">4610</item>
-</device>
\ No newline at end of file
+    <item name="battery.capacity">4600</item>
+</device>
diff --git a/resource-overlay/rtwo/SettingsProvider/res/values/config.xml b/resource-overlay/rtwo/SettingsProvider/res/values/config.xml
index 1e38b15..672c3ea 100644
--- a/resource-overlay/rtwo/SettingsProvider/res/values/config.xml
+++ b/resource-overlay/rtwo/SettingsProvider/res/values/config.xml
@@ -5,5 +5,5 @@
 -->
 <resources>
     <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
-    <string name="def_device_name_simple">motorola edge 30 ultra</string>
+    <string name="def_device_name_simple">motorola edge 40 pro</string>
 </resources>
diff --git a/resource-overlay/rtwo/SystemUI/res/values/dimens.xml b/resource-overlay/rtwo/SystemUI/res/values/dimens.xml
index 880fac4..956127e 100644
--- a/resource-overlay/rtwo/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/rtwo/SystemUI/res/values/dimens.xml
@@ -20,9 +20,9 @@
     <dimen name="keyguard_indication_margin_bottom">16.0dip</dimen>
 
 	<!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">920.0px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">990.0px</dimen>
 
     <!-- Location on the screen of the center of the physical volume up/down buttons. -->
-    <dimen name="physical_volume_up_button_center_screen_location_y">550.0px</dimen>
-    <dimen name="physical_volume_down_button_center_screen_location_y">690.0px</dimen>
+    <dimen name="physical_volume_up_button_center_screen_location_y">594.0px</dimen>
+    <dimen name="physical_volume_down_button_center_screen_location_y">749.0px</dimen>
 </resources>