diff --git a/common.mk b/common.mk
index 9bd00cd..7a161bd 100644
--- a/common.mk
+++ b/common.mk
@@ -224,9 +224,17 @@ PRODUCT_PACKAGES += \
 # Overlays
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
-PRODUCT_PACKAGE_OVERLAYS += \
-    $(COMMON_PATH)/overlay \
-    $(COMMON_PATH)/overlay-lineage \
+PRODUCT_PACKAGES += \
+    FrameworksResCommon \
+    FrameworksResSamsung \
+    SettingsResCommon \
+    SettingsProviderResCommon \
+    SystemUIResCommon \
+    TelecommResCommon \
+    TelephonyResCommon \
+
+DEVICE_PACKAGE_OVERLAYS += \
+    $(COMMON_PATH)/overlay-lineage
 
 # Partitions
 PRODUCT_PACKAGES += \
diff --git a/overlay-lineage/frameworks/base/core/res/res/values/config.xml b/overlay-lineage/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 952fbd3..0000000
--- a/overlay-lineage/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-
-    <!-- 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 Flinger audio_policy.conf 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>
-</resources>
diff --git a/overlay-lineage/frameworks/base/packages/SettingsLib/res/values/config.xml b/overlay-lineage/frameworks/base/packages/SettingsLib/res/values/config.xml
new file mode 100644
index 0000000..77a636e
--- /dev/null
+++ b/overlay-lineage/frameworks/base/packages/SettingsLib/res/values/config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<resources>
+    <!-- Threshold in micro watts above which a charger is rated as "fast"; 2.16A @ 5V  -->
+    <integer name="config_chargingFastThreshold">10800000</integer>
+</resources>
diff --git a/overlay-lineage/frameworks/base/packages/SettingsLibs/res/values/config.xml b/overlay-lineage/frameworks/base/packages/SettingsLibs/res/values/config.xml
deleted file mode 100644
index 70dbbae..0000000
--- a/overlay-lineage/frameworks/base/packages/SettingsLibs/res/values/config.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Threshold in micro watts below which a charger is rated as "slow"; 1A @ 5V -->
-    <integer name="config_chargingSlowlyThreshold">5000</integer>
-
-    <!-- Threshold in micro watts above which a charger is rated as "fast"; 1.5A @ 5V  -->
-    <integer name="config_chargingFastThreshold">7500</integer>
-</resources>
diff --git a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml
deleted file mode 100644
index cbcf4a7..0000000
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Charging info current divider, if needed -->
-    <integer name="config_currentInfoDivider" translatable="false">1</integer>
-
-    <!-- Should we listen for fingerprints when the screen is off?  Devices
-         with a rear-mounted sensor want this, but certain devices have
-         the sensor embedded in the power key and listening all the time
-         causes a poor experience. -->
-    <bool name="config_fingerprintWakeAndUnlock">false</bool>
-</resources>
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
index fa38fb5..c96c10d 100644
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2024 The LineageOS Project
- *
+ * SPDX-FileCopyrightText: The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 -->
 <resources>
+    <!-- The list of package IDs that are allowed to use aux cameras.
+         NOTE: If this list is empty then all apps will be able to use aux cameras. -->
+    <string-array name="config_cameraAuxPackageAllowList" translatable="false">
+        <item>com.android.camera</item>
+    </string-array>
+
+    <!-- Whether device has screen with higher aspect ratio -->
     <bool name="config_haveHigherAspectRatioScreen">true</bool>
 
+    <!-- Whether device has a notch -->
+    <bool name="config_haveNotch">true</bool>
+
     <!-- Defines the actions shown in advanced reboot submenu -->
     <string-array name="config_restartActionsList">
         <item>restart</item>
         <item>restart_recovery</item>
-        <item>restart_download</item>
+        <item>restart_bootloader</item>
         <item>restart_fastboot</item>
      </string-array>
-
-    <!-- The list of package IDs that are allowed to use aux cameras.
-         NOTE: If this list is empty then all apps will be able to use aux cameras. -->
-    <string-array name="config_cameraAuxPackageAllowList" translatable="false">
-        <item>org.codeaurora.snapcam</item>
-        <item>com.android.camera</item>
-        <item>org.lineageos.aperture</item>
-        <item>org.lineageos.aperture.dev</item>
-    </string-array>
 </resources>
diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
index e6d0f14..88d6144 100644
--- a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
+++ b/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
 -->
 <resources>
     <!-- Default for Settings.Global.DISABLE_WINDOW_BLURS -->
diff --git a/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml b/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
new file mode 100644
index 0000000..fd2a063
--- /dev/null
+++ b/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Enable auxiliary cameras selector. -->
+    <bool name="config_enableAuxCameras">true</bool>
+</resources>
diff --git a/overlay/packages/apps/LineageParts/res/values/config.xml b/overlay-lineage/packages/apps/LineageParts/res/values/config.xml
similarity index 90%
rename from overlay/packages/apps/LineageParts/res/values/config.xml
rename to overlay-lineage/packages/apps/LineageParts/res/values/config.xml
index 1032160..db82ce8 100644
--- a/overlay/packages/apps/LineageParts/res/values/config.xml
+++ b/overlay-lineage/packages/apps/LineageParts/res/values/config.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2024 The LineageOS Project
- *
+ * SPDX-FileCopyrightText: The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
     <!-- Default action ids for a device's touchscreen gestures
          The array should be sorted in the same order as the
          touchscreen gestures advertised by the device's LineageHW impl. -->
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-lineage/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index eae1042..0000000
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Show battery cycle count -->
-    <bool name="config_show_battery_cycle_count" translatable="false">true</bool>
-</resources>
diff --git a/overlay/FrameworksResCommon/Android.bp b/overlay/FrameworksResCommon/Android.bp
new file mode 100644
index 0000000..f1f51bb
--- /dev/null
+++ b/overlay/FrameworksResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "FrameworksResCommon",
+    vendor: true,
+}
diff --git a/overlay/FrameworksResCommon/AndroidManifest.xml b/overlay/FrameworksResCommon/AndroidManifest.xml
new file mode 100644
index 0000000..7024c00
--- /dev/null
+++ b/overlay/FrameworksResCommon/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.overlay.common">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="100"
+        android:targetPackage="android" />
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/FrameworksResCommon/res/values/config.xml
similarity index 87%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to overlay/FrameworksResCommon/res/values/config.xml
index 29fc056..d2fc3f9 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/FrameworksResCommon/res/values/config.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2024 The LineageOS Project
- *
+ * SPDX-FileCopyrightText: The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 -->
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- If true, the screen can be rotated via the accelerometer in all 4
+         rotations as the default behavior. -->
+    <bool name="config_allowAllRotations">true</bool>
+
     <!-- Allow automatic adjusting of the screen brightness while dozing in low power state. -->
     <bool name="config_allowAutoBrightnessWhileDozing">true</bool>
 
@@ -113,77 +116,84 @@
     <!-- Indicate whether the SD card is accessible without removing the battery. -->
     <bool name="config_batterySdCardAccessibility">true</bool>
 
-    <!-- Boolean indicating if current platform supports BLE peripheral mode -->
-    <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
+    <!-- Operating volatage for bluetooth controller. 0 by default-->
+    <integer name="config_bluetooth_operating_voltage_mv">3300</integer>
 
-    <!-- Default files to pin via Pinner Service -->
+    <!-- Flag specifying whether VoLTE should be available for carrier: independent of
+         carrier provisioning. If false: hard disabled. If true: then depends on carrier
+         provisioning, availability etc -->
+    <bool name="config_carrier_volte_available">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 -->
+    <bool name="config_carrier_wfc_ims_available">true</bool>
+
+    <!-- Default list of files pinned by the Pinner Service -->
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
-        <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
         <item>"/apex/com.android.art/javalib/core-libart.jar"</item>
+        <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
         <item>"/system/framework/framework.jar"</item>
         <item>"/system/framework/services.jar"</item>
         <item>"/system/bin/surfaceflinger"</item>
         <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
     </string-array>
 
-   <!-- Flag specifying whether VT is available on device -->
-    <bool name="config_device_vt_available">true</bool>
+    <!-- Flag specifying whether VoLTE is available on device -->
+    <bool name="config_device_volte_available">true</bool>
 
-    <!-- Whether WM DisplayContent supports high performance transitions
-         (lower-end devices may want to disable) -->
-    <bool name="config_deviceSupportsHighPerfTransitions">false</bool>
+    <!-- Flag specifying whether WFC over IMS is available on device -->
+    <bool name="config_device_wfc_ims_available">true</bool>
+
+    <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->
+    <bool name="config_displayBlanksAfterDoze">true</bool>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
     <bool name="config_dozeAfterScreenOffByDefault">true</bool>
 
     <!-- Control whether the always on display mode is available. This should only be enabled on
