diff --git a/epkowa.desc b/epkowa.desc
index 716d2f6..b624b1e 100644
--- a/epkowa.desc
+++ b/epkowa.desc
@@ -212,13 +212,6 @@
 :status    :good
 :comment   "100Base-TX/10Base-T unsupported<br>IEEE1394 untested"
 
-:model     "ES-D400"
-:interface "USB"
-:usbid     "0x04b8" "0x0136"
-:status    :good
-:comment   "requires DFSG non-free esci-interpreter-gt-s80"
-:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
-
 :model     "ES-H300"
 :interface "USB"
 :usbid     "0x04b8" "0x012b"
@@ -299,13 +292,6 @@
 :comment   "A better backend for the FilmScan 200 can be found at <A HREF=\"http://www.vjet.demon.co.uk/scanner/\">http://www.vjet.demon.co.uk/scanner/</A>."
 :url       "http://www.vjet.demon.co.uk/scanner/"
 
-:model     "GT-1500"
-:interface "USB"
-:usbid     "0x04b8" "0x0133"
-:status    :good
-:comment   "requires DFSG non-free iscan-plugin-gt-1500<br>overseas version of the GT-D1000"
-:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
-
 :model     "GT-2200"
 :interface "USB"
 :usbid     "0x04b8" "0x0102"
@@ -365,14 +351,14 @@
 :usbid     "0x04b8" "0x010f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-7300U"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x011d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-7400U"			; product spec (JP)
 :interface "USB"
@@ -454,7 +440,7 @@
 :usbid     "0x04b8" "0x0116"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-9400"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-9500"
 :interface "SCSI"
@@ -502,103 +488,68 @@
 :status    :good
 :comment   "IEEE1394 untested<br>overseas version of the ES-9000H"
 
-:model     "GT-D1000"
-:interface "USB"
-:usbid     "0x04b8" "0x0133"
-:status    :good
-:comment   "requires DFSG non-free iscan-plugin-gt-1500"
-:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
-
 :model     "GT-F500"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :comment   "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-F520"
 :interface "USB"
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :comment   "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-F550"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :comment   "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-F570"
 :interface "USB"
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :comment   "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-F600"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x0118"
 :status    :good
 :comment   "only scans up to 2400dpi<br>requires DFSG non-free iscan-plugin-gt-f600"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-F650"
 :interface "USB"
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600<br>GT-S600 with TPU"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-F670"
 :interface "USB"
 :usbid     "0x04b8" "0x012e"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f670"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-F700"
 :interface "USB"
 :usbid     "0x04b8" "0x012f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f700"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "GT-F720"
-:interface "USB"
-:usbid     "0x04b8" "0x0131"
-:status    :good
-:comment   "requires DFSG non-free esci-interpreter-gt-f720<br>GT-S620 with TPU"
-:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
-
-:model     "GT-S50"
-:interface "USB"
-:usbid     "0x04b8" "0x0137"
-:status    :good
-:comment   "requires DFSG non-free esci-interpreter-gt-s80"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "GT-S80"
-:interface "USB"
-:usbid     "0x04b8" "0x0136"
-:status    :good
-:comment   "requires DFSG non-free esci-interpreter-gt-s80<br>overseas version of the ES-D400"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-S600"
 :interface "USB"
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "GT-S620"
-:interface "USB"
-:usbid     "0x04b8" "0x0131"
-:status    :good
-:comment   "requires DFSG non-free esci-interpreter-gt-f720"
-:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-X700"			; product spec (JP)
 :interface "USB"
@@ -611,14 +562,7 @@
 :usbid     "0x04b8" "0x0119"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-x750"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "GT-X770"
-:interface "USB"
-:usbid     "0x04b8" "0x0130"
-:status    :good
-:comment   "requires DFSG non-free iscan-plugin-gt-x770"
-:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "GT-X800"			; product spec (JP)
 :interface "USB IEEE1394"
@@ -626,13 +570,6 @@
 :status    :complete
 :comment   "film area guide mode not supported<br>IEEE1394 untested"
 
-:model     "GT-X820"
-:interface "USB"
-:usbid     "0x04b8" "0x013a"
-:status    :good
-:comment   "requires DFSG non-free iscan-plugin-gt-x820"
-:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
-
 :model     "GT-X900"
 :interface "USB IEEE1394"
 :usbid     "0x04b8" "0x012c"
@@ -885,28 +822,28 @@
 :usbid     "0x04b8" "0x010f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend<br>overseas version of the GT-7200U"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 1250 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x010f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend<br>Perfection 1250 with TPU option bundled"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 1260"
 :interface "USB"
 :usbid     "0x04b8" "0x011d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend<br>overseas version of the GT-7300U"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 1260 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x011d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend<br>Perfection 1260 with TPU option bundled"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 1270"
 :interface "USB"
@@ -977,21 +914,21 @@
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :comment   "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend<br>overseas version of the GT-F500"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 2580 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :comment   "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend<br>overseas version of the GT-F550"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 3170 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0116"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-9400<br>overseas version of the GT-9400UF"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 3200 PHOTO"	; command spec
 :interface "USB"
@@ -1004,28 +941,28 @@
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :comment   "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend<br>overseas version of the GT-F520"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 3590 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :comment   "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend<br>overseas version of the GT-F570"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 4180 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0118"
 :status    :good
 :comment   "only scans up to 2400dpi<br>requires DFSG non-free iscan-plugin-gt-f600<br>overseas version of the GT-F600"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 4490 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0119"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-x750<br>overseas version of the GT-X750"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection 4870 PHOTO"	; command spec
 :interface "USB"
@@ -1049,56 +986,28 @@
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600<br>overseas version of the GT-S600"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "Perfection V30"
-:interface "USB"
-:usbid     "0x04b8" "0x0131"
-:status    :good
-:comment   "requires DFSG non-free esci-interpreter-gt-f720<br>overseas version of the GT-S620"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection V100 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600<br>overseas version of the GT-F650"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection V200 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x012e"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f670<br>overseas version of the GT-F670"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "Perfection V300 PHOTO"
-:interface "USB"
-:usbid     "0x04b8" "0x0131"
-:status    :good
-:comment   "requires DFSG non-free esci-interpreter-gt-f720<br>overseas version of the GT-F720"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection V350 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x012f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f700<br>overseas version of the GT-F700"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "Perfection V500 PHOTO"
-:interface "USB"
-:usbid     "0x04b8" "0x0130"
-:status    :good
-:comment   "requires DFSG non-free iscan-plugin-gt-x770<br>overseas version of the GT-X770"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
-
-:model     "Perfection V600 PHOTO"
-:interface "USB"
-:usbid     "0x04b8" "0x013a"
-:status    :good
-:comment   "requires DFSG non-free iscan-plugin-gt-x820<br>overseas version of the GT-X820"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Perfection V700"
 :interface "USB IEEE1394"
@@ -1200,14 +1109,14 @@
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Stylus CX4400"
 :interface "USB"
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Stylus CX4500"
 :interface "USB"
@@ -1274,14 +1183,14 @@
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Stylus CX5600"
 :interface "USB"
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Stylus CX5700F"
 :interface "USB"
@@ -1420,7 +1329,7 @@
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
 
 :model     "Stylus DX4800"
 :interface "USB"
diff --git a/models.dat b/models.dat
index bafdbfc..8a2105a 100644
--- a/models.dat
+++ b/models.dat
@@ -20,7 +20,7 @@
 # This file automatically generated by the HPLIP model editor (model_editor.py).
 # Please do NOT hand edit this file.
 #
-# Last written on Thu, 11 Feb 2010 16:49:34 by mubeen.
+# Last written on Mon, 03 Aug 2009 12:47:40 by dsuffiel.
 # Model editor version 10.2 (Qt4).
 
 
@@ -53,7 +53,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2b82
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -93,7 +93,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -133,7 +133,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=352d
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -172,7 +172,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2518
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -217,7 +217,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2d69
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -259,7 +259,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2b82
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -300,7 +300,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -339,7 +339,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2eb8
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -381,7 +381,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2de2
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ540
@@ -443,7 +443,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -485,7 +485,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2de2
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ540
@@ -533,7 +533,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -572,7 +572,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=26a4
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -614,7 +614,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2b46
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -874,7 +874,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3085
+support-subtype=2f15
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -917,7 +917,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3496
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -1013,7 +1013,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=30a1
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor
@@ -1067,7 +1067,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2f34
+support-subtype=3ee5
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor,Postscript
@@ -1199,7 +1199,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=320e
+support-subtype=30dd
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -1324,7 +1324,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=38d5
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -1363,7 +1363,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=38d5
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -1408,7 +1408,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=33f2
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -1449,7 +1449,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3ce0
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -1494,7 +1494,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=324a
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -1585,7 +1585,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=348d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -1630,7 +1630,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=30dd
+support-subtype=2fab
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -1675,7 +1675,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=29f7
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -1720,7 +1720,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=33f2
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -1759,7 +1759,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=38d5
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -1849,7 +1849,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=324a
+support-subtype=2a34
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -1894,7 +1894,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=31f0
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -1939,7 +1939,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=324a
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -1984,7 +1984,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=30dd
+support-subtype=2f6e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -2029,7 +2029,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=29f7
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -2068,7 +2068,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -2113,7 +2113,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=33bd
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -2158,7 +2158,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -2203,7 +2203,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=30dd
+support-subtype=2f8c
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -2293,7 +2293,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=348d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -2338,7 +2338,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=324a
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -2379,7 +2379,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -2424,7 +2424,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=348d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -2464,7 +2464,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -2506,7 +2506,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3496
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=PSP100
@@ -2516,110 +2516,8 @@ usb-pid=3802
 usb-vid=3f0
 wifi-config=0
 
-[photosmart_b109a_series]
-align-type=1
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=Photosmart_C5100.png
-io-mfp-mode=3
-io-mode=1
-io-support=2
-job-storage=0
-linefeed-cal-type=0
-model1=HP Photosmart All-in-One Printer - B109a
-model2=HP Photosmart All-in-One Printer - B109c
-model3=HP Photosmart All-in-One Printer - B109d
-model4=HP Photosmart All-in-One Printer - B109e
-monitor-type=0
-panel-check-type=1
-pcard-type=2
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=2
-r0-agent1-sku=564/564XL
-r0-agent1-type=1
-r0-agent2-kind=2
-r0-agent2-sku=564/564XL
-r0-agent2-type=4
-r0-agent3-kind=2
-r0-agent3-sku=564/564XL
-r0-agent3-type=5
-r0-agent4-kind=2
-r0-agent4-sku=564/564XL
-r0-agent4-type=6
-r1-agent1-kind=2
-r1-agent1-sku=564/564XL
-r1-agent1-type=1
-r1-agent2-kind=2
-r1-agent2-sku=564/564XL
-r1-agent2-type=4
-r1-agent3-kind=2
-r1-agent3-sku=564/564XL
-r1-agent3-type=5
-r1-agent4-kind=2
-r1-agent4-sku=564/564XL
-r1-agent4-type=6
-r2-agent1-kind=2
-r2-agent1-sku=364/364XL
-r2-agent1-type=1
-r2-agent2-kind=2
-r2-agent2-sku=364/364XL
-r2-agent2-type=4
-r2-agent3-kind=2
-r2-agent3-sku=364/364XL
-r2-agent3-type=5
-r2-agent4-kind=2
-r2-agent4-sku=364/364XL
-r2-agent4-type=6
-r4-agent1-kind=2
-r4-agent1-sku=178/178XL
-r4-agent1-type=1
-r4-agent2-kind=2
-r4-agent2-sku=178/178XL
-r4-agent2-type=4
-r4-agent3-kind=2
-r4-agent3-sku=178/178XL
-r4-agent3-type=5
-r4-agent4-kind=2
-r4-agent4-sku=178/178XL
-r4-agent4-type=6
-r8-agent1-kind=2
-r8-agent1-sku=862/862XL
-r8-agent1-type=1
-r8-agent2-kind=2
-r8-agent2-sku=862/862XL
-r8-agent2-type=4
-r8-agent3-kind=2
-r8-agent3-sku=862/862XL
-r8-agent3-type=5
-r8-agent4-kind=2
-r8-agent4-sku=862/862XL
-r8-agent4-type=6
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=2
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.10
-tech-class=Stabler
-tech-subclass=Normal
-tech-type=2
-usb-pid=7a11
-usb-vid=3f0
-wifi-config=0
-
 [deskjet_ink_advant_k109a-z]
