diff --git a/MBCPApp/common.sh b/MBCPApp/common.sh
index 945a3ae..29ada3a 100644
--- a/MBCPApp/common.sh
+++ b/MBCPApp/common.sh
@@ -29,6 +29,7 @@ strip_all() {
 
 getvar() {
     # Usage: getline "n" "pattern" "file"
+    i=0
     while IFS= read -r line; do
         i=$((i+1))
         [ "$i" = "$1" ] && printf '%s\n' "${line##$2}" && return
@@ -117,11 +118,12 @@ pblock() {
     echo "$1" > "$blocker"
 }
 
-get_mb_ver() {
+mb_ver() {
+    [ -z "$1" ] && return 42
     a="$(grep -m1 'android:versionName' "$DIRPATH"/mbapk/mbapk_unpacked/AndroidManifest.xml | tr ' ' '\n' | grep -m1 'android:versionName')"
     a="$(bb_split "$a" '=' '1')"
     a="$(strip_all "$a" '"')"
-    bb_split "$a" '.' '2'
+    bb_split "$a" '.' "$1"
 }
 
 good() {
diff --git a/MBCPApp/parse.sh b/MBCPApp/parse.sh
index f91aa40..4878c5f 100644
--- a/MBCPApp/parse.sh
+++ b/MBCPApp/parse.sh
@@ -77,12 +77,36 @@ for f in patches/*.sh ; do
         continue
     }
     [ -n "$minver" ] && {
-        [ "$(get_mb_ver)" -gt "$minver" ] || {
+        chk="${minver//[^.]}"
+        [ "${#chk}" -ne 2 ] && {
+            warn "[parser] skipping [$pname] with malformed minver"
+            continue
+        }
+
+        minmajor="$(bb_split "$minver" '.' '0')"
+        minminor="$(bb_split "$minver" '.' '1')"
+        minpatch="$(bb_split "$minver" '.' '2')"
+
+        [ "$(( $(mb_ver 0) * 10000 + $(mb_ver 1) * 100 + $(mb_ver 2) ))" -lt \
+          "$((    minmajor * 10000 +    minminor * 100 +    minpatch ))" \
+        ] && {
         info "[parser] skipping [$pname] as current version is lower than patch version clamp"
         continue ; }
     } || :
     [ -n "$maxver" ] && {
-        [ "$(get_mb_ver)" -lt "$maxver" ] || {
+        chk="${maxver//[^.]}"
+        [ "${#chk}" -ne 2 ] && {
+            warn "[parser] skipping [$pname] with malformed maxver"
+            continue
+        }
+
+        maxmajor="$(bb_split "$maxver" '.' '0')"
+        maxminor="$(bb_split "$maxver" '.' '1')"
+        maxpatch="$(bb_split "$maxver" '.' '2')"
+
+        [ "$(( $(mb_ver 0) * 10000 + $(mb_ver 1) * 100 + $(mb_ver 2) ))" -gt \
+          "$((    maxmajor * 10000 +    maxminor * 100 +    maxpatch ))" \
+        ] && {
         info "[parser] skipping [$pname] as current version is higher than patch version clamp"
         continue ; }
     } || :
diff --git a/MBCPApp/patches/add_verified_badge.sh b/MBCPApp/patches/add_verified_badge.sh
index 3c0dee3..e900978 100644
--- a/MBCPApp/patches/add_verified_badge.sh
+++ b/MBCPApp/patches/add_verified_badge.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Add verified badge
 # MAXVER:
-# MINVER: 
+# MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
diff --git a/MBCPApp/patches/autopatch_strings.sh b/MBCPApp/patches/autopatch_strings.sh
index 8894c34..e13fb4c 100644
--- a/MBCPApp/patches/autopatch_strings.sh
+++ b/MBCPApp/patches/autopatch_strings.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Autopatch strings
-# MAXVER: 67
+# MAXVER: 6.4.67
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
@@ -46,7 +46,7 @@ sed_libapp 's|To provide the best experience, the MBBank APP needs access to som
 # QR on "Other"
 sed_libapp 's|QR receive|My QR     |g'
 
-# Digital OTP related 
+# Digital OTP related
 sed_libapp 's|To use transaction authentication feature with Online OTP, please signin APP MB Bank and implement Online OTP registration in the Installation item|DigitalOTP is not currently registered on your MBCP app. In order to use this feature, please login to MBCP and setup DigitalOTP, then try again.  |'
 sed_libapp 's|When transacting via Internet banking or registering Online OTP on other device|Used for transactions via eMB or when registering DigitalOTP on other device   |'
 sed_libapp 's|online OTP|DigitalOTP|g'
@@ -101,18 +101,18 @@ sed_libapp 's|You want to send a gift for the occasion?|You want to send a gift
 sed_libapp 's|Intruction|How-to    |g'
 sed_libapp 's|MBBank will send the withdrawal verification code to the APP instead of SMS on the phone.|MB Bank will send the withdrawal verification code to MBCPApp instead of SMS as before.  |'
 
-# Latest version check 
+# Latest version check
 sed_libapp 's|The lastest version|TG/Disroot:mbbpatch|'
 
-# Profile section 
+# Profile section
 sed_libapp 's|User profile|View profile|g'
 sed_libapp 's|MB Membership Package|MB Membership        |'
 sed_libapp 's|email information|Email information|g'
 
-# Account related 
+# Account related
 sed_libapp 's|Premium Account Number|Open new lucky account|'
 
-# Cashback 150K badge (unused on v6.4.62+) 
+# Cashback 150K badge (unused on v6.4.62+)
 sed_libapp 's|Cashback 150K|             |'
 
 # Forgot password screen
@@ -120,7 +120,7 @@ sed_libapp 's|Request for supplying password|Request for new password      |'
 sed_libapp 's|ID card/ID card|Old/New ID card|g'
 sed_libapp 's|Number of document|Number of ID card |g'
 
-# Wrong password dialog 
+# Wrong password dialog
 sed_libapp 's|Your device will be locked if you enter incorrectly more than 5 times. Please try again or select the "Forgot password" feature to be reissued.|Your account will be locked if you enter incorrect password more than 5 times. Please try again or use the "Forgot password" feature to reset. |'
 
 # Others section on MB
@@ -138,7 +138,7 @@ sed_libapp 's|Please come back later for more new themes!|Tips: Unofficial theme
 sed_libapp 's|Change theme successfully|App theme changed :)     |'
 sed_libapp 's|Change theme|Store themes|'
 
-# Balance fluctuations notifications (Configuration -> Balance fluctuations notifications) 
+# Balance fluctuations notifications (Configuration -> Balance fluctuations notifications)
 sed_libapp 's|get notifications|Get notifications|g'
 sed_libapp 's|Read the announcement|Notify with voice    |'
 
@@ -155,7 +155,7 @@ sed_libapp 's|Start journey|Alright !    |'
 sed_libapp 's|Go here to install the app|MBCPApp settings are here |'
 
 
-# EKYC error dialog 
+# EKYC error dialog
 sed_libapp 's|Verification information is invalid, please contact hotline 1900545426 for support|EKYC failed, please go to Telegram group (@mbbpatch_eng) for details and help !!! |'
 
 # XPE002/XPE003 dialog :
@@ -190,7 +190,7 @@ sed_libapp 's|Zalo Pay|ZolaPay |'
 sed_libapp 's|MB membership|MB Membership|g'
 
 # Explore strings (homeLanding -> More -> Discovery)
-sed_libapp 's|New release|Features   |g'			
+sed_libapp 's|New release|Features   |g'
 sed_libapp 's|Challenge to receive gifts|Others                    |g'
 
 # Close account hints (homeLanding -> Total balance VND -> See -> Close account)
@@ -198,7 +198,7 @@ sed_libapp 's|MB will Autoally transfer the entire remaining balance to the acco
 
 # Expired login session dialog
 sed_libapp 's|The login session expired. Please login again|Login session are expired. Please login again|'
-# Confirm button on dialog 
+# Confirm button on dialog
 sed_libapp 's|I understand|OKAY        |g'
 
 # Exit application dialog
@@ -239,7 +239,7 @@ sed_libapp 's|AI Suggestion|MB Suggestion|'
 sed_libapp 's|Quick transfer using AI|Quick transfer         |'
 
 
-# Placeholder toolbox	
+# Placeholder toolbox
 sed_libapp 's|Shopping, entertainment|MBCPApp Toolbox        |'
 
 
diff --git a/MBCPApp/patches/better_custombgscreen.sh b/MBCPApp/patches/better_custombgscreen.sh
index 7c3088d..59f509d 100644
--- a/MBCPApp/patches/better_custombgscreen.sh
+++ b/MBCPApp/patches/better_custombgscreen.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Better custom background screen
-# MAXVER: 
-# MINVER: 83
+# MAXVER:
+# MINVER: 6.4.83
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
diff --git a/MBCPApp/patches/bypass_accessibility_malicious_app_check.sh b/MBCPApp/patches/bypass_accessibility_malicious_app_check.sh
index b04e3c5..423b093 100644
--- a/MBCPApp/patches/bypass_accessibility_malicious_app_check.sh
+++ b/MBCPApp/patches/bypass_accessibility_malicious_app_check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Bypass accessibility & malicious apps check
-# MAXVER: 55
+# MAXVER: 6.4.55
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
diff --git a/MBCPApp/patches/bypass_checksum.sh b/MBCPApp/patches/bypass_checksum.sh
index a6745ee..5daf1de 100644
--- a/MBCPApp/patches/bypass_checksum.sh
+++ b/MBCPApp/patches/bypass_checksum.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Bypass GW934 checksum
-# MAXVER: 67
-# MINVER: 63
+# MAXVER: 6.4.67
+# MINVER: 6.4.63
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
@@ -18,11 +18,11 @@ fi
 
 info "Extracting [app-debug.apk]..."
 unzip -o 'tools/bypass/app-debug.apk' -d 'tools/bypass'
-mv 'tools/bypass/lib/arm64-v8a/libSignatureKiller.so' 'tools/bypass/lib/arm64-v8a/libmodft3.so' 
+mv 'tools/bypass/lib/arm64-v8a/libSignatureKiller.so' 'tools/bypass/lib/arm64-v8a/libmodft3.so'
 mv 'tools/bypass/lib/armeabi-v7a/libSignatureKiller.so' 'tools/bypass/lib/armeabi-v7a/libmodft3.so'
 info "Moving libraries..."
-mv 'tools/bypass/lib/arm64-v8a/libmodft3.so' 'mbapk/mbapk_unpacked/root/lib/arm64-v8a' 
-mv 'tools/bypass/lib/armeabi-v7a/libmodft3.so' 'mbapk/mbapk_unpacked/root/lib/armeabi-v7a' 
+mv 'tools/bypass/lib/arm64-v8a/libmodft3.so' 'mbapk/mbapk_unpacked/root/lib/arm64-v8a'
+mv 'tools/bypass/lib/armeabi-v7a/libmodft3.so' 'mbapk/mbapk_unpacked/root/lib/armeabi-v7a'
 
 mv 'mbapk/mbapk_unpacked/root/lib/arm64-v8a/libapp.so' 'mbapk/mbapk_unpacked/root/lib/arm64-v8a/libmbcp.so'
 mv 'mbapk/mbapk_unpacked/root/lib/armeabi-v7a/libapp.so' 'mbapk/mbapk_unpacked/root/lib/armeabi-v7a/libmbcp.so'
diff --git a/MBCPApp/patches/bypass_new_zimperium_detection.sh b/MBCPApp/patches/bypass_new_zimperium_detection.sh
index 0bfc1aa..3eda1c0 100644
--- a/MBCPApp/patches/bypass_new_zimperium_detection.sh
+++ b/MBCPApp/patches/bypass_new_zimperium_detection.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Bypass new zimperium detection
-# MAXVER: 63
+# MAXVER: 6.4.63
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
diff --git a/MBCPApp/patches/change_app_logo.sh b/MBCPApp/patches/change_app_logo.sh
index 93c2f07..15dd607 100644
--- a/MBCPApp/patches/change_app_logo.sh
+++ b/MBCPApp/patches/change_app_logo.sh
@@ -27,7 +27,7 @@ do
     rm -rf "$DIRPATH"/mbapk/mbapk_unpacked/resources/package_1/res/mipmap-xhdpi
     rm -rf "$DIRPATH"/mbapk/mbapk_unpacked/resources/package_1/res/mipmap-xxhdpi
     rm -rf "$DIRPATH"/mbapk/mbapk_unpacked/resources/package_1/res/mipmap-xxxhdpi
-    
+
     info 'Copying new logos to [mbapk_unpacked/res]...'
     cp -r -f "$DIRPATH"/mbcpicons/"$variant"/mipmap-hdpi mbapk/mbapk_unpacked/resources/package_1/res
     cp -r -f "$DIRPATH"/mbcpicons/"$variant"/mipmap-mdpi mbapk/mbapk_unpacked/resources/package_1/res
diff --git a/MBCPApp/patches/custom_vtapscreen.sh b/MBCPApp/patches/custom_vtapscreen.sh
index efdcaff..765ff29 100644
--- a/MBCPApp/patches/custom_vtapscreen.sh
+++ b/MBCPApp/patches/custom_vtapscreen.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-# PATCHNAME: Custom VTAP screen 
-# MAXVER: 
-# MINVER: 52
+# PATCHNAME: Custom VTAP screen
+# MAXVER:
+# MINVER: 6.4.52
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
diff --git a/MBCPApp/patches/disable_membership.sh b/MBCPApp/patches/disable_membership.sh
index 06ddedd..5f46067 100644
--- a/MBCPApp/patches/disable_membership.sh
+++ b/MBCPApp/patches/disable_membership.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# PATCHNAME: Disable MB Membership 
-# MAXVER: 67
+# PATCHNAME: Disable MB Membership
+# MAXVER: 6.4.67
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
diff --git a/MBCPApp/patches/fix_tian37.sh b/MBCPApp/patches/fix_tian37.sh
index ac4b2d5..bb71130 100644
--- a/MBCPApp/patches/fix_tian37.sh
+++ b/MBCPApp/patches/fix_tian37.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-# PATCHNAME: Tian37 Fix 
-# MAXVER: 
-# MINVER: 85
+# PATCHNAME: Tian37 Fix
+# MAXVER:
+# MINVER: 6.4.85
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
diff --git a/MBCPApp/patches/hide_vtap_root_detection_activity.sh b/MBCPApp/patches/hide_vtap_root_detection_activity.sh
index c6b135c..39e2e99 100644
--- a/MBCPApp/patches/hide_vtap_root_detection_activity.sh
+++ b/MBCPApp/patches/hide_vtap_root_detection_activity.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Hide VTAP root detection activity & dialog
-# MAXVER: 
+# MAXVER:
 # MINVER:
 # shellcheck disable=SC1091,SC2016
 . "$DIRPATH"/common.sh
@@ -9,26 +9,26 @@
 if [[ -d mbapk/mbapk_unpacked/smali/classes4/com/vtap/ ]]; then
 	info "VTAP is found on [smali_classes4], Applying!"
 	# Adapt with v6.4.53+
-	sed -i 's|Lcom/vtap/MaintenanceActivity;|Lio/flutter/plugins/MainActivity;|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes4/com/vtap/d.smali 
-	sed -i 's|Lcom/vtap/MaintenanceActivity;|Lio/flutter/plugins/MainActivity;|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes4/com/vtap/VTapSetupPlugin.smali  
-	rm -f 'mbapk/mbapk_unpacked/smali/classes4/com/vtap/MaintenanceActivity.smali' 
+	sed -i 's|Lcom/vtap/MaintenanceActivity;|Lio/flutter/plugins/MainActivity;|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes4/com/vtap/d.smali
+	sed -i 's|Lcom/vtap/MaintenanceActivity;|Lio/flutter/plugins/MainActivity;|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes4/com/vtap/VTapSetupPlugin.smali
+	rm -f 'mbapk/mbapk_unpacked/smali/classes4/com/vtap/MaintenanceActivity.smali'
 	rm -f 'mbapk/mbapk_unpacked/smali/classes4/com/vtap/MaintenanceActivity$1.smali'
 	rm -f 'mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/vguard/VGDialogActivity.smali'
-	sed -i 's|Lcom/vkey/android/vguard/VGDialogActivity;|Lio/flutter/plugins/MainActivity;|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/dy.smali 
+	sed -i 's|Lcom/vkey/android/vguard/VGDialogActivity;|Lio/flutter/plugins/MainActivity;|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/dy.smali
 	# Bypass VKey root check that throw VGFullScreenDialogActivity then exit :)
 	cp -f 'blob_patches/bypass_rootold/BasicThreatInfo.smali' 'mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/internal/vguard/engine/'
-	cp -f 'blob_patches/bypass_rootold/VGThreatAppInfo.smali' 'mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/vguard/model/' 
+	cp -f 'blob_patches/bypass_rootold/VGThreatAppInfo.smali' 'mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/vguard/model/'
 	cp -f 'blob_patches/bypass_rootold/VGThreatResponse.smali' 'mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/vguard/model/'
 	# Test crash fixes for some Android 13 devices
 	sed -i 's|invoke-virtual {v5, v12}, Lcom/vkey/android/vguard/model/VGThreatResponse;->setUsingLegacyMessage(Z)V| |g' 'mbapk/mbapk_unpacked/smali/classes4/com/vkey/android/eg.smali'
-else 
+else
 	info "VTAP is not found on [smali_classes4], ignore copying!"
 fi
 
 if [[ -d mbapk/mbapk_unpacked/smali/classes3/com/vtap ]]; then
 	info "VTAP is found on [smali_classes3], Applying!"
 	# Adapt with v6.4.62+
-	cp -f 'blob_patches/bypass_rootold/BasicThreatInfo.smali' 'mbapk/mbapk_unpacked/smali/classes3/com/vkey/android/internal/vguard/engine/' 
+	cp -f 'blob_patches/bypass_rootold/BasicThreatInfo.smali' 'mbapk/mbapk_unpacked/smali/classes3/com/vkey/android/internal/vguard/engine/'
 	cp -f 'blob_patches/bypass_rootold/VGThreatAppInfo.smali' 'mbapk/mbapk_unpacked/smali/classes3/com/vkey/android/vguard/model/'
 	cp -f 'blob_patches/bypass_rootold/VGThreatResponse.smali' 'mbapk/mbapk_unpacked/smali/classes3/com/vkey/android/vguard/model/'
 	# Test crash fixes for some Android 13 devices
@@ -37,5 +37,5 @@ else
 	info "VTAP is not found on [smali_classes3], ignore copying!"
 	warn "Something wrong here! [smali_classes3] should contains VTAP !!!"
 	warn "Try to unpack app again !"
-	exit 1 
+	exit 1
 fi
diff --git a/MBCPApp/patches/legacy_hide_vtap.sh b/MBCPApp/patches/legacy_hide_vtap.sh
index 489cbae..131fd1a 100644
--- a/MBCPApp/patches/legacy_hide_vtap.sh
+++ b/MBCPApp/patches/legacy_hide_vtap.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Legacy hide VTAP activity & dialog
-# MAXVER: 
+# MAXVER:
 # MINVER:
 # shellcheck disable=SC1091,SC2016
 
diff --git a/MBCPApp/patches/modify_app_theme.sh b/MBCPApp/patches/modify_app_theme.sh
index 3c29f77..4742e10 100644
--- a/MBCPApp/patches/modify_app_theme.sh
+++ b/MBCPApp/patches/modify_app_theme.sh
@@ -21,8 +21,8 @@ do
       info 'Copying [welcom_img_eMbee.webp]...'
       cp -f 'blob_patches/semipriority/welcom_img_eMbee.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base'
 
-      
-      cat mbapk/mbapk_unpacked/root/lib/arm64-v8a/libapp.so | grep -a -oH filestatic > /dev/null 2>&1 && demopriority 
+
+      cat mbapk/mbapk_unpacked/root/lib/arm64-v8a/libapp.so | grep -a -oH filestatic > /dev/null 2>&1 && demopriority
       demopriority() {
       # Modify the demo screen
       info 'Modifying demo screenshot...'
@@ -64,12 +64,12 @@ do
     cp -f 'blob_patches/trungthu_theme/bill_background_gold.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/trungthu'
     cp -f 'blob_patches/trungthu_theme/coreBanking_img_successBackground.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/trungthu'
     cp -f 'blob_patches/trungthu_theme/qr_img_ThemeDefalut.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/trungthu'
-    
+
     rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/static/onboarding/onboarding_illus_a80.webp'
     rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/static/onboarding/onboarding_img_a80Banner.webp'
     rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/static/onboarding/onboarding_img_a80Code.webp'
     rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/static/onboarding/onboarding_bg_a80Landing.webp'
-	
+
     cat mbapk/mbapk_unpacked/root/lib/arm64-v8a/libapp.so | grep -a -oH filestatic > /dev/null 2>&1 && demotrungthu
     demotrungthu() {
     sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_thumbnail_quockhanh.png|https://gitlab.com/-/project/56341767/uploads/227ca0fc0dd1b5b3973690c3f9031c27/thumb.png?app=mbcp11|g'
@@ -78,7 +78,7 @@ do
     sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenHome_quockhanh.png|https://gitlab.com/-/project/56341767/uploads/b0b35d05a0752b6eec0dd19d50f15afd/preview3.png?ref=mbcp|g'
     sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenSuccess_quockhanh.png|https://gitlab.com/-/project/56341767/uploads/c61050db4674a181978b6f868c100aa6/preview4.png?ref=mbcpapp|g'
     sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenShare_quockhanh.png|https://gitlab.com/-/project/56341767/uploads/2bd471b0b9ef7f96b05020bb4af304ed/preview5.png?ref=mbcp1|g'
-     }	
+     }
     echo "Patch applied by MBCPApp Patcher on $(uname -s -r) with commit : $(git rev-parse --short HEAD) at $(date)." > "mbapk/mbapk_unpacked/root/assets/mbcp_info/midautumn_theme.inf"
       good "Applied [Mid-autumn festival] theme."
 
@@ -92,7 +92,7 @@ do
       cp -f 'blob_patches/mbclassic/loading_bg_main.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base'
       cp -f 'blob_patches/mbclassic/login_bg_main.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base'
       cp -f 'blob_patches/mbclassic/qr_img_ThemeDefalut.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base'
-	
+
       cat mbapk/mbapk_unpacked/root/lib/arm64-v8a/libapp.so | grep -a -oH filestatic > /dev/null 2>&1 && demombclassic
       demombclassic() {
       # Modify theme preview on settings
@@ -100,15 +100,15 @@ do
 
       sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenLoginClassic.png|https://gitlab.com/-/project/56341767/uploads/f585b28f88876db211f116d1d622031d/mbcp_login.png?git1|g'
 
-      sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_thumbnailClassic.png|https://gitlab.com/-/project/56341767/uploads/ba4f0923a4956ba379868e01c55e9cfb/thumb.png?aaaaaaa|g' 
+      sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_thumbnailClassic.png|https://gitlab.com/-/project/56341767/uploads/ba4f0923a4956ba379868e01c55e9cfb/thumb.png?aaaaaaa|g'
 
       sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_thumbnailClassic.png|https://gitlab.com/-/project/56341767/uploads/ba4f0923a4956ba379868e01c55e9cfb/thumb.png?aaaaaaa|g'
 
       sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenHomeClassic.png|https://gitlab.com/-/project/56341767/uploads/1d7fcf300167e87440220a6f0d28b8c1/mbcp_lobby.png?aaa|g'
 
-      sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenHomeClassic.png|https://gitlab.com/-/project/56341767/uploads/1d7fcf300167e87440220a6f0d28b8c1/mbcp_lobby.png?aaa|g' 
+      sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenHomeClassic.png|https://gitlab.com/-/project/56341767/uploads/1d7fcf300167e87440220a6f0d28b8c1/mbcp_lobby.png?aaa|g'
 
-      sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenSuccessClassic.png|https://gitlab.com/-/project/56341767/uploads/d94e257eb6cf59865016a939541c32fc/mbcp_transfer.png?aaa|g' 
+      sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenSuccessClassic.png|https://gitlab.com/-/project/56341767/uploads/d94e257eb6cf59865016a939541c32fc/mbcp_transfer.png?aaa|g'
 
       sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/ThemeImage/theme_img_screenSuccessClassic.png|https://gitlab.com/-/project/56341767/uploads/d94e257eb6cf59865016a939541c32fc/mbcp_transfer.png?aaa|g'
 
@@ -166,7 +166,7 @@ do
 
       cat mbapk/mbapk_unpacked/root/lib/arm64-v8a/libapp.so | grep -a -oH filestatic > /dev/null 2>&1 && noel2024lib
       noel2024lib() {
-	
+
       # Lockdown ability to change other theme, also force Noel 2024 theme
       sed_libapp 's|theme|Noel |g'
       sed_libapp 's|theme|Noel |g'
@@ -175,7 +175,7 @@ do
       sed_libapp 's|Change Noel |Noel 2024   |g'
       # Modify the demo screen
       sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/module/onboarding/welcome/welcom_img_demoImage01.png|https://gitlab.com/-/project/56341767/uploads/bab657a5c0a9d0c4e0f7ddd5ba5772e9/noel1.png?ref=mbcpappgit1234|g'
-      
+
       sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/module/onboarding/welcome/welcom_img_demoImage02.png|https://gitlab.com/-/project/56341767/uploads/8314efa7352360a84df8ec8315ee587b/noel2.png?ref=mbcpappgit1234|g'
 
       sed_libapp 's|https://filestatic.mbbank.com.vn/mbapp-images/rs/prime/module/onboarding/welcome/welcom_img_demoImage03.png|https://gitlab.com/-/project/56341767/uploads/f05f1e2fc54d24d99504141d65a107e8/noel3.png?ref=mbcpappgit1234|g'
@@ -196,7 +196,7 @@ do
       cp -f 'blob_patches/tretrung_theme/login_bg_main.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/noel'
       cp -f 'blob_patches/tretrung_theme/login_bg_main.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/noel/loading_bg_main.webp'
       cp -f 'blob_patches/tretrung_theme/login_bg_main.webp' 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/noel/qr_img_ThemeDefalut.webp'
-	
+
       rm -rf 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/noel/customUI_img_noelMode.webp'
       rm -rf 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/noel/a_logo_img_addon.webp'
 
diff --git a/MBCPApp/patches/remove_banner_miniapp.sh b/MBCPApp/patches/remove_banner_miniapp.sh
index 57b23e8..0af60c4 100644
--- a/MBCPApp/patches/remove_banner_miniapp.sh
+++ b/MBCPApp/patches/remove_banner_miniapp.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove banners & MiniApp
-# MAXVER: 67
+# MAXVER: 6.4.67
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
@@ -37,7 +37,7 @@ rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/pri
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/khien_img_muasam.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/khien_img_offline.webp'
 
-# 
+#
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/static/banner_transfer_mass.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/static/banner_transfer_private.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/static/recap_banner.webp'
diff --git a/MBCPApp/patches/remove_bulitin_fonts.sh b/MBCPApp/patches/remove_bulitin_fonts.sh
index 9c4cc88..da87b39 100644
--- a/MBCPApp/patches/remove_bulitin_fonts.sh
+++ b/MBCPApp/patches/remove_bulitin_fonts.sh
@@ -27,9 +27,9 @@ rm -f 'mbapk/mbapk_unpacked/resources/package_1/res/font/bold.ttf'
 rm -f 'mbapk/mbapk_unpacked/resources/package_1/res/font/medium.ttf'
 rm -f 'mbapk/mbapk_unpacked/resources/package_1/res/font/regular.ttf'
 rm -f 'mbapk/mbapk_unpacked/root/assets/insider.ttf'
-# Placeholder font to fix display issues when open details balance notifications 
+# Placeholder font to fix display issues when open details balance notifications
 info "Creating placeholder font..."
-touch 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/fonts/AvertaStdCY-Regular.otf' 
+touch 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/fonts/AvertaStdCY-Regular.otf'
 # Placeholder to prevent compiling resource fail
 touch 'mbapk/mbapk_unpacked/resources/package_1/res/font/avenir_next_bold.ttf'
 info 'Copying fix fonts...'
diff --git a/MBCPApp/patches/remove_custompfp.sh b/MBCPApp/patches/remove_custompfp.sh
index 8cc6ddf..e98b6f0 100644
--- a/MBCPApp/patches/remove_custompfp.sh
+++ b/MBCPApp/patches/remove_custompfp.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# PATCHNAME: Remove custom profile picture 
-# MAXVER: 67
+# PATCHNAME: Remove custom profile picture
+# MAXVER: 6.4.67
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
diff --git a/MBCPApp/patches/remove_embee.sh b/MBCPApp/patches/remove_embee.sh
index 1990d75..9bd24d8 100644
--- a/MBCPApp/patches/remove_embee.sh
+++ b/MBCPApp/patches/remove_embee.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove eMBee
-# MAXVER: 67
+# MAXVER: 6.4.67
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
@@ -19,8 +19,8 @@ rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/bas
 # Priority support
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/eMBee_img_page.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/eMBee_img_header.webp'
-rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/eMBee_img_login.webp'   
-# Private support  
+rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/eMBee_img_login.webp'
+# Private support
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/eMBee_img_page.private.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/eMBee_img_login.private.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/eMBee_img_header.private.webp'
@@ -31,6 +31,6 @@ rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/bas
 # Private support
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/eMBee_img_loginSupport.private.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/eMBee_img_loginSupport.webp'
-# Priority support 
+# Priority support
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/eMBee_img_headerNew.webp'
 rm -f 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/priority/eMBee_img_loginSupport.webp'
diff --git a/MBCPApp/patches/remove_invoke_to_mbshield.sh b/MBCPApp/patches/remove_invoke_to_mbshield.sh
index 5db9403..315c1da 100644
--- a/MBCPApp/patches/remove_invoke_to_mbshield.sh
+++ b/MBCPApp/patches/remove_invoke_to_mbshield.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove invoke to mbshield
-# MAXVER:  
-# MINVER: 21
+# MAXVER:
+# MINVER: 6.4.21
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
@@ -21,7 +21,7 @@ done
 else
 	warn "Flutter not found on classes4, ignoring..."
 fi
-	
+
 	# Newer dex location (found on v6.4.82+, might present since v6.4.70+)
 if [[ -f mbapk/mbapk_unpacked/smali/classes3/io/flutter/plugins/MainActivity.smali ]]; then
 	info "Flutter found on classes3 !!"
diff --git a/MBCPApp/patches/remove_mbai.sh b/MBCPApp/patches/remove_mbai.sh
index 4b0b48b..b696a24 100644
--- a/MBCPApp/patches/remove_mbai.sh
+++ b/MBCPApp/patches/remove_mbai.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove MB AI Bullsh*t resources
-# MAXVER: 
-# MINVER: 73
+# MAXVER:
+# MINVER: 6.4.73
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
@@ -21,7 +21,7 @@ rm -rf 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/ba
 rm -rf 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/mbai_img_search.webp'
 rm -rf 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/coreBanking_illus_p2p.webp'
 rm -rf 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/base/coreBanking_illus_p2p.private.webp'
-# Tet binh ngo 
+# Tet binh ngo
 rm -rf 'mbapk/mbapk_unpacked/root/assets/flutter_assets/assets/images/dynamic/tetbinhngo/coreBanking_illus_p2p.webp'
 
 
diff --git a/MBCPApp/patches/remove_new_root_detection.sh b/MBCPApp/patches/remove_new_root_detection.sh
index 4886a4f..4635343 100644
--- a/MBCPApp/patches/remove_new_root_detection.sh
+++ b/MBCPApp/patches/remove_new_root_detection.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove new root detection
-# MAXVER: 59
+# MAXVER: 6.4.59
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
diff --git a/MBCPApp/patches/remove_new_zimperium_check.sh b/MBCPApp/patches/remove_new_zimperium_check.sh
index 12b3794..c752260 100644
--- a/MBCPApp/patches/remove_new_zimperium_check.sh
+++ b/MBCPApp/patches/remove_new_zimperium_check.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove new zimperium check
-# MAXVER: 
-# MINVER: 59
+# MAXVER:
+# MINVER: 6.4.59
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
@@ -22,7 +22,7 @@
     sed -i 's|designersactivists                                                                     |weneedfreedom|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes/androidx/UnderlyingVcl.smali
      # Adapt with v6.4.66
     sed -i 's|estimateddistributions                                                                 |weneedfreedom|g' "$DIRPATH"/mbapk/mbapk_unpacked/smali/classes/androidx/UnderlyingVcl.smali
-else 
+else
     warn "[UnderlyingVcl.smali] not found! skipping"
 fi
     # Adapt with v6.4.67+
@@ -70,12 +70,12 @@ fi
     cp 'mbapk/mbapk_unpacked/root/lib/arm64-v8a/libweneedfreedom.so' 'temp/'
     mv 'temp/libweneedfreedom.so' 'temp/libdesignersactivists.so'
     cp -f 'temp/libdesignersactivists.so' 'mbapk/mbapk_unpacked/root/lib/arm64-v8a/libdesignersactivists.so'
-    rm -rf temp 
+    rm -rf temp
     mkdir temp
     cp 'mbapk/mbapk_unpacked/root/lib/armeabi-v7a/libweneedfreedom.so' 'temp/'
     mv 'temp/libweneedfreedom.so' 'temp/libdesignersactivists.so'
     cp -f 'temp/libdesignersactivists.so' 'mbapk/mbapk_unpacked/root/lib/armeabi-v7a/libdesignersactivists.so'
-    rm -rf temp 
+    rm -rf temp
 else
     warn "[libdesignersactivists.so] not found! skipping"
 fi
@@ -171,6 +171,6 @@ fi
     # Fixes EKYC3002-MS6998 (DF16246.6) error on devices with randomized apps
     info "Patching [AndroidManifest.xml]"
     sed -i 's|<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>||g' 'mbapk/mbapk_unpacked/AndroidManifest.xml'
-   
-    
-    
+
+
+
diff --git a/MBCPApp/patches/remove_useless_lib.sh b/MBCPApp/patches/remove_useless_lib.sh
index 8e50731..7199478 100644
--- a/MBCPApp/patches/remove_useless_lib.sh
+++ b/MBCPApp/patches/remove_useless_lib.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove useless libraries
-# MAXVER: 
-# MINVER: 68
+# MAXVER:
+# MINVER: 6.4.68
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
diff --git a/MBCPApp/patches/remove_vnpay_vmb20.sh b/MBCPApp/patches/remove_vnpay_vmb20.sh
index c028607..e8d1e20 100644
--- a/MBCPApp/patches/remove_vnpay_vmb20.sh
+++ b/MBCPApp/patches/remove_vnpay_vmb20.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove VNPAY VMB20
 # MAXVER:
-# MINVER: 56
+# MINVER: 6.4.56
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
diff --git a/MBCPApp/patches/remove_vpn_detection.sh b/MBCPApp/patches/remove_vpn_detection.sh
index e631ab6..45fad9e 100644
--- a/MBCPApp/patches/remove_vpn_detection.sh
+++ b/MBCPApp/patches/remove_vpn_detection.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # PATCHNAME: Remove VPN detection
-# MAXVER: 67
+# MAXVER: 6.4.67
 # MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
diff --git a/MBCPApp/patches/restore_old_lib_682.sh b/MBCPApp/patches/restore_old_lib_682.sh
index 43a6dd8..b7ec821 100644
--- a/MBCPApp/patches/restore_old_lib_682.sh
+++ b/MBCPApp/patches/restore_old_lib_682.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-# PATCHNAME: Restore old 682 lib 
-# MAXVER: 63
-# MINVER: 61
+# PATCHNAME: Restore old 682 lib
+# MAXVER: 6.4.63
+# MINVER: 6.4.61
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
@@ -10,13 +10,13 @@ echo "Downloading v6.4.61 apks..."
 wget https://github.com/kongu2k8-svg/mbapk/releases/download/mb/embee_v6.4.61_682_arm64-v8a_armeabi-v7a.apks -q --show-progress
 mv *.apks old682/
 echo "Unpacking..."
-java -jar tools/apkeditor.jar m -i old682/*.apks 
+java -jar tools/apkeditor.jar m -i old682/*.apks
 java -jar tools/apktool.jar d old682/*.apk -o old682/unpacked -j$(nproc)
-mv old682/unpacked/lib/arm64-v8a/libapp.so mbapk/mbapk_unpacked/root/lib/arm64-v8a/ 
-mv old682/unpacked/lib/armeabi-v7a/libapp.so mbapk/mbapk_unpacked/root/lib/armeabi-v7a/ 
-mv old682/unpacked/lib/arm64-v8a/libflutter.so mbapk/mbapk_unpacked/root/lib/arm64-v8a/ 
-mv old682/unpacked/lib/armeabi-v7a/libflutter.so mbapk/mbapk_unpacked/root/lib/armeabi-v7a/   
-echo "Cleaning..."   
+mv old682/unpacked/lib/arm64-v8a/libapp.so mbapk/mbapk_unpacked/root/lib/arm64-v8a/
+mv old682/unpacked/lib/armeabi-v7a/libapp.so mbapk/mbapk_unpacked/root/lib/armeabi-v7a/
+mv old682/unpacked/lib/arm64-v8a/libflutter.so mbapk/mbapk_unpacked/root/lib/arm64-v8a/
+mv old682/unpacked/lib/armeabi-v7a/libflutter.so mbapk/mbapk_unpacked/root/lib/armeabi-v7a/
+echo "Cleaning..."
 rm -rf old682
 echo "WARNING : Any changes to [libapp.so] like Autopatch strings are reverted, please apply again if you want to !"
 
diff --git a/MBCPApp/patches/spoof_appver.sh b/MBCPApp/patches/spoof_appver.sh
index c0969d7..c8b9293 100644
--- a/MBCPApp/patches/spoof_appver.sh
+++ b/MBCPApp/patches/spoof_appver.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # PATCHNAME: Spoof app version to 698
-# MAXVER: 67
-# MINVER: 
+# MAXVER: 6.4.67
+# MINVER:
 # shellcheck disable=SC1091
 . "$DIRPATH"/common.sh
 
diff --git a/MBCPApp/patches/widget_dark.sh b/MBCPApp/patches/widget_dark.sh
index 67eecb2..56d5bfe 100644
--- a/MBCPApp/patches/widget_dark.sh
+++ b/MBCPApp/patches/widget_dark.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# PATCHNAME: Change widget background to dark 
+# PATCHNAME: Change widget background to dark
 # MAXVER:
 # MINVER:
 # shellcheck disable=SC1091