-         devices where the display has been tuned to be power efficient in DOZE and/or DOZE_SUSPEND
+         devices where the display has be tuned to be power efficient in DOZE and/or DOZE_SUSPEND
          states. -->
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
 
-    <!-- Control whether the always on display mode is enabled by default. This value will be used
-         during initialization when the setting is still null. -->
-    <bool name="config_dozeAlwaysOnEnabled">false</bool>
-
     <!-- ComponentName of a dream to show whenever the system would otherwise have
          gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
          try to start this dream if possible.  The dream should typically call startDozing()
          to put the display into a low power state and allow the application processor
          to be suspended.  When the dream ends, the system will go to sleep as usual.
          Specify the component name or an empty string if none.
-
          Note that doze dreams are not subject to the same start conditions as ordinary dreams.
          Doze dreams will run whenever the power manager is in a dozing state. -->
     <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
-    <!-- If device supports pickup/lift gesture -->
-    <bool name="config_dozePulsePickup">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>
+    <!-- Doze: should the TYPE_PICK_UP_GESTURE sensor be used as a pulse signal. -->
+    <bool name="config_dozePulsePickup">false</bool>
 
     <!-- If true, the display will be shifted around in ambient mode. -->
     <bool name="config_enableBurnInProtection">true</bool>
 
-    <!-- Enables or disables haptic effect when the text insertion/selection handle is moved
-         manually by the user. Off by default, since the expected haptic feedback may not be
-         available on some devices. -->
-    <bool name="config_enableHapticTextHandle">true</bool>
+    <!-- Enable lockscreen rotation by default -->
+    <bool name="config_enableLockScreenRotation">true</bool>
 
     <!-- Whether the new Auto Selection Network UI should be shown -->
     <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
 
-    <!-- Whether Hearing Aid profile is supported -->
-    <bool name="config_hearing_aid_profile_supported">true</bool>
+    <!-- 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 Flinger audio_policy.conf 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>
 
-    <!-- Is the device capable of hot swapping an UICC Card -->
+    <!-- Is the device capable of hot swapping an ICC Card -->
     <bool name="config_hotswapCapable">true</bool>
 
     <!-- Indicate whether closing the lid causes the device to go to sleep and opening
@@ -196,16 +206,23 @@
          will not debounce light sensor readings -->
     <integer name="config_lightSensorWarmupTime">200</integer>
 
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">Android-Mms/2.0</string>
+
+    <!-- MMS user agent prolfile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
+
     <!-- Control whether Night display is available. This should only be enabled on devices
          that have a HWC implementation that can apply the matrix passed to setColorTransform
          without impacting power, performance, and app compatibility (e.g. protected content). -->
     <bool name="config_nightDisplayAvailable">true</bool>
 
-    <!-- Maximum color temperature, in Kelvin, supported by Night display. -->
-    <integer name="config_nightDisplayColorTemperatureMax">8192</integer>
-
-    <!-- Should the pinner service pin the Camera application? -->
-    <bool name="config_pinnerCameraApp">true</bool>
+    <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and
+         is not necessarily the same as the number of phones/logical modems supported by the device.
+         For example, a multi-sim device can have 2 phones/logical modems, but 3 physical slots,
+         or a single SIM device can have 1 phones/logical modems, but 2 physical slots (one eSIM
+         and one pSIM) -->
+    <integer name="config_num_physical_slots">2</integer>
 
     <!-- Bytes that the PinnerService will pin for Home app -->
     <integer name="config_pinnerHomePinBytes">6291456</integer>
@@ -224,7 +241,7 @@
          to maximize power savings but not all devices support it.
          Refer to autosuspend.h for details.
     -->
-    <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
+    <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">false</bool>
 
     <!-- Power Management: Specifies whether to decouple the interactive state of the
          device from the display on/off state.
@@ -239,13 +256,7 @@
          to maximize power savings but not all devices support it.
          Refer to power.h for details.
     -->
-    <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
-
-    <!-- The RadioAccessFamilies supported by the device.
-         Empty is viewed as "all".  Only used on devices which
-         don't support RIL_REQUEST_GET_RADIO_CAPABILITY
-         format is UMTS|LTE|... -->
-    <string name="config_radio_access_family">GSM|WCDMA|LTE</string>
+    <bool name="config_powerDecoupleInteractiveModeFromDisplay">false</bool>
 
     <!-- An array describing the screen's backlight values corresponding to the brightness
          values in the config_screenBrightnessNits array.