-align-type=14
+align-type=11
 clean-type=2
 color-cal-type=0
 copy-type=0
@@ -2681,114 +2579,13 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.8
-tech-class=ViperPlusTrim
+tech-class=DJD2600
 tech-subclass=Normal
 tech-type=2
 usb-pid=8311
 usb-vid=3f0
 wifi-config=0
 
-[photosmart_wireless_b109n-z]
-align-type=1
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=Photosmart_C5100.png
-io-mfp-mode=3
-io-mode=1
-io-support=10
-job-storage=0
-linefeed-cal-type=0
-model1=HP Photosmart Wireless All-in-One Printer - B109n
-model2=HP Photosmart Wireless All-in-One Printer - B109q
-model3=HP Photosmart Wireless All-in-One Printer - B109q=r
-monitor-type=0
-panel-check-type=1
-pcard-type=2
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=2
-r0-agent1-sku=564/564XL
-r0-agent1-type=1
-r0-agent2-kind=2
-r0-agent2-sku=564/564XL
-r0-agent2-type=4
-r0-agent3-kind=2
-r0-agent3-sku=564/564XL
-r0-agent3-type=5
-r0-agent4-kind=2
-r0-agent4-sku=564/564XL
-r0-agent4-type=6
-r1-agent1-kind=2
-r1-agent1-sku=564/564XL
-r1-agent1-type=1
-r1-agent2-kind=2
-r1-agent2-sku=564/564XL
-r1-agent2-type=4
-r1-agent3-kind=2
-r1-agent3-sku=564/564XL
-r1-agent3-type=5
-r1-agent4-kind=2
-r1-agent4-sku=564/564XL
-r1-agent4-type=6
-r2-agent1-kind=2
-r2-agent1-sku=364/364XL
-r2-agent1-type=1
-r2-agent2-kind=2
-r2-agent2-sku=364/364XL
-r2-agent2-type=4
-r2-agent3-kind=2
-r2-agent3-sku=364/364XL
-r2-agent3-type=5
-r2-agent4-kind=2
-r2-agent4-sku=364/364XL
-r2-agent4-type=6
-r4-agent1-kind=2
-r4-agent1-sku=178/178XL
-r4-agent1-type=1
-r4-agent2-kind=2
-r4-agent2-sku=178/178XL
-r4-agent2-type=4
-r4-agent3-kind=2
-r4-agent3-sku=178/178XL
-r4-agent3-type=5
-r4-agent4-kind=2
-r4-agent4-sku=178/178XL
-r4-agent4-type=6
-r8-agent1-kind=2
-r8-agent1-sku=862/862XL
-r8-agent1-type=1
-r8-agent2-kind=2
-r8-agent2-sku=862/862XL
-r8-agent2-type=4
-r8-agent3-kind=2
-r8-agent3-sku=862/862XL
-r8-agent3-type=5
-r8-agent4-kind=2
-r8-agent4-sku=862/862XL
-r8-agent4-type=6
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=2
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.10
-tech-class=Stabler
-tech-subclass=Normal
-tech-type=2
-usb-pid=7b11
-usb-vid=3f0
-wifi-config=1
-
 [hp_designjet_110]
 align-type=0
 clean-type=0
@@ -2821,7 +2618,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -2861,7 +2658,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=38d5
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -2905,7 +2702,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=PSP100
@@ -2947,7 +2744,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -2996,7 +2793,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3849
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=PSP100
@@ -3036,7 +2833,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2f8d
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3076,7 +2873,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2a52
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3097,7 +2894,7 @@ fw-download=False
 icon=Photosmart_C5100.png
 io-mfp-mode=3
 io-mode=1
-io-support=10
+io-support=2
 job-storage=0
 linefeed-cal-type=0
 model1=HP Photosmart Plus All-in-One Printer - B209a
@@ -3171,7 +2968,7 @@ r8-agent3-type=5
 r8-agent4-kind=2
 r8-agent4-sku=862/862XL
 r8-agent4-type=6
-scan-style=1
+scan-style=0
 scan-type=1
 status-battery-check=0
 status-dynamic-counters=2
@@ -3180,7 +2977,7 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.8
-tech-class=Stabler
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=7e11
@@ -3291,7 +3088,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2b64
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3330,7 +3127,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2a8f
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3369,7 +3166,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2cb2
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3413,7 +3210,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3597
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=PSP100
@@ -3455,7 +3252,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=32e9
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -3503,7 +3300,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3637
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=PSP100
@@ -3543,7 +3340,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=26fd
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3582,7 +3379,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2cb2
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3621,7 +3418,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2a8f
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -3700,7 +3497,7 @@ status-battery-check=0
 status-dynamic-counters=3
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3aeb
 support-type=2
 support-ver=0.9.9
 tech-class=DJ3600
@@ -3742,7 +3539,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=33da
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ540
@@ -3904,270 +3701,16 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=3.9.2
-tech-class=Python
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=7311
 usb-vid=3f0
 wifi-config=0
 
-[photosmart_prem-web_c309n-s]
-align-type=1
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=Photosmart_C6100.png
-io-mfp-mode=3
-io-mode=1
-io-support=14
-job-storage=0
-linefeed-cal-type=0
-model1=HP Photosmart Premium Fax All-in-One Printer series -C309a
-model2=HP Photosmart Premium Fax All-in-One Printer series -C309c
-monitor-type=0
-panel-check-type=1
-pcard-type=2
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=2
-r0-agent1-sku=564/564XL
-r0-agent1-type=1
-r0-agent2-kind=2
-r0-agent2-sku=564/564XL
-r0-agent2-type=4
-r0-agent3-kind=2
-r0-agent3-sku=564/564XL
-r0-agent3-type=5
-r0-agent4-kind=2
-r0-agent4-sku=564/564XL
-r0-agent4-type=6
-r0-agent5-kind=2
-r0-agent5-sku=564/564XL
-r0-agent5-type=19
-r1-agent2-kind=2
-r1-agent2-sku=564/564XL
-r1-agent2-type=4
-r1-agent3-kind=2
-r1-agent3-sku=564/564XL
-r1-agent3-type=5
-r1-agent4-kind=2
-r1-agent4-sku=564/564XL
-r1-agent4-type=6
-r1-agent5-kind=2
-r1-agent5-sku=564/564XL
-r1-agent5-type=19
-r10-agent1-kind=2
-r10-agent1-sku=862/862XL
-r10-agent1-type=1
-r10-agent2-kind=2
-r10-agent2-sku=862/862XL
-r10-agent2-type=4
-r10-agent3-kind=2
-r10-agent3-sku=862/862XL
-r10-agent3-type=5
-r10-agent4-kind=2
-r10-agent4-sku=862/862XL
-r10-agent4-type=6
-r10-agent5-kind=2
-r10-agent5-sku=862/862XL
-r10-agent5-type=19
-r2-agent1-kind=2
-r2-agent1-sku=564/564XL
-r2-agent1-type=1
-r2-agent2-kind=2
-r2-agent2-sku=564/564XL
-r2-agent2-type=4
-r2-agent3-kind=2
-r2-agent3-sku=564/564XL
-r2-agent3-type=5
-r2-agent4-kind=2
-r2-agent4-sku=564/564XL
-r2-agent4-type=6
-r2-agent5-kind=2
-r2-agent5-sku=564/564XL
-r2-agent5-type=19
-r4-agent1-kind=2
-r4-agent1-sku=364/364XL
-r4-agent1-type=1
-r4-agent2-kind=2
-r4-agent2-sku=364/364XL
-r4-agent2-type=4
-r4-agent3-kind=2
-r4-agent3-sku=364/364XL
-r4-agent3-type=5
-r4-agent4-kind=2
-r4-agent4-sku=364/364XL
-r4-agent4-type=6
-r4-agent5-kind=2
-r4-agent5-sku=364/364XL
-r4-agent5-type=19
-r8-agent1-kind=2
-r8-agent1-sku=178/178XL
-r8-agent1-type=1
-r8-agent2-kind=2
-r8-agent2-sku=178/178XL
-r8-agent2-type=4
-r8-agent3-kind=2
-r8-agent3-sku=178/178XL
-r8-agent3-type=5
-r8-agent4-kind=2
-r8-agent4-sku=178/178XL
-r8-agent4-type=6
-r8-agent5-kind=2
-r8-agent5-sku=178/178XL
-r8-agent5-type=19
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=2
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.10
-tech-class=Python
-tech-subclass=NoCDDVD,NoMaxDPI
-tech-type=2
-usb-pid=7c11
-usb-vid=3f0
-wifi-config=1
-
-[photosmart_premium_c309g-m]
-align-type=1
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=Photosmart_C6100.png
-io-mfp-mode=3
-io-mode=1
-io-support=14
-job-storage=0
-linefeed-cal-type=0
-model1=HP Photosmart Premium All-in-One Printer series - C309g
-model2=HP Photosmart Premium All-in-One Printer series - C309h
-monitor-type=0
-panel-check-type=1
-pcard-type=2
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=2
-r0-agent1-sku=564/564XL
-r0-agent1-type=1
-r0-agent2-kind=2
-r0-agent2-sku=564/564XL
-r0-agent2-type=4
-r0-agent3-kind=2
-r0-agent3-sku=564/564XL
-r0-agent3-type=5
-r0-agent4-kind=2
-r0-agent4-sku=564/564XL
-r0-agent4-type=6
-r0-agent5-kind=2
-r0-agent5-sku=564/564XL
-r0-agent5-type=19
-r1-agent2-kind=2
-r1-agent2-sku=564/564XL
-r1-agent2-type=4
-r1-agent3-kind=2
-r1-agent3-sku=564/564XL
-r1-agent3-type=5
-r1-agent4-kind=2
-r1-agent4-sku=564/564XL
-r1-agent4-type=6
-r1-agent5-kind=2
-r1-agent5-sku=564/564XL
-r1-agent5-type=19
-r10-agent1-kind=2
-r10-agent1-sku=862/862XL
-r10-agent1-type=1
-r10-agent2-kind=2
-r10-agent2-sku=862/862XL
-r10-agent2-type=4
-r10-agent3-kind=2
-r10-agent3-sku=862/862XL
-r10-agent3-type=5
-r10-agent4-kind=2
-r10-agent4-sku=862/862XL
-r10-agent4-type=6
-r10-agent5-kind=2
-r10-agent5-sku=862/862XL
-r10-agent5-type=19
-r2-agent1-kind=2
-r2-agent1-sku=564/564XL
-r2-agent1-type=1
-r2-agent2-kind=2
-r2-agent2-sku=564/564XL
-r2-agent2-type=4
-r2-agent3-kind=2
-r2-agent3-sku=564/564XL
-r2-agent3-type=5
-r2-agent4-kind=2
-r2-agent4-sku=564/564XL
-r2-agent4-type=6
-r2-agent5-kind=2
-r2-agent5-sku=564/564XL
-r2-agent5-type=19
-r4-agent1-kind=2
-r4-agent1-sku=364/364XL
-r4-agent1-type=1
-r4-agent2-kind=2
-r4-agent2-sku=364/364XL
-r4-agent2-type=4
-r4-agent3-kind=2
-r4-agent3-sku=364/364XL
-r4-agent3-type=5
-r4-agent4-kind=2
-r4-agent4-sku=364/364XL
-r4-agent4-type=6
-r4-agent5-kind=2
-r4-agent5-sku=364/364XL
-r4-agent5-type=19
-r8-agent1-kind=2
-r8-agent1-sku=178/178XL
-r8-agent1-type=1
-r8-agent2-kind=2
-r8-agent2-sku=178/178XL
-r8-agent2-type=4
-r8-agent3-kind=2
-r8-agent3-sku=178/178XL
-r8-agent3-type=5
-r8-agent4-kind=2
-r8-agent4-sku=178/178XL
-r8-agent4-type=6
-r8-agent5-kind=2
-r8-agent5-sku=178/178XL
-r8-agent5-type=19
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=2
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.10
-tech-class=Python
-tech-subclass=NoCDDVD,NoMaxDPI
-tech-type=2
-usb-pid=7d11
-usb-vid=3f0
-wifi-config=1
-
 [photosmart_a310_series]
 align-type=1
 clean-type=1
