diff --git a/patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch b/patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch
new file mode 100644
index 0000000..b1d0fa5
--- /dev/null
+++ b/patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch
@@ -0,0 +1,57 @@
+From 54ae0f29ba89e7dc79b69540f78cdabdd943a0d3 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 30 Nov 2021 12:58:00 +0000
+Subject: [PATCH] SearchLauncher: Adapt to Trebuchet
+
+---
+ apps/SearchLauncher/Android.mk          | 4 ++--
+ apps/SearchLauncher/AndroidManifest.xml | 4 +++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/apps/SearchLauncher/Android.mk b/apps/SearchLauncher/Android.mk
+index 0b7f7d4..91da3c8 100644
+--- a/apps/SearchLauncher/Android.mk
++++ b/apps/SearchLauncher/Android.mk
+@@ -23,7 +23,7 @@ LOCAL_USE_AAPT2 := true
+ LOCAL_AAPT2_ONLY := true
+ 
+ # Relative path for AOSP Launcher3 directory
+-LAUNCHER_PATH := ../../../../packages/apps/Launcher3
++LAUNCHER_PATH := ../../../../packages/apps/Trebuchet
+ 
+ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
+ LOCAL_STATIC_JAVA_LIBRARIES := lib_launcherClient
+@@ -60,7 +60,7 @@ LOCAL_USE_AAPT2 := true
+ LOCAL_AAPT2_ONLY := true
+ 
+ # Relative path for AOSP Launcher3 directory
+-LAUNCHER_PATH := ../../../../packages/apps/Launcher3
++LAUNCHER_PATH := ../../../../packages/apps/Trebuchet
+ 
+ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
+ LOCAL_STATIC_JAVA_LIBRARIES := \
+diff --git a/apps/SearchLauncher/AndroidManifest.xml b/apps/SearchLauncher/AndroidManifest.xml
+index 6f48d23..f8ca8e3 100644
+--- a/apps/SearchLauncher/AndroidManifest.xml
++++ b/apps/SearchLauncher/AndroidManifest.xml
+@@ -19,6 +19,7 @@
+ -->
+ <manifest
+     xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:tools="http://schemas.android.com/tools"
+     package="com.android.launcher3">
+     <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
+     <!--
+@@ -36,7 +37,8 @@
+         android:theme="@style/AppTheme"
+         android:largeHeap="@bool/config_largeHeap"
+         android:restoreAnyVersion="true"
+-        android:supportsRtl="true" >
++        android:supportsRtl="true"
++        tools:replace="android:icon" >
+ 
+         <!--
+         Main launcher activity. When extending only change the name, and keep all the
+-- 
+2.25.1
+
diff --git a/patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch b/patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch
index 842d287..0a98f61 100644
--- a/patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch
+++ b/patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch
@@ -1,4 +1,4 @@
-From 32affddf47a6a3aba580707f349565b3655a16b7 Mon Sep 17 00:00:00 2001
+From fdfa781b28c22610fc2cc26a2820da5d0fda4c32 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 17 Feb 2018 19:39:38 +0100
 Subject: [PATCH 1/6] Allow deletion of symlink
@@ -9,10 +9,10 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
  1 file changed, 1 insertion(+)
 
 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index e21524a..ca8e6f9 100644