@@ -1259,15 +1270,10 @@
     <bool name="config_showNavigationBar">true</bool>
 
     <!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
-    <integer name="config_shutdownBatteryTemperature">680</integer>
-
-    <!-- Whether to enable shifting of elements in the status bar and the navigation bar.
-         Should be enabled for OLED devices to reduce/prevent burn in on the status bar
-         and on the navigation bar and disabled for all other devices. -->
-    <bool name="config_statusBarBurnInProtection">true</bool>
+    <integer name="config_shutdownBatteryTemperature">600</integer>
 
     <!-- Whether the Unprocessed audio source supports the required frequency range and level -->
-    <bool name="config_supportAudioSourceUnprocessed">false</bool>
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
 
     <!-- Whether device supports double tap to wake -->
     <bool name="config_supportDoubleTapWake">true</bool>
@@ -1287,46 +1293,26 @@
          phone object irrespective of this config -->
     <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
 
+    <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
+    <bool name="config_unplugTurnsOnScreen">true</bool>
+
     <!-- When true use the linux /dev/input/event subsystem to detect the switch changes
          on the headphone/microphone jack. When false use the older uevent framework. -->
     <bool name="config_useDevInputEventForAudioJack">true</bool>
 
-    <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
-    <bool name="config_unplugTurnsOnScreen">true</bool>
+    <!-- This string array should be overridden by the device to present a list of radio
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[ConnectivityManager connectionType],
+                      [# simultaneous connection types]"  -->
+    <string-array translatable="false" name="radioAttributes">
+        <item>"1,1"</item>
+        <item>"0,1"</item>
+        <item>"7,1"</item>
+        <item>"9,1"</item>
+    </string-array>
 
-    <!-- Disables compatibility WAL mode.
-         In this mode, only database journal mode will be changed, connection pool
-         size will still be limited to a single connection. -->
-    <bool name="db_compatibility_wal_supported">false</bool>
-
-    <!-- The default journal mode to use use when Write-Ahead Logging is not active.
-         Choices are: OFF, DELETE, TRUNCATE, PERSIST and MEMORY.
-         PERSIST may improve performance by reducing how often journal blocks are
-         reallocated (compared to truncation) resulting in better data block locality
-         and less churn of the storage media.
-         The PERSIST mode results in data persisting in the journal beyond the life of
-         a transaction, so it interacts poorly with SECURE_DELETE. -->
-    <string name="db_default_journal_mode" translatable="false">MEMORY</string>
-
-    <!-- The database synchronization mode when using the default journal mode.
-         FULL is safest and preserves durability at the cost of extra fsyncs.
-         NORMAL also preserves durability in non-WAL modes and uses checksums to ensure
-         integrity although there is a small chance that an error might go unnoticed.
-         Choices are: FULL, NORMAL, OFF. -->
-    <string name="db_default_sync_mode" translatable="false">NORMAL</string>
-
-    <!-- The database synchronization mode when using Write-Ahead Logging.
-         From https://www.sqlite.org/pragma.html#pragma_synchronous:
-         WAL mode is safe from corruption with synchronous=NORMAL, and probably DELETE mode is safe
-         too on modern filesystems. WAL mode is always consistent with synchronous=NORMAL, but WAL
-         mode does lose durability. A transaction committed in WAL mode with
-         synchronous=NORMAL might roll back following a power loss or system crash.
-         Transactions are durable across application crashes regardless of the synchronous setting
-         or journal mode. The synchronous=NORMAL setting is a good choice for most applications
-         running in WAL mode.
-         Choices are: FULL, NORMAL, OFF. -->
-    <string name="db_wal_sync_mode" translatable="false">NORMAL</string>
-
-    <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
-    <bool name="config_zramWriteback">true</bool>
+    <!-- Boolean indicating if restoring network selection should be skipped -->
+    <!-- The restoring is handled by modem if it is true-->
+    <bool translatable="false" name="skip_restoring_network_selection">true</bool>
 </resources>
diff --git a/overlay/FrameworksResSamsung/Android.bp b/overlay/FrameworksResSamsung/Android.bp
new file mode 100644
index 0000000..c4fef2b
--- /dev/null
+++ b/overlay/FrameworksResSamsung/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "FrameworksResSamsung",
+    vendor: true,
+}
diff --git a/overlay/FrameworksResSamsung/AndroidManifest.xml b/overlay/FrameworksResSamsung/AndroidManifest.xml
new file mode 100644
index 0000000..ab635f8
--- /dev/null
+++ b/overlay/FrameworksResSamsung/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.overlay.samsung">
+    <overlay android:targetPackage="android"
+                   android:isStatic="true"
+                   android:priority="600"/>
+</manifest>
diff --git a/overlay/FrameworksResSamsung/res/values/config.xml b/overlay/FrameworksResSamsung/res/values/config.xml
new file mode 100644
index 0000000..a1dc69e
--- /dev/null
+++ b/overlay/FrameworksResSamsung/res/values/config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Whether WM DisplayContent supports high performance transitions
+         (lower-end devices may want to disable) -->
+    <bool name="config_deviceSupportsHighPerfTransitions">false</bool>
+
+    <!-- If true, SCO sample rate will be reported via g_sco_samplerate audio parameter -->
+    <bool name="sco_report_samplerate">true</bool>
+</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/FrameworksResSamsung/res/values/dimens.xml
similarity index 69%
rename from overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
rename to overlay/FrameworksResSamsung/res/values/dimens.xml
index e7d4e77..b455a22 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/overlay/FrameworksResSamsung/res/values/dimens.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2024 The LineageOS Project
- *
+ * SPDX-FileCopyrightText: The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 -->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
 <resources>