@@ -4329,7 +3872,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=32e3
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -4457,7 +4000,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -4500,7 +4043,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a7f
 support-type=2
 support-ver=2.7.6
 tech-class=DJGenericVIP
@@ -4628,7 +4171,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2eb8
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -4670,7 +4213,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2e1f
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ540
@@ -4712,7 +4255,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3320
+support-subtype=2f34
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -4751,7 +4294,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2eb8
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -4803,7 +4346,7 @@ status-battery-check=1
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3636
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ350
@@ -4884,7 +4427,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2a8f
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -4973,7 +4516,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -5059,7 +4602,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=38b5
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -5105,7 +4648,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=2eb8
 support-type=2
 support-ver=0.9.5
 tech-class=DJ540
@@ -5150,7 +4693,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=311a
 support-type=2
 support-ver=0.9.5
 tech-class=DJ350
@@ -5328,7 +4871,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3c28
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -5412,7 +4955,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -5465,7 +5008,7 @@ status-battery-check=1
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=381e
+support-subtype=381a
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -5505,7 +5048,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3193
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -5766,7 +5309,7 @@ status-battery-check=2
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.2
 tech-class=DJ55xx
@@ -5805,7 +5348,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3496
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -5850,7 +5393,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=324a
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -5937,7 +5480,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -5983,7 +5526,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=3489
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -6075,7 +5618,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -6207,7 +5750,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -6251,7 +5794,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b53
 support-type=2
 support-ver=1.6.6
 tech-class=DJGenericVIP
@@ -6342,7 +5885,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3bfa
 support-type=2
 support-ver=2.7.7
 tech-class=DJGenericVIP
@@ -6387,7 +5930,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2e3e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -6431,7 +5974,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.7
 tech-class=QuickConnect
@@ -6620,7 +6163,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2e3e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -6665,7 +6208,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2e3e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -6710,7 +6253,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2e3e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -6755,7 +6298,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2fe7
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -6794,7 +6337,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2d6a
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -6841,7 +6384,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2f6f
+support-subtype=2d6a
 support-type=2
 support-ver=0.9.5
 tech-class=DJ600
@@ -6887,7 +6430,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a7f
 support-type=2
 support-ver=1.6.6
 tech-class=PSP470
@@ -6977,7 +6520,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2e9a
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -7062,7 +6605,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -7153,7 +6696,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=383c
 support-type=2
 support-ver=2.7.7
 tech-class=PSP470
@@ -7235,7 +6778,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.9
 tech-class=QuickConnect
@@ -7281,7 +6824,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3062
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -7423,7 +6966,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=3573
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -7433,48 +6976,6 @@ usb-pid=2004
 usb-vid=3f0
 wifi-config=0
 
-[photosmart_a640_series]
-align-type=1
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=0
-fax-type=0
-fw-download=False
-icon=Photosmart_a510.png
-io-mfp-mode=3
-io-mode=1
-io-support=2
-job-storage=0
-linefeed-cal-type=0
-model1=HP Photosmart A640 Printer Series
-monitor-type=0
-panel-check-type=0
-pcard-type=2
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-r0-agent1-kind=3
-r0-agent1-sku=110
-r0-agent1-type=2
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.10
-tech-class=QuickConnect
-tech-subclass=Normal
-tech-type=2
-usb-pid=2c02
-usb-vid=3f0
-wifi-config=0
-
 [deskjet_648c]
 align-type=0
 clean-type=0
@@ -7513,7 +7014,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=35fb
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -7556,7 +7057,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=29d7
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -7605,7 +7106,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ630
@@ -7652,7 +7153,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2f6f
+support-subtype=2fe7
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -7698,7 +7199,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3007
+support-subtype=2cf0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -7833,7 +7334,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2eb9
+support-subtype=3007
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xx
@@ -8166,7 +7667,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=3007
+support-subtype=2ed7
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -8263,7 +7764,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=3007
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -8311,7 +7812,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=335d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -8351,7 +7852,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=333d
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -8399,7 +7900,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=335d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -8438,7 +7939,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -8482,7 +7983,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a7f
 support-type=2
 support-ver=1.6.6
 tech-class=PSP470
@@ -8521,7 +8022,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2eb8
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -8560,7 +8061,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -8608,7 +8109,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=335d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -8653,7 +8154,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=337c
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -8692,7 +8193,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3007
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -8740,7 +8241,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ6xxPhoto
@@ -8809,7 +8310,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.7
 tech-class=DJGenericVIP
@@ -8879,7 +8380,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.7
 tech-class=DJGenericVIP
@@ -8921,7 +8422,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=34aa
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -8966,7 +8467,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=337c
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -9011,7 +8512,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=352d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -9056,7 +8557,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=337c
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -9066,45 +8567,6 @@ usb-pid=0
 usb-vid=3f0
 wifi-config=0
 
-[hp_designjet_t770_postscript]
-align-type=0
-clean-type=0
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=default_designjet.png
-io-mfp-mode=1
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Designjet T770 Postscript
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=0
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.12
-tech-class=Postscript
-tech-subclass=Normal
-tech-type=2
-usb-pid=d14
-usb-vid=3f0
-wifi-config=0
-
 [psc_780]
 align-type=1
 clean-type=1
@@ -9224,7 +8686,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=37ff
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -9266,7 +8728,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -9395,7 +8857,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3b16
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -9440,7 +8902,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -9485,7 +8947,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=35fb
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -9524,7 +8986,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -9565,7 +9027,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3026
+support-subtype=2d6b
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -9609,7 +9071,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=2.7.7
 tech-class=PSP470
@@ -9700,7 +9162,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=35fb
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -9745,7 +9207,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=35fb
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -9790,7 +9252,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -9880,7 +9342,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=35fb
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8xx
@@ -9972,7 +9434,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ8x5
@@ -10018,7 +9480,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=2da6
 support-type=2
 support-ver=0.9.5
 tech-class=DJ850
@@ -10177,7 +9639,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=2de6
+support-subtype=2de3
 support-type=2
 support-ver=0.9.5
 tech-class=DJ850
@@ -10477,7 +9939,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3cd2
 support-type=2
 support-ver=2.7.6
 tech-class=DJ3600
@@ -10594,7 +10056,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.7.6
 tech-class=DJ3600
@@ -10639,7 +10101,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -10687,7 +10149,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -10732,7 +10194,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -10778,7 +10240,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -10823,7 +10285,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=3320
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -10868,7 +10330,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -10913,7 +10375,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -10958,7 +10420,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11006,7 +10468,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11051,7 +10513,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=348d
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11096,7 +10558,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11141,7 +10603,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=337c
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11186,7 +10648,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=337c
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11231,7 +10693,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=324a
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11322,7 +10784,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=219b2b
+support-subtype=3a3d
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -11647,7 +11109,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -11693,7 +11155,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3a3d
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -12072,7 +11534,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3d3b
 support-type=2
 support-ver=2.8.2
 tech-class=LJP1XXX
@@ -12114,7 +11576,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3b49
 support-type=2
 support-ver=2.8.9
 tech-class=LJm1005
@@ -12156,7 +11618,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3d0a
 support-type=2
 support-ver=2.8.2
 tech-class=LJP1XXX
@@ -12198,7 +11660,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3d5a
 support-type=2
 support-ver=2.8.6
 tech-class=LJP1XXX
@@ -12240,7 +11702,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3d5a
 support-type=2
 support-ver=2.8.6
 tech-class=LJP1XXX
@@ -12282,7 +11744,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3d0a
 support-type=2
 support-ver=3.9.4
 tech-class=LJP1XXX
@@ -12302,7 +11764,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_1012.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -12344,7 +11806,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_1012.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -12386,7 +11848,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_1012.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -12459,7 +11921,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=3e6b
+support-subtype=3d63
 support-type=2
 support-ver=2.8.10
 tech-class=Postscript
@@ -12510,7 +11972,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3b92
 support-type=2
 support-ver=2.8.10
 tech-class=Postscript
@@ -12553,7 +12015,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.7.10
 tech-class=LJZjsMono
@@ -12596,7 +12058,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=37e0
 support-type=2
 support-ver=2.7.10
 tech-class=LJZjsMono
@@ -12638,7 +12100,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3ccf
+support-subtype=394d
 support-type=2
 support-ver=2.7.10
 tech-class=LJMono,LJZjsMono
@@ -12681,7 +12143,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=394d
 support-type=2
 support-ver=2.7.10
 tech-class=LJMono,LJZjsMono
@@ -12723,7 +12185,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3ccf
+support-subtype=394d
 support-type=2
 support-ver=2.7.10
 tech-class=LJMono,LJZjsMono
@@ -12763,7 +12225,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -12803,7 +12265,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -12823,7 +12285,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=1
 job-storage=0
 linefeed-cal-type=0
@@ -12846,7 +12308,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=348c
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -12892,7 +12354,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3496
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -13002,7 +12464,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3672
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -13022,7 +12484,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=1
 job-storage=0
 linefeed-cal-type=0
@@ -13066,7 +12528,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=1
 job-storage=0
 linefeed-cal-type=0
@@ -13088,7 +12550,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=31d0
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -13131,7 +12593,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -13178,7 +12640,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -13223,7 +12685,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=36c1
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -13312,7 +12774,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=2.8.9
 tech-class=LJZjsMono
@@ -13354,7 +12816,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=2.8.9
 tech-class=LJZjsMono
@@ -13398,7 +12860,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -13463,7 +12925,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -13531,7 +12993,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=1
 support-released=True
-support-subtype=2f6e
+support-subtype=2e1f
 support-type=2
 support-ver=0.9.5
 tech-class=DJ850
@@ -13609,7 +13071,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -13632,7 +13094,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3aba
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -13652,7 +13114,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -13767,7 +13229,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=3fba
+support-subtype=357e
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -13777,45 +13239,6 @@ usb-pid=317
 usb-vid=3f0
 wifi-config=0
 
-[hp_designjet_t1200_postscript]
-align-type=0
-clean-type=0
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=default_designjet.png
-io-mfp-mode=1
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Designjet T1200 Postscript
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=0
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.12
-tech-class=Postscript
-tech-subclass=Normal
-tech-type=2
-usb-pid=d14
-usb-vid=3f0
-wifi-config=0
-
 [business_inkjet_1200]
 align-type=1
 clean-type=1
@@ -13873,7 +13296,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3b04
+support-subtype=3ad3
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -13971,7 +13394,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=37c1
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -14073,7 +13496,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=392e
 support-type=2
 support-ver=3.9.2
 tech-class=LJZjsColor
@@ -14119,7 +13542,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3496
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -14165,7 +13588,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3496
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -14207,7 +13630,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -14249,7 +13672,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -14469,7 +13892,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=3786
+support-subtype=36af
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -14543,7 +13966,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a72
 support-type=2
 support-ver=1.6.6
 tech-class=DJ3320
