diff --git a/resource-overlay/device/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml
index 2310c09..83ff46b 100644
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
@@ -7,25 +7,31 @@
     <!-- Vibrator pattern for feedback about a long screen/key press -->
     <integer-array name="config_longPressVibePattern">
         <item>0</item>
-        <item>67</item>
+        <item>60</item>
     </integer-array>
 
     <!-- Vibrator pattern for feedback about touching a virtual key -->
     <integer-array name="config_virtualKeyVibePattern">
         <item>0</item>
-        <item>67</item>
+        <item>50</item>
     </integer-array>
 
-    <!-- Vibrator pattern for feedback about booting with safe mode enabled -->
-    <integer-array name="config_safeModeEnabledVibePattern">
+    <!-- Vibrator pattern for feedback when selecting an hour/minute tick of a Clock -->
+    <integer-array name="config_clockTickVibePattern">
         <item>0</item>
-        <item>0</item>
-        <item>94</item>
+        <item>40</item>
     </integer-array>
 
-    <!-- Note: This setting is deprecated, please use
-    config_screenBrightnessSettingMinimumFloat instead -->
-    <integer name="config_screenBrightnessSettingMinimum">2</integer>
+    <!-- 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" type="dimen">0.03418803</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" type="dimen">0.42911446</item>
 
     <!-- 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
@@ -38,7 +44,7 @@
     <!-- 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>
+    <item name="config_screenBrightnessDimFloat" type="dimen">0.03418803</item>
 
     <!-- Array of light sensor lux values to define our levels for auto backlight brightness support.
          The N entries of this array define N + 1 control points as follows:
@@ -71,6 +77,9 @@
         <item>1250</item>
         <item>3500</item>
         <item>5500</item>
+        <item>10000</item>
+        <item>50000</item>
+        <item>120000</item>
     </integer-array>
 
     <!-- Array of desired screen brightness in nits corresponding to the lux values
@@ -86,7 +95,7 @@
          array. The brightness values must be non-negative and non-decreasing. This must be
          overridden in platform specific overlays -->
     <integer-array name="config_autoBrightnessDisplayValuesNits">
-        <item>2</item>
+        <item>3</item>
         <item>7</item>
         <item>10</item>
         <item>12</item>
@@ -95,8 +104,11 @@
         <item>111</item>
         <item>149</item>
         <item>192</item>
-        <item>252</item>
+        <item>325</item>
         <item>500</item>
+        <item>700</item>
+        <item>800</item>
+        <item>1000</item>
     </integer-array>
 
     <!-- An array describing the screen's backlight values corresponding to the brightness
@@ -104,17 +116,19 @@
 
          This array should be equal in size to config_screenBrightnessBacklight. -->
     <integer-array name="config_screenBrightnessBacklight">
-        <item>0</item>
-        <item>1</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>9</item>
+        <item>27</item>
+        <item>35</item>
+        <item>38</item>
+        <item>55</item>
+        <item>106</item>
+        <item>113</item>
         <item>129</item>
+        <item>147</item>
+        <item>183</item>
+        <item>228</item>
+        <item>239</item>
+        <item>244</item>
         <item>255</item>
     </integer-array>
 
@@ -126,8 +140,7 @@
 
          This array should be equal in size to config_screenBrightnessBacklight -->
     <integer-array name="config_screenBrightnessNits">
-        <item>0</item>
-        <item>2</item>
+        <item>3</item>
         <item>7</item>
         <item>10</item>
         <item>12</item>
@@ -136,8 +149,11 @@
         <item>111</item>
         <item>149</item>
         <item>192</item>
-        <item>252</item>
+        <item>325</item>
         <item>500</item>
+        <item>700</item>
+        <item>800</item>
+        <item>1000</item>
     </integer-array>
 
     <!-- MMS user agent string -->
@@ -212,6 +228,38 @@
          -->
     <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
 
+    <!-- The default refresh rate for a given device. Change this value to set a higher default
+         refresh rate. If the hardware composer on the device supports display modes with a higher
+         refresh rate than the default value specified here, the framework may use those higher
+         refresh rate modes if an app chooses one by setting preferredDisplayModeId or calling
+         setFrameRate().
+         If a non-zero value is set for config_defaultPeakRefreshRate, then
+         config_defaultRefreshRate may be set to 0, in which case the value set for
+         config_defaultPeakRefreshRate will act as the default frame rate. -->
+    <integer name="config_defaultRefreshRate">0</integer>
+
+    <!-- The default peak refresh rate for a given device. Change this value if you want to prevent
+         the framework from using higher refresh rates, even if display modes with higher refresh
+         rates are available from hardware composer. Only has an effect if the value is
+         non-zero. -->
+    <integer name="config_defaultPeakRefreshRate">120</integer>
+
+    <!-- Low zone brightness thresholds in the range [0, 255] -->
+    <integer-array name="config_brightnessThresholdsOfPeakRefreshRate" translatable="false">
+        <item>77</item>
+        <item>62</item>
+    </integer-array>
+
+    <!-- Low zone lux thresholds -->
+    <integer-array name="config_ambientThresholdsOfPeakRefreshRate" translatable="false">
+        <item>-1</item>
+        <item>70</item>
+    </integer-array>
+
+    <!-- Default refresh rate in the zone defined by brightness and ambient thresholds.
+         If non-positive, then the refresh rate is unchanged even if thresholds are configured. -->
+    <integer name="config_defaultRefreshRateInZone">90</integer>
+
     <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
          when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
          where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
