diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
deleted file mode 100644
index 0dd1611..0000000
--- a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014-2015 The CyanogenMod 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>
-    <!-- Default clock position
-         * 0: show the clock in the right position (LTR)
-         * 1: show the clock in the center
-         * 2: show the clock in the left position (LTR)
-    -->
-    <integer name="def_clock_position">2</integer>
-</resources>
diff --git a/overlay-lineage/packages/apps/Settings/res/values/lineage_config.xml b/overlay-lineage/packages/apps/Settings/res/values/lineage_config.xml
deleted file mode 100644
index b7be82f..0000000
--- a/overlay-lineage/packages/apps/Settings/res/values/lineage_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 The XenonHD 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">
-
-    <!-- Defines the location of the fingerprint sensor on the device
-         0 = back
-         1 = front
-         2 = left side
-         3 = right side
-    -->
-    <integer name="config_fingerprintSensorLocation">1</integer>
-
-</resources>
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-pe/frameworks/base/core/res/res/values/config.xml
similarity index 71%
rename from overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
rename to overlay-pe/frameworks/base/core/res/res/values/config.xml
index 9056e62..599526e 100644
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ b/overlay-pe/frameworks/base/core/res/res/values/config.xml
@@ -1,44 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, 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.
-*/
+<!-- Copyright (C) 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.  Do not translate. -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-<!-- The list of vendor package signatures that should also be considered
+    <!-- The list of vendor package signatures that should also be considered
          platform signatures, specifically for use on devices with a vendor partition. -->
     <string-array name="config_vendorPlatformSignatures" translatable="false">
         <item>308203ef308202d7a003020102020900e3258054350f9f87300d06092a864886f70d010105050030818d310b300906035504061302434e3112301006035504080c094775616e67446f6e673116301406035504070c0d5368656e5a68656e20566965773110300e060355040a0c07416e64726f69643110300e060355040b0c07416e64726f69643110300e06035504030c07416e64726f6964311c301a06092a864886f70d010901160d6f70706f406f70706f2e636f6d301e170d3138313132373036353430345a170d3436303431343036353430345a30818d310b300906035504061302434e3112301006035504080c094775616e67446f6e673116301406035504070c0d5368656e5a68656e20566965773110300e060355040a0c07416e64726f69643110300e060355040b0c07416e64726f69643110300e06035504030c07416e64726f6964311c301a06092a864886f70d010901160d6f70706f406f70706f2e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100a3076d6d4300b36bd274f72c96462ff5e600aae0dcead9929651966d79c281fd39b9a86810377fcbaff9069d47eb8a18f0585e3675bc6e8226dcea48b232d73fd8a2935b71beca7d2158abcd89ac2d3036e384974f5e617f8ed9d4dc5131b15c9f1d58af709df262e31f91c0b3f6ff4addea8796b7e5f485227adf7439307855a324175db223bbd8ba3d67b193e445c8ccfe41a818cb1fdf461c64fdecdaa94f462ccdaf772a2711f0213ce90b4e284080cc3a5ddd303e6e1bd30e7262bd806e7060b0a4a5744381118d4759fa0e78277085678cfe72e3ea2c0b56c3491f2c4999ad1c6cca42b0bf3377118798700e0aca5d0da7dd8648944bfef1b7ab72e2ff0203010001a350304e301d0603551d0e041604146aa620e9b2faf6c86f2497fbd74c350c6548d69b301f0603551d230418301680146aa620e9b2faf6c86f2497fbd74c350c6548d69b300c0603551d13040530030101ff300d06092a864886f70d0101050500038201010060dbb658e3386c5a37d3e0deca9f4dc75935bcaedacbe5aa280ab33d0fbfd06b1edf260b807dc9fc60f3011cb04af3bbdd9e53da1184cee0978320c5afbc5dc7006429d0b40392340afb9c32055eb2d642fe94f8f7cbab276f313fca521bee1d16250c6e149fc0ae0fa63a0f3d5bfc3d3b243759cacf04cfaf571af5da98e19a7f519a74081ad337d5ab5fd55c6b06570434edae4602f7a4b59ee4e10e7d2f52d893bb6caed46af5a271aac7b06e14df2bd1f0c4dd6d4c33adca000de1bb8e78875f3c801da0be63f1b52c59913fe6c24c91e3182bef40d6369f3ba8bb4df98587c81f36a110fe16a4cac9f5061b03a056e15fb3bee873754b9a7472da914e0d</item>
     </string-array>
 
-    <!-- Hardware keys present on the device, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareKeys">64</integer>
-
     <!-- Default value for proximity check on screen wake
      NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
     <bool name="config_proximityCheckOnWake">true</bool>
@@ -48,6 +30,9 @@
     <!-- Whether device has screen with higher aspect ratio -->
     <bool name="config_haveHigherAspectRatioScreen">true</bool>
 
+    <!-- Whether device ignores the RSSNR signal implementation -->
+    <bool name="config_ignoreRssnrSignalLevel">true</bool>
+
     <!-- Whether device needs to wait for Qualcomm MPCTL service to start
          before setting power profiles on boot. -->
     <bool name="config_waitForMpctlOnBoot">true</bool>
diff --git a/overlay-lineage/frameworks/base/core/res/res/values/lineage_config.xml b/overlay-pe/frameworks/base/core/res/res/values/custom_config.xml
similarity index 100%
rename from overlay-lineage/frameworks/base/core/res/res/values/lineage_config.xml
rename to overlay-pe/frameworks/base/core/res/res/values/custom_config.xml
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-pe/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
rename to overlay-pe/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 032cf9b..31ea860 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -442,9 +442,6 @@
     <!-- Whether device supports double tap to wake -->
     <bool name="config_supportDoubleTapWake">true</bool>
 
-    <!-- Whether device ignores the RSSNR signal implementation -->
-    <bool name="config_ignoreRssnrSignalLevel">true</bool>
-
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
          specified -->
     <string name="default_wallpaper_component" translatable="false">com.breel.wallpapers19/com.breel.wallpapers19.doodle.wallpaper.variations.DoodleWallpaperV1</string>
diff --git a/sdm710.mk b/sdm710.mk
index 031eebb..190107c 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -22,9 +22,7 @@ PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-# ifneq ($(findstring lineage, $(TARGET_PRODUCT)),)
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
-# endif
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-pe
 
 # Audio
 PRODUCT_PACKAGES += \