@@ -14597,7 +14020,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3d1e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -14639,7 +14062,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=219b2b
+support-subtype=36af
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -14737,7 +14160,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3a42
+support-subtype=3baf
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -14788,7 +14211,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -14839,7 +14262,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -14884,7 +14307,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=36c1
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -14900,7 +14323,7 @@ clean-type=0
 color-cal-type=0
 copy-type=0
 embedded-server-type=0
-fax-type=5
+fax-type=-1
 fw-download=False
 icon=hp_laserjet_3050.png
 io-mfp-mode=4
@@ -14926,7 +14349,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=2.8.9
 tech-class=LJZjsMono
@@ -14946,7 +14369,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -14988,7 +14411,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -15010,7 +14433,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a04
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -15030,7 +14453,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -15072,7 +14495,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -15115,7 +14538,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_1200.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -15137,7 +14560,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3879
+support-subtype=3878
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -15302,7 +14725,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=1.7.4
 tech-class=DJ3320
@@ -15356,7 +14779,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3aee
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -15397,7 +14820,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=35f9
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -15508,7 +14931,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.5
 tech-class=DJ3320
@@ -15622,7 +15045,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3abc
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -15664,7 +15087,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3d1e
 support-type=2
 support-ver=2.8.2
 tech-class=LJm1005,LJMono
@@ -15706,7 +15129,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3d7a
 support-type=2
 support-ver=2.8.2
 tech-class=LJm1005
@@ -15824,7 +15247,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3dfa
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -15875,7 +15298,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=3.8.12
 tech-class=LJColor,Postscript
@@ -15926,7 +15349,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3db4
 support-type=2
 support-ver=2.8.5
 tech-class=LJColor,Postscript
@@ -15977,7 +15400,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3db4
 support-type=2
 support-ver=2.8.5
 tech-class=LJColor,Postscript
@@ -16019,7 +15442,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.10
 tech-class=LJMono,Postscript
@@ -16103,7 +15526,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.10
 tech-class=Postscript
@@ -16154,7 +15577,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2f6e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor
@@ -16184,7 +15607,6 @@ model3=HP Deskjet D1650 Printer
 model4=HP Deskjet D1658 Printer
 model5=HP Deskjet D1660 Printer
 model6=HP Deskjet D1663 Printer
-model7=HP Deskjet D1668 Printer
 monitor-type=0
 panel-check-type=0
 pcard-type=0
@@ -16233,7 +15655,7 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.8
-tech-class=ViperMinusTrim
+tech-class=DJD2600
 tech-subclass=Normal
 tech-type=2
 usb-pid=7f11
@@ -16349,7 +15771,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3dfa
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -16451,7 +15873,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2f6e
+support-subtype=2dc6
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor
@@ -16490,7 +15912,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=3c73
 support-type=2
 support-ver=3.9.2
 tech-class=LJZjsColor
@@ -16555,7 +15977,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=372a
+support-subtype=3db4
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -16657,7 +16079,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3398
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -16804,7 +16226,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3c84
 support-type=2
 support-ver=2.7.6
 tech-class=LJm1005,LJMono
@@ -16846,7 +16268,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ca2
 support-type=2
 support-ver=2.7.6
 tech-class=LJm1005,LJMono
@@ -16888,7 +16310,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono
@@ -16930,7 +16352,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono
@@ -16972,7 +16394,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono
@@ -17014,7 +16436,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3b92
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono,Postscript
@@ -17056,7 +16478,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono
@@ -17107,7 +16529,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -17158,7 +16580,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ca2
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -17209,7 +16631,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -17260,7 +16682,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ca2
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -17302,7 +16724,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.10
 tech-class=LJMono,LJZjsMono
@@ -17344,7 +16766,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=45ac
 support-type=2
 support-ver=2.8.10
 tech-class=LJMono,LJZjsMono
@@ -17428,7 +16850,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=45ac
 support-type=2
 support-ver=2.8.10
 tech-class=LJMono,Postscript
@@ -17470,7 +16892,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=45ac
 support-type=2
 support-ver=2.8.10
 tech-class=LJMono,Postscript
@@ -17512,7 +16934,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=8
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.10
 tech-class=LJMono,Postscript
@@ -17604,7 +17026,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3911
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -17645,7 +17067,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -17691,7 +17113,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3617
+support-subtype=35f9
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -17711,7 +17133,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_2100.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=3
 job-storage=0
 linefeed-cal-type=0
@@ -17834,7 +17256,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=1.7.4
 tech-class=DJ3320
@@ -17882,7 +17304,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=359e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -17974,7 +17396,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -18081,7 +17503,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=34c9
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -18176,7 +17598,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=3fba
+support-subtype=3989
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -18281,7 +17703,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3c0b
 support-type=2
 support-ver=2.8.6
 tech-class=DJ3320
@@ -18370,7 +17792,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3496
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -18433,7 +17855,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=33b7
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -18497,7 +17919,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3812
+support-subtype=37be
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP,Postscript
@@ -18600,7 +18022,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP,Postscript
@@ -18649,7 +18071,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -18849,7 +18271,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a72
 support-type=2
 support-ver=1.6.6
 tech-class=DJ3600
@@ -18993,7 +18415,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -19044,7 +18466,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -19095,7 +18517,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -19215,7 +18637,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -19268,7 +18690,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=35fb
+support-subtype=37f5
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -19278,92 +18700,6 @@ usb-pid=3611
 usb-vid=3f0
 wifi-config=0
 
-[deskjet_f2400_series]
-align-type=13
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=0
-fax-type=0
-fw-download=False
-icon=hp_deskjet_f4200.png
-io-mfp-mode=3
-io-mode=1
-io-support=2
-job-storage=0
-linefeed-cal-type=0
-model1=HP Deskjet F2410 All-in-One Printer
-model10=HP Deskjet F2488 All-in-One Printer
-model11=HP Deskjet F2492 All-in-One Printer
-model12=HP Deskjet F2493 All-in-One Printer
-model2=HP Deskjet F2418 All-in-One Printer
-model3=HP Deskjet F2420 All-in-One Printer
-model4=HP Deskjet F2423 All-in-One Printer
-model5=HP Deskjet F2430 All-in-One Printer
-model6=HP Deskjet F2440 All-in-One Printer
-model7=HP Deskjet F2476 All-in-One Printer
-model8=HP Deskjet F2480 All-in-One Printer
-model9=HP Deskjet F2483 All-in-One Printer
-monitor-type=0
-panel-check-type=1
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=3
-r0-agent1-sku=60/60XL/60b
-r0-agent1-type=1
-r0-agent2-kind=3
-r0-agent2-sku=60/60XL
-r0-agent2-type=2
-r10-agent1-kind=3
-r10-agent1-sku=818/818XL/818b
-r10-agent1-type=1
-r10-agent2-kind=3
-r10-agent2-sku=818/818XL
-r10-agent2-type=2
-r18-agent2-kind=3
-r18-agent2-sku=93/95
-r18-agent2-type=2
-r18-agent3-kind=3
-r18-agent3-sku=99
-r18-agent3-type=3
-r2-agent1-kind=3
-r2-agent1-sku=60/60XL/60b
-r2-agent1-type=1
-r2-agent2-kind=3
-r2-agent2-sku=60/60XL
-r2-agent2-type=2
-r4-agent1-kind=3
-r4-agent1-sku=300/300XL/300b
-r4-agent1-type=1
-r4-agent2-kind=3
-r4-agent2-sku=300/300XL
-r4-agent2-type=2
-r8-agent1-kind=3
-r8-agent1-sku=121/121XL/121b
-r8-agent1-type=1
-r8-agent2-kind=3
-r8-agent2-sku=121/121XL
-r8-agent2-type=2
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=1
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.10
-tech-class=ViperMinusVIP
-tech-subclass=Normal
-tech-type=2
-usb-pid=7611
-usb-vid=3f0
-wifi-config=0
-
 [deskjet_d2400_series]
 align-type=5
 clean-type=2
@@ -19494,7 +18830,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=37ff
 support-type=2
 support-ver=1.7.4
 tech-class=DJ3600
@@ -19514,7 +18850,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -19556,7 +18892,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -19601,7 +18937,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -19733,7 +19069,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3398
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -19787,7 +19123,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=35bc
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor,Postscript
@@ -19883,7 +19219,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=35bc
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor
@@ -19957,7 +19293,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a60
 support-type=2
 support-ver=2.8.5
 tech-class=DJGenericVIP
@@ -20008,7 +19344,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -20261,7 +19597,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=38f3
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -20339,7 +19675,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=3c73
 support-type=2
 support-ver=3.9.2
 tech-class=LJZjsColor
@@ -20480,7 +19816,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=3752
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -20558,7 +19894,7 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.6
-tech-class=ViperPlusTrim
+tech-class=DJD2600
 tech-subclass=Normal
 tech-type=2
 usb-pid=8011
@@ -20728,7 +20064,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3c73
 support-type=2
 support-ver=0.9.11
 tech-class=Postscript
@@ -20958,7 +20294,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -21012,7 +20348,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=3c87
+support-subtype=3baf
 support-type=2
 support-ver=1.6.10
 tech-class=Postscript
@@ -21066,7 +20402,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=3c87
+support-subtype=0
 support-type=2
 support-ver=1.6.10
 tech-class=Postscript
@@ -21108,7 +20444,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
 tech-class=LJMono,Postscript
@@ -21150,7 +20486,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=2.8.10
 tech-class=Postscript
@@ -21192,7 +20528,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=6
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=2.8.10
 tech-class=Postscript
@@ -21231,7 +20567,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3398
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -21350,7 +20686,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee6
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor,Postscript
@@ -21404,7 +20740,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3e6b
 support-type=2
 support-ver=0.9.5
 tech-class=Postscript
@@ -21512,7 +20848,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3d59
 support-type=2
 support-ver=0.9.5
 tech-class=Postscript
@@ -21597,7 +20933,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_4600.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -21631,7 +20967,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3fa9
+support-subtype=3a23
 support-type=2
 support-ver=0.9.7
 tech-class=LJColor,Postscript
@@ -21670,7 +21006,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3398
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -21690,7 +21026,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -21732,7 +21068,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -21759,7 +21095,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono,Postscript
@@ -21779,7 +21115,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -21822,7 +21158,7 @@ fax-type=1
 fw-download=False
 icon=hp_LaserJet_3015.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=3
 job-storage=0
 linefeed-cal-type=0
@@ -21864,7 +21200,7 @@ fax-type=1
 fw-download=False
 icon=hp_LaserJet_3020.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=3
 job-storage=0
 linefeed-cal-type=0
@@ -21906,7 +21242,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_4345_mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -21929,7 +21265,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3e4d
 support-type=2
 support-ver=1.6.12
 tech-class=LJMono,Postscript
@@ -21949,7 +21285,7 @@ fax-type=1
 fw-download=False
 icon=hp_LaserJet_3020.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -21971,7 +21307,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3af6
+support-subtype=383b
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -22020,7 +21356,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3e4d
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono,Postscript
@@ -22063,7 +21399,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3fba
+support-subtype=3c64
 support-type=2
 support-ver=0.9.8
 tech-class=LJMono,Postscript
@@ -22105,7 +21441,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3c64
 support-type=2
 support-ver=0.9.8
 tech-class=LJMono,Postscript
@@ -22147,7 +21483,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3c64
 support-type=2
 support-ver=0.9.8
 tech-class=LJMono
@@ -22190,7 +21526,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -22231,7 +21567,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=336f
+support-subtype=333e
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -22337,7 +21673,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=1.6.6
 tech-class=DJGenericVIP
