diff --git a/device.mk b/device.mk
index 9934a8a..a7df43a 100644
--- a/device.mk
+++ b/device.mk
@@ -23,7 +23,9 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 PRODUCT_SOONG_NAMESPACES += device/peter/gsi
 
 # Overlay
-PRODUCT_PACKAGE_OVERLAYS += device/peter/gsi/overlay
+PRODUCT_PACKAGES += \
+    GsiFrameworkResTarget \
+    GsiLauncher3Target
 
 # Device-specific overlays from phhusson
 include vendor/hardware_overlay/overlay.mk
@@ -46,8 +48,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     UnifiedNlp
 
-# ThemePicker (for Launcher3)
+# Launcher3
 PRODUCT_PACKAGES += \
+    Launcher3QuickStep \
     ThemePicker
 
 # Enable ro.adb.secure on userdebug and user
diff --git a/overlay/GsiFrameworkResTarget/Android.bp b/overlay/GsiFrameworkResTarget/Android.bp
new file mode 100644
index 0000000..1903cda
--- /dev/null
+++ b/overlay/GsiFrameworkResTarget/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "GsiFrameworkResTarget",
+    sdk_version: "current",
+    product_specific: true,
+}
diff --git a/overlay/GsiFrameworkResTarget/AndroidManifest.xml b/overlay/GsiFrameworkResTarget/AndroidManifest.xml
new file mode 100644
index 0000000..f2f4250
--- /dev/null
+++ b/overlay/GsiFrameworkResTarget/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.overlay.gsi.target">
+    <overlay
+        android:isStatic="true"
+        android:priority="350"
+        android:targetPackage="android" />
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/GsiFrameworkResTarget/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to overlay/GsiFrameworkResTarget/res/values/config.xml
diff --git a/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml b/overlay/GsiFrameworkResTarget/res/xml/config_webview_packages.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml
rename to overlay/GsiFrameworkResTarget/res/xml/config_webview_packages.xml
diff --git a/overlay/GsiLauncher3Target/Android.bp b/overlay/GsiLauncher3Target/Android.bp
new file mode 100644
index 0000000..c22719e
--- /dev/null
+++ b/overlay/GsiLauncher3Target/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "GsiLauncher3Target",
+    sdk_version: "current",
+    product_specific: true,
+}
diff --git a/overlay/GsiLauncher3Target/AndroidManifest.xml b/overlay/GsiLauncher3Target/AndroidManifest.xml
new file mode 100644
index 0000000..2f9b446
--- /dev/null
+++ b/overlay/GsiLauncher3Target/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.launcher3.overlay.gsi.target">
+    <overlay
+        android:isStatic="true"
+        android:priority="350"
+        android:targetPackage="com.android.launcher3" />
+</manifest>
diff --git a/overlay/GsiLauncher3Target/res/values/config.xml b/overlay/GsiLauncher3Target/res/values/config.xml
new file mode 100644
index 0000000..ed2d281
--- /dev/null
+++ b/overlay/GsiLauncher3Target/res/values/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="wallpaper_picker_package" translatable="false">com.android.wallpaper</string>
+</resources>