diff --git a/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch b/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch
index 184ac19..69ccc7c 100644
--- a/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch
+++ b/packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch
@@ -1,4 +1,4 @@
-From ab8f40929c16e56034811ab5de87a6d658ce70b5 Mon Sep 17 00:00:00 2001
+From 12224023faccc52724a443670bd77c6aa229ce58 Mon Sep 17 00:00:00 2001
 From: Luca Stefani <luca.stefani.ge1@gmail.com>
 Date: Fri, 1 Nov 2019 21:14:29 +0100
 Subject: [PATCH 1/5] Add wallpaper privapp whitelist
@@ -61,5 +61,5 @@ index 00000000..e3f3b658
 +    </privapp-permissions>
 +</permissions>
 -- 
-2.39.2
+2.40.0
 
diff --git a/packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch b/packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch
index 2d17fff..989c44c 100644
--- a/packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch
+++ b/packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch
@@ -1,4 +1,4 @@
-From 4b8b458becc81bdf4171e40660c5e4b1073985fc Mon Sep 17 00:00:00 2001
+From 4b626d87eafd37bf950550f5c14b42f5eaab19eb Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 19:00:36 -0700
 Subject: [PATCH 2/5] Override legacy WallpaperPicker app
@@ -22,5 +22,5 @@ index ff9413ac..dee08f45 100644
  
  prebuilt_etc_xml {
 -- 
-2.39.2
+2.40.0
 
diff --git a/packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch b/packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch
index dda6409..c99f17d 100644
--- a/packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch
+++ b/packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch
@@ -1,4 +1,4 @@
-From 9ebd057db4adf880c69de6d3558bfbe6948d60ca Mon Sep 17 00:00:00 2001
+From 0068121d698911e9bc86a224b3f9a2fb7bdc6cbc Mon Sep 17 00:00:00 2001
 From: LuK1337 <priv.luk@gmail.com>
 Date: Tue, 15 Sep 2020 03:27:19 +0200
 Subject: [PATCH 3/5] Add wallpaper default permissions
@@ -83,5 +83,5 @@ index 00000000..41b23ce1
 +    </exception>
 +</exceptions>
 -- 
-2.39.2
+2.40.0
 
diff --git a/packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch b/packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch
index 2b17626..02bcaaa 100644
--- a/packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch
+++ b/packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch
@@ -1,4 +1,4 @@
-From 1814b701dfef99ecc9246620c33740ef466c9e71 Mon Sep 17 00:00:00 2001
+From e51787a4ad9f2a70d9d68cad29a8974244c2c0b6 Mon Sep 17 00:00:00 2001
 From: Luca Stefani <luca.stefani.ge1@gmail.com>
 Date: Fri, 1 Nov 2019 23:17:08 +0100
 Subject: [PATCH 4/5] Specify we read and write launcher settings
@@ -23,5 +23,5 @@ index 4e71bcc6..26f4fce0 100755
          tools:replace="android:icon,android:name"
          android:extractNativeLibs="false"
 -- 
-2.39.2
+2.40.0
 
diff --git a/packages/apps/ThemePicker/0005-Add-permission-for-launcher-preview-rendering.patch b/packages/apps/ThemePicker/0005-Add-permission-for-launcher-preview-rendering.patch
index 691452c..2a212f1 100644
--- a/packages/apps/ThemePicker/0005-Add-permission-for-launcher-preview-rendering.patch
+++ b/packages/apps/ThemePicker/0005-Add-permission-for-launcher-preview-rendering.patch
@@ -1,4 +1,4 @@
-From 8ebb9654981aea1a79a4145eda7c55d2f5a02d1c Mon Sep 17 00:00:00 2001
+From 3156edaae20291237f095d2d5bb66e8ba0a4cea5 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 22:40:58 -0700
 Subject: [PATCH 5/5] Add permission for launcher preview rendering
@@ -33,5 +33,5 @@ index e3f3b658..47133be8 100644
      </privapp-permissions>
  </permissions>
 -- 
-2.39.2
+2.40.0
 
diff --git a/packages/apps/ThemePicker/0005-Declare-HOME-query-for-launcher-discovery.patch b/packages/apps/ThemePicker/0005-Declare-HOME-query-for-launcher-discovery.patch
deleted file mode 100644
index ca5a00b..0000000
--- a/packages/apps/ThemePicker/0005-Declare-HOME-query-for-launcher-discovery.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From da21218f9905f70f8b83d2a6bbbdc91e322333c5 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Tue, 5 Oct 2021 19:12:40 -0700
-Subject: [PATCH 5/6] Declare HOME query for launcher discovery
-
-ThemePicker needs to query the current launcher in order to render
-launcher/wallpaper previews, toggle themed icons, and change the app
-grid size.
-
-Change-Id: Id79fe1eaa4d09f775a37a1dfb1091ed08a1d3422
----
- AndroidManifest.xml | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index cace7db..85bf749 100755
---- a/AndroidManifest.xml
-+++ b/AndroidManifest.xml
-@@ -35,6 +35,11 @@
-         <intent>
-             <action android:name="com.android.launcher3.action.PARTNER_CUSTOMIZATION" />
-         </intent>
-+        <!-- Intent filter with action used to discover launcher -->
-+        <intent>
-+            <action android:name="android.intent.action.MAIN" />
-+            <category android:name="android.intent.category.HOME" />
-+        </intent>
-     </queries>
- 
-     <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
--- 
-2.37.2
-
diff --git a/packages/apps/ThemePicker/0006-Add-permission-for-launcher-preview-rendering.patch b/packages/apps/ThemePicker/0006-Add-permission-for-launcher-preview-rendering.patch
deleted file mode 100644
index a1afdd2..0000000
--- a/packages/apps/ThemePicker/0006-Add-permission-for-launcher-preview-rendering.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b7867190ba594edc894d3833746c5af07ad596af Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Tue, 5 Oct 2021 22:40:58 -0700
-Subject: [PATCH 6/6] Add permission for launcher preview rendering
-
-Change-Id: Ie707dcd98161e8f5993b0504295fddc3f395cd20
----
- AndroidManifest.xml                         | 1 +
- privapp_whitelist_com.android.wallpaper.xml | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 85bf749..897a21f 100755
---- a/AndroidManifest.xml
-+++ b/AndroidManifest.xml
-@@ -8,6 +8,7 @@
-     <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
-     <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
-+    <uses-permission android:name="android.permission.BIND_WALLPAPER" />
- 
-     <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE" />
- 
-diff --git a/privapp_whitelist_com.android.wallpaper.xml b/privapp_whitelist_com.android.wallpaper.xml
-index e3f3b65..5dee99b 100644
---- a/privapp_whitelist_com.android.wallpaper.xml
-+++ b/privapp_whitelist_com.android.wallpaper.xml
-@@ -17,6 +17,7 @@
- <permissions>
-     <privapp-permissions package="com.android.wallpaper">
-         <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
-+        <permission name="android.permission.BIND_WALLPAPER"/>
-         <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
-         <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-         <permission name="android.permission.WRITE_SECURE_SETTINGS" />
--- 
-2.37.2
-