diff --git a/device.mk b/device.mk
index 69fbf9a..7ad04c7 100644
--- a/device.mk
+++ b/device.mk
@@ -25,7 +25,6 @@ $(call inherit-product, device/motorola/sm6375-common/common.mk)
 PRODUCT_PACKAGES += \
     FrameworksResDevice \
     LineageSystemUIDevice \
-    SettingsResDevice \
     SystemUIResDevice \
     WifiResDevice
 
diff --git a/resource-overlay/device/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml
index d2a92f0..0ff0540 100644
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
@@ -13,13 +13,13 @@
     <!-- Vibrator pattern for feedback about touching a virtual key -->
     <integer-array name="config_virtualKeyVibePattern">
         <item>0</item>
-        <item>50</item>
+        <item>30</item>
     </integer-array>
 
     <!-- Vibrator pattern for feedback when selecting an hour/minute tick of a Clock -->
     <integer-array name="config_clockTickVibePattern">
-        <item>0</item>
-        <item>40</item>
+        <item>125</item>
+        <item>30</item>
     </integer-array>
 
     <!-- Minimum screen brightness setting allowed by power manager.
@@ -77,9 +77,6 @@
         <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
@@ -95,7 +92,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>3</item>
+        <item>2</item>
         <item>7</item>
         <item>10</item>
         <item>12</item>
@@ -104,11 +101,8 @@
         <item>111</item>
         <item>149</item>
         <item>192</item>
-        <item>325</item>
+        <item>252</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
@@ -116,19 +110,17 @@
 
          This array should be equal in size to config_screenBrightnessBacklight. -->
     <integer-array name="config_screenBrightnessBacklight">
-        <item>9</item>
-        <item>27</item>
-        <item>35</item>
-        <item>38</item>
-        <item>55</item>
-        <item>106</item>
-        <item>113</item>
+        <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>129</item>
-        <item>147</item>
-        <item>183</item>
-        <item>228</item>
-        <item>239</item>
-        <item>244</item>
         <item>255</item>
     </integer-array>
 
@@ -140,7 +132,8 @@
 
          This array should be equal in size to config_screenBrightnessBacklight -->
     <integer-array name="config_screenBrightnessNits">
-        <item>3</item>
+        <item>0</item>
+        <item>2</item>
         <item>7</item>
         <item>10</item>
         <item>12</item>
@@ -149,11 +142,8 @@
         <item>111</item>
         <item>149</item>
         <item>192</item>
-        <item>325</item>
+        <item>252</item>
         <item>500</item>
-        <item>700</item>
-        <item>800</item>
-        <item>1000</item>
     </integer-array>
 
     <!-- MMS user agent string -->
@@ -199,31 +189,37 @@
          @see https://www.w3.org/TR/SVG/paths.html#PathData
          -->
     <string name="config_mainBuiltInDisplayCutout" translatable="false">
