diff --git a/resource-overlay/device/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml
index 3e826c6..49069de 100644
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
@@ -13,7 +13,7 @@
     <!-- Vibrator pattern for feedback about touching a virtual key -->
     <integer-array name="config_virtualKeyVibePattern">
         <item>0</item>
-        <item>30</item>
+        <item>50</item>
     </integer-array>
 
     <!-- Vibrator pattern for feedback when selecting an hour/minute tick of a Clock -->
@@ -67,16 +67,29 @@
 
          Must be overridden in platform specific overlays -->
     <integer-array name="config_autoBrightnessLevels">
+        <item>1</item>
         <item>2</item>
-        <item>4</item>
         <item>5</item>
         <item>10</item>
-        <item>40</item>
+        <item>29</item>
+        <item>50</item>
+        <item>90</item>
         <item>100</item>
-        <item>325</item>
-        <item>1250</item>
-        <item>3500</item>
-        <item>5500</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>1500</item>
+        <item>1600</item>
+        <item>1800</item>
+        <item>2000</item>
+        <item>3000</item>
+        <item>4000</item>
+        <item>8000</item>
     </integer-array>
 
     <!-- Array of desired screen brightness in nits corresponding to the lux values
@@ -92,17 +105,21 @@
          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>7</item>
+        <item>3</item>
         <item>10</item>
-        <item>12</item>
-        <item>24</item>
-        <item>95</item>
-        <item>111</item>
-        <item>149</item>
-        <item>192</item>
-        <item>252</item>
-        <item>500</item>
+        <item>20</item>
+        <item>50</item>
+        <item>70</item>
+        <item>85</item>
+        <item>110</item>
+        <item>130</item>
+        <item>150</item>
+        <item>180</item>
+        <item>202</item>
+        <item>350</item>
+        <item>380</item>
+        <item>420</item>
+        <item>450</item>
     </integer-array>
 
     <!-- An array describing the screen's backlight values corresponding to the brightness
@@ -111,16 +128,20 @@
          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>3</item>
         <item>6</item>
-        <item>12</item>
+        <item>11</item>
+        <item>28</item>
+        <item>40</item>
         <item>48</item>
-        <item>57</item>
-        <item>76</item>
-        <item>98</item>
-        <item>129</item>
+        <item>62</item>
+        <item>74</item>
+        <item>85</item>
+        <item>102</item>
+        <item>118</item>
+        <item>198</item>
+        <item>215</item>
+        <item>238</item>
         <item>255</item>
     </integer-array>
 
@@ -133,17 +154,21 @@
          This array should be equal in size to config_screenBrightnessBacklight -->
     <integer-array name="config_screenBrightnessNits">
         <item>0</item>
-        <item>2</item>
-        <item>7</item>
+        <item>3</item>
         <item>10</item>
-        <item>12</item>
-        <item>24</item>
-        <item>95</item>
-        <item>111</item>
-        <item>149</item>
-        <item>192</item>
-        <item>252</item>
-        <item>500</item>
+        <item>20</item>
+        <item>50</item>
+        <item>70</item>
+        <item>85</item>
+        <item>110</item>
+        <item>130</item>
+        <item>150</item>
+        <item>180</item>
+        <item>202</item>
+        <item>350</item>
+        <item>380</item>
+        <item>420</item>
+        <item>450</item>
     </integer-array>
 
     <!-- MMS user agent string -->
@@ -189,10 +214,10 @@
          @see https://www.w3.org/TR/SVG/paths.html#PathData
          -->
     <string name="config_mainBuiltInDisplayCutout" translatable="false">
-        M -34,0
-        L -34,100
-        L 34,100
-        L 34,0
+        M -50,0
+        L 50,0
+        L 50,115
+        L -50,115
         Z
     </string>
 
diff --git a/resource-overlay/device/Frameworks/res/values/dimens.xml b/resource-overlay/device/Frameworks/res/values/dimens.xml
index ea4fda8..94f6ec0 100644
--- a/resource-overlay/device/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/device/Frameworks/res/values/dimens.xml
@@ -9,18 +9,18 @@
 
     <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
          calculate the status bar height. -->
-    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_default">24dp</dimen>
 
     <!-- Height of the status bar in portrait.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_portrait">100px</dimen>
+    <dimen name="status_bar_height_portrait">115px</dimen>
 
     <!-- Height of the status bar in landscape.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_landscape">28dp</dimen>
+    <dimen name="status_bar_height_landscape">24dp</dimen>
 
     <!-- Default radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">95px</dimen>
+    <dimen name="rounded_corner_radius">85px</dimen>
 </resources>
diff --git a/resource-overlay/device/SystemUI/res/values/config.xml b/resource-overlay/device/SystemUI/res/values/config.xml
deleted file mode 100644
index 3069b08..0000000
--- a/resource-overlay/device/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- A path similar to frameworks/base/core/res/res/values/config.xml
-      config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a outer
-      display cutout. If present as well as config_enableDisplayCutoutProtection is set to true,
-      then SystemUI will draw this "protection path" instead of the display cutout path that is
-      normally used for anti-aliasing.
-
-      This path will only be drawn when the front-facing camera turns on, otherwise the main
-      DisplayCutout path will be rendered
-       -->
-    <string name="config_frontBuiltInDisplayCutoutProtection" translatable="false">
-        M 661,72
-        a 57,57 0 1 0 114,0
-        a 57,57 0 1 0 -114,0
-        Z
-    </string>
-
-    <!-- ID for the camera of outer display that needs extra protection -->
-    <string name="config_protectedCameraId" translatable="false">1</string>
-
-    <!--  Flag to turn on the rendering of the above path or not  -->
-    <bool name="config_enableDisplayCutoutProtection">true</bool>
-</resources>
diff --git a/resource-overlay/device/SystemUI/res/values/dimens.xml b/resource-overlay/device/SystemUI/res/values/dimens.xml
index 3a57b30..6d3268a 100644
--- a/resource-overlay/device/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/device/SystemUI/res/values/dimens.xml
@@ -27,9 +27,9 @@
      display fingerprint sensors, this directly corresponds to the fingerprint sensor's location.
      For devices with sensors on the back of the device, this corresponds to the location on the
      screen directly in front of the sensor. -->
-    <dimen name="physical_fingerprint_sensor_center_screen_location_y">810px</dimen>
+    <dimen name="physical_fingerprint_sensor_center_screen_location_y">620px</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">810px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">620px</dimen>
 </resources>