diff --git a/overlay/FrameworksResOverlay/res/values/config.xml b/overlay/FrameworksResOverlay/res/values/config.xml
index e33df9d..7eae1ad 100644
--- a/overlay/FrameworksResOverlay/res/values/config.xml
+++ b/overlay/FrameworksResOverlay/res/values/config.xml
@@ -45,6 +45,40 @@
     <integer-array name="config_ambientDarkeningThresholds">
         <item>200</item>
     </integer-array>
+
+    <!-- Array of desired screen brightness in nits corresponding to the lux values
+         in the config_autoBrightnessLevels array. The display brightness is defined as the measured
+         brightness of an all-white image.
+
+         If this is defined then:
+            - config_autoBrightnessLcdBacklightValues should not be defined
+            - config_screenBrightnessNits must be defined
+            - config_screenBrightnessBacklight must be defined
+
+         This array should have size one greater than the size of the config_autoBrightnessLevels
+         array. The brightness values must be non-negative and non-decreasing. This must be
+         overridden in platform specific overlays -->
+    <integer-array name="config_autoBrightnessLcdBacklightValues">
+        <item>8</item>
+        <item>64</item>
+        <item>98</item>
+        <item>104</item>
+        <item>110</item>
+        <item>116</item>
+        <item>122</item>
+        <item>128</item>
+        <item>134</item>
+        <item>182</item>
+        <item>255</item>
+        <item>255</item>
+        <item>255</item>
+        <item>255</item>
+        <item>255</item>
+        <item>255</item>
+        <item>255</item>
+        <item>255</item>
+    </integer-array>
+
     <!-- An array describing the screen's backlight values corresponding to the brightness
          values in the config_screenBrightnessNits array. -->
     <integer-array name="config_screenBrightnessBacklight">
@@ -257,6 +291,18 @@
     <!-- Flag specifying whether WFC over IMS is available on device -->
     <bool name="config_device_wfc_ims_available">true</bool>
 
+    <!-- Set this to true to enable the platform's auto-power-save modes like doze and
+     app standby.  These are not enabled by default because they require a standard
+     cloud-to-device messaging service for apps to interact correctly with the modes
+     (such as to be able to deliver an instant message to the device even when it is
+     dozing).  This should be enabled if you have such services and expect apps to
+     correctly use them when installed on your device.  Otherwise, keep this disabled
+     so that applications can still use their own mechanisms. -->
+    <bool name="config_enableAutoPowerModes">true</bool>
+
+    <!-- True if the device supports Sustained Performance Mode -->
+    <bool name="config_sustainedPerformanceModeSupported">true</bool>
+
     <!-- Flag specifying whether WFC over IMS should be available for carrier: independent of
          carrier provisioning. If false: hard disabled. If true: then depends on carrier
          provisioning, availability etc -->
@@ -270,6 +316,10 @@
          provisioning, availability etc -->
     <bool name="config_carrier_volte_available">true</bool>
 
+    <!-- List of comma separated package names for which we the system will not show crash like
+         tts, etc. dialogs. -->
+    <string name="config_appsNotReportingCrashes">com.google.android.tts</string>
+
     <!-- Flag specifying whether VoLTE TTY is supported -->
     <bool name="config_carrier_volte_tty_supported">true</bool>
 
@@ -281,6 +331,9 @@
          available on some devices. -->
     <bool name="config_enableHapticTextHandle">true</bool>
 
+     <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
+     <bool name="config_wifi_dual_band_support">true</bool>
+
     <!-- Default list of files pinned by the Pinner Service -->
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
         <item>"/system/framework/framework.jar"</item>
@@ -293,6 +346,23 @@
         <item>"/system/bin/surfaceflinger"</item>
     </string-array>
 
+    <!-- Whether WiFi display is supported by this device.
+         There are many prerequisites for this feature to work correctly.
+         Here are a few of them:
+         * The WiFi radio must support WiFi P2P.
+         * The WiFi radio must support concurrent connections to the WiFi display and
+           to an access point.
+         * The Audio Server audio_policy_configuration.xml file must specify a rule for
+           the "r_submix" remote submix module.  This module is used to record and stream system
+           audio output to the WiFi display encoder in the media server.
+         * The remote submix module "audio.r_submix.default" must be installed on the device.
+         * The device must be provisioned with HDCP keys (for protected content).
+    -->
+    <bool name="config_enableWifiDisplay">true</bool>
+
+    <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
+    <bool name="config_zramWriteback">true</bool>
+
     <!-- Should the pinner service pin the Home application? -->
     <bool name="config_pinnerHomeApp">true</bool>
 
@@ -307,7 +377,9 @@
     <!-- Pulled from Ren's TrebleDroid Pova 4 Pro overlay -->
     <bool name="config_dozeAfterScreenOff">true</bool>
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-    <integer name="config_defaultPeakRefreshRate">121</integer>
-    <integer name="config_defaultRefreshRate">121</integer>
+    <integer name="config_defaultPeakRefreshRate">90</integer>
+    <integer name="config_defaultRefreshRate">90</integer>
     <integer name="config_screenBrightnessDoze">5</integer>
+     <!-- Determines whether the shell features all run on another thread.  -->
+     <bool name="config_enableShellMainThread">true</bool>
 </resources>
diff --git a/overlay/SystemUIOverlay/res/values/config.xml b/overlay/SystemUIOverlay/res/values/config.xml
new file mode 100755
index 0000000..cf39abf
--- /dev/null
+++ b/overlay/SystemUIOverlay/res/values/config.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, 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>
+    <!-- Doze: check proximity sensor before pulsing? -->
+    <bool name="doze_proximity_check_before_pulse">false</bool>
+
+    <!-- Doze: does this device support STATE_DOZE?  -->
+    <bool name="doze_display_state_supported">true</bool>
+
+
+    <!-- If not zero, limits the internal screen recorder's framerate to the set value. -->
+    <integer name="config_screenRecorderMaxFramerate">90</integer>
+
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+</resources>
diff --git a/overlay/SystemUIOverlay/res/values/dimens.xml b/overlay/SystemUIOverlay/res/values/dimens.xml
index 985f5a5..1a77898 100644
--- a/overlay/SystemUIOverlay/res/values/dimens.xml
+++ b/overlay/SystemUIOverlay/res/values/dimens.xml
@@ -16,24 +16,31 @@
 */
 -->
 <resources>
-    <!-- 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 physical volume up/down buttons -->
+    <dimen name="physical_volume_down_button_center_screen_location_y">1150px</dimen>
+    <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen>
 
-    <!-- Location on the screen of the center of the fingerprint sensor. For devices with under
+    <!-- Location on the screen of the center of the physical power button. -->
+    <dimen name="physical_power_button_center_screen_location_y">1025px</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">1100px</dimen>
 
+    <!-- Location on the screen of the center of the fingerprint sensor -->
+    <dimen name="physical_fingerprint_sensor_center_screen_location_x">1080px</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">1100px</dimen>
-    
-    <dimen name="rounded_corner_content_padding">47.0px</dimen>
+
+    <!-- The padding on the side of the navigation bar. Must be greater than or equal to
+         navigation_extra_key_width -->
+    <dimen name="navigation_side_padding">85.0dip</dimen>
+    <dimen name="rounded_corner_content_padding">10dp</dimen>
     <dimen name="status_bar_padding_end">4.0dip</dimen>
     <dimen name="status_bar_padding_start">4.0dip</dimen>
 </resources>