+    <!-- Blur radius behind Notification Shade -->
+    <dimen name="max_depth_blur_radius_enhanced">15dp</dimen>
+    <dimen name="max_shade_window_blur_radius">17dp</dimen>
+
     <!-- the padding on the start of the statusbar -->
     <dimen name="status_bar_padding_start">8.0dip</dimen>
 
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_height_landscape">24.0dip</dimen>
     <dimen name="status_bar_height_portrait">24.0dip</dimen>
-
-    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with
-         display size. -->
-    <dimen name="lock_icon_padding">32px</dimen>
-
-    <!-- Blur radius behind Notification Shade -->
-    <dimen name="max_shade_window_blur_radius">17dp</dimen>
 </resources>
diff --git a/overlay/Launcher3DeviceOverlay/Android.bp b/overlay/Launcher3DeviceOverlay/Android.bp
new file mode 100644
index 0000000..f87b5f7
--- /dev/null
+++ b/overlay/Launcher3DeviceOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "Launcher3DeviceOverlay",
+    product_specific: true
+}
diff --git a/overlay/Launcher3DeviceOverlay/AndroidManifest.xml b/overlay/Launcher3DeviceOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..d5d0e67
--- /dev/null
+++ b/overlay/Launcher3DeviceOverlay/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?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.launcher3.overlay">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.launcher3"
+             android:isStatic="true"
+             android:priority="150" />
+</manifest>
diff --git a/overlay/packages/apps/Launcher3/quickstep/res/values/config.xml b/overlay/Launcher3DeviceOverlay/res/values/config.xml
similarity index 62%
rename from overlay/packages/apps/Launcher3/quickstep/res/values/config.xml
rename to overlay/Launcher3DeviceOverlay/res/values/config.xml
index f1742c4..0023b37 100644
--- a/overlay/packages/apps/Launcher3/quickstep/res/values/config.xml
+++ b/overlay/Launcher3DeviceOverlay/res/values/config.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) The LineageOS Project
- *
+ * SPDX-FileCopyrightText: The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 -->
 <resources>
     <integer name="max_depth_blur_radius">11</integer>
-    <dimen name="max_depth_blur_radius_enhanced">15dp</dimen>
 </resources>