@@ -22522,7 +21858,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -22563,7 +21899,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3320
+support-subtype=3287
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -22605,7 +21941,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -22650,7 +21986,7 @@ support-released=True
 support-subtype=3656
 support-type=2
 support-ver=0.9.5
-tech-class=LJMono,Postscript
+tech-class=LJMono
 tech-subclass=Normal
 tech-type=3
 usb-pid=117
@@ -22836,7 +22172,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -22923,7 +22259,7 @@ support-released=True
 support-subtype=3656
 support-type=2
 support-ver=0.9.5
-tech-class=LJMono
+tech-class=LJMono,Postscript
 tech-subclass=Normal
 tech-type=3
 usb-pid=117
@@ -23153,7 +22489,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -23201,7 +22537,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -23246,7 +22582,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -23372,7 +22708,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=219b2b
+support-subtype=36b0
 support-type=2
 support-ver=0.9.8
 tech-class=LJMono,Postscript
@@ -23414,7 +22750,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=3c64
+support-subtype=36b0
 support-type=2
 support-ver=0.9.8
 tech-class=LJMono
@@ -23460,7 +22796,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -23550,7 +22886,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -23589,7 +22925,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3398
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -23693,7 +23029,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -23749,7 +23085,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3af7
 support-type=2
 support-ver=2.7.10
 tech-class=LJJetReady
@@ -23769,7 +23105,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_laserjet_cp3505.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -23803,7 +23139,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=458d
 support-type=2
 support-ver=2.7.6
 tech-class=LJColor,Postscript
@@ -23823,7 +23159,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_laserjet_cp3525.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -23857,7 +23193,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -23877,7 +23213,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_laserjet_cm1312_mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -23909,7 +23245,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
 tech-class=LJColor,Postscript
@@ -23966,7 +23302,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3af7
 support-type=2
 support-ver=2.7.10
 tech-class=LJJetReady
@@ -24014,7 +23350,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -24071,7 +23407,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3af7
+support-subtype=3ee5
 support-type=2
 support-ver=2.7.10
 tech-class=LJJetReady
@@ -24127,7 +23463,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3f5d
 support-type=2
 support-ver=2.7.10
 tech-class=LJJetReady
@@ -24177,7 +23513,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3c6c
 support-type=2
 support-ver=2.7.9
 tech-class=DJ3600
@@ -24228,7 +23564,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3b04
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -24284,7 +23620,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -24304,7 +23640,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_3700.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -24361,7 +23697,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_3700.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -24452,7 +23788,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -24491,7 +23827,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3398
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -24511,7 +23847,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_4600.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -24545,7 +23881,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3f10
+support-subtype=4145
 support-type=2
 support-ver=0.9.7
 tech-class=LJColor,Postscript
@@ -24590,7 +23926,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -24636,7 +23972,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -24728,7 +24064,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -24773,7 +24109,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -24826,7 +24162,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -24969,7 +24305,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=383c
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -25014,7 +24350,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -25060,7 +24396,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -25146,7 +24482,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -25166,7 +24502,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_laserjet_cp4005.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -25199,7 +24535,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3bad
 support-type=2
 support-ver=1.6.12
 tech-class=LJColor,Postscript
@@ -25219,7 +24555,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25241,7 +24577,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25261,7 +24597,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25283,7 +24619,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25303,7 +24639,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25325,7 +24661,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a22
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25345,7 +24681,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25367,7 +24703,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25387,7 +24723,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25409,7 +24745,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25429,7 +24765,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25451,7 +24787,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25471,7 +24807,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25493,7 +24829,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25513,7 +24849,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -25535,7 +24871,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -25576,7 +24912,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -25625,69 +24961,6 @@ usb-pid=714
 usb-vid=3f0
 wifi-config=0
 
-[hp_color_laserjet_cp4020_series]
-align-type=0
-clean-type=0
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=hp_color_laserjet_cp3525.png
-io-mfp-mode=3
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Color LaserJet CP4020 Series Printer
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=4
-r0-agent1-sku=CE260A
-r0-agent1-type=1
-r0-agent2-kind=4
-r0-agent2-sku=CE261A
-r0-agent2-type=4
-r0-agent3-kind=4
-r0-agent3-sku=CE262A
-r0-agent3-type=5
-r0-agent4-kind=4
-r0-agent4-sku=CE263A
-r0-agent4-type=6
-r1-agent1-kind=4
-r1-agent1-sku=CE260X
-r1-agent1-type=1
-r1-agent2-kind=4
-r1-agent2-sku=CE261A
-r1-agent2-type=4
-r1-agent3-kind=4
-r1-agent3-sku=CE262A
-r1-agent3-type=5
-r1-agent4-kind=4
-r1-agent4-sku=CE263A
-r1-agent4-type=6
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=3
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.12
-tech-class=LJColor,Postscript
-tech-subclass=Normal
-tech-type=4
-usb-pid=8817
-usb-vid=3f0
-wifi-config=0
-
 [hp_laserjet_4050_series]
 align-type=0
 clean-type=0
@@ -25744,7 +25017,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_4000.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -25769,7 +25042,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=380d
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -25879,7 +25152,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=1.6.6
 tech-class=DJGenericVIP
@@ -25899,7 +25172,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_4100_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=1
 linefeed-cal-type=0
@@ -26012,7 +25285,7 @@ status-battery-check=0
 status-dynamic-counters=3
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a72
 support-type=2
 support-ver=1.6.6
 tech-class=DJ4100
@@ -26139,7 +25412,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=1.7.4
 tech-class=DJ3600
@@ -26187,7 +25460,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3561
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3320
@@ -26232,7 +25505,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=359e
+support-subtype=0
 support-type=2
 support-ver=2.7.11
 tech-class=DJ3320
@@ -26297,7 +25570,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_4000.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -26423,7 +25696,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=386e
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -26462,7 +25735,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=3b52
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -26569,7 +25842,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.7.6
 tech-class=DJGenericVIP
@@ -26657,7 +25930,7 @@ status-battery-check=0
 status-dynamic-counters=3
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3898
 support-type=2
 support-ver=1.7.4
 tech-class=DJ4100
@@ -26668,7 +25941,7 @@ usb-vid=3f0
 wifi-config=0
 
 [deskjet_f4200_series]
-align-type=13
+align-type=6
 clean-type=1
 color-cal-type=3
 copy-type=0
@@ -26955,7 +26228,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3f20
+support-subtype=3e68
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -27004,7 +26277,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=3fba
+support-subtype=3898
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -27056,7 +26329,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=37d6
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -27127,7 +26400,7 @@ status-battery-check=0
 status-dynamic-counters=3
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=0.9.11
 tech-class=DJ3320
@@ -27261,7 +26534,7 @@ status-battery-check=0
 status-dynamic-counters=3
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=2.8.6
 tech-class=DJ4100
@@ -27359,7 +26632,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.4
 tech-class=DJGenericVIP
@@ -27410,7 +26683,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=3f7b
+support-subtype=38c9
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -27461,7 +26734,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono,Postscript
@@ -27555,7 +26828,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=3f30
+support-subtype=3898
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -27652,7 +26925,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.7.10
 tech-class=DJGenericVIP
@@ -27739,7 +27012,7 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.6
-tech-class=ViperPlusVIP
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=7711
@@ -27844,7 +27117,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3bec
 support-type=2
 support-ver=2.8.5
 tech-class=DJGenericVIP
@@ -27854,76 +27127,6 @@ usb-pid=6c11
 usb-vid=3f0
 wifi-config=0
 
-[officejet_4500_g510a-f]
-align-type=13
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=0
-fax-type=1
-fw-download=False
-icon=officejet_j5500_series.png
-io-mfp-mode=3
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Officejet 4500 Desktop All-in-One Printer - G510a
-model2=HP Officejet 4500 All-in-One Desktop Printer - G510b
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=3
-r0-agent1-sku=901/901XL
-r0-agent1-type=1
-r0-agent2-kind=3
-r0-agent2-sku=901
-r0-agent2-type=2
-r10-agent1-kind=3
-r10-agent1-sku=818/818XL/818b
-r10-agent1-type=1
-r10-agent2-kind=3
-r10-agent2-sku=818/818XL
-r10-agent2-type=2
-r2-agent1-kind=3
-r2-agent1-sku=60/60XL/60b
-r2-agent1-type=1
-r2-agent2-kind=3
-r2-agent2-sku=60/60XL
-r2-agent2-type=2
-r4-agent1-kind=3
-r4-agent1-sku=300/300XL/300b
-r4-agent1-type=1
-r4-agent2-kind=3
-r4-agent2-sku=300/300XL
-r4-agent2-type=2
-r8-agent1-kind=3
-r8-agent1-sku=121/121XL/121b
-r8-agent1-type=1
-r8-agent2-kind=3
-r8-agent2-sku=121/121XL
-r8-agent2-type=2
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=1
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.10.2
-tech-class=ViperPlusVIP
-tech-subclass=Normal
-tech-type=2
-usb-pid=4712
-usb-vid=3f0
-wifi-config=0
-
 [hp_designjet_4500]
 align-type=0
 clean-type=0
@@ -27955,7 +27158,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -27965,81 +27168,6 @@ usb-pid=0
 usb-vid=3f0
 wifi-config=0
 
-[deskjet_f4500_series]
-align-type=13
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=0
-fax-type=0
-fw-download=False
-icon=hp_deskjet_f4200.png
-io-mfp-mode=3
-io-mode=1
-io-support=10
-job-storage=0
-linefeed-cal-type=0
-model1=HP Deskjet F4500 All-in-One Printer Series
-monitor-type=0
-panel-check-type=1
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=3
-r0-agent1-sku=60/60XL/60b
-r0-agent1-type=1
-r0-agent2-kind=3
-r0-agent2-sku=60/60XL
-r0-agent2-type=2
-r10-agent1-kind=3
-r10-agent1-sku=818/818XL/818b
-r10-agent1-type=1
-r10-agent2-kind=3
-r10-agent2-sku=818/818XL
-r10-agent2-type=2
-r18-agent2-kind=3
-r18-agent2-sku=93/95
-r18-agent2-type=2
-r18-agent3-kind=3
-r18-agent3-sku=99
-r18-agent3-type=3
-r2-agent1-kind=3
-r2-agent1-sku=60/60XL/60b
-r2-agent1-type=1
-r2-agent2-kind=3
-r2-agent2-sku=60/60XL
-r2-agent2-type=2
-r4-agent1-kind=3
-r4-agent1-sku=300/300XL/300b
-r4-agent1-type=1
-r4-agent2-kind=3
-r4-agent2-sku=300/300XL
-r4-agent2-type=2
-r8-agent1-kind=3
-r8-agent1-sku=121/121XL/121b
-r8-agent1-type=1
-r8-agent2-kind=3
-r8-agent2-sku=121/121XL
-r8-agent2-type=2
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=1
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.10
-tech-class=ViperPlusVIP
-tech-subclass=Normal
-tech-type=2
-usb-pid=8c11
-usb-vid=3f0
-wifi-config=1
-
 [hp_color_laserjet_4500]
 align-type=0
 clean-type=0
@@ -28050,7 +27178,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_4500.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -28169,7 +27297,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3bec
 support-type=2
 support-ver=2.8.6
 tech-class=DJGenericVIP
@@ -28179,76 +27307,6 @@ usb-pid=2a12
 usb-vid=3f0
 wifi-config=0
 
