diff --git a/core/java/com/android/internal/util/pixys/PixelPropsUtils.java b/core/java/com/android/internal/util/pixys/PixelPropsUtils.java
index 3e8d2858faf2..ebbe153c1608 100644
--- a/core/java/com/android/internal/util/pixys/PixelPropsUtils.java
+++ b/core/java/com/android/internal/util/pixys/PixelPropsUtils.java
@@ -62,21 +62,16 @@ public class PixelPropsUtils {
     private static final Map<String, Object> propsToChangeK30U;
     private static final Map<String, ArrayList<String>> propsToKeep;
 
-    private static final String[] packagesToChangePixel7Pro = {
-            "com.google.android.apps.privacy.wildlife",
-            "com.google.android.apps.wallpaper.pixel",
-            "com.google.android.apps.wallpaper",
-            "com.google.android.apps.subscriptions.red",
-            "com.google.pixel.livewallpaper"
+    private static final String[] packagesToChangePixel5 = {
+            "com.breel.wallpapers20"
     };
 
    private static final String[] packagesToChangePixel6Pro = {
             "com.google.android.apps.googleassistant",
             "com.google.android.googlequicksearchbox",
-            "com.google.android.inputmethod.latin",
             "com.google.android.as",
-            "com.google.android.wallpaper.effects",
-            "com.google.android.apps.emojiwallpaper",
+            "com.google.android.inputmethod.latin",
+            "com.google.android.gms"
     };
 
     private static final String[] packagesToChangePixelXL = {
@@ -96,7 +91,6 @@ public class PixelPropsUtils {
     private static final String[] extraPackagesToChange = {
             "com.android.chrome",
             "com.android.vending",
-            "com.breel.wallpapers20",
             "com.nhs.online.nhsonline",
             "com.netflix.mediaclient",
             "com.nothing.smartcenter"
@@ -310,14 +304,14 @@ public void onTaskStackChanged() {
             } else if (isPixelDevice) {
                 return;
             } else {
-                if (Arrays.asList(packagesToChangePixel7Pro).contains(packageName)) {
-                    propsToChange.putAll(propsToChangePixel7Pro);
+                if (Arrays.asList(packagesToChangePixel5).contains(packageName)) {
+                    propsToChange.putAll(propsToChangePixel5);
                 } else if (Arrays.asList(packagesToChangePixelXL).contains(packageName)) {
                     propsToChange.putAll(propsToChangePixelXL);
                 } else if (Arrays.asList(packagesToChangePixel6Pro).contains(packageName)) {
                     propsToChange.putAll(propsToChangePixel6Pro);
                 } else {
-                    propsToChange.putAll(propsToChangePixel5);
+                    propsToChange.putAll(propsToChangePixel7Pro);
                 }
             }
 
diff --git a/packages/SystemUI/scripts/token_alignment/package-lock.json b/packages/SystemUI/scripts/token_alignment/package-lock.json
index da9edb3b39b5..6c67f65e0f9d 100644
--- a/packages/SystemUI/scripts/token_alignment/package-lock.json
+++ b/packages/SystemUI/scripts/token_alignment/package-lock.json
@@ -2975,9 +2975,9 @@
             }
         },
         "node_modules/tough-cookie": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-            "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
             "dependencies": {
                 "psl": "^1.1.33",
                 "punycode": "^2.1.1",