diff --git a/overlay/SettingsProviderResCommon/Android.bp b/overlay/SettingsProviderResCommon/Android.bp
new file mode 100644
index 0000000..b66b896
--- /dev/null
+++ b/overlay/SettingsProviderResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsProviderResCommon",
+    vendor: true,
+}
diff --git a/overlay/SettingsProviderResCommon/AndroidManifest.xml b/overlay/SettingsProviderResCommon/AndroidManifest.xml
new file mode 100644
index 0000000..fa76dcb
--- /dev/null
+++ b/overlay/SettingsProviderResCommon/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?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.providers.settings.overlay.common">
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <application android:hasCode="false" />
+
+    <overlay android:targetPackage="com.android.providers.settings"
+        android:priority="0"
+        android:isStatic="true" />
+</manifest>
diff --git a/overlay-lineage/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/SettingsProviderResCommon/res/values/config.xml
similarity index 56%
rename from overlay-lineage/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to overlay/SettingsProviderResCommon/res/values/config.xml
index 255a4bb..27152ca 100644
--- a/overlay-lineage/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/SettingsProviderResCommon/res/values/config.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2024 The LineageOS Project
- *
+ * SPDX-FileCopyrightText: The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 -->
-<resources>
-    <!-- Default screen brightness, from 0 to 255.  102 is 40%. -->
-    <integer name="def_screen_brightness">82</integer>
-
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Set the automatic brightness mode on by default -->
     <bool name="def_screen_brightness_automatic_mode">true</bool>
 </resources>
