diff --git a/app/src/main/java/balti/xposed/pixelifygooglephotos/DeviceProps.kt b/app/src/main/java/balti/xposed/pixelifygooglephotos/DeviceProps.kt
index eb0cc21..d2cc2ea 100644
--- a/app/src/main/java/balti/xposed/pixelifygooglephotos/DeviceProps.kt
+++ b/app/src/main/java/balti/xposed/pixelifygooglephotos/DeviceProps.kt
@@ -232,101 +232,6 @@ object DeviceProps {
             getAndroidVersionFromLabel("Q 10.0"),
         ),
 
-        // DeviceEntries(
-        //     "Pixel 2", hashMapOf(
-        //         Pair("BRAND", "google"),
-        //         Pair("MANUFACTURER", "Google"),
-        //         Pair("DEVICE", "walleye"),
-        //         Pair("PRODUCT", "walleye"),
-        //         Pair("HARDWARE", "walleye"),
-        //         Pair("BOARD", "walleye"),
-        //         Pair("MODEL", "Pixel 2"),
-        //         Pair("ID", "OPM1.171019.011"),
-        //         Pair("DISPLAY", "walleye-user 8.1.0 OPM1.171019.011 4448085 release-keys"),
-        //         Pair("FINGERPRINT", "google/walleye/walleye:8.1.0/OPM1.171019.011/4448085:user/release-keys"),
-        //         Pair("TYPE", "user"),
-        //         Pair("TAGS", "release-keys"),
-        //     ),
-        //     "Pixel 2017",
-        //     getAndroidVersionFromLabel("Oreo 8.1.0"),
-        // ),
-
-        // DeviceEntries(
-        //     "Pixel 3 XL", hashMapOf(
-        //         Pair("BRAND", "google"),
-        //         Pair("MANUFACTURER", "Google"),
-        //         Pair("DEVICE", "crosshatch"),
-        //         Pair("PRODUCT", "crosshatch"),
-        //         Pair("HARDWARE", "crosshatch"),
-        //         Pair("BOARD", "crosshatch"),
-        //         Pair("MODEL", "Pixel 3 XL"),
-        //         Pair("ID", "RQ3A.211001.001"),
-        //         Pair("DISPLAY", "crosshatch-user 11 RQ3A.211001.001 7641976 release-keys"),
-        //         Pair("FINGERPRINT", "google/crosshatch/crosshatch:11/RQ3A.211001.001/7641976:user/release-keys"),
-        //         Pair("TYPE", "user"),
-        //         Pair("TAGS", "release-keys"),
-        //     ),
-        //     "Pixel 2018",
-        //     getAndroidVersionFromLabel("R 11.0"),
-        // ),
-
-        // DeviceEntries(
-        //     "Pixel 3a XL", hashMapOf(
-        //         Pair("BRAND", "google"),
-        //         Pair("MANUFACTURER", "Google"),
-        //         Pair("DEVICE", "bonito"),
-        //         Pair("PRODUCT", "bonito"),
-        //         Pair("HARDWARE", "bonito"),
-        //         Pair("BOARD", "bonito"),
-        //         Pair("MODEL", "Pixel 3a XL"),
-        //         Pair("ID", "RQ3A.211001.001"),
-        //         Pair("DISPLAY", "bonito-user 11 RQ3A.211001.001 7641976 release-keys"),
-        //         Pair("FINGERPRINT", "google/bonito/bonito:11/RQ3A.211001.001/7641976:user/release-keys"),
-        //         Pair("TYPE", "user"),
-        //         Pair("TAGS", "release-keys"),
-        //     ),
-        //     "Pixel 2019 mid-year",
-        //     getAndroidVersionFromLabel("R 11.0"),
-        // ),
-
-        // DeviceEntries(
-        //     "Pixel 4 XL", hashMapOf(
-        //         Pair("BRAND", "google"),
-        //         Pair("MANUFACTURER", "Google"),
-        //         Pair("DEVICE", "coral"),
-        //         Pair("PRODUCT", "coral"),
-        //         Pair("HARDWARE", "coral"),
-        //         Pair("BOARD", "coral"),
-        //         Pair("MODEL", "Pixel 4 XL"),
-        //         Pair("ID", "SP1A.211105.002"),
-        //         Pair("DISPLAY", "coral-user 12 SP1A.211105.002 7743617 release-keys"),
-        //         Pair("FINGERPRINT", "google/coral/coral:12/SP1A.211105.002/7743617:user/release-keys"),
-        //         Pair("TYPE", "user"),
-        //         Pair("TAGS", "release-keys"),
-        //     ),
-        //     "Pixel 2019 mid-year",
-        //     getAndroidVersionFromLabel("S 12.0"),
-        // ),
-
-        // DeviceEntries(
-        //     "Pixel 4a", hashMapOf(
-        //         Pair("BRAND", "google"),
-        //         Pair("MANUFACTURER", "Google"),
-        //         Pair("DEVICE", "sunfish"),
-        //         Pair("PRODUCT", "sunfish"),
-        //         Pair("HARDWARE", "sunfish"),
-        //         Pair("BOARD", "sunfish"),
-        //         Pair("MODEL", "Pixel 4a"),
-        //         Pair("ID", "RQ3A.211001.001"),
-        //         Pair("DISPLAY", "sunfish-user 11 RQ3A.211001.0011 7641976 release-keys"),
-        //         Pair("FINGERPRINT", "google/sunfish/sunfish:11/RQ3A.211001.001/7641976:user/release-keys"),
-        //         Pair("TYPE", "user"),
-        //         Pair("TAGS", "release-keys"),
-        //     ),
-        //     "Pixel 2020 mid-year",
-        //     getAndroidVersionFromLabel("R 11.0"),
-        // ),
-
         DeviceEntries(
             "Pixel 5 (Storage saver quality)", hashMapOf(
                 Pair("BRAND", "google"),
@@ -346,44 +251,6 @@ object DeviceProps {
             getAndroidVersionFromLabel("T 13.0"),
         ),
 
-        // DeviceEntries(
-        //     "Pixel 5a", hashMapOf(
-        //         Pair("BRAND", "google"),
-        //         Pair("MANUFACTURER", "Google"),
-        //         Pair("DEVICE", "barbet"),
-        //         Pair("PRODUCT", "barbet"),
-        //         Pair("HARDWARE", "barbet"),
-        //         Pair("BOARD", "barbet"),
-        //         Pair("MODEL", "Pixel 5a"),
-        //         Pair("ID", "RD2A.211001.002"),
-        //         Pair("DISPLAY", "barbet-user 11 RD2A.211001.002 7644766 release-keys"),
-        //         Pair("FINGERPRINT", "google/barbet/barbet:11/RD2A.211001.002/7644766:user/release-keys"),
-        //         Pair("TYPE", "user"),
-        //         Pair("TAGS", "release-keys"),
-        //     ),
-        //     "Pixel 2021 mid-year",
-        //     getAndroidVersionFromLabel("R 11.0"),
-        // ),
-
-        // DeviceEntries(
-        //     "Pixel 6 Pro", hashMapOf(
-        //         Pair("BRAND", "google"),
-        //         Pair("MANUFACTURER", "Google"),
-        //         Pair("DEVICE", "raven"),
-        //         Pair("PRODUCT", "raven"),
-        //         Pair("HARDWARE", "raven"),
-        //         Pair("BOARD", "raven"),
-        //         Pair("MODEL", "Pixel 6 Pro"),
-        //         Pair("ID", "SD1A.210817.036"),
-        //         Pair("DISPLAY", "raven-user 12 SD1A.210817.036 7805805 release-keys"),
-        //         Pair("FINGERPRINT", "google/raven/raven:12/SD1A.210817.036/7805805:user/release-keys"),
-        //         Pair("TYPE", "user"),
-        //         Pair("TAGS", "release-keys"),
-        //     ),
-        //     "Pixel 2021 mid-year",
-        //     getAndroidVersionFromLabel("S 12.0"),
-        // ),
-
         DeviceEntries(
             "Pixel Fold", hashMapOf(
                 Pair("BRAND", "google"),
@@ -393,14 +260,14 @@ object DeviceProps {
                 Pair("HARDWARE", "felix"),
                 Pair("BOARD", "felix"),
                 Pair("MODEL", "Pixel Fold"),
-                Pair("ID", "UP1A.231005.007"),
-                Pair("DISPLAY", "felix-user 14 UP1A.231005.007 10754064 release-keys"),
-                Pair("FINGERPRINT", "google/felix/felix:14/UP1A.231005.007/10754064:user/release-keys"),
+                Pair("ID", "TQ3C.230901.001.B1"),
+                Pair("DISPLAY", "felix-user 13 TQ3C.230901.001.B1 10750989 release-keys"),
+                Pair("FINGERPRINT", "google/felix/felix:13/TQ3C.230901.001.B1/10750989:user/release-keys"),
                 Pair("TYPE", "user"),
                 Pair("TAGS", "release-keys"),
             ),
             "Pixel 2023 mid-year",
-            getAndroidVersionFromLabel("U 14.0"),
+            getAndroidVersionFromLabel("T 13.0"),
         ),
 
         DeviceEntries(
@@ -412,14 +279,14 @@ object DeviceProps {
                 Pair("HARDWARE", "tangorpro"),
                 Pair("BOARD", "tangorpro"),
                 Pair("MODEL", "Pixel Tablet"),
-                Pair("ID", "TQ3A.230901.001"),
-                Pair("DISPLAY", "tangorpro-user 14 UP1A.231005.007 10754064 release-keys"),
-                Pair("FINGERPRINT", "google/tangorpro/tangorpro:14/UP1A.231005.007/10754064:user/release-keys"),
+                Pair("ID", "TQ3A.230901.001.B1"),
+                Pair("DISPLAY", "tangorpro-user 13 TQ3A.230901.001.B1 10750577 release-keys"),
+                Pair("FINGERPRINT", "google/tangorpro/tangorpro:13/TQ3A.230901.001.B1/10750577:user/release-keys"),
                 Pair("TYPE", "user"),
                 Pair("TAGS", "release-keys"),
             ),
             "Pixel Tablet 2023",
-            getAndroidVersionFromLabel("U 14.0"),
+            getAndroidVersionFromLabel("T 13.0"),
         ),
 
         DeviceEntries(
@@ -431,13 +298,13 @@ object DeviceProps {
                 Pair("HARDWARE", "cheetah"),
                 Pair("BOARD", "cheetah"),
                 Pair("MODEL", "Pixel 7 Pro"),
-                Pair("ID", "TQ3A.230901.001"),
-                Pair("DISPLAY", "cheetah-user 13 TQ3A.230901.001 10750268 release-keys"),
-                Pair("FINGERPRINT", "google/cheetah/cheetah:13/TQ3A.230901.001/10750268:user/release-keys"),
-                Pair("SOC_MANUFACTURER", "Google"),
-                Pair("SOC_MODEL", "GS201"),
+                Pair("ID", "TQ3A.230901.001.C2"),
+                Pair("DISPLAY", "cheetah-user 13 TQ3A.230901.001.C2 10753682 release-keys"),
+                Pair("FINGERPRINT", "google/cheetah/cheetah:13/TQ3A.230901.001.C2/10753682:user/release-keys"),
                 Pair("TYPE", "user"),
                 Pair("TAGS", "release-keys"),
+                // Pair("SOC_MANUFACTURER", "Google"),
+                // Pair("SOC_MODEL", "GS201"),
             ),
             "Pixel 2022 mid-year",
             getAndroidVersionFromLabel("T 13.0"),
@@ -455,11 +322,11 @@ object DeviceProps {
                 Pair("ID", "UD1A.230803.041"),
                 Pair("DISPLAY", "shiba-user 14 UD1A.230803.041 10808477 release-keys"),
                 Pair("FINGERPRINT", "google/shiba/shiba:14/UD1A.230803.041/10808477:user/release-keys"),
-                Pair("BOOTLOADER", "ripcurrent-14.0-10807316"),
-                Pair("SOC_MANUFACTURER", "Google"),
-                Pair("SOC_MODEL", "Tensor G3"),
                 Pair("TYPE", "user"),
                 Pair("TAGS", "release-keys"),
+                // Pair("BOOTLOADER", "ripcurrent-14.0-10807316"),
+                // Pair("SOC_MANUFACTURER", "Google"),
+                // Pair("SOC_MODEL", "Tensor G3"),
             ),
             "Pixel 2023 mid-year",
             getAndroidVersionFromLabel("U 14.0"),
@@ -477,11 +344,11 @@ object DeviceProps {
                 Pair("ID", "UD1A.230803.041"),
                 Pair("DISPLAY", "husky-user 14 UD1A.230803.041 10808477 release-keys"),
                 Pair("FINGERPRINT", "google/husky/husky:14/UD1A.230803.041/10808477:user/release-keys"),
-                Pair("BOOTLOADER", "ripcurrent-14.0-10807316"),
-                Pair("SOC_MANUFACTURER", "Google"),
-                Pair("SOC_MODEL", "Tensor G3"),
                 Pair("TYPE", "user"),
                 Pair("TAGS", "release-keys"),
+                // Pair("BOOTLOADER", "ripcurrent-14.0-10807316"),
+                // Pair("SOC_MANUFACTURER", "Google"),
+                // Pair("SOC_MODEL", "Tensor G3"),
             ),
             "Pixel 2023 mid-year",
             getAndroidVersionFromLabel("U 14.0"),