diff --git a/patches_treble/device_phh_treble/0002-treble-Lineage-ify.patch b/patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
similarity index 91%
rename from patches_treble/device_phh_treble/0002-treble-Lineage-ify.patch
rename to patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
index 2692e37..15a8b57 100644
--- a/patches_treble/device_phh_treble/0002-treble-Lineage-ify.patch
+++ b/patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
@@ -1,9 +1,10 @@
-From b7e42be7eef0c237ba715e48a9563fb130ace133 Mon Sep 17 00:00:00 2001
+From f58f4704de0b4e9f9e650ca954de1bf971d897d1 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Wed, 23 Oct 2019 09:38:16 +0000
-Subject: [PATCH 2/4] treble: Lineage-ify
+Date: Thu, 18 Nov 2021 02:19:52 +0000
+Subject: [PATCH 1/3] treble: Lineage-ify
 
 Squash of:
+- Proper target names
 - Remove fsck SELinux labels
 - treble: Add overlay-lineage
 - treble: Don't specify config_wallpaperCropperPackage
@@ -11,10 +12,11 @@ Squash of:
 ---
  base-pre.mk                                   |  3 -
  base.mk                                       | 16 ++--
+ generate.sh                                   |  2 +-
  .../lineage/res/res/values/config.xml         | 81 +++++++++++++++++++
  .../base/core/res/res/values/config.xml       |  1 -
  sepolicy/file_contexts                        |  3 -
- 5 files changed, 90 insertions(+), 14 deletions(-)
+ 6 files changed, 91 insertions(+), 15 deletions(-)
  create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 
 diff --git a/base-pre.mk b/base-pre.mk
@@ -63,6 +65,19 @@ index 301fee9..e8ac0a3 100644
  
  #VNDK config files
  PRODUCT_COPY_FILES += \
+diff --git a/generate.sh b/generate.sh
+index c1494c7..2760fad 100644
+--- a/generate.sh
++++ b/generate.sh
+@@ -64,7 +64,7 @@ for part in a ab;do
+ 					optional_base='$(call inherit-product, device/phh/treble/base-sas.mk)'
+ 				fi
+ 
+-				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
++				target="lineage_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
+ 
+ 				baseArch="$arch"
+ 				if [ "$arch" = "a64" ];then
 diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
 new file mode 100644
 index 0000000..8df673a
diff --git a/patches_treble/device_phh_treble/0001-treble-Proper-target-names-for-LineageOS.patch b/patches_treble/device_phh_treble/0001-treble-Proper-target-names-for-LineageOS.patch
deleted file mode 100644
index 0a6c204..0000000
--- a/patches_treble/device_phh_treble/0001-treble-Proper-target-names-for-LineageOS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cadb66ad47c20d7f1bc3698e830bbde1ac528ace Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Thu, 18 Nov 2021 02:19:52 +0000
-Subject: [PATCH 1/4] treble: Proper target names for LineageOS
-
-Change-Id: Ib8c12e98d4e875733f0df7874b3a14370f7166e3
----
- generate.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/generate.sh b/generate.sh
-index c1494c7..1ee98ad 100644
---- a/generate.sh
-+++ b/generate.sh
-@@ -65,6 +65,9 @@ for part in a ab;do
- 				fi
- 
- 				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
-+				if [ "$1" == "lineage" ];then
-+					target="lineage_${target}"
-+				fi
- 
- 				baseArch="$arch"
- 				if [ "$arch" = "a64" ];then
--- 
-2.25.1
-
diff --git a/patches_treble/device_phh_treble/0003-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch b/patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
similarity index 81%
rename from patches_treble/device_phh_treble/0003-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
rename to patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
index 1b6ed3a..bece280 100644
--- a/patches_treble/device_phh_treble/0003-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
+++ b/patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
@@ -1,7 +1,7 @@
-From 49c33e6e43aa8b2dbd8f02baa6f47a88caf2a3bb Mon Sep 17 00:00:00 2001
+From 3003b3b500c33aca047d5c61e5d9bf1db9980faf Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 8 Aug 2021 09:29:32 +0000
-Subject: [PATCH 3/4] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
+Subject: [PATCH 2/3] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly
 
 Change-Id: I725443154fabde548d2e6c1b072d34c27596c421
 ---
diff --git a/patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch b/patches_treble/device_phh_treble/0003-add-offline-charger-sepolicy.patch
similarity index 77%
rename from patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch
rename to patches_treble/device_phh_treble/0003-add-offline-charger-sepolicy.patch
index fcde59a..476fd1c 100644
--- a/patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch
+++ b/patches_treble/device_phh_treble/0003-add-offline-charger-sepolicy.patch
@@ -1,7 +1,7 @@
-From b47d7218ce7161cb9e81e21e55db013dd9fbcf68 Mon Sep 17 00:00:00 2001
+From 384487e08861871d0cdccadecc01abb14cfa8709 Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Tue, 15 Sep 2020 21:26:45 -0400
-Subject: [PATCH 4/4] add offline charger sepolicy
+Subject: [PATCH 3/3] add offline charger sepolicy
 
 ---
  sepolicy/gsicharger.te | 1 +