diff --git a/rro_overlays/ApertureOverlayDevice/AndroidManifest.xml b/rro_overlays/ApertureOverlayDevice/AndroidManifest.xml
index 1d00c9a..10080d0 100644
--- a/rro_overlays/ApertureOverlayDevice/AndroidManifest.xml
+++ b/rro_overlays/ApertureOverlayDevice/AndroidManifest.xml
@@ -4,11 +4,8 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.lineageos.aperture.overlay.device">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="200"
-        android:targetPackage="org.lineageos.aperture" />
-
+          package="org.lineageos.aperture.overlay.device">
+    <overlay android:targetPackage="org.lineageos.aperture"
+             android:isStatic="true"
+             android:priority="200" />
 </manifest>
diff --git a/rro_overlays/ApertureOverlayDevice/res/values/config.xml b/rro_overlays/ApertureOverlayDevice/res/values/config.xml
index 7a2da53..78e05ad 100644
--- a/rro_overlays/ApertureOverlayDevice/res/values/config.xml
+++ b/rro_overlays/ApertureOverlayDevice/res/values/config.xml
@@ -18,26 +18,28 @@
         <item>10</item>
     </string-array>
 
-    <!-- An array of triplets made of (camera ID, qualities, framerates).
+    <!-- An array of triplets made of (camera ID, qualities, frame rates).
          These video modes will be added to the available
-         quality/framerate combinations of a camera device.
+         quality/frame rate combinations of a camera device.
          Make sure the device is able to handle those configurations
-         and maintain a stable framerate at any condition.
+         and maintain a stable frame rate at any condition.
          Note that you can't add video qualities that aren't
-         exposed by the camera, only new framerates.
+         exposed by the camera, only new frame rates.
          Valid values of resolution are:
           - "sd" (480p)
           - "hd" (720p)
           - "fhd" (1080p)
           - "uhd" (2160p)
-         Valid values of framerate are:
+         Valid values of frame rate are:
           - "24"
           - "30"
           - "60"
           - "120"
+         Additionally you can prepend `-` to frame rate to mark it as unsupported.
          Example:
              <string-array name="config_additionalVideoConfigurations">
                  <item>0</item> <item>sd|hd|fhd</item> <item>60|120</item>
+                 <item>0</item> <item>uhd</item> <item>-60</item>
                  <item>1</item> <item>sd|hd|fhd</item> <item>60</item>
              </string-array>
     -->
diff --git a/rro_overlays/FrameworkResOverlayDevice/AndroidManifest.xml b/rro_overlays/FrameworkResOverlayDevice/AndroidManifest.xml
index 252ebfd..0e70d14 100644
--- a/rro_overlays/FrameworkResOverlayDevice/AndroidManifest.xml
+++ b/rro_overlays/FrameworkResOverlayDevice/AndroidManifest.xml
@@ -4,11 +4,8 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.overlay.device">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="200"
-        android:targetPackage="android" />
-
+          package="android.overlay.device">
+    <overlay android:targetPackage="android"
+             android:isStatic="true"
+             android:priority="200" />
 </manifest>
diff --git a/rro_overlays/FrameworkResOverlayDevice/res/values/config.xml b/rro_overlays/FrameworkResOverlayDevice/res/values/config.xml
index 8c153b1..43ec324 100644
--- a/rro_overlays/FrameworkResOverlayDevice/res/values/config.xml
+++ b/rro_overlays/FrameworkResOverlayDevice/res/values/config.xml
@@ -16,11 +16,32 @@
 
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds.  Do not translate. -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
+<resources>
+    <!-- Flag indicating whether we should enable the automatic brightness.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>
 
+    <!-- Note: This setting is deprecated, please use
+    config_screenBrightnessSettingMinimumFloat instead -->
+    <integer name="config_screenBrightnessSettingMinimum">2</integer>
+
+    <!-- Note: This setting is deprecated, please use
+    config_screenBrightnessSettingDefaultFloat instead -->
+    <integer name="config_screenBrightnessSettingDefault">184</integer>
+
+    <!-- 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
+         when adapting to brighter or darker environments.  This parameter controls how quickly
+         brightness changes occur in response to an observed change in light level that exceeds the
+         hysteresis threshold. -->
+    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
+    <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
+
+    <!-- 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">6</integer>
+
     <!-- 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:
          (1-based arrays)