-[officejet_4500_g510g-m]
-align-type=13
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=0
-fax-type=1
-fw-download=False
-icon=officejet_j5500_series.png
-io-mfp-mode=3
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Officejet 4500 All-in-One Printer - G510g
-model2=HP Officejet 4500 All-in-One Printer - G510h
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=3
-r0-agent1-sku=901/901XL
-r0-agent1-type=1
-r0-agent2-kind=3
-r0-agent2-sku=901
-r0-agent2-type=2
-r10-agent1-kind=3
-r10-agent1-sku=818/818XL/818b
-r10-agent1-type=1
-r10-agent2-kind=3
-r10-agent2-sku=818/818XL
-r10-agent2-type=2
-r2-agent1-kind=3
-r2-agent1-sku=60/60XL/60b
-r2-agent1-type=1
-r2-agent2-kind=3
-r2-agent2-sku=60/60XL
-r2-agent2-type=2
-r4-agent1-kind=3
-r4-agent1-sku=300/300XL/300b
-r4-agent1-type=1
-r4-agent2-kind=3
-r4-agent2-sku=300/300XL
-r4-agent2-type=2
-r8-agent1-kind=3
-r8-agent1-sku=121/121XL/121b
-r8-agent1-type=1
-r8-agent2-kind=3
-r8-agent2-sku=121/121XL
-r8-agent2-type=2
-scan-style=1
-scan-type=1
-status-battery-check=0
-status-dynamic-counters=1
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.10.2
-tech-class=ViperPlusVIP
-tech-subclass=Normal
-tech-type=2
-usb-pid=4712
-usb-vid=3f0
-wifi-config=0
-
 [photosmart_c4500_series]
 align-type=13
 clean-type=1
@@ -28343,7 +27401,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3bcd
 support-type=2
 support-ver=2.8.10
 tech-class=DJGenericVIP
@@ -28351,7 +27409,7 @@ tech-subclass=Normal
 tech-type=2
 usb-pid=6b11
 usb-vid=3f0
-wifi-config=1
+wifi-config=0
 
 [hp_laserjet_p4515tn]
 align-type=0
@@ -28363,7 +27421,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -28385,7 +27443,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -28405,7 +27463,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -28427,7 +27485,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -28447,7 +27505,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -28469,7 +27527,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -28489,7 +27547,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -28531,7 +27589,7 @@ fax-type=0
 fw-download=False
 icon=laserjet_2410.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -28553,7 +27611,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3a05
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono
@@ -28563,69 +27621,6 @@ usb-pid=7317
 usb-vid=3f0
 wifi-config=0
 
-[hp_color_laserjet_cp4520_series]
-align-type=0
-clean-type=0
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=hp_color_laserjet_cp3525.png
-io-mfp-mode=3
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Color LaserJet CP4520 Series Printer
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=1
-r0-agent1-kind=4
-r0-agent1-sku=CE260A
-r0-agent1-type=1
-r0-agent2-kind=4
-r0-agent2-sku=CE261A
-r0-agent2-type=4
-r0-agent3-kind=4
-r0-agent3-sku=CE262A
-r0-agent3-type=5
-r0-agent4-kind=4
-r0-agent4-sku=CE263A
-r0-agent4-type=6
-r1-agent1-kind=4
-r1-agent1-sku=CE260X
-r1-agent1-type=1
-r1-agent2-kind=4
-r1-agent2-sku=CE261A
-r1-agent2-type=4
-r1-agent3-kind=4
-r1-agent3-sku=CE262A
-r1-agent3-type=5
-r1-agent4-kind=4
-r1-agent4-sku=CE263A
-r1-agent4-type=6
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=3
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.12
-tech-class=LJColor,Postscript
-tech-subclass=Normal
-tech-type=4
-usb-pid=8817
-usb-vid=3f0
-wifi-config=0
-
 [hp_designjet_4520ps]
 align-type=0
 clean-type=0
@@ -28735,7 +27730,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -28755,7 +27750,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_4500.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -28820,7 +27815,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_4600.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -28861,7 +27856,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=38bf
+support-subtype=38b6
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor
@@ -28948,7 +27943,7 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.6
-tech-class=ViperPlusVIP
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=7411
@@ -28965,7 +27960,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_4600.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -29022,7 +28017,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_4600.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -29079,7 +28074,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_4600.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -29348,7 +28343,7 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.8
-tech-class=ViperPlusVIP
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=7511
@@ -29409,7 +28404,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor,Postscript
@@ -29429,7 +28424,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_4730mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -29463,7 +28458,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=396c
 support-type=2
 support-ver=2.7.6
 tech-class=LJColor,Postscript
@@ -29568,7 +28563,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=384d
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -29676,7 +28671,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_4345_mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -29698,7 +28693,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=1.6.12
 tech-class=LJMono,Postscript
@@ -29718,7 +28713,7 @@ fax-type=0
 fw-download=False
 icon=hp_LaserJet_4345_mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=1
 linefeed-cal-type=0
@@ -29742,7 +28737,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=1.6.10
 tech-class=LJMono,Postscript
@@ -29880,7 +28875,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a3d
 support-type=2
 support-ver=1.6.9
 tech-class=DJGenericVIP
@@ -30018,7 +29013,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=1.6.9
 tech-class=DJGenericVIP
@@ -30028,61 +29023,6 @@ usb-pid=5811
 usb-vid=3f0
 wifi-config=0
 
-[deskjet_5100]
-align-type=1
-clean-type=1
-color-cal-type=3
-copy-type=0
-embedded-server-type=0
-fax-type=0
-fw-download=False
-icon=deskjet_5100.png
-io-mfp-mode=6
-io-mode=1
-io-support=2
-job-storage=0
-linefeed-cal-type=0
-model1=HP Deskjet 5100 Color Inkjet Printer
-model2=HP Deskjet 5145 Color Inkjet Printer
-model3=HP Deskjet 5150v Color Inkjet Printer
-model4=HP Deskjet 5150w Color Inkjet Printer
-model5=HP Deskjet 5150 Color Inkjet Printer
-model6=HP Deskjet 5151 Color Inkjet Printer
-model7=HP Deskjet 5160 Color Inkjet Printer
-model8=HP Deskjet 5168 Color Inkjet Printer
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-r0-agent1-kind=3
-r0-agent1-sku=56 (C6656A)
-r0-agent1-type=1
-r0-agent2-kind=3
-r0-agent2-sku=57 (C6657A)
-r0-agent2-type=2
-r0-agent3-kind=3
-r0-agent3-sku=58 (C6658A)
-r0-agent3-type=3
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=2
-support-released=True
-support-subtype=3b04
-support-type=2
-support-ver=0.9.5
-tech-class=DJGenericVIP
-tech-subclass=Normal
-tech-type=2
-usb-pid=0
-usb-vid=3f0
-wifi-config=0
-
 [photosmart_d5100_series]
 align-type=1
 clean-type=1
@@ -30177,7 +29117,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a72
 support-type=2
 support-ver=1.6.9
 tech-class=DJGenericVIP
@@ -30187,6 +29127,61 @@ usb-pid=c402
 usb-vid=3f0
 wifi-config=0
 
+[deskjet_5100]
+align-type=1
+clean-type=1
+color-cal-type=3
+copy-type=0
+embedded-server-type=0
+fax-type=0
+fw-download=False
+icon=deskjet_5100.png
+io-mfp-mode=6
+io-mode=1
+io-support=2
+job-storage=0
+linefeed-cal-type=0
+model1=HP Deskjet 5100 Color Inkjet Printer
+model2=HP Deskjet 5145 Color Inkjet Printer
+model3=HP Deskjet 5150v Color Inkjet Printer
+model4=HP Deskjet 5150w Color Inkjet Printer
+model5=HP Deskjet 5150 Color Inkjet Printer
+model6=HP Deskjet 5151 Color Inkjet Printer
+model7=HP Deskjet 5160 Color Inkjet Printer
+model8=HP Deskjet 5168 Color Inkjet Printer
+monitor-type=0
+panel-check-type=0
+pcard-type=0
+plugin=0
+plugin-reason=0
+power-settings=0
+pq-diag-type=0
+r-type=0
+r0-agent1-kind=3
+r0-agent1-sku=56 (C6656A)
+r0-agent1-type=1
+r0-agent2-kind=3
+r0-agent2-sku=57 (C6657A)
+r0-agent2-type=2
+r0-agent3-kind=3
+r0-agent3-sku=58 (C6658A)
+r0-agent3-type=3
+scan-style=0
+scan-type=0
+status-battery-check=0
+status-dynamic-counters=0
+status-type=2
+support-released=True
+support-subtype=3b04
+support-type=2
+support-ver=0.9.5
+tech-class=DJGenericVIP
+tech-subclass=Normal
+tech-type=2
+usb-pid=0
+usb-vid=3f0
+wifi-config=0
+
 [hp_designjet_5100]
 align-type=0
 clean-type=0
@@ -30216,7 +29211,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -30265,7 +29260,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=359e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -30401,7 +29396,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=359e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -30447,7 +29442,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3752
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xx
@@ -30540,7 +29535,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.7.6
 tech-class=DJGenericVIP
@@ -30585,7 +29580,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=219b2b
+support-subtype=3d59
 support-type=2
 support-ver=0.9.11
 tech-class=LJMono,Postscript
@@ -30679,159 +29674,6 @@ usb-pid=8917
 usb-vid=3f0
 wifi-config=0
 
-[hp_color_laserjet_cp5225]
-align-type=0
-clean-type=0
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=hp_color_laserjet_cp3525.png
-io-mfp-mode=1
-io-mode=1
-io-support=2
-job-storage=0
-linefeed-cal-type=0
-model1=HP Color LaserJet CP5225
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-r0-agent1-kind=4
-r0-agent1-sku=CE740A
-r0-agent1-type=1
-r0-agent2-kind=4
-r0-agent2-sku=CE741A
-r0-agent2-type=4
-r0-agent3-kind=4
-r0-agent3-sku=CD743A
-r0-agent3-type=5
-r0-agent4-kind=4
-r0-agent4-sku=CE742A
-r0-agent4-type=6
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=6
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.12
-tech-class=LJColor,Postscript
-tech-subclass=Normal
-tech-type=4
-usb-pid=5117
-usb-vid=3f0
-wifi-config=0
-
-[hp_color_laserjet_cp5225n]
-align-type=0
-clean-type=0
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=hp_color_laserjet_cp3525.png
-io-mfp-mode=1
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Color LaserJet CP5225n
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-r0-agent1-kind=4
-r0-agent1-sku=CE740A
-r0-agent1-type=1
-r0-agent2-kind=4
-r0-agent2-sku=CE741A
-r0-agent2-type=4
-r0-agent3-kind=4
-r0-agent3-sku=CD743A
-r0-agent3-type=5
-r0-agent4-kind=4
-r0-agent4-sku=CE742A
-r0-agent4-type=6
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=6
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.12
-tech-class=LJColor,Postscript
-tech-subclass=Normal
-tech-type=4
-usb-pid=5117
-usb-vid=3f0
-wifi-config=0
-
-[hp_color_laserjet_cp5225dn]
-align-type=0
-clean-type=0
-color-cal-type=0
-copy-type=0
-embedded-server-type=1
-fax-type=0
-fw-download=False
-icon=hp_color_laserjet_cp3525.png
-io-mfp-mode=1
-io-mode=1
-io-support=6
-job-storage=0
-linefeed-cal-type=0
-model1=HP Color LaserJet CP5225dn
-monitor-type=0
-panel-check-type=0
-pcard-type=0
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-r0-agent1-kind=4
-r0-agent1-sku=CE740A
-r0-agent1-type=1
-r0-agent2-kind=4
-r0-agent2-sku=CE741A
-r0-agent2-type=4
-r0-agent3-kind=4
-r0-agent3-sku=CD743A
-r0-agent3-type=5
-r0-agent4-kind=4
-r0-agent4-sku=CE742A
-r0-agent4-type=6
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=6
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=3.9.12
-tech-class=LJColor,Postscript
-tech-subclass=Normal
-tech-type=4
-usb-pid=5117
-usb-vid=3f0
-wifi-config=0
-
 [photosmart_c5300_series]
 align-type=1
 clean-type=1