@@ -223,7 +271,7 @@
     <!-- The properties of a UDFPS sensor in pixels, in the order listed below: -->
     <integer-array name="config_udfps_sensor_props" translatable="false">
         <item>540</item> <!-- sensorLocationX -->
-        <item>2164</item> <!-- sensorLocationY -->
+        <item>2168</item> <!-- sensorLocationY -->
         <item>91</item> <!-- sensorRadius -->
     </integer-array>
 </resources>
diff --git a/resource-overlay/device/Frameworks/res/values/dimens.xml b/resource-overlay/device/Frameworks/res/values/dimens.xml
index d774185..8077006 100644
--- a/resource-overlay/device/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/device/Frameworks/res/values/dimens.xml
@@ -22,5 +22,5 @@
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Default radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">95.0px</dimen>
+    <dimen name="rounded_corner_radius">105px</dimen>
 </resources>
diff --git a/resource-overlay/device/Frameworks/res/xml/power_profile.xml b/resource-overlay/device/Frameworks/res/xml/power_profile.xml
index aa55560..f672893 100644
--- a/resource-overlay/device/Frameworks/res/xml/power_profile.xml
+++ b/resource-overlay/device/Frameworks/res/xml/power_profile.xml
@@ -5,113 +5,80 @@
 -->
 <device name="Android">
     <item name="none">0</item>
-    <item name="screen.on.display0">139.28</item>
-    <item name="screen.full.display0">450</item>
-    <item name="wifi.on">0.9</item>
-    <item name="wifi.active">34.36</item>
-    <item name="wifi.scan">4.73</item>
-    <item name="camera.avg">523.93</item>
-    <item name="camera.flashlight">200.75</item>
-    <item name="gps.on">171</item>
-    <item name="radio.active">136.278</item>
-    <item name="radio.scanning">10.57</item>
+    <item name="screen.on.display0">47.12</item>
+    <item name="screen.full.display0">310.48</item>
+    <item name="wifi.on">1.78</item>
+    <item name="wifi.active">88.58</item>
+    <item name="wifi.scan">44.18</item>
+    <item name="camera.avg">607.96</item>
+    <item name="camera.flashlight">99.85</item>
+    <item name="gps.on">50.69</item>
+    <item name="radio.active">284.89</item>
+    <item name="radio.scanning">35</item>
     <array name="radio.on">
-        <value>33.079</value>
+        <value>35</value>
         <value>30</value>
         <value>25</value>
         <value>20</value>
         <value>15</value>
         <value>10</value>
         <value>5</value>
-        <value>1.463</value>
+        <value>1.090</value>
     </array>
     <array name="cpu.clusters.cores">
-        <value>4</value>
-        <value>3</value>
-        <value>1</value>
+        <value>6</value>
+        <value>2</value>
     </array>
     <array name="cpu.core_speeds.cluster0">
         <value>300000</value>
-        <value>691200</value>
-        <value>806400</value>
+        <value>576000</value>
+        <value>710400</value>
         <value>940800</value>
-        <value>1152000</value>
+        <value>1190400</value>
         <value>1324800</value>
-        <value>1516800</value>
-        <value>1651200</value>
+        <value>1478400</value>
+        <value>1574400</value>
+        <value>1708800</value>
         <value>1804800</value>
     </array>
     <array name="cpu.core_speeds.cluster1">
-        <value>691200</value>
-        <value>940800</value>
-        <value>1228800</value>
-        <value>1344000</value>
-        <value>1516800</value>
+        <value>768000</value>
+        <value>979200</value>
+        <value>1017600</value>
+        <value>1248000</value>
+        <value>1401600</value>
+        <value>1536000</value>
         <value>1651200</value>
-        <value>1900800</value>
-        <value>2054400</value>
-        <value>2131200</value>
-        <value>2400000</value>
-    </array>
-    <array name="cpu.core_speeds.cluster2">
-        <value>806400</value>
-        <value>1056000</value>
-        <value>1324800</value>
-        <value>1516800</value>
-        <value>1766400</value>
-        <value>1862400</value>
+        <value>1804800</value>
         <value>2035200</value>
