diff --git a/config/common.mk b/config/common.mk
index e8b5608918bc031a6b6258bc4934daf0893b56a7..94b97e412f6634ebb816fdb2685a1e8b34d07c50 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -23,9 +23,8 @@ PRODUCT_PACKAGES += \
     GsfProxy \
     FakeStore \
     Mail \
-    BlissLauncher \
-    BlissIconPack \
-    OpenWeatherMapWeatherProvider \
+    BlissLauncher3 \
+    BlissWeather \
     AccountManager \
     Camera \
     eDrive \
@@ -39,7 +38,6 @@ PRODUCT_PACKAGES += \
     Apps \
     PwaPlayer \
     AdvancedPrivacy \
-    WeatherProvider \
     SplitInstallService \
     WebCalendarManager \
     Talkback \
diff --git a/config/permissions/eos-permissions.xml b/config/permissions/eos-permissions.xml
index dc572e1eb2e60cdc1dbf1467b14e13785adb326c..2e9f24c0dec7e0ff12130f5209d14745c3caac8c 100644
--- a/config/permissions/eos-permissions.xml
+++ b/config/permissions/eos-permissions.xml
@@ -230,5 +230,12 @@
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
+    <exception package="foundation.e.blissweather">
+        <!-- Location -->
+        <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
+        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
+        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
+    </exception>
+
 </exceptions>
 
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index ba23acf664c821cc16288af289f3da67f378eb8d..3f4faaf29a1a0f75c4e6d31fc9926d1f8a3a38c9 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -56,4 +56,18 @@
          without explicit consent of the user. If no accessibility service with the specified name
          exists on the device, the accessibility shortcut will be disabled by default. -->
     <string name="config_defaultAccessibilityService" translatable="false">app.talkbackfoss/com.google.android.marvin.talkback.TalkBackService</string>
+    
+    <!-- Component name for the activity that will be presenting the Recents UI, which will receive
+         special permissions for API related to fetching and presenting recent tasks. The default
+         configuration uses Launcehr3QuickStep as default launcher and points to the corresponding
+         recents component. When using a different default launcher, change this appropriately or
+         use the default systemui implementation: com.android.systemui/.recents.RecentsActivity -->
+    <string name="config_recentsComponentName" translatable="false">foundation.e.blisslauncher/com.android.quickstep.RecentsActivity</string>
+
+    <!-- This is the default launcher package with an activity to use on secondary displays that
+         support system decorations.
+         This launcher package must have an activity that supports multiple instances and has
+         corresponding launch mode set in AndroidManifest.
+         {@see android.view.Display#FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS} -->
+    <string name="config_secondaryHomePackage" translatable="false">foundation.e.blisslauncher</string>
 </resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ef17739f49178fabdb1e71913810176d95ebc9b6
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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. -->
+<resources>
+    <!-- Launcher package name for overlaying icons. -->
+    <string name="launcher_overlayable_package" translatable="false">foundation.e.blisslauncher</string>
+</resources>
diff --git a/overlay/no-rro/packages/apps/ThemePicker/res/values/strings.xml b/overlay/no-rro/packages/apps/ThemePicker/res/values/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..11428b07995709c98405c51f0894297d7204cad3
--- /dev/null
+++ b/overlay/no-rro/packages/apps/ThemePicker/res/values/strings.xml
@@ -0,0 +1,16 @@
+<!--
+     Copyright (C) 2018 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="launcher_overlayable_package" translatable="false">foundation.e.blisslauncher</string>
+</resources>