@@ -30875,7 +29717,7 @@ r0-agent4-sku=04/04XL
 r0-agent4-type=6
 r0-agent5-kind=2
 r0-agent5-sku=04/04XL
-r0-agent5-type=19
+r0-agent5-type=16
 r1-agent1-kind=2
 r1-agent1-sku=04/04XL
 r1-agent1-type=1
@@ -30890,7 +29732,7 @@ r1-agent4-sku=04/04XL
 r1-agent4-type=6
 r1-agent5-kind=2
 r1-agent5-sku=04/04XL
-r1-agent5-type=19
+r1-agent5-type=16
 r2-agent1-kind=2
 r2-agent1-sku=360/360XL
 r2-agent1-type=1
@@ -30905,7 +29747,7 @@ r2-agent4-sku=360/360XL
 r2-agent4-type=6
 r2-agent5-kind=2
 r2-agent5-sku=360/360XL
-r2-agent5-type=19
+r2-agent5-type=16
 r4-agent1-kind=2
 r4-agent1-sku=155/155XL
 r4-agent1-type=1
@@ -30920,7 +29762,7 @@ r4-agent4-sku=155/155XL
 r4-agent4-type=6
 r4-agent5-kind=2
 r4-agent5-sku=155/155XL
-r4-agent5-type=19
+r4-agent5-type=16
 r8-agent1-kind=2
 r8-agent1-sku=808/808XL
 r8-agent1-type=1
@@ -30935,18 +29777,18 @@ r8-agent4-sku=808/808XL
 r8-agent4-type=6
 r8-agent5-kind=2
 r8-agent5-sku=808/808XL
-r8-agent5-type=19
+r8-agent5-type=16
 scan-style=0
 scan-type=1
 status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.10
-tech-class=Python
-tech-subclass=NoCDDVD,NoAutoDuplex,NoMaxDPI
+tech-class=DJGenericVIP
+tech-subclass=Normal
 tech-type=2
 usb-pid=7111
 usb-vid=3f0
@@ -30999,7 +29841,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=1.7.2
 tech-class=DJGenericVIP
@@ -31086,7 +29928,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.7.9
 tech-class=DJGenericVIP
@@ -31147,7 +29989,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ca2
 support-type=2
 support-ver=1.7.2
 tech-class=DJGenericVIP
@@ -31263,7 +30105,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.6
 tech-class=DJGenericVIP
@@ -31402,7 +30244,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -31452,7 +30294,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a04
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -31526,7 +30368,7 @@ fax-type=0
 fw-download=False
 icon=LASERJET_5500.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -31614,7 +30456,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -31695,7 +30537,7 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.8
-tech-class=ViperPlusVIP
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=8211
@@ -31779,7 +30621,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.7
 tech-class=DJGenericVIP
@@ -31829,7 +30671,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ55xx
@@ -31849,7 +30691,7 @@ fax-type=0
 fw-download=False
 icon=LASERJET_5500.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -31890,7 +30732,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3879
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor,Postscript
@@ -31938,7 +30780,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ55xx
@@ -31986,7 +30828,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=357e
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -32044,7 +30886,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b0a
 support-type=2
 support-ver=0.9.5
 tech-class=DJ3600
@@ -32191,7 +31033,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -32307,7 +31149,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -32637,7 +31479,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=38d0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -32754,8 +31596,8 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.6
-tech-class=Python
-tech-subclass=NoCDDVD
+tech-class=DJGenericVIP
+tech-subclass=Normal
 tech-type=2
 usb-pid=4312
 usb-vid=3f0
@@ -32868,8 +31710,8 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.6
-tech-class=Python
-tech-subclass=NoAutoDuplex,NoCDDVD
+tech-class=DJGenericVIP
+tech-subclass=Normal
 tech-type=2
 usb-pid=4212
 usb-vid=3f0
@@ -32885,7 +31727,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_laserjet_cp6015.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -32920,7 +31762,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.5
 tech-class=LJColor,Postscript
@@ -32940,7 +31782,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_4730mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -32972,7 +31814,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.6
 tech-class=LJColor,Postscript
@@ -32992,7 +31834,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_4730mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -33025,7 +31867,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.5
 tech-class=LJColor
@@ -33045,7 +31887,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_4730mfp.png
 io-mfp-mode=3
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -33217,7 +32059,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=1.6.9
 tech-class=DJGenericVIP
@@ -33259,7 +32101,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -33441,7 +32283,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -33531,7 +32373,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -33576,7 +32418,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -33624,7 +32466,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=37f1
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -33743,7 +32585,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3931
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -33888,7 +32730,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3df1
 support-type=2
 support-ver=2.7.9
 tech-class=DJGenericVIP
@@ -33941,7 +32783,7 @@ r0-agent4-sku=04/04XL
 r0-agent4-type=6
 r0-agent5-kind=2
 r0-agent5-sku=04/04XL
-r0-agent5-type=19
+r0-agent5-type=16
 r1-agent1-kind=2
 r1-agent1-sku=04/04XL
 r1-agent1-type=1
@@ -33956,7 +32798,7 @@ r1-agent4-sku=04/04XL
 r1-agent4-type=6
 r1-agent5-kind=2
 r1-agent5-sku=04/04XL
-r1-agent5-type=19
+r1-agent5-type=16
 r2-agent1-kind=2
 r2-agent1-sku=360/360XL
 r2-agent1-type=1
@@ -33971,7 +32813,7 @@ r2-agent4-sku=360/360XL
 r2-agent4-type=6
 r2-agent5-kind=2
 r2-agent5-sku=360/360XL
-r2-agent5-type=19
+r2-agent5-type=16
 r4-agent1-kind=2
 r4-agent1-sku=155/155XL
 r4-agent1-type=1
@@ -33986,7 +32828,7 @@ r4-agent4-sku=155/155XL
 r4-agent4-type=6
 r4-agent5-kind=2
 r4-agent5-sku=155/155XL
-r4-agent5-type=19
+r4-agent5-type=16
 r8-agent1-kind=2
 r8-agent1-sku=808/808XL
 r8-agent1-type=1
@@ -34008,11 +32850,11 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.10
-tech-class=Python
-tech-subclass=NoAutoDuplex,NoCDDVD,NoMaxDPI
+tech-class=DJGenericVIP
+tech-subclass=Normal
 tech-type=2
 usb-pid=7011
 usb-vid=3f0
@@ -34141,7 +32983,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3bec
 support-type=2
 support-ver=0.9.11
 tech-class=DJGenericVIP
@@ -34232,7 +33074,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3bec
 support-type=2
 support-ver=2.8.4
 tech-class=DJGenericVIP
@@ -34350,8 +33192,8 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.4
-tech-class=Python
-tech-subclass=NoCDDVD,NoAutoDuplex
+tech-class=DJGenericVIP
+tech-subclass=Normal
 tech-type=2
 usb-pid=4412
 usb-vid=3f0
@@ -34465,8 +33307,8 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.4
-tech-class=Python
-tech-subclass=NoCDDVD
+tech-class=DJGenericVIP
+tech-subclass=Normal
 tech-type=2
 usb-pid=4512
 usb-vid=3f0
@@ -34606,7 +33448,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -34745,7 +33587,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=385a
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -34887,7 +33729,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ad2
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -35024,7 +33866,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=f4983
+support-subtype=3db4
 support-type=2
 support-ver=0.9.8
 tech-class=DJGenericVIP
@@ -35165,7 +34007,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=0.9.8
 tech-class=DJGenericVIP
@@ -35186,7 +34028,7 @@ fw-download=False
 icon=hp_photosmart_b8500_series.png
 io-mfp-mode=3
 io-mode=1
-io-support=6
+io-support=2
 job-storage=0
 linefeed-cal-type=0
 model1=HP Officejet 7000 Wide Format Printer -- E809a
@@ -35282,8 +34124,8 @@ support-released=True
 support-subtype=219b2b
 support-type=2
 support-ver=3.9.8
-tech-class=OJ7000
-tech-subclass=LargeFormatA3,NoAutoDuplex
+tech-class=DJGenericVIP
+tech-subclass=LargeFormatSuperB
 tech-type=2
 usb-pid=4612
 usb-vid=3f0
@@ -35343,7 +34185,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3752
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJ9xxVIP
@@ -35479,7 +34321,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b80
 support-type=2
 support-ver=1.6.9
 tech-class=DJGenericVIP
@@ -35616,7 +34458,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3cc6
 support-type=2
 support-ver=2.7.9
 tech-class=DJGenericVIP
@@ -35749,7 +34591,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a72
 support-type=2
 support-ver=1.6.8
 tech-class=DJGenericVIP
@@ -35799,7 +34641,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=3636
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -35980,7 +34822,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3df1
 support-type=2
 support-ver=2.7.9
 tech-class=DJGenericVIP
@@ -36172,7 +35014,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -36305,7 +35147,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ce0
 support-type=2
 support-ver=2.7.9
 tech-class=DJGenericVIP
@@ -36356,7 +35198,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=35fb
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -36395,7 +35237,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=236d
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -36434,7 +35276,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=236d
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -36571,7 +35413,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -36762,7 +35604,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a9e
 support-type=2
 support-ver=1.6.6
 tech-class=DJGenericVIP
@@ -36810,7 +35652,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -37046,7 +35888,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -37056,58 +35898,6 @@ usb-pid=4311
 usb-vid=3f0
 wifi-config=0
 
-[photosmart_7400_series]
-align-type=7
-clean-type=1
-color-cal-type=0
-copy-type=0
-embedded-server-type=0
-fax-type=0
-fw-download=False
-icon=Photosmart_7400_series.png
-io-mfp-mode=6
-io-mode=1
-io-support=2
-job-storage=0
-linefeed-cal-type=0
-model1=HP Photosmart 7450 Photo Printer
-model2=HP Photosmart 7450v Photo Printer
-model3=HP Photosmart 7450xi Photo Printer
-model4=HP Photosmart 7458 Photo Printer
-model5=HP Photosmart 7459 Photo Printer
-monitor-type=0
-panel-check-type=1
-pcard-type=2
-plugin=0
-plugin-reason=0
-power-settings=0
-pq-diag-type=0
-r-type=0
-r0-agent1-kind=3
-r0-agent1-sku=56 (C6656A)
-r0-agent1-type=1
-r0-agent2-kind=3
-r0-agent2-sku=57 (C6657A)
-r0-agent2-type=2
-r0-agent3-kind=3
-r0-agent3-sku=58 (C6658A)
-r0-agent3-type=3
-scan-style=0
-scan-type=0
-status-battery-check=0
-status-dynamic-counters=0
-status-type=2
-support-released=True
-support-subtype=219b2b
-support-type=2
-support-ver=0.9.5
-tech-class=DJGenericVIP
-tech-subclass=Normal
-tech-type=2
-usb-pid=b802
-usb-vid=3f0
-wifi-config=0
-
 [photosmart_d7400_series]
 align-type=1
 clean-type=1
@@ -37229,7 +36019,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a5f
 support-type=2
 support-ver=2.7.9
 tech-class=DJGenericVIP
@@ -37239,6 +36029,58 @@ usb-pid=5e11
 usb-vid=3f0
 wifi-config=0
 