@@ -61,8 +82,7 @@
     </integer-array>
 
     <!-- Array of desired screen brightness in nits corresponding to the lux values
-         in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
-         config_screenBrightnessMaximumNits, the display brightness is defined as the measured
+         in the config_autoBrightnessLevels array. The display brightness is defined as the measured
          brightness of an all-white image.
 
          If this is defined then:
@@ -93,6 +113,81 @@
         <item>427.6287</item>
     </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. -->
+    <integer-array name="config_screenBrightnessBacklight">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>25</item>
+        <item>30</item>
+        <item>35</item>
+        <item>40</item>
+        <item>45</item>
+        <item>50</item>
+        <item>55</item>
+        <item>60</item>
+        <item>65</item>
+        <item>70</item>
+        <item>75</item>
+        <item>80</item>
+        <item>85</item>
+        <item>90</item>
+        <item>95</item>
+        <item>100</item>
+        <item>105</item>
+        <item>110</item>
+        <item>115</item>
+        <item>120</item>
+        <item>125</item>
+        <item>130</item>
+        <item>135</item>
+        <item>140</item>
+        <item>145</item>
+        <item>150</item>
+        <item>155</item>
+        <item>160</item>
+        <item>165</item>
+        <item>170</item>
+        <item>174</item>
+        <item>179</item>
+        <item>184</item>
+        <item>189</item>
+        <item>194</item>
+        <item>199</item>
+        <item>204</item>
+        <item>209</item>
+        <item>214</item>
+        <item>219</item>
+        <item>224</item>
+        <item>229</item>
+        <item>234</item>
+        <item>239</item>
+        <item>244</item>
+        <item>249</item>
+        <item>255</item>
+    </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
          should be measured with an all white image while the display is in the fully on state.
@@ -171,188 +266,6 @@
         <item>427.6287</item>
     </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. -->