diff --git a/overlay/SettingsResCommon/Android.bp b/overlay/SettingsResCommon/Android.bp
new file mode 100644
index 0000000..c67362e
--- /dev/null
+++ b/overlay/SettingsResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsResCommon",
+    vendor: true,
+}
diff --git a/overlay/SettingsResCommon/AndroidManifest.xml b/overlay/SettingsResCommon/AndroidManifest.xml
new file mode 100644
index 0000000..fa753f9
--- /dev/null
+++ b/overlay/SettingsResCommon/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?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.common">
+    <overlay android:targetPackage="com.android.settings"
+                   android:isStatic="true"/>
+</manifest>
diff --git a/overlay/SettingsResCommon/res/values/config.xml b/overlay/SettingsResCommon/res/values/config.xml
new file mode 100644
index 0000000..77a636e
--- /dev/null
+++ b/overlay/SettingsResCommon/res/values/config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<resources>
+    <!-- Threshold in micro watts above which a charger is rated as "fast"; 2.16A @ 5V  -->
+    <integer name="config_chargingFastThreshold">10800000</integer>
+</resources>
diff --git a/overlay/SystemUIResCommon/Android.bp b/overlay/SystemUIResCommon/Android.bp
new file mode 100644
index 0000000..74b6651
--- /dev/null
+++ b/overlay/SystemUIResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SystemUIResCommon",
+    vendor: true,
+}
diff --git a/overlay/SystemUIResCommon/AndroidManifest.xml b/overlay/SystemUIResCommon/AndroidManifest.xml
new file mode 100644
index 0000000..09c276b
--- /dev/null
+++ b/overlay/SystemUIResCommon/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?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"
+    coreApp="true"
+    package="com.android.systemui.overlay.common">
+    <overlay android:targetPackage="com.android.systemui" android:isStatic="true" />
+</manifest>
diff --git a/overlay/SystemUIResCommon/res/values-sw372dp/dimens.xml b/overlay/SystemUIResCommon/res/values-sw372dp/dimens.xml
new file mode 100644
index 0000000..1391cae
--- /dev/null
+++ b/overlay/SystemUIResCommon/res/values-sw372dp/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<resources>
+    <dimen name="rounded_corner_radius">4dp</dimen>
+    <dimen name="rounded_corner_content_padding">8dp</dimen>
+</resources>
diff --git a/overlay/SystemUIResCommon/res/values/config.xml b/overlay/SystemUIResCommon/res/values/config.xml
new file mode 100644
index 0000000..7f8514f
--- /dev/null
+++ b/overlay/SystemUIResCommon/res/values/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+    <!-- Threshold in micro watts above which a charger is rated as "fast"; 2.16A @ 5V  -->
+    <integer name="config_chargingFastThreshold">10800000</integer>
+
+    <!-- Doze: does this device support STATE_DOZE?  -->
+    <bool name="doze_display_state_supported">true</bool>
+
+    <!-- Doze: does this device support STATE_DOZE_SUSPEND?  -->
+    <bool name="doze_suspend_display_state_supported">false</bool>
+
+    <!-- Should we vibrate on an icon animation of the shelf. This should only be active if the
+     vibrator is capable of subtle vibrations -->
+    <bool name="config_vibrateOnIconAnimation">true</bool>
+</resources>
diff --git a/overlay/TelecommResCommon/Android.bp b/overlay/TelecommResCommon/Android.bp
new file mode 100644
index 0000000..fd3b916
--- /dev/null
+++ b/overlay/TelecommResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "TelecommResCommon",
+    vendor: true,
+}
diff --git a/overlay/TelecommResCommon/AndroidManifest.xml b/overlay/TelecommResCommon/AndroidManifest.xml
new file mode 100644
index 0000000..59c5965
--- /dev/null
+++ b/overlay/TelecommResCommon/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.server.telecom.overlay.common">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="100"
+        android:targetPackage="com.android.server.telecom" />
+</manifest>
diff --git a/overlay/TelecommResCommon/res/values/config.xml b/overlay/TelecommResCommon/res/values/config.xml
new file mode 100644
index 0000000..657268d
--- /dev/null
+++ b/overlay/TelecommResCommon/res/values/config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Class name for the default in-call UI Service [DO NOT TRANSLATE] -->
+    <string name="incall_default_class" translatable="false">com.android.incallui.InCallServiceImpl</string>
+
+    <!-- Flag indicating if the tty is enabled -->
+    <bool name="tty_enabled">true</bool>
+</resources>
diff --git a/overlay/TelephonyResCommon/Android.bp b/overlay/TelephonyResCommon/Android.bp
new file mode 100644
index 0000000..33e6e09
--- /dev/null
+++ b/overlay/TelephonyResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "TelephonyResCommon",
+    vendor: true,
+}
diff --git a/overlay/TelephonyResCommon/AndroidManifest.xml b/overlay/TelephonyResCommon/AndroidManifest.xml
new file mode 100644
index 0000000..7c1eadc
--- /dev/null
+++ b/overlay/TelephonyResCommon/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.phone.overlay.common">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="100"
+        android:targetPackage="com.android.phone" />
+</manifest>
diff --git a/overlay/TelephonyResCommon/res/values/config.xml b/overlay/TelephonyResCommon/res/values/config.xml
new file mode 100644
index 0000000..721203d
--- /dev/null
+++ b/overlay/TelephonyResCommon/res/values/config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * SPDX-FileCopyrightText: The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
+    <string name="config_ims_mmtel_package" translatable="false">org.codeaurora.ims</string>
+
+    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
+    <string name="config_ims_rcs_package" translatable="false">com.android.service.ims</string>
+</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index 5413f97..0000000
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024-2025 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">75px</dimen>
-
-    <!-- Adjust the icon padding in status bar for rounded corners -->
-    <dimen name="rounded_corner_content_padding">35px</dimen>
-
-    <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
-         calculate the status bar height.
-    -->
-    <dimen name="status_bar_height_default">25px</dimen>
-    <!-- Height of the status bar in portrait.
-         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-    -->
-    <dimen name="status_bar_height_portrait">93px</dimen>
-</resources>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
deleted file mode 100644
index 3639ee0..0000000
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Default for Settings.System.USER_ROTATION -->
-    <integer name="def_user_rotation">0</integer>
-
-    <!-- Default accelerometer rotation -->
-    <bool name="def_accelerometer_rotation">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
deleted file mode 100644
index e60aacf..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- The minimum bottom margin of the keyguard security container -->
-    <dimen name="kg_security_container_min_bottom_margin">400px</dimen>
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
deleted file mode 100644
index 615d2e3..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Doze: does this device support STATE_DOZE?  -->
-    <bool name="doze_display_state_supported">true</bool>
-
-    <!-- Threshold in micro watts above which a charger is rated as "fast"; 2.16A @ 5V  -->
-    <integer name="config_chargingFastThreshold">10800000</integer>
-
-    <!-- Whether usage of the proximity sensor during doze is supported -->
-    <bool name="doze_proximity_sensor_supported">false</bool>
-
-   <!-- Rounded Corner -->
-    <dimen name="rounded_corner_radius">4dp</dimen>
-    <dimen name="rounded_corner_content_padding">16dp</dimen>
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/integers.xml b/overlay/frameworks/base/packages/SystemUI/res/values/integers.xml
deleted file mode 100644
index 4cb6948..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values/integers.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Maximum number of notification icons shown on the Always on Display
-        (excluding overflow dot) -->
-    <integer name="max_notif_icons_on_aod">9</integer>
-</resources>
diff --git a/overlay/hardware/samsung/AdvancedDisplay/res/values/arrays.xml b/overlay/hardware/samsung/AdvancedDisplay/res/values/arrays.xml
deleted file mode 100644
index 15a0ca9..0000000
--- a/overlay/hardware/samsung/AdvancedDisplay/res/values/arrays.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="mdnie_scenario_entries" translatable="false">
-        <item>LineageOS (default)</item>
-        <item>Video</item>
-        <item>Video warm</item>
-        <item>Video cold</item>
-        <item>Camera</item>
-        <item>Navigation</item>
-        <item>Gallery</item>
-        <item>Video call</item>
-        <item>Browser</item>
-        <item>eBook</item>
-        <item>E-mail</item>
-        <item>Digital television</item>
-    </string-array>
-
-    <string-array name="mdnie_scenario_entries_values" translatable="false">
-        <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>16</item>
-    </string-array>
-</resources>
diff --git a/overlay/packages/apps/Aperture/app/src/main/res/values/config.xml b/overlay/packages/apps/Aperture/app/src/main/res/values/config.xml
deleted file mode 100644
index a60258c..0000000
--- a/overlay/packages/apps/Aperture/app/src/main/res/values/config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- Enable auxiliary cameras selector. -->
-    <bool name="config_enableAuxCameras">true</bool>
-
-    <!-- An array of triplets made of (camera ID, qualities, framerates).
-         These video modes will be added to the available
-         quality/framerate combinations of a camera device.
-         Make sure the device is able to handle those configurations
-         and maintain a stable framerate at any condition.
-         Note that you can't add video qualities that aren't
-         exposed by the camera, only new framerates.
-         Valid values of resolution are:
-          - "sd" (480p)
-          - "hd" (720p)
-          - "fhd" (1080p)
-          - "uhd" (2160p)
-         Valid values of framerate are:
-          - "24"
-          - "30"
-          - "60"
-          - "120"
-         Example:
-             <string-array name="config_additionalVideoConfigurations">
-                 <item>0</item> <item>sd|hd|fhd</item> <item>60|120</item>
-                 <item>1</item> <item>sd|hd|fhd</item> <item>60</item>
-             </string-array>
-    -->
-    <string-array name="config_additionalVideoConfigurations">
-        <item>0</item> <item>sd|hd|fhd</item> <item>60</item>
-        <item>1</item> <item>sd|hd|fhd</item> <item>60</item>
-        <item>3</item> <item>sd|hd|fhd</item> <item>60</item>
-    </string-array>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index 05d7ff6..0000000
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Whether or not the device is capable of multiple levels of vibration intensity.
-         Note that this is different from whether it can control the vibration amplitude as some
-         devices will be able to vary their amplitude but do not possess enough dynamic range to
-         have distinct intensity levels -->
-    <bool name="config_vibration_supports_multiple_intensities">true</bool>
-
-    <!-- Add fingerprint radius settings -->
-    <dimen name="fingerprint_dot_radius">8dp</dimen>
-    <item name="fingerprint_sensor_location_fraction_y" type="fraction">85%</item>
-
-    <!-- The number of vibration intensity levels supported by the device.
-         Note that this should correspond to the ability to vary the vibration amplitude, with
-         enough dynamic range to have at least as many distinct intensity levels as defined here.
-         Supported values are 1, 2, 3. If '1', the settings app will use a toggle for the settings,
-         otherwise a slider. If '3', the settings app maps intensities directly to the levels
-         supported by the Vibrator HAL APIs. If '2', then the levels will be mapped to
-         VIBRATION_INTENSITY_LOW and VIBRATION_INTENSITY_HIGH, which gives the most range for
-         scaling vibrations. The medium intensity will be skipped.
-         The default intensity values are configured at
-         frameworks/base/core/res/res/values/config.xml's config_default[type]VibrationIntensity.
-         Make sure that each default intensity value is consistent with the supported levels set
-         here. If this settings supports only 2 levels, for example, then the default intensity
-         should be either LOW (1) or HIGH (3).
-    -->
-    <integer name="config_vibration_supported_intensity_levels">3</integer>
-
-    <!-- Threshold in micro watts above which a charger is rated as "fast"; 2.16A @ 5V  -->
-    <integer name="config_chargingFastThreshold">10800000</integer>
-
-    <!-- Whether to show Smooth Display feature in Settings Options -->
-    <bool name="config_show_smooth_display">true</bool>
-</resources>
diff --git a/overlay/packages/apps/SystemUI/res/values/config.xml b/overlay/packages/apps/SystemUI/res/values/config.xml
deleted file mode 100644
index eb3ae34..0000000
--- a/overlay/packages/apps/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- If not zero, limits the internal screen recorder's framerate to the set value. -->
-    <integer name="config_screenRecorderMaxFramerate">60</integer>
-</resources>