New upstream version 3.19.8

1270 files changed, 1415 insertions, 168 deletions

diff --git a/Makefile.in b/Makefile.in
index 57b2812e0..d5dc09db1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -868,6 +868,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \
 	prnt/ps/hp-laserjet_1320-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \
 	prnt/ps/hp-pagewide_color_765-ps.ppd.gz \
+	prnt/ps/hp-designjet_t2600-ps.ppd.gz \
 	prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz \
 	prnt/ps/hp-designjet_z5400-postscript.ppd.gz \
 	prnt/ps/hp-laserjet_m806-ps.ppd.gz \
@@ -1000,6 +1001,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \
 	prnt/ps/hp-officejet_pro_8210-ps.ppd.gz \
 	prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz \
 	prnt/ps/hp-laserjet_2300-ps.ppd.gz \
+	prnt/ps/hp-designjet_t1600dr-ps.ppd.gz \
 	prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \
 	prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz \
 	prnt/ps/hp-laserjet_m506-ps.ppd.gz \
@@ -1059,6 +1061,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \
 	prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz \
 	prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz \
 	prnt/ps/hp-designjet_d5800-ps.ppd.gz \
+	prnt/ps/hp-designjet_t1530-postscript.ppd.gz \
 	prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz \
 	prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz \
 	prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \
@@ -1067,6 +1070,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \
 	prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \
 	prnt/ps/hp-designjet_z6600-postscript.ppd.gz \
+	prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz \
 	prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \
 	prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz \
@@ -1123,12 +1127,14 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \
 	prnt/ps/hp-officejet_color_x555-ps.ppd.gz \
 	prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz \
+	prnt/ps/hp-designjet_t930-postscript.ppd.gz \
 	prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz \
 	prnt/ps/hp-postscript-laserjet-pro.ppd.gz \
 	prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz \
 	prnt/ps/hp-designjet_4020ps-ps.ppd.gz \
 	prnt/ps/hp-designjet_t7100ps-ps.ppd.gz \
 	prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz \
+	prnt/ps/hp-designjet_t2530-postscript.ppd.gz \
 	prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_m553-ps.ppd.gz \
@@ -3209,6 +3215,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-laserjet_1320-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \
     prnt/ps/hp-pagewide_color_765-ps.ppd.gz \
+    prnt/ps/hp-designjet_t2600-ps.ppd.gz \
     prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz \
     prnt/ps/hp-designjet_z5400-postscript.ppd.gz \
     prnt/ps/hp-laserjet_m806-ps.ppd.gz \
@@ -3341,6 +3348,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-officejet_pro_8210-ps.ppd.gz \
     prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_2300-ps.ppd.gz \
+    prnt/ps/hp-designjet_t1600dr-ps.ppd.gz \
     prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \
     prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz \
     prnt/ps/hp-laserjet_m506-ps.ppd.gz \
@@ -3400,6 +3408,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz \
     prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz \
     prnt/ps/hp-designjet_d5800-ps.ppd.gz \
+    prnt/ps/hp-designjet_t1530-postscript.ppd.gz \
     prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \
@@ -3408,6 +3417,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \
     prnt/ps/hp-designjet_z6600-postscript.ppd.gz \
+    prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz \
     prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \
     prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz \
@@ -3464,12 +3474,14 @@ foomatic_ps_printers = \
     prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \
     prnt/ps/hp-officejet_color_x555-ps.ppd.gz \
     prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz \
+    prnt/ps/hp-designjet_t930-postscript.ppd.gz \
     prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz \
     prnt/ps/hp-postscript-laserjet-pro.ppd.gz \
     prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz \
     prnt/ps/hp-designjet_4020ps-ps.ppd.gz \
     prnt/ps/hp-designjet_t7100ps-ps.ppd.gz \
     prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz \
+    prnt/ps/hp-designjet_t2530-postscript.ppd.gz \
     prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_m553-ps.ppd.gz \
diff --git a/base/imageprocessing.py b/base/imageprocessing.py
index 420355d2d..49c6416ca 100644
--- a/base/imageprocessing.py
+++ b/base/imageprocessing.py
@@ -39,6 +39,8 @@ import math
 import os
 import sys
 import platform
+import re
+import subprocess
 from installer import core_install
 from installer import dcheck
 #from .dcheck import *
@@ -330,7 +332,13 @@ def rotate_bound(image, angle):
     return cv2.warpAffine(image, M, (nW, nH))
     
 def orientangle(im):
-    from tesserocr import PyTessBaseAPI, PSM
+    if int(get_tesseract_version()) >= 4:
+        import locale
+        locale.setlocale(locale.LC_ALL, 'C')
+        from tesserocr import PyTessBaseAPI, PSM
+    else:
+        from tesserocr import PyTessBaseAPI, PSM
+
     with PyTessBaseAPI(psm=PSM.AUTO_OSD) as api:        
         try:        
             api.SetImage(im)
@@ -692,9 +700,12 @@ def merge_PDF_viewer(output,ocr):
         output_ocr = g[0] +"_ocr.pdf"
         if sys.version_info[0] == 3:
             cmd = "ocrmypdf" + " " + output + " " + output_ocr
+            os_utils.execute(cmd)
         else:
