diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 2cd48b9..b0c170d 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -63,7 +63,7 @@
     BlissUpdater \
     BlissPapers \
     SettingsIntelligenceGooglePrebuilt \
-    NexusLauncherRelease \
+    Lawnchair \
     NexusWallpapersStubPrebuilt2019Static \
     GalleryGoPrebuilt \
     PixelThemesStub2019 \
@@ -96,7 +96,13 @@
 # Bliss System Permission
 PRODUCT_COPY_FILES += \
     vendor/bliss/config/permissions/privapp-permissions-bliss-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-bliss-system.xml
-    
+
 # Bliss Product Permission
 PRODUCT_COPY_FILES += \
     vendor/bliss/config/permissions/privapp-permissions-bliss-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-bliss.xml
+
+# Lawnchair
+PRODUCT_COPY_FILES += \
+    vendor/bliss/prebuilt/common/etc/permissions/privapp-permissions-lawnchair.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-lawnchair.xml \
+    vendor/bliss/prebuilt/common/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml
+
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 5764687..162035a 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -116,14 +116,7 @@
           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">com.google.android.apps.nexuslauncher/com.android.quickstep.RecentsActivity</string>
-
-    <!-- This is the default launcher component to use on secondary displays that support system
-         decorations.
-         This launcher activity must support multiple instances and have corresponding launch mode
-         set in AndroidManifest.
-         {@see android.view.Display#FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS} -->
-    <string name="config_secondaryHomeComponent">com.google.android.apps.nexuslauncher/com.android.launcher3.SecondaryDisplayLauncher</string>
+    <string name="config_recentsComponentName" translatable="false">ch.deletescape.lawnchair.ci/com.android.quickstep.RecentsActivity</string>
 
     <!-- Colon separated list of package names that should be granted DND access -->
     <string name="config_defaultDndAccessPackages" translatable="false">com.google.android.gms:com.google.android.GoogleCamera:com.google.intelligence.sense:com.google.android.settings.intelligence</string>
diff --git a/overlay/lawnchair/frameworks/base/core/res/res/values/bools.xml b/overlay/lawnchair/frameworks/base/core/res/res/values/bools.xml
new file mode 100644
index 0000000..72c8d73
--- /dev/null
+++ b/overlay/lawnchair/frameworks/base/core/res/res/values/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_swipe_up_gesture_setting_available">true</bool>
+    <bool name="config_custom_swipe_up_gesture_setting_available">true</bool>
+</resources>
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 797512c..d0e649b 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -143,3 +143,15 @@
 LOCAL_DEX_PREOPT := false
 LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Lawnchair
+LOCAL_SRC_FILES := priv-app/$(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_DEX_PREOPT := false
+LOCAL_REPLACE_PREBUILT_APK_INSTALLED := $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
+include $(BUILD_PREBUILT)
diff --git a/prebuilt/common/etc/permissions/privapp-permissions-lawnchair.xml b/prebuilt/common/etc/permissions/privapp-permissions-lawnchair.xml
new file mode 100644
index 0000000..c702580
--- /dev/null
+++ b/prebuilt/common/etc/permissions/privapp-permissions-lawnchair.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This XML file declares which signature|privileged permissions should be granted to privileged
+applications on GMS or Google-branded devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+<permissions>
+    <privapp-permissions package="ch.deletescape.lawnchair.ci">
+        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
+        <permission name="android.permission.VIBRATE"/>
+        <permission name="com.android.launcher.permission.READ_SETTINGS"/>
+        <permission name="com.android.launcher.permission.WRITE_SETTINGS"/>
+        <permission name="com.google.android.apps.nexuslauncher.permission.READ_SETTINGS"/>
+        <permission name="com.google.android.apps.nexuslauncher.permission.WRITE_SETTINGS"/>
+        <permission name="ch.deletescape.lawnchair.ci.permission.READ_SETTINGS"/>
+        <permission name="ch.deletescape.lawnchair.ci.permission.WRITE_SETTINGS"/>
+        <permission name="ch.deletescape.lawnchair.lawnfeed.CONNECT_SERVICE"/>
+        <permission name="ch.deletescape.lawnchair.ci.permission.QSB"/>
+        <permission name="android.permission.EXPAND_STATUS_BAR"/>
+        <permission name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+        <permission name="android.permission.READ_PHONE_STATE"/>
+        <permission name="android.permission.READ_EXTERNAL_STORAGE"/>
+        <permission name="android.permission.SET_WALLPAPER"/>
+        <permission name="android.permission.INSTALL_SHORTCUT"/>
+        <permission name="android.permission.WRITE_SETTINGS"/>
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
+        <permission name="android.permission.DEVICE_POWER"/>
+        <permission name="android.permission.ACCESS_COARSE_LOCATION"/>
+        <permission name="com.android.permission.RECEIVE_LAUNCH_BROADCASTS"/>
+        <permission name="com.huawei.wallpaperservcie.permission.SET_WALLPAPER_OFFSET"/>
+        <permission name="com.huawei.android.thememanager.permission.ACCESS_CHANGE_WALLPAPER"/>
+        <permission name="com.android.launcher.permission.LAUNCHER_ANIMATION"/>
+        <permission name="com.inveno.hwread.permission.LAUNCHER_RECEIVE"/>
+        <permission name="android.permission.BIND_ACCESSIBILITY_SERVICE"/>
+        <permission name="android.permission.REQUEST_DELETE_PACKAGES"/>
+        <permission name="android.permission.BIND_APPWIDGET"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.GET_TASKS"/>
+        <permission name="android.permission.REMOVE_TASKS"/>
+        <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.READ_FRAME_BUFFER"/>
+        <permission name="android.permission.GET DETAILED TASKS"/>
+        <permission name="android.permission.ACCESS_INSTANT_APPS"/>
+        <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.CREATE_USERS"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
+        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.BLUETOOTH"/>
+        <permission name="org.pixelexperience.weather.client.READ_WEATHER"/>
+        <permission name="ch.deletescape.lawnchair.ci.permission.BROADCAST_BUGREPORT"/>
+        <permission name="android.permission.FOREGROUND_SERVICE"/>
+        <permission name="xyz.paphonb.systemuituner.permission.MODIFY_NAVBAR"/>
+        <permission name="android.permission.READ_CALENDAR"/>
+        <permission name="android.permission.CALL_PHONE"/>
+        <permission name="android.permission.SET_WALLPAPER_HINTS"/>
+        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+        <permission name="android.permission.INTERNET"/>
+        <permission name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+    </privapp-permissions>
+</permissions>
diff --git a/prebuilt/common/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml b/prebuilt/common/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml
new file mode 100644
index 0000000..b720879
--- /dev/null
+++ b/prebuilt/common/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This XML file declares which platform apps that need to access internal APIs.
+-->
+<config>
+  <hidden-api-whitelisted-app package="ch.deletescape.lawnchair.ci" />
+</config>
diff --git a/prebuilt/common/priv-app/Lawnchair.apk b/prebuilt/common/priv-app/Lawnchair.apk
new file mode 100644
index 0000000..0a6c8e3
--- /dev/null
+++ b/prebuilt/common/priv-app/Lawnchair.apk
Binary files differ