diff --git a/device.mk b/device.mk
index 23406a467e57db2e2e1a31becb34cae4d8cc21a7..ce480750050e738a74eaae5a97dd7ac64430c1e2 100644
--- a/device.mk
+++ b/device.mk
@@ -322,11 +322,14 @@ PRODUCT_PACKAGES += \
     libstagefrighthw
 
 # Overlay
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
+
 PRODUCT_PACKAGES += \
     CarrierConfigResCommon \
     eCameraTarget \
     FrameworksResCommon \
     FrameworksResTarget \
+    SettingsProviderRes \
     SettingsResCommon \
     SystemUIResCommon \
     SystemUIResTarget \
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-lineage/packages/apps/Settings/res/values/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7050a9828f2e91d66f6537c492c1784bb7612804
--- /dev/null
+++ b/overlay-lineage/packages/apps/Settings/res/values/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2021, The LineageOS 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Whether to show min refresh rate in display settings -->
+    <bool name="config_show_min_refresh_rate_switch">true</bool>
+</resources>
diff --git a/overlay/FrameworksResCommon/res/values/config.xml b/overlay/FrameworksResCommon/res/values/config.xml
index d37afc88db8208a744559904d57e85816dfb0c48..3e117ff55a195c91cc216f0355ab2cbb8f16c15d 100644
--- a/overlay/FrameworksResCommon/res/values/config.xml
+++ b/overlay/FrameworksResCommon/res/values/config.xml
@@ -94,25 +94,11 @@
          the restoring is handled by modem if it is true -->
     <bool name="skip_restoring_network_selection">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_defaultPeakRefreshRate">240</integer>
-
-    <!-- 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">60</integer>
 
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">4</integer>
diff --git a/overlay/SettingsProviderRes/Android.bp b/overlay/SettingsProviderRes/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..31723c577f81b92fdb568b03e36ec9c22b4ba03e
--- /dev/null
+++ b/overlay/SettingsProviderRes/Android.bp
@@ -0,0 +1,8 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+runtime_resource_overlay {
+    name: "SettingsProviderRes",
+    product_specific: true,
+}
diff --git a/overlay/SettingsProviderRes/AndroidManifest.xml b/overlay/SettingsProviderRes/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0d5b64c92f0e41dc774497bd79f83473e3250b59
--- /dev/null
+++ b/overlay/SettingsProviderRes/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.providers.settings.overlay">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="800"
+        android:targetPackage="com.android.providers.settings" />
+</manifest>
diff --git a/overlay/SettingsProviderRes/res/values/defaults.xml b/overlay/SettingsProviderRes/res/values/defaults.xml
new file mode 100644
index 0000000000000000000000000000000000000000..282daa4262bee84d0329ff7745fed29392a62c24
--- /dev/null
+++ b/overlay/SettingsProviderRes/res/values/defaults.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
+<resources>
+    <!-- Automatic Brightness -->
+    <bool name="def_screen_brightness_automatic_mode">true</bool>
+</resources>