diff --git a/config/common.mk b/config/common.mk
index 4662f00cfc8d0a9f6ff921cf440e5fa43fa8c14a..580234f0e3f2cdf6a056d49129e23f61ddda350c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -66,4 +66,4 @@ ifeq (true,$(INCLUDE_IH8SN))
   endif
 endif
 
-include $(call inherit-product, prebuilts/prebuiltapks/config/common.mk)
+include $(call inherit-product, external/prebuiltapks/config/common.mk)
diff --git a/config/telephony.mk b/config/telephony.mk
index 2dc3f08c5a5bc66ef8a42154271dd81d6563f99d..fd0f919cc5e394cb9b2235a79e7da3ad2b4baad5 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -2,4 +2,4 @@
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=Dione.ogg
 
-include $(call inherit-product, prebuilts/prebuiltapks/config/telephony.mk)
+include $(call inherit-product, external/prebuiltapks/config/telephony.mk)
diff --git a/overlay/no-rro/external/setupdesign/main/res/values-night-v31/colors.xml b/overlay/no-rro/external/setupdesign/main/res/values-night-v31/colors.xml
deleted file mode 100644
index 7d08298c0bfe8f2baa3806e689d833c425b416f1..0000000000000000000000000000000000000000
--- a/overlay/no-rro/external/setupdesign/main/res/values-night-v31/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright Murena SAS 2024
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources>
-  <color name="sud_system_background_surface">@*android:color/e_background_dark</color>
-</resources>
diff --git a/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml b/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml
deleted file mode 100644
index 920f616e15bf1b26bbd8524289d5f68a6b7af77d..0000000000000000000000000000000000000000
--- a/overlay/no-rro/external/setupdesign/main/res/values-v31/colors.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright Murena SAS 2024
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources>
-  <color name="sud_system_background_surface">@*android:color/e_background_light</color>
-  <color name="sud_system_accent1_600">@*android:color/e_accent_light</color>
-  <color name="sud_system_accent1_100">@*android:color/e_accent_dark</color>
-</resources>
diff --git a/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml b/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml
deleted file mode 100644
index 25ccb0cb781442c0961e7e4bbed77bca67b48fe4..0000000000000000000000000000000000000000
--- a/overlay/no-rro/external/setupdesign/main/res/values-v31/styles.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright Murena SAS 2024
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources>
-  <style name="SudFullDynamicColorAlertDialogThemeCompat" parent="SudDynamicColorAlertDialogThemeCompat">
-    <item name="android:colorBackground">@*android:color/e_floating_background_dark</item>
-  </style>
-  <style name="SudFullDynamicColorAlertDialogThemeCompat.Light" parent="SudDynamicColorAlertDialogThemeCompat.Light">
-    <item name="android:colorBackground">@*android:color/e_floating_background_light</item>
-  </style>
-
-  <style name="SudFullDynamicColorAlertDialogTheme" parent="SudDynamicColorAlertDialogTheme">
-    <item name="android:colorBackground">@*android:color/e_floating_background_dark</item>
-  </style>
-  <style name="SudFullDynamicColorAlertDialogTheme.Light" parent="SudDynamicColorAlertDialogTheme.Light">
-    <item name="android:colorBackground">@*android:color/e_floating_background_light</item>
-  </style>
-</resources>
diff --git a/overlay/no-rro/external/setupdesign/main/res/values/colors.xml b/overlay/no-rro/external/setupdesign/main/res/values/colors.xml
deleted file mode 100644
index eff7fe259ba032198b1fed710ba375e1d51a1828..0000000000000000000000000000000000000000
--- a/overlay/no-rro/external/setupdesign/main/res/values/colors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright Murena SAS 2022
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <color name="sud_glif_background_color_dark">@*android:color/background_device_default_dark</color>
-    <color name="sud_glif_v3_dialog_background_color_dark">@*android:color/background_floating_device_default_dark</color>
-    <color name="sud_glif_v3_dialog_background_color_light">@*android:color/background_floating_device_default_light</color>
-    <color name="sud_glif_v3_nav_bar_divider_color_light">#00000000</color>
-    <color name="sud_color_error_text_dark">@*android:color/error_color_material_dark</color>
-    <color name="sud_color_error_text_light">@*android:color/error_color_material_light</color>
-</resources>
diff --git a/overlay/no-rro/packages/apps/ThemePicker/res/values/strings.xml b/overlay/no-rro/packages/apps/ThemePicker/res_override/values/override.xml
similarity index 92%
rename from overlay/no-rro/packages/apps/ThemePicker/res/values/strings.xml
rename to overlay/no-rro/packages/apps/ThemePicker/res_override/values/override.xml
index 11428b07995709c98405c51f0894297d7204cad3..9f6cfeb7c442bfef3e2e32a243bdba0e99ed19ff 100644
--- a/overlay/no-rro/packages/apps/ThemePicker/res/values/strings.xml
+++ b/overlay/no-rro/packages/apps/ThemePicker/res_override/values/override.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2018 The Android Open Source Project
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -10,7 +11,6 @@
      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">
+<resources>
     <string name="launcher_overlayable_package" translatable="false">foundation.e.blisslauncher</string>
 </resources>