-            cmd = "pypdfocr" + "  " + output
-        os_utils.execute(cmd)
+            #cmd = "pypdfocr" + "  " + output
+            print("Santhosh")
+            out = subprocess.Popen(['pypdfocr',output],stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
+            stdout,stderr =out.communicate()
         #g = output.split(".")
         #output_ocr = g[0] +"_ocr.pdf"
         if os.path.isfile(output_ocr):
@@ -766,8 +777,12 @@ def check_skimage():
 def check_tesserocr_imutils():
     scanjet_flag = None
     try:
-        import tesserocr
-        #import imutils	
+        if int(get_tesseract_version()) >= 4:
+            import locale
+            locale.setlocale(locale.LC_ALL, 'C')
+            import tesserocr
+        else:
+            import tesserocr
     except ImportError as error:
         scanjet_flag=str(error)
 		#.split(' ')[-1]
@@ -1050,3 +1065,26 @@ def check_scipy():
     return scanjet_flag
 
 
+def _read_string(s):
+    if sys.version_info >= (3, 0):
+        return s.decode('UTF-8')
+    else:
+        return s
+
+def get_tesseract_version():
+    try:
+        p = subprocess.Popen(['tesseract', '-v'], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+        stdout_version, version = p.communicate()
+        version = _read_string(version).strip()
+        if version == '':
+            version = _read_string(stdout_version).strip()
+        version_match = re.search(r'^tesseract ((?:\d+\.)+\d+).*', version, re.M)
+        if version_match:
+            version = version_match.group(1)
+            return version[0]
+        else:
+            return 0
+    except OSError as e:
+        #log.debug('Failed to extract tesseract version from executable: {}'.format(e))
+        return 0
+
diff --git a/configure b/configure
index 6c9f44208..6ffdc17c7 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.19.6.
+# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.19.8.
 #
-# Report bugs to <3.19.6>.
+# Report bugs to <3.19.8>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -246,7 +246,7 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.19.6 about your
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.19.8 about your
 $0: system, including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -569,9 +569,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HP Linux Imaging and Printing'
 PACKAGE_TARNAME='hplip'
-PACKAGE_VERSION='3.19.6'
-PACKAGE_STRING='HP Linux Imaging and Printing 3.19.6'
-PACKAGE_BUGREPORT='3.19.6'
+PACKAGE_VERSION='3.19.8'
+PACKAGE_STRING='HP Linux Imaging and Printing 3.19.8'
+PACKAGE_BUGREPORT='3.19.8'
 PACKAGE_URL=''
 
 # Factoring default headers for most tests.
@@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HP Linux Imaging and Printing 3.19.6 to adapt to many kinds of systems.
+\`configure' configures HP Linux Imaging and Printing 3.19.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1558,7 +1558,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.19.6:";;
+     short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.19.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1661,7 +1661,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <3.19.6>.
+Report bugs to <3.19.8>.
 _ACEOF
 ac_status=$?
 fi
@@ -1724,7 +1724,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HP Linux Imaging and Printing configure 3.19.6
+HP Linux Imaging and Printing configure 3.19.8
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2191,7 +2191,7 @@ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( $as_echo "## --------------------- ##
-## Report this to 3.19.6 ##
+## Report this to 3.19.8 ##
 ## --------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -2268,7 +2268,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HP Linux Imaging and Printing $as_me 3.19.6, which was
+It was created by HP Linux Imaging and Printing $as_me 3.19.8, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3084,7 +3084,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hplip'
- VERSION='3.19.6'
+ VERSION='3.19.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16580,12 +16580,13 @@ else
   qt4=yes
 fi
 
-if test "$qt4" = "yes"; then
+if test "$qt4" = "yes" && test "$qt5" = "no"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+   qt4=no
 fi
  if test x$qt4 = xyes; then
   QT4_INSTALL_TRUE=
@@ -16608,6 +16609,8 @@ fi
 if test "$qt3" = "yes"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+   qt5=no
+   qt4=no
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -16631,10 +16634,10 @@ epm_qt3=\#
 epm_qt4=\#
 epm_qt5=\#
 if test "$hpcups_only_build" = "no" && test "$hpijs_only_build" = "no"; then
-if test "$qt3" = "yes" && test "$qt4" = "no" && "$qt5" = "no"; then
+if test "$qt3" = "yes" && test "$qt4" = "no" && test "$qt5" = "no"; then
    ui_toolkit=qt3
    epm_qt3=
-elif test "$qt4" = "yes"; then
+elif test "$qt4" = "yes" && test "$qt5" = "no"; then
    ui_toolkit=qt4
    epm_qt4=
 elif test "$qt5" = "yes"; then
@@ -18455,7 +18458,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HP Linux Imaging and Printing $as_me 3.19.6, which was
+This file was extended by HP Linux Imaging and Printing $as_me 3.19.8, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18506,13 +18509,13 @@ $config_files
 Configuration commands:
 $config_commands
 
-Report bugs to <3.19.6>."
+Report bugs to <3.19.8>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HP Linux Imaging and Printing config.status 3.19.6
+HP Linux Imaging and Printing config.status 3.19.8
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 55d38bf2c..4fc819528 100755
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@
 #   104 = no libdl
 
 #AC_PREREQ(2.59)
-AC_INIT([HP Linux Imaging and Printing], [3.19.6], [3.19.6], [hplip])
+AC_INIT([HP Linux Imaging and Printing], [3.19.8], [3.19.8], [hplip])
 #AM_INIT_AUTOMAKE([1.9 foreign])
 AM_INIT_AUTOMAKE
 AC_DISABLE_STATIC
@@ -487,10 +487,11 @@ AC_MSG_CHECKING([for qt4])
 AC_ARG_ENABLE(qt4,
   [  --enable-qt4    enable qt4 (default=yes)],
   qt4=$enableval, qt4=yes)
-if test "$qt4" = "yes"; then
+if test "$qt4" = "yes" && test "$qt5" = "no"; then
    AC_MSG_RESULT(yes)
 else
    AC_MSG_RESULT(no)
+   qt4=no
 fi
 AM_CONDITIONAL(QT4_INSTALL, test x$qt4 = xyes)
 
@@ -500,6 +501,8 @@ AC_ARG_ENABLE(qt3,
   qt3=$enableval, qt3=no)
 if test "$qt3" = "yes"; then
    AC_MSG_RESULT(yes)
+   qt5=no
+   qt4=no
 else
    AC_MSG_RESULT(no)
 fi
@@ -515,10 +518,10 @@ epm_qt3=\#
 epm_qt4=\#
 epm_qt5=\#
 if test "$hpcups_only_build" = "no" && test "$hpijs_only_build" = "no"; then
-if test "$qt3" = "yes" && test "$qt4" = "no" && "$qt5" = "no"; then
+if test "$qt3" = "yes" && test "$qt4" = "no" && test "$qt5" = "no"; then
    ui_toolkit=qt3
    epm_qt3=
-elif test "$qt4" = "yes"; then
+elif test "$qt4" = "yes" && test "$qt5" = "no"; then
    ui_toolkit=qt4
    epm_qt4=
 elif test "$qt5" = "yes"; then
diff --git a/data/models/models.dat b/data/models/models.dat
index 982bd0a96..8d172fabf 100644
--- a/data/models/models.dat
+++ b/data/models/models.dat
@@ -65970,6 +65970,308 @@ usb-pid=0
 usb-vid=3f0
 wifi-config=0
 
+[hp_designjet_t930_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=6
+io-mode=1
+io-support=4
+job-storage=0
+linefeed-cal-type=0
+model1=HP DesignJet T930 Postscript
+monitor-type=0
+panel-check-type=0
+pcard-type=0
+plugin=0
+plugin-reason=0
+power-settings=0
+ppd-name=hp-designjet_t930-postscript.ppd
+pq-diag-type=0
+r-type=0
+r0-agent1-kind=3
+r0-agent1-sku=B3P13A/B3P19A
+r0-agent1-type=4
+r0-agent2-kind=3
+r0-agent2-sku=B3P14A/B3P20A
+r0-agent2-type=5
+r0-agent3-kind=3
+r0-agent3-sku=B3P15A/B3P21A
+r0-agent3-type=6
+r0-agent4-kind=3
+r0-agent4-sku=B3P16A/B3P22A
+r0-agent4-type=21
+r0-agent5-kind=3
+r0-agent5-sku=B3P17A/B3P23A
+r0-agent5-type=20
+r0-agent6-kind=3
+r0-agent6-sku=B3P18A/B3P24A
+r0-agent6-type=17
+scan-src=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.13.6
+tech-class=Postscript
+family-class=Undefined
+tech-subclass=Normal
+tech-type=2
+usb-pid=0
+usb-vid=3f0
+wifi-config=0
+
+[hp_designjet_t2530_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=6
+io-mode=1
+io-support=4
+job-storage=0
+linefeed-cal-type=0
+model1=HP DesignJet T2530 Postscript
+monitor-type=0
+panel-check-type=0
+pcard-type=0
+plugin=0
+plugin-reason=0
+power-settings=0
+ppd-name=hp-designjet_t2530-postscript.ppd
+pq-diag-type=0
+r-type=0
+r0-agent1-kind=3
+r0-agent1-sku=B3P13A/B3P19A
+r0-agent1-type=4
+r0-agent2-kind=3
+r0-agent2-sku=B3P14A/B3P20A
+r0-agent2-type=5
+r0-agent3-kind=3
+r0-agent3-sku=B3P15A/B3P21A
+r0-agent3-type=6
+r0-agent4-kind=3
+r0-agent4-sku=B3P16A/B3P22A
+r0-agent4-type=21
+r0-agent5-kind=3
+r0-agent5-sku=B3P17A/B3P23A
+r0-agent5-type=20
+r0-agent6-kind=3
+r0-agent6-sku=B3P18A/B3P24A
+r0-agent6-type=17
+scan-src=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.13.6
+tech-class=Postscript
+family-class=Undefined
+tech-subclass=Normal
+tech-type=2
+usb-pid=0
+usb-vid=3f0
+wifi-config=0
+
+[hp_designjet_t1530_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=6
+io-mode=1
+io-support=4
+job-storage=0
+linefeed-cal-type=0
+model1=HP DesignJet T1530 Postscript
+monitor-type=0
+panel-check-type=0
+pcard-type=0
+plugin=0
+plugin-reason=0
+power-settings=0
+ppd-name=hp-designjet_t1530-postscript.ppd
+pq-diag-type=0
+r-type=0
+r0-agent1-kind=3
+r0-agent1-sku=B3P13A/B3P19A
+r0-agent1-type=4
+r0-agent2-kind=3
+r0-agent2-sku=B3P14A/B3P20A
+r0-agent2-type=5
+r0-agent3-kind=3
+r0-agent3-sku=B3P15A/B3P21A
+r0-agent3-type=6
+r0-agent4-kind=3
+r0-agent4-sku=B3P16A/B3P22A
+r0-agent4-type=21
+r0-agent5-kind=3
+r0-agent5-sku=B3P17A/B3P23A
+r0-agent5-type=20
+r0-agent6-kind=3
+r0-agent6-sku=B3P18A/B3P24A
+r0-agent6-type=17
+scan-src=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.13.6
+tech-class=Postscript
+family-class=Undefined
+tech-subclass=Normal
+tech-type=2
+usb-pid=0
+usb-vid=3f0
+wifi-config=0
+
+[hp_designjet_t1600_postscript_printer]
+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=4
+job-storage=0
+linefeed-cal-type=0
+model1=HP DesignJet T1600 PostScript Printer
+monitor-type=0
+ppd-name=hp-designjet_t1600_printer-ps.ppd
+panel-check-type=0
+pcard-type=0
+plugin=0
+plugin-reason=0
+power-settings=0
+pq-diag-type=0
+r-type=0
+scan-src=0
+scan-type=0
+status-battery-check=0
+status-dynamic-counters=0
+status-type=10
+support-released=True
+support-subtype=219b2b
+support-type=2
+support-ver=3.19.5
+tech-class=Postscript
+family-class=Undefined
+tech-subclass=Normal
+tech-type=2
+usb-pid=0
+usb-vid=3f0
+wifi-config=0
+
+[hp_designjet_t1600dr_postscript_printer]
+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=4
+job-storage=0
+linefeed-cal-type=0
+model1=HP DesignJet T1600dr Postscript Printer
+monitor-type=0
+ppd-name=hp-designjet_t1600dr-ps.ppd
+panel-check-type=0
+pcard-type=0
+plugin=0
+plugin-reason=0
+power-settings=0
+pq-diag-type=0
+r-type=0
+scan-src=0
+scan-type=0
+status-battery-check=0
+status-dynamic-counters=0
+status-type=10
+support-released=True
+support-subtype=219b2b
+support-type=2
+support-ver=3.19.5
+tech-class=Postscript
+family-class=Undefined
+tech-subclass=Normal
+tech-type=2
+usb-pid=0
+usb-vid=3f0
+wifi-config=0
+
+
+[hp_designjet_t2600_postscript_mfp]
+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=4
+job-storage=0
+linefeed-cal-type=0
+model1=HP DesignJet T2600 PostScript MFP
+monitor-type=0
+ppd-name=hp-designjet_t2600-ps.ppd
+panel-check-type=0
+pcard-type=0
+plugin=0
+plugin-reason=0
+power-settings=0
+pq-diag-type=0
+r-type=0
+scan-src=0
+scan-type=0
+status-battery-check=0
+status-dynamic-counters=0
+status-type=10
+support-released=True
+support-subtype=219b2b
+support-type=2
+support-ver=3.19.5
+tech-class=Postscript
+family-class=Undefined
+tech-subclass=Normal
+tech-type=2
+usb-pid=0
+usb-vid=3f0
+wifi-config=0
+
+
 # align-type
 # ----------
 # Align cartridges type
diff --git a/fax/ledmfax.py b/fax/ledmfax.py
index 79c0812d1..86fbfac2d 100644
--- a/fax/ledmfax.py
+++ b/fax/ledmfax.py
@@ -438,7 +438,7 @@ class LEDMFaxSendThread(FaxSendThread):
                         pos2 = response.find(b"Cache-Control",0,len(response))
                         jobListURI = response[pos:pos1].strip()
                         jobListURI = jobListURI.replace(b'\r',b'').replace(b'\n',b'')
-                        if jobListURI == '':
+                        if jobListURI == b'':
                             jobListURI = response[pos:pos2].strip()
                             jobListURI = jobListURI.replace(b'\r',b'').replace(b'\n',b'')
                             log.debug("jobListURI = [%s] type=%s" %(jobListURI, type(jobListURI)))
diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz
index 45e080c1b..f3eca5644 100644
--- a/fax/ppd/HP-Fax-hpcups.ppd.gz
+++ b/fax/ppd/HP-Fax-hpcups.ppd.gz
diff --git a/fax/ppd/HP-Fax-hpijs.ppd.gz b/fax/ppd/HP-Fax-hpijs.ppd.gz
index 6965d2ec0..6f1c9b91f 100644
--- a/fax/ppd/HP-Fax-hpijs.ppd.gz
+++ b/fax/ppd/HP-Fax-hpijs.ppd.gz
diff --git a/fax/ppd/HP-Fax2-hpcups.ppd.gz b/fax/ppd/HP-Fax2-hpcups.ppd.gz
index 2a8be5dcb..a7ed8dee6 100644
--- a/fax/ppd/HP-Fax2-hpcups.ppd.gz
+++ b/fax/ppd/HP-Fax2-hpcups.ppd.gz
diff --git a/fax/ppd/HP-Fax2-hpijs.ppd.gz b/fax/ppd/HP-Fax2-hpijs.ppd.gz
index d2c625e07..0084e6f5f 100644
--- a/fax/ppd/HP-Fax2-hpijs.ppd.gz
+++ b/fax/ppd/HP-Fax2-hpijs.ppd.gz
diff --git a/fax/ppd/HP-Fax3-hpcups.ppd.gz b/fax/ppd/HP-Fax3-hpcups.ppd.gz
index 73f7d1776..5f2bbe749 100644
--- a/fax/ppd/HP-Fax3-hpcups.ppd.gz
+++ b/fax/ppd/HP-Fax3-hpcups.ppd.gz
diff --git a/fax/ppd/HP-Fax3-hpijs.ppd.gz b/fax/ppd/HP-Fax3-hpijs.ppd.gz
index d430a2050..73211eddd 100644
--- a/fax/ppd/HP-Fax3-hpijs.ppd.gz
+++ b/fax/ppd/HP-Fax3-hpijs.ppd.gz
diff --git a/fax/ppd/HP-Fax4-hpcups.ppd.gz b/fax/ppd/HP-Fax4-hpcups.ppd.gz
index 58a03ef65..8db80896c 100644
--- a/fax/ppd/HP-Fax4-hpcups.ppd.gz
+++ b/fax/ppd/HP-Fax4-hpcups.ppd.gz
diff --git a/fax/ppd/HP-Fax4-hpijs.ppd.gz b/fax/ppd/HP-Fax4-hpijs.ppd.gz
index 2cf61f296..12e03bc9b 100644
--- a/fax/ppd/HP-Fax4-hpijs.ppd.gz
+++ b/fax/ppd/HP-Fax4-hpijs.ppd.gz
diff --git a/foomatic_drv.inc b/foomatic_drv.inc
index b01a5877e..c8a6bc1cf 100644
--- a/foomatic_drv.inc
+++ b/foomatic_drv.inc
@@ -879,6 +879,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-laserjet_1320-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \
     prnt/ps/hp-pagewide_color_765-ps.ppd.gz \
+    prnt/ps/hp-designjet_t2600-ps.ppd.gz \
     prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz \
     prnt/ps/hp-designjet_z5400-postscript.ppd.gz \
     prnt/ps/hp-laserjet_m806-ps.ppd.gz \
@@ -1011,6 +1012,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-officejet_pro_8210-ps.ppd.gz \
     prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_2300-ps.ppd.gz \
+    prnt/ps/hp-designjet_t1600dr-ps.ppd.gz \
     prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \
     prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz \
     prnt/ps/hp-laserjet_m506-ps.ppd.gz \
@@ -1070,6 +1072,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz \
     prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz \
     prnt/ps/hp-designjet_d5800-ps.ppd.gz \
+    prnt/ps/hp-designjet_t1530-postscript.ppd.gz \
     prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \
@@ -1078,6 +1081,7 @@ foomatic_ps_printers = \
     prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \
     prnt/ps/hp-designjet_z6600-postscript.ppd.gz \
+    prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz \
     prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \
     prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz \
@@ -1134,12 +1138,14 @@ foomatic_ps_printers = \
     prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \
     prnt/ps/hp-officejet_color_x555-ps.ppd.gz \
     prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz \
+    prnt/ps/hp-designjet_t930-postscript.ppd.gz \
     prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz \
     prnt/ps/hp-postscript-laserjet-pro.ppd.gz \
     prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz \
     prnt/ps/hp-designjet_4020ps-ps.ppd.gz \
     prnt/ps/hp-designjet_t7100ps-ps.ppd.gz \
     prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz \
+    prnt/ps/hp-designjet_t2530-postscript.ppd.gz \
     prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_m553-ps.ppd.gz \
diff --git a/hplip.list.in b/hplip.list.in
index 3b2207290..5441aa930 100644
--- a/hplip.list.in
+++ b/hplip.list.in
@@ -368,6 +368,10 @@ f 0644 root root $ppd/HP prnt/pdf/*.ppd.gz
 @epm_full@l 755 root root $bindir/hp-config_usb_printer ../share/hplip/config_usb_printer.py
 @epm_full@l 755 root root $bindir/hp-diagnose_queues ../share/hplip/diagnose_queues.py
 
+# qt5
+@epm_full@@epm_qt5@d 775 root root $home/ui5 -
+@epm_full@@epm_qt5@f 644 root root $home/ui5 ui5/*.py
+
 # qt4
 @epm_full@@epm_qt4@d 775 root root $home/ui4 -
 @epm_full@@epm_qt4@f 644 root root $home/ui4 ui4/*.py
diff --git a/hplipclassdriver.spec b/hplipclassdriver.spec
index d62118826..6a2b391c6 100644
--- a/hplipclassdriver.spec
+++ b/hplipclassdriver.spec
@@ -1,5 +1,5 @@
 Name: hplipclassdriver
-Version: 3.19.6
+Version: 3.19.8
 Release: 0
 License: (c) 2004-2009 Copyright HP Development Company, LP
 Packager: HPLIP
diff --git a/installer/distros.dat b/installer/distros.dat
index 2e058b189..f332e9472 100644
--- a/installer/distros.dat
+++ b/installer/distros.dat
@@ -114,7 +114,7 @@ supported=0
 

 [suse]

 index=3

-versions=12.2,12.3,13.1,13.2,42.1,42.2,42.3,15.0

+versions=12.2,12.3,13.1,13.2,42.1,42.2,42.3,15.0,15.1

 display_name=SUSE Linux

 alt_names=

 display=1

@@ -1049,6 +1049,159 @@ packages=python3-notify2
 packages=automake

 

 # ****************************************

+

+

+[suse:15.1]

+code_name=Harlequin

+supported=1

+packaged_version=3.19.8

+release_date=22.05.2019

+scan_supported=1

+fax_supported=1

+pcard_supported=0

+network_supported=1

+parallel_supported=0

+usb_supported=1

+notes=Please be sure to disable the CD repositories in YaST.

+ppd_install=drv

+udev_mode_fix=1

+ppd_dir=/usr/share/cups/model/HP

+fix_ppd_symlink=0

+drv_dir=/usr/share/cups/drv/HP

+cups_path_with_bitness=0

+ui_toolkit=qt4

+native_cups=1

+pre_depend_cmd=su -c "zypper refresh"

+post_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --force --auto-agree-with-licenses cups-filters-ghostscript",su -c "service cups restart"

+scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks remove python-numpy",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install opencv-python",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image",su -c "pip2 install reportlab==3.4.0",su -c "pip2 install scipy"

+#su -c "pip2 install --upgrade setuptools"

+scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install opencv-python",su -c "pip3 install setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image",su -c "pip3 install reportlab==3.4.0",su -c "pip3 install scipy"

+

+[suse:15.1:cups]

+packages=cups,cups-client

+

+[suse:15.1:cups-devel]

+packages=cups-devel,cupsddk

+

+[suse:15.1:gcc]

+packages=gcc-c++

+

+[suse:15.1:gs]

+packages=ghostscript-library

+

+[suse:15.1:libcrypto]

+packages=openssl

+

+[suse:15.1:libjpeg]

+packages=libjpeg-devel,zlib-devel

+

+[suse:15.1:libnetsnmp-devel]

+packages=net-snmp-devel

+

+[suse:15.1:libpthread]

+packages=glibc

+

+[suse:15.1:libtool]

+packages=libtool,libgphoto2-devel,rpm-build

+

+[suse:15.1:libusb]

+packages=libusb-1_0-devel,libusb-1_0-0

+

+[suse:15.1:make]

+packages=make

+

+[suse:15.1:pil]

+packages=python-imaging

+

+[suse:15.1:ppdev]

+packages=

+commands=su -c "modprobe ppdev"

+

+[suse:15.1:pyqt]

+packages=python-qt

+

+[suse:15.1:pyqt4]

+packages=python-qt4

+

+[suse:15.1:pyqt4-dbus]

+packages=dbus-1-python-devel,dbus-1-python

+

+[suse:15.1:python-devel]

+packages=python-devel,python-xml,libpython2_7-1_0

+

+[suse:15.1:python23]

+packages=python

+

+[suse:15.1:python2X]

+packages=python

+

+[suse:15.1:reportlab]

+packages=

+

+[suse:15.1:sane]

+packages=xsane

+

+[suse:15.1:sane-devel]

+packages=sane-backends-devel

+

+[suse:15.1:scanimage]

+packages=sane-backends

+

+[suse:15.1:xsane]

+packages=xsane

+

+[suse:15.1:cups-ddk]

+packages=cupsddk

+

+[suse:15.1:python-dbus]

+packages=dbus-1-python

+

+[suse:15.1:dbus]

+packages=dbus-1-devel,python-gobject2

+

+[suse:15.1:python-xml]

+packages=python-xml,libpython2_7-1_0

+

+[suse:15.1:cups-image]

+packages=cups-devel

+

+[suse:15.1:python-notify]

+packages=python-notify

+

+[suse:15.1:network]

+packages=wget

+

+[suse:15.1:avahi-utils]

+packages=avahi-utils

+

+[suse:15.1:python3-pyqt4]

+packages=python3-qt4,python3-qt4-devel

+

+[suse:15.1:python3-dbus]

+packages=dbus-1-python3,python3-gobject,python3-gobject2-devel

+

+[suse:15.1:python3-xml]

+packages=python3-xml,python3-lxml

+

+[suse:15.1:python3-devel]

+packages=python3-devel

+

+[suse:15.1:python3-pyqt4-dbus]

+packages=dbus-1-python3-devel,dbus-1-python3

+

+[suse:15.1:python3-pil]

+packages=python3-Pillow

+

+[suse:15.1:python3-reportlab]

+packages=python3-reportlab

+

+[suse:15.1:python3-notify2]

+packages=python3-notify2

+

+[suse:15.1:automake]

+packages=automake

+

+# ****************************************

 [redhat]

 index=6

 versions=8.0,9.0

@@ -2358,7 +2511,7 @@ ui_toolkit=qt3
 # ****************************************

 [rhel]

 index=7

-versions=5.0,6.0,7.0,7.1,7.2,7.3,7.6

+versions=5.0,6.0,7.0,7.1,7.2,7.3,7.6,8.0

 display_name=Red Hat Enterprise Linux

 alt_names=red hat enterprise linux

 display=1

@@ -2647,6 +2800,124 @@ packaged_version=3.19.3
 release_date=31/11/2018

 same_as_version=6.0

 

+

+# ****************************************

+[rhel:8.0]

+code_name=Ootpa

+supported=1

+scan_supported=1

+fax_supported=1

+pcard_supported=1

+network_supported=1

+parallel_supported=1

+usb_supported=1

+packaged_version=3.19.8

+release_date=

+notes=

+ppd_install=

+udev_mode_fix=1

+ppd_dir=/usr/share/cups/model/HP

+fix_ppd_symlink=0

+drv_dir=/usr/share/cups/drv/HP

+ui_toolkit=qt5

+package_available=1

+package_arch=x86_64

+native_cups=1

+libusb01=1

+

+[rhel:8:0:cups]

+packages=cups

+

+[rhel:8:0:cups-devel]

+packages=cups-devel

+

+[rhel:8:0:gcc]

+packages=gcc-c++

+

+[rhel:8:0:gs]

+packages=ghostscript

+

+[rhel:8:0:libcrypto]

+packages=openssl-devel

+

+[rhel:8:0:libjpeg]

+packages=libjpeg-devel

+

+[rhel:8:0:libnetsnmp-devel]

+packages=net-snmp-devel

+

+[rhel:8:0:libpthread]

+packages=glibc-headers

+

+[rhel:8:0:libtool]

+packages=libtool

+

+[rhel:8:0:libusb]

+packages=libusb1

+

+[rhel:8:0:make]

+packages=make

+

+[rhel:8:0:pil]

+packages=python-imaging

+

+[rhel:8:0:ppdev]

+packages=

+

+[rhel:8:0:python3-devel]

+packages=python3-devel

+

+[rhel:8:0:pyqt5]

+packages=python3-qt5

+

+[rhel:8:0:pyqt5-dbus]

+packages=python3-dbus.mainloop.pyqt5

+

+[rhel:8:0:python36]

+packages=python

+

+[rhel:8:0:python3X]

+packages=python

+

+[rhel:8:0:reportlab]

+packages=python-reportlab

+

+[rhel:8:0:sane]

+packages=sane-backends

+

+[rhel:8:0:sane-devel]

+packages=sane-backends-devel

+

+[rhel:8:0:scanimage]

+packages=sane-frontends

+

+[rhel:8:0:xsane]

+packages=xsane

+

+[rhel:8:0:python3-dbus]

+packages=python3-dbus

+

+[rhel:8:0:dbus]

+packages=dbus-devel

+

+[rhel:8:0:cups-image]

+packages=cups-devel

+

+[rhel:8:0:python-notify]

+packages=notify-python

+

+[rhel:8:0:policykit]

+packages=polkit,polkit-gnome

+

+[rhel:8:0:network]

+packages=wget

+

+[rhel:8:0:avahi-utils]

+packages=avahi-tools

+

+[rhel:8:0:automake]

+packages=automake1.11

+

 # ****************************************

 [slackware]

 index=8

@@ -5989,7 +6260,7 @@ packages=epm
 # ****************************************

 [debian]

 index=2

-versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8

+versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8,9.9,10.0

 display_name=Debian

 alt_names=

 display=1

@@ -7415,7 +7686,7 @@ same_as_version=9.1
 

 [debian:9.5]

 code_name=Stretch

-packaged_version=3.18.9

+packaged_version=3.18.4

 release_date=10/3/2018

 #su -c "apt-get install --force-yes -y python-qt4",su -c "apt-get install --force-yes -y python-qt4-dbus",

 #scanjet_depend_cmd=su -c "apt-get install --force-yes -y python2-pip",su -c "pip2 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip2 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image",su -c "pip2 install scipy"

@@ -7453,6 +7724,250 @@ same_as_version=9.1
 

 # ****************************************

 

+[debian:9.9]

+code_name=Stretch

+supported=1

+scan_supported=1

+fax_supported=1

+pcard_supported=1

+network_supported=1

+parallel_supported=1

+usb_supported=1

+packaged_version=3.19.8

+release_date=22/07/2017

+notes=NOTE: Disable the CD Sources in your apt sources.list or the install will fail and hang.

+ppd_install=drv

+udev_mode_fix=1

+ppd_dir=/usr/share/ppd/HP

+fix_ppd_symlink=0

+drv_dir=/usr/share/cups/drv/HP

+ui_toolkit=qt5

+native_cups=1

+policykit=0

+# This libdir_path will be used only for 64 bit machine.

+libdir_path=/usr/lib/x86_64-linux-gnu

+[debian:9.9:cups]

+packages=cups,libcups2

+[debian:9.9:cups-devel]

+packages=libcups2-dev,cups-bsd,cups-client,cups,libcups2

+[debian:9.9:gcc]

+packages=g++

+[debian:9.9:gs]

+packages=ghostscript,ghostscript-cups,ghostscript-x

+[debian:9.9:libcrypto]

+packages=libssl-dev

+[debian:9.9:libjpeg]

+packages=libjpeg62-turbo-dev

+[debian:9.9:libnetsnmp-devel]

+packages=libsnmp-dev,snmp

+[debian:9.9:libpthread]

+packages=libc6

+[debian:9.9:libtool]

+packages=libtool,libtool-bin

+[debian:9.9:libusb]

+packages=libusb-1.0.0-dev

+[debian:9.9:make]

+packages=make

+[debian:9.9:pil]

+packages=python-imaging

+[debian:9.9:ppdev]

+packages=

+commands=su -c "modprobe ppdev",su -c cp -f /etc/modules /etc/modules.hplip,echo ppdev | su -c tee -a /etc/modules

+[debian:9.9:pyqt]

+packages=python-qt3

+[debian:9.9:python-devel]

+packages=python-dev

+[debian:9.9:pyqt4]

+packages=python-qt4

+[debian:9.9:pyqt4-dbus]

+packages=python-qt4-dbus

+[debian:9.9:python23]

+packages=python

+[debian:9.9:python2X]

+packages=python

+[debian:9.9:reportlab]

+packages=python-reportlab

+[debian:9.9:sane]

+packages=sane

+[debian:9.9:sane-devel]

+packages=libsane-dev

+[debian:9.9:scanimage]

+packages=sane-utils

+[debian:9.9:xsane]

+packages=xsane

+[debian:9.9:cups-ddk]

+packages=

+[debian:9.9:python-dbus]

+packages=python-dbus,python-gobject

+[debian:9.9:dbus]

+packages=libdbus-1-dev

+[debian:9.9:python-ctypes]

+packages=python-ctypes

+[debian:9.9:cups-image]

+packages=libcupsimage2,libcupsimage2-dev

+[debian:9.9:policykit]

+packages=policykit-1,policykit-1-gnome

+[debian:9.9:python-notify]

+packages=python-notify

+[debian:9.9:network]

+packages=wget

+[debian:9.9:avahi-utils]

+packages=avahi-utils

+[debian:9.9:gtk]

+packages=libcanberra-gtk-module

+[debian:9.9:python3-notify2]

+packages=python3-notify2

+[debian:9.9:python3-pyqt4-dbus]

+packages=python3-dbus.mainloop.qt

+[debian:9.9:python3-pyqt4]

+packages=python3-pyqt4,gtk2-engines-pixbuf

+[debian:9.9:python3-dbus]

+packages=python3-dbus,python3-gi

+[debian:9.9:python3-xml]

+packages=python3-lxml

+[debian:9.9:python3-devel]

+packages=python3-dev

+[debian:9.9:python3-pil]

+packages=python3-pil

+[debian:9.9:python3-reportlab]

+packages=python3-reportlab

+[debian:9.9:python3-pyqt5-dbus]

+packages=python3-dbus.mainloop.pyqt5

+[debian:9.9:python3-pyqt5]

+packages=python3-pyqt5,gtk2-engines-pixbuf

+[debian:9.9:pyqt5]

+packages=gtk2-engines-pixbuf,python-pyqt5

+[debian:9.9:pyqt5-dbus]

+packages=python-dbus.mainloop.pyqt5

+[debian:9.9:automake]

+packages=automake1.11

+[debian:9.9:epm]

+packages=epm

+

+# ****************************************

+[debian:10.0]

+code_name=Buster

+supported=1

+scan_supported=1

+fax_supported=1

+pcard_supported=1

+network_supported=1

+parallel_supported=1

+usb_supported=1

+packaged_version=3.19.8

+release_date=22/07/2017

+notes=NOTE: Disable the CD Sources in your apt sources.list or the install will fail and hang.

+ppd_install=drv

+udev_mode_fix=1

+ppd_dir=/usr/share/ppd/HP

+fix_ppd_symlink=0

+drv_dir=/usr/share/cups/drv/HP

+ui_toolkit=qt5

+native_cups=1

+policykit=0

+# This libdir_path will be used only for 64 bit machine.

+libdir_path=/usr/lib/x86_64-linux-gnu

+[debian:10.0:cups]

+packages=cups,libcups2

+[debian:10.0:cups-devel]

+packages=libcups2-dev,cups-bsd,cups-client

+[debian:10.0:gcc]

+packages=g++

+[debian:10.0:gs]

+packages=ghostscript,ghostscript-cups,ghostscript-x

+[debian:10.0:libcrypto]

+packages=libssl-dev

+[debian:10.0:libjpeg]

+packages=libjpeg62-turbo-dev

+[debian:10.0:libnetsnmp-devel]

+packages=libsnmp-dev,snmp

+[debian:10.0:libpthread]

+packages=libc6

+[debian:10.0:libtool]

+packages=libtool,libtool-bin

+[debian:10.0:libusb]

+packages=libusb-1.0.0-dev

+[debian:10.0:make]

+packages=make

+[debian:10.0:ppdev]

+packages=

+commands=su -c "modprobe ppdev",su -c cp -f /etc/modules /etc/modules.hplip,echo ppdev | su -c tee -a /etc/modules

+[debian:10.0:pyqt]

+packages=python-qt3

+[debian:10.0:python-devel]

+packages=python-dev

+[debian:10.0:pyqt4]

+packages=python-qt4

+[debian:10.0:pyqt4-dbus]

+packages=python-qt4-dbus

+[debian:10.0:python23]

+packages=python

+[debian:10.0:python2X]

+packages=python

+[debian:10.0:reportlab]

+packages=python-reportlab

+[debian:10.0:sane]

+packages=sane

+[debian:10.0:sane-devel]

+packages=libsane-dev

+[debian:10.0:scanimage]

+packages=sane-utils

+[debian:10.0:xsane]

+packages=xsane

+[debian:10.0:cups-ddk]

+packages=

+[debian:10.0:python-dbus]

+packages=python-dbus,python-gobject

+[debian:10.0:dbus]

+packages=libdbus-1-dev

+[debian:10.0:python-ctypes]

+packages=python-ctypes

+[debian:10.0:cups-image]

+packages=libcupsimage2,libcupsimage2-dev

+[debian:10.0:policykit]

+packages=policykit-1,policykit-1-gnome

+[debian:10.0:python-notify]

+packages=python-notify

+[debian:10.0:network]

+packages=wget

+[debian:10.0:avahi-utils]

+packages=avahi-utils

+[debian:10.0:gtk]

+packages=libcanberra-gtk-module

+[debian:10.0:python3-notify2]

+packages=python3-notify2

+[debian:10.0:python3-pyqt4-dbus]

+packages=python3-dbus.mainloop.qt

+[debian:10.0:python3-pyqt4]

+packages=python3-pyqt4,gtk2-engines-pixbuf

+[debian:10.0:python3-dbus]

+packages=python3-dbus,python3-gi

+[debian:10.0:python3-xml]

+packages=python3-lxml

+[debian:10.0:python3-devel]

+packages=python3-dev

+[debian:10.0:python3-pil]

+packages=python3-pil

+[debian:10.0:python3-reportlab]

+packages=python3-reportlab

+[debian:10.0:python3-pyqt5-dbus]

+packages=python3-dbus.mainloop.pyqt5

+[debian:10.0:python3-pyqt5]

+packages=python3-pyqt5,gtk2-engines-pixbuf

+[debian:10.0:pyqt5]

+packages=gtk2-engines-pixbuf,python-pyqt5

+[debian:10.0:pyqt5-dbus]

+packages=python-dbus.mainloop.pyqt5

+

+[debian:10.0:automake]

+packages=automake1.11

+

+[debian:10.0:epm]

+packages=epm

+

+

+# ****************************************

+

 [xandros]

 index=13

 versions=any

@@ -9553,7 +10068,7 @@ packages=epm
 # ****************************************

 [linuxmint]

 index=22

-versions=13,14,15,16,17,17.1,17.2,17.3,18,18.1,18.2,18.3,19,19.1

+versions=13,14,15,16,17,17.1,17.2,17.3,18,18.1,18.2,18.3,19,19.1,19.2

 display_name=Linux Mint

 alt_names=mint, mint linux

 display=1

@@ -11131,6 +11646,162 @@ packages=automake1.11
 [linuxmint:19.1:epm]

 packages=epm

 

+# ****************************************

+

+[linuxmint:19.2]

+code_name=Tessa

+packaged_version=3.19.8

+release_date=19/12/18

+supported=1

+scan_supported=1

+fax_supported=1

+pcard_supported=1

+network_supported=1

+parallel_supported=1

+usb_supported=1

+notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information.  Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive.

+ppd_install=drv

+udev_mode_fix=1

+ppd_dir=/usr/share/ppd/HP

+fix_ppd_symlink=0

+drv_dir=/usr/share/cups/drv/HP

+ui_toolkit=qt4

+native_cups=1

+acl_rules=1

+#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy

+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy

+

+libdir_path=/usr/lib/x86_64-linux-gnu

+

+[linuxmint:19.2:cups]

+packages=libcups2

+

+[linuxmint:19.2:cups-devel]

+packages=libcups2-dev,cups-bsd,cups-client

+

+[linuxmint:19.2:gcc]

+packages=build-essential

+

+[linuxmint:19.2:gs]

+packages=ghostscript

+

+[linuxmint:19.2:libcrypto]

+packages=

+commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install openssl

+

+[linuxmint:19.2:libjpeg]

+packages=libjpeg8-dev

+

+[linuxmint:19.2:libnetsnmp-devel]

+packages=

+commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install libsnmp-dev,sudo apt-get --assume-yes install snmp-mibs-downloader

+

+[linuxmint:19.2:libpthread]

+packages=build-essential

+

+[linuxmint:19.2:libtool]

+packages=libtool,libtool-bin

+

+[linuxmint:19.2:libusb]

+packages=libusb-1.0.0-dev

+

+[linuxmint:19.2:make]

+packages=build-essential

+

+#[linuxmint:19.2:pil]

+#packages=python-imaging

+

+[linuxmint:19.2:ppdev]

+packages=

+commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules

+

+[linuxmint:19.2:pyqt]

+packages=python-qt4

+

+[linuxmint:19.2:python-devel]

+packages=python-dev

+

+[linuxmint:19.2:pyqt4]

+packages=python-qt4

+

+[linuxmint:19.2:pyqt4-dbus]

+packages=python-qt4-dbus

+

+#[linuxmint:19.2:python23]

+#packages=python

+

+[linuxmint:19.2:python2X]

+packages=python

+

+[linuxmint:19.2:reportlab]

+packages=python-reportlab

+

+[linuxmint:19.2:sane]

+packages=libsane

+

+[linuxmint:19.2:sane-devel]

+packages=libsane-dev

+

+[linuxmint:19.2:scanimage]

+packages=sane-utils

+

+[linuxmint:19.2:xsane]

+packages=xsane

+

+[linuxmint:19.2:python-dbus]

+packages=python-dbus,python-gobject

+

+[linuxmint:19.2:dbus]

+packages=libdbus-1-dev

+

+[linuxmint:19.2:cups-image]

+packages=libcupsimage2-dev

+

+[linuxmint:19.2:cups-ddk]

+packages=cups,libcupsimage2-dev

+

+[linuxmint:19.2:policykit]

+packages=policykit-1,policykit-1-gnome

+

+[linuxmint:19.2:python-notify]

+packages=python-notify

+

+[linuxmint:19.2:network]

+packages=wget

+

+[linuxmint:19.2:avahi-utils]

+packages=avahi-utils

+

+[linuxmint:19.2:python3-pyqt4-dbus]

+packages=python3-dbus.mainloop.qt

+

+[linuxmint:19.2:python3-pyqt4]

+packages=python3-pyqt4

+

+[linuxmint:19.2:python3-dbus]

+packages=python3-dbus,python3-gi

+

+[linuxmint:19.2:python3-xml]

+packages=python3-lxml

+

+[linuxmint:19.2:python3-devel]

+packages=python3-dev

+

+[linuxmint:19.2:python3-pil]

+packages=python3-pil

+

+[linuxmint:19.2:python3-reportlab]

+packages=python3-reportlab

+

+[linuxmint:19.2:python3-notify2]

+packages=python3-notify2,mate-notification-daemon

+

+[linuxmint:19.2:automake]

+packages=automake1.11

+

+[linuxmint:19.2:epm]

+packages=epm

+

 

 # ****************************************

 

@@ -11944,7 +12615,7 @@ packages=epm
 

 [manjarolinux]

 index=26

-versions=17.1.4,18.0

+versions=17.1.4,18.0,18.0.4

 display_name=Manjaro Linux

 alt_names=ManjaroLinux,manjaro

 display=1

@@ -12324,3 +12995,185 @@ packages=
 

 [manjarolinux:18.0:automake]

 packages=automake

+

+# ****************************************

+

+[manjarolinux:18.0.4]

+code_name=Illyria

+supported=1

+scan_supported=1

+fax_supported=1

+pcard_supported=1

+network_supported=1

+parallel_supported=1

+usb_supported=1

+packaged_version=3.19.1

+release_date=24/01/2019

+notes=Enable the universe/multiverse repositories. Also be sure you are using the Manjaro "Main" Repositories. See: https://wiki.manjaro.org/index.php/Arch_User_Repository for more information.  Disable the CD-ROM/DVD source if you do not have the Manjaro installation media inserted in the drive.

+ppd_install=drv

+udev_mode_fix=1

+ppd_dir=/usr/share/ppd/HP

+fix_ppd_symlink=0

+drv_dir=/usr/share/cups/drv/HP

+ui_toolkit=qt5

+native_cups=1

+acl_rules=1

+package_mgr_cmd=sudo pacman -S --noconfirm $packages_to_install

+#scanjet_depend_cmd=sudo pacman -Sy --noconfirm python2-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-*,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pip2 install pypdfocr,sudo pip2 install scikit-image,sudo pip2 install scipy

+#scanjet_py3_depend_cmd=sudo pacman -Sy --noconfirm python3-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-*,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy

+scanjet_depend_cmd=sudo pacman -Sy --noconfirm python2-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-eng,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pacman -Sy --noconfirm zbar,sudo pip2 install pypdfocr,sudo pip2 install scikit-image,sudo pip2 install scipy

+scanjet_py3_depend_cmd=sudo pacman -Sy --noconfirm llvm,sudo pacman -Sy --noconfirm llvm-libs,sudo pacman -Sy --noconfirm python-pip,sudo easy_install pip==18.0,sudo pip install Pillow,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-eng,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy

+

+libdir_path=/usr/lib

+[manjarolinux:18.0.4:cups]

+packages=libcups2

+

+[manjarolinux:18.0.4:libjpeg]

+packages=libjpeg-turbo

+

+[manjarolinux:18.0.4:cups-devel]

+packages=libcups2-dev,cups-bsd,cups-client

+

+[manjarolinux:18.0.4:gcc]

+packages=libusb-compat

+commands=/bin/bash -c "yes | sudo pacman -Sy gcc-multilib gcc-libs-multilib lib32-gcc-libs lib32-glibc",/bin/bash -c "yes | sudo pacman -S --needed gcc"

+

+[manjarolinux:18.0.4:gs]

+packages=libidn,ghostscript

+

+[manjarolinux:18.0.4:gtk-engine-murrine]

+packages=gtk-engine-murrine

+

+[manjarolinux:18.0.4:libcrypto]

+packages=openssl,libssl-dev

+

+[manjarolinux:18.0.4:libnetsnmp-devel]

+packages=libsnmp-dev,snmp-mibs-downloader

+

+[manjarolinux:18.0.4:libpthread]

+packages=libpthread-stubs

+

+[manjarolinux:18.0.4:libtool]

+packages=libtool,libtool-bin

+

+[manjarolinux:18.0.4:libusb]

+packages=libusb-1.0.0-dev

+

+[manjarolinux:18.0.4:make]

+packages=make

+

+[manjarolinux:18.0.4:pil]

+packages=python2-imaging

+

+[manjarolinux:18.0.4:ppdev]

+packages=

+commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules

+

+[manjarolinux:18.0.4:pyqt]

+packages=pyqt

+

+[manjarolinux:18.0.4:python2-devel]

+packages=

+commands=sudo pacman -S --noconfirm pygtk

+

+[manjarolinux:18.0.4:pyqt4]

+packages=python2-pyqt,pygtk

+

+[manjarolinux:18.0.4:pyqt4-dbus]

+packages=dbus-python

+

+[manjarolinux:18.0.4:pyqt5]

+packages=python2-pyqt5

+

+[manjarolinux:18.0.4:pyqt5-dbus]

+packages=

+

+[manjarolinux:18.0.4:python23]

+packages=python2

+

+[manjarolinux:18.0.4:python2X]

+packages=python2

+

+[manjarolinux:18.0.4:reportlab]

+packages=python2-reportlab

+

+[manjarolinux:18.0.4:sane]

+packages=sane

+

+[manjarolinux:18.0.4:sane-devel]

+packages=

+

+[manjarolinux:18.0.4:scanimage]

+packages=

+

+[manjarolinux:18.0.4:xsane]

+packages=xsane

+

+[manjarolinux:18.0.4:python-dbus]

+packages=dbus-python,python2-dbus

+

+[manjarolinux:18.0.4:dbus]

+packages=libdbus-1-dev

+

+[manjarolinux:18.0.4:cups-image]

+packages=libcupsimage2-dev

+

+[manjarolinux:18.0.4:cups-ddk]

+packages=cups

+

+[manjarolinux:18.0.4:policykit]

+packages=policykit-1,policykit-1-gnome

+

+[manjarolinux:18.0.4:python2-notify]

+packages=

+commands=sudo pacman -S --noconfirm python2-notify

+

+[manjarolinux:18.0.4:python-notify]

+packages=python2-notify

+

+[manjarolinux:18.0.4:network]

+packages=wget

+

+[manjarolinux:18.0.4:avahi-utils]

+packages=avahi-utils

+

+[manjarolinux:18.0.4:python3-pyqt4-dbus]

+packages=

+

+[manjarolinux:18.0.4:python3-pyqt4]

+packages=python-pyqt4,pygtk

+

+[manjarolinux:18.0.4:python3-pyqt5-dbus]

+packages=python-dbus.mainloop.pyqt5

+

+[manjarolinux:18.0.4:python3-pyqt5]

+packages=python-pyqt5

+

+[manjarolinux:18.0.4:python3-dbus]

+packages=python-dbus,python-gi

+

+[manjarolinux:18.0.4:python3-xml]

+packages=python-lxml

+

+[manjarolinux:18.0.4:python3-devel]

+packages=

+

+[manjarolinux:18.0.4:python3-pil]

+packages=python2-pillow

+

+[manjarolinux:18.0.4:python3-reportlab]

+packages=python-reportlab

+

+[manjarolinux:18.0.4:python3-notify2]

+packages=python2-notify

+

+[manjarolinux:18.0.4:autoconf]

+packages=autoconf

+

+[manjarolinux:18.0.4:epm]

+packages=

+

+[manjarolinux:18.0.4:automake]

+packages=automake

+

+

diff --git a/ppd/classppd/hpcups/hp-Ampere.ppd.gz b/ppd/classppd/hpcups/hp-Ampere.ppd.gz
index 1868737c9..ec4627990 100644
--- a/ppd/classppd/hpcups/hp-Ampere.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Ampere.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-CLE.ppd.gz b/ppd/classppd/hpcups/hp-CLE.ppd.gz
index 5575c20a4..70f568c1f 100644
--- a/ppd/classppd/hpcups/hp-CLE.ppd.gz
+++ b/ppd/classppd/hpcups/hp-CLE.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-CLE17.ppd.gz b/ppd/classppd/hpcups/hp-CLE17.ppd.gz
index 0d04cf808..5d4983c15 100644
--- a/ppd/classppd/hpcups/hp-CLE17.ppd.gz
+++ b/ppd/classppd/hpcups/hp-CLE17.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Copperhead.ppd.gz b/ppd/classppd/hpcups/hp-Copperhead.ppd.gz
index ca9502add..e46443578 100644
--- a/ppd/classppd/hpcups/hp-Copperhead.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Copperhead.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz b/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz
index 18aaf12fa..8bde85cc6 100644
--- a/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz
index 94f605c4f..8ffc813c5 100644
--- a/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz
+++ b/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz
index 6db8ffee4..de2cc9f23 100644
--- a/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz
+++ b/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz
index a7bdf9577..0c4cd622e 100644
--- a/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz
+++ b/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz
index 6cd6095b3..b70b1e1c9 100644
--- a/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz
+++ b/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Corbett.ppd.gz b/ppd/classppd/hpcups/hp-Corbett.ppd.gz
index 295233152..67e902834 100644
--- a/ppd/classppd/hpcups/hp-Corbett.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Corbett.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz b/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz
index a02552365..6e4eeebd1 100644
--- a/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz
+++ b/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz b/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz
index 7da335dda..6caff2b79 100644
--- a/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz
+++ b/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz b/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz
index fc0fb66bd..cb39324c0 100644
--- a/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz
+++ b/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Gemstone.ppd.gz b/ppd/classppd/hpcups/hp-Gemstone.ppd.gz
index 6ff9be70a..eda891a82 100644
--- a/ppd/classppd/hpcups/hp-Gemstone.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Gemstone.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Kapan.ppd.gz b/ppd/classppd/hpcups/hp-Kapan.ppd.gz
index fbe686d44..2743f9aad 100644
--- a/ppd/classppd/hpcups/hp-Kapan.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Kapan.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz
index 19889be46..119c88eac 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz
+++ b/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz
index ab18fdb8d..dfda9b837 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz
+++ b/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz
index 0f4457da4..fac1a9387 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz
+++ b/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz
index 311a2806a..900fac675 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz
+++ b/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz
index 6a17f7d6e..e2c83c49d 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz
+++ b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz
index bed4362e1..a6321d85c 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz
+++ b/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz
index 346f08c09..bbeaa79b4 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz
+++ b/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Mimas.ppd.gz b/ppd/classppd/hpcups/hp-Mimas.ppd.gz
index 00e4a27e4..e5dd44585 100644
--- a/ppd/classppd/hpcups/hp-Mimas.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Mimas.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Mimas15.ppd.gz b/ppd/classppd/hpcups/hp-Mimas15.ppd.gz
index a62dacdb2..356949740 100644
--- a/ppd/classppd/hpcups/hp-Mimas15.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Mimas15.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Mimas17.ppd.gz b/ppd/classppd/hpcups/hp-Mimas17.ppd.gz
index 12faa2589..0e0fc91ab 100644
--- a/ppd/classppd/hpcups/hp-Mimas17.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Mimas17.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz b/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz
index 8889a04fd..1ca5a7b1b 100644
--- a/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz
+++ b/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-OJ7000.ppd.gz b/ppd/classppd/hpcups/hp-OJ7000.ppd.gz
index 8ea2d3f42..991f62523 100644
--- a/ppd/classppd/hpcups/hp-OJ7000.ppd.gz
+++ b/ppd/classppd/hpcups/hp-OJ7000.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz b/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz
index 46fb9a831..193cc8358 100644
--- a/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz
+++ b/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz b/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz
index 78d1293c0..3d87d6962 100644
--- a/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz
+++ b/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz
index 59cdb120e..004227c0a 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz
index aa29b152e..c2c9db4ab 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz
index caaa8f916..34e1750f4 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz
index 157b08c0d..30265a93b 100644
--- a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz b/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz
index dfddb5b5e..bcdc6569d 100644
--- a/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz b/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz
index 958bb3890..53daf799c 100644
--- a/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PSP100.ppd.gz b/ppd/classppd/hpcups/hp-PSP100.ppd.gz
index 323f4e723..f0f7586ab 100644
--- a/ppd/classppd/hpcups/hp-PSP100.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PSP100.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PSP470.ppd.gz b/ppd/classppd/hpcups/hp-PSP470.ppd.gz
index 432260c74..b86df9535 100644
--- a/ppd/classppd/hpcups/hp-PSP470.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PSP470.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Pyramid.ppd.gz b/ppd/classppd/hpcups/hp-Pyramid.ppd.gz
index 3f4fa0a64..292ca2cb3 100644
--- a/ppd/classppd/hpcups/hp-Pyramid.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Pyramid.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz b/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz
index cf1800e21..5883a330a 100644
--- a/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz b/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz
index c754b2137..6c407d027 100644
--- a/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz b/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz
index 88e58d565..4308ce5ac 100644
--- a/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz b/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz
index 7acd3194c..ed69ed162 100644
--- a/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz
+++ b/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Python.ppd.gz b/ppd/classppd/hpcups/hp-Python.ppd.gz
index 3ce568283..141356661 100644
--- a/ppd/classppd/hpcups/hp-Python.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Python.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Python10.ppd.gz b/ppd/classppd/hpcups/hp-Python10.ppd.gz
index f34024c8a..0fe34fd35 100644
--- a/ppd/classppd/hpcups/hp-Python10.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Python10.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Python11.ppd.gz b/ppd/classppd/hpcups/hp-Python11.ppd.gz
index f598cb54a..2218988da 100644
--- a/ppd/classppd/hpcups/hp-Python11.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Python11.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz b/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz
index 71c4dc43a..f35c3e437 100644
--- a/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz
+++ b/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz b/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz
index 5a4b08170..dcad06c85 100644
--- a/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz
+++ b/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Saipan.ppd.gz b/ppd/classppd/hpcups/hp-Saipan.ppd.gz
index 780d93b8b..3020346f1 100644
--- a/ppd/classppd/hpcups/hp-Saipan.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Saipan.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz b/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz
index 43900a811..169480449 100644
--- a/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-Stabler.ppd.gz b/ppd/classppd/hpcups/hp-Stabler.ppd.gz
index 00828a7ca..e0be089a7 100644
--- a/ppd/classppd/hpcups/hp-Stabler.ppd.gz
+++ b/ppd/classppd/hpcups/hp-Stabler.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz b/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz
index 00187a8f1..fa1eb0ab3 100644
--- a/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz
+++ b/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz b/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz
index 69fb6f469..903e036e9 100644
--- a/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz
+++ b/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz
diff --git a/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz b/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz
index 36a5355d4..7b7b8608d 100644
--- a/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz
+++ b/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz
diff --git a/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz b/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz
index 3ef7de54c..66b0af058 100644
--- a/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz
+++ b/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz
diff --git a/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz b/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz
index 0b2f19a43..c1eafc391 100644
--- a/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz
+++ b/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz
diff --git a/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz b/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz
index c278e4176..50d6c4bb7 100644
--- a/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz
+++ b/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz
diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz
index d66d380f1..e5bc4e59a 100644
--- a/ppd/hpcups/apollo-2100.ppd.gz
+++ b/ppd/hpcups/apollo-2100.ppd.gz
diff --git a/ppd/hpcups/apollo-2150.ppd.gz b/ppd/hpcups/apollo-2150.ppd.gz
index 96a8bd611..58af17d8d 100644
--- a/ppd/hpcups/apollo-2150.ppd.gz
+++ b/ppd/hpcups/apollo-2150.ppd.gz
diff --git a/ppd/hpcups/apollo-2200.ppd.gz b/ppd/hpcups/apollo-2200.ppd.gz
index 17b07d901..5b1cc6318 100644
--- a/ppd/hpcups/apollo-2200.ppd.gz
+++ b/ppd/hpcups/apollo-2200.ppd.gz
diff --git a/ppd/hpcups/apollo-2500.ppd.gz b/ppd/hpcups/apollo-2500.ppd.gz
index 4bd0f7ca3..867921809 100644
--- a/ppd/hpcups/apollo-2500.ppd.gz
+++ b/ppd/hpcups/apollo-2500.ppd.gz
diff --git a/ppd/hpcups/apollo-2600.ppd.gz b/ppd/hpcups/apollo-2600.ppd.gz
index 6bf6b31b7..a540c0c76 100644
--- a/ppd/hpcups/apollo-2600.ppd.gz
+++ b/ppd/hpcups/apollo-2600.ppd.gz
diff --git a/ppd/hpcups/apollo-2650.ppd.gz b/ppd/hpcups/apollo-2650.ppd.gz
index 7becef6e1..2ac17ebb1 100644
--- a/ppd/hpcups/apollo-2650.ppd.gz
+++ b/ppd/hpcups/apollo-2650.ppd.gz
diff --git a/ppd/hpcups/apollo-p2000-u.ppd.gz b/ppd/hpcups/apollo-p2000-u.ppd.gz
index 66216e915..aa30e4fc8 100644
--- a/ppd/hpcups/apollo-p2000-u.ppd.gz
+++ b/ppd/hpcups/apollo-p2000-u.ppd.gz
diff --git a/ppd/hpcups/apollo-p2250.ppd.gz b/ppd/hpcups/apollo-p2250.ppd.gz
index 41b3e041c..57f53e261 100644
--- a/ppd/hpcups/apollo-p2250.ppd.gz
+++ b/ppd/hpcups/apollo-p2250.ppd.gz
diff --git a/ppd/hpcups/hp-2000c.ppd.gz b/ppd/hpcups/hp-2000c.ppd.gz
index e6ff5ff7d..d2723b7da 100644
--- a/ppd/hpcups/hp-2000c.ppd.gz
+++ b/ppd/hpcups/hp-2000c.ppd.gz
diff --git a/ppd/hpcups/hp-2500c.ppd.gz b/ppd/hpcups/hp-2500c.ppd.gz
index 01b14dc95..735ad872b 100644
--- a/ppd/hpcups/hp-2500c.ppd.gz
+++ b/ppd/hpcups/hp-2500c.ppd.gz
diff --git a/ppd/hpcups/hp-910.ppd.gz b/ppd/hpcups/hp-910.ppd.gz
index 17a9de28f..bbc69f374 100644
--- a/ppd/hpcups/hp-910.ppd.gz
+++ b/ppd/hpcups/hp-910.ppd.gz
diff --git a/ppd/hpcups/hp-915.ppd.gz b/ppd/hpcups/hp-915.ppd.gz
index abe9bb8c3..86744ab79 100644
--- a/ppd/hpcups/hp-915.ppd.gz
+++ b/ppd/hpcups/hp-915.ppd.gz
diff --git a/ppd/hpcups/hp-amp.ppd.gz b/ppd/hpcups/hp-amp.ppd.gz
index 1126ae1bd..dbee27171 100644
--- a/ppd/hpcups/hp-amp.ppd.gz
+++ b/ppd/hpcups/hp-amp.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_1000.ppd.gz b/ppd/hpcups/hp-business_inkjet_1000.ppd.gz
index 3f9fa1aab..85d469779 100644
--- a/ppd/hpcups/hp-business_inkjet_1000.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_1000.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_1100.ppd.gz b/ppd/hpcups/hp-business_inkjet_1100.ppd.gz
index 051d7e23a..5024907ee 100644
--- a/ppd/hpcups/hp-business_inkjet_1100.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_1100.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_1200.ppd.gz b/ppd/hpcups/hp-business_inkjet_1200.ppd.gz
index 5beb95353..cbbf43721 100644
--- a/ppd/hpcups/hp-business_inkjet_1200.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_1200.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_2200.ppd.gz b/ppd/hpcups/hp-business_inkjet_2200.ppd.gz
index a4dc9adb6..67fb3dbe8 100644
--- a/ppd/hpcups/hp-business_inkjet_2200.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_2200.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_2230.ppd.gz b/ppd/hpcups/hp-business_inkjet_2230.ppd.gz
index 59a9f0579..02ad16a30 100644
--- a/ppd/hpcups/hp-business_inkjet_2230.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_2230.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz
index d25af5c0e..300cd5063 100644
--- a/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz
index 2426c41b0..791c6c635 100644
--- a/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz
index 1b8f33232..8f1c23a8a 100644
--- a/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz
index 8ba02dc90..bd68f8767 100644
--- a/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz
index 4e038daca..cbd0eb327 100644
--- a/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz
index 00cd5c9fd..ea933d787 100644
--- a/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz
index f7e0c46f8..a5245f3d8 100644
--- a/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz
+++ b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_1600.ppd.gz b/ppd/hpcups/hp-color_laserjet_1600.ppd.gz
index 12b21ff66..67f0dd76f 100644
--- a/ppd/hpcups/hp-color_laserjet_1600.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_1600.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz
index c65765be5..92bd916ef 100644
--- a/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz b/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz
index 6afdbdbff..8e9dd4aa8 100644
--- a/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz
index 737a55829..1c184f819 100644
--- a/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3500.ppd.gz b/ppd/hpcups/hp-color_laserjet_3500.ppd.gz
index 97d15e2af..7115ff4f2 100644
--- a/ppd/hpcups/hp-color_laserjet_3500.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3500.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz
index 719db0e42..52e115346 100644
--- a/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3550.ppd.gz b/ppd/hpcups/hp-color_laserjet_3550.ppd.gz
index 363b915f2..7ad3baafe 100644
--- a/ppd/hpcups/hp-color_laserjet_3550.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3550.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz
index 3a151691b..96022b859 100644
--- a/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3600.ppd.gz b/ppd/hpcups/hp-color_laserjet_3600.ppd.gz
index 1ca968087..e7e254400 100644
--- a/ppd/hpcups/hp-color_laserjet_3600.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3600.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz
index 011f4022f..4f98c2bfd 100644
--- a/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz
index 2b5c2f733..ce9a7aa2d 100644
--- a/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz
index dee5a1468..592e6b18a 100644
--- a/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz
index b4cee5e04..f916aee20 100644
--- a/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz
index 153ad6b8c..fdbe12fed 100644
--- a/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz
index 891d63a21..cf26d1783 100644
--- a/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz
index d143af7c7..a67819797 100644
--- a/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz
index bd61b2c3e..ac7568126 100644
--- a/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz
index a086be3ef..98e3fb652 100644
--- a/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz
index a42fab1c1..f6c9884c5 100644
--- a/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_5.ppd.gz b/ppd/hpcups/hp-color_laserjet_5.ppd.gz
index a45bb98a0..3bee9be19 100644
--- a/ppd/hpcups/hp-color_laserjet_5.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_5.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz
index f217b645e..d5728d287 100644
--- a/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz
index e82a4ee94..70a87711a 100644
--- a/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz
index a446b836a..09bf79abf 100644
--- a/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz
index bad9716c8..14059e6c4 100644
--- a/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz
index b1abb70cb..32afef1af 100644
--- a/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz
index 32997ec24..8038bae35 100644
--- a/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
index be3fc5cb2..bca09f3dc 100644
--- a/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz
index a03c2980c..2e1a34785 100644
--- a/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz
index dce4ae07b..bd4bb6580 100644
--- a/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz
index cd54611d4..7e49fc1b9 100644
--- a/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz
index 3f46c3375..057686be8 100644
--- a/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz
index c6259711a..6802c75c0 100644
--- a/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz
index 36e648299..0ace433ca 100644
--- a/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz
index 3ff72a6fb..9a3234e8a 100644
--- a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz
index 3a9c06592..d669b5cdd 100644
--- a/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz
index d3a72fed1..b1e8ddddd 100644
--- a/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz
index cf456ea80..18c07db07 100644
--- a/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz
index 3aa9c48ed..d74ff5b5d 100644
--- a/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz
index 1f0e80565..867fc49fd 100644
--- a/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz
index 89273d1a6..106cb86ce 100644
--- a/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz
index 3f50f1e79..de8f76d35 100644
--- a/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz
index 264591191..6c2868737 100644
--- a/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz
index 3396a3c81..716005a07 100644
--- a/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz
index c65c7f155..bc7753299 100644
--- a/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz
index b4e19ec65..defe46c17 100644
--- a/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz
index 120b28111..605df3df7 100644
--- a/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz
index d050159c4..76edd6170 100644
--- a/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz
index bb7fc8b8c..c9c3affe7 100644
--- a/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz
index f2f85fb62..4d655d671 100644
--- a/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz
index 0967faa62..15795d1c4 100644
--- a/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz
index 086b856b5..af46a83f2 100644
--- a/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz
index 79fdec023..407372bcd 100644
--- a/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz
index ad4aa2ce1..769261164 100644
--- a/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz
index b7015cb05..2aeab5646 100644
--- a/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz
index 5ab56f1f5..ca0c3282a 100644
--- a/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz
index c9c1d66e6..3426b0717 100644
--- a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz
index eeb81129b..66c0016e1 100644
--- a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz
index 35e06c43b..c54861c32 100644
--- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz
diff --git a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
index cd2aa8a06..8dca05278 100644
--- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
+++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
diff --git a/ppd/hpcups/hp-cp1160.ppd.gz b/ppd/hpcups/hp-cp1160.ppd.gz
index 8144516ac..75482b4ac 100644
--- a/ppd/hpcups/hp-cp1160.ppd.gz
+++ b/ppd/hpcups/hp-cp1160.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz
index 1ff7993f0..09a23f0ed 100644
--- a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1010_series.ppd.gz b/ppd/hpcups/hp-deskjet_1010_series.ppd.gz
index a63a227d6..e26c94aa2 100644
--- a/ppd/hpcups/hp-deskjet_1010_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1010_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz
index 1b0a50127..2c12ce8ff 100644
--- a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1100.ppd.gz b/ppd/hpcups/hp-deskjet_1100.ppd.gz
index 909a8bf5e..62fc1bbe0 100644
--- a/ppd/hpcups/hp-deskjet_1100.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1100.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1110_series.ppd.gz b/ppd/hpcups/hp-deskjet_1110_series.ppd.gz
index f4142eebf..d9d4c2b41 100644
--- a/ppd/hpcups/hp-deskjet_1110_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1110_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1120.ppd.gz b/ppd/hpcups/hp-deskjet_1120.ppd.gz
index d43b0f6c1..fa709ac06 100644
--- a/ppd/hpcups/hp-deskjet_1120.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1120.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1125.ppd.gz b/ppd/hpcups/hp-deskjet_1125.ppd.gz
index 0cdac14ef..4854d91e6 100644
--- a/ppd/hpcups/hp-deskjet_1125.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1125.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1200c.ppd.gz b/ppd/hpcups/hp-deskjet_1200c.ppd.gz
index 218053b2e..13793da71 100644
--- a/ppd/hpcups/hp-deskjet_1200c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1200c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1220c.ppd.gz b/ppd/hpcups/hp-deskjet_1220c.ppd.gz
index cdd4b4a72..cd68fb14d 100644
--- a/ppd/hpcups/hp-deskjet_1220c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1220c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1280.ppd.gz b/ppd/hpcups/hp-deskjet_1280.ppd.gz
index 80ee70d5a..9f1c49c0d 100644
--- a/ppd/hpcups/hp-deskjet_1280.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1280.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz
index 02ec778b1..3fb253bd9 100644
--- a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1600c.ppd.gz b/ppd/hpcups/hp-deskjet_1600c.ppd.gz
index 2fcb4c6d2..c9e7ad8fb 100644
--- a/ppd/hpcups/hp-deskjet_1600c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1600c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1600cm.ppd.gz b/ppd/hpcups/hp-deskjet_1600cm.ppd.gz
index c94ae10d7..c97942e36 100644
--- a/ppd/hpcups/hp-deskjet_1600cm.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1600cm.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz
index ba4613c51..74e686139 100644
--- a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz
index 87b506866..7656b1419 100644
--- a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2020_series.ppd.gz b/ppd/hpcups/hp-deskjet_2020_series.ppd.gz
index 28a981f79..a8afbbcea 100644
--- a/ppd/hpcups/hp-deskjet_2020_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2020_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz
index 2a193c407..aa2f44722 100644
--- a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2130_series.ppd.gz b/ppd/hpcups/hp-deskjet_2130_series.ppd.gz
index 1c18c45fd..cd3988656 100644
--- a/ppd/hpcups/hp-deskjet_2130_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2130_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2200_series.ppd.gz b/ppd/hpcups/hp-deskjet_2200_series.ppd.gz
index b24bd152f..3f991f248 100644
--- a/ppd/hpcups/hp-deskjet_2200_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2200_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz
index 39d2a87f1..e58c46b52 100644
--- a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz
index 88b5d13bc..34d931cb0 100644
--- a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz
index 2e50031fc..b10a80674 100644
--- a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2600_series.ppd.gz b/ppd/hpcups/hp-deskjet_2600_series.ppd.gz
index 10f52c132..96d5ad620 100644
--- a/ppd/hpcups/hp-deskjet_2600_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2600_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz
index 28d56891d..9578d03cd 100644
--- a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz
index 7bf862298..065d3c2fd 100644
--- a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz
index e181e8728..cb457de52 100644
--- a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz
index 0ece68011..2fbc5c425 100644
--- a/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz
index c0862a05c..6d92af550 100644
--- a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3320.ppd.gz b/ppd/hpcups/hp-deskjet_3320.ppd.gz
index 0e83d10fd..99ca332dc 100644
--- a/ppd/hpcups/hp-deskjet_3320.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3320.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3325.ppd.gz b/ppd/hpcups/hp-deskjet_3325.ppd.gz
index 14caa0d4a..d1aac01ac 100644
--- a/ppd/hpcups/hp-deskjet_3325.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3325.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3420.ppd.gz b/ppd/hpcups/hp-deskjet_3420.ppd.gz
index 8913791cf..774fcdd71 100644
--- a/ppd/hpcups/hp-deskjet_3420.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3420.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3425.ppd.gz b/ppd/hpcups/hp-deskjet_3425.ppd.gz
index 9781ab9e4..5f799e834 100644
--- a/ppd/hpcups/hp-deskjet_3425.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3425.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3450.ppd.gz b/ppd/hpcups/hp-deskjet_3450.ppd.gz
index 64f68c081..29cc7a38a 100644
--- a/ppd/hpcups/hp-deskjet_3450.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3450.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3500.ppd.gz b/ppd/hpcups/hp-deskjet_3500.ppd.gz
index 912e46a42..d8e363598 100644
--- a/ppd/hpcups/hp-deskjet_3500.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3500.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz
index 69ec407eb..39f6a4f7e 100644
--- a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz
index 2d9f82771..befad5568 100644
--- a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz
index 3c7de9e32..4cfe4daea 100644
--- a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3550.ppd.gz b/ppd/hpcups/hp-deskjet_3550.ppd.gz
index acb71ffb2..110e2860e 100644
--- a/ppd/hpcups/hp-deskjet_3550.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3550.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3600.ppd.gz b/ppd/hpcups/hp-deskjet_3600.ppd.gz
index 8004887c4..a42b3b5cd 100644
--- a/ppd/hpcups/hp-deskjet_3600.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3600.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3630_series.ppd.gz b/ppd/hpcups/hp-deskjet_3630_series.ppd.gz
index 6a7bb6532..2356d1a84 100644
--- a/ppd/hpcups/hp-deskjet_3630_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3630_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3650.ppd.gz b/ppd/hpcups/hp-deskjet_3650.ppd.gz
index 9a15e24b3..ac1d0e6b8 100644
--- a/ppd/hpcups/hp-deskjet_3650.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3650.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3700_series.ppd.gz b/ppd/hpcups/hp-deskjet_3700_series.ppd.gz
index 7a9a72b29..eec787195 100644
--- a/ppd/hpcups/hp-deskjet_3700_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3700_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3740.ppd.gz b/ppd/hpcups/hp-deskjet_3740.ppd.gz
index dda69bd32..f7f53ea23 100644
--- a/ppd/hpcups/hp-deskjet_3740.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3740.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3810.ppd.gz b/ppd/hpcups/hp-deskjet_3810.ppd.gz
index c7b89f78e..61623be92 100644
--- a/ppd/hpcups/hp-deskjet_3810.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3810.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3816.ppd.gz b/ppd/hpcups/hp-deskjet_3816.ppd.gz
index 712ebbc64..3d9cbb3ff 100644
--- a/ppd/hpcups/hp-deskjet_3816.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3816.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3819.ppd.gz b/ppd/hpcups/hp-deskjet_3819.ppd.gz
index 7e690160d..850bb92ae 100644
--- a/ppd/hpcups/hp-deskjet_3819.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3819.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3820.ppd.gz b/ppd/hpcups/hp-deskjet_3820.ppd.gz
index d854cb9e2..2c6678722 100644
--- a/ppd/hpcups/hp-deskjet_3820.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3820.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3822.ppd.gz b/ppd/hpcups/hp-deskjet_3822.ppd.gz
index badf667e8..41316fc28 100644
--- a/ppd/hpcups/hp-deskjet_3822.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3822.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3830_series.ppd.gz b/ppd/hpcups/hp-deskjet_3830_series.ppd.gz
index 68dfcc618..9f3ef0333 100644
--- a/ppd/hpcups/hp-deskjet_3830_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3830_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3840.ppd.gz b/ppd/hpcups/hp-deskjet_3840.ppd.gz
index 396f979d7..c6ab13ecd 100644
--- a/ppd/hpcups/hp-deskjet_3840.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3840.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3870.ppd.gz b/ppd/hpcups/hp-deskjet_3870.ppd.gz
index 2e06eb786..2d88aca63 100644
--- a/ppd/hpcups/hp-deskjet_3870.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3870.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3900.ppd.gz b/ppd/hpcups/hp-deskjet_3900.ppd.gz
index 0329b9b35..4497906fc 100644
--- a/ppd/hpcups/hp-deskjet_3900.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3900.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3910.ppd.gz b/ppd/hpcups/hp-deskjet_3910.ppd.gz
index 2517774c9..f24b8e6dd 100644
--- a/ppd/hpcups/hp-deskjet_3910.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3910.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3920.ppd.gz b/ppd/hpcups/hp-deskjet_3920.ppd.gz
index d8654aa90..685e78e8c 100644
--- a/ppd/hpcups/hp-deskjet_3920.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3920.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_3940.ppd.gz b/ppd/hpcups/hp-deskjet_3940.ppd.gz
index 5f61dc22e..c032c9343 100644
--- a/ppd/hpcups/hp-deskjet_3940.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_3940.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_400.ppd.gz b/ppd/hpcups/hp-deskjet_400.ppd.gz
index 01b68e7c8..c666c8081 100644
--- a/ppd/hpcups/hp-deskjet_400.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_400.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_400l.ppd.gz b/ppd/hpcups/hp-deskjet_400l.ppd.gz
index 901cdad6e..09a79411f 100644
--- a/ppd/hpcups/hp-deskjet_400l.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_400l.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz
index 9064e5b20..a927b6f4a 100644
--- a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_4530_series.ppd.gz b/ppd/hpcups/hp-deskjet_4530_series.ppd.gz
index 3254dfd7b..9878156b8 100644
--- a/ppd/hpcups/hp-deskjet_4530_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_4530_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_460.ppd.gz b/ppd/hpcups/hp-deskjet_460.ppd.gz
index 1472cca9f..a56c407dc 100644
--- a/ppd/hpcups/hp-deskjet_460.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_460.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz
index 3fd1e989f..ebd82cd98 100644
--- a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz
index ce20c0f19..6491cb738 100644
--- a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_4640_series.ppd.gz b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz
index ff391dc96..fe2dbf757 100644
--- a/ppd/hpcups/hp-deskjet_4640_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_4670_series.ppd.gz b/ppd/hpcups/hp-deskjet_4670_series.ppd.gz
index 3570a05bf..ec51af0ad 100644
--- a/ppd/hpcups/hp-deskjet_4670_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_4670_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_4720_series.ppd.gz b/ppd/hpcups/hp-deskjet_4720_series.ppd.gz
index 00b47a03d..46134ea1c 100644
--- a/ppd/hpcups/hp-deskjet_4720_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_4720_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_500.ppd.gz b/ppd/hpcups/hp-deskjet_500.ppd.gz
index f703a6cd5..a398811a9 100644
--- a/ppd/hpcups/hp-deskjet_500.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_500.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5000_series.ppd.gz b/ppd/hpcups/hp-deskjet_5000_series.ppd.gz
index c1f4571e5..b68d0b345 100644
--- a/ppd/hpcups/hp-deskjet_5000_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5000_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_500c.ppd.gz b/ppd/hpcups/hp-deskjet_500c.ppd.gz
index 4d9952bb9..75713064a 100644
--- a/ppd/hpcups/hp-deskjet_500c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_500c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_505j.ppd.gz b/ppd/hpcups/hp-deskjet_505j.ppd.gz
index 64c2fede4..a2ef95022 100644
--- a/ppd/hpcups/hp-deskjet_505j.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_505j.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_510.ppd.gz b/ppd/hpcups/hp-deskjet_510.ppd.gz
index 6f6da4b57..531e07824 100644
--- a/ppd/hpcups/hp-deskjet_510.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_510.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5100.ppd.gz b/ppd/hpcups/hp-deskjet_5100.ppd.gz
index 5b213ce11..1bf955dfd 100644
--- a/ppd/hpcups/hp-deskjet_5100.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5100.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_520.ppd.gz b/ppd/hpcups/hp-deskjet_520.ppd.gz
index f720e4168..b3088978c 100644
--- a/ppd/hpcups/hp-deskjet_520.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_520.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5200_series.ppd.gz b/ppd/hpcups/hp-deskjet_5200_series.ppd.gz
index ebe0054b2..c560ab7f4 100644
--- a/ppd/hpcups/hp-deskjet_5200_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5200_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_540.ppd.gz b/ppd/hpcups/hp-deskjet_540.ppd.gz
index 3f90079bf..d0a59024b 100644
--- a/ppd/hpcups/hp-deskjet_540.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_540.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5400_series.ppd.gz b/ppd/hpcups/hp-deskjet_5400_series.ppd.gz
index 21704fff5..7f6198e88 100644
--- a/ppd/hpcups/hp-deskjet_5400_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5400_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_550c.ppd.gz b/ppd/hpcups/hp-deskjet_550c.ppd.gz
index 8f6d69a58..6f9da9cd4 100644
--- a/ppd/hpcups/hp-deskjet_550c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_550c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz
index 0c1b791e9..05c8f1733 100644
--- a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5550.ppd.gz b/ppd/hpcups/hp-deskjet_5550.ppd.gz
index befe13fe5..ff6bdee16 100644
--- a/ppd/hpcups/hp-deskjet_5550.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5550.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5551.ppd.gz b/ppd/hpcups/hp-deskjet_5551.ppd.gz
index 43cdca114..2bb44675d 100644
--- a/ppd/hpcups/hp-deskjet_5551.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5551.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5552.ppd.gz b/ppd/hpcups/hp-deskjet_5552.ppd.gz
index da281b83e..12dbfd9fa 100644
--- a/ppd/hpcups/hp-deskjet_5552.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5552.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5570_series.ppd.gz b/ppd/hpcups/hp-deskjet_5570_series.ppd.gz
index 4fed1711c..43df1a504 100644
--- a/ppd/hpcups/hp-deskjet_5570_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5570_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5600.ppd.gz b/ppd/hpcups/hp-deskjet_5600.ppd.gz
index c9598f2b8..d4251b16a 100644
--- a/ppd/hpcups/hp-deskjet_5600.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5600.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5640_series.ppd.gz b/ppd/hpcups/hp-deskjet_5640_series.ppd.gz
index 68713c289..6667676ce 100644
--- a/ppd/hpcups/hp-deskjet_5640_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5640_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5650.ppd.gz b/ppd/hpcups/hp-deskjet_5650.ppd.gz
index 3091ddd17..23f46007d 100644
--- a/ppd/hpcups/hp-deskjet_5650.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5650.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5652.ppd.gz b/ppd/hpcups/hp-deskjet_5652.ppd.gz
index ed07ff581..14ab28240 100644
--- a/ppd/hpcups/hp-deskjet_5652.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5652.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5700.ppd.gz b/ppd/hpcups/hp-deskjet_5700.ppd.gz
index c7ef84ec6..02d5debd9 100644
--- a/ppd/hpcups/hp-deskjet_5700.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5700.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5730_series.ppd.gz b/ppd/hpcups/hp-deskjet_5730_series.ppd.gz
index 8b4154404..f6ef5cf5f 100644
--- a/ppd/hpcups/hp-deskjet_5730_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5730_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5800.ppd.gz b/ppd/hpcups/hp-deskjet_5800.ppd.gz
index 0a2fe0e7f..4ba9020db 100644
--- a/ppd/hpcups/hp-deskjet_5800.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5800.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5810_series.ppd.gz b/ppd/hpcups/hp-deskjet_5810_series.ppd.gz
index 262d02291..c927c3387 100644
--- a/ppd/hpcups/hp-deskjet_5810_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5810_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5820_series.ppd.gz b/ppd/hpcups/hp-deskjet_5820_series.ppd.gz
index 87a33be08..a315d21fd 100644
--- a/ppd/hpcups/hp-deskjet_5820_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5820_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5850.ppd.gz b/ppd/hpcups/hp-deskjet_5850.ppd.gz
index 23a88ce96..1ae3bf56d 100644
--- a/ppd/hpcups/hp-deskjet_5850.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5850.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_5900_series.ppd.gz b/ppd/hpcups/hp-deskjet_5900_series.ppd.gz
index 1ab45a405..4c2c4738d 100644
--- a/ppd/hpcups/hp-deskjet_5900_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_5900_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_600.ppd.gz b/ppd/hpcups/hp-deskjet_600.ppd.gz
index 2cd822ee5..741415c91 100644
--- a/ppd/hpcups/hp-deskjet_600.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_600.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_610c.ppd.gz b/ppd/hpcups/hp-deskjet_610c.ppd.gz
index 19bb85f44..bb4d7e1af 100644
--- a/ppd/hpcups/hp-deskjet_610c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_610c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_610cl.ppd.gz b/ppd/hpcups/hp-deskjet_610cl.ppd.gz
index 376c492d9..f47576870 100644
--- a/ppd/hpcups/hp-deskjet_610cl.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_610cl.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6120.ppd.gz b/ppd/hpcups/hp-deskjet_6120.ppd.gz
index 80e5fc97b..e61ae38f1 100644
--- a/ppd/hpcups/hp-deskjet_6120.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6120.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6122.ppd.gz b/ppd/hpcups/hp-deskjet_6122.ppd.gz
index 0fce13099..06f96502d 100644
--- a/ppd/hpcups/hp-deskjet_6122.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6122.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6127.ppd.gz b/ppd/hpcups/hp-deskjet_6127.ppd.gz
index 58d0eb819..8cd0cb269 100644
--- a/ppd/hpcups/hp-deskjet_6127.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6127.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_612c.ppd.gz b/ppd/hpcups/hp-deskjet_612c.ppd.gz
index 238526a51..917a85555 100644
--- a/ppd/hpcups/hp-deskjet_612c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_612c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_630c.ppd.gz b/ppd/hpcups/hp-deskjet_630c.ppd.gz
index 85f0c16a5..dfdc8354d 100644
--- a/ppd/hpcups/hp-deskjet_630c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_630c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_632c.ppd.gz b/ppd/hpcups/hp-deskjet_632c.ppd.gz
index 1b76b431f..58b0e7a54 100644
--- a/ppd/hpcups/hp-deskjet_632c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_632c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_640c.ppd.gz b/ppd/hpcups/hp-deskjet_640c.ppd.gz
index a641ac053..fe62a22cc 100644
--- a/ppd/hpcups/hp-deskjet_640c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_640c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_648c.ppd.gz b/ppd/hpcups/hp-deskjet_648c.ppd.gz
index 5c0b65d6f..1b13e96bf 100644
--- a/ppd/hpcups/hp-deskjet_648c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_648c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6500.ppd.gz b/ppd/hpcups/hp-deskjet_6500.ppd.gz
index 07be99825..4175c10cc 100644
--- a/ppd/hpcups/hp-deskjet_6500.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6500.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz
index 8b3262986..4e1895ed8 100644
--- a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_656c.ppd.gz b/ppd/hpcups/hp-deskjet_656c.ppd.gz
index 832960482..bcce91325 100644
--- a/ppd/hpcups/hp-deskjet_656c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_656c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_660.ppd.gz b/ppd/hpcups/hp-deskjet_660.ppd.gz
index 0f42b0f20..1f079a158 100644
--- a/ppd/hpcups/hp-deskjet_660.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_660.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6600.ppd.gz b/ppd/hpcups/hp-deskjet_6600.ppd.gz
index 8516d4c9c..0de5c02ed 100644
--- a/ppd/hpcups/hp-deskjet_6600.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6600.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_670.ppd.gz b/ppd/hpcups/hp-deskjet_670.ppd.gz
index 2c1e337a3..3bdacda60 100644
--- a/ppd/hpcups/hp-deskjet_670.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_670.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_670c.ppd.gz b/ppd/hpcups/hp-deskjet_670c.ppd.gz
index de229a047..0b70ab019 100644
--- a/ppd/hpcups/hp-deskjet_670c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_670c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_670tv.ppd.gz b/ppd/hpcups/hp-deskjet_670tv.ppd.gz
index f96cb98ef..6780f7823 100644
--- a/ppd/hpcups/hp-deskjet_670tv.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_670tv.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_672c.ppd.gz b/ppd/hpcups/hp-deskjet_672c.ppd.gz
index 4c4c72131..f5e32654a 100644
--- a/ppd/hpcups/hp-deskjet_672c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_672c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_680.ppd.gz b/ppd/hpcups/hp-deskjet_680.ppd.gz
index b59af01db..f70b8c943 100644
--- a/ppd/hpcups/hp-deskjet_680.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_680.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6800.ppd.gz b/ppd/hpcups/hp-deskjet_6800.ppd.gz
index 4249df463..d51a15d5f 100644
--- a/ppd/hpcups/hp-deskjet_6800.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6800.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_682.ppd.gz b/ppd/hpcups/hp-deskjet_682.ppd.gz
index 4060bf0f1..9650c35c3 100644
--- a/ppd/hpcups/hp-deskjet_682.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_682.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_690c.ppd.gz b/ppd/hpcups/hp-deskjet_690c.ppd.gz
index 265721990..749bc4341 100644
--- a/ppd/hpcups/hp-deskjet_690c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_690c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_692.ppd.gz b/ppd/hpcups/hp-deskjet_692.ppd.gz
index 6443e7453..63fb53617 100644
--- a/ppd/hpcups/hp-deskjet_692.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_692.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_693.ppd.gz b/ppd/hpcups/hp-deskjet_693.ppd.gz
index e785b3674..90029255f 100644
--- a/ppd/hpcups/hp-deskjet_693.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_693.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_694.ppd.gz b/ppd/hpcups/hp-deskjet_694.ppd.gz
index ed80118db..2eb59b7a9 100644
--- a/ppd/hpcups/hp-deskjet_694.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_694.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6940_series.ppd.gz b/ppd/hpcups/hp-deskjet_6940_series.ppd.gz
index 9a114c891..fa3c6993a 100644
--- a/ppd/hpcups/hp-deskjet_6940_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6940_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_695.ppd.gz b/ppd/hpcups/hp-deskjet_695.ppd.gz
index 9bca8137e..a6fafe675 100644
--- a/ppd/hpcups/hp-deskjet_695.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_695.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_697.ppd.gz b/ppd/hpcups/hp-deskjet_697.ppd.gz
index 01659a5b8..2156a016e 100644
--- a/ppd/hpcups/hp-deskjet_697.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_697.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_6980_series.ppd.gz b/ppd/hpcups/hp-deskjet_6980_series.ppd.gz
index 417eef252..e3f74b488 100644
--- a/ppd/hpcups/hp-deskjet_6980_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_6980_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_810c.ppd.gz b/ppd/hpcups/hp-deskjet_810c.ppd.gz
index 206b238fd..5b0d041a2 100644
--- a/ppd/hpcups/hp-deskjet_810c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_810c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_812c.ppd.gz b/ppd/hpcups/hp-deskjet_812c.ppd.gz
index 3892e5c2a..69295f9b6 100644
--- a/ppd/hpcups/hp-deskjet_812c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_812c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_815c.ppd.gz b/ppd/hpcups/hp-deskjet_815c.ppd.gz
index ac49bd039..91d1ce4b3 100644
--- a/ppd/hpcups/hp-deskjet_815c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_815c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_816c.ppd.gz b/ppd/hpcups/hp-deskjet_816c.ppd.gz
index ee0ab31b1..d06cd0a93 100644
--- a/ppd/hpcups/hp-deskjet_816c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_816c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_825c.ppd.gz b/ppd/hpcups/hp-deskjet_825c.ppd.gz
index e35a437d5..774117613 100644
--- a/ppd/hpcups/hp-deskjet_825c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_825c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_830c.ppd.gz b/ppd/hpcups/hp-deskjet_830c.ppd.gz
index 9508a55fa..7f3e5c388 100644
--- a/ppd/hpcups/hp-deskjet_830c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_830c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_832c.ppd.gz b/ppd/hpcups/hp-deskjet_832c.ppd.gz
index a6452d2d0..263122d9b 100644
--- a/ppd/hpcups/hp-deskjet_832c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_832c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_840c.ppd.gz b/ppd/hpcups/hp-deskjet_840c.ppd.gz
index 0b550c9a2..e6781d357 100644
--- a/ppd/hpcups/hp-deskjet_840c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_840c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_841c.ppd.gz b/ppd/hpcups/hp-deskjet_841c.ppd.gz
index 1868f5a18..e0066e969 100644
--- a/ppd/hpcups/hp-deskjet_841c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_841c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_842c.ppd.gz b/ppd/hpcups/hp-deskjet_842c.ppd.gz
index 7d29ebae3..4a743822b 100644
--- a/ppd/hpcups/hp-deskjet_842c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_842c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_843c.ppd.gz b/ppd/hpcups/hp-deskjet_843c.ppd.gz
index fae372605..df32e5c89 100644
--- a/ppd/hpcups/hp-deskjet_843c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_843c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_845c.ppd.gz b/ppd/hpcups/hp-deskjet_845c.ppd.gz
index 57d2f1e4a..fb2f0fb9a 100644
--- a/ppd/hpcups/hp-deskjet_845c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_845c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_850c.ppd.gz b/ppd/hpcups/hp-deskjet_850c.ppd.gz
index 3b4c5d19d..e7bfef7c7 100644
--- a/ppd/hpcups/hp-deskjet_850c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_850c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_855c.ppd.gz b/ppd/hpcups/hp-deskjet_855c.ppd.gz
index 5c5ee719d..be38ac66a 100644
--- a/ppd/hpcups/hp-deskjet_855c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_855c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_870c.ppd.gz b/ppd/hpcups/hp-deskjet_870c.ppd.gz
index 32ae8fe04..4587cf2b1 100644
--- a/ppd/hpcups/hp-deskjet_870c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_870c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_880c.ppd.gz b/ppd/hpcups/hp-deskjet_880c.ppd.gz
index 59cf7f0e1..25631db07 100644
--- a/ppd/hpcups/hp-deskjet_880c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_880c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_882c.ppd.gz b/ppd/hpcups/hp-deskjet_882c.ppd.gz
index e3a39aed4..bf1d6c9d0 100644
--- a/ppd/hpcups/hp-deskjet_882c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_882c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_890c.ppd.gz b/ppd/hpcups/hp-deskjet_890c.ppd.gz
index a51e7c8f8..c34457990 100644
--- a/ppd/hpcups/hp-deskjet_890c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_890c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_895c.ppd.gz b/ppd/hpcups/hp-deskjet_895c.ppd.gz
index ec51cfd17..f6c2a3afb 100644
--- a/ppd/hpcups/hp-deskjet_895c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_895c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_916c.ppd.gz b/ppd/hpcups/hp-deskjet_916c.ppd.gz
index bec20a7a4..3aa073227 100644
--- a/ppd/hpcups/hp-deskjet_916c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_916c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_920c.ppd.gz b/ppd/hpcups/hp-deskjet_920c.ppd.gz
index 6cfd0c55d..a2ee48b4d 100644
--- a/ppd/hpcups/hp-deskjet_920c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_920c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_9300.ppd.gz b/ppd/hpcups/hp-deskjet_9300.ppd.gz
index 57f2e5e3d..8f68f459d 100644
--- a/ppd/hpcups/hp-deskjet_9300.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_9300.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_930c.ppd.gz b/ppd/hpcups/hp-deskjet_930c.ppd.gz
index 7fafaa1ae..2b38dbc27 100644
--- a/ppd/hpcups/hp-deskjet_930c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_930c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_932c.ppd.gz b/ppd/hpcups/hp-deskjet_932c.ppd.gz
index 6ec65450d..01f3e01cc 100644
--- a/ppd/hpcups/hp-deskjet_932c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_932c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_933c.ppd.gz b/ppd/hpcups/hp-deskjet_933c.ppd.gz
index 3ee18690b..1f70127d3 100644
--- a/ppd/hpcups/hp-deskjet_933c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_933c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_934c.ppd.gz b/ppd/hpcups/hp-deskjet_934c.ppd.gz
index f22790fbc..b9146582d 100644
--- a/ppd/hpcups/hp-deskjet_934c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_934c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_935c.ppd.gz b/ppd/hpcups/hp-deskjet_935c.ppd.gz
index b22f1f26d..317007fcd 100644
--- a/ppd/hpcups/hp-deskjet_935c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_935c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_940c.ppd.gz b/ppd/hpcups/hp-deskjet_940c.ppd.gz
index a57f93373..57af3f062 100644
--- a/ppd/hpcups/hp-deskjet_940c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_940c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_948c.ppd.gz b/ppd/hpcups/hp-deskjet_948c.ppd.gz
index f2bd876c6..b07570878 100644
--- a/ppd/hpcups/hp-deskjet_948c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_948c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_950c.ppd.gz b/ppd/hpcups/hp-deskjet_950c.ppd.gz
index bacd3f8ae..38dc1d687 100644
--- a/ppd/hpcups/hp-deskjet_950c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_950c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_952c.ppd.gz b/ppd/hpcups/hp-deskjet_952c.ppd.gz
index 79aa0e54c..414582fdc 100644
--- a/ppd/hpcups/hp-deskjet_952c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_952c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_955c.ppd.gz b/ppd/hpcups/hp-deskjet_955c.ppd.gz
index e6b49c958..a18b72f9d 100644
--- a/ppd/hpcups/hp-deskjet_955c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_955c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_957c.ppd.gz b/ppd/hpcups/hp-deskjet_957c.ppd.gz
index 2b76d02b7..39ff87213 100644
--- a/ppd/hpcups/hp-deskjet_957c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_957c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_959c.ppd.gz b/ppd/hpcups/hp-deskjet_959c.ppd.gz
index 5399d9adf..4a99ef6e2 100644
--- a/ppd/hpcups/hp-deskjet_959c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_959c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_9600.ppd.gz b/ppd/hpcups/hp-deskjet_9600.ppd.gz
index d5b9392db..7bd76943d 100644
--- a/ppd/hpcups/hp-deskjet_9600.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_9600.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_960c.ppd.gz b/ppd/hpcups/hp-deskjet_960c.ppd.gz
index 04028138c..1b7641cd1 100644
--- a/ppd/hpcups/hp-deskjet_960c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_960c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_970c.ppd.gz b/ppd/hpcups/hp-deskjet_970c.ppd.gz
index 672a60208..fa6e8b87c 100644
--- a/ppd/hpcups/hp-deskjet_970c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_970c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_975c.ppd.gz b/ppd/hpcups/hp-deskjet_975c.ppd.gz
index 953951c73..7180e2bdd 100644
--- a/ppd/hpcups/hp-deskjet_975c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_975c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_9800.ppd.gz b/ppd/hpcups/hp-deskjet_9800.ppd.gz
index 3d5ca1984..87a94a50b 100644
--- a/ppd/hpcups/hp-deskjet_9800.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_9800.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_980c.ppd.gz b/ppd/hpcups/hp-deskjet_980c.ppd.gz
index e37e355e5..2fea28e5e 100644
--- a/ppd/hpcups/hp-deskjet_980c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_980c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_990c.ppd.gz b/ppd/hpcups/hp-deskjet_990c.ppd.gz
index 61a6df9c1..64ab5fe7a 100644
--- a/ppd/hpcups/hp-deskjet_990c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_990c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_995c.ppd.gz b/ppd/hpcups/hp-deskjet_995c.ppd.gz
index 827b66cfd..bfe2fcf4e 100644
--- a/ppd/hpcups/hp-deskjet_995c.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_995c.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz
index 73c18e1f7..937c7d6ba 100644
--- a/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz
index 3eb0852a3..c7edaf0fd 100644
--- a/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz
index 1d8601c6e..316fc377b 100644
--- a/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz
index 9ac2d310d..4b147c672 100644
--- a/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz
index 1c80dae48..ab2f8d3f0 100644
--- a/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz
index 0e618a1fe..b3f6f4666 100644
--- a/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz
index 92808c39b..a3e64ad64 100644
--- a/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz
index 5fceda235..70313376f 100644
--- a/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz
index 6faa1e5f3..24e7339d8 100644
--- a/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz
index 8149cab5f..f3c61134c 100644
--- a/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz
index e482013de..f3f31cf30 100644
--- a/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz
index 0d9cf3cbb..c841376f3 100644
--- a/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_d730.ppd.gz b/ppd/hpcups/hp-deskjet_d730.ppd.gz
index 239d26316..6ce30e995 100644
--- a/ppd/hpcups/hp-deskjet_d730.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_d730.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz
index 0235925ad..ae7c278c8 100644
--- a/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz
index 90828a32d..15932121e 100644
--- a/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz
index a6fc714cd..2daa776f8 100644
--- a/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f300_series.ppd.gz b/ppd/hpcups/hp-deskjet_f300_series.ppd.gz
index 52fb69951..8ab993030 100644
--- a/ppd/hpcups/hp-deskjet_f300_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f300_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz
index 99454ec0d..fe99a3751 100644
--- a/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz
index 3d252a900..0a746e6c1 100644
--- a/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz
index d7da0701a..c6ae51a77 100644
--- a/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz
index bdbf571e4..947ed0c70 100644
--- a/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_f735.ppd.gz b/ppd/hpcups/hp-deskjet_f735.ppd.gz
index 27afe48f3..cf96839dc 100644
--- a/ppd/hpcups/hp-deskjet_f735.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_f735.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz
index 4f555c730..67490dd7a 100644
--- a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz
index ea0006fae..ffaf2874f 100644
--- a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz
index 558afd62b..dcd030313 100644
--- a/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz
diff --git a/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz
index c6da60a83..6df8fe504 100644
--- a/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz
+++ b/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz
diff --git a/ppd/hpcups/hp-dj350.ppd.gz b/ppd/hpcups/hp-dj350.ppd.gz
index 639877f58..561b52ba4 100644
--- a/ppd/hpcups/hp-dj350.ppd.gz
+++ b/ppd/hpcups/hp-dj350.ppd.gz
diff --git a/ppd/hpcups/hp-dj450.ppd.gz b/ppd/hpcups/hp-dj450.ppd.gz
index 0211ac703..8aee61ca3 100644
--- a/ppd/hpcups/hp-dj450.ppd.gz
+++ b/ppd/hpcups/hp-dj450.ppd.gz
diff --git a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz
index 5951bf9e6..5cef82bba 100644
--- a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_110_series.ppd.gz b/ppd/hpcups/hp-envy_110_series.ppd.gz
index 1c40fa06d..7cdbb7f25 100644
--- a/ppd/hpcups/hp-envy_110_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_110_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_120_series.ppd.gz b/ppd/hpcups/hp-envy_120_series.ppd.gz
index 768611853..5b73ee73c 100644
--- a/ppd/hpcups/hp-envy_120_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_120_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_4500_series.ppd.gz b/ppd/hpcups/hp-envy_4500_series.ppd.gz
index 0d5377bbc..b6e9cfe32 100644
--- a/ppd/hpcups/hp-envy_4500_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_4500_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_4510_series.ppd.gz b/ppd/hpcups/hp-envy_4510_series.ppd.gz
index 874dd889f..e838ddf43 100644
--- a/ppd/hpcups/hp-envy_4510_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_4510_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_4520_series.ppd.gz b/ppd/hpcups/hp-envy_4520_series.ppd.gz
index 7144eedcc..cb4cdafa8 100644
--- a/ppd/hpcups/hp-envy_4520_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_4520_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_5000_series.ppd.gz b/ppd/hpcups/hp-envy_5000_series.ppd.gz
index ef3fa2e0a..1ecdba1a4 100644
--- a/ppd/hpcups/hp-envy_5000_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_5000_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_5530_series.ppd.gz b/ppd/hpcups/hp-envy_5530_series.ppd.gz
index 2545b9df8..ca37ae81d 100644
--- a/ppd/hpcups/hp-envy_5530_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_5530_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_5540_series.ppd.gz b/ppd/hpcups/hp-envy_5540_series.ppd.gz
index 7a2ba2dcd..fff7ee53c 100644
--- a/ppd/hpcups/hp-envy_5540_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_5540_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_5640_series.ppd.gz b/ppd/hpcups/hp-envy_5640_series.ppd.gz
index 5db59b7b2..1d419f5cd 100644
--- a/ppd/hpcups/hp-envy_5640_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_5640_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_5660_series.ppd.gz b/ppd/hpcups/hp-envy_5660_series.ppd.gz
index 7774162de..699413d5f 100644
--- a/ppd/hpcups/hp-envy_5660_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_5660_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_7640_series.ppd.gz b/ppd/hpcups/hp-envy_7640_series.ppd.gz
index 3fc661870..df47435ce 100644
--- a/ppd/hpcups/hp-envy_7640_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_7640_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_8000_series.ppd.gz b/ppd/hpcups/hp-envy_8000_series.ppd.gz
index 1db5eab61..f68befc34 100644
--- a/ppd/hpcups/hp-envy_8000_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_8000_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz b/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz
index 902a1e88b..fad6cf731 100644
--- a/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz b/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz
index 63760797f..a34725d51 100644
--- a/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz
diff --git a/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz b/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz
index 441b6c914..286a6cc78 100644
--- a/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz
+++ b/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz
diff --git a/ppd/hpcups/hp-ink_tank_110_series.ppd.gz b/ppd/hpcups/hp-ink_tank_110_series.ppd.gz
index 29f19ee55..cbd5ac567 100644
--- a/ppd/hpcups/hp-ink_tank_110_series.ppd.gz
+++ b/ppd/hpcups/hp-ink_tank_110_series.ppd.gz
diff --git a/ppd/hpcups/hp-ink_tank_310_series.ppd.gz b/ppd/hpcups/hp-ink_tank_310_series.ppd.gz
index 529a7333e..8a22a710a 100644
--- a/ppd/hpcups/hp-ink_tank_310_series.ppd.gz
+++ b/ppd/hpcups/hp-ink_tank_310_series.ppd.gz
diff --git a/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz b/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz
index 1a8793976..c2becdb4d 100644
--- a/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz
+++ b/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz
diff --git a/ppd/hpcups/hp-laser_ns_1020.ppd.gz b/ppd/hpcups/hp-laser_ns_1020.ppd.gz
index f4df18cdd..29e1a293d 100644
--- a/ppd/hpcups/hp-laser_ns_1020.ppd.gz
+++ b/ppd/hpcups/hp-laser_ns_1020.ppd.gz
diff --git a/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz b/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz
index 2330b2f36..e3e035556 100644
--- a/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz
+++ b/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz
index 165e92eaa..c54ffbb73 100644
--- a/ppd/hpcups/hp-laserjet_1000.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1000.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1005_series.ppd.gz b/ppd/hpcups/hp-laserjet_1005_series.ppd.gz
index 50c38d189..af0ae930f 100644
--- a/ppd/hpcups/hp-laserjet_1005_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1005_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1010.ppd.gz b/ppd/hpcups/hp-laserjet_1010.ppd.gz
index 47b887ad3..fedf89cd3 100644
--- a/ppd/hpcups/hp-laserjet_1010.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1010.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1012.ppd.gz b/ppd/hpcups/hp-laserjet_1012.ppd.gz
index 44a24eb6e..4f10c4e61 100644
--- a/ppd/hpcups/hp-laserjet_1012.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1012.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1015.ppd.gz b/ppd/hpcups/hp-laserjet_1015.ppd.gz
index a5f60e92e..ac6d74ae6 100644
--- a/ppd/hpcups/hp-laserjet_1015.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1015.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1018.ppd.gz b/ppd/hpcups/hp-laserjet_1018.ppd.gz
index 43c433b1b..748b97527 100644
--- a/ppd/hpcups/hp-laserjet_1018.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1018.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1020.ppd.gz b/ppd/hpcups/hp-laserjet_1020.ppd.gz
index 0f04f1f5f..7c9850a94 100644
--- a/ppd/hpcups/hp-laserjet_1020.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1020.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz
index 3ac8652ff..d6929ffe7 100644
--- a/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz
index 0e818b70d..557ae2203 100644
--- a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz
index b7a05fd54..2ba28093b 100644
--- a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1100.ppd.gz b/ppd/hpcups/hp-laserjet_1100.ppd.gz
index 04226c908..d52de2f95 100644
--- a/ppd/hpcups/hp-laserjet_1100.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1100.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1100a.ppd.gz b/ppd/hpcups/hp-laserjet_1100a.ppd.gz
index b892261ad..dea799a3f 100644
--- a/ppd/hpcups/hp-laserjet_1100a.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1100a.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1100xi.ppd.gz b/ppd/hpcups/hp-laserjet_1100xi.ppd.gz
index e0a3c3e4b..6c999df11 100644
--- a/ppd/hpcups/hp-laserjet_1100xi.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1100xi.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1150.ppd.gz b/ppd/hpcups/hp-laserjet_1150.ppd.gz
index c1d30a3a3..55311d421 100644
--- a/ppd/hpcups/hp-laserjet_1150.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1150.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1160_series.ppd.gz b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz
index c994c3fb9..16e17b69d 100644
--- a/ppd/hpcups/hp-laserjet_1160_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz
index de9b84843..25c58a426 100644
--- a/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1200n.ppd.gz b/ppd/hpcups/hp-laserjet_1200n.ppd.gz
index c301ca75e..b09ebb14e 100644
--- a/ppd/hpcups/hp-laserjet_1200n.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1200n.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz
index 5c35bd0f9..632bc65e8 100644
--- a/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1220se.ppd.gz b/ppd/hpcups/hp-laserjet_1220se.ppd.gz
index a174fbcf6..95f473fa9 100644
--- a/ppd/hpcups/hp-laserjet_1220se.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1220se.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz
index a98948f9e..0268831f4 100644
--- a/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz
index 6488848c0..bb2d0eaff 100644
--- a/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz
index 9c7536e56..24a590726 100644
--- a/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1320.ppd.gz b/ppd/hpcups/hp-laserjet_1320.ppd.gz
index edfb39868..b21441d49 100644
--- a/ppd/hpcups/hp-laserjet_1320.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1320.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz
index 41163387f..b981c72e6 100644
--- a/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1320n.ppd.gz b/ppd/hpcups/hp-laserjet_1320n.ppd.gz
index 7fa9e1c72..d9ce25ade 100644
--- a/ppd/hpcups/hp-laserjet_1320n.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1320n.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1320nw.ppd.gz b/ppd/hpcups/hp-laserjet_1320nw.ppd.gz
index 393cf3790..492231253 100644
--- a/ppd/hpcups/hp-laserjet_1320nw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1320nw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_1320tn.ppd.gz b/ppd/hpcups/hp-laserjet_1320tn.ppd.gz
index ae1632921..f34c36aaa 100644
--- a/ppd/hpcups/hp-laserjet_1320tn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_1320tn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz
index 5e58a064e..7bc5b93f9 100644
--- a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz
index e73901c49..2975f8eeb 100644
--- a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_2300_series.ppd.gz b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz
index e244f01c3..f7a450262 100644
--- a/ppd/hpcups/hp-laserjet_2300_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz
index 1eeca307d..e2220cd68 100644
--- a/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz
index c3243d11b..748c9b4d7 100644
--- a/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz
index 61eeb966e..b76081de2 100644
--- a/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz
index aadc4fd23..23d9830f3 100644
--- a/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz
index 2d1a76644..8f1d7a8e1 100644
--- a/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz
index 473f4add5..81db53b5e 100644
--- a/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz
index c366dab98..28bde78cf 100644
--- a/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz
index 55656a8b4..80f0ec8b7 100644
--- a/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3055.ppd.gz b/ppd/hpcups/hp-laserjet_3055.ppd.gz
index 243e780d9..b4c98f346 100644
--- a/ppd/hpcups/hp-laserjet_3055.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3055.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3100.ppd.gz b/ppd/hpcups/hp-laserjet_3100.ppd.gz
index ceb7394dc..4ea3e0a15 100644
--- a/ppd/hpcups/hp-laserjet_3100.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3100.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3150.ppd.gz b/ppd/hpcups/hp-laserjet_3150.ppd.gz
index 53b9c355d..c91e71443 100644
--- a/ppd/hpcups/hp-laserjet_3150.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3150.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3200.ppd.gz b/ppd/hpcups/hp-laserjet_3200.ppd.gz
index 2a5d45f65..6fe6b53d4 100644
--- a/ppd/hpcups/hp-laserjet_3200.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3200.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz
index d3cce1078..31331c1ba 100644
--- a/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3330.ppd.gz b/ppd/hpcups/hp-laserjet_3330.ppd.gz
index b24606278..ba983abfa 100644
--- a/ppd/hpcups/hp-laserjet_3330.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3330.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz
index 77b8f05ab..485ef8360 100644
--- a/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz
index 045283195..ac1aac9c7 100644
--- a/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_3392.ppd.gz b/ppd/hpcups/hp-laserjet_3392.ppd.gz
index 645f83d62..ccb64a42b 100644
--- a/ppd/hpcups/hp-laserjet_3392.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_3392.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz
index 091e18707..27458ae73 100644
--- a/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz
index 9f34f5bba..cf95affe9 100644
--- a/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz
index 5c11b4f4f..46aecf2bb 100644
--- a/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz
index 55c317254..f95ce0f77 100644
--- a/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4150_series.ppd.gz b/ppd/hpcups/hp-laserjet_4150_series.ppd.gz
index 6b40c50dd..b64188453 100644
--- a/ppd/hpcups/hp-laserjet_4150_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4150_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz
index 1d5f58f00..692972a35 100644
--- a/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz
index eba4d3858..a074e9319 100644
--- a/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz
index 8501c8f6d..972bca6b7 100644
--- a/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz
index 8ac5cc127..cfa79ac7d 100644
--- a/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz
index af4f4cf19..01e6d6146 100644
--- a/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz
index 91fc6d0b1..953a502f1 100644
--- a/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz
index ca29374db..9c5807acc 100644
--- a/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4l.ppd.gz b/ppd/hpcups/hp-laserjet_4l.ppd.gz
index 99732ad83..9f1dec88b 100644
--- a/ppd/hpcups/hp-laserjet_4l.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4l.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4ml.ppd.gz b/ppd/hpcups/hp-laserjet_4ml.ppd.gz
index 019543ba9..43c162e09 100644
--- a/ppd/hpcups/hp-laserjet_4ml.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4ml.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz
index a7a0ebc82..51155784e 100644
--- a/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz
index 64ff04e4d..84284c75a 100644
--- a/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz
index 0cfa67401..d63f3053c 100644
--- a/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz
index 5a093283d..7d7ce891e 100644
--- a/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz
index d4676ace7..2b71f0550 100644
--- a/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz
index 7b15555ce..e7505ab38 100644
--- a/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz
index 244d0a3e2..15bb8f92f 100644
--- a/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5200lx.ppd.gz b/ppd/hpcups/hp-laserjet_5200lx.ppd.gz
index 4e4b93817..698025e88 100644
--- a/ppd/hpcups/hp-laserjet_5200lx.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5200lx.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5l.ppd.gz b/ppd/hpcups/hp-laserjet_5l.ppd.gz
index 61b75b61d..e51d6878c 100644
--- a/ppd/hpcups/hp-laserjet_5l.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5l.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz
index ed66bbd7e..a370b0bd5 100644
--- a/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5p.ppd.gz b/ppd/hpcups/hp-laserjet_5p.ppd.gz
index e93e61912..89dd9edd9 100644
--- a/ppd/hpcups/hp-laserjet_5p.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5p.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz
index d47846007..b1f3eacf2 100644
--- a/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz
index aace55d8a..a53c7a4c6 100644
--- a/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_6l.ppd.gz b/ppd/hpcups/hp-laserjet_6l.ppd.gz
index 72279dd75..8aab5d7ea 100644
--- a/ppd/hpcups/hp-laserjet_6l.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_6l.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz
index a3018d246..406cf5552 100644
--- a/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_6p.ppd.gz b/ppd/hpcups/hp-laserjet_6p.ppd.gz
index 2757e1289..097087776 100644
--- a/ppd/hpcups/hp-laserjet_6p.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_6p.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz
index c585db16a..1dce41d29 100644
--- a/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz
index db45d0e02..ca20370a1 100644
--- a/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz
index 2384cc527..5769fad1e 100644
--- a/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz
index 89ab0e8a5..c84cbea6b 100644
--- a/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz
index 2cbd4cd90..5e9b92826 100644
--- a/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz
index 6e8c48709..49135e40f 100644
--- a/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz
index 7af671aa1..92f85766d 100644
--- a/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz
index f7518cd6c..5e38abde8 100644
--- a/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz
index 7a22905cd..355e5058f 100644
--- a/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz
index 354ea78ea..3a9d3b8f0 100644
--- a/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz
index f5550b95d..528b19c40 100644
--- a/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz
index 4d0486959..8abf83629 100644
--- a/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz
index 2e560071d..803390a10 100644
--- a/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz
index fdd8dab5e..4a9203ecb 100644
--- a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz
index 74738b8a5..3bb620dc9 100644
--- a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz
index e36bbbdc9..48a7153be 100644
--- a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz
index bccd55fdb..3edc9942c 100644
--- a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz
index c86e86c2f..8169c0de8 100644
--- a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz
index 8a3e6c19e..16f30898a 100644
--- a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz
index 4160688c6..d77b50ed8 100644
--- a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz
index 58f064a8a..86e9ee6eb 100644
--- a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz
index 35a021507..656a8d794 100644
--- a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz
index 9511d881f..367b54db1 100644
--- a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1005.ppd.gz b/ppd/hpcups/hp-laserjet_m1005.ppd.gz
index b2ee19c3f..644c3eca2 100644
--- a/ppd/hpcups/hp-laserjet_m1005.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1005.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz b/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz
index a5b833189..ec552862f 100644
--- a/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz
index 02abf618e..ef4f41d90 100644
--- a/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz
index 6e695ec1f..7a39bf55f 100644
--- a/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz
index c6b501a74..3073931a4 100644
--- a/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz b/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz
index 847f01557..cee445794 100644
--- a/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz
index 6ca0acfd2..401b4bd61 100644
--- a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz
index 08ffd1d50..e5845ac9c 100644
--- a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz
index a9f49d5dc..847032af4 100644
--- a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz
index b39c4704d..3483c1d32 100644
--- a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz
index c3ad797e7..2184ba215 100644
--- a/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz
index 54fa09da3..a60f40d54 100644
--- a/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz
index 66c5a0934..14cec12e7 100644
--- a/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz
index e9658c5e3..bf3e5de51 100644
--- a/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz
index 40235e4c9..05f491f4b 100644
--- a/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz
index c9f8ae1e0..cf3aba791 100644
--- a/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz
index 854c3244d..bc3a06a8a 100644
--- a/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz
index 01ccdadae..13ec86cfd 100644
--- a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz
index 23a608a48..fd21ddb2f 100644
--- a/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz
index c811d2c94..93f879cd1 100644
--- a/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz
index 3a3b536a9..a50af3a8a 100644
--- a/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz b/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz
index bf58d8bbc..6787ab8ae 100644
--- a/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz b/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz
index 60c0a7a8c..b92ade6ec 100644
--- a/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p1005.ppd.gz b/ppd/hpcups/hp-laserjet_p1005.ppd.gz
index c25ec0dd9..89dacf478 100644
--- a/ppd/hpcups/hp-laserjet_p1005.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p1005.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p1006.ppd.gz b/ppd/hpcups/hp-laserjet_p1006.ppd.gz
index ae436ab1a..8c479b957 100644
--- a/ppd/hpcups/hp-laserjet_p1006.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p1006.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p1007.ppd.gz b/ppd/hpcups/hp-laserjet_p1007.ppd.gz
index 742cf68bc..32279edc4 100644
--- a/ppd/hpcups/hp-laserjet_p1007.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p1007.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p1008.ppd.gz b/ppd/hpcups/hp-laserjet_p1008.ppd.gz
index 82c7c92f8..cb927324e 100644
--- a/ppd/hpcups/hp-laserjet_p1008.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p1008.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p1009.ppd.gz b/ppd/hpcups/hp-laserjet_p1009.ppd.gz
index 20c0f3078..0ae394bce 100644
--- a/ppd/hpcups/hp-laserjet_p1009.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p1009.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p1505.ppd.gz b/ppd/hpcups/hp-laserjet_p1505.ppd.gz
index 3285ab110..0cd9fd85a 100644
--- a/ppd/hpcups/hp-laserjet_p1505.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p1505.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz
index 6608acb1d..f5c26a174 100644
--- a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz
index 5ddf093fd..91bb61f4e 100644
--- a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz
index 0dbb552c3..aecef8940 100644
--- a/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz
index 6fb6edb88..c1436d968 100644
--- a/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz
index 936063bd5..3a36f3e1e 100644
--- a/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz
index 19a55814b..12c3cf0fb 100644
--- a/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz
index 900d34140..936a0c254 100644
--- a/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz
index c1335b646..5a65b3350 100644
--- a/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz
index 0b0f7a1a1..486ae40df 100644
--- a/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz
index 579f5f991..d9cfe0d6e 100644
--- a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz
index f452f6521..15d5440fd 100644
--- a/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz
index a13b7d8f6..767a5c078 100644
--- a/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz
index c23824b58..f3ff10b59 100644
--- a/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz
index af507f25d..0b2bb8c1f 100644
--- a/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz
index ea72a5be7..353230193 100644
--- a/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz
index b2ae6ab6b..8c36df13b 100644
--- a/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz
index 1ec21afc5..08933c953 100644
--- a/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4014.ppd.gz b/ppd/hpcups/hp-laserjet_p4014.ppd.gz
index 7fb1a7e35..1dc2478a0 100644
--- a/ppd/hpcups/hp-laserjet_p4014.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4014.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz b/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz
index c0fbed156..d6ec2e71e 100644
--- a/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4014n.ppd.gz b/ppd/hpcups/hp-laserjet_p4014n.ppd.gz
index f2d2a2065..231d1e089 100644
--- a/ppd/hpcups/hp-laserjet_p4014n.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4014n.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4015.ppd.gz b/ppd/hpcups/hp-laserjet_p4015.ppd.gz
index d97972f38..50f6c9cab 100644
--- a/ppd/hpcups/hp-laserjet_p4015.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4015.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz b/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz
index fd9327ccc..9a24fc85f 100644
--- a/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4015n.ppd.gz b/ppd/hpcups/hp-laserjet_p4015n.ppd.gz
index 68741c8ef..9562ac614 100644
--- a/ppd/hpcups/hp-laserjet_p4015n.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4015n.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz b/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz
index 58ad5585c..7886ca438 100644
--- a/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4015x.ppd.gz b/ppd/hpcups/hp-laserjet_p4015x.ppd.gz
index 56842a8b9..7f8bd2091 100644
--- a/ppd/hpcups/hp-laserjet_p4015x.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4015x.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4515.ppd.gz b/ppd/hpcups/hp-laserjet_p4515.ppd.gz
index 3de1ce409..415acd166 100644
--- a/ppd/hpcups/hp-laserjet_p4515.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4515.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4515n.ppd.gz b/ppd/hpcups/hp-laserjet_p4515n.ppd.gz
index 1f5cac66f..0d984c866 100644
--- a/ppd/hpcups/hp-laserjet_p4515n.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4515n.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz b/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz
index bd4062b62..76d08d3f9 100644
--- a/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4515x.ppd.gz b/ppd/hpcups/hp-laserjet_p4515x.ppd.gz
index 7bb8427d7..866ef2a32 100644
--- a/ppd/hpcups/hp-laserjet_p4515x.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4515x.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz
index 2546ea98e..32c298b7f 100644
--- a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz
index 181348344..26baf9849 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz
index 85cc38324..21332a580 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz
index 664b8b573..2e5c5086b 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz
index 36d4da5ff..fa195ca36 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz
index d6281e300..a22934147 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz
index 0e9118e19..30df94116 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz
index 1e7733a59..8c410d6c3 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz
index e1f05789a..8c0ec1a60 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz
index 8db68d1aa..fc337a0e1 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz
index 471a6002a..31e1e2129 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz
index 1aa8777a1..70cb3f25e 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz
index 82af86716..517b87d58 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz
index 9a66c944f..52374c465 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz
index 7846e533c..86206ba08 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz
index 4e56f95b0..0fe27bf1f 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz
index 90d017092..200094c68 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz
index a1eed93db..420da3283 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz
index db0446b52..707a2aa8a 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz
index 12d034b91..61732f4ba 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz
index f5a56990d..f78fc28dd 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz
index 16c5c58ff..147779fae 100644
--- a/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz
index feabcfc7d..5ceedf504 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz
index 14e1905ba..90648a4e7 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz
index 493b93b52..e9034704b 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz
index 20c360371..87a81020e 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz
index 624bf3927..d66cf4820 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz
index 1a8ba39f7..1f5c9a692 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz
index db7847718..deadbea9a 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz
index 69ee8c5bc..df8ca6ab9 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz
index 224e83d98..cbaea86b5 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz
index 3f60e872f..75df87198 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz
index c189f1e2f..04501551b 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz
index e3691b7ca..05629ca31 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz
index 811a2cf35..582fefa8e 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
index e8ace902a..af9a379c6 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
index ccac2e1fc..239020adf 100644
--- a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz
index 5718e21b0..0a4bac44a 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz
index 60a50fe52..690f0e0fe 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz
index 0933ac8f3..e127815fe 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz
index 63ef5e50b..20a5b4a4a 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz
index 510c1d5b1..757abd8aa 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz
index c3ec0d991..960c1f347 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz
index e040d3474..09ef6c053 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz
index ff0d5aa27..c991ec49e 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz
index 93495a0e4..6182e720d 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz
index 7fbb9c7fe..ffb4666bf 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz
index 48dd29fd7..718a96295 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz
index 03389991a..55c9eac28 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz
index 15ba97c52..40dabbdeb 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz
index 041bb7b7e..03b309789 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz
index 724f054e4..f304b2f63 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz
index c799841aa..efcc4dbd8 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz
index a1b94aa27..6c077873a 100644
--- a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz
diff --git a/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz
index db93f8a4e..36a628e38 100644
--- a/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz
+++ b/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz
diff --git a/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz b/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz
index f5e449bcb..f323795ea 100644
--- a/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz b/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz
index f7721dbac..7201b2727 100644
--- a/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz b/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz
index 37d3cd08b..a5ead9055 100644
--- a/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz
+++ b/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz
diff --git a/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz b/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz
index 585a493db..e17950e32 100644
--- a/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz
+++ b/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz
diff --git a/ppd/hpcups/hp-officejet.ppd.gz b/ppd/hpcups/hp-officejet.ppd.gz
index 8f79532c1..c6708e076 100644
--- a/ppd/hpcups/hp-officejet.ppd.gz
+++ b/ppd/hpcups/hp-officejet.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz b/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz
index 12f57b392..60f86d787 100644
--- a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz
+++ b/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz
index 6c284ca1b..0440db80f 100644
--- a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz
+++ b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz b/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz
index 64b257703..521453da4 100644
--- a/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz b/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz
index f2316ea69..04bb159d5 100644
--- a/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_2620_series.ppd.gz b/ppd/hpcups/hp-officejet_2620_series.ppd.gz
index 8c115a836..cb1e4e2db 100644
--- a/ppd/hpcups/hp-officejet_2620_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_2620_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_3830_series.ppd.gz b/ppd/hpcups/hp-officejet_3830_series.ppd.gz
index 5b53a5ea0..121d92243 100644
--- a/ppd/hpcups/hp-officejet_3830_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_3830_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz
index 6f00ce258..e9490df34 100644
--- a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4100_series.ppd.gz b/ppd/hpcups/hp-officejet_4100_series.ppd.gz
index e5098a065..8e6ccd4ea 100644
--- a/ppd/hpcups/hp-officejet_4100_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4100_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4105.ppd.gz b/ppd/hpcups/hp-officejet_4105.ppd.gz
index 20c59d0d0..fc10eff73 100644
--- a/ppd/hpcups/hp-officejet_4105.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4105.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4115_series.ppd.gz b/ppd/hpcups/hp-officejet_4115_series.ppd.gz
index 196728556..74b9603c1 100644
--- a/ppd/hpcups/hp-officejet_4115_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4115_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4200_series.ppd.gz b/ppd/hpcups/hp-officejet_4200_series.ppd.gz
index ae863835f..73fb9fb01 100644
--- a/ppd/hpcups/hp-officejet_4200_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4200_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4255.ppd.gz b/ppd/hpcups/hp-officejet_4255.ppd.gz
index 081e11200..a6dde635a 100644
--- a/ppd/hpcups/hp-officejet_4255.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4255.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4300_series.ppd.gz b/ppd/hpcups/hp-officejet_4300_series.ppd.gz
index e60654b91..e9d511acf 100644
--- a/ppd/hpcups/hp-officejet_4300_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4300_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz
index 3edad5713..dd795ade8 100644
--- a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz
index 844dbf956..0c0db7d9f 100644
--- a/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz
index 06f8d723e..9f1f4d294 100644
--- a/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz
index 7edafc852..7f8821699 100644
--- a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz
index 041d66f4f..217e1a97c 100644
--- a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4610_series.ppd.gz b/ppd/hpcups/hp-officejet_4610_series.ppd.gz
index 6db976ce6..69d97ba9b 100644
--- a/ppd/hpcups/hp-officejet_4610_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4610_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4620_series.ppd.gz b/ppd/hpcups/hp-officejet_4620_series.ppd.gz
index aed372a5e..485f2706a 100644
--- a/ppd/hpcups/hp-officejet_4620_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4620_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4630_series.ppd.gz b/ppd/hpcups/hp-officejet_4630_series.ppd.gz
index 5c3273e25..ee987f0a6 100644
--- a/ppd/hpcups/hp-officejet_4630_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4630_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_4650_series.ppd.gz b/ppd/hpcups/hp-officejet_4650_series.ppd.gz
index dc198f38b..de0926229 100644
--- a/ppd/hpcups/hp-officejet_4650_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_4650_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_5100_series.ppd.gz b/ppd/hpcups/hp-officejet_5100_series.ppd.gz
index 43ec7a614..b4af772d3 100644
--- a/ppd/hpcups/hp-officejet_5100_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_5100_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_5200_series.ppd.gz b/ppd/hpcups/hp-officejet_5200_series.ppd.gz
index af8db0b03..8e16d779d 100644
--- a/ppd/hpcups/hp-officejet_5200_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_5200_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_5500_series.ppd.gz b/ppd/hpcups/hp-officejet_5500_series.ppd.gz
index bcc4ff7de..d78edfc18 100644
--- a/ppd/hpcups/hp-officejet_5500_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_5500_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_5600_series.ppd.gz b/ppd/hpcups/hp-officejet_5600_series.ppd.gz
index 51332eccc..556b4a134 100644
--- a/ppd/hpcups/hp-officejet_5600_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_5600_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_5740_series.ppd.gz b/ppd/hpcups/hp-officejet_5740_series.ppd.gz
index ec0ec62b0..bbbedc456 100644
--- a/ppd/hpcups/hp-officejet_5740_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_5740_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz b/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz
index 6c4feb922..213b2c5f1 100644
--- a/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz b/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz
index 6b824f01c..9680cb4eb 100644
--- a/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6100.ppd.gz b/ppd/hpcups/hp-officejet_6100.ppd.gz
index 23b97808e..21f2fc2f9 100644
--- a/ppd/hpcups/hp-officejet_6100.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6100.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6100_series.ppd.gz b/ppd/hpcups/hp-officejet_6100_series.ppd.gz
index 0e03def76..e5f9b36c0 100644
--- a/ppd/hpcups/hp-officejet_6100_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6100_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6150_series.ppd.gz b/ppd/hpcups/hp-officejet_6150_series.ppd.gz
index c204b8d3e..e0c1e2ea3 100644
--- a/ppd/hpcups/hp-officejet_6150_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6150_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6200_series.ppd.gz b/ppd/hpcups/hp-officejet_6200_series.ppd.gz
index 6bc3a0f94..98d1bb952 100644
--- a/ppd/hpcups/hp-officejet_6200_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6200_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6300_series.ppd.gz b/ppd/hpcups/hp-officejet_6300_series.ppd.gz
index 049efa675..bffff2085 100644
--- a/ppd/hpcups/hp-officejet_6300_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6300_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz b/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz
index 1aa0a9e84..8849e06cd 100644
--- a/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz b/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz
index 096a3eacf..da3fd50c4 100644
--- a/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz
index bbd4352b4..1bd467c79 100644
--- a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz
index 4b893db58..b4e22b0c0 100644
--- a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6600.ppd.gz b/ppd/hpcups/hp-officejet_6600.ppd.gz
index 28d91a05e..62d10780c 100644
--- a/ppd/hpcups/hp-officejet_6600.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6600.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6700.ppd.gz b/ppd/hpcups/hp-officejet_6700.ppd.gz
index 235f1ba20..d3b82d32b 100644
--- a/ppd/hpcups/hp-officejet_6700.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6700.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6800.ppd.gz b/ppd/hpcups/hp-officejet_6800.ppd.gz
index 34ae0ab74..cb1f58ccc 100644
--- a/ppd/hpcups/hp-officejet_6800.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6800.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6950.ppd.gz b/ppd/hpcups/hp-officejet_6950.ppd.gz
index 70f9bddd0..4a6599f50 100644
--- a/ppd/hpcups/hp-officejet_6950.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6950.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_6960.ppd.gz b/ppd/hpcups/hp-officejet_6960.ppd.gz
index 157faf44a..b4b33d26a 100644
--- a/ppd/hpcups/hp-officejet_6960.ppd.gz
+++ b/ppd/hpcups/hp-officejet_6960.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz
index f068b8ba8..76097858f 100644
--- a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7100_series.ppd.gz b/ppd/hpcups/hp-officejet_7100_series.ppd.gz
index 42520f2fc..2b796def6 100644
--- a/ppd/hpcups/hp-officejet_7100_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7100_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7110_series.ppd.gz b/ppd/hpcups/hp-officejet_7110_series.ppd.gz
index 831ce407f..14f14e196 100644
--- a/ppd/hpcups/hp-officejet_7110_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7110_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7200_series.ppd.gz b/ppd/hpcups/hp-officejet_7200_series.ppd.gz
index deb46aa06..2bb5b8c87 100644
--- a/ppd/hpcups/hp-officejet_7200_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7200_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7300_series.ppd.gz b/ppd/hpcups/hp-officejet_7300_series.ppd.gz
index f2908128a..0e36ea69b 100644
--- a/ppd/hpcups/hp-officejet_7300_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7300_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7400_series.ppd.gz b/ppd/hpcups/hp-officejet_7400_series.ppd.gz
index 48e1af4cf..0a707b5fd 100644
--- a/ppd/hpcups/hp-officejet_7400_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7400_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz
index d1904d7c9..569810460 100644
--- a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7510_series.ppd.gz b/ppd/hpcups/hp-officejet_7510_series.ppd.gz
index ace3189c9..762ea451f 100644
--- a/ppd/hpcups/hp-officejet_7510_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7510_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_7610_series.ppd.gz b/ppd/hpcups/hp-officejet_7610_series.ppd.gz
index 325020263..0165c7414 100644
--- a/ppd/hpcups/hp-officejet_7610_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_7610_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_8010_series.ppd.gz b/ppd/hpcups/hp-officejet_8010_series.ppd.gz
index 5aa1dd70e..cc127a4a3 100644
--- a/ppd/hpcups/hp-officejet_8010_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_8010_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_8020_series.ppd.gz b/ppd/hpcups/hp-officejet_8020_series.ppd.gz
index 9ab20390d..33fef7e33 100644
--- a/ppd/hpcups/hp-officejet_8020_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_8020_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_8040_series.ppd.gz b/ppd/hpcups/hp-officejet_8040_series.ppd.gz
index f42f4ee9e..923912b46 100644
--- a/ppd/hpcups/hp-officejet_8040_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_8040_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_8700.ppd.gz b/ppd/hpcups/hp-officejet_8700.ppd.gz
index 2e64f90b3..80d74cdb9 100644
--- a/ppd/hpcups/hp-officejet_8700.ppd.gz
+++ b/ppd/hpcups/hp-officejet_8700.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_9010_series.ppd.gz b/ppd/hpcups/hp-officejet_9010_series.ppd.gz
index d548844a7..c027c7374 100644
--- a/ppd/hpcups/hp-officejet_9010_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_9010_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz
index 379900443..4aa7db9cc 100644
--- a/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz
+++ b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_d_series.ppd.gz b/ppd/hpcups/hp-officejet_d_series.ppd.gz
index 8acc7b925..bc74d9c3c 100644
--- a/ppd/hpcups/hp-officejet_d_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_d_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_g55.ppd.gz b/ppd/hpcups/hp-officejet_g55.ppd.gz
index 4bd677c61..b33e019ff 100644
--- a/ppd/hpcups/hp-officejet_g55.ppd.gz
+++ b/ppd/hpcups/hp-officejet_g55.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_g55xi.ppd.gz b/ppd/hpcups/hp-officejet_g55xi.ppd.gz
index eb846d084..93e0f6843 100644
--- a/ppd/hpcups/hp-officejet_g55xi.ppd.gz
+++ b/ppd/hpcups/hp-officejet_g55xi.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_g85.ppd.gz b/ppd/hpcups/hp-officejet_g85.ppd.gz
index 644ba170d..f37841bdd 100644
--- a/ppd/hpcups/hp-officejet_g85.ppd.gz
+++ b/ppd/hpcups/hp-officejet_g85.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_g85xi.ppd.gz b/ppd/hpcups/hp-officejet_g85xi.ppd.gz
index f5740bc6e..8ed364717 100644
--- a/ppd/hpcups/hp-officejet_g85xi.ppd.gz
+++ b/ppd/hpcups/hp-officejet_g85xi.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_g95.ppd.gz b/ppd/hpcups/hp-officejet_g95.ppd.gz
index 2df5060cd..a193bcda9 100644
--- a/ppd/hpcups/hp-officejet_g95.ppd.gz
+++ b/ppd/hpcups/hp-officejet_g95.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_h470.ppd.gz b/ppd/hpcups/hp-officejet_h470.ppd.gz
index e8103ae97..8181908c4 100644
--- a/ppd/hpcups/hp-officejet_h470.ppd.gz
+++ b/ppd/hpcups/hp-officejet_h470.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz
index dc200aa55..d53f35ecd 100644
--- a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j3600_series.ppd.gz b/ppd/hpcups/hp-officejet_j3600_series.ppd.gz
index 4d2b2732f..a2a3154c7 100644
--- a/ppd/hpcups/hp-officejet_j3600_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j3600_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j4500_series.ppd.gz b/ppd/hpcups/hp-officejet_j4500_series.ppd.gz
index 312bc79bc..3f41b11c0 100644
--- a/ppd/hpcups/hp-officejet_j4500_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j4500_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j4660_series.ppd.gz b/ppd/hpcups/hp-officejet_j4660_series.ppd.gz
index 27a43b771..639b6d7c5 100644
--- a/ppd/hpcups/hp-officejet_j4660_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j4660_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j4680_series.ppd.gz b/ppd/hpcups/hp-officejet_j4680_series.ppd.gz
index 7ae00270f..cad1d812f 100644
--- a/ppd/hpcups/hp-officejet_j4680_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j4680_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j5500_series.ppd.gz b/ppd/hpcups/hp-officejet_j5500_series.ppd.gz
index 8b8c7d7cb..8a21be666 100644
--- a/ppd/hpcups/hp-officejet_j5500_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j5500_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j5700_series.ppd.gz b/ppd/hpcups/hp-officejet_j5700_series.ppd.gz
index 6f4fa8f05..b25ec21e4 100644
--- a/ppd/hpcups/hp-officejet_j5700_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j5700_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_j6400_series.ppd.gz b/ppd/hpcups/hp-officejet_j6400_series.ppd.gz
index b5c2eed92..ccb779423 100644
--- a/ppd/hpcups/hp-officejet_j6400_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_j6400_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_k60.ppd.gz b/ppd/hpcups/hp-officejet_k60.ppd.gz
index 0c63c740b..5dc571284 100644
--- a/ppd/hpcups/hp-officejet_k60.ppd.gz
+++ b/ppd/hpcups/hp-officejet_k60.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_k60xi.ppd.gz b/ppd/hpcups/hp-officejet_k60xi.ppd.gz
index 58438d0b1..2749075af 100644
--- a/ppd/hpcups/hp-officejet_k60xi.ppd.gz
+++ b/ppd/hpcups/hp-officejet_k60xi.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_k7100.ppd.gz b/ppd/hpcups/hp-officejet_k7100.ppd.gz
index 11031ba51..e9646d720 100644
--- a/ppd/hpcups/hp-officejet_k7100.ppd.gz
+++ b/ppd/hpcups/hp-officejet_k7100.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_k80.ppd.gz b/ppd/hpcups/hp-officejet_k80.ppd.gz
index a130ba86e..f380088d9 100644
--- a/ppd/hpcups/hp-officejet_k80.ppd.gz
+++ b/ppd/hpcups/hp-officejet_k80.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_k80xi.ppd.gz b/ppd/hpcups/hp-officejet_k80xi.ppd.gz
index b86851af1..83da90299 100644
--- a/ppd/hpcups/hp-officejet_k80xi.ppd.gz
+++ b/ppd/hpcups/hp-officejet_k80xi.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_lx.ppd.gz b/ppd/hpcups/hp-officejet_lx.ppd.gz
index a6f0899c7..221338d84 100644
--- a/ppd/hpcups/hp-officejet_lx.ppd.gz
+++ b/ppd/hpcups/hp-officejet_lx.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz b/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz
index 995d19166..b166e8bef 100644
--- a/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz
index 699f2586a..bf92295e7 100644
--- a/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_3610.ppd.gz b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz
index d78ed060b..616c49fbd 100644
--- a/ppd/hpcups/hp-officejet_pro_3610.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz
index 27eedd24a..269cd1332 100644
--- a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_6230.ppd.gz b/ppd/hpcups/hp-officejet_pro_6230.ppd.gz
index 845611a91..e94bc84fa 100644
--- a/ppd/hpcups/hp-officejet_pro_6230.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_6230.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_6830.ppd.gz b/ppd/hpcups/hp-officejet_pro_6830.ppd.gz
index 6e371fb50..f094fde52 100644
--- a/ppd/hpcups/hp-officejet_pro_6830.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_6830.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_6960.ppd.gz b/ppd/hpcups/hp-officejet_pro_6960.ppd.gz
index 8c440acbc..15fb08fec 100644
--- a/ppd/hpcups/hp-officejet_pro_6960.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_6960.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_6970.ppd.gz b/ppd/hpcups/hp-officejet_pro_6970.ppd.gz
index 5ecfcfa44..00d9a08d0 100644
--- a/ppd/hpcups/hp-officejet_pro_6970.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_6970.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz
index 7ee02cb65..46891c6cd 100644
--- a/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz
index 49c1dccce..7e68bfe39 100644
--- a/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz
index 1f7b666b4..b5b7bbec3 100644
--- a/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz
index 40868df2b..5289b2465 100644
--- a/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz
index c3f4143a9..d9e621114 100644
--- a/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz
index a62dbe063..a6242d26d 100644
--- a/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz
index 76a3fae32..fb6bcd285 100644
--- a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz
index 63daaff7d..891e091d3 100644
--- a/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz
index bf65dd7c2..536ef0fad 100644
--- a/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz
index b4a64ba18..cfd5226c0 100644
--- a/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz
index 200a4cfe5..27b81e913 100644
--- a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8600.ppd.gz b/ppd/hpcups/hp-officejet_pro_8600.ppd.gz
index dd04f70e3..8c9dbe719 100644
--- a/ppd/hpcups/hp-officejet_pro_8600.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8600.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8610.ppd.gz b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz
index ec6f033fd..776f46252 100644
--- a/ppd/hpcups/hp-officejet_pro_8610.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8620.ppd.gz b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz
index 6f3bbba4b..d4c83e52b 100644
--- a/ppd/hpcups/hp-officejet_pro_8620.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8630.ppd.gz b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz
index d59675ffa..e060b576e 100644
--- a/ppd/hpcups/hp-officejet_pro_8630.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8640.ppd.gz b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz
index 66ff9bead..2d891762e 100644
--- a/ppd/hpcups/hp-officejet_pro_8640.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8660.ppd.gz b/ppd/hpcups/hp-officejet_pro_8660.ppd.gz
index 89d5166f3..91db4e1f4 100644
--- a/ppd/hpcups/hp-officejet_pro_8660.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8660.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8710.ppd.gz b/ppd/hpcups/hp-officejet_pro_8710.ppd.gz
index ea410d1ce..b9c42a087 100644
--- a/ppd/hpcups/hp-officejet_pro_8710.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8710.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_8720.ppd.gz b/ppd/hpcups/hp-officejet_pro_8720.ppd.gz
index c36d4194f..be8b7f2ab 100644
--- a/ppd/hpcups/hp-officejet_pro_8720.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_8720.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz
index 9806a8e00..4072bef27 100644
--- a/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz
index 728f59acb..310be5a83 100644
--- a/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz
index f1645bddd..3f3b18652 100644
--- a/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz
index 676e97b74..8963a2379 100644
--- a/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_k550.ppd.gz b/ppd/hpcups/hp-officejet_pro_k550.ppd.gz
index 7776b4dad..7cb3a243c 100644
--- a/ppd/hpcups/hp-officejet_pro_k550.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_k550.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_k850.ppd.gz b/ppd/hpcups/hp-officejet_pro_k850.ppd.gz
index e8ebbf4d3..f582284d1 100644
--- a/ppd/hpcups/hp-officejet_pro_k850.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_k850.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz b/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz
index 41b2dbce8..94e8d83a1 100644
--- a/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz
index e31258851..309b9ea77 100644
--- a/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz
index 43feb0148..7939fa499 100644
--- a/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz
index 689759e35..36328a9c2 100644
--- a/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz
index e507a7385..fb7e17ce9 100644
--- a/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz
index a10777621..63918ed15 100644
--- a/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz
+++ b/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_r40.ppd.gz b/ppd/hpcups/hp-officejet_r40.ppd.gz
index 47daaef4f..5436aaf75 100644
--- a/ppd/hpcups/hp-officejet_r40.ppd.gz
+++ b/ppd/hpcups/hp-officejet_r40.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_r40xi.ppd.gz b/ppd/hpcups/hp-officejet_r40xi.ppd.gz
index f7054fb33..71d47a3e1 100644
--- a/ppd/hpcups/hp-officejet_r40xi.ppd.gz
+++ b/ppd/hpcups/hp-officejet_r40xi.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_r45.ppd.gz b/ppd/hpcups/hp-officejet_r45.ppd.gz
index 2b36231ab..fa44e8bf7 100644
--- a/ppd/hpcups/hp-officejet_r45.ppd.gz
+++ b/ppd/hpcups/hp-officejet_r45.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_r60.ppd.gz b/ppd/hpcups/hp-officejet_r60.ppd.gz
index 0985fe54b..9e8b39494 100644
--- a/ppd/hpcups/hp-officejet_r60.ppd.gz
+++ b/ppd/hpcups/hp-officejet_r60.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_r65.ppd.gz b/ppd/hpcups/hp-officejet_r65.ppd.gz
index 725226f0d..6472e1dbb 100644
--- a/ppd/hpcups/hp-officejet_r65.ppd.gz
+++ b/ppd/hpcups/hp-officejet_r65.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_r80.ppd.gz b/ppd/hpcups/hp-officejet_r80.ppd.gz
index 93f168be9..c1af58a9a 100644
--- a/ppd/hpcups/hp-officejet_r80.ppd.gz
+++ b/ppd/hpcups/hp-officejet_r80.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_r80xi.ppd.gz b/ppd/hpcups/hp-officejet_r80xi.ppd.gz
index 9657efe2a..c5189c995 100644
--- a/ppd/hpcups/hp-officejet_r80xi.ppd.gz
+++ b/ppd/hpcups/hp-officejet_r80xi.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_300.ppd.gz b/ppd/hpcups/hp-officejet_series_300.ppd.gz
index 87cf6ec9f..0ba86a650 100644
--- a/ppd/hpcups/hp-officejet_series_300.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_300.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_310.ppd.gz b/ppd/hpcups/hp-officejet_series_310.ppd.gz
index 567497752..b05ad2331 100644
--- a/ppd/hpcups/hp-officejet_series_310.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_310.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_320.ppd.gz b/ppd/hpcups/hp-officejet_series_320.ppd.gz
index b466ce526..57e36559e 100644
--- a/ppd/hpcups/hp-officejet_series_320.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_320.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_330.ppd.gz b/ppd/hpcups/hp-officejet_series_330.ppd.gz
index 495c7be24..416601552 100644
--- a/ppd/hpcups/hp-officejet_series_330.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_330.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_350.ppd.gz b/ppd/hpcups/hp-officejet_series_350.ppd.gz
index 1789f7251..8d7a8594b 100644
--- a/ppd/hpcups/hp-officejet_series_350.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_350.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_520.ppd.gz b/ppd/hpcups/hp-officejet_series_520.ppd.gz
index 05eb020e5..29307f079 100644
--- a/ppd/hpcups/hp-officejet_series_520.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_520.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_570.ppd.gz b/ppd/hpcups/hp-officejet_series_570.ppd.gz
index ca91d986a..31d2248de 100644
--- a/ppd/hpcups/hp-officejet_series_570.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_570.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_580.ppd.gz b/ppd/hpcups/hp-officejet_series_580.ppd.gz
index 6d3960a80..bf16399c7 100644
--- a/ppd/hpcups/hp-officejet_series_580.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_580.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_590.ppd.gz b/ppd/hpcups/hp-officejet_series_590.ppd.gz
index fd093782a..11bad0a6c 100644
--- a/ppd/hpcups/hp-officejet_series_590.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_590.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_600.ppd.gz b/ppd/hpcups/hp-officejet_series_600.ppd.gz
index fbb2e751a..c4c224fb4 100644
--- a/ppd/hpcups/hp-officejet_series_600.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_600.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_610.ppd.gz b/ppd/hpcups/hp-officejet_series_610.ppd.gz
index 708cea1ac..d4729c55e 100644
--- a/ppd/hpcups/hp-officejet_series_610.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_610.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_630.ppd.gz b/ppd/hpcups/hp-officejet_series_630.ppd.gz
index d7085dc75..cad9ce5b4 100644
--- a/ppd/hpcups/hp-officejet_series_630.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_630.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_700.ppd.gz b/ppd/hpcups/hp-officejet_series_700.ppd.gz
index 2be4ffc46..6be87dabf 100644
--- a/ppd/hpcups/hp-officejet_series_700.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_700.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_710.ppd.gz b/ppd/hpcups/hp-officejet_series_710.ppd.gz
index b18ac82d2..5264d65e4 100644
--- a/ppd/hpcups/hp-officejet_series_710.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_710.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_720.ppd.gz b/ppd/hpcups/hp-officejet_series_720.ppd.gz
index c4ce11171..25a395c5c 100644
--- a/ppd/hpcups/hp-officejet_series_720.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_720.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_series_725.ppd.gz b/ppd/hpcups/hp-officejet_series_725.ppd.gz
index 772d23a56..27d984dc5 100644
--- a/ppd/hpcups/hp-officejet_series_725.ppd.gz
+++ b/ppd/hpcups/hp-officejet_series_725.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_t_series.ppd.gz b/ppd/hpcups/hp-officejet_t_series.ppd.gz
index 7ed06c1af..8988738f2 100644
--- a/ppd/hpcups/hp-officejet_t_series.ppd.gz
+++ b/ppd/hpcups/hp-officejet_t_series.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_v30.ppd.gz b/ppd/hpcups/hp-officejet_v30.ppd.gz
index 74d6dfdf1..7aaa4c9cb 100644
--- a/ppd/hpcups/hp-officejet_v30.ppd.gz
+++ b/ppd/hpcups/hp-officejet_v30.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_v40.ppd.gz b/ppd/hpcups/hp-officejet_v40.ppd.gz
index 4999a47b0..eec42842b 100644
--- a/ppd/hpcups/hp-officejet_v40.ppd.gz
+++ b/ppd/hpcups/hp-officejet_v40.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_v40xi.ppd.gz b/ppd/hpcups/hp-officejet_v40xi.ppd.gz
index e074394a7..b832b6c83 100644
--- a/ppd/hpcups/hp-officejet_v40xi.ppd.gz
+++ b/ppd/hpcups/hp-officejet_v40xi.ppd.gz
diff --git a/ppd/hpcups/hp-officejet_v45.ppd.gz b/ppd/hpcups/hp-officejet_v45.ppd.gz
index ae3c92f16..79a7514ed 100644
--- a/ppd/hpcups/hp-officejet_v45.ppd.gz
+++ b/ppd/hpcups/hp-officejet_v45.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_100.ppd.gz b/ppd/hpcups/hp-photosmart_100.ppd.gz
index b1682bc43..909e57d71 100644
--- a/ppd/hpcups/hp-photosmart_100.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_100.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_1115.ppd.gz b/ppd/hpcups/hp-photosmart_1115.ppd.gz
index 126b2259c..7796e5a97 100644
--- a/ppd/hpcups/hp-photosmart_1115.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_1115.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_1215.ppd.gz b/ppd/hpcups/hp-photosmart_1215.ppd.gz
index f9adaa451..874591bed 100644
--- a/ppd/hpcups/hp-photosmart_1215.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_1215.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_1218.ppd.gz b/ppd/hpcups/hp-photosmart_1218.ppd.gz
index f91ad3577..83ada8263 100644
--- a/ppd/hpcups/hp-photosmart_1218.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_1218.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_130.ppd.gz b/ppd/hpcups/hp-photosmart_130.ppd.gz
index ace0625a0..6407081e1 100644
--- a/ppd/hpcups/hp-photosmart_130.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_130.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_1315.ppd.gz b/ppd/hpcups/hp-photosmart_1315.ppd.gz
index b018d9cc8..53d825f1c 100644
--- a/ppd/hpcups/hp-photosmart_1315.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_1315.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_140_series.ppd.gz b/ppd/hpcups/hp-photosmart_140_series.ppd.gz
index 39dc0e378..9a8d3f63e 100644
--- a/ppd/hpcups/hp-photosmart_140_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_140_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_230.ppd.gz b/ppd/hpcups/hp-photosmart_230.ppd.gz
index b66305731..810751511 100644
--- a/ppd/hpcups/hp-photosmart_230.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_230.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_240_series.ppd.gz b/ppd/hpcups/hp-photosmart_240_series.ppd.gz
index b5d81369c..0afb43d5a 100644
--- a/ppd/hpcups/hp-photosmart_240_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_240_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_2570_series.ppd.gz b/ppd/hpcups/hp-photosmart_2570_series.ppd.gz
index aaf0cd533..2745972f4 100644
--- a/ppd/hpcups/hp-photosmart_2570_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_2570_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_2600_series.ppd.gz b/ppd/hpcups/hp-photosmart_2600_series.ppd.gz
index 9cb8e8f72..6b44d969e 100644
--- a/ppd/hpcups/hp-photosmart_2600_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_2600_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_2700_series.ppd.gz b/ppd/hpcups/hp-photosmart_2700_series.ppd.gz
index 7ade8390c..addf3e884 100644
--- a/ppd/hpcups/hp-photosmart_2700_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_2700_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_3100_series.ppd.gz b/ppd/hpcups/hp-photosmart_3100_series.ppd.gz
index b387360d4..1444240c9 100644
--- a/ppd/hpcups/hp-photosmart_3100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_3100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_3200_series.ppd.gz b/ppd/hpcups/hp-photosmart_3200_series.ppd.gz
index 038618591..1d341fba6 100644
--- a/ppd/hpcups/hp-photosmart_3200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_3200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_320_series.ppd.gz b/ppd/hpcups/hp-photosmart_320_series.ppd.gz
index 15897aedf..182315aba 100644
--- a/ppd/hpcups/hp-photosmart_320_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_320_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_3300_series.ppd.gz b/ppd/hpcups/hp-photosmart_3300_series.ppd.gz
index 92415cbb3..dfdd74787 100644
--- a/ppd/hpcups/hp-photosmart_3300_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_3300_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_330_series.ppd.gz b/ppd/hpcups/hp-photosmart_330_series.ppd.gz
index aab15084c..29ab642d3 100644
--- a/ppd/hpcups/hp-photosmart_330_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_330_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_370_series.ppd.gz b/ppd/hpcups/hp-photosmart_370_series.ppd.gz
index 575605b71..6f1f89acf 100644
--- a/ppd/hpcups/hp-photosmart_370_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_370_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_380_series.ppd.gz b/ppd/hpcups/hp-photosmart_380_series.ppd.gz
index a72e14bed..cc66c9b5a 100644
--- a/ppd/hpcups/hp-photosmart_380_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_380_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_420_series.ppd.gz b/ppd/hpcups/hp-photosmart_420_series.ppd.gz
index e02b58345..f1fafefe7 100644
--- a/ppd/hpcups/hp-photosmart_420_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_420_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_470_series.ppd.gz b/ppd/hpcups/hp-photosmart_470_series.ppd.gz
index 7c7dfe4be..5266d6ba2 100644
--- a/ppd/hpcups/hp-photosmart_470_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_470_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_5510_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz
index 374da2f88..00e0c26a0 100644
--- a/ppd/hpcups/hp-photosmart_5510_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz
index b34fda86e..da850dddf 100644
--- a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz b/ppd/hpcups/hp-photosmart_5520_series.ppd.gz
index bf409913d..c35cf6c37 100644
--- a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_5520_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz
index a1b00d420..0b963589d 100644
--- a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz
index ef9e5bbb5..362eabec2 100644
--- a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz
index fe79dcad4..addbd3295 100644
--- a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7345.ppd.gz b/ppd/hpcups/hp-photosmart_7345.ppd.gz
index 3ae913a3c..9fcdddeae 100644
--- a/ppd/hpcups/hp-photosmart_7345.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7345.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz
index 7d2be0719..c2057a550 100644
--- a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7510_series.ppd.gz b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz
index ef01a8ec6..860fb9a6f 100644
--- a/ppd/hpcups/hp-photosmart_7510_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7520_series.ppd.gz b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz
index 1f64c26ce..e2b1cbe22 100644
--- a/ppd/hpcups/hp-photosmart_7520_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7550.ppd.gz b/ppd/hpcups/hp-photosmart_7550.ppd.gz
index 136429c56..cb038fa93 100644
--- a/ppd/hpcups/hp-photosmart_7550.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7550.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7600_series.ppd.gz b/ppd/hpcups/hp-photosmart_7600_series.ppd.gz
index 3f5e3c864..3a6535c31 100644
--- a/ppd/hpcups/hp-photosmart_7600_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7600_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7700_series.ppd.gz b/ppd/hpcups/hp-photosmart_7700_series.ppd.gz
index 357d08e65..cbf700285 100644
--- a/ppd/hpcups/hp-photosmart_7700_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7700_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7800_series.ppd.gz b/ppd/hpcups/hp-photosmart_7800_series.ppd.gz
index 4c368eea6..7e8f0df64 100644
--- a/ppd/hpcups/hp-photosmart_7800_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7800_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_7900_series.ppd.gz b/ppd/hpcups/hp-photosmart_7900_series.ppd.gz
index 95a32244f..05981cf2e 100644
--- a/ppd/hpcups/hp-photosmart_7900_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_7900_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_8000_series.ppd.gz b/ppd/hpcups/hp-photosmart_8000_series.ppd.gz
index 721a0a5c1..473dd93c1 100644
--- a/ppd/hpcups/hp-photosmart_8000_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_8000_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_8100_series.ppd.gz b/ppd/hpcups/hp-photosmart_8100_series.ppd.gz
index 8817b45b9..6fcce0c82 100644
--- a/ppd/hpcups/hp-photosmart_8100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_8100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_8200_series.ppd.gz b/ppd/hpcups/hp-photosmart_8200_series.ppd.gz
index fa7dbdf42..c2f904aae 100644
--- a/ppd/hpcups/hp-photosmart_8200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_8200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_8400_series.ppd.gz b/ppd/hpcups/hp-photosmart_8400_series.ppd.gz
index f73f5d7e4..2b84f1235 100644
--- a/ppd/hpcups/hp-photosmart_8400_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_8400_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_8700_series.ppd.gz b/ppd/hpcups/hp-photosmart_8700_series.ppd.gz
index 5864ff7c1..a6fe46426 100644
--- a/ppd/hpcups/hp-photosmart_8700_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_8700_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a310_series.ppd.gz b/ppd/hpcups/hp-photosmart_a310_series.ppd.gz
index ee1565a91..0542edef5 100644
--- a/ppd/hpcups/hp-photosmart_a310_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a310_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a320_series.ppd.gz b/ppd/hpcups/hp-photosmart_a320_series.ppd.gz
index a037d6bb6..d612f5246 100644
--- a/ppd/hpcups/hp-photosmart_a320_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a320_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a430_series.ppd.gz b/ppd/hpcups/hp-photosmart_a430_series.ppd.gz
index 380550373..eb5fd5382 100644
--- a/ppd/hpcups/hp-photosmart_a430_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a430_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a440_series.ppd.gz b/ppd/hpcups/hp-photosmart_a440_series.ppd.gz
index d4e7ffa3c..a08b696d1 100644
--- a/ppd/hpcups/hp-photosmart_a440_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a440_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a510_series.ppd.gz b/ppd/hpcups/hp-photosmart_a510_series.ppd.gz
index 828530d30..6ef93dd78 100644
--- a/ppd/hpcups/hp-photosmart_a510_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a510_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a520_series.ppd.gz b/ppd/hpcups/hp-photosmart_a520_series.ppd.gz
index 208be2aff..e8ab9098b 100644
--- a/ppd/hpcups/hp-photosmart_a520_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a520_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a530_series.ppd.gz b/ppd/hpcups/hp-photosmart_a530_series.ppd.gz
index 99144c07a..adf0c12dc 100644
--- a/ppd/hpcups/hp-photosmart_a530_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a530_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a610_series.ppd.gz b/ppd/hpcups/hp-photosmart_a610_series.ppd.gz
index 824b2baeb..1e431c631 100644
--- a/ppd/hpcups/hp-photosmart_a610_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a610_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a620_series.ppd.gz b/ppd/hpcups/hp-photosmart_a620_series.ppd.gz
index 964ed245f..6268ce5b1 100644
--- a/ppd/hpcups/hp-photosmart_a620_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a620_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a630_series.ppd.gz b/ppd/hpcups/hp-photosmart_a630_series.ppd.gz
index ec753e16f..82ba8ae8b 100644
--- a/ppd/hpcups/hp-photosmart_a630_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a630_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a640_series.ppd.gz b/ppd/hpcups/hp-photosmart_a640_series.ppd.gz
index 922d3c7fd..43288bcb8 100644
--- a/ppd/hpcups/hp-photosmart_a640_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a640_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a710_series.ppd.gz b/ppd/hpcups/hp-photosmart_a710_series.ppd.gz
index 06a3da0bd..dba0a7cff 100644
--- a/ppd/hpcups/hp-photosmart_a710_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a710_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_a820_series.ppd.gz b/ppd/hpcups/hp-photosmart_a820_series.ppd.gz
index 08011ce36..de9712859 100644
--- a/ppd/hpcups/hp-photosmart_a820_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_a820_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz
index b25888b9c..3348d9bcc 100644
--- a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz
index fdc147c09..386afd852 100644
--- a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz
index c0e557cec..24053285d 100644
--- a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz
index f2c0d9bb0..0a91042ac 100644
--- a/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz b/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz
index c63bf26b0..6cccde486 100644
--- a/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz
index 08ba30997..1571d5d80 100644
--- a/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz
index b10248289..ce640f90d 100644
--- a/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz
index dbede65e2..bd475a1b3 100644
--- a/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz
index d5050eccf..24470b05d 100644
--- a/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz
index e2a38fc09..7881b2479 100644
--- a/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz
index 0bd4ec455..1f16fb9c6 100644
--- a/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz
index 8fed73a8e..b381fc728 100644
--- a/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz
index cd7f214f3..d19110d5a 100644
--- a/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz
index 204e7c704..5a49baf9b 100644
--- a/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz
index e8ae3ae41..2f5d4b9a4 100644
--- a/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz
index 37c68a015..4113fe307 100644
--- a/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz
index 086302561..c3eb202ee 100644
--- a/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz
index d6bee98d7..83cc8bd2a 100644
--- a/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz
index ce71cea21..9cabdd22f 100644
--- a/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz
index a94bac009..77947815d 100644
--- a/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz
index a1b484d4f..ff5ac4e7c 100644
--- a/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz
index 0faa0dbe3..6034ceba8 100644
--- a/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz
index 8b9cc8207..f2ce167a1 100644
--- a/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz
index 516457977..782cbc59b 100644
--- a/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz
index 2c8725c3f..ea2f8530f 100644
--- a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz
index 9cbc8904e..b9ab05c84 100644
--- a/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz
index dac4db6aa..6850cdde7 100644
--- a/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz
index 9a2a65be2..dcb5b6892 100644
--- a/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz
index c63582ba9..fdd4a5e9c 100644
--- a/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz
index 4c6f540d2..26517edaa 100644
--- a/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz
index 85af417ef..574b28d96 100644
--- a/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz
index 220161700..84e082dde 100644
--- a/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz
index 4c18024b0..e5bc5622a 100644
--- a/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz
index 5a9f28246..87cc47e83 100644
--- a/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz
index 9836fdf6b..3e195ed12 100644
--- a/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz
index 7b0527e13..63ac8dc83 100644
--- a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz
index f565794ad..e46d4b012 100644
--- a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_p1000.ppd.gz b/ppd/hpcups/hp-photosmart_p1000.ppd.gz
index faee43e17..9d77e3b06 100644
--- a/ppd/hpcups/hp-photosmart_p1000.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_p1000.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_p1100.ppd.gz b/ppd/hpcups/hp-photosmart_p1100.ppd.gz
index a2b90836d..6efe01312 100644
--- a/ppd/hpcups/hp-photosmart_p1100.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_p1100.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz b/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz
index 77c380b09..6f93345f8 100644
--- a/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz
index 4f0ba9156..adacc0272 100644
--- a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz
index 63dcf8cc3..ed2046b0d 100644
--- a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz
index b38cd41d5..52500c10e 100644
--- a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz
index 2d61bb691..3522dfa8a 100644
--- a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz
index 0d5310906..da20bcb17 100644
--- a/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz b/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz
index eb27009f2..2d14c65f9 100644
--- a/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz b/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz
index dab08755f..3bc82786e 100644
--- a/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz
diff --git a/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz b/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz
index 4ac2b9dfc..68979d0b8 100644
--- a/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz
+++ b/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz
diff --git a/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz b/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz
index 2b367b483..15bec8657 100644
--- a/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz
+++ b/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1000_series.ppd.gz b/ppd/hpcups/hp-psc_1000_series.ppd.gz
index 0e5046af8..dd5caec13 100644
--- a/ppd/hpcups/hp-psc_1000_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1000_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1100_series.ppd.gz b/ppd/hpcups/hp-psc_1100_series.ppd.gz
index ab6abb43e..c4fe74db5 100644
--- a/ppd/hpcups/hp-psc_1100_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1100_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1200_series.ppd.gz b/ppd/hpcups/hp-psc_1200_series.ppd.gz
index 570e2732a..e8bb8a727 100644
--- a/ppd/hpcups/hp-psc_1200_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1200_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1300_series.ppd.gz b/ppd/hpcups/hp-psc_1300_series.ppd.gz
index 3670d2bcf..a344cf50a 100644
--- a/ppd/hpcups/hp-psc_1300_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1300_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1310_series.ppd.gz b/ppd/hpcups/hp-psc_1310_series.ppd.gz
index 5395c4444..3fdebab4b 100644
--- a/ppd/hpcups/hp-psc_1310_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1310_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1358_series.ppd.gz b/ppd/hpcups/hp-psc_1358_series.ppd.gz
index e9bbd7f22..4d4aee687 100644
--- a/ppd/hpcups/hp-psc_1358_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1358_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1400_series.ppd.gz b/ppd/hpcups/hp-psc_1400_series.ppd.gz
index 28d1ca3bb..ef1b021d8 100644
--- a/ppd/hpcups/hp-psc_1400_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1400_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1500_series.ppd.gz b/ppd/hpcups/hp-psc_1500_series.ppd.gz
index 8b6d0ac51..d7eae5d4d 100644
--- a/ppd/hpcups/hp-psc_1500_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1500_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1510_series.ppd.gz b/ppd/hpcups/hp-psc_1510_series.ppd.gz
index 5d9815694..dbda09960 100644
--- a/ppd/hpcups/hp-psc_1510_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1510_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_1600_series.ppd.gz b/ppd/hpcups/hp-psc_1600_series.ppd.gz
index 1dbd78dcd..8ae82d9ee 100644
--- a/ppd/hpcups/hp-psc_1600_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_1600_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2100_series.ppd.gz b/ppd/hpcups/hp-psc_2100_series.ppd.gz
index ff7ceb965..a68c69ee5 100644
--- a/ppd/hpcups/hp-psc_2100_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2100_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2150_series.ppd.gz b/ppd/hpcups/hp-psc_2150_series.ppd.gz
index 703cf9a8a..3c33040c5 100644
--- a/ppd/hpcups/hp-psc_2150_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2150_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2170_series.ppd.gz b/ppd/hpcups/hp-psc_2170_series.ppd.gz
index 699546323..8d4e6f70b 100644
--- a/ppd/hpcups/hp-psc_2170_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2170_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2200_series.ppd.gz b/ppd/hpcups/hp-psc_2200_series.ppd.gz
index 584342d2a..9d62b71eb 100644
--- a/ppd/hpcups/hp-psc_2200_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2200_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2210_series.ppd.gz b/ppd/hpcups/hp-psc_2210_series.ppd.gz
index 25f9a1cb0..154429e39 100644
--- a/ppd/hpcups/hp-psc_2210_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2210_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2300_series.ppd.gz b/ppd/hpcups/hp-psc_2300_series.ppd.gz
index 219d06bd3..28a7c45c0 100644
--- a/ppd/hpcups/hp-psc_2300_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2300_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2350_series.ppd.gz b/ppd/hpcups/hp-psc_2350_series.ppd.gz
index 5e34a40d6..284f9f0c7 100644
--- a/ppd/hpcups/hp-psc_2350_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2350_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2400_series.ppd.gz b/ppd/hpcups/hp-psc_2400_series.ppd.gz
index ca3f8097a..29d7fa4c2 100644
--- a/ppd/hpcups/hp-psc_2400_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2400_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_2500_series.ppd.gz b/ppd/hpcups/hp-psc_2500_series.ppd.gz
index 32e97c48e..f72ff43fb 100644
--- a/ppd/hpcups/hp-psc_2500_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_2500_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_500.ppd.gz b/ppd/hpcups/hp-psc_500.ppd.gz
index ce0bf1c3c..a8dba99ee 100644
--- a/ppd/hpcups/hp-psc_500.ppd.gz
+++ b/ppd/hpcups/hp-psc_500.ppd.gz
diff --git a/ppd/hpcups/hp-psc_720.ppd.gz b/ppd/hpcups/hp-psc_720.ppd.gz
index 276077996..4a360ca82 100644
--- a/ppd/hpcups/hp-psc_720.ppd.gz
+++ b/ppd/hpcups/hp-psc_720.ppd.gz
diff --git a/ppd/hpcups/hp-psc_750.ppd.gz b/ppd/hpcups/hp-psc_750.ppd.gz
index 6c25c2bfd..e17217d37 100644
--- a/ppd/hpcups/hp-psc_750.ppd.gz
+++ b/ppd/hpcups/hp-psc_750.ppd.gz
diff --git a/ppd/hpcups/hp-psc_750xi.ppd.gz b/ppd/hpcups/hp-psc_750xi.ppd.gz
index 3b8c4dcca..ca9d8ac04 100644
--- a/ppd/hpcups/hp-psc_750xi.ppd.gz
+++ b/ppd/hpcups/hp-psc_750xi.ppd.gz
diff --git a/ppd/hpcups/hp-psc_760.ppd.gz b/ppd/hpcups/hp-psc_760.ppd.gz
index 28728bc7c..d069d20a1 100644
--- a/ppd/hpcups/hp-psc_760.ppd.gz
+++ b/ppd/hpcups/hp-psc_760.ppd.gz
diff --git a/ppd/hpcups/hp-psc_780.ppd.gz b/ppd/hpcups/hp-psc_780.ppd.gz
index 406595887..97e5a0007 100644
--- a/ppd/hpcups/hp-psc_780.ppd.gz
+++ b/ppd/hpcups/hp-psc_780.ppd.gz
diff --git a/ppd/hpcups/hp-psc_780xi.ppd.gz b/ppd/hpcups/hp-psc_780xi.ppd.gz
index 69473c031..74903e9f6 100644
--- a/ppd/hpcups/hp-psc_780xi.ppd.gz
+++ b/ppd/hpcups/hp-psc_780xi.ppd.gz
diff --git a/ppd/hpcups/hp-psc_900_series.ppd.gz b/ppd/hpcups/hp-psc_900_series.ppd.gz
index f141142aa..0aa250ddd 100644
--- a/ppd/hpcups/hp-psc_900_series.ppd.gz
+++ b/ppd/hpcups/hp-psc_900_series.ppd.gz
diff --git a/ppd/hpcups/hp-psc_920.ppd.gz b/ppd/hpcups/hp-psc_920.ppd.gz
index 807c53365..0d632f2fc 100644
--- a/ppd/hpcups/hp-psc_920.ppd.gz
+++ b/ppd/hpcups/hp-psc_920.ppd.gz
diff --git a/ppd/hpcups/hp-psc_950.ppd.gz b/ppd/hpcups/hp-psc_950.ppd.gz
index 08ca18990..be408f762 100644
--- a/ppd/hpcups/hp-psc_950.ppd.gz
+++ b/ppd/hpcups/hp-psc_950.ppd.gz
diff --git a/ppd/hpcups/hp-psc_950vr.ppd.gz b/ppd/hpcups/hp-psc_950vr.ppd.gz
index 0d9a2be51..f7ed3af0d 100644
--- a/ppd/hpcups/hp-psc_950vr.ppd.gz
+++ b/ppd/hpcups/hp-psc_950vr.ppd.gz
diff --git a/ppd/hpcups/hp-psc_950xi.ppd.gz b/ppd/hpcups/hp-psc_950xi.ppd.gz
index 8b7828145..cf30d061a 100644
--- a/ppd/hpcups/hp-psc_950xi.ppd.gz
+++ b/ppd/hpcups/hp-psc_950xi.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_350_series.ppd.gz b/ppd/hpcups/hp-smart_tank_350_series.ppd.gz
index 740be7f8a..fd5b5fa31 100644
--- a/ppd/hpcups/hp-smart_tank_350_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_350_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_500_series.ppd.gz b/ppd/hpcups/hp-smart_tank_500_series.ppd.gz
index 9d7fd6407..681f18e77 100644
--- a/ppd/hpcups/hp-smart_tank_500_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_500_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_510_series.ppd.gz b/ppd/hpcups/hp-smart_tank_510_series.ppd.gz
index e51759734..98a48479a 100644
--- a/ppd/hpcups/hp-smart_tank_510_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_510_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_530_series.ppd.gz b/ppd/hpcups/hp-smart_tank_530_series.ppd.gz
index c7bf486ca..e07e47503 100644
--- a/ppd/hpcups/hp-smart_tank_530_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_530_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_610_series.ppd.gz b/ppd/hpcups/hp-smart_tank_610_series.ppd.gz
index cfa13d9d2..e43e5f62b 100644
--- a/ppd/hpcups/hp-smart_tank_610_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_610_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz
index ae66dd591..15af9dc39 100644
--- a/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz
index cd81cd83c..bd40e01d1 100644
--- a/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz
index fb08fa373..22d39b4e1 100644
--- a/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz
diff --git a/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz b/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz
index ef2418e33..20b71d793 100644
--- a/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz
+++ b/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz
diff --git a/ppd/hpcups/hp-tango.ppd.gz b/ppd/hpcups/hp-tango.ppd.gz
index b15e8f9a5..0d3c42f7e 100644
--- a/ppd/hpcups/hp-tango.ppd.gz
+++ b/ppd/hpcups/hp-tango.ppd.gz
diff --git a/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz
index 993d9cc8e..ad5023d02 100644
--- a/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz
+++ b/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz
diff --git a/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz
index 2b68e6670..d4da87e3a 100644
--- a/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz
+++ b/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz
diff --git a/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz
index 83577a7d1..ff0c015cc 100644
--- a/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz
+++ b/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz
diff --git a/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz
index 848732e87..dd14c7fd5 100644
--- a/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz
+++ b/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz
diff --git a/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz
index f4638f6db..d7273f69c 100644
--- a/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz
+++ b/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz
diff --git a/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz b/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz
index 1125c220f..79cc81b39 100644
--- a/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz
+++ b/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz
diff --git a/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz b/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
index cbc779579..78d6e8752 100644
--- a/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
+++ b/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
diff --git a/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz b/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
index d5a375604..2d09ca4d2 100644
--- a/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
+++ b/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
diff --git a/prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz b/prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz
index 7fa46896f..114564292 100644
--- a/prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz
+++ b/prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet-ps.ppd.gz b/prnt/ps/hp-color_laserjet-ps.ppd.gz
index 276b3ebff..fc19b5d54 100644
--- a/prnt/ps/hp-color_laserjet-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz
index 3d2a44f8a..b3e1de530 100644
--- a/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz
index 49ee0ab6c..0b61ebde1 100644
--- a/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz
index 4d4f0aac3..0e13d77ef 100644
--- a/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz
index 1114d4de7..9c60d8f55 100644
--- a/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz
index 3f975bc72..41d56295f 100644
--- a/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz
index b06ed5d63..e8adbceae 100644
--- a/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz
index 6752d03e5..08fa32592 100644
--- a/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz
index 37a00d933..686a574f6 100644
--- a/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz
index 547b77bfb..6d357db1e 100644
--- a/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz
index 56483dbcd..450426470 100644
--- a/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz
index c0a9ede04..bfde465c3 100644
--- a/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz
index a2e9a0523..6620c51b7 100644
--- a/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz
index 1faaff285..588aa06c2 100644
--- a/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz
index f94760273..c7e018261 100644
--- a/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz
index 8554e9fef..d48272d5c 100644
--- a/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz
index cc380cfba..0aeb2d0f8 100644
--- a/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz
index 0ff1b2d00..cd2b423d6 100644
--- a/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz
index 01813e0fe..6f8338f2d 100644
--- a/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz
index 0ce187cd6..82fda6cd0 100644
--- a/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz
index cdc1c6745..817d409eb 100644
--- a/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz
index eecc37c6a..afbf66f45 100644
--- a/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz
index c19dec2bc..a21f9a193 100644
--- a/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz
index d1a7f4f64..91bd4f72d 100644
--- a/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz
index a385c6a7d..7e1278b99 100644
--- a/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz
index 6ba7eff38..15c45a01b 100644
--- a/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz
index 8ea46b934..a0baf6960 100644
--- a/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz
index adaa760f1..f89fd1efa 100644
--- a/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz
index 805425681..706a31ff1 100644
--- a/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz
index 1f51a5be8..de3d96181 100644
--- a/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz
index 6dbc6b38e..efedcaf40 100644
--- a/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz
index 9e325e4a5..0880c3db5 100644
--- a/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz b/prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz
index 94ad597e2..4d4da5807 100644
--- a/prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz
index fa2f502c6..b25c262f0 100644
--- a/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz
index 316860861..56bab068c 100644
--- a/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
index ddd988573..c275c0d5f 100644
--- a/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
index 048e1ad85..b869d8c5f 100644
--- a/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
index be140cb15..54ff50e50 100644
--- a/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
index 8a86afb31..c14a57517 100644
--- a/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
index e085d6de1..25005c5d2 100644
--- a/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
index 00d010df8..003f2ccc5 100644
--- a/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
index 00aef94fd..f100f55c0 100644
--- a/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz
index b9cbeed85..4378ca379 100644
--- a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
index ff59a6162..4cfb4f4d5 100644
--- a/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
index 88fc13311..8f39ceec9 100644
--- a/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
index 79e4eea4b..bbf99bb53 100644
--- a/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
index f0c2e31ef..1693b1f02 100644
--- a/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz
index 08519bee1..83bba1c9c 100644
--- a/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz
index e6d38b37b..0125dd457 100644
--- a/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz
index 2fc0e0eb9..93be34822 100644
--- a/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz
index bb9c2ebc9..c3218a48f 100644
--- a/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz
index 3579dbcc4..c24d4b622 100644
--- a/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz
index 2bf8bb557..7dd248877 100644
--- a/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz
index 4b048fd53..70ed42373 100644
--- a/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz
index 9d5601011..3ab7e4ef4 100644
--- a/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz
index 9c5166a21..85ed1f35c 100644
--- a/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz
index 8769ec16b..bd6022469 100644
--- a/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz
index 539ccad47..a4bb1fa44 100644
--- a/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz
index 521e78b64..9d24481e0 100644
--- a/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz
index db95afeae..1bdf43cd9 100644
--- a/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz
index 8a87465de..758360c5a 100644
--- a/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz
index 2c425d716..8dcc887e7 100644
--- a/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz
index de9ea7eaf..620cb5968 100644
--- a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz
index 5566ba650..2f878e721 100644
--- a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz
index f7cb309b5..89bd6d070 100644
--- a/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz
index a8e2e4758..be650bfcb 100644
--- a/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz
index def32b0ff..fe734f2c5 100644
--- a/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz
index 62e15625c..7976131e8 100644
--- a/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
index b6d10ce60..0a74d7e2a 100644
--- a/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
index 935f15359..7f6e7399e 100644
--- a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz
index 79c6c85cb..4a4373779 100644
--- a/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz
index eb78b7229..424e0347c 100644
--- a/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz
index e0ea41083..898e9870b 100644
--- a/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz
index d6fe7d0f8..f44a4d9c4 100644
--- a/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz
index 1cd3ad23b..41a2cd175 100644
--- a/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz
index 7ac3a8842..073067f58 100644
--- a/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz
index 857271d6b..0c8186e34 100644
--- a/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz
index be0a5145b..dda197547 100644
--- a/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz
index c37fc0dc6..c937a523d 100644
--- a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz
index 5d05e46a8..25ba75991 100644
--- a/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz
index 1d017f692..4a80722f5 100644
--- a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz
index 2aa7dc143..6f51510d0 100644
--- a/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz
index 31120ba45..2de63bfba 100644
--- a/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
index 64ed6c2ec..8b68f11d4 100644
--- a/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz
index e5ae45440..712330183 100644
--- a/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
index 18e89c637..0c3ff3471 100644
--- a/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz
index 26097ea45..cf8711c90 100644
--- a/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz
index 08957eb05..2ca52a124 100644
--- a/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
index 998f075cf..6d1561527 100644
--- a/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz
index 2e63240af..7a51b9da9 100644
--- a/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz
index 20b8cff3b..66b77d7de 100644
--- a/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz
index 1a4dc4478..da9ae8093 100644
--- a/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz
index 122ee8d0a..7dda83af3 100644
--- a/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
index 27d4a8fda..ea53f1893 100644
--- a/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz
index 3279c83e0..bb77c7d85 100644
--- a/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
index c50c40468..500d7e807 100644
--- a/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
index 76358b916..0f4d36ff6 100644
--- a/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
index 563013ed7..8a3d3be9e 100644
--- a/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
+++ b/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_4000ps.ppd.gz b/prnt/ps/hp-designjet_4000ps.ppd.gz
index 0971b78d9..5c1eb3077 100644
--- a/prnt/ps/hp-designjet_4000ps.ppd.gz
+++ b/prnt/ps/hp-designjet_4000ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz
index c16adf740..0ffc76317 100644
--- a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_4500mfp.ppd.gz b/prnt/ps/hp-designjet_4500mfp.ppd.gz
index 899494665..fa52ca929 100644
--- a/prnt/ps/hp-designjet_4500mfp.ppd.gz
+++ b/prnt/ps/hp-designjet_4500mfp.ppd.gz
diff --git a/prnt/ps/hp-designjet_4500ps.ppd.gz b/prnt/ps/hp-designjet_4500ps.ppd.gz
index a7456b356..fcb2e643f 100644
--- a/prnt/ps/hp-designjet_4500ps.ppd.gz
+++ b/prnt/ps/hp-designjet_4500ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz
index b13b4f404..fcc88885b 100644
--- a/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_4520ps-ps.ppd.gz b/prnt/ps/hp-designjet_4520ps-ps.ppd.gz
index a5f7183f8..5d396d2f4 100644
--- a/prnt/ps/hp-designjet_4520ps-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_4520ps-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz
index 52b168dd3..a0373a277 100644
--- a/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz
index d588dd8e5..625973c82 100644
--- a/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz
index 9af575544..1c4f17c09 100644
--- a/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz
index 4d118f1f1..113938dde 100644
--- a/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz
index 789ad1ff2..34231e818 100644
--- a/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz
index dd1124867..ce1fe0104 100644
--- a/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_d5800-ps.ppd.gz b/prnt/ps/hp-designjet_d5800-ps.ppd.gz
index 7d2545f0d..5255712e2 100644
--- a/prnt/ps/hp-designjet_d5800-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_d5800-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz
index 1285db961..007e9e7f1 100644
--- a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz
index b1bf664c9..5f1ae10f4 100644
--- a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz
index 720835cb1..4bf732f0a 100644
--- a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz
index e859a7491..360ad1139 100644
--- a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz
index 916526fa8..19ba4c4cc 100644
--- a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz
index c93f96eb6..210c8c5f3 100644
--- a/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz
index da30986ef..398e04b6e 100644
--- a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz
+++ b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1530-postscript.ppd.gz b/prnt/ps/hp-designjet_t1530-postscript.ppd.gz
new file mode 100644
index 000000000..6efa8fa9b
--- /dev/null
+++ b/prnt/ps/hp-designjet_t1530-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz b/prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz
new file mode 100644
index 000000000..51d591ef6
--- /dev/null
+++ b/prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1600dr-ps.ppd.gz b/prnt/ps/hp-designjet_t1600dr-ps.ppd.gz
new file mode 100644
index 000000000..873e0c363
--- /dev/null
+++ b/prnt/ps/hp-designjet_t1600dr-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz
index 5e7209743..fc746db8f 100644
--- a/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz
index 954372123..42a828e97 100644
--- a/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz
index 3a4c72a84..b2ea4cdee 100644
--- a/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz
index dcccb68f9..c2778ec07 100644
--- a/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz
index 346928eb4..f45a5abed 100644
--- a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz
index 7600a2a0c..ce62fb239 100644
--- a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz
+++ b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_t2530-postscript.ppd.gz b/prnt/ps/hp-designjet_t2530-postscript.ppd.gz
new file mode 100644
index 000000000..5f5b864e1
--- /dev/null
+++ b/prnt/ps/hp-designjet_t2530-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_t2600-ps.ppd.gz b/prnt/ps/hp-designjet_t2600-ps.ppd.gz
new file mode 100644
index 000000000..56b177771
--- /dev/null
+++ b/prnt/ps/hp-designjet_t2600-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz b/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz
index 88767e365..71ef4317d 100644
--- a/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t3500-ps.ppd.gz b/prnt/ps/hp-designjet_t3500-ps.ppd.gz
index 4868c1844..a6527012d 100644
--- a/prnt/ps/hp-designjet_t3500-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t3500-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz
index d7d089f20..13014f971 100644
--- a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz
index b579472c5..e21b1a664 100644
--- a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t7200-ps.ppd.gz b/prnt/ps/hp-designjet_t7200-ps.ppd.gz
index dc123b80b..17dfc7460 100644
--- a/prnt/ps/hp-designjet_t7200-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t7200-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz
index 23c8e0e08..e91dc7440 100644
--- a/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz
index 0db4ec665..11cae1287 100644
--- a/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz
index 78bd97607..3963895d3 100644
--- a/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz
index a4c05c741..9863838e5 100644
--- a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz
index 9259b3c69..25df45595 100644
--- a/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_t920-postscript.ppd.gz b/prnt/ps/hp-designjet_t920-postscript.ppd.gz
index 1bbf83a61..e8db4e163 100644
--- a/prnt/ps/hp-designjet_t920-postscript.ppd.gz
+++ b/prnt/ps/hp-designjet_t920-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_t930-postscript.ppd.gz b/prnt/ps/hp-designjet_t930-postscript.ppd.gz
new file mode 100644
index 000000000..d13a52733
--- /dev/null
+++ b/prnt/ps/hp-designjet_t930-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz
index 79ed72306..131204219 100644
--- a/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz
index 67f0849bd..aaf22cc1e 100644
--- a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz
index 73e7c8b5e..810156565 100644
--- a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz
+++ b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz
index 109fbbfdc..fd798b83f 100644
--- a/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
index 582db2998..bb3d72643 100644
--- a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
index bbcdd6887..1a7f9c064 100644
--- a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz
index 211d33ae4..878cd8ecf 100644
--- a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz
index 41fa1c5ca..53e1ed1ba 100644
--- a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6600-postscript.ppd.gz b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz
index 29b24e362..1d8d34278 100644
--- a/prnt/ps/hp-designjet_z6600-postscript.ppd.gz
+++ b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz b/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz
index 86049b622..88c1baed6 100644
--- a/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz
index 307dadddd..7a285966e 100644
--- a/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz
+++ b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz b/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz
index dd805c9e2..697e54767 100644
--- a/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz
diff --git a/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz b/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz
index 1f177108a..088b33dba 100644
--- a/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz
+++ b/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
index c77ce2a51..6cf8aa6ad 100644
--- a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1200-ps.ppd.gz b/prnt/ps/hp-laserjet_1200-ps.ppd.gz
index 2f975e019..45e56994d 100644
--- a/prnt/ps/hp-laserjet_1200-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1200-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1200n-ps.ppd.gz b/prnt/ps/hp-laserjet_1200n-ps.ppd.gz
index bcc4eccda..2a79d763c 100644
--- a/prnt/ps/hp-laserjet_1200n-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1200n-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1220-ps.ppd.gz b/prnt/ps/hp-laserjet_1220-ps.ppd.gz
index 7cfeb9cd6..0ddfc4daf 100644
--- a/prnt/ps/hp-laserjet_1220-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1220-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1220se-ps.ppd.gz b/prnt/ps/hp-laserjet_1220se-ps.ppd.gz
index aa4c35e0d..469f75b17 100644
--- a/prnt/ps/hp-laserjet_1220se-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1220se-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1300-ps.ppd.gz b/prnt/ps/hp-laserjet_1300-ps.ppd.gz
index eefa567f2..1f366da1b 100644
--- a/prnt/ps/hp-laserjet_1300-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1300-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1300n-ps.ppd.gz b/prnt/ps/hp-laserjet_1300n-ps.ppd.gz
index 26d79abaf..e0eeb59ed 100644
--- a/prnt/ps/hp-laserjet_1300n-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1300n-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz b/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz
index 5ac8aeb1c..4e36c3d16 100644
--- a/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1320-ps.ppd.gz b/prnt/ps/hp-laserjet_1320-ps.ppd.gz
index 4fcb2d3a7..b63450de8 100644
--- a/prnt/ps/hp-laserjet_1320-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1320-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz b/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz
index f62f73f88..ac3a6a049 100644
--- a/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1320n-ps.ppd.gz b/prnt/ps/hp-laserjet_1320n-ps.ppd.gz
index 8017744af..0df647346 100644
--- a/prnt/ps/hp-laserjet_1320n-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1320n-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz b/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz
index 6bf1ae113..c719bbe14 100644
--- a/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz b/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz
index ca9c40570..78f7abba4 100644
--- a/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz b/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz
index d889f62eb..ffbd64da4 100644
--- a/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz
index 0b917a44c..6ce5fcf8a 100644
--- a/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz
index 06bbf1acb..a998ac67d 100644
--- a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2100-ps.ppd.gz b/prnt/ps/hp-laserjet_2100-ps.ppd.gz
index a608e5497..5f2f87b09 100644
--- a/prnt/ps/hp-laserjet_2100-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2100-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz
index 77c77a7da..d4dbbdd51 100644
--- a/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2200-ps.ppd.gz b/prnt/ps/hp-laserjet_2200-ps.ppd.gz
index 19266771b..5ac6c0889 100644
--- a/prnt/ps/hp-laserjet_2200-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2200-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz
index ef31f6bfc..f2c227db7 100644
--- a/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2300-ps.ppd.gz b/prnt/ps/hp-laserjet_2300-ps.ppd.gz
index 221b04dc2..f8dcfb69a 100644
--- a/prnt/ps/hp-laserjet_2300-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2300-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz
index 7dcba65a4..df23fe9eb 100644
--- a/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2410-ps.ppd.gz b/prnt/ps/hp-laserjet_2410-ps.ppd.gz
index e440c6640..0aaba6e39 100644
--- a/prnt/ps/hp-laserjet_2410-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2410-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2420-ps.ppd.gz b/prnt/ps/hp-laserjet_2420-ps.ppd.gz
index 92fd5254f..8d75da8c4 100644
--- a/prnt/ps/hp-laserjet_2420-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2420-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_2430-ps.ppd.gz b/prnt/ps/hp-laserjet_2430-ps.ppd.gz
index 4ef8df13c..2c0c769f8 100644
--- a/prnt/ps/hp-laserjet_2430-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_2430-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3015-ps.ppd.gz b/prnt/ps/hp-laserjet_3015-ps.ppd.gz
index afe96509f..279bc7e2b 100644
--- a/prnt/ps/hp-laserjet_3015-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3015-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3020-ps.ppd.gz b/prnt/ps/hp-laserjet_3020-ps.ppd.gz
index c9366de2d..7cc6d6104 100644
--- a/prnt/ps/hp-laserjet_3020-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3020-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3030-ps.ppd.gz b/prnt/ps/hp-laserjet_3030-ps.ppd.gz
index a27d03c6f..8e2b751e5 100644
--- a/prnt/ps/hp-laserjet_3030-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3030-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3050-ps.ppd.gz b/prnt/ps/hp-laserjet_3050-ps.ppd.gz
index 7b09bddbc..d1d62e937 100644
--- a/prnt/ps/hp-laserjet_3050-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3050-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3052-ps.ppd.gz b/prnt/ps/hp-laserjet_3052-ps.ppd.gz
index ffe31d154..97f69871b 100644
--- a/prnt/ps/hp-laserjet_3052-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3052-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3200m-ps.ppd.gz b/prnt/ps/hp-laserjet_3200m-ps.ppd.gz
index f41f00dd6..7a729f8c1 100644
--- a/prnt/ps/hp-laserjet_3200m-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3200m-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz b/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz
index 013f522d0..f1690d560 100644
--- a/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3380-ps.ppd.gz b/prnt/ps/hp-laserjet_3380-ps.ppd.gz
index 0534aecb5..3bb028196 100644
--- a/prnt/ps/hp-laserjet_3380-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3380-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_3390-ps.ppd.gz b/prnt/ps/hp-laserjet_3390-ps.ppd.gz
index f469c5aed..43765a24a 100644
--- a/prnt/ps/hp-laserjet_3390-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_3390-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4-ps.ppd.gz b/prnt/ps/hp-laserjet_4-ps.ppd.gz
index 03f86ff6a..66a886d91 100644
--- a/prnt/ps/hp-laserjet_4-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz
index fe3923644..fc07d30bb 100644
--- a/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz
index 1dfa2fe8c..cd154066f 100644
--- a/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz
index 5f4f2371d..3ebc5c639 100644
--- a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz b/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz
index 263403a5d..8a2e4511f 100644
--- a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz
index 94de3ee03..28fddcf4e 100644
--- a/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz
index 10173101a..e3ac04fc1 100644
--- a/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz
index 9eb83d747..f5805541e 100644
--- a/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4200-ps.ppd.gz b/prnt/ps/hp-laserjet_4200-ps.ppd.gz
index e5d3276a2..a164db831 100644
--- a/prnt/ps/hp-laserjet_4200-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4200-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4240-ps.ppd.gz b/prnt/ps/hp-laserjet_4240-ps.ppd.gz
index ba5184dab..5c13f131f 100644
--- a/prnt/ps/hp-laserjet_4240-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4240-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4250-ps.ppd.gz b/prnt/ps/hp-laserjet_4250-ps.ppd.gz
index 7fcd9e7d6..aa6e84e7b 100644
--- a/prnt/ps/hp-laserjet_4250-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4250-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4300-ps.ppd.gz b/prnt/ps/hp-laserjet_4300-ps.ppd.gz
index 89cbc4003..e9f3c62ce 100644
--- a/prnt/ps/hp-laserjet_4300-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4300-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz
index ba9feb77b..c6f23338b 100644
--- a/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4350-ps.ppd.gz b/prnt/ps/hp-laserjet_4350-ps.ppd.gz
index eda296ed8..bdf850bd3 100644
--- a/prnt/ps/hp-laserjet_4350-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4350-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz b/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz
index c02ea24f0..f53ee7ea3 100644
--- a/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4ml-ps.ppd.gz b/prnt/ps/hp-laserjet_4ml-ps.ppd.gz
index bd08ed48e..12d0d8b16 100644
--- a/prnt/ps/hp-laserjet_4ml-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4ml-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4mp-ps.ppd.gz b/prnt/ps/hp-laserjet_4mp-ps.ppd.gz
index 7b33de9cb..6f2fdbc93 100644
--- a/prnt/ps/hp-laserjet_4mp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4mp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4si-ps.ppd.gz b/prnt/ps/hp-laserjet_4si-ps.ppd.gz
index 1676d009d..7ba288233 100644
--- a/prnt/ps/hp-laserjet_4si-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4si-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_4v-ps.ppd.gz b/prnt/ps/hp-laserjet_4v-ps.ppd.gz
index 97b29c63a..0a55d499a 100644
--- a/prnt/ps/hp-laserjet_4v-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_4v-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5000-ps.ppd.gz b/prnt/ps/hp-laserjet_5000-ps.ppd.gz
index 1e0dead03..363526742 100644
--- a/prnt/ps/hp-laserjet_5000-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5000-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz
index 6c4e36188..509755393 100644
--- a/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz
index feb1b4276..2bb4e6111 100644
--- a/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
index 08f73cafd..7b17a8428 100644
--- a/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
index 7ea902f25..9a49b8992 100644
--- a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz
index a0b52b3da..a1e7c0bba 100644
--- a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz
index 3348cdca1..ffdfe8233 100644
--- a/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5200-ps.ppd.gz b/prnt/ps/hp-laserjet_5200-ps.ppd.gz
index f8528f483..370d678c2 100644
--- a/prnt/ps/hp-laserjet_5200-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5200-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5200l-ps.ppd.gz b/prnt/ps/hp-laserjet_5200l-ps.ppd.gz
index ddec3ba2f..726d66158 100644
--- a/prnt/ps/hp-laserjet_5200l-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5200l-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz b/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz
index c2249b4ec..34dd00bf7 100644
--- a/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5mp-ps.ppd.gz b/prnt/ps/hp-laserjet_5mp-ps.ppd.gz
index 75ae35cfd..fa86df1f5 100644
--- a/prnt/ps/hp-laserjet_5mp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5mp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5p-ps.ppd.gz b/prnt/ps/hp-laserjet_5p-ps.ppd.gz
index 308b1c911..52af16575 100644
--- a/prnt/ps/hp-laserjet_5p-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5p-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5si-ps.ppd.gz b/prnt/ps/hp-laserjet_5si-ps.ppd.gz
index 31c26a620..44592d8c3 100644
--- a/prnt/ps/hp-laserjet_5si-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5si-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz b/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz
index 38c47093d..c24deb13a 100644
--- a/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz b/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz
index d1a31264c..dded13190 100644
--- a/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_6mp-ps.ppd.gz b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz
index f68ef439c..54abb6211 100644
--- a/prnt/ps/hp-laserjet_6mp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_6p-ps.ppd.gz b/prnt/ps/hp-laserjet_6p-ps.ppd.gz
index 412530cba..3ce755cda 100644
--- a/prnt/ps/hp-laserjet_6p-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_6p-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
index 18f9a420b..c11f546ed 100644
--- a/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz b/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz
index e0d49843f..f6975f562 100644
--- a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_8000-ps.ppd.gz b/prnt/ps/hp-laserjet_8000-ps.ppd.gz
index 5168256ec..12f77f025 100644
--- a/prnt/ps/hp-laserjet_8000-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_8000-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz
index 06c7002e0..6ab887cf7 100644
--- a/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz
index 2f38a4d1f..87c2f3489 100644
--- a/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz
index eb0388220..79242c3fa 100644
--- a/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz
index f658d5262..e7e038b0d 100644
--- a/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz
index 2916e7ab9..912880f16 100644
--- a/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz
index d7d25149a..fe7d2c3e6 100644
--- a/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9040-ps.ppd.gz b/prnt/ps/hp-laserjet_9040-ps.ppd.gz
index 0deb47646..4a8e75ce0 100644
--- a/prnt/ps/hp-laserjet_9040-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9040-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz
index 3da7ed1d3..3903085e9 100644
--- a/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9050-ps.ppd.gz b/prnt/ps/hp-laserjet_9050-ps.ppd.gz
index e2bdd572a..5bee068be 100644
--- a/prnt/ps/hp-laserjet_9050-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9050-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz
index d370c8421..970334596 100644
--- a/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz
index 6024b8e0e..f3212527e 100644
--- a/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz
index f92e66300..8fed409c1 100644
--- a/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz
index 3b6bd1f06..e827c5590 100644
--- a/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
index 9bc3ed32e..b4a7c217f 100644
--- a/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz
index 574220836..1f23db656 100644
--- a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_e50145-ps.ppd.gz b/prnt/ps/hp-laserjet_e50145-ps.ppd.gz
index d07077dad..090285bfc 100644
--- a/prnt/ps/hp-laserjet_e50145-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_e50145-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz b/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz
index ce8663766..4884101a4 100644
--- a/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_e60155-ps.ppd.gz b/prnt/ps/hp-laserjet_e60155-ps.ppd.gz
index ebde753d9..8e272dac9 100644
--- a/prnt/ps/hp-laserjet_e60155-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_e60155-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_e60165-ps.ppd.gz b/prnt/ps/hp-laserjet_e60165-ps.ppd.gz
index 69c871ec3..13ad6d489 100644
--- a/prnt/ps/hp-laserjet_e60165-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_e60165-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_e60175-ps.ppd.gz b/prnt/ps/hp-laserjet_e60175-ps.ppd.gz
index e1d930491..c5edcbdc3 100644
--- a/prnt/ps/hp-laserjet_e60175-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_e60175-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz b/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz
index 8c10ccc71..e0375e91a 100644
--- a/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz b/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz
index b8fccce54..f3c470ab1 100644
--- a/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz
index f8313d7d3..bdf4cef2e 100644
--- a/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz
index ed12b0a9c..1e8a722da 100644
--- a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz
index 0c99a4bb3..9bedf2ae0 100644
--- a/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz
index dca9f3620..430f7916e 100644
--- a/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz
index 3ae5890e0..b3d9144b6 100644
--- a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz
index b0d3666dd..250f552a1 100644
--- a/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz
index 98bcc052b..eea71149d 100644
--- a/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz
index d6b13d8eb..abe17c77f 100644
--- a/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz
index 196035cec..99f043979 100644
--- a/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz
index a7ac22290..8a8c57492 100644
--- a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz
index 9ab72638c..229456145 100644
--- a/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz
index 626c67416..a42994c30 100644
--- a/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz
index 2197c907a..973974eb6 100644
--- a/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz
index b5590b8ca..86ce42009 100644
--- a/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz
index 7932c0603..cd33d0130 100644
--- a/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz
index 7049f0804..273e18952 100644
--- a/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz
index 5aee3c779..814c07a0d 100644
--- a/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m506-ps.ppd.gz b/prnt/ps/hp-laserjet_m506-ps.ppd.gz
index ad522b5da..e8ab19038 100644
--- a/prnt/ps/hp-laserjet_m506-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m506-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m507-ps.ppd.gz b/prnt/ps/hp-laserjet_m507-ps.ppd.gz
index 9b85c44fb..b36772c8a 100644
--- a/prnt/ps/hp-laserjet_m507-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m507-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz b/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz
index abbafeb0d..68a995639 100644
--- a/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz b/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz
index e373f0b30..66b46164a 100644
--- a/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m806-ps.ppd.gz b/prnt/ps/hp-laserjet_m806-ps.ppd.gz
index 2d517b6d8..fe75160e0 100644
--- a/prnt/ps/hp-laserjet_m806-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m806-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz
index 01ccdc868..a0991730d 100644
--- a/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz
index 06d3fe976..90485d020 100644
--- a/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz
index 85f82c8ad..00376b789 100644
--- a/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz
index eea57cbb9..c6ad65a48 100644
--- a/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz
index a14144eeb..b7557e3d8 100644
--- a/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz
index 4d2fde7de..1f4d43fc0 100644
--- a/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz
index a6c2529ab..4c3400c80 100644
--- a/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz
index 674bd6c33..871c3b55d 100644
--- a/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz
index 46863c4a3..afe5d7a75 100644
--- a/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz
index 938701ba9..5499526be 100644
--- a/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz
index 126529f7a..9589903f9 100644
--- a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz
index 75b837c3f..f9229ad82 100644
--- a/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz
index 0bef0c0b4..6cb3d1f9f 100644
--- a/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz
index 53a954aba..0fb85a40f 100644
--- a/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz
index 2331128bf..2a9e1af76 100644
--- a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz
index c390ebc39..b696564f7 100644
--- a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz
index cd1653d47..0e3f939e7 100644
--- a/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_p3004-ps.ppd.gz b/prnt/ps/hp-laserjet_p3004-ps.ppd.gz
index d2acab6bd..1915d1062 100644
--- a/prnt/ps/hp-laserjet_p3004-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_p3004-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_p3005-ps.ppd.gz b/prnt/ps/hp-laserjet_p3005-ps.ppd.gz
index bfd3c509e..68b50f8a2 100644
--- a/prnt/ps/hp-laserjet_p3005-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_p3005-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz
index fa385f571..d3c6ada99 100644
--- a/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz
index 66143e79c..d71bfa45c 100644
--- a/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz
index ab8d8de80..79fd58c49 100644
--- a/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz
index 7aadaba43..d1e0ea98c 100644
--- a/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
index 748c32782..1dcdf9f43 100644
--- a/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz
index 8041d5245..c3e1898e6 100644
--- a/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz
index d36ad051f..01b359497 100644
--- a/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz
index 0a15ca103..f8ba0ef49 100644
--- a/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz
index 539d5e271..849497948 100644
--- a/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz
index 0528cc380..f21cf25f0 100644
--- a/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz
index 8fd8f04c6..549bec96e 100644
--- a/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz
index 7f53f27b5..7c90c01d9 100644
--- a/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz
index 99834fef4..cb7d80157 100644
--- a/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz
index 984eaad79..502ed5208 100644
--- a/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz
index a9ce8b409..76ef9608a 100644
--- a/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz
index 2b81a1c3d..e4727df6b 100644
--- a/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz
index 0842d1772..90d47b0da 100644
--- a/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
index b65fc42dd..51de90dea 100644
--- a/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz
index acdac02f3..647d9cc18 100644
--- a/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz
index 85ad5cc89..2e932af16 100644
--- a/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz
diff --git a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz
index 93e9d0a3a..328605793 100644
--- a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz
+++ b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz
diff --git a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz
index 1a84bf5dd..f99d512f1 100644
--- a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz
+++ b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz
diff --git a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
index 7426eec7f..00f329531 100644
--- a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
+++ b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
diff --git a/prnt/ps/hp-mopier_240-ps.ppd.gz b/prnt/ps/hp-mopier_240-ps.ppd.gz
index 9caa17500..8b5fedc5c 100644
--- a/prnt/ps/hp-mopier_240-ps.ppd.gz
+++ b/prnt/ps/hp-mopier_240-ps.ppd.gz
diff --git a/prnt/ps/hp-mopier_320-ps.ppd.gz b/prnt/ps/hp-mopier_320-ps.ppd.gz
index b08469a5f..6e3c755d1 100644
--- a/prnt/ps/hp-mopier_320-ps.ppd.gz
+++ b/prnt/ps/hp-mopier_320-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz
index 5afffbba9..953370756 100644
--- a/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz
+++ b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz
diff --git a/prnt/ps/hp-officejet_color_x555-ps.ppd.gz b/prnt/ps/hp-officejet_color_x555-ps.ppd.gz
index d3ab2f24a..b6d1e0ff0 100644
--- a/prnt/ps/hp-officejet_color_x555-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_color_x555-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz
index 461577292..8b9a46a80 100644
--- a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz
index 4b99adbe7..d0fd97a08 100644
--- a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz
index 1e65179af..31e275cf8 100644
--- a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz
index 744426ac0..620111766 100644
--- a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz
index 4ea90458f..39829adda 100644
--- a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
index b199c5a7f..c7305894a 100644
--- a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz
index 65cac9927..9bba5facd 100644
--- a/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz
index 4894b6193..b8fb2e4c2 100644
--- a/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz
index 6b5cb598b..b23ca4de2 100644
--- a/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz
diff --git a/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz
index 41fffdc63..7b2bb5572 100644
--- a/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz
+++ b/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz
index ffdd5a81b..f57f9836c 100644
--- a/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz
index 95e54d50d..660f2b0d8 100644
--- a/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz b/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz
index eee807a34..5638b4e6d 100644
--- a/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_556-ps.ppd.gz b/prnt/ps/hp-pagewide_color_556-ps.ppd.gz
index 36b0ac8ca..6d02aa795 100644
--- a/prnt/ps/hp-pagewide_color_556-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_556-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_755-ps.ppd.gz b/prnt/ps/hp-pagewide_color_755-ps.ppd.gz
index 5555c75bc..925f6407f 100644
--- a/prnt/ps/hp-pagewide_color_755-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_755-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_765-ps.ppd.gz b/prnt/ps/hp-pagewide_color_765-ps.ppd.gz
index c0bbe64c6..830d203e2 100644
--- a/prnt/ps/hp-pagewide_color_765-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_765-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz b/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz
index 4e357d7a3..0013085b8 100644
--- a/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz
index 92b9b8d52..3172572a5 100644
--- a/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz
index ecad63432..8b1af86c6 100644
--- a/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz
index d17daba6b..0b6ef672c 100644
--- a/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz b/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
index 49b99d2cb..f94af6bd9 100644
--- a/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz
index 1576c0f4d..0c29ca256 100644
--- a/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz
index 626fcde37..f797eda59 100644
--- a/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz
index d7c049fc6..884645bb3 100644
--- a/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz
index 04098d69b..1270106d2 100644
--- a/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz b/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz
index ff44c2ad8..b8e8ab9be 100644
--- a/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz b/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz
index 628501fac..f359687e3 100644
--- a/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_p55250-ps.ppd.gz b/prnt/ps/hp-pagewide_p55250-ps.ppd.gz
index 95ea8e3ca..b0d0d8998 100644
--- a/prnt/ps/hp-pagewide_p55250-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_p55250-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz b/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz
index b307261a0..74458a09b 100644
--- a/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz
index 0b5bde1fa..cd351c79e 100644
--- a/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz
index 9bf20cab2..8c30f8c70 100644
--- a/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz
index ee3b7e398..328066103 100644
--- a/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz
index 48c7e30b3..b01b0185d 100644
--- a/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz
index 4f16c3bb0..8d136d04c 100644
--- a/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz
index 38a6925e4..684276871 100644
--- a/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz
index 33cbd7b92..26cf196c1 100644
--- a/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz
index c831c9c3a..f8e887894 100644
--- a/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz
index 12db991d4..1a7bdded6 100644
--- a/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz
index 6caf58cd7..410c4a082 100644
--- a/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz
index 55648147e..0edc6eeb1 100644
--- a/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz
index bd797578b..2ff9c9c85 100644
--- a/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz
index a5435997f..c34e164d3 100644
--- a/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz
index 2b70e5528..224936f4d 100644
--- a/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz
index ff2ea2ca5..dc6e02ceb 100644
--- a/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz
index bd30f697f..905440397 100644
--- a/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz
index 6589c31c4..6ca5e8a04 100644
--- a/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz
index 2b5ab21b5..b01262712 100644
--- a/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz
index ae2042b99..6474c4360 100644
--- a/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz
index a25631f4d..d3a03f06e 100644
--- a/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz
index 33a279d59..e1de5a79d 100644
--- a/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz
index da1a1d64b..38e928b5c 100644
--- a/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz
index 4b178c8e6..d64d30216 100644
--- a/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz
index 3e6fcf337..6f055715e 100644
--- a/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz
diff --git a/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz
index d57b92f5c..6876dd54d 100644
--- a/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz
+++ b/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz
diff --git a/prnt/ps/hp-postscript-inkjet.ppd.gz b/prnt/ps/hp-postscript-inkjet.ppd.gz
index 3ef7de54c..66b0af058 100644
--- a/prnt/ps/hp-postscript-inkjet.ppd.gz
+++ b/prnt/ps/hp-postscript-inkjet.ppd.gz
diff --git a/prnt/ps/hp-postscript-laserjet-pro.ppd.gz b/prnt/ps/hp-postscript-laserjet-pro.ppd.gz
index 0b2f19a43..c1eafc391 100644
--- a/prnt/ps/hp-postscript-laserjet-pro.ppd.gz
+++ b/prnt/ps/hp-postscript-laserjet-pro.ppd.gz
diff --git a/prnt/ps/hp-postscript-laserjet.ppd.gz b/prnt/ps/hp-postscript-laserjet.ppd.gz
index c278e4176..50d6c4bb7 100644
--- a/prnt/ps/hp-postscript-laserjet.ppd.gz
+++ b/prnt/ps/hp-postscript-laserjet.ppd.gz
diff --git a/scan.py b/scan.py
index d31aee148..4f2fdef74 100755
--- a/scan.py
+++ b/scan.py
@@ -131,6 +131,7 @@ orient = 0
 orient_list = []
 multipick_error_message = "The scan operation has been cancelled or a multipick or paper is jammed in the ADF.\nIf you cancelled the scan,click OK.\nIf the scan was terminated due to a multi-feed or paper jam in the ADF,\ndo the following:\n\n1)Clear the ADF path. For instructions see your product documentation.\n2)Check the sheets are not stuck together. Remove any staples, sticky notes,tape or other objects.\n3)Restart the scan\n\nNote:If necessary, turn off automatic detection of multi-pick before starting a new scan\n"
 SANE_STATUS_MULTIPICK=12
+SANE_STATUS_JAMMED=6
 
 PAGE_SIZES = { # in mm
     '5x7' : (127, 178, "5x7 photo", 'in'),
@@ -206,10 +207,6 @@ def createPagesFile(adf_page_files,pages_file,file_type='.png'):
         for p in adf_page_files:
             im = Image.open(p)
             output = utils.createBBSequencedFilename(pages_file, file_type, output_path)
-            '''pyPlatform = platform.python_version()
-            num = pyPlatform.split('.')
-            if num[0] >= '3':
-                im = im.convert("RGB")'''
             try:
                 im.save(output,compress_level=1,quality=55)
             except:
@@ -321,32 +318,7 @@ try:
         ("[OPTIONS] (advanced)", "", "header", False),
         ("Set the scanner compression mode:", "-x<mode> or --compression=<mode>, <mode>='raw', 'none' or 'jpeg' ('jpeg' is default) ('raw' and 'none' are equivalent)", "option", False),]
 
-    '''scanjet=[utils.USAGE_SPACE,("[OPTIONS] (Scanjet)", "", "header", False),("multi-pick mode:", "--multipick (multipick detection enabled)", "option", False),
-        ("Auto-orientation mode:", "--autoorient (auto orientation enabled)", "option", False),
-        ("Crushed:", "--crushed (crushed enabled)", "option", False),
-        ("Background Color Removal:", "--bg_color_removal (Background Color Removal(make white) enabled)", "option", False),
-        ("Punch Hole Removal:", "--punchhole_removal (Background Color Removal(make white) enabled)", "option", False),
-        ("batchsep and blankpage mode:", "--batchsepBP (Batch Seperation Blankpage enabled)", "option", False),
-        ("batchsep and Barcode mode:", "--batchsepBC (Batch Seperation barcode enabled)", "option", False),
-        ("Auto-Crop mode:", "--autocrop (auto crop enabled)", "option", False),
-	("Deskew mode:", "--deskew (deskew enabled)", "option", False),
-	("Mixed-feed mode:", "--mixedfeed (multi feed enabled)", "option", False),
-        ("Document merge:", "--docmerge (document merge enabled)", "option", False),
-        ("Document merge ADF Flatbed:", "--adf_fladbed_merge (document merge ADF and Flatbed UI application enabled)", "option", False),
-        ("Color Dropout Red :", "-color_dropout_red_value=<color_dropout_red_value> or --color_dropout_red_value=<color_dropout_red_value>", "option", False),
-        ("Color Dropout Green :", "-color_dropout_green_value=<color_dropout_green_value> or --color_dropout_green_value=<color_dropout_green_value>", "option", False),
-        ("Color Dropout Blue :", "-color_dropout_blue_value=<color_dropout_blue_value> or --color_dropout_blue_value=<color_dropout_blue_value>", "option", False),
-        ("Color Dropout Range :", "-color_range=<color_range> or --color_range=<color_range>", "option", False),
-        ("", "Example:color_dropout = [0,0,0,0].", "option", False),
-        ("Image contrast:", "--contrast=<contrast>", "option", False),
-        ("", "The contrast range varies from device to device.", "option", False),
-        ("Image brightness:", "--brightness=<brightness>", "option", False),
-        ("", "The brightness range varies from device to device.", "option", False),
-        ("Image sharpness:", "--sharpness=<sharpness>", "option", False),
-        ("", "The sharpness range varies from device to device.", "option", False),
-        ("Image color:", "--color_value=<color_value>", "option", False),
-        ("", "The color range varies from device to device.", "option", False),
-	("Blank Page Removal:", "--blankpage(blank page removal enabled)", "option", False)]'''
+    
     scan_parseStdOpts = ['dest=', 'mode=', 'res=', 'resolution=',
                           'resize=', 'adf', 'duplex', 'dup', 'unit=',
                           'units=', 'area=', 'box=', 'tlx=',
@@ -363,59 +335,6 @@ try:
                           'editor=', 'dp=', 'dest-printer=', 'dd=',
                           'dest-device=', 'brightness=', 'contrast=','filetype=', 'path=', 'uiscan', 'sharpness=','color_dropout_red_value=','color_dropout_green_value=','color_dropout_blue_value=','color_range=', 'color_value=','multipick','autoorient','blankpage','batchsepBP','mixedfeed', 'crushed', 'bg_color_removal','punchhole_removal','docmerge','adf_fladbed_merge','batchsepBC','deskew','autocrop',]
 
-    '''scanjet_parseStdOpts = [ 'brightness=', 'sharpness=', 'contrast=', 'color_value=','multipick','autoorient','blankpage','batchsepBP','mixedfeed', 'crushed','docmerge','adf_fladbed_merge','batchsepBC','deskew','autocrop',]
-
-    scanjet_flag_pil=imageprocessing.check_pil()
-    scanjet_flag_numpy=imageprocessing.check_numpy()
-    scanjet_flag_opencv=imageprocessing.check_opencv()
-    scanjet_flag_tesser_utils=imageprocessing.check_tesserocr_imutils()
-    scanjet_flag_pypdf2=imageprocessing.check_pypdf2()
-    scanjet_flag_barcode=imageprocessing.check_zbar()
-    try:
-        if scanjet_flag_pil == 'PIL':
-            scanjet_parseStdOpts = []
-        if scanjet_flag_numpy == 'numpy':
-            parse_list = ['multipick','autoorient','batchsepBP','mixedfeed', 'crushed','docmerge','adf_fladbed_merge','batchsepBC','deskew','autocrop']
-            for thing in parse_list: 
-                try:
-                    scanjet_parseStdOpts.remove(thing)
-                except ValueError:
-                    print ('')
-        if scanjet_flag_opencv == 'cv2':
-            parse_list = ['deskew','autocrop','mixedfeed']
-            for thing in parse_list: 
-                try:
-                    scanjet_parseStdOpts.remove(thing)
-                except ValueError:
-                    print ('')
-        if scanjet_flag_tesser_utils == 'tesserocr' or scanjet_flag_tesser_utils == 'imutils':
-            parse_list = ['autoorient']
-            for thing in parse_list: 
-                try:
-                    scanjet_parseStdOpts.remove(thing)
-                except ValueError:
-                    print ('')
-        if scanjet_flag_pypdf2 == 'PyPDF2':
-            parse_list = ['docmerge','adf_fladbed_merge']
-            for thing in parse_list: 
-                try:
-                    scanjet_parseStdOpts.remove(thing)
-                except ValueError:
-                    print ('')
-        if scanjet_flag_barcode == 'False':
-            parse_list = ['batchsepBC']
-            for thing in parse_list: 
-                try:
-                    scanjet_parseStdOpts.remove(thing)
-                except ValueError:
-                    print ('')
-    except TypeError:
-        print ('')'''
-    #if con_device == 5000 or con_device == 7500:
-	#scanjet=[("Destination:", "--path=<destination>", "option", False),]
-        #extra_options.extend(scanjet)
-        #scanjet_parseStdOpts = ['filetype=', 'path=', 'uiscan', 'sharpness=', 'color_value=','multipick','autoorient','blankpage','batchsepBP','mixedfeed', 'crushed','docmerge','adf_fladbed_merge','batchsepBC','deskew','autocrop',] 
-        #scan_parseStdOpts.extend(scanjet_parseStdOpts)
     mod.setUsage(module.USAGE_FLAG_DEVICE_ARGS, extra_options, see_also_list=[])
 
     #print devicelist 
@@ -1024,6 +943,9 @@ try:
             if multipick and e.args[0] == SANE_STATUS_MULTIPICK:
                  log.error(multipick_error_message)
                  sys.exit(2)
+            if e.args[0] == SANE_STATUS_JAMMED:
+                 log.error(multipick_error_message)
+                 sys.exit(7)
             sane.reportError(e.args[0])
             sys.exit(1)
 
@@ -1341,6 +1263,9 @@ try:
                         if adf and e.args[0] == SANE_STATUS_MULTIPICK and multipick:
                             log.error(multipick_error_message)
                             sys.exit(2)
+                        if adf and (e.args[0] == SANE_STATUS_JAMMED) :
+                            log.error(multipick_error_message)
+                            sys.exit(7)
                         sane.reportError(e.args[0])
                         sys.exit(1)
                     except KeyboardInterrupt:
@@ -1361,6 +1286,9 @@ try:
                         if multipick:
                             log.error(multipick_error_message)
                             sys.exit(2)
+                    if adf and status == SANE_STATUS_JAMMED:
+                        log.error(multipick_error_message)
+                        sys.exit(7)
 
                     if expected_bytes > 0:
                         if adf:
@@ -1391,8 +1319,8 @@ try:
                                                 utils.format_bytes(bytes_read))
 
                                 if status != scanext.SANE_STATUS_GOOD:
-                                    if status == SANE_STATUS_MULTIPICK and multipick:
-                                        log.error("ADF_MPD multipick error %d" % (status))
+                                    if (status == SANE_STATUS_MULTIPICK and multipick) or (status == SANE_STATUS_JAMMED):
+                                        log.error("ADF_MPD multipick or Jam error %d" % (status))
                                         log.error("Error in reading data. Status=%d " % (status))
 					#sys.exit(2)
 					
@@ -1607,10 +1535,7 @@ try:
                                 if (document_merge and duplex and save_file == 'pdf') or (imageprocessing.check_pypdf2() != None):
                                     temp_output = utils.createSequencedFilename("hpscan", '.png', output_path)
                                 else:
-                                    if mixed_feed:
-                                        temp_output = utils.createSequencedFilename("hpscan",ext, output_path)
-                                    else:
-                                        temp_output = utils.createSequencedFilename("hpscan",'.png', output_path)
+                                    temp_output = utils.createSequencedFilename("hpscan",ext, output_path)
                             adf_page_files.append(temp_output)
                             #print "entered flatbed save"
                             '''pyPlatform = platform.python_version()
@@ -1640,6 +1565,10 @@ try:
                     log.error("ADF_MPD multipick error %d" % (status))
                     log.error("Error in reading data. Status=%d bytes_read=%d." % (status, bytes_read))
                     sys.exit(2)
+                elif uiscan == True and (status == SANE_STATUS_JAMMED):
+                    log.error("ADF_MPD multipick or Jam error %d" % (status))
+                    log.error("Error in reading data. Status=%d bytes_read=%d." % (status, bytes_read))
+                    sys.exit(7)
                 else:
                     log.error("No data read.")
                     sys.exit(1)
diff --git a/scan/scanext/scanext.c b/scan/scanext/scanext.c
index ff5798798..3ddfb3583 100755
--- a/scan/scanext/scanext.c
+++ b/scan/scanext/scanext.c
@@ -244,6 +244,7 @@ static PyObject *startScan (_ScanDevice * self, PyObject * args)
     Py_END_ALLOW_THREADS
 
     if (st != SANE_STATUS_GOOD &&
+        st != SANE_STATUS_JAMMED &&
         st != SANE_STATUS_EOF &&
         st != SANE_STATUS_NO_DOCS &&
         st != SANE_STATUS_MULTIPICK)
diff --git a/ui4/scandialog.py b/ui4/scandialog.py
index bb5e22714..9a5608279 100644
--- a/ui4/scandialog.py
+++ b/ui4/scandialog.py
@@ -18,6 +18,7 @@ import platform
 
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
+from collections import OrderedDict
 
 '''dir_path = os.path.dirname(os.path.realpath(__file__))
 print (dir_path)
@@ -26,6 +27,34 @@ import sys
 print sys.path'''
 from scan import sane
 
+PAGE_SIZES = OrderedDict([ # in mm
+    ("letter" , (215, 279, "Letter", 'in')),
+    ('a3' , (297, 420, "A3", 'mm')),
+    ("a4" , (210, 297, "A4", 'mm')),
+    ("a5" , (148, 210, "A5", 'mm')),
+    ('5x7' , (127, 178, "5x7 photo", 'in')),
+    ('4x6' , (102, 152, "4x6 photo", 'in')),
+    ('3x5' , (76, 127, "3x5 index card", 'in')),
+    ('a2_env' , (111, 146, "A2 Envelope", 'in')),
+    ("a6" , (105, 148, "A6", 'mm')),
+    ("b4" , (257, 364, "B4", 'mm')),
+    ("b5" , (182, 257, "B5", 'mm')),
+    ("c6_env" , (114, 162, "C6 Envelope", 'in')),
+    ("dl_env" , (110, 220, "DL Envelope", 'in')),
+    ("exec" , (184, 267, "Executive", 'in')),
+    ("flsa" , (216, 330, "Flsa", 'mm')),
+    ("higaki" , (100, 148, "Hagaki", 'mm')),
+    ("japan_env_3" , (120, 235, "Japanese Envelope #3", 'mm')),
+    ("japan_env_4" , (90, 205, "Japanese Envelope #4", 'mm')),
+    ("legal" , (215, 356, "Legal", 'in')),
+    ("no_10_env" , (105, 241, "Number 10 Envelope", 'in')),
+    ("oufufu-hagaki" , (148, 200, "Oufuku-Hagaki", 'mm')),
+    ("photo" , (102, 152, "Photo", 'in')),
+    ("super_b" , (330, 483, "Super B", 'in')),
+    ])
+
+
+
 #devicelist = {}
 device_name = ''
 path = os.getcwd()
@@ -181,12 +210,12 @@ class Ui_HpScan(object):
         self.comboBox_Papersize = QtGui.QComboBox(self.dockWidgetContents)
         self.comboBox_Papersize.setGeometry(QtCore.QRect(85, 330, 171, 41))
         self.comboBox_Papersize.setObjectName(_fromUtf8("comboBox_Papersize"))
-        self.comboBox_Papersize.addItem(_fromUtf8(""))
-        self.comboBox_Papersize.addItem(_fromUtf8(""))
-        self.comboBox_Papersize.addItem(_fromUtf8(""))
-        self.comboBox_Papersize.addItem(_fromUtf8(""))
-        self.comboBox_Papersize.addItem(_fromUtf8(""))
-        self.comboBox_Papersize.currentIndexChanged.connect(self.comboBox_PaperSizeIndexChanged)
+        #self.comboBox_Papersize.addItem(_fromUtf8(""))
+        #self.comboBox_Papersize.addItem(_fromUtf8(""))
+        #self.comboBox_Papersize.addItem(_fromUtf8(""))
+        #self.comboBox_Papersize.addItem(_fromUtf8(""))
+        #self.comboBox_Papersize.addItem(_fromUtf8(""))
+        #self.comboBox_Papersize.currentIndexChanged.connect(self.comboBox_PaperSizeIndexChanged)
         self.pushButton_Scan = QtGui.QPushButton(self.dockWidgetContents)
         self.pushButton_Scan.setGeometry(QtCore.QRect(60, 470, 81, 41))
         font = QtGui.QFont()
@@ -569,6 +598,7 @@ class Ui_HpScan(object):
         cmd = cmd + ' --path=' + str(path)
         cmd = cmd + ' --' + 'uiscan'
         self.pushButton_Scan.setEnabled(False)
+        #print(cmd)
         status = utils.run(cmd)
         #print (status)
         if status[0] == 2:
@@ -605,6 +635,8 @@ class Ui_HpScan(object):
                 self.pushButton_Scan.setEnabled(True)
         elif status[0] == 6:
             self.failureMessage(convert_error_message)
+        elif status[0] == 7:
+            self.warningMessage(multipick_error_message)
         self.pushButton_Scan.setEnabled(True)
         #if status != 0:
             #print("Cmd %s failed with status %d",cmd,status)
@@ -634,6 +666,15 @@ class Ui_HpScan(object):
         #print self.file_type
 
     def comboBox_SourceChanged(self,device):
+        supported_PageSizes =[]
+        for x in PAGE_SIZES:
+            if PAGE_SIZES[x][0]<self.devicelist[self.device_uri][2] and PAGE_SIZES[x][1]<self.devicelist[self.device_uri][3]:
+                supported_PageSizes.append(x)
+        self.comboBox_Papersize.clear()
+        self.comboBox_Papersize.addItems(supported_PageSizes)
+        self.comboBox_Papersize.currentIndexChanged.connect(self.comboBox_PaperSizeIndexChanged)
+
+        
         if device != '5000' and device != '7500' and device != '9120' and device != '8500' and device != '3500' and device != '4500' and device != '3000' and device != '7000' and device != '2000' and device != '2500':
             self.multi_pick_pri = False
         else:
@@ -1401,11 +1442,11 @@ class Ui_HpScan(object):
         #self.comboBox_Papersize.setItemText(2, _translate("HpScan", "3x5", None))
         #self.comboBox_Papersize.setItemText(3, _translate("HpScan", "a2_env", None))
         #self.comboBox_Papersize.setItemText(4, _translate("HpScan", "a3", None))
-        self.comboBox_Papersize.setItemText(0, _translate("HpScan", "a4", None))
-        self.comboBox_Papersize.setItemText(1, _translate("HpScan", "a5", None))
+        #self.comboBox_Papersize.setItemText(0, _translate("HpScan", "a4", None))
+        #self.comboBox_Papersize.setItemText(1, _translate("HpScan", "a5", None))
         #self.comboBox_Papersize.setItemText(7, _translate("HpScan", "a6", None))
         #self.comboBox_Papersize.setItemText(8, _translate("HpScan", "b4", None))
-        self.comboBox_Papersize.setItemText(2, _translate("HpScan", "b5", None))
+        #self.comboBox_Papersize.setItemText(2, _translate("HpScan", "b5", None))
         #self.comboBox_Papersize.setItemText(10, _translate("HpScan", "c6_env", None))
         #self.comboBox_Papersize.setItemText(11, _translate("HpScan", "dl_env", None))
         #self.comboBox_Papersize.setItemText(12, _translate("HpScan", "exec", None))
@@ -1413,14 +1454,14 @@ class Ui_HpScan(object):
         #self.comboBox_Papersize.setItemText(14, _translate("HpScan", "higaki", None))
         #self.comboBox_Papersize.setItemText(15, _translate("HpScan", "japan_env_3", None))
         #self.comboBox_Papersize.setItemText(16, _translate("HpScan", "japan_env_4", None))
-        self.comboBox_Papersize.setItemText(3, _translate("HpScan", "legal", None))
-        self.comboBox_Papersize.setItemText(4, _translate("HpScan", "letter", None))
+        #self.comboBox_Papersize.setItemText(3, _translate("HpScan", "legal", None))
+        #self.comboBox_Papersize.setItemText(4, _translate("HpScan", "letter", None))
         #self.comboBox_Papersize.setItemText(19, _translate("HpScan", "no_10_env", None))
         #self.comboBox_Papersize.setItemText(20, _translate("HpScan", "oufufu-hagaki", None))
         #self.comboBox_Papersize.setItemText(21, _translate("HpScan", "photo", None))
         #self.comboBox_Papersize.setItemText(22, _translate("HpScan", "super_b", None))
         #self.comboBox_Papersize.setItemText(23, _translate("HpScan", "b6", None))
-        self.comboBox_Papersize.setCurrentIndex(4)        
+        #self.comboBox_Papersize.setCurrentIndex(4)        
         self.pushButton_Scan.setText(_translate("HpScan", "Scan", None))
         
         self.pushButton_Change.setText(_translate("HpScan", "Change Path", None))
@@ -1484,13 +1525,20 @@ class SetupDialog():
         #device = ''
         sane.init()
         sane_devices = sane.getDevices()
-        for d, mfg, mdl, t in sane_devices:
-            try:
-                devicelist[d]
-            except KeyError:
-                devicelist[d] = [mdl]
-            else:
-                devicelist[d].append(mdl)
+        
+        for device, mfg, mdl, t in sane_devices:
+            if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device):
+                try:
+                    scanDevice = sane.openDevice(device)
+                    source_option = scanDevice.getOptionObj("source").constraint
+                    brx = scanDevice.getOptionObj('br-x').limitAndSet(None)
+                    bry = scanDevice.getOptionObj('br-y').limitAndSet(None)
+                    devicelist[device] = [mdl]
+                    devicelist[device].extend([source_option,int(brx)+1,int(bry)+1])
+                    scanDevice.closeScan()
+                except :
+                    pass                     
+
         sane.deInit()
         #print (devicelist)
 
diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
index 495883f72..498151ca1 100644
--- a/ui5/devmgr5.py
+++ b/ui5/devmgr5.py
@@ -48,7 +48,7 @@ import collections
 # dbus
 try:
     import dbus
-    from dbus.mainloop.pyqt5 import DBusQtMainLoop
+    from dbus.mainloop.glib import DBusGMainLoop
     from dbus import lowlevel
 except ImportError:
     log.error("Unable to load DBus libraries. Please check your installation and try again.")
@@ -269,7 +269,7 @@ class DevMgr5(Ui_MainWindow_Derived, Ui_MainWindow, QMainWindow):
 
     # TODO: Make sbus init mandatory success, else exit
     def initDBus(self):
-        self.dbus_loop = DBusQtMainLoop(set_as_default=True)
+        self.dbus_loop = DBusGMainLoop(set_as_default=True)
         self.dbus_avail, self.service, self.session_bus = device.init_dbus(self.dbus_loop)
 
         if not self.dbus_avail:
diff --git a/ui5/scandialog.py b/ui5/scandialog.py
index 5d7e7d27f..a99d5891b 100644
--- a/ui5/scandialog.py
+++ b/ui5/scandialog.py
@@ -18,6 +18,34 @@ from PyQt5.QtGui import *
 from PyQt5.QtCore import *
 from PyQt5.QtWidgets import *
 from scan import sane
+from collections import OrderedDict
+
+PAGE_SIZES = OrderedDict([ # in mm
+    ("letter" , (215, 279, "Letter", 'in')),
+    ('a3' , (297, 420, "A3", 'mm')),
+    ("a4" , (210, 297, "A4", 'mm')),
+    ("a5" , (148, 210, "A5", 'mm')),
+    ('5x7' , (127, 178, "5x7 photo", 'in')),
+    ('4x6' , (102, 152, "4x6 photo", 'in')),
+    ('3x5' , (76, 127, "3x5 index card", 'in')),
+    ('a2_env' , (111, 146, "A2 Envelope", 'in')),
+    ("a6" , (105, 148, "A6", 'mm')),
+    ("b4" , (257, 364, "B4", 'mm')),
+    ("b5" , (182, 257, "B5", 'mm')),
+    ("c6_env" , (114, 162, "C6 Envelope", 'in')),
+    ("dl_env" , (110, 220, "DL Envelope", 'in')),
+    ("exec" , (184, 267, "Executive", 'in')),
+    ("flsa" , (216, 330, "Flsa", 'mm')),
+    ("higaki" , (100, 148, "Hagaki", 'mm')),
+    ("japan_env_3" , (120, 235, "Japanese Envelope #3", 'mm')),
+    ("japan_env_4" , (90, 205, "Japanese Envelope #4", 'mm')),
+    ("legal" , (215, 356, "Legal", 'in')),
+    ("no_10_env" , (105, 241, "Number 10 Envelope", 'in')),
+    ("oufufu-hagaki" , (148, 200, "Oufuku-Hagaki", 'mm')),
+    ("photo" , (102, 152, "Photo", 'in')),
+    ("super_b" , (330, 483, "Super B", 'in')),
+    ])
+
 
 #devicelist = {}
 device_name = ''
@@ -168,12 +196,12 @@ class Ui_HpScan(object):
         self.comboBox_Papersize = QtWidgets.QComboBox(self.dockWidgetContents)
         self.comboBox_Papersize.setGeometry(QtCore.QRect(85, 330, 171, 41))
         self.comboBox_Papersize.setObjectName("comboBox_Papersize")
-        self.comboBox_Papersize.addItem("")
-        self.comboBox_Papersize.addItem("")
-        self.comboBox_Papersize.addItem("")
-        self.comboBox_Papersize.addItem("")
-        self.comboBox_Papersize.addItem("")
-        self.comboBox_Papersize.currentIndexChanged.connect(self.comboBox_PaperSizeIndexChanged)
+        #self.comboBox_Papersize.addItem("")
+        #self.comboBox_Papersize.addItem("")
+        #self.comboBox_Papersize.addItem("")
+        #self.comboBox_Papersize.addItem("")
+        #self.comboBox_Papersize.addItem("")
+        #self.comboBox_Papersize.currentIndexChanged.connect(self.comboBox_PaperSizeIndexChanged)
         self.pushButton_Scan = QtWidgets.QPushButton(self.dockWidgetContents)
         self.pushButton_Scan.setGeometry(QtCore.QRect(60, 470, 81, 41))
         font = QtGui.QFont()
@@ -592,6 +620,8 @@ class Ui_HpScan(object):
                 self.pushButton_Scan.setEnabled(True)
         elif status[0] == 6:
             self.failureMessage(convert_error_message)
+        elif status[0] == 7:
+            self.warningMessage(multipick_error_message)
         self.pushButton_Scan.setEnabled(True)
         #if status != 0:
             #print("Cmd %s failed with status %d",cmd,status)
@@ -621,6 +651,15 @@ class Ui_HpScan(object):
         #print self.file_type
 
     def comboBox_SourceChanged(self,device):
+        supported_PageSizes =[]
+        for x in PAGE_SIZES:
+            if PAGE_SIZES[x][0]<self.devicelist[self.device_uri][2] and PAGE_SIZES[x][1]<self.devicelist[self.device_uri][3]:
+                supported_PageSizes.append(x)
+        self.comboBox_Papersize.clear()
+        self.comboBox_Papersize.addItems(supported_PageSizes)
+        self.comboBox_Papersize.currentIndexChanged.connect(self.comboBox_PaperSizeIndexChanged)
+
+        
         if device != '5000' and device != '7500' and device != '9120' and device != '8500' and device != '3500' and device != '4500' and device != '3000' and device != '7000' and device != '2000' and device != '2500':
             self.multi_pick_pri = False
         else:
@@ -1388,11 +1427,11 @@ class Ui_HpScan(object):
         #self.comboBox_Papersize.setItemText(2, _translate("HpScan", "3x5", None))
         #self.comboBox_Papersize.setItemText(3, _translate("HpScan", "a2_env", None))
         #self.comboBox_Papersize.setItemText(4, _translate("HpScan", "a3", None))
-        self.comboBox_Papersize.setItemText(0, _translate("HpScan", "a4", None))
-        self.comboBox_Papersize.setItemText(1, _translate("HpScan", "a5", None))
+        #self.comboBox_Papersize.setItemText(0, _translate("HpScan", "a4", None))
+        #self.comboBox_Papersize.setItemText(1, _translate("HpScan", "a5", None))
         #self.comboBox_Papersize.setItemText(7, _translate("HpScan", "a6", None))
         #self.comboBox_Papersize.setItemText(8, _translate("HpScan", "b4", None))
-        self.comboBox_Papersize.setItemText(2, _translate("HpScan", "b5", None))
+        #self.comboBox_Papersize.setItemText(2, _translate("HpScan", "b5", None))
         #self.comboBox_Papersize.setItemText(10, _translate("HpScan", "c6_env", None))
         #self.comboBox_Papersize.setItemText(11, _translate("HpScan", "dl_env", None))
         #self.comboBox_Papersize.setItemText(12, _translate("HpScan", "exec", None))
@@ -1400,14 +1439,14 @@ class Ui_HpScan(object):
         #self.comboBox_Papersize.setItemText(14, _translate("HpScan", "higaki", None))
         #self.comboBox_Papersize.setItemText(15, _translate("HpScan", "japan_env_3", None))
         #self.comboBox_Papersize.setItemText(16, _translate("HpScan", "japan_env_4", None))
-        self.comboBox_Papersize.setItemText(3, _translate("HpScan", "legal", None))
-        self.comboBox_Papersize.setItemText(4, _translate("HpScan", "letter", None))
+        #self.comboBox_Papersize.setItemText(3, _translate("HpScan", "legal", None))
+        #self.comboBox_Papersize.setItemText(4, _translate("HpScan", "letter", None))
         #self.comboBox_Papersize.setItemText(19, _translate("HpScan", "no_10_env", None))
         #self.comboBox_Papersize.setItemText(20, _translate("HpScan", "oufufu-hagaki", None))
         #self.comboBox_Papersize.setItemText(21, _translate("HpScan", "photo", None))
         #self.comboBox_Papersize.setItemText(22, _translate("HpScan", "super_b", None))
         #self.comboBox_Papersize.setItemText(23, _translate("HpScan", "b6", None))
-        self.comboBox_Papersize.setCurrentIndex(4)        
+        #self.comboBox_Papersize.setCurrentIndex(4)        
         self.pushButton_Scan.setText(_translate("HpScan", "Scan", None))
         
         self.pushButton_Change.setText(_translate("HpScan", "Change Path", None))
@@ -1470,13 +1509,20 @@ class SetupDialog():
         #device = ''
         sane.init()
         sane_devices = sane.getDevices()
-        for d, mfg, mdl, t in sane_devices:
-            try:
-                devicelist[d]
-            except KeyError:
-                devicelist[d] = [mdl]
-            else:
-                devicelist[d].append(mdl)
+        
+        for device, mfg, mdl, t in sane_devices:
+            if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device):
+                try:
+                    scanDevice = sane.openDevice(device)
+                    source_option = scanDevice.getOptionObj("source").constraint
+                    brx = scanDevice.getOptionObj('br-x').limitAndSet(None)
+                    bry = scanDevice.getOptionObj('br-y').limitAndSet(None)
+                    devicelist[device] = [mdl]
+                    devicelist[device].extend([source_option,int(brx)+1,int(bry)+1])
+                    scanDevice.closeScan()
+                except :
+                    pass                    
+
         sane.deInit()
         #print (devicelist)
 
diff --git a/ui5/setupdialog_base.py b/ui5/setupdialog_base.py
index ce4f35317..eab5f3000 100644
--- a/ui5/setupdialog_base.py
+++ b/ui5/setupdialog_base.py
@@ -7,7 +7,7 @@
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
-
+from base import utils
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
@@ -94,7 +94,8 @@ class Ui_Dialog(object):
         self.NetworkDiscoveryMethodComboBox.setObjectName("NetworkDiscoveryMethodComboBox")
         self.NetworkDiscoveryMethodComboBox.addItem("")
         self.NetworkDiscoveryMethodComboBox.addItem("")
-        self.NetworkDiscoveryMethodComboBox.addItem("")
+        if utils.which("avahi-browse"):
+           self.NetworkDiscoveryMethodComboBox.addItem("")
         self.hboxlayout2.addWidget(self.NetworkDiscoveryMethodComboBox)
         self.gridlayout4.addLayout(self.hboxlayout2, 1, 0, 1, 1)
         self.hboxlayout3 = QtWidgets.QHBoxLayout()
@@ -356,7 +357,8 @@ class Ui_Dialog(object):
         self.NetworkDiscoveryMethodLabel.setText(_translate("Dialog", "Network discovery method:"))
         self.NetworkDiscoveryMethodComboBox.setItemText(0, _translate("Dialog", "SLP"))
         self.NetworkDiscoveryMethodComboBox.setItemText(1, _translate("Dialog", "mDNS/Bonjour"))
-        self.NetworkDiscoveryMethodComboBox.setItemText(2, _translate("Dialog", "Avahi"))
+        if utils.which("avahi-browse"):
+           self.NetworkDiscoveryMethodComboBox.setItemText(2, _translate("Dialog", "Avahi"))
         self.NetworkTimeoutLabel.setText(_translate("Dialog", "Timeout:"))
         self.NetworkTimeoutSpinBox.setSuffix(_translate("Dialog", "sec"))
         self.NetworkTTLLabel.setText(_translate("Dialog", "TTL:"))