-    <integer-array name="config_screenBrightnessBacklight">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>11</item>
-        <item>12</item>
-        <item>13</item>
-        <item>14</item>
-        <item>15</item>
-        <item>16</item>
-        <item>17</item>
-        <item>18</item>
-        <item>19</item>
-        <item>20</item>
-        <item>25</item>
-        <item>30</item>
-        <item>35</item>
-        <item>40</item>
-        <item>45</item>
-        <item>50</item>
-        <item>55</item>
-        <item>60</item>
-        <item>65</item>
-        <item>70</item>
-        <item>75</item>
-        <item>80</item>
-        <item>85</item>
-        <item>90</item>
-        <item>95</item>
-        <item>100</item>
-        <item>105</item>
-        <item>110</item>
-        <item>115</item>
-        <item>120</item>
-        <item>125</item>
-        <item>130</item>
-        <item>135</item>
-        <item>140</item>
-        <item>145</item>
-        <item>150</item>
-        <item>155</item>
-        <item>160</item>
-        <item>165</item>
-        <item>170</item>
-        <item>174</item>
-        <item>179</item>
-        <item>184</item>
-        <item>189</item>
-        <item>194</item>
-        <item>199</item>
-        <item>204</item>
-        <item>209</item>
-        <item>214</item>
-        <item>219</item>
-        <item>224</item>
-        <item>229</item>
-        <item>234</item>
-        <item>239</item>
-        <item>244</item>
-        <item>249</item>
-        <item>255</item>
-    </integer-array>
-
-    <!-- Array of hysteresis constraint values for brightening, represented as tenths of a
-         percent. The length of this array is assumed to be one greater than
-         config_dynamicHysteresisLuxLevels. The brightening threshold is calculated as
-         lux * (1.0f + CONSTRAINT_VALUE). When the current lux is higher than this threshold,
-         the screen brightness is recalculated. See the config_dynamicHysteresisLuxLevels
-         description for how the constraint value is chosen. -->
-    <integer-array name="config_dynamicHysteresisBrightLevels">
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>250</item>
-        <item>300</item>
-        <item>300</item>
-        <item>300</item>
-        <item>300</item>
-        <item>300</item>
-        <item>300</item>
-        <item>400</item>
-        <item>500</item>
-    </integer-array>
-
-    <!-- Array of hysteresis constraint values for darkening, represented as tenths of a
-         percent. The length of this array is assumed to be one greater than
-         config_dynamicHysteresisLuxLevels. The darkening threshold is calculated as
-         lux * (1.0f - CONSTRAINT_VALUE). When the current lux is lower than this threshold,
-         the screen brightness is recalculated. See the config_dynamicHysteresisLuxLevels
-         description for how the constraint value is chosen. -->
-    <integer-array name="config_dynamicHysteresisDarkLevels">
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>200</item>
-        <item>300</item>
-        <item>400</item>
-        <item>400</item>
-        <item>400</item>
-        <item>400</item>
-        <item>400</item>
-        <item>400</item>
-        <item>500</item>
-        <item>500</item>
-    </integer-array>
-
-    <!-- Array of ambient lux threshold values. This is used for determining hysteresis constraint
-         values by calculating the index to use for lookup and then setting the constraint value
-         to the corresponding value of the array. The new brightening hysteresis constraint value
-         is the n-th element of config_dynamicHysteresisBrightLevels, and the new darkening
-         hysteresis constraint value is the n-th element of config_dynamicHysteresisDarkLevels.
-
-         The (zero-based) index is calculated as follows: (MAX is the largest index of the array)
-         condition                      calculated index
-         value < lux[0]                 0
-         lux[n] <= value < lux[n+1]     n+1
-         lux[MAX] <= value              MAX+1 -->
-    <integer-array name="config_dynamicHysteresisLuxLevels">
-        <item>1</item>
-        <item>4</item>
-        <item>12</item>
-        <item>20</item>
-        <item>40</item>
-        <item>65</item>
-        <item>95</item>
-        <item>140</item>
-        <item>200</item>
-        <item>350</item>
-        <item>650</item>
-        <item>1300</item>
-        <item>2000</item>
-        <item>3300</item>
-        <item>6000</item>
-        <item>10000</item>
-    </integer-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">6</integer>
-
-    <!-- Default screen brightness setting.
-         Must be in the range specified by minimum and maximum. -->
-    <integer name="config_screenBrightnessSettingDefault">184</integer>
-
-    <!-- Minimum screen brightness setting allowed by the power manager.
-         The user is forbidden from setting the brightness below this level. -->
-    <integer name="config_screenBrightnessSettingMinimum">2</integer>
-
-    <!-- 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
-         when adapting to brighter or darker environments.  This parameter controls how quickly
-         brightness changes occur in response to an observed change in light level that exceeds the
-         hysteresis threshold. -->
-    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
-    <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
-
-    <!-- The maximum range of gamma adjustment possible using the screen
-         auto-brightness adjustment setting. -->
-    <fraction name="config_autoBrightnessAdjustmentMaxGamma">300%</fraction>
-
     <!-- Amount of time it takes for the light sensor to warm up in milliseconds.
          For this time after the screen turns on, the Power Manager
          will not debounce light sensor readings -->
diff --git a/rro_overlays/FrameworkResOverlayDevice/res/values/dimens.xml b/rro_overlays/FrameworkResOverlayDevice/res/values/dimens.xml
index 78939f5..2102e5e 100644
--- a/rro_overlays/FrameworkResOverlayDevice/res/values/dimens.xml
+++ b/rro_overlays/FrameworkResOverlayDevice/res/values/dimens.xml
@@ -18,13 +18,20 @@
 */
 -->
 <resources>
-    <!-- Height of the status bar.
+    <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
+         calculate the status bar height. -->
+    <dimen name="status_bar_height_default">32dp</dimen>
+
+    <!-- Height of the status bar in portrait.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_default">32dp</dimen>
     <dimen name="status_bar_height_portrait">35dp</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">32dp</dimen>
 
-    <!-- Radius of the software rounded corners. -->
+    <!-- Default radius of the software rounded corners. -->
     <dimen name="rounded_corner_radius">84px</dimen>
 </resources>
diff --git a/rro_overlays/LineageSDKOverlayDevice/AndroidManifest.xml b/rro_overlays/LineageSDKOverlayDevice/AndroidManifest.xml
index ac566a7..cb2634c 100644
--- a/rro_overlays/LineageSDKOverlayDevice/AndroidManifest.xml
+++ b/rro_overlays/LineageSDKOverlayDevice/AndroidManifest.xml
@@ -4,11 +4,8 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="lineageos.platform.overlay.device">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="200"
-        android:targetPackage="lineageos.platform" />
-
+          package="lineageos.platform.overlay.device">
+    <overlay android:targetPackage="lineageos.platform"
+             android:isStatic="true"
+             android:priority="200" />
 </manifest>