+[photosmart_7400_series]
+align-type=7
+clean-type=1
+color-cal-type=0
+copy-type=0
+embedded-server-type=0
+fax-type=0
+fw-download=False
+icon=Photosmart_7400_series.png
+io-mfp-mode=6
+io-mode=1
+io-support=2
+job-storage=0
+linefeed-cal-type=0
+model1=HP Photosmart 7450 Photo Printer
+model2=HP Photosmart 7450v Photo Printer
+model3=HP Photosmart 7450xi Photo Printer
+model4=HP Photosmart 7458 Photo Printer
+model5=HP Photosmart 7459 Photo Printer
+monitor-type=0
+panel-check-type=1
+pcard-type=2
+plugin=0
+plugin-reason=0
+power-settings=0
+pq-diag-type=0
+r-type=0
+r0-agent1-kind=3
+r0-agent1-sku=56 (C6656A)
+r0-agent1-type=1
+r0-agent2-kind=3
+r0-agent2-sku=57 (C6657A)
+r0-agent2-type=2
+r0-agent3-kind=3
+r0-agent3-sku=58 (C6658A)
+r0-agent3-type=3
+scan-style=0
+scan-type=0
+status-battery-check=0
+status-dynamic-counters=0
+status-type=2
+support-released=True
+support-subtype=3b04
+support-type=2
+support-ver=0.9.5
+tech-class=DJGenericVIP
+tech-subclass=Normal
+tech-type=2
+usb-pid=b802
+usb-vid=3f0
+wifi-config=0
+
 [officejet_pro_l7400]
 align-type=12
 clean-type=1
@@ -37286,7 +36128,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3d66
 support-type=2
 support-ver=2.8.4
 tech-class=OJProKx50
@@ -37325,7 +36167,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2da8
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -37381,12 +36223,12 @@ r0-agent6-kind=2
 r0-agent6-sku=88 (C9386) / 88L (C9391)
 r0-agent6-type=4
 scan-style=1
-scan-type=6
+scan-type=1
 status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=1.7.2
 tech-class=OJProKx50
@@ -37500,11 +36342,11 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
-tech-class=Python
-tech-subclass=NoAutoDuplex,NoCDDVD,NoMaxDPI
+tech-class=DJGenericVIP
+tech-subclass=Normal
 tech-type=2
 usb-pid=6f11
 usb-vid=3f0
@@ -37540,7 +36382,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2dc7
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -37590,7 +36432,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -37630,7 +36472,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2796
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -37670,7 +36512,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2796
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -37709,7 +36551,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=2796
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -37764,12 +36606,12 @@ r0-agent6-kind=2
 r0-agent6-sku=88 (C9386) / 88L (C9391)
 r0-agent6-type=4
 scan-style=1
-scan-type=6
+scan-type=1
 status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=1.7.2
 tech-class=OJProKx50
@@ -37821,7 +36663,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -37881,7 +36723,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b90
 support-type=2
 support-ver=1.7.2
 tech-class=OJProKx50
@@ -37939,7 +36781,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3816
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -38079,7 +36921,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a3d
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -38133,7 +36975,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=35fb
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -38227,11 +37069,11 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3beb
 support-type=2
 support-ver=3.9.2
-tech-class=Corbett
-tech-subclass=Normal
+tech-class=DJGenericVIP
+tech-subclass=NoFullBleed
 tech-type=2
 usb-pid=3612
 usb-vid=3f0
@@ -38412,7 +37254,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a42
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -38451,7 +37293,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=3c47
 support-type=2
 support-ver=1.7.4
 tech-class=Postscript
@@ -38490,7 +37332,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=219b2b
+support-subtype=3c47
 support-type=2
 support-ver=1.7.4
 tech-class=Postscript
@@ -38622,7 +37464,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.7.9
 tech-class=DJGenericVIP
@@ -38761,7 +37603,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -38781,7 +37623,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_8100_Series.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -38803,7 +37645,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono
@@ -38847,7 +37689,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=3636
+support-subtype=3ee5
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -38912,7 +37754,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_8100_Series.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -39122,7 +37964,7 @@ status-battery-check=0
 status-dynamic-counters=2
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3a42
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -39224,7 +38066,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=1.6.9
 tech-class=DJGenericVIP
@@ -39364,7 +38206,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b04
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -39415,10 +38257,10 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=3.9.2
-tech-class=Corbett
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=3912
@@ -39466,10 +38308,10 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=3.9.2
-tech-class=Corbett
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=3812
@@ -39512,15 +38354,15 @@ r0-agent4-kind=2
 r0-agent4-sku=940
 r0-agent4-type=4
 scan-style=1
-scan-type=6
+scan-type=1
 status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=3.9.2
-tech-class=Corbett
+tech-class=DJGenericVIP
 tech-subclass=Normal
 tech-type=2
 usb-pid=4012
@@ -39537,7 +38379,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_8550.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -39695,11 +38537,11 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.10
-tech-class=Python
-tech-subclass=LargeFormatA3,NoAutoDuplex
+tech-class=DJGenericVIP
+tech-subclass=LargeFormatSuperB
 tech-type=2
 usb-pid=d102
 usb-vid=3f0
@@ -39715,7 +38557,7 @@ fax-type=0
 fw-download=False
 icon=HP_Color_LaserJet_8550.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=2
 job-storage=0
 linefeed-cal-type=0
@@ -39760,7 +38602,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=37c3
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor,Postscript
@@ -39818,7 +38660,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3d8b
 support-type=2
 support-ver=2.7.10
 tech-class=DJGenericVIP
@@ -39981,7 +38823,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=0
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -40037,7 +38879,7 @@ r0-agent4-sku=HP 70 (C9404A)
 r0-agent4-type=15
 r0-agent5-kind=2
 r0-agent5-sku=HP 38 (C9412A)
-r0-agent5-type=39
+r0-agent5-type=1
 r0-agent6-kind=2
 r0-agent6-sku=HP 38 (C9413A)
 r0-agent6-type=19
@@ -40056,7 +38898,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=2
 support-ver=2.8.4
 tech-class=DJGenericVIP
@@ -40102,7 +38944,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=219b2b
+support-subtype=3a41
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -40122,7 +38964,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40165,7 +39007,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40189,7 +39031,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=38d0
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -40209,7 +39051,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40233,7 +39075,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=394d
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -40253,7 +39095,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40275,7 +39117,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono,Postscript
@@ -40319,7 +39161,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=9
 support-released=True
-support-subtype=219b2b
+support-subtype=386c
 support-type=2
 support-ver=0.9.5
 tech-class=LJMono,Postscript
@@ -40339,7 +39181,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40381,7 +39223,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40404,7 +39246,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=2.8.5
 tech-class=LJMono,Postscript
@@ -40424,7 +39266,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40466,7 +39308,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=3
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40488,7 +39330,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3b72
 support-type=2
 support-ver=3.9.6
 tech-class=LJMono,Postscript
@@ -40508,7 +39350,7 @@ fax-type=0
 fw-download=False
 icon=HP_LaserJet_9000_MFP.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40671,7 +39513,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=3ee5
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -40736,7 +39578,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_9500.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40782,7 +39624,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=3
 support-released=True
-support-subtype=219b2b
+support-subtype=3dd2
 support-type=2
 support-ver=0.9.5
 tech-class=LJColor,Postscript
@@ -40802,7 +39644,7 @@ fax-type=0
 fw-download=False
 icon=hp_color_LaserJet_9500.png
 io-mfp-mode=6
-io-mode=1
+io-mode=6
 io-support=6
 job-storage=0
 linefeed-cal-type=0
@@ -40896,7 +39738,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=2
 support-released=True
-support-subtype=219b2b
+support-subtype=381c
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -41038,7 +39880,7 @@ status-battery-check=0
 status-dynamic-counters=1
 status-type=2
 support-released=True
-support-subtype=3c47
+support-subtype=3f30
 support-type=2
 support-ver=0.9.5
 tech-class=DJGenericVIP
@@ -41077,7 +39919,7 @@ status-battery-check=0
 status-dynamic-counters=0
 status-type=0
 support-released=True
-support-subtype=236d
+support-subtype=0
 support-type=0
 support-ver=0.0.0
 tech-class=Undefined
@@ -41166,7 +40008,6 @@ wifi-config=0
 # 2 : B&W PML/MFPDTF (late channel open) (do NOT use for new models)
 # 3 : OZ or Color Fax (Do not use)
 # 4 : B&W SOAP
-# 5 : B&W MARVELL
 #
 #
 # fw-download
@@ -41338,7 +40179,6 @@ wifi-config=0
 # 3 : SOAP1
 # 4 : Marvell
 # 5 : SOAP2
-# 6 : Duplex SCL
 #
 #
 # status-battery-check
@@ -41413,7 +40253,6 @@ wifi-config=0
 # AP21xx
 # AP2560
 # AP2xxx
-# Corbett
 # DJ3320
 # DJ350
 # DJ3600
@@ -41430,6 +40269,7 @@ wifi-config=0
 # DJ8xx
 # DJ9xx
 # DJ9xxVIP
+# DJD2600
 # DJGenericVIP
 # LJColor
 # LJFastRaster
@@ -41439,20 +40279,13 @@ wifi-config=0
 # LJZjsColor
 # LJZjsMono
 # LJm1005
-# OJ7000
 # OJProKx50
 # PSP100
 # PSP470
 # Postscript
-# Python
 # QuickConnect
-# Stabler
 # Undefined
 # Unsupported
-# ViperMinusTrim
-# ViperMinusVIP
-# ViperPlusTrim
-# ViperPlusVIP
 #
 #
 # tech-subclass
@@ -41471,12 +40304,9 @@ wifi-config=0
 # LargeFormatA3
 # LargeFormatSuperB
 # No1200dpiNoSensor
-# NoAutoDuplex
 # NoAutoTray
-# NoCDDVD
 # NoEvenDuplex
 # NoFullBleed
-# NoMaxDPI
 # NoPhotoBestHiresModes
 # NoPhotoMode
 # Normal
diff --git a/sane-backends.changes b/sane-backends.changes
index 8343639..e1fbe79 100644
--- a/sane-backends.changes
+++ b/sane-backends.changes
@@ -1,20 +1,8 @@
--------------------------------------------------------------------
-Tue Jun 22 16:40:42 CEST 2010 - jsmeix@suse.de
-
-- Updated models.dat to the one from our current HPLIP version
-  so that the generated hpaio.desc matches to our HPLIP version.
-- Enhanced epkowa.desc only with models which require proprietary
-  software so that the supported models in epkowa.desc
-  still match to what is supported by our iscan-free package
-  but more users of models which require proprietary
-  software will be informed via yast2-scanner.
-
 -------------------------------------------------------------------
 Tue May 11 14:31:58 UTC 2010 - lnussel@suse.de
 
-- remove disable-resmgr-support.patch.
-  It's not needed as configure won't find resmgr anyways
-  (see Novell/Suse Bugzilla bnc#605914).
+- remove disable-resmgr-support.patch. It's not needed as configure won't find
+  resmgr anyways
 
 -------------------------------------------------------------------
 Fri May  7 11:43:41 CEST 2010 - jsmeix@suse.de
diff --git a/sane-backends.spec b/sane-backends.spec
index 329897e..5d5a2dc 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -41,11 +41,8 @@ Source102:      sane.reg
 # Source104 was our hpaio.desc file which was derived from scan/sane/hpaio.desc from the hplip sources
 # but as scan/sane/hpaio.desc was completely messed up Source104 is now dropped and we
 # create our hpaio.desc file directly from the models.dat file of HPLIP via Source109 and Source110.
-# Original iscan descriptions-external file for the epkowa backend (provided by the package iscan-free).
-# This file is based on a copy of doc/epkowa.desc in the sources of our iscan-free package.
-# Meanwhile there is a newer epkowa.desc in the sources of this sane-backends package.
-# Only the missing models from the newer epkowa.desc which require proprietary software
-# were added so that users of those models are informed via yast2-scanner.
+# Original iscan descriptions-external file for the epkowa backend (provided by the package iscan).
+# This file is a copy of doc/epkowa.desc in the sources of the iscan package:
 Source105:      epkowa.desc
 # Since openSUSE 10.3 "Source106: create_hal_global_fdi_for_scanners" is dropped because
 # it is replaced by "Source108: create_hal_global_fdi_from_libsane.rules".