diff --git a/neofetch b/neofetch
index 7ac63ed5..2daf4e04 100755
--- a/neofetch
+++ b/neofetch
@@ -1085,6 +1085,7 @@ get_model() {
                 "iPad2,"[1-4]):  "iPad 2" ;;
                 "iPad3,"[1-3]):  "iPad 3" ;;
                 "iPad3,"[4-6]):  "iPad 4" ;;
+                "iPad6,1"[12]):  "iPad 5" ;;
                 "iPad7,"[5-6]):  "iPad 6" ;;
                 "iPad4,"[1-3]):  "iPad Air" ;;
                 "iPad5,"[3-4]):  "iPad Air 2" ;;
@@ -1101,10 +1102,6 @@ get_model() {
                 "iPad5,"[1-2]):  "iPad mini 4" ;;
                 "iPad11,"[1-2]): "iPad mini 5" ;;
 
-                "iPad6,11" | "iPad 6,12")
-                    : "iPad 5"
-                ;;
-
                 "iPhone1,1"):     "iPhone" ;;
                 "iPhone1,2"):     "iPhone 3G" ;;
                 "iPhone2,1"):     "iPhone 3GS" ;;
@@ -1118,16 +1115,15 @@ get_model() {
                 "iPhone8,1"):     "iPhone 6s" ;;
                 "iPhone8,2"):     "iPhone 6s Plus" ;;
                 "iPhone8,4"):     "iPhone SE" ;;
+                "iPhone9,"[13]):  "iPhone 7" ;;
+                "iPhone9,"[24]):  "iPhone 7 Plus" ;;
+                "iPhone10,"[14]): "iPhone 8" ;;
+                "iPhone10,"[25]): "iPhone 8 Plus" ;;
+                "iPhone10,"[36]): "iPhone X" ;;
                 "iPhone11,2"):    "iPhone XS" ;;
+                "iPhone11,"[46]): "iPhone XS Max" ;;
                 "iPhone11,8"):    "iPhone XR" ;;
 
-                "iPhone9,1"  | "iPhone9,3"):  "iPhone 7" ;;
-                "iPhone9,2"  | "iPhone9,4"):  "iPhone 7 Plus" ;;
-                "iPhone10,1" | "iPhone10,4"): "iPhone 8" ;;
-                "iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;;
-                "iPhone10,3" | "iPhone10,6"): "iPhone X" ;;
-                "iPhone11,4" | "iPhone11,6"): "iPhone XS Max" ;;
-
                 "iPod1,1"): "iPod touch" ;;
                 "ipod2,1"): "iPod touch 2G" ;;
                 "ipod3,1"): "iPod touch 3G" ;;
@@ -1881,11 +1877,11 @@ get_cpu() {
                 "iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;;
                 "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;;
                 "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;;
-                "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;;
+                "iPhone8,"[1-4] | "iPad6,1"[12]): "Apple A9 (2) @ 1.85GHz" ;;
                 "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;;
                 "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;;
 
-                "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4])
+                "iPhone11,"[2468] | "iPad11,"[1-4])
                     : "Apple A12 Bionic (6) @ 2.49GHz"
                 ;;
 
@@ -2197,12 +2193,13 @@ get_gpu() {
 
         "iPhone OS")
             case "$kernel_machine" in
-                "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;;
-                "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;;
-                "iPad3,"[1-3]):   "PowerVR SGX534MP4" ;;
-                "iPad3,"[4-6]):   "PowerVR SGX554MP4" ;;
-                "iPad5,"[3-4]):   "PowerVR GXA6850" ;;
-                "iPad6,"[3-8]):   "PowerVR 7XT" ;;
+                "iPhone1,"[1-2]):   "PowerVR MBX Lite 3D" ;;
+                "iPhone5,"[1-4]):   "PowerVR SGX543MP3" ;;
+                "iPhone11,"[2468]): "G11P" ;;
+                "iPad3,"[1-3]):     "PowerVR SGX534MP4" ;;
+                "iPad3,"[4-6]):     "PowerVR SGX554MP4" ;;
+                "iPad5,"[3-4]):     "PowerVR GXA6850" ;;
+                "iPad6,"[3-8]):     "PowerVR 7XT" ;;
 
                 "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1")
                     : "PowerVR SGX535"
@@ -2220,7 +2217,7 @@ get_gpu() {
                     : "PowerVR GX6450"
                 ;;
 
-                "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12")
+                "iPhone8,"[1-4] | "iPad6,1"[12])
                     : "PowerVR GT7600"
                 ;;
 
@@ -2228,10 +2225,6 @@ get_gpu() {
                     : "PowerVR GT7600 Plus"
                 ;;
 
-                "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8")
-                    : "G11P"
-                ;;
-
                 "iPod1,1" | "iPod2,1")
                     : "PowerVR MBX Lite"
                 ;;