-        <value>2208000</value>
-        <value>2380800</value>
-        <value>2515200</value>
     </array>
     <array name="cpu.core_power.cluster0">
-        <value>4.13</value>
-        <value>6.9</value>
-        <value>7.26</value>
-        <value>8.88</value>
-        <value>12.17</value>
-        <value>15.7</value>
-        <value>20.06</value>
-        <value>25.76</value>
-        <value>30.9</value>
+        <value>22.3</value>
+        <value>25.9</value>
+        <value>27.7</value>
+        <value>32.7</value>
+        <value>36.5</value>
+        <value>39.8</value>
+        <value>43.1</value>
+        <value>51.9</value>
+        <value>54.9</value>
+        <value>58.0</value>
     </array>
     <array name="cpu.core_power.cluster1">
-        <value>26.93</value>
-        <value>20.23</value>
-        <value>57.22</value>
-        <value>71.71</value>
-        <value>91.77</value>
-        <value>108.31</value>
-        <value>158.29</value>
-        <value>182.69</value>
-        <value>186.79</value>
-        <value>230.89</value>
-    </array>
-    <array name="cpu.core_power.cluster2">
-        <value>34.69</value>
-        <value>49.4</value>
-        <value>70.56</value>
-        <value>89.92</value>
-        <value>117.81</value>
-        <value>129.49</value>
-        <value>185.7</value>
-        <value>184.51</value>
-        <value>218.2</value>
-        <value>243.16</value>
-    </array>
-    <item name="cpu.cluster_power.cluster0">1.13</item>
-    <item name="cpu.cluster_power.cluster1">1.13</item>
-    <item name="cpu.cluster_power.cluster1">1.13</item>
-    <item name="cpu.suspend">6.5</item>
-    <item name="cpu.idle">12.86</item>
-    <item name="cpu.active">6.79</item>
-    <item name="battery.capacity">4020</item>
-    <item name="modem.controller.idle">6</item>
-    <item name="modem.controller.rx">180</item>
-    <item name="modem.controller.tx">186</item>
-    <item name="modem.controller.voltage">3700</item>
-    <array name="memory.bandwidths">
-        <value>17</value>
+        <value>45.3</value>
+        <value>55.7</value>
+        <value>57.7</value>
+        <value>70.8</value>
+        <value>84.4</value>
+        <value>93.1</value>
+        <value>111.6</value>
+        <value>134.1</value>
+        <value>168.5</value>
     </array>
+    <item name="cpu.cluster_power.cluster0">0.7</item>
+    <item name="cpu.cluster_power.cluster1">6.7</item>
+    <item name="cpu.suspend">3.993</item>
+    <item name="cpu.idle">5.006</item>
+    <item name="cpu.active">4.4</item>
+    <item name="battery.capacity">5000</item>
 </device>
diff --git a/resource-overlay/device/Settings/res/drawable/regulatory_info.png b/resource-overlay/device/Settings/res/drawable/regulatory_info.png
deleted file mode 100644
index d38c551..0000000
Binary files a/resource-overlay/device/Settings/res/drawable/regulatory_info.png and /dev/null differ
diff --git a/resource-overlay/device/Settings/res/values/config.xml b/resource-overlay/device/Settings/res/values/config.xml
index 92b4f8b..48afae3 100644
--- a/resource-overlay/device/Settings/res/values/config.xml
+++ b/resource-overlay/device/Settings/res/values/config.xml
@@ -4,9 +4,6 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-    <!-- Whether to show a preference item for regulatory information in About phone -->
-    <bool name="config_show_regulatory_info">true</bool>
-
     <!-- The radius of the enrollment progress bar, in dp -->
     <integer name="config_udfpsEnrollProgressBar">65</integer>
 </resources>
diff --git a/resource-overlay/device/SystemUI/res/values/dimens.xml b/resource-overlay/device/SystemUI/res/values/dimens.xml
index a9fdf0c..7aabe10 100644
--- a/resource-overlay/device/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/device/SystemUI/res/values/dimens.xml
@@ -11,14 +11,14 @@
     <dimen name="keyguard_carrier_text_margin">4dp</dimen>
 
     <!-- Bottom margin size when fingerprint in display is active -->
-    <dimen name="keyguard_indication_margin_bottom">15dp</dimen>
+    <dimen name="keyguard_indication_margin_bottom">8dp</dimen>
 
     <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
     <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
 
     <!-- Location on the screen of the center of the physical power button. This is a reasonable
     default that should be overridden by device-specific overlays. -->
-    <dimen name="physical_power_button_center_screen_location_y">1000.0px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">880px</dimen>
 
     <!-- Microns/ums (1000 um = 1mm) per pixel for the given device. If unspecified, UI that
          relies on this value will not be sized correctly. -->