-        M 507,63
-        a 33,33 0 1 0 66,0
-        a 33,33 0 1 0 -66,0
-        Z
-        @left
-    </string>
-
-    <!-- Like config_mainBuiltInDisplayCutout, but this path is used to report the
-         one single bounding rect per device edge to the app via
-         {@link DisplayCutout#getBoundingRect}. Note that this path should try to match the visual
-         appearance of the cutout as much as possible, and may be smaller than
-         config_mainBuiltInDisplayCutout
-         -->
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation" translatable="false">
-        M -33 0
-        L -33 126
-        L 33 126
-        L 33 0
+        M -34,0
+        L -34,100
+        L 34,100
+        L 34,0
         Z
     </string>
 
-    <!-- Whether the display cutout region of the main built-in display should be forced to
-         black in software (to avoid aliasing or emulate a cutout that is not physically existent).
-         -->
-    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
+    <!-- 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,
+         and Strength as defined in Authenticators.java -->
+    <string-array name="config_biometric_sensors" translatable="false">
+        <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
+    </string-array>
+
+    <!-- An array of arrays of side fingerprint sensor properties relative to each display.
+         Note: this value is temporary and is expected to be queried directly
+         from the HAL in the future. -->
+    <array name="config_sfps_sensor_props" translatable="false">
+        <item>@array/config_sfps_sensor_props_0</item>
+    </array>
+
+    <array name="config_sfps_sensor_props_0" translatable="false">
+        <item>local:4630947043778501761</item> <!--item>displayId</item-->
+        <item>1080</item> <!--item>sensorLocationX</item-->
+        <item>815</item> <!--item>sensorLocationY</item-->
+        <item>200</item> <!--item>sensorRadius</item-->
+    </array>
+
+    <!-- Indicates whether device has a power button fingerprint sensor. -->
+    <bool name="config_is_powerbutton_fps" translatable="false">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
@@ -243,32 +239,15 @@
 
     <!-- Low zone brightness thresholds in the range [0, 255] -->
     <integer-array name="config_brightnessThresholdsOfPeakRefreshRate" translatable="false">
-        <item>77</item>
-        <item>62</item>
+        <item>72</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,
-         and Strength as defined in Authenticators.java -->
-    <string-array name="config_biometric_sensors" translatable="false">
-        <item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
-    </string-array>
-
-    <!-- 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>2168</item> <!-- sensorLocationY -->
-        <item>91</item> <!-- sensorRadius -->
-    </integer-array>
+    <integer name="config_defaultRefreshRateInZone">120</integer>
 </resources>
diff --git a/resource-overlay/device/Frameworks/res/values/dimens.xml b/resource-overlay/device/Frameworks/res/values/dimens.xml
index 8077006..ea4fda8 100644
--- a/resource-overlay/device/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/device/Frameworks/res/values/dimens.xml
@@ -14,7 +14,7 @@
     <!-- Height of the status bar in portrait.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_portrait">126px</dimen>
+    <dimen name="status_bar_height_portrait">100px</dimen>
 
     <!-- Height of the status bar in landscape.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
@@ -22,5 +22,5 @@
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Default radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">105px</dimen>
+    <dimen name="rounded_corner_radius">95px</dimen>
 </resources>
diff --git a/resource-overlay/device/Settings/Android.bp b/resource-overlay/device/Settings/Android.bp
deleted file mode 100644
index 3fd9f54..0000000
--- a/resource-overlay/device/Settings/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// SPDX-FileCopyrightText: The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "SettingsResDevice",
-    vendor: true,
-}
diff --git a/resource-overlay/device/Settings/AndroidManifest.xml b/resource-overlay/device/Settings/AndroidManifest.xml
deleted file mode 100644
index 9e0553c..0000000
--- a/resource-overlay/device/Settings/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay.device">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="600"
-        android:targetPackage="com.android.settings" />
-</manifest>
diff --git a/resource-overlay/device/Settings/res/values/config.xml b/resource-overlay/device/Settings/res/values/config.xml
deleted file mode 100644
index 48afae3..0000000
--- a/resource-overlay/device/Settings/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- 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/config.xml b/resource-overlay/device/SystemUI/res/values/config.xml
index ae3a4cb..3069b08 100644
--- a/resource-overlay/device/SystemUI/res/values/config.xml
+++ b/resource-overlay/device/SystemUI/res/values/config.xml
@@ -14,9 +14,9 @@
       DisplayCutout path will be rendered
        -->
     <string name="config_frontBuiltInDisplayCutoutProtection" translatable="false">
-        M 503,63
-        a 37,37 0 1 0 74,0
-        a 37,37 0 1 0 -74,0
+        M 661,72
+        a 57,57 0 1 0 114,0
+        a 57,57 0 1 0 -114,0
         Z
     </string>
 
diff --git a/resource-overlay/device/SystemUI/res/values/dimens.xml b/resource-overlay/device/SystemUI/res/values/dimens.xml
index 7aabe10..3a57b30 100644
--- a/resource-overlay/device/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/device/SystemUI/res/values/dimens.xml
@@ -16,11 +16,20 @@
     <!--  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 fingerprint sensor. For devices with under
+     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.
+     By default, this is set to @null to use the horizontal center of the screen. -->
+    <dimen name="physical_fingerprint_sensor_center_screen_location_x">1080px</dimen>
+
+    <!-- Location on the screen of the center of the fingerprint sensor. For devices with under
+     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>
+
     <!-- 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">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. -->
-    <item format="float" name="pixel_pitch" type="dimen">62.73</item>
+    <dimen name="physical_power_button_center_screen_location_y">810px</dimen>
 </resources>