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