+index fd42cbe..230fdf6 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -313,6 +313,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
+@@ -321,6 +321,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
  static bool destroy_dir(const std::string& dir) {
      LOG(DEBUG) << "Destroying: " << dir;
      if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {
@@ -21,5 +21,5 @@ index e21524a..ca8e6f9 100644
          return false;
      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch b/patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
index 51370bf..4d5d755 100644
--- a/patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
+++ b/patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
@@ -1,4 +1,4 @@
-From f19e29be30ae859c084bebd2d5c32f7ff94bc31f Mon Sep 17 00:00:00 2001
+From 42c27d00edd1a7cf52b7fa33cc16395e05e37d3c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:37:54 +0200
 Subject: [PATCH 2/6] Support Samsung's implementation of exfat, called sdfat
@@ -40,5 +40,5 @@ index 34f1024..3aa9494 100644
      }
  
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches_treble_phh/platform_system_vold/0003-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch b/patches_treble_phh/platform_system_vold/0003-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch
index 3a73cd6..47d6e7a 100644
--- a/patches_treble_phh/platform_system_vold/0003-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch
+++ b/patches_treble_phh/platform_system_vold/0003-Check-needsCheckpoint-only-if-checkpoint-is-supporte.patch
@@ -1,7 +1,7 @@
-From d69f9a1231d08fd6508e7219b3298cdbc3158796 Mon Sep 17 00:00:00 2001
+From e46c9b776cef6a26dceb5e447a7efbe14608df93 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 16 Sep 2019 13:49:05 +0200
-Subject: [PATCH] Check needsCheckpoint only if checkpoint is supported
+Subject: [PATCH 3/6] Check needsCheckpoint only if checkpoint is supported
 
 This is needed because some devices (Xiaomi MiPad 4, uncertified)
 declares a bootctrl HAL in manifest, but doesn't have it.
@@ -13,10 +13,10 @@ Change-Id: I2dafcbca7e994d7a3ac36ef3698590db2ab482fa
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/cryptfs.cpp b/cryptfs.cpp
-index 33f0913..7db1ef6 100644
+index 3c6ed15..4188797 100644
 --- a/cryptfs.cpp
 +++ b/cryptfs.cpp
-@@ -1963,7 +1963,9 @@ static int cryptfs_restart_internal(int restart_main) {
+@@ -1968,7 +1968,9 @@ static int cryptfs_restart_internal(int restart_main) {
              SLOGE("Failed to setexeccon");
              return -1;
          }
diff --git a/patches_treble_phh/platform_system_vold/0004-Sony-has-texfat-exfat-fs.patch b/patches_treble_phh/platform_system_vold/0004-Sony-has-texfat-exfat-fs.patch
index 20b2204..cc668e9 100644
--- a/patches_treble_phh/platform_system_vold/0004-Sony-has-texfat-exfat-fs.patch
+++ b/patches_treble_phh/platform_system_vold/0004-Sony-has-texfat-exfat-fs.patch
@@ -1,4 +1,4 @@
-From 8ffe3b736fa6736eb12951977eabdde6cd999359 Mon Sep 17 00:00:00 2001
+From 719cfde8ee01af3d1d9304bad2337466876a5af4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Jan 2020 00:27:17 +0100
 Subject: [PATCH 4/6] Sony has `texfat` exfat fs
@@ -34,5 +34,5 @@ index 3aa9494..03ad649 100644
          return 0;
      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches_treble_phh/platform_system_vold/0005-Failing-to-create-facedata-shouldn-t-be-fatal.patch b/patches_treble_phh/platform_system_vold/0005-Failing-to-create-facedata-shouldn-t-be-fatal.patch
index bbc02cd..a011051 100644
--- a/patches_treble_phh/platform_system_vold/0005-Failing-to-create-facedata-shouldn-t-be-fatal.patch
+++ b/patches_treble_phh/platform_system_vold/0005-Failing-to-create-facedata-shouldn-t-be-fatal.patch
@@ -1,4 +1,4 @@
-From f558003318cd010d46dc3fca1508cf282d4ca56b Mon Sep 17 00:00:00 2001
+From 4d463aa11eeaddc24542fe35da764b0194cf2701 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Mar 2020 14:49:09 +0100
 Subject: [PATCH 5/6] Failing to create facedata shouldn't be fatal
@@ -34,5 +34,5 @@ index d624d73..60056f3 100644
          }
      }
 -- 
-2.17.1
+2.25.1
 
diff --git a/patches_treble_phh/platform_system_vold/0006-Every-voldmanaged-storage-is-adoptable.patch b/patches_treble_phh/platform_system_vold/0006-Every-voldmanaged-storage-is-adoptable.patch
index 07b07ce..ee3ebf9 100644
--- a/patches_treble_phh/platform_system_vold/0006-Every-voldmanaged-storage-is-adoptable.patch
+++ b/patches_treble_phh/platform_system_vold/0006-Every-voldmanaged-storage-is-adoptable.patch
@@ -1,4 +1,4 @@
-From c1ccb433badede868ab164e0b74d942fa6341559 Mon Sep 17 00:00:00 2001
+From 1cbbd5e59bad038231806c4ae9b04cbb2f0208da Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Wed, 11 Mar 2020 14:02:35 +0100
 Subject: [PATCH 6/6] Every voldmanaged storage is adoptable
@@ -8,11 +8,11 @@ Subject: [PATCH 6/6] Every voldmanaged storage is adoptable
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/main.cpp b/main.cpp
-index ebe5510..113d9b9 100644
+index 2ddb958..77c8ab5 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -249,7 +249,7 @@ static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quot
-             std::string nickname(entry.label);
+@@ -255,7 +255,7 @@ static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quot
+             int partnum = entry.partnum;
              int flags = 0;
  
 -            if (entry.is_encryptable()) {
@@ -21,5 +21,5 @@ index ebe5510..113d9b9 100644
                  *has_adoptable = true;
              }
 -- 
-2.17.1
+2.25.1