diff --git a/rro_overlays/LineageSystemUIOverlayDevice/AndroidManifest.xml b/rro_overlays/LineageSystemUIOverlayDevice/AndroidManifest.xml
index 080eb27..31910a7 100644
--- a/rro_overlays/LineageSystemUIOverlayDevice/AndroidManifest.xml
+++ b/rro_overlays/LineageSystemUIOverlayDevice/AndroidManifest.xml
@@ -4,11 +4,8 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.overlay.lineage.device">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="250"
-        android:targetPackage="com.android.systemui" />
-
+          package="com.android.systemui.overlay.lineage.device">
+    <overlay android:targetPackage="com.android.systemui"
+             android:isStatic="true"
+             android:priority="250" />
 </manifest>
diff --git a/rro_overlays/LineageSystemUIOverlayDevice/res/values/config.xml b/rro_overlays/LineageSystemUIOverlayDevice/res/values/config.xml
deleted file mode 100644
index d7a76bb..0000000
--- a/rro_overlays/LineageSystemUIOverlayDevice/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <!-- Color of the UDFPS pressed view -->
-    <color name="config_udfpsColor">#00ffffff</color>
-</resources>
diff --git a/rro_overlays/LineageSystemUIOverlayDevice/res/values/lineage_config.xml b/rro_overlays/LineageSystemUIOverlayDevice/res/values/lineage_config.xml
new file mode 100644
index 0000000..fd65409
--- /dev/null
+++ b/rro_overlays/LineageSystemUIOverlayDevice/res/values/lineage_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Color of the UDFPS pressed view -->
+    <color name="config_udfpsColor">#00ffffff</color>
+</resources>
diff --git a/rro_overlays/SettingsOverlayDevice/AndroidManifest.xml b/rro_overlays/SettingsOverlayDevice/AndroidManifest.xml
index 45365b0..d739b77 100644
--- a/rro_overlays/SettingsOverlayDevice/AndroidManifest.xml
+++ b/rro_overlays/SettingsOverlayDevice/AndroidManifest.xml
@@ -4,11 +4,8 @@
      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="200"
-        android:targetPackage="com.android.settings" />
-
+          package="com.android.settings.overlay.device">
+    <overlay android:targetPackage="com.android.settings"
+             android:isStatic="true"
+             android:priority="200" />
 </manifest>
diff --git a/rro_overlays/SettingsOverlayDevice/res/values/config.xml b/rro_overlays/SettingsOverlayDevice/res/values/config.xml
index fdd0916..61ebb3c 100644
--- a/rro_overlays/SettingsOverlayDevice/res/values/config.xml
+++ b/rro_overlays/SettingsOverlayDevice/res/values/config.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
     <!-- The radius of the enrollment progress bar, in dp -->
     <integer name="config_udfpsEnrollProgressBar">100</integer>
 </resources>
diff --git a/rro_overlays/SystemUIOverlayDevice/AndroidManifest.xml b/rro_overlays/SystemUIOverlayDevice/AndroidManifest.xml
index b1d712c..69bcc9e 100644
--- a/rro_overlays/SystemUIOverlayDevice/AndroidManifest.xml
+++ b/rro_overlays/SystemUIOverlayDevice/AndroidManifest.xml
@@ -4,11 +4,8 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.overlay.device">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="200"
-        android:targetPackage="com.android.systemui" />
-
+          package="com.android.systemui.overlay.device">
+    <overlay android:targetPackage="com.android.systemui"
+             android:isStatic="true"
+             android:priority="200" />
 </manifest>
diff --git a/rro_overlays/SystemUIOverlayDevice/res/values/dimens.xml b/rro_overlays/SystemUIOverlayDevice/res/values/dimens.xml
index 6dd1e30..86649c7 100644
--- a/rro_overlays/SystemUIOverlayDevice/res/values/dimens.xml
+++ b/rro_overlays/SystemUIOverlayDevice/res/values/dimens.xml
@@ -16,13 +16,17 @@
 */
 -->
 <resources>
+    <!-- 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">950px</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">1900px</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 name="pixel_pitch" format="float" type="dimen">62.98</item>
-
-    <!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">950px</dimen>
-
-    <!-- Location on the screen of the center of the fingerprint sensor. -->
-    <dimen name="physical_fingerprint_sensor_center_screen_location_y">1900px</dimen>
 </resources>