Imported Upstream version 5.2.5

author: Roger Leigh <rleigh@debian.org> 2010-02-18 18:43:37 +0000
committer: Roger Leigh <rleigh@debian.org> 2010-02-18 18:43:37 +0000
commit: b7a746079a87b24dc0e64362e83463029e26c98f (patch)
tree: 4cd968e10cb18bdcd7ed21489f6fdb3e9dc1e0ff /src
parent: 0f09a5be038c93c1bd5ca2988e152345bbf74c00 (diff)
27 files changed, 3781 insertions, 707 deletions
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index 1286c45..adf27e9 100644
--- a/src/cups/cups-genppdupdate.in
+++ b/src/cups/cups-genppdupdate.in
@@ -1,5 +1,5 @@
 #! @PERL@ -w
-# $Id: cups-genppdupdate.in,v 1.57 2009/06/07 02:34:55 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.58 2010/01/01 19:22:18 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -177,7 +177,7 @@ if (!$quiet || $verbose) {
 	my $plural = $updated_ppd_count == 1 ? "" : "s";
 	print STDOUT "Updated $updated_ppd_count PPD file${plural}.";
 	if (!defined $opt_o || $opt_o ne "") {
-	    print STDOUT "Restart cupsd for the changes to take effect.";
+	    print STDOUT "  Restart cupsd for the changes to take effect.";
 	}
 	print STDOUT "\n";
     } else {
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 2af44a6..7568abf 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
  /*
- * "$Id: genppd.c,v 1.178 2009/07/18 00:55:45 rlk Exp $"
+ * "$Id: genppd.c,v 1.179 2009/10/05 12:37:30 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
@@ -358,30 +358,34 @@ list_ppds(const char *argv0)		/* I - Name of program */
   for (i = 0; i < stp_printer_model_count(); i++)
     if ((printer = stp_get_printer_by_index(i)) != NULL)
     {
+      const char *device_id;
       if (!strcmp(stp_printer_get_family(printer), "ps") ||
 	  !strcmp(stp_printer_get_family(printer), "raw"))
         continue;
 
+      device_id = stp_printer_get_device_id(printer);
       printf("\"%s://%s/expert\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
-	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
+	     "\"%s\"\n",
              scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
-	     stp_printer_get_long_name(printer));
+	     stp_printer_get_long_name(printer),
+	     device_id ? device_id : "");
 
 #ifdef GENERATE_SIMPLIFIED_PPDS
       printf("\"%s://%s/simple\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
-	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
+	     "\"%s\"\n",
              scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
-	     stp_printer_get_long_name(printer));
+	     stp_printer_get_long_name(printer),
+	     device_id ? device_id : "");
 #endif
     }
 
@@ -925,6 +929,7 @@ write_ppd(
   int		model;			/* Internal model ID */
   const char	*long_name;		/* Driver long name */
   const char	*manufacturer;		/* Manufacturer of printer */
+  const char	*device_id;		/* IEEE1284 device ID */
   const stp_vars_t *printvars;		/* Printer option names */
   paper_t	*the_papers;		/* Media sizes */
   int		cur_opt;		/* Current option */
@@ -957,6 +962,7 @@ write_ppd(
   model      = stp_printer_get_model(p);
   long_name  = stp_printer_get_long_name(p);
   manufacturer = stp_printer_get_manufacturer(p);
+  device_id  = stp_printer_get_device_id(p);
   printvars  = stp_printer_get_defaults(p);
   the_papers = NULL;
   cur_opt    = 0;
@@ -1079,6 +1085,8 @@ write_ppd(
   gzprintf(fp, "*cupsFilter:	\"application/vnd.cups-raster 100 rastertogutenprint.%s\"\n", GUTENPRINT_RELEASE_VERSION);
   if (strcasecmp(manufacturer, "EPSON") == 0)
     gzputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
+  if (device_id)
+    gzprintf(fp, "*1284DeviceID: \"%s\"\n", device_id);
   if (!language)
   {
    /*
@@ -2353,5 +2361,5 @@ write_ppd(
 
 
 /*
- * End of "$Id: genppd.c,v 1.178 2009/07/18 00:55:45 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.179 2009/10/05 12:37:30 rlk Exp $".
  */
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 0d14b08..cec0294 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.100 2009/03/22 01:35:18 rlk Exp $"
+ * "$Id: escputil.c,v 1.102 2009/12/23 20:13:54 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -381,6 +381,7 @@ main(int argc, char **argv)
 	      printf(_("Alignment choices must be at least 1."));
 	      do_help(1);
 	    }
+	  break;
 	case 'p':
 	  alignment_passes = atoi(optarg);
 	  if (alignment_passes < 1)
@@ -388,6 +389,7 @@ main(int argc, char **argv)
 	      printf(_("Alignment passes must be at least 1."));
 	      do_help(1);
 	    }
+	  break;
 	default:
 	  printf("%s\n", gettext(banner));
 	  fprintf(stderr, _("Unknown option %c\n"), c);
@@ -1017,8 +1019,8 @@ static const char *aux_colors[] =
     N_("Cyan"),			/* 1 */
     N_("Magenta"),		/* 2 */
     N_("Yellow"),		/* 3 */
-    NULL,			/* 4 */
-    NULL,			/* 5 */
+    N_("Light Cyan"),		/* 4 */
+    N_("Light Magenta"),	/* 5 */
     NULL,			/* 6 */
     NULL,			/* 7 */
     NULL,			/* 8 */
@@ -1334,6 +1336,9 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	  printf("%20s    %20s\n", _("Ink color"), _("Percent remaining"));
 	  for (j = 0; j < count; j++)
 	    {
+	      STP_DEBUG(fprintf(stderr, "    Ink %d: ind[0] %d ind[1] %d ind[2] %d interchangeable %d param %d count %d aux %d\n",
+				j, ind[0], ind[1], ind[2], interchangeable_inks,
+				param, color_count, aux_color_count));
 	      if (ind[0] < color_count && param == 3 &&
 		  (interchangeable_inks || ind[1] >= aux_color_count ||
 		   ! aux_colors[(int) ind[1]]))
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index 11121aa..8f8e1aa 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -86,6 +86,7 @@
 #gptofoo canon-cp500 printer/Canon-SELPHY-CP-500
 #gptofoo canon-cp510 printer/Canon-SELPHY-CP-510
 #gptofoo canon-cp520 printer/Canon-SELPHY-CP-520
+#gptofoo canon-cp530 printer/Canon-SELPHY-CP-530
 #gptofoo canon-cp600 printer/Canon-SELPHY-CP-600
 #gptofoo canon-cp710 printer/Canon-SELPHY-CP-710
 #gptofoo canon-cp720 printer/Canon-SELPHY-CP-720
@@ -154,7 +155,9 @@
 #gptofoo epson-acl_c8600 printer/Epson-AcuLaser_C8600
 #gptofoo epson-acl_c8600ps printer/Epson-AcuLaser_C8600PS
 #gptofoo escp2-artisan700 printer/Epson-Artisan_700
+#gptofoo escp2-artisan710 printer/Epson-Artisan_710
 #gptofoo escp2-artisan800 printer/Epson-Artisan_800
+#gptofoo escp2-artisan810 printer/Epson-Artisan_810
 #gptofoo escp2-b300 printer/Epson-B300
 #gptofoo escp2-b308 printer/Epson-B308
 #gptofoo escp2-b500dn printer/Epson-B500DN
@@ -415,14 +418,19 @@
 #gptofoo escp2-dx9400f printer/Epson-Stylus_DX9400F
 #gptofoo escp2-nx100 printer/Epson-Stylus_NX100
 #gptofoo escp2-nx105 printer/Epson-Stylus_NX105
+#gptofoo escp2-nx115 printer/Epson-Stylus_NX115
 #gptofoo escp2-nx200 printer/Epson-Stylus_NX200
+#gptofoo escp2-nx215 printer/Epson-Stylus_NX215
 #gptofoo escp2-nx300 printer/Epson-Stylus_NX300
 #gptofoo escp2-nx400 printer/Epson-Stylus_NX400
+#gptofoo escp2-nx415 printer/Epson-Stylus_NX415
+#gptofoo escp2-nx515 printer/Epson-Stylus_NX515
 #gptofoo escp2-photo printer/Epson-Stylus_Photo
 #gptofoo escp2-1200 printer/Epson-Stylus_Photo_1200
 #gptofoo escp2-1270 printer/Epson-Stylus_Photo_1270
 #gptofoo escp2-1280 printer/Epson-Stylus_Photo_1280
 #gptofoo escp2-1290 printer/Epson-Stylus_Photo_1290
+#gptofoo escp2-1290s printer/Epson-Stylus_Photo_1290s
 #gptofoo escp2-1400 printer/Epson-Stylus_Photo_1400
 #gptofoo escp2-1410 printer/Epson-Stylus_Photo_1410
 #gptofoo escp2-2000 printer/Epson-Stylus_Photo_2000P
@@ -517,12 +525,16 @@
 #gptofoo escp2-px201 printer/Epson-PX_201
 #gptofoo escp2-px401a printer/Epson-PX_401
 #gptofoo escp2-px601f printer/Epson-PX_601F
+#gptofoo escp2-px1001 printer/Epson-PX_1001
 #gptofoo escp2-of-b30 printer/Epson-Stylus_Office_B30
 #gptofoo escp2-of-b33 printer/Epson-Stylus_Office_B33
 #gptofoo escp2-of-b40w printer/Epson-Stylus_Office_B40W
+#gptofoo escp2-of-b1100 printer/Epson-Stylus_Office_B1100
 #gptofoo escp2-of-t30 printer/Epson-Stylus_Office_T30
 #gptofoo escp2-of-t33 printer/Epson-Stylus_Office_T33
 #gptofoo escp2-of-t40w printer/Epson-Stylus_Office_T40W
+#gptofoo escp2-of-t1100 printer/Epson-Stylus_Office_T1100
+#gptofoo escp2-of-t1110 printer/Epson-Stylus_Office_T1110
 #gptofoo escp2-of-bx300f printer/Epson-Stylus_Office_BX300F
 #gptofoo escp2-of-bx600fw printer/Epson-Stylus_Office_BX600FW
 #gptofoo escp2-of-sx600fw printer/Epson-Stylus_Office_SX600FW
@@ -533,20 +545,48 @@
 #gptofoo escp2-meof80w printer/Epson-ME_Office_80W
 #gptofoo escp2-meof360 printer/Epson-ME_Office_360
 #gptofoo escp2-meof700fw printer/Epson-ME_Office_700FW
+#gptofoo escp2-meof1100 printer/Epson-ME_Office_1100
 #gptofoo escp2-wf30 printer/Epson-WorkForce_30
 #gptofoo escp2-wf40 printer/Epson-WorkForce_40
+#gptofoo escp2-wf310 printer/Epson-WorkForce_310
+#gptofoo escp2-wf315 printer/Epson-WorkForce_315
 #gptofoo escp2-wf500 printer/Epson-WorkForce_500
 #gptofoo escp2-wf600 printer/Epson-WorkForce_600
-#gptofoo escp2-px700fw printer/Epson-Stylus_PX700W
-#gptofoo escp2-px800fw printer/Epson-Stylus_PX800FW
+#gptofoo escp2-wf610 printer/Epson-WorkForce_610
+#gptofoo escp2-wf615 printer/Epson-WorkForce_615
+#gptofoo escp2-wf1100 printer/Epson-WorkForce_1100
+#gptofoo escp2-px650 printer/Epson-Stylus_Photo_PX650
+#gptofoo escp2-px700fw printer/Epson-Stylus_Photo_PX700W
+#gptofoo escp2-px710fw printer/Epson-Stylus_Photo_PX710W
+#gptofoo escp2-px800fw printer/Epson-Stylus_Photo_PX800FW
+#gptofoo escp2-px810fw printer/Epson-Stylus_Photo_PX810FW
 #gptofoo escp2-s20 printer/Epson-Stylus_S20
+#gptofoo escp2-s21 printer/Epson-Stylus_S21
+#gptofoo escp2-s50 printer/Epson-Stylus_Photo_S50
 #gptofoo escp2-sx100 printer/Epson-Stylus_SX100
 #gptofoo escp2-sx105 printer/Epson-Stylus_SX105
+#gptofoo escp2-sx110 printer/Epson-Stylus_SX110
+#gptofoo escp2-sx115 printer/Epson-Stylus_SX115
 #gptofoo escp2-sx200 printer/Epson-Stylus_SX200
 #gptofoo escp2-sx205 printer/Epson-Stylus_SX205
+#gptofoo escp2-sx210 printer/Epson-Stylus_SX210
+#gptofoo escp2-sx215 printer/Epson-Stylus_SX215
 #gptofoo escp2-sx400 printer/Epson-Stylus_SX400
 #gptofoo escp2-sx405 printer/Epson-Stylus_SX405
+#gptofoo escp2-sx410 printer/Epson-Stylus_SX410
+#gptofoo escp2-sx415 printer/Epson-Stylus_SX415
+#gptofoo escp2-sx510w printer/Epson-Stylus_SX510W
+#gptofoo escp2-sx515 printer/Epson-Stylus_SX515
+#gptofoo escp2-sx600fw printer/Epson-Stylus_SX600FW
+#gptofoo escp2-sx610fw printer/Epson-Stylus_SX610FW
+#gptofoo escp2-sx615 printer/Epson-Stylus_SX615
+#gptofoo escp2-sx650 printer/Epson-Stylus_SX650
 #gptofoo escp2-t20 printer/Epson-Stylus_T20
+#gptofoo escp2-t21 printer/Epson-Stylus_T21
+#gptofoo escp2-t26 printer/Epson-Stylus_T26
+#gptofoo escp2-t30 printer/Epson-Stylus_T30
+#gptofoo escp2-t40w printer/Epson-Stylus_T40W
+#gptofoo escp2-t50 printer/Epson-Stylus_T50
 #gptofoo escp2-tx100 printer/Epson-Stylus_TX100
 #gptofoo escp2-tx101 printer/Epson-Stylus_TX101
 #gptofoo escp2-tx102 printer/Epson-Stylus_TX102
@@ -555,10 +595,21 @@
 #gptofoo escp2-tx105 printer/Epson-Stylus_TX105
 #gptofoo escp2-tx106 printer/Epson-Stylus_TX106
 #gptofoo escp2-tx109 printer/Epson-Stylus_TX109
+#gptofoo escp2-tx110 printer/Epson-Stylus_TX110
 #gptofoo escp2-tx200 printer/Epson-Stylus_TX200
+#gptofoo escp2-tx210 printer/Epson-Stylus_TX210
+#gptofoo escp2-tx300f printer/Epson-Stylus_TX300F
 #gptofoo escp2-tx400 printer/Epson-Stylus_TX400
+#gptofoo escp2-tx410 printer/Epson-Stylus_TX410
+#gptofoo escp2-tx510fn printer/Epson-Stylus_TX510FN
+#gptofoo escp2-tx550w printer/Epson-Stylus_TX550W
+#gptofoo escp2-tx610fw printer/Epson-Stylus_TX610FW
+#gptofoo escp2-tx615 printer/Epson-Stylus_TX615
+#gptofoo escp2-tx650 printer/Epson-Stylus_TX650
 #gptofoo escp2-tx700w printer/Epson-Stylus_Photo_TX700W
+#gptofoo escp2-tx710w printer/Epson-Stylus_Photo_TX710W
 #gptofoo escp2-tx800w printer/Epson-Stylus_Photo_TX800FW
+#gptofoo escp2-tx810fw printer/Epson-Stylus_Photo_TX810FW
 #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400
 #gptofoo fujifilm-cx550 printer/Fujifilm-Printpix-CX-550
 #gptofoo fujifilm-nx500 printer/Fujifilm-FinePix-NX-500
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 0ccc74c..c3aaf05 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.424 2009/07/21 11:07:06 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.426 2009/11/15 01:50:50 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -922,7 +922,7 @@ static const int_param_t int_parameters[] =
 {
   {
     {
-      "QualityEnhancement", N_("Quality Enhancement"), N_("Advanced Printer Functionality"),
+      "BandEnhancement", N_("Quality Enhancement"), N_("Advanced Printer Functionality"),
       N_("Enhance print quality by additional passes"),
       STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, STP_CHANNEL_NONE, 1, 0
@@ -2737,7 +2737,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       if (stp_escp2_has_media_feature(v, name))
 	description->is_active = 1;
     }
-  else if (strcmp(name, "QualityEnhancement") == 0)
+  else if (strcmp(name, "BandEnhancement") == 0)
     {
       description->is_active = 1;
     }
@@ -3908,7 +3908,10 @@ setup_head_parameters(stp_vars_t *v)
 
   pd->printer_weave = get_printer_weave(v);
 
-  pd->extra_vertical_passes = 1 << stp_get_int_parameter(v, "QualityEnhancement");
+  pd->extra_vertical_passes = 1;
+  if (stp_check_int_parameter(v, "BandEnhancement", STP_PARAMETER_ACTIVE))
+    pd->extra_vertical_passes =
+      1 << stp_get_int_parameter(v, "BandEnhancement");
   if (stp_escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
       (pd->inkname->inkset == INKSET_CMYK || pd->physical_channels == 1) &&
       pd->res->hres == pd->physical_xdpi && pd->res->vres == 360)
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 29836ed..6d3a719 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-olympus.c,v 1.94 2009/06/22 11:58:34 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.95 2010/01/04 14:04:25 m0m Exp $"
  *
  *   Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
  *
@@ -1665,7 +1665,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
-  { /* Canon CP-520 */
+  { /* Canon CP-520, SELPHY CP-530 */
     1004,
     &ymc_ink_list,
     &res_300dpi_list,
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index fa107cd..4dfe787 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.156 2008/08/06 22:49:05 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.157 2010/02/12 01:02:12 rlk Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -204,6 +204,7 @@ static const pcl_t pcl_media_types[] =
 
 #define PCL_PAPERSOURCE_STANDARD	0	/* Don't output code */
 #define PCL_PAPERSOURCE_MANUAL		2
+#define PCL_PAPERSOURCE_MANUAL_ADJ	(PCL_PAPERSOURCE_MANUAL + PAPERSOURCE_ADJ_GUIDE)
 #define PCL_PAPERSOURCE_ENVELOPE	3	/* Not used */
 
 /* LaserJet types */
@@ -235,6 +236,7 @@ static const pcl_t pcl_media_sources[] =
 {
     { "Standard", N_ ("Standard"), PCL_PAPERSOURCE_STANDARD},
     { "Manual", N_ ("Manual"), PCL_PAPERSOURCE_MANUAL},
+    { "ManualAdj", N_ ("Manual - Movable Guides"), PCL_PAPERSOURCE_MANUAL_ADJ},
 /*  {"Envelope", PCL_PAPERSOURCE_ENVELOPE}, */
     { "MultiPurposeAdj", N_ ("Tray 1 - Movable Guides"), PCL_PAPERSOURCE_LJ_TRAY1_ADJ},
     { "MultiPurpose", N_ ("Tray 1"), PCL_PAPERSOURCE_LJ_TRAY1},
@@ -610,6 +612,7 @@ static const short new_papertypes[] =
 static const short laserjet_papersources[] =
 {
   PCL_PAPERSOURCE_STANDARD,
+  PCL_PAPERSOURCE_MANUAL_ADJ,
   PCL_PAPERSOURCE_MANUAL,
   PCL_PAPERSOURCE_LJ_TRAY1_ADJ,
   PCL_PAPERSOURCE_LJ_TRAY1,
@@ -1051,6 +1054,19 @@ static const pcl_cap_t pcl_model_capabilities[] =
     emptylist,
     laserjet_papersources,
   },
+  /* PCL-4 with large paper, no expanded A4 margins */
+  { 24,
+    13 * 72, 19 * 72,
+    1, 1,				/* Min paper size */
+    PCL_RES_150_150 | PCL_RES_300_300,
+    {12, 12, 18, 18},
+    {12, 12, 18, 18},	/* Check/Fix */
+    PCL_COLOR_NONE,
+    PCL_PRINTER_LJ,
+    ljbig_papersizes,
+    emptylist,
+    laserjet_papersources,
+  },
   /* LaserJet III series */
   { 3,
     17 * 72 / 2, 14 * 72,
@@ -1103,6 +1119,19 @@ static const pcl_cap_t pcl_model_capabilities[] =
     emptylist,
     laserjet_papersources,
   },
+  /* PCL-5 with large paper, no expanded margins */
+  { 34,
+    13 * 72, 19 * 72,
+    1, 1,				/* Min paper size */
+    PCL_RES_150_150 | PCL_RES_300_300,
+    {12, 12, 18, 18},
+    {12, 12, 18, 18},	/* Check/Fix */
+    PCL_COLOR_NONE,
+    PCL_PRINTER_LJ | PCL_PRINTER_TIFF | PCL_PRINTER_BLANKLINE,
+    ljbig_papersizes,
+    emptylist,
+    laserjet_papersources,
+  },
   /* LaserJet 4L */
   { 4,
     17 * 72 / 2, 14 * 72,
@@ -1185,6 +1214,20 @@ static const pcl_cap_t pcl_model_capabilities[] =
     emptylist,
     laserjet_papersources,
   },
+  /* PCL-5c/5e/6/XL with large paper, no expanded A4 margins */
+  { 63,
+    13 * 72, 19 * 72,
+    1, 1,				/* Min paper size */
+    PCL_RES_150_150 | PCL_RES_300_300 | PCL_RES_600_600,
+    {12, 12, 18, 18},
+    {12, 12, 18, 18},	/* Check/Fix */
+    PCL_COLOR_NONE,
+    PCL_PRINTER_LJ | PCL_PRINTER_NEW_ERG | PCL_PRINTER_TIFF | PCL_PRINTER_BLANKLINE |
+      PCL_PRINTER_DUPLEX,
+    ljbig_papersizes,
+    emptylist,
+    laserjet_papersources,
+  },
   /* LaserJet 5Si */
   { 7,
     13 * 72, 19 * 72,
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 728718e..228d241 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.101 2008/08/18 02:00:18 rlk Exp $"
+ * "$Id: print-ps.c,v 1.102 2009/09/03 00:33:52 rlk Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -771,6 +771,121 @@ ps_external_options(const stp_vars_t *v)
 }
 
 /*
+ * 'ps_print_device_settings()' - output postscript code from PPD into the
+ * postscript stream.
+ */
+
+static void
+ps_print_device_settings(stp_vars_t *v)
+{
+  int i;
+  stp_parameter_list_t param_list = ps_list_parameters(v);
+  if (! param_list)
+    return;
+  stp_puts("%%BeginSetup\n", v);
+  for (i = 0; i < stp_parameter_list_count(param_list); i++)
+    {
+      const stp_parameter_t *param = stp_parameter_list_param(param_list, i);
+      stp_parameter_t desc;
+      stp_describe_parameter(v, param->name, &desc);
+      if (desc.is_active)
+	{
+	  switch (desc.p_type)
+	    {
+	    case STP_PARAMETER_TYPE_STRING_LIST:
+	    case STP_PARAMETER_TYPE_BOOLEAN:
+	      {
+		const char *val=NULL;
+		const char *defval=NULL;
+
+		/* If this is a bool parameter, set val to "True" or "False" - otherwise fetch from string parameter. */
+		if(desc.p_type==STP_PARAMETER_TYPE_BOOLEAN)
+		  {
+		    val=stp_get_boolean_parameter(v,desc.name) ? "True" : "False";
+		    defval=desc.deflt.boolean ? "True" : "False";
+		  }
+		else
+		  {
+		    val=stp_get_string_parameter(v,desc.name);
+		    defval=desc.deflt.str;
+		  }
+
+		/* We only include the option's code if it's set to a value other than the default. */
+		if(val && defval && (strcmp(val,defval)!=0))
+		  {
+		    if(m_ppd)
+		      {
+			/* If we have a PPD xml tree we hunt for the appropriate "option" and "choice"... */
+			stp_mxml_node_t *node=m_ppd;
+			node=stp_mxmlFindElement(node,node, "option", "name", desc.name, STP_MXML_DESCEND);
+			if(node)
+			  {
+			    node=stp_mxmlFindElement(node,node, "choice", "name", val, STP_MXML_DESCEND);
+			    if(node)
+			      {
+				if(node->child && node->child->value.opaque && (strlen(node->child->value.opaque)>1))
+				  {
+				    /* If we have opaque data for the child, we use %%BeginFeature and copy the code verbatim. */
+				    stp_puts("[{\n", v);
+				    stp_zprintf(v, "%%%%BeginFeature: *%s %s\n", desc.name, val);
+				    if(node->child->value.opaque)
+				      stp_puts(node->child->value.opaque,v);
+				    stp_puts("\n%%EndFeature\n", v);
+				    stp_puts("} stopped cleartomark\n", v);
+				  }
+				else
+				  {
+				    /* If we don't have code, we use %%IncludeFeature instead. */
+				    stp_puts("[{\n", v);
+				    stp_zprintf(v, "%%%%IncludeFeature: *%s %s\n", desc.name, val);
+				    if(node->child->value.opaque)
+				      stp_puts(node->child->value.opaque,v);
+				    stp_puts("} stopped cleartomark\n", v);
+				  }
+			      }
+			  }
+		      }
+		  }
+	      }
+	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      if(stp_get_int_parameter(v,desc.name)!=desc.deflt.integer)
+		{
+		  stp_puts("[{\n", v);
+		  stp_zprintf(v, "%%%%IncludeFeature: *%s %d\n", desc.name,
+			      stp_get_int_parameter(v, desc.name));
+		  stp_puts("} stopped cleartomark\n", v);
+		}
+	      break;
+	    case STP_PARAMETER_TYPE_DOUBLE:
+	      if(stp_get_float_parameter(v,desc.name)!=desc.deflt.dbl)
+		{
+		  stp_puts("[{\n", v);
+		  stp_zprintf(v, "%%%%IncludeFeature: *%s %f\n", desc.name,
+			      stp_get_float_parameter(v, desc.name));
+		  stp_puts("} stopped cleartomark\n", v);
+		}
+	      break;
+	    case STP_PARAMETER_TYPE_DIMENSION:
+	      if(stp_get_dimension_parameter(v,desc.name)!=desc.deflt.dimension)
+		{
+		  stp_puts("[{\n", v);
+		  stp_zprintf(v, "%%%%IncludeFeature: *%s %d\n", desc.name,
+			      stp_get_dimension_parameter(v, desc.name));
+		  stp_puts("} stopped cleartomark\n", v);
+		}
+	      break;
+	    default:
+	      break;
+	    }
+	}
+      stp_parameter_description_destroy(&desc);
+    }
+  stp_puts("%%EndSetup\n", v);
+  stp_parameter_list_destroy(param_list);
+}
+
+/*
  * 'ps_print()' - Print an image to a PostScript printer.
  */
 
@@ -867,10 +982,7 @@ ps_print_internal(stp_vars_t *v, stp_image_t *image)
   stp_puts("%%Orientation: Portrait\n", v);
   stp_puts("%%EndComments\n", v);
 
-#if 0
-  /* This is still not correct -- rlk 20070601 */
   ps_print_device_settings(v);
-#endif
 
  /*
   * Output the page...
diff --git a/src/main/printers.c b/src/main/printers.c
index 8df5ea9..af2a670 100644
--- a/src/main/printers.c
+++ b/src/main/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.85 2008/06/03 11:40:39 rlk Exp $"
+ * "$Id: printers.c,v 1.86 2009/10/05 12:37:30 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -65,6 +65,7 @@ struct stp_printer
   char       *long_name;        /* Long name for UI */
   char       *family;           /* Printer family */
   char	     *manufacturer;	/* Printer manufacturer */
+  char	     *device_id; /* IEEE 1284 device ID */
   int        model;             /* Model number */
   int	     vars_initialized;
   const stp_printfuncs_t *printfuncs;
@@ -187,6 +188,12 @@ stpi_printer_long_namefunc(const void *item)
 }
 
 const char *
+stp_printer_get_device_id(const stp_printer_t *printer)
+{
+  return printer->device_id;
+}
+
+const char *
 stp_printer_get_family(const stp_printer_t *printer)
 {
   return printer->family;
@@ -243,6 +250,30 @@ stp_get_printer_by_driver(const char *driver)
   return (const stp_printer_t *) stp_list_item_get_data(printer_item);
 }
 
+const stp_printer_t *
+stp_get_printer_by_device_id(const char *device_id)
+{
+  stp_list_item_t *printer_item;
+  if (printer_list == NULL)
+    {
+      stp_erprintf("No printer drivers found: "
+		   "are STP_DATA_PATH and STP_MODULE_PATH correct?\n");
+      stpi_init_printer_list();
+    }
+  if (! device_id || strcmp(device_id, "") == 0)
+    return NULL;
+
+  printer_item = stp_list_get_start(printer_list);
+  while (printer_item)
+    {
+      if (strcmp(((const stp_printer_t *) stp_list_item_get_data(printer_item)),
+		 device_id) == 0)
+	return ((const stp_printer_t *) stp_list_item_get_data(printer_item));
+      printer_item = stp_list_item_next(printer_item);
+    }
+  return NULL;
+}
+
 int
 stp_get_printer_index_by_driver(const char *driver)
 {
@@ -1054,6 +1085,9 @@ stp_printer_create_from_xmltree(stp_mxml_node_t *printer, /* The printer node */
   outprinter->manufacturer = stp_strdup(stp_mxmlElementGetAttr(printer, "manufacturer"));
   outprinter->model = stp_xmlstrtol(stp_mxmlElementGetAttr(printer, "model"));
   outprinter->family = stp_strdup((const char *) family);
+  stmp = stp_mxmlElementGetAttr(printer, "deviceid");
+  if (stmp)
+    outprinter->device_id = stp_strdup(stmp);
 
   if (stp_get_driver(outprinter->printvars))
     driver = 1;
diff --git a/src/main/xmlppd.c b/src/main/xmlppd.c
index 10c2bb9..c633694 100644
--- a/src/main/xmlppd.c
+++ b/src/main/xmlppd.c
@@ -23,6 +23,8 @@
 
 #include <stdio.h>
 #include <gutenprint/mxml.h>
+#include <gutenprint/util.h>
+#include <gutenprint/string-list.h>
 #include <stdlib.h>
 #include "xmlppd.h"
 
@@ -213,6 +215,8 @@ stpi_xmlppd_read_ppd_file(const char *filename)	/* I - PPD file */
   int		order_length;
   char		*order_list;
   int		in_comment;
+  stp_string_list_t *ialist = stp_string_list_create();
+  stp_string_list_t *pdlist = stp_string_list_create();
 
 
  /*
@@ -478,35 +482,51 @@ stpi_xmlppd_read_ppd_file(const char *filename)	/* I - PPD file */
 	}
       else if (!option && !strcmp(buffer, "*ImageableArea"))
 	{
-	  stp_mxml_node_t *psize = stpi_xmlppd_find_page_size(ppd, keyword);
-	  if (psize)
+	  stp_string_list_add_string(ialist, keyword, value);
+	}
+      else if (!option && !strcmp(buffer, "*PaperDimension"))
+	{
+	  stp_string_list_add_string(pdlist, keyword, value);
+	}
+    }
+  for (i = 0; i < stp_string_list_count(ialist); i++)
+    {
+      stp_param_string_t *pstr = stp_string_list_param(ialist, i);
+      stp_mxml_node_t *psize = stpi_xmlppd_find_page_size(ppd, pstr->name);
+      if (psize)
+	{
+	  const char *data[4];
+	  value = stp_strdup(pstr->text);
+	  parse_values(data, 4, value);
+	  if (data[3])
 	    {
-	      const char *data[4];
-	      parse_values(data, 4, value);
-	      if (data[3])
-		{
-		  stp_mxmlElementSetAttr(psize, "left", data[0]);
-		  stp_mxmlElementSetAttr(psize, "bottom", data[1]);
-		  stp_mxmlElementSetAttr(psize, "right", data[2]);
-		  stp_mxmlElementSetAttr(psize, "top", data[3]);
-		}
+	      stp_mxmlElementSetAttr(psize, "left", data[0]);
+	      stp_mxmlElementSetAttr(psize, "bottom", data[1]);
+	      stp_mxmlElementSetAttr(psize, "right", data[2]);
+	      stp_mxmlElementSetAttr(psize, "top", data[3]);
 	    }
+	  stp_free(value);
 	}
-      else if (!option && !strcmp(buffer, "*PaperDimension"))
+    }
+  stp_string_list_destroy(ialist);
+  for (i = 0; i < stp_string_list_count(pdlist); i++)
+    {
+      stp_param_string_t *pstr = stp_string_list_param(pdlist, i);
+      stp_mxml_node_t *psize = stpi_xmlppd_find_page_size(ppd, pstr->name);
+      if (psize)
 	{
-	  stp_mxml_node_t *psize = stpi_xmlppd_find_page_size(ppd, keyword);
-	  if (psize)
+	  const char *data[2];
+	  value = stp_strdup(pstr->text);
+	  parse_values(data, 2, value);
+	  if (data[1])
 	    {
-	      const char *data[2];
-	      parse_values(data, 2, value);
-	      if (data[1])
-		{
-		  stp_mxmlElementSetAttr(psize, "width", data[0]);
-		  stp_mxmlElementSetAttr(psize, "height", data[1]);
-		}
+	      stp_mxmlElementSetAttr(psize, "width", data[0]);
+	      stp_mxmlElementSetAttr(psize, "height", data[1]);
 	    }
+	  stp_free(value);
 	}
     }
+  stp_string_list_destroy(pdlist);
   option_count = stpi_xmlppd_find_option_count(ppd);
   order_length = 1;		/* Terminating null */
   order_array = malloc(sizeof(order_t) * option_count);
diff --git a/src/testpattern/extended.sample b/src/testpattern/extended.sample
index 8e9d0be..025f841 100644
--- a/src/testpattern/extended.sample
+++ b/src/testpattern/extended.sample
@@ -4,7 +4,7 @@
 # values for each of these settings
 # Printer model
 printer escp2-2200;
-mode extended 7;
+mode extended 7 16;
 # Resolution, or print quality
 parameter Resolution 720sw;
 # Media source (if appropriate for your printer)
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index ecc28d7..9a7db40 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -66,7 +66,7 @@ GetOptions("v+"  => \$valgrind,
 	   "M:s" => \$calc_md5_file,
 	   "h"   => \$help);
 
-if ($help) {
+sub print_help_and_exit() {
     my $options = join("\n                        ", sort @standard_options);
     print STDERR <<EOF;
 Usage: run-testpattern-2 [opts] [model ...]
@@ -95,6 +95,8 @@ Usage: run-testpattern-2 [opts] [model ...]
 		    tested.
 		    Default:
 		        $options
+    -d option=value Test this option with only the specified (default) value,
+		    if available
     -p page count   Specify number of pages to print per printer.  Default $std_pages.
     -P page count   Specify number of pages to print per printer when testing
                     duplex mode.  Default $duplex_pages.
@@ -116,13 +118,23 @@ EOF
 exit 1;
 }
 
+if ($help) {
+    print_help_and_exit();
+}
+
 my $pages = $std_pages;
 
 if (! @special_options) {
     @special_options = @standard_options;
 }
 
+my $bad_opt = 0;
+
 foreach my $opt (@default_options) {
+    if (! ($opt =~ /=/)) {
+	print STDERR "Malformed default option `$opt'\n";
+	$bad_opt = 1;
+    }
     my ($option, $value) = split(/=/, $opt);
     if (! $value) {
 	delete $base_settings{$option};
@@ -131,6 +143,10 @@ foreach my $opt (@default_options) {
     }
 }
 
+if ($bad_opt) {
+    print_help_and_exit();
+}
+
 my $pwd = `pwd`;
 chomp $pwd;
 
@@ -409,6 +425,18 @@ sub do_printer($$) {
     my (@resolutions) = grep {$_ ne 'None' } keys %$tmp;
     $tmp = $stpdata{$printer}{'PrintingMode'};
     my (@printing_modes) = grep {$_ ne 'None' } keys %$tmp;
+    if ($base_settings{'PrintingMode'}) {
+	if ($base_settings{'PrintingMode'} eq 'Color' &&
+	    grep { $_ eq 'Color' } @printing_modes) {
+	    @printing_modes = 'Color';
+	} elsif ($base_settings{'PrintingMode'} eq 'BW' &&
+		 grep { $_ eq 'BW' } @printing_modes) {
+	    @printing_modes = 'BW';
+	} else {
+	    return;
+	}
+    }
+	    
     foreach $key (@special_options) {
 	my $nkey = build_key($key, $printer);
 	if ($nkey ne "") {
diff --git a/src/xml/escp2/inks/claria.xml b/src/xml/escp2/inks/claria.xml
index 5874a95..9c492eb 100644
--- a/src/xml/escp2/inks/claria.xml
+++ b/src/xml/escp2/inks/claria.xml
@@ -281,5 +281,123 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
+
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISHextone" text="MIS Six Tone">
+ <Shades>
+  <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone">
+  <Channels>
+   <channel name="hextone" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+     <SubchannelValueParam name="HGray5Value"/>
+     <SubchannelScaleParam name="HGray5Scale"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray4Trans"/>
+     <SubchannelValueParam name="HGray4Value"/>
+     <SubchannelScaleParam name="HGray4Scale"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray3Trans"/>
+     <SubchannelValueParam name="HGray3Value"/>
+     <SubchannelScaleParam name="HGray3Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray2Trans"/>
+     <SubchannelValueParam name="HGray2Value"/>
+     <SubchannelScaleParam name="HGray2Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray1Trans"/>
+     <SubchannelValueParam name="HGray1Value"/>
+     <SubchannelScaleParam name="HGray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
 </escp2:InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inputslots/Makefile.am b/src/xml/escp2/inputslots/Makefile.am
index 65fa848..b27f529 100644
--- a/src/xml/escp2/inputslots/Makefile.am
+++ b/src/xml/escp2/inputslots/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2009/05/30 14:10:32 rlk Exp $
+## $Id: Makefile.am,v 1.8 2010/01/16 19:53:46 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSI
 pkgxmldata_DATA =				\
 	artisan.xml				\
 	b500.xml				\
+	cd.xml					\
 	cd_cutter_roll_feed.xml			\
 	cd_roll_feed.xml			\
 	cutter_roll_feed.xml			\
diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in
index 1917798..5f7809d 100644
--- a/src/xml/escp2/inputslots/Makefile.in
+++ b/src/xml/escp2/inputslots/Makefile.in
@@ -281,6 +281,7 @@ pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSI
 pkgxmldata_DATA = \
 	artisan.xml				\
 	b500.xml				\
+	cd.xml					\
 	cd_cutter_roll_feed.xml			\
 	cd_roll_feed.xml			\
 	cutter_roll_feed.xml			\
diff --git a/src/xml/escp2/inputslots/cd.xml b/src/xml/escp2/inputslots/cd.xml
new file mode 100644
index 0000000..9ecb61b
--- /dev/null
+++ b/src/xml/escp2/inputslots/cd.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="cd">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>PP\003\000\000\001\377</InitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PP\003\000\000\002\001</InitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/media/claria.xml b/src/xml/escp2/media/claria.xml
index 101bf57..42f8fe7 100644
--- a/src/xml/escp2/media/claria.xml
+++ b/src/xml/escp2/media/claria.xml
@@ -116,6 +116,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BrightWhite" text="Bright White Paper" class="plain">
@@ -172,6 +220,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -228,6 +324,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -284,6 +428,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -340,6 +532,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -396,6 +636,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -452,6 +740,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -508,6 +844,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -564,6 +948,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PresentationMatte" text="Premium Presentation Paper Matte" class="good">
@@ -620,6 +1052,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -676,6 +1156,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -732,6 +1260,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -788,6 +1364,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
@@ -844,6 +1468,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="UltraGlossyPhoto" text="Ultra Glossy Photo Paper" class="premium">
@@ -900,6 +1572,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
@@ -956,6 +1676,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -1012,6 +1780,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="UltraLuster" text="Ultra Premium Photo Paper Luster" class="premium">
@@ -1068,6 +1884,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
@@ -1124,6 +1988,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -1180,6 +2092,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -1236,6 +2196,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -1256,6 +2264,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/claria1400.xml b/src/xml/escp2/media/claria1400.xml
index 94da1cb..66541a2 100644
--- a/src/xml/escp2/media/claria1400.xml
+++ b/src/xml/escp2/media/claria1400.xml
@@ -116,6 +116,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BrightWhite" text="Bright White Paper" class="plain">
@@ -172,6 +220,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -228,6 +324,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -284,6 +428,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -340,6 +532,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -396,6 +636,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -452,6 +740,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -508,6 +844,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -564,6 +948,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PresentationMatte" text="Premium Presentation Paper Matte" class="good">
@@ -620,6 +1052,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -676,6 +1156,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -732,6 +1260,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -788,6 +1364,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
@@ -844,6 +1468,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="UltraGlossyPhoto" text="Ultra Glossy Photo Paper" class="premium">
@@ -900,6 +1572,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
@@ -956,6 +1676,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -1012,6 +1780,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="UltraLuster" text="Ultra Premium Photo Paper Luster" class="premium">
@@ -1068,6 +1884,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
@@ -1124,6 +1988,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -1180,6 +2092,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -1236,6 +2196,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -1255,6 +2263,54 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
index e416c58..33229ad 100644
--- a/src/xml/escp2/model/Makefile.am
+++ b/src/xml/escp2/model/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.16 2009/05/30 14:10:32 rlk Exp $
+## $Id: Makefile.am,v 1.18 2010/01/16 19:53:46 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -124,7 +124,9 @@ pkgxmldata_DATA =				\
 	model_95.xml				\
 	model_96.xml				\
 	model_97.xml				\
-	model_98.xml
+	model_98.xml				\
+	model_99.xml				\
+	model_100.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	-rm -f $@ $@.tmp
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
index 3053266..a8c1607 100644
--- a/src/xml/escp2/model/Makefile.in
+++ b/src/xml/escp2/model/Makefile.in
@@ -377,7 +377,9 @@ pkgxmldata_DATA = \
 	model_95.xml				\
 	model_96.xml				\
 	model_97.xml				\
-	model_98.xml
+	model_98.xml				\
+	model_99.xml				\
+	model_100.xml
 
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/model_100.xml b/src/xml/escp2/model/model_100.xml
new file mode 100644
index 0000000..a92aa11
--- /dev/null
+++ b/src/xml/escp2/model/model_100.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="100">
+ <media src="escp2/media/c120.xml"/>
+ <inputSlots src="escp2/inputslots/cd.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c120.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 262</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black 1"/>
+  <ChannelName translate="name" name="Black 2"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_63.xml b/src/xml/escp2/model/model_63.xml
index 3b57e61..5e736e3 100644
--- a/src/xml/escp2/model/model_63.xml
+++ b/src/xml/escp2/model/model_63.xml
@@ -67,10 +67,10 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <ChannelNames>
   <ChannelName translate="name" name="Black"/>
   <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
   <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
   <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
  </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
diff --git a/src/xml/escp2/model/model_84.xml b/src/xml/escp2/model/model_84.xml
index 50eaf90..bd11e7a 100644
--- a/src/xml/escp2/model/model_84.xml
+++ b/src/xml/escp2/model/model_84.xml
@@ -67,10 +67,10 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <ChannelNames>
   <ChannelName translate="name" name="Black"/>
   <ChannelName translate="name" name="Cyan"/>
-  <ChannelName translate="name" name="Magenta"/>
-  <ChannelName translate="name" name="Yellow"/>
   <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
   <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
  </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
diff --git a/src/xml/escp2/model/model_96.xml b/src/xml/escp2/model/model_96.xml
index ec776fd..e79af9d 100644
--- a/src/xml/escp2/model/model_96.xml
+++ b/src/xml/escp2/model/model_96.xml
@@ -67,12 +67,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <CDMediaSize>595 842</CDMediaSize>
  <AlignmentChoices>4 15 0 0</AlignmentChoices>
  <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
   <ChannelName translate="name" name="Yellow"/>
-  <ChannelName translate="name" name="Black"/>
   <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Black"/>
   <ChannelName translate="name" name="Magenta"/>
-  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
  </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
diff --git a/src/xml/escp2/model/model_99.xml b/src/xml/escp2/model/model_99.xml
new file mode 100644
index 0000000..ab0e2a8
--- /dev/null
+++ b/src/xml/escp2/model/model_99.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="99">
+ <media src="escp2/media/c120.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c120.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black 1"/>
+  <ChannelName translate="name" name="Black 2"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/papers.xml b/src/xml/papers.xml
index 8d83276..80f5036 100644
--- a/src/xml/papers.xml
+++ b/src/xml/papers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: papers.xml,v 1.7 2009/04/14 01:09:42 rlk Exp $"
+   "$Id: papers.xml,v 1.8 2009/08/25 12:54:57 rlk Exp $"
 
    XML description of papers known to libgutenprint.
    You can add additional paper sizes here.
@@ -854,6 +854,22 @@
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
+    <paper name="EA5">
+      <description translate="value" value="EA5"/>
+      <comment value="229mm x 156mm"/>
+      <width value="442"/>
+      <height value="649"/>
+      <unit value="metric-extended"/>
+      <type value="envelope"/>
+    </paper>
+    <paper name="EA5_l">
+      <description translate="value" value="EA5 landscape"/>
+      <comment value="229mm x 156mm landscape"/>
+      <width value="649"/>
+      <height value="442"/>
+      <unit value="metric-extended"/>
+      <type value="envelope"/>
+    </paper>
 <!-- GROUP: US CAD -->
 <!--
     US CAD standard paper sizes
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
index c52bc41..01399bf 100644
--- a/src/xml/printers.xml
+++ b/src/xml/printers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: printers.xml,v 1.37 2009/06/20 08:35:32 faust3 Exp $"
+   "$Id: printers.xml,v 1.46 2010/02/12 01:02:12 rlk Exp $"
 
    XML description of printers known to libgutenprint
    You can add additional printers here, but the underlying driver has
@@ -90,39 +90,39 @@
         <parameter type="float" name="CyanGamma">1.3</parameter> 
       </parameters>
       <printer translate="name" name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
-      <printer translate="name" name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-80" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-85" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
-      <printer translate="name" name="Canon BJC-210" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-50" deviceid="MFG:Canon;MDL:BJC-50;" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-55" deviceid="MFG:Canon;MDL:BJC-55;" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-80" deviceid="MFG:Canon;MDL:BJC-80;" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-85" deviceid="MFG:Canon;MDL:BJC-85;" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-210" deviceid="MFG:Canon;MDL:BJC-210;DES:Canon BJC-210;CMD:BJ,LQ,BJL,BJRaster;" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-240" driver="bjc-240" manufacturer="Canon" model="240" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-250" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-1000" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-250" deviceid="MFG:Canon;MDL:BJC-250;DES:Canon BJC-250;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-1000" deviceid="MFG:Canon;MDL:BJC-1000;DES:Canon BJC-1000;CMD:BJL,BJRaster,BSCC,TXT01;" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-2000" driver="bjc-2000" manufacturer="Canon" model="2000" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-2010" driver="bjc-2010" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-2100" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-2100" deviceid="MFG:Canon;MDL:BJC-2100;DES:Canon BJC-2100;" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-2110" driver="bjc-2110" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-3000" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-3000" deviceid="MFG:Canon;MDL:BJC-3000;DES:Canon BJC-3000;CMD:BJL,BJRaster3,BSCC,TXT01,BJScan2;" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer translate="name" name="Canon BJC-4300" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer translate="name" name="Canon BJC-4400" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-4300" deviceid="MFG:Canon;MDL:BJC-4300;DES:Canon BJC-4300;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-4400" deviceid="MFG:Canon;MDL:BJC-4400;DES:Canon BJC-4400;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-6000" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6000" deviceid="MFG:Canon;MDL:BJC-6000;DES:Canon BJC-6000;CMD:BJL,BJRaster3,BSCC,TXT;" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-6100" driver="bjc-6100" manufacturer="Canon" model="6100" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-6200" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6200" deviceid="MFG:Canon;MDL:BJC-6200;DES:Canon BJC-6200;CMD:BJL,BJRaster3,BSCC,TXT01,BJScan2;" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-6500" driver="bjc-6500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
       <printer translate="name" name="Canon BJC-7000" driver="bjc-7000" manufacturer="Canon" model="7000" parameters="gamma_6_density_800_params" />
       <printer translate="name" name="Canon BJC-7100" driver="bjc-7100" manufacturer="Canon" model="7100" parameters="density_800_params" />
-      <printer translate="name" name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-8200" deviceid="MFG:Canon;MDL:BJC-8200;DES:Canon;CMD:BJL,BJRaster3,BSCC,TXT01;" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon BJC-8500" driver="bjc-8500" manufacturer="Canon" model="8500" parameters="density_800_params" />
-      <printer translate="name" name="Canon S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon S100" deviceid="MFG:Canon;MDL:S100SP;DES:Canon S100SP;CMD:BJL,BJRaster,BSCC,TXT01;" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
       <printer translate="name" name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" />
       <printer translate="name" name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" parameters="density_800_params" />
       <printer translate="name" name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" />
       <printer translate="name" name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
       <printer translate="name" name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" />
-      <printer translate="name" name="Canon S600" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S600" deviceid="MFG:Canon;MDL:S600;DES:Canon S600;CMD:BJL,BJRaster3,BSCC,TXT01;" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer translate="name" name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
@@ -194,51 +194,53 @@
         <parameter type="float" name="BlackDensity">0.8</parameter>
       </parameters>
       <printer translate="name" name="Epson Artisan 700" driver="escp2-artisan700" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Artisan 710" driver="escp2-artisan710" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Artisan 800" driver="escp2-artisan800" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Artisan 810" driver="escp2-artisan810" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson B-300" driver="escp2-b300" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson B-308" driver="escp2-b308" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson B-500DN" driver="escp2-b500dn" manufacturer="Epson" model="87" parameters="standard_params" />
       <printer translate="name" name="Epson B-508DN" driver="escp2-b508dn" manufacturer="Epson" model="87" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20" deviceid="MFG:EPSON;MDL:Stylus C20;DES:EPSON Stylus C20;CMD:ESCPL2,BDC,D4;" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20UX" deviceid="MFG:EPSON;MDL:Stylus C20;DES:EPSON Stylus C20;CMD:ESCPL2,BDC,D4;" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40" deviceid="MFG:EPSON;MDL:Stylus C40;DES:None;" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42" deviceid="MFG:EPSON;MDL:Stylus C42;DES:EPSON Stylus C42;CMD:ESCPL2,BDC,D4;" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42UX" deviceid="MFG:EPSON;MDL:Stylus C42;DES:EPSON Stylus C42;CMD:ESCPL2,BDC,D4;" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43" deviceid="MFG:EPSON;MDL:Stylus C43;DES:EPSON Stylus C43;CMD:ESCPL2,BDC,D4;" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43SX" deviceid="MFG:EPSON;MDL:Stylus C43;DES:EPSON Stylus C43;CMD:ESCPL2,BDC,D4;" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43UX" deviceid="MFG:EPSON;MDL:Stylus C43;DES:EPSON Stylus C43;CMD:ESCPL2,BDC,D4;" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44" deviceid="MFG:EPSON;MDL:Stylus C44;DES:EPSON Stylus C44;CMD:ESCPL2,BDC,D4;" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44SX" deviceid="MFG:EPSON;MDL:Stylus C44;DES:EPSON Stylus C44;CMD:ESCPL2,BDC,D4;" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44UX" deviceid="MFG:EPSON;MDL:Stylus C44;DES:EPSON Stylus C44;CMD:ESCPL2,BDC,D4;" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C45" deviceid="MFG:EPSON;MDL:Stylus C45;DES:EPSON Stylus C45;CMD:ESCPL2,BDC,D4;" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C46" deviceid="MFG:EPSON;MDL:Stylus C46;DES:EPSON Stylus C46;CMD:ESCPL2,BDC,D4;" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C48" deviceid="MFG:EPSON;MDL:Stylus C48;DES:EPSON Stylus C48;CMD:ESCPL2,BDC,D4;" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C60" deviceid="MFG:EPSON;MDL:Stylus C60;DES:EPSON Stylus C60;CMD:ESCPL2,BDC,D4;" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C62" deviceid="MFG:EPSON;MDL:Stylus C62;DES:EPSON Stylus C62;CMD:ESCPL2,BDC,D4;" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C65" deviceid="MFG:EPSON;MDL:Stylus C65;DES:EPSON Stylus C65;CMD:ESCPL2,BDC,D4;" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C66" deviceid="MFG:EPSON;MDL:Stylus C66;DES:EPSON Stylus C66;CMD:ESCPL2,BDC,D4;" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C68" deviceid="MFG:EPSON;MDL:Stylus C68;DES:EPSON Stylus C68;CMD:ESCPL2,BDC,D4;" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C79" driver="escp2-c79" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C80" deviceid="MFG:EPSON;MDL:Stylus C80;DES:EPSON Stylus C80;CMD:ESCPL2,BDC,D4;" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C82" deviceid="MFG:EPSON;MDL:Stylus C82;DES:EPSON Stylus C82;CMD:ESCPL2,BDC,D4;" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C84" deviceid="MFG:EPSON;MDL:Stylus C84;DES:EPSON Stylus C84;CMD:ESCPL2,BDC,D4;" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C85" deviceid="MFG:EPSON;MDL:Stylus C85;DES:EPSON Stylus C85;CMD:ESCPL2,BDC,D4;" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C86" deviceid="MFG:EPSON;MDL:Stylus C86;DES:EPSON Stylus C86;CMD:ESCPL2,BDC,D4;" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C88" deviceid="MFG:EPSON;MDL:Stylus C88;DES:EPSON Stylus C88;CMD:ESCPL2,BDC,D4;" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C110" driver="escp2-c110" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus C120" driver="escp2-c120" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
@@ -248,81 +250,85 @@
       <printer translate="name" name="Epson Stylus Color PRO" driver="escp2-pro" manufacturer="Epson" model="45" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus Color 440" deviceid="MFG:EPSON;MDL:Stylus COLOR 440;DES:EPSON Stylus COLOR 440;CMD:ESCPL2,BDC;" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 460" deviceid="MFG:EPSON;MDL:Stylus COLOR 460;DES:EPSON Stylus COLOR 460;CMD:ESCPL2,BDC;" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 480" deviceid="MFG:EPSON;MDL:Stylus COLOR 480;DES:EPSON Stylus COLOR 480;CMD:ESCPL2,BDC,D4;" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
       <printer translate="name" name="Epson Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 600" deviceid="MFG:EPSON;MDL:Stylus COLOR 600;CMD:ESCPL2,BDC;" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 670" deviceid="MFG:EPSON;MDL:Stylus COLOR 670;DES:EPSON Stylus COLOR 670;CMD:ESCPL2,BDC,D4;" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 740" deviceid="MFG:EPSON;MDL:Stylus COLOR 740;DES:EPSON Stylus COLOR 740;CMD:ESCPL2,BDC,D4;" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 760" deviceid="MFG:EPSON;MDL:Stylus COLOR 760;DES:EPSON Stylus COLOR 760;CMD:ESCPL2,BDC,D4;" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 777" deviceid="MFG:EPSON;MDL:Stylus COLOR 777;DES:EPSON Stylus COLOR 777;CMD:ESCPL2,BDC,D4;" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 800" deviceid="MFG:EPSON;MDL:Stylus COLOR 800;CMD:ESCPL2,PRPXL24,BDC;" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 880" deviceid="MFG:EPSON;MDL:Stylus COLOR 880;DES:EPSON Stylus COLOR 880;CMD:ESCPL2,BDC,D4;" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 8 3" driver="escp2-83" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 900" deviceid="MFG:EPSON;MDL:Stylus COLOR 900;DES:EPSON Stylus COLOR 900;CMD:ESCPL2,PRPXL24,BDC,D4;" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 980" deviceid="MFG:Epson;MDL:Stylus Color 980;CMD:ESC/P2;" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1520" deviceid="MFG:EPSON;MDL:Stylus COLOR 1520;CMD:ESCP2E,PRPXL;" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office B30" driver="escp2-of-b30" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office B33" driver="escp2-of-b33" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office B40W" driver="escp2-of-b40w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office B1100" driver="escp2-of-b1100" manufacturer="Epson" model="99" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office T30" driver="escp2-of-t30" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office T33" driver="escp2-of-t33" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office T40W" driver="escp2-of-t40w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T1100" driver="escp2-of-t1100" manufacturer="Epson" model="99" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T1110" driver="escp2-of-t1110" manufacturer="Epson" model="99" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 700" deviceid="MFG:EPSON;MDL:Stylus Photo 700;DES:EPSON Stylus Photo 700;CMD:ESCPL2,BDC;" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo EX" deviceid="MFG:EPSON;MDL:Stylus Photo EX;CMD:ESCPL2,BDC;" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 750" deviceid="MFG:EPSON;MDL:Stylus Photo 750;DES:EPSON Stylus Photo 750;CMD:ESCPL2,BDC,D4;" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35" parameters="standard_params" />
     <!--
          Note that the 785EPX has a roll feed holder.  It's more like the 890
          than the 780, despite the name.
     -->
-      <printer translate="name" name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 785" deviceid="MFG:EPSON;MDL:Stylus Photo 785EPX;DES:EPSON Stylus Photo 785EPX;CMD:ESCPL2,BDC,D4;" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 790" deviceid="MFG:EPSON;MDL:Stylus Photo 790;DES:EPSON Stylus Photo 790;CMD:ESCPL2,BDC,D4;" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 820" deviceid="MFG:EPSON;MDL:Stylus Photo 820;DES:EPSON Stylus Photo 820;CMD:ESCPL2,BDC,D4;" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 825" deviceid="MFG:EPSON;MDL:Stylus Photo 825;DES:EPSON Stylus Photo 825;CMD:ESCPL2,BDC,D4;" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 830" deviceid="MFG:EPSON;MDL:Stylus Photo 830U;DES:EPSON Stylus Photo 830U;CMD:ESCPL2,BDC,D4;" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 870" deviceid="MFG:EPSON;MDL:Stylus Photo 870;DES:EPSON Stylus Photo 870;CMD:ESCPL2,BDC,D4;" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 890" deviceid="MFG:EPSON;MDL:Stylus Photo 890;DES:EPSON Stylus Photo 890;CMD:ESCPL2,BDC,D4;" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 895" deviceid="MFG:EPSON;MDL:Stylus Photo 895;DES:EPSON Stylus Photo 895;CMD:ESCPL2,BDC,D4;" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 900" deviceid="MFG:EPSON;MDL:Stylus Photo 900;DES:EPSON Stylus Photo 900;CMD:ESCPL2,BDC,D4;" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 915" deviceid="MFG:EPSON;MDL:Stylus Photo 915;DES:EPSON Stylus Photo 915;CMD:ESCPL2,BDC,D4;" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 935" deviceid="MFG:EPSON;MDL:Stylus Photo 935;DES:EPSON Stylus Photo 935;CMD:ESCPL2,BDC,D4;" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1290s" driver="escp2-1290s" manufacturer="Epson" model="37" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R200" deviceid="MFG:EPSON;MDL:Stylus Photo R200;DES:EPSON Stylus Photo R200;CMD:ESCPL2,BDC,D4;" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R210" deviceid="MFG:EPSON;MDL:Stylus Photo R210;DES:EPSON Stylus Photo R210;CMD:ESCPL2,BDC,D4;" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R220" deviceid="MFG:EPSON;MDL:Stylus Photo R220;DES:EPSON Stylus Photo R220;CMD:ESCPL2,BDC,D4;" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
@@ -332,10 +338,10 @@
       <printer translate="name" name="Epson Stylus Photo R280" driver="escp2-r280" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo R285" driver="escp2-r285" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo R290" driver="escp2-r290" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R300" deviceid="MFG:EPSON;MDL:Stylus Photo R300;DES:EPSON Stylus Photo R300;" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R310" deviceid="MFG:EPSON;MDL:Stylus Photo R310;DES:EPSON Stylus Photo R310;" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R320" deviceid="MFG:EPSON;MDL:Stylus Photo R320;DES:EPSON Stylus Photo R320;" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R340" deviceid="MFG:EPSON;MDL:Stylus Photo R340;DES:EPSON Stylus Photo R340;" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R350" driver="escp2-r350" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R360" driver="escp2-r360" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo R380" driver="escp2-r380" manufacturer="Epson" model="81" parameters="claria_params" />
@@ -345,12 +351,12 @@
       <printer translate="name" name="Epson Stylus Photo R1900" driver="escp2-r1900" manufacturer="Epson" model="91" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R2880" driver="escp2-r2880" manufacturer="Epson" model="98" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX400" deviceid="MFG:EPSON;MDL:Stylus Photo RX400;DES:EPSON Stylus Photo RX400;CMD:ESCPL2,BDC,D4;" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX420" deviceid="MFG:EPSON;MDL:Stylus Photo RX420;DES:EPSON Stylus Photo RX420;CMD:ESCPL2,BDC,D4;" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX425" deviceid="MFG:EPSON;MDL:Stylus Photo RX425;DES:EPSON Stylus Photo RX425;CMD:ESCPL2,BDC,D4;" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX430" deviceid="MFG:EPSON;MDL:Stylus Photo RX430;DES:EPSON Stylus Photo RX430;CMD:ESCPL2,BDC,D4;" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX500" deviceid="MFG:EPSON;MDL:Stylus Photo RX500;DES:EPSON Stylus Photo RX500;CMD:ESCPL2,BDC,D4;" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX510" deviceid="MFG:EPSON;MDL:Stylus Photo RX510;DES:EPSON Stylus Photo RX510;CMD:ESCPL2,BDC,D4;" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX560" driver="escp2-rx560" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX580" driver="escp2-rx580" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX585" driver="escp2-rx585" manufacturer="Epson" model="81" parameters="claria_params" />
@@ -358,15 +364,17 @@
       <printer translate="name" name="Epson Stylus Photo RX595" driver="escp2-rx595" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX610" driver="escp2-rx610" manufacturer="Epson" model="81" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX620" deviceid="MFG:EPSON;MDL:Stylus Photo RX620;DES:EPSON Stylus Photo RX620;CMD:ESCPL2,BDC,D4;" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX630" deviceid="MFG:EPSON;MDL:Stylus Photo RX630;DES:EPSON Stylus Photo RX630;CMD:ESCPL2,BDC,D4;" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="97" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="97" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="97" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX700" deviceid="MFG:EPSON;MDL:Stylus Photo RX700;DES:EPSON Stylus Photo RX700;CMD:ESCPL2,BDC,D4;" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo TX710W" driver="escp2-tx710w" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo TX800FW" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo TX810FW" driver="escp2-tx810fw" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" />
       <printer translate="name" name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" />
@@ -383,62 +391,62 @@
       <printer translate="name" name="Epson Stylus Pro 11880" driver="escp2-11880" manufacturer="Epson" model="88" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer translate="name" name="Epson Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX1500" deviceid="MFG:EPSON;MDL:Stylus CX1500;DES:EPSON Stylus CX1500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus CX3100" deviceid="MFG:EPSON;MDL:Stylus CX3100;DES:EPSON Stylus CX3100;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3200" deviceid="MFG:EPSON;MDL:Stylus CX3200;DES:EPSON Stylus CX3200;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3500" deviceid="MFG:EPSON;MDL:Stylus CX3500;DES:EPSON Stylus CX3500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3600" deviceid="MFG:EPSON;MDL:Stylus CX3600;DES:EPSON Stylus CX3600;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3650" deviceid="MFG:EPSON;MDL:Stylus CX3650;DES:EPSON Stylus CX3650;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3700" deviceid="MFG:EPSON;MDL:Stylus CX3700;DES:EPSON Stylus CX3700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3800" deviceid="MFG:EPSON;MDL:Stylus CX3800;DES:EPSON Stylus CX3800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3805" deviceid="MFG:EPSON;MDL:Stylus CX3805;DES:EPSON Stylus CX3805;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3810" deviceid="MFG:EPSON;MDL:Stylus CX3810;DES:EPSON Stylus CX3810;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX4100" deviceid="MFG:EPSON;MDL:Stylus CX4100;DES:EPSON Stylus CX4100;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4100" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4200" deviceid="MFG:EPSON;MDL:Stylus CX4200;DES:EPSON Stylus CX4200;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4500" deviceid="MFG:EPSON;MDL:Stylus CX4500;DES:EPSON Stylus CX4500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4600" deviceid="MFG:EPSON;MDL:Stylus CX4600;DES:EPSON Stylus CX4600;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4700" deviceid="MFG:EPSON;MDL:Stylus CX4700;DES:EPSON Stylus CX4700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4800" deviceid="MFG:EPSON;MDL:Stylus CX4800;DES:EPSON Stylus CX4800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4800" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5100" deviceid="MFG:EPSON;MDL:Stylus CX5100;DES:EPSON Stylus CX5100;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5300" deviceid="MFG:EPSON;MDL:Stylus CX5300;DES:EPSON Stylus CX5300;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5400" deviceid="MFG:EPSON;MDL:Stylus CX5400;DES:EPSON Stylus CX5400;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX5500" driver="escp2-cx5500" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5700" deviceid="MFG:EPSON;MDL:Stylus CX5700;DES:EPSON Stylus CX5700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5800" deviceid="MFG:EPSON;MDL:Stylus CX5800;DES:EPSON Stylus CX5800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx5800" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6300" deviceid="MFG:EPSON;MDL:Stylus CX6300;DES:EPSON Stylus CX6300;CMD:ESCPL2,BDC,D4;" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6500" deviceid="MFG:EPSON;MDL:Stylus CX6500;DES:EPSON Stylus CX6500;CMD:ESCPL2,BDC,D4;" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6600" deviceid="MFG:EPSON;MDL:Stylus CX6600;DES:EPSON Stylus CX6600;CMD:ESCPL2,BDC,D4;" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX7400" driver="escp2-cx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7700" deviceid="MFG:EPSON;MDL:Stylus CX7700;DES:EPSON Stylus CX7700;CMD:ESCPL2,BDC,D4;" driver="escp2-cx7700" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7800" deviceid="MFG:EPSON;MDL:Stylus CX7800;DES:EPSON Stylus CX7800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx7800" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8300" deviceid="MFG:EPSON;MDL:Stylus CX8300;DES:EPSON Stylus CX8300;CMD:ESCPL2,BDC,D4;" driver="escp2-cx8300" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8400" deviceid="MFG:EPSON;MDL:Stylus CX8400;DES:EPSON Stylus CX8400;CMD:ESCPL2,BDC,D4;" driver="escp2-cx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9300F" driver="escp2-cx9300f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9400" driver="escp2-cx9400" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9400F" driver="escp2-cx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus CX9475F" driver="escp2-cx9475f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D68" deviceid="MFG:EPSON;MDL:Stylus D68;DES:EPSON Stylus D68;CMD:ESCPL2,BDC,D4;" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D88" deviceid="MFG:EPSON;MDL:Stylus D88;DES:EPSON Stylus D88;CMD:ESCPL2,BDC,D4;" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX3800" deviceid="MFG:EPSON;MDL:Stylus DX3800;DES:EPSON Stylus DX3800;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX3850" deviceid="MFG:EPSON;MDL:Stylus DX3850;DES:EPSON Stylus DX3850;CMD:ESCPL2,BDC,D4;" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4000" driver="escp2-dx4000" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
-      <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4200" deviceid="MFG:EPSON;MDL:Stylus DX4200;DES:EPSON Stylus DX4200;CMD:ESCPL2,BDC,D4;" driver="escp2-dx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4250" deviceid="MFG:EPSON;MDL:Stylus DX4250;DES:EPSON Stylus DX4250;CMD:ESCPL2,BDC,D4;" driver="escp2-dx4250" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX4400" driver="escp2-dx4400" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4450" driver="escp2-dx4450" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="95" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4800" deviceid="MFG:EPSON;MDL:Stylus DX4800;DES:EPSON Stylus DX4800;CMD:ESCPL2,BDC,D4;" driver="escp2-dx4800" manufacturer="Epson" model="95" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4850" driver="escp2-dx4850" manufacturer="Epson" model="95" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX7000F" driver="escp2-dx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX7400" driver="escp2-dx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
@@ -448,19 +456,45 @@
       <printer translate="name" name="Epson Stylus DX9400F" driver="escp2-dx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus NX100" driver="escp2-nx100" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX105" driver="escp2-nx105" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX115" driver="escp2-nx115" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX215" driver="escp2-nx215" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX300" driver="escp2-nx300" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX400" driver="escp2-nx400" manufacturer="Epson" model="93" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus PX700W" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="96" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX415" driver="escp2-nx415" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX515" driver="escp2-nx515" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo PX650" driver="escp2-px650" manufacturer="Epson" model="97" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo PX700W" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo PX710W" driver="escp2-px710fw" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo PX810FW" driver="escp2-px810fw" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus S21" driver="escp2-s21" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus S50" driver="escp2-s50" manufacturer="Epson" model="97" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX100" driver="escp2-sx100" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX105" driver="escp2-sx105" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX110" driver="escp2-sx110" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX115" driver="escp2-sx115" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX200" driver="escp2-sx200" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX205" driver="escp2-sx205" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX210" driver="escp2-sx210" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX215" driver="escp2-sx215" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX400" driver="escp2-sx400" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX405" driver="escp2-sx405" manufacturer="Epson" model="93" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus T20" driver="escp2-t20" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX410" driver="escp2-sx410" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX415" driver="escp2-sx415" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX510W" driver="escp2-sx510w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX515" driver="escp2-sx515" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX600FW" driver="escp2-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX610FW" driver="escp2-sx610fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX615" driver="escp2-sx615" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX650" driver="escp2-sx650" manufacturer="Epson" model="97" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T20" driver="escp2-t20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T21" driver="escp2-t21" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T26" driver="escp2-t26" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T30" driver="escp2-t30" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T40W" driver="escp2-t40w" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T50" driver="escp2-t50" manufacturer="Epson" model="97" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX100" driver="escp2-tx100" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX101" driver="escp2-tx101" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX102" driver="escp2-tx102" manufacturer="Epson" model="94" parameters="standard_params" />
@@ -469,8 +503,18 @@
       <printer translate="name" name="Epson Stylus TX105" driver="escp2-tx105" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX106" driver="escp2-tx106" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX109" driver="escp2-tx109" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX110" driver="escp2-tx110" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX200" driver="escp2-tx200" manufacturer="Epson" model="93" parameters="standard_params" />
+<!-- The TX210 has the same head configuration as the TX100, not TX200 -->
+      <printer translate="name" name="Epson Stylus TX210" driver="escp2-tx210" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX300F" driver="escp2-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus TX400" driver="escp2-tx400" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX410" driver="escp2-tx410" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX510FN" driver="escp2-tx510fn" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX550W" driver="escp2-tx550w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX610FW" driver="escp2-tx610fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX615" driver="escp2-tx615" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX650" driver="escp2-tx650" manufacturer="Epson" model="97" parameters="standard_params" />
       <printer translate="name" name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
       <printer translate="name" name="Epson PictureMate Dash" driver="escp2-picmatedash" manufacturer="Epson" model="86" parameters="standard_params" />
       <printer translate="name" name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
@@ -491,8 +535,13 @@
       <printer translate="name" name="Epson PictureMate 2005" driver="escp2-picmate2005" manufacturer="Epson" model="73" parameters="standard_params" />
       <printer translate="name" name="Epson WorkForce 30" driver="escp2-wf30" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson WorkForce 40" driver="escp2-wf40" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 310" driver="escp2-wf310" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 315" driver="escp2-wf315" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson WorkForce 500" driver="escp2-wf500" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson WorkForce 600" driver="escp2-wf600" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 610" driver="escp2-wf610" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 615" driver="escp2-wf615" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 1100" driver="escp2-wf1100" manufacturer="Epson" model="99" parameters="standard_params" />
       <printer translate="name" name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" />
       <printer translate="name" name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" />
       <printer translate="name" name="Epson CL 760" driver="escp2-cl760" manufacturer="Epson" model="56" parameters="480_params" />
@@ -519,6 +568,7 @@
       <printer translate="name" name="Epson ME Office 80W" driver="escp2-meof80w" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson ME Office 360" driver="escp2-meof360" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson ME Office 700FW" driver="escp2-meof700fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 1100" driver="escp2-meof1100" manufacturer="Epson" model="99" parameters="standard_params" />
       <printer translate="name" name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" />
       <printer translate="name" name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" />
       <printer translate="name" name="Epson MJ 6000C" driver="escp2-mj6000c" manufacturer="Epson" model="6" parameters="standard_params" />
@@ -580,6 +630,7 @@
       <printer translate="name" name="Epson PX 201" driver="escp2-px201" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson PX 401A" driver="escp2-px401a" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson PX 601F" driver="escp2-px601f" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 1001" driver="escp2-px1001" manufacturer="Epson" model="100" parameters="standard_params" />
       <printer translate="name" name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
       <printer translate="name" name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />
       <printer translate="name" name="Epson PX G5000" driver="escp2-pxg5000" manufacturer="Epson" model="67" parameters="standard_params" />
@@ -604,7 +655,7 @@
       </parameters>
       <printer translate="name" name="Apollo P-2100" driver="pcl-apollo-p2100" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2150" driver="pcl-apollo-p2150" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="Apollo P-2200" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2200" deviceid="MFG:EPSON;MDL:Stylus DX4800;DES:EPSON Stylus DX4800;CMD:ESCPL2,BDC,D4;" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2250" driver="pcl-apollo-p2250" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2500" driver="pcl-apollo-p2500" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Apollo P-2550" driver="pcl-apollo-p2550" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
@@ -617,38 +668,38 @@
       <printer translate="name" name="Brother DCP-1200" driver="brother-dcp-1200" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother DCP-8045D" driver="brother-dcp-8045d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1040" driver="brother-hl-1040" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1050" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1050" deviceid="MFG:Brother;MDL:HL-1050 series;CMD:PCL5,PJL,PCLXL;" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1060" driver="brother-hl-1060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1070" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1070" deviceid="MFG:Brother;MDL:HL-1070 series;CMD:PCL5,POSTSCRIPT2,PJL,PCLXL;" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-10V" driver="brother-hl-10v" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-10h" driver="brother-hl-10h" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1240" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1250" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1260" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1240" deviceid="MFG:Brother;MDL:HL-1240 series;CMD:PCL4,PJL;" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1250" deviceid="MFG:Brother;MDL:HL-1250 series;CMD:PCL5,PJL,PCLXL;" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1260" deviceid="MFG:Brother;MDL:HL-1250 series;CMD:PCL5,PJL,PCLXL;" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1270N" driver="brother-hl-1270n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1430" driver="brother-hl-1430" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1440" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1450" driver="brother-hl-1450" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-1470N" driver="brother-hl-1470n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1430" deviceid="MFG:Brother;MDL:HL-1430 series;CMD:PJL;" driver="brother-hl-1430" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1440" deviceid="MFG:Brother;MDL:HL-1440 series;CMD:PCL4,PJL;" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1450" deviceid="MFG:Brother;MDL:Brother HL-1450 series;" driver="brother-hl-1450" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1470N" deviceid="MFG:Brother;MDL:Brother HL-1470N series;" driver="brother-hl-1470n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1650" driver="brother-hl-1650" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1660e" driver="brother-hl-1660e" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1670N" driver="brother-hl-1670n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-2460" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2060" deviceid="MFG:Brother;MDL:HL-2040 series;DES:None;CMD:PJL,HBP;" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2460" deviceid="MFG:Brother;MDL:Brother HL-2460 series;" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-5030" driver="brother-hl-5030" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5040" driver="brother-hl-5040" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5050" driver="brother-hl-5050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5070N" driver="brother-hl-5070n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5140" driver="brother-hl-5140" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5150D" driver="brother-hl-5150d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-5170DN" driver="brother-hl-5170dn" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5040" deviceid="MFG:Brother;MDL:HL-5040 series;CMD:PJL,PCL,PCLXL;" driver="brother-hl-5040" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5050" deviceid="MFG:Brother;MDL:Brother HL-5050 series;" driver="brother-hl-5050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5070N" deviceid="MFG:Brother;MDL:Brother HL-5070N series;" driver="brother-hl-5070n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5140" deviceid="MFG:Brother;MDL:HL-5140 series;CMD:PJL,PCL,PCLXL;" driver="brother-hl-5140" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5150D" deviceid="MFG:Brother;MDL:Brother HL-5150D series;CMD:PJL,PCL,PCLXL,POSTSCRIPT;" driver="brother-hl-5150d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5170DN" deviceid="MFG:Brother;MDL:Brother HL-5170DN series;CMD:PJL,PCL,PCLXL,POSTSCRIPT;" driver="brother-hl-5170dn" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-630" driver="brother-hl-630" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-660" driver="brother-hl-660" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-7050" driver="brother-hl-7050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-7050" deviceid="MFG:Brother;MDL:Brother HL-7050 series;" driver="brother-hl-7050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-7050N" driver="brother-hl-7050n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-760" driver="brother-hl-760" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-960" driver="brother-hl-960" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
@@ -659,7 +710,7 @@
       <printer translate="name" name="Canon GP 335" driver="canon-gp_335" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-4sx" driver="canon-lbp-4sx" manufacturer="Canon" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-430" driver="canon-lbp-430" manufacturer="Canon" model="4" parameters="pcl_laser_params" />
-      <printer translate="name" name="Canon LBP-1000" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1000" deviceid="MFG:Canon;MDL:LBP-1000;DES:LBP-1000;CMD:PCL-XL;" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-1260" driver="canon-lbp-1260" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon LBP-1760" driver="canon-lbp-1760" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Canon imageRunner 330s" driver="canon-ir_330s" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
@@ -669,21 +720,21 @@
       <printer translate="name" name="Epson ActionLaser 1100" driver="epson-actl_1100" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson ActionLaser II" driver="epson-actl_ii" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C2000" driver="epson-acl_c2000" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson AcuLaser C2000PS" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C2000PS" deviceid="MFG:Epson;MDL:AL-C2000 PS3;" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C8500" driver="epson-acl_c8500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C8500PS" driver="epson-acl_c8500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson AcuLaser C8600" driver="epson-acl_c8600" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson AcuLaser C8600PS" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8600PS" deviceid="MFG:Epson;MDL:AL-C8600 PS3;" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5200" driver="epson-epl-5200" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5200+" driver="epson-epl-5200plus" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson EPL-5700" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5700" deviceid="MFG:EPSON;MDL:EPL-5700;DES:EPSON EPL-5700;CMD:PJL,EJL,ESCPL2-00,ESCP9-84,PRPXL24-01,HP ENHANCED PCL5,HPGL2-01,;" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5700PS" driver="epson-epl-5700ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5800" driver="epson-epl-5800" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5800PS" driver="epson-epl-5800ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-5900" driver="epson-epl-5900" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson EPL-5900PS" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5900PS" deviceid="MFG:Epson;MDL:EPL-5900 PS3;" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-6100" driver="epson-epl-6100" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Epson EPL-6100PS" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-6100PS" deviceid="MFG:Epson;MDL:EPL-6100 PS3;" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-7100" driver="epson-epl-7100" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-N2050" driver="epson-epl-n2050" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Epson EPL-N2050+" driver="epson-epl-n2050plus" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
@@ -708,68 +759,68 @@
       <printer translate="name" name="Generic PCL 5e LF Printer" driver="pcl-g_5e_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Generic PCL 6/PCL XL Printer" driver="pcl-g_6" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Generic PCL 6/PCL XL LF Printer" driver="pcl-g_6_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 10512" driver="gestetner-10512" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 2212" driver="gestetner-2212" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 2712" driver="gestetner-2712" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 3212" driver="gestetner-3212" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 3502" driver="gestetner-3502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 3532/4235g" driver="gestetner-4235g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 4502" driver="gestetner-4502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 4532/4245g" driver="gestetner-4245g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 6002" driver="gestetner-6002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 7502" driver="gestetner-7502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 9002" driver="gestetner-9002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 10512" driver="gestetner-10512" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 2212" driver="gestetner-2212" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 2712" driver="gestetner-2712" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 3212" driver="gestetner-3212" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 3502" driver="gestetner-3502" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 3532/4235g" driver="gestetner-4235g" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 4502" driver="gestetner-4502" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 4532/4245g" driver="gestetner-4245g" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 6002" driver="gestetner-6002" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 7502" driver="gestetner-7502" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 9002" driver="gestetner-9002" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm415" driver="gestetner-dsm415" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm615" driver="gestetner-dsm615" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm616" driver="gestetner-dsm616" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm618" driver="gestetner-dsm618" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm618d" driver="gestetner-dsm618d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm620" driver="gestetner-dsm620" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm620d" driver="gestetner-dsm620d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm622" driver="gestetner-dsm622" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm627" driver="gestetner-dsm627" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm635/635G" driver="gestetner-dsm635g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm645/645G" driver="gestetner-ds645g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm651" driver="gestetner-dsm651" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm660" driver="gestetner-dsm660" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm675" driver="gestetner-dsm675" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm725" driver="gestetner-dsm725" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm730" driver="gestetner-dsm730" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm735/735G" driver="gestetner-dsm735g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm745/745G" driver="gestetner-dsm745g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP1100/DSm7110" driver="gestetner-dsm7110" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP1350/DSm7135" driver="gestetner-dsm7135" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP1600/DSm716" driver="gestetner-dsm716" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP2000/DSm721d" driver="gestetner-dsm721d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP2500/DSm625" driver="gestetner-dsm625" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP3500/DSm735e" driver="gestetner-dsm735e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP4500/DSm745e" driver="gestetner-dsm745e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP5500/DSm755" driver="gestetner-dsm755" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP6500/DSm765" driver="gestetner-dsm765" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP7500/DSm775" driver="gestetner-dsm775" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP9000/DSm790" driver="gestetner-dsm790" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm615" driver="gestetner-dsm615" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm616" driver="gestetner-dsm616" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm618" driver="gestetner-dsm618" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm618d" driver="gestetner-dsm618d" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm620" driver="gestetner-dsm620" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm620d" driver="gestetner-dsm620d" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm622" driver="gestetner-dsm622" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm627" driver="gestetner-dsm627" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm635/635G" driver="gestetner-dsm635g" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm645/645G" driver="gestetner-ds645g" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm651" driver="gestetner-dsm651" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm660" driver="gestetner-dsm660" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm675" driver="gestetner-dsm675" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm725" driver="gestetner-dsm725" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm730" driver="gestetner-dsm730" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm735/735G" driver="gestetner-dsm735g" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm745/745G" driver="gestetner-dsm745g" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1100/DSm7110" driver="gestetner-dsm7110" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1350/DSm7135" driver="gestetner-dsm7135" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1600/DSm716" driver="gestetner-dsm716" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP2000/DSm721d" driver="gestetner-dsm721d" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP2500/DSm625" driver="gestetner-dsm625" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP3500/DSm735e" driver="gestetner-dsm735e" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP4500/DSm745e" driver="gestetner-dsm745e" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP5500/DSm755" driver="gestetner-dsm755" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP6500/DSm765" driver="gestetner-dsm765" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP7500/DSm775" driver="gestetner-dsm775" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP9000/DSm790" driver="gestetner-dsm790" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 161/DSm416" driver="gestetner-dsm416" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 2510/DSm725e" driver="gestetner-dsm725e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 2550" driver="gestetner-mp_2550" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 2550B" driver="gestetner-mp_2550b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 3010/DSm730e" driver="gestetner-dsm730e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 3350" driver="gestetner-mp_3350" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 3350B" driver="gestetner-mp_3350b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 4000" driver="gestetner-mp_4000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 4000B" driver="gestetner-mp_4000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 5000" driver="gestetner-mp_5000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 5000B" driver="gestetner-mp_5000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Business Inkjet 2200" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2230" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2250" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2250TN" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Business Inkjet 2280" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Gestetner MP 2510/DSm725e" driver="gestetner-dsm725e" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 2550" driver="gestetner-mp_2550" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 2550B" driver="gestetner-mp_2550b" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 3010/DSm730e" driver="gestetner-dsm730e" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 3350" driver="gestetner-mp_3350" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 3350B" driver="gestetner-mp_3350b" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 4000" driver="gestetner-mp_4000" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 4000B" driver="gestetner-mp_4000b" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 5000" driver="gestetner-mp_5000" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 5000B" driver="gestetner-mp_5000b" manufacturer="Gestetner" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Business Inkjet 2200" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;CMD:MLC,PML,PJL;" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2230" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;CMD:MLC,PML,PJL;" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;CMD:MLC,PML,PJL,PCL5,POSTSCRIPT;" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250TN" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;CMD:MLC,PML,PJL,PCL5,POSTSCRIPT;" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2280" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;CMD:MLC,PML,PJL,PCL5,POSTSCRIPT;" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP Color Inkjet Printer CP1700" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color Inkjet Printer CP1700" deviceid="MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP Color LaserJet 2500" driver="hp-clj_2500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Color LaserJet 4500" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Color LaserJet 4550" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP Color LaserJet 4600" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4500" deviceid="MFG:Hewlett-Packard;MDL:LaserJet Color 4500;" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4550" deviceid="MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550;DES:Hewlett-Packard Color LaserJet 4550;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL;" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4600" deviceid="MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Color LaserJet 5500" driver="hp-clj_5500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
@@ -786,9 +837,9 @@
       <printer translate="name" name="HP DesignJet 2500CP" driver="pcl-desnj-2500" manufacturer="HP" model="12500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DesignJet 3500CP" driver="pcl-desnj-3500" manufacturer="HP" model="13500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DesignJet ColorPro CAD" driver="hp-desnj_cp_cad" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 400" deviceid="MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;CMD:PCL,C32;" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 420C" driver="hp-dj_420c" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 450" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 450" deviceid="MFG:hp;MDL:dj450;DES:hp dj450;CMD:MLC,PCL,PML,DESKJET,DW-PCL,DYN;" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 505J Plus" driver="hp-dj_505j_plus" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
@@ -796,84 +847,84 @@
       <printer translate="name" name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 5550" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 5550" deviceid="MFG:hp;MDL:deskjet 5550;DES:hp deskjet 5550;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 5551" driver="hp-dj_5551" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 600" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 600" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;CMD:MLC,PCL,PML;" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 600C" driver="pcl-601" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 610C" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 610CL" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 6122" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;CMD:MLC,PCL,PML;" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610CL" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;CMD:MLC,PCL,PML;" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 6122" deviceid="MFG:hp;MDL:deskjet 6122;DES:hp deskjet 6122;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 6127" driver="hp-dj_6127" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 612C" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 640C" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 612C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;CMD:MLC,PCL,PML;" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 640C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;CMD:MLC,PCL,PML;" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 648C" driver="hp-dj_648c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 660C" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 670C" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 660C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 660C;DES:Hewlett-Packard DeskJet 660C;CMD:MLC,PCL,PML;" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 670C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;CMD:MLC,PCL,PML;" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 670TV" driver="hp-dj_670tv" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 672C" driver="hp-dj_672c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 680C" driver="hp-dj_680c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 682C" driver="hp-dj_682c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 690C" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 690C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;CMD:MLC,PCL,PML;" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 692C" driver="hp-dj_692c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 693C" driver="hp-dj_693c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 694C" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 694C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;CMD:MLC,PCL,PML;" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 695C" driver="hp-dj_695c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 697C" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 697C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;CMD:MLC,PCL,PML;" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 815C" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 816C" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 825C" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 812C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;CMD:MLC,PCL,PML;" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 815C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;CMD:MLC,PCL,PML;" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 816C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;CMD:MLC,PCL,PML;" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 825C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;CMD:MLC,PCL,PML;" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 830C" driver="hp-dj_830c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 832C" driver="hp-dj_832c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 841C" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 843C" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer translate="name" name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 880C" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 840C" deviceid="MFG:Hewlett-Packard;MDL:DeskJet 840C;" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 841C" deviceid="MFG:Hewlett-Packard;MDL:DeskJet 841C;" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 842C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 840C;DES:Hewlett-Packard DeskJet 840C;CMD:MLC,PCL,PML;" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 843C" deviceid="MFG:Hewlett-Packard;MDL:DeskJet 843C;" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 845C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;CMD:MLC,PCL,PML;" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 850C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;CMD:PCL,MLC,PML;" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 855C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;CMD:PCL,MLC,PML;" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 870C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;CMD:PCL,MLC,PML;" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 880C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;CMD:MLC,PCL,PML;" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 882C" driver="hp-dj_882c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 890C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;CMD:PCL,MLC,PML;" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 895C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;CMD:MLC,PCL,PML;" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
       <printer translate="name" name="HP DeskJet 916C" driver="pcl-900" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 920C" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 920C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;CMD:MLC,PCL,PML;" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 9300" driver="hp-dj_9300" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 930C" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 930C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;CMD:MLC,PCL,PML;" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 932C" driver="hp-dj_932c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 933C" driver="hp-dj_933c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 934C" driver="hp-dj_934c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 935C" driver="hp-dj_935c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 940C" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 940C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;CMD:MLC,PCL,PML;" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 948C" driver="hp-dj_948c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 950C" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 950C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;CMD:MLC,PCL,PML;" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 960C" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 970C" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 960C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;CMD:MLC,PCL,PML;" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 970C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;CMD:MLC,PCL,PML;" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 980C" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 990C" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 980C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;CMD:MLC,PCL,PML;" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 990C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;CMD:MLC,PCL,PML;" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 995C" driver="hp-dj_995c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1120C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 1120C;DES:Hewlett-Packard Deskjet 1120C;CMD:PCL,MLC,PML;" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1125C" driver="hp-dj_1125c" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
+      <printer translate="name" name="HP DeskJet 1220C" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;CMD:MLC,PCL,PML;" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
       <printer translate="name" name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 1600CM" driver="hp-dj_1600cm" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 2000" driver="pcl-2000" manufacturer="HP" model="2000" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 2500" driver="pcl-2500" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 2500CM" driver="hp-2500cm" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 340C" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 340C" deviceid="MFG:Hewlett-Packard;MDL:HP DeskJet 340;DES:HP;CMD:PCL,C32;" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 3810" driver="hp-dj_3810" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 3816" driver="hp-dj_3816" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP DeskJet 3820" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3820" deviceid="MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;CMD:MLC,PCL,PML;" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP DeskJet 3822" driver="hp-dj_3822" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP LaserJet 2" driver="pcl-2" manufacturer="HP" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 2D" driver="hp-lj_2d" manufacturer="HP" model="2" parameters="pcl_laser_params" />
@@ -883,173 +934,173 @@
       <printer translate="name" name="HP LaserJet 3D" driver="hp-lj_3d" manufacturer="HP" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 3P w/ PCL5" driver="hp-lj_3p_w_pcl5" manufacturer="HP" model="4" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 3P w/PS" driver="hp-lj_3p_w_ps" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4 Plus" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4 Plus" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;CMD:PJL,PCL,POSTSCRIPT;" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4" driver="pcl-4" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4L" deviceid="MFG:Hewlett-Packard;MDL:LaserJet 4L;CMD:HP ENHANCED PCL5,PJL;" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4M" driver="hp-lj_4m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4ML" driver="hp-lj_4ml" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4P" driver="hp-lj_4p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5" driver="pcl-5" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5L" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5L" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;CMD:HP ENHANCED PCL5,PJL;" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5M" driver="hp-lj_5m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5MP" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5P" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5MP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;CMD:HP ENHANCED PCL5,PJL,POSTSCRIPT;" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5P" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;CMD:HP ENHANCED PCL5,PJL;" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5Si" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:None;CMD:PJL,MLC,PCL,POSTSCRIPT;" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 6" driver="pcl-6" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 6L" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 6MP" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 6P" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1010" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1012" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1015" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6L" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:Hewlett-Packard LaserJet 6L Printer;" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6MP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;CMD:PJL,MLC,PCLXL,PCL,POSTSCRIPT;" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6P" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;CMD:HP ENHANCED PCL5,PJL;" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1010" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1010;CMD:FastRaster;" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1012" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1012;CMD:FastRaster;" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1015" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1015;CMD:FastRaster;" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 1022" driver="hp-lj_1022" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1100" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1100A" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1150" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1160" driver="hp-lj_1160" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1200" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1220" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1300" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 1320" driver="hp-lj_1320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2100" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2100M" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2200" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2300" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;CMD:MLC,PCL,PJL;" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100A" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100A Printer-Copier-Scanner;CMD:MLC,MFPDTF1,PCL,PJL;" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1150" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;CMD:PJL,MLC,BIDI-ECP,PCL,DW-PCL;" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1160" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;CMD:PJL,MLC,BIDI-ECP,PCL,DW-PCL;" driver="hp-lj_1160" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1200" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1220" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1300" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1320" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_1320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_2100" manufacturer="HP" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100M" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_2100m" manufacturer="HP" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2200" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2300" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PJL,POSTSCRIPT;" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 2410" driver="hp-lj_2410" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2420" driver="hp-lj_2420" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 2430" driver="hp-lj_2430" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3015" driver="hp-lj_3015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3020" driver="hp-lj_3020" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3030" driver="hp-lj_3030" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3050" driver="hp-lj_3050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3052" driver="hp-lj_3052" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3055" driver="hp-lj_3055" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3200" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3200m" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2420" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;CMD:PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT;" driver="hp-lj_2420" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2430" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;CMD:PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT,PDF;" driver="hp-lj_2430" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3015" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3020" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3020" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3030" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3030" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3050" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3052" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3052" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3055" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3055" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;CMD:PJL,MLC,PCL,PCLXL;" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200m" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 3200se" driver="hp-lj_3200se" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3300 MFP" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3310 MFP" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3320 MFP" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3320N MFP" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3330 MFP" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3380" driver="hp-lj_3380" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3390" driver="hp-lj_3390" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 3392" driver="hp-lj_3392" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4000" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4050" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4100" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4200" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3300 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3310 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320N MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3300/3310/3320;DES:Hewlett-Packard LaserJet 3300/3310/3320;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3330 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3380" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3380" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3390" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3390" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3392" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3392" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4000" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4050" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series;DES:Hewlett-Packard LaserJet 4050 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4100" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series;DES:Hewlett-Packard LaserJet 4100 Series;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL;" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4200" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;CMD:PJL,MLC,POSTSCRIPT,PJL,PCLXL,PCL;" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4240" driver="hp-lj_4240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4250" driver="hp-lj_4250" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4300" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4250" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;CMD:PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT;" driver="hp-lj_4250" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4300" deviceid="MFG:Hewlett-Packard;MDL:hp LaserJet 4300;CMD:PJL,MLC,POSTSCRIPT,PJL,PCLXL,PCL;" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 4345 mfp" driver="hp-lj_4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 4350" driver="hp-lj_4350" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 5000" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4350" deviceid="MFG:HP;MDL:hp LaserJet 4350L;" driver="hp-lj_4350" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5000" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5100" driver="hp-lj_5100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5200" driver="hp-lj_5200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 5200L" driver="hp-lj_5200l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 8000" driver="hp-lj_8000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet 8150" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8150" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9040" driver="hp-lj_9040" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9040 MFP" driver="hp-lj_9040_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9050" driver="hp-lj_9050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP LaserJet 9050 MFP" driver="hp-lj_9050_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M3027 MFP" driver="hp-lj_m3027_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M3035 MFP" driver="hp-lj_m3035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M4345 MFP" driver="hp-lj_m4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M5025 MFP" driver="hp-lj_m5025_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet M5035 MFP" driver="hp-lj_m5035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P2010" driver="hp-lj_p2010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P2015" driver="hp-lj_p2015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P3004" driver="hp-lj_p3004" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP LaserJet P3005" driver="hp-lj_p3005" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3027 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m3027_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3035 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m3035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M4345 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5025 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m5025_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5035 MFP" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_m5035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2010" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P2010 series;DES:Hewlett-Packard LaserJet P2010 series;CMD:PJL,MLC,BIDI-ECP,PCL,DW-PCL;" driver="hp-lj_p2010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2015" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_p2015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3004" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P3004 Series;DES:Hewlett-Packard LaserJet P3004 Series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_p3004" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3005" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet P3005 Series;DES:Hewlett-Packard LaserJet P3005 Series;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_p3005" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="HP OfficeJet 300" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 330" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 350" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 500" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 520" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 570" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 580" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 590" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 600" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 610" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 625" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 630" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 635" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 700" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 710" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 720" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 725" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 5105" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 5110" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 300" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 330" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 350" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 500" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 520" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 570" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 580" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 590" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 500;CMD:MLC,PCL,PML;" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 600" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 610" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 625" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 630" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 635" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 600;CMD:MLC,PCL,PML;" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 700" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 710" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 720" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 725" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 700;CMD:MLC,PCL,PML;" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5105" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;CMD:MLC,PCL,PML;" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5110" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;CMD:MLC,PCL,PML;" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP OfficeJet 5110xi" driver="hp-oj_5110xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 6105" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 6110" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 7110" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 7130" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet 7140" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D125" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D135" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D145" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet D155" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet G55" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet G85" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet G95" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K60" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K60xi" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K80" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet K80xi" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet LX" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet Pro 1150C" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet Pro 1170C" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet Pro 1175C" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R40" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R45" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R60" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R65" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet R80" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet T45" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet T65" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet V40" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP OfficeJet V40xi" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6105" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6110" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7110" deviceid="MFG:Hewlett-Packard;MDL:officejet 7100 series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7130" deviceid="MFG:Hewlett-Packard;MDL:officejet 7100 series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7140" deviceid="MFG:Hewlett-Packard;MDL:officejet 7100 series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D125" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D135" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D145" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D155" deviceid="MFG:Hewlett-Packard;MDL:officejet d series;CMD:MLC,PCL,PML,DW-PCL,BIDI-ECP;" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G55" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G85" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G95" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K60;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60xi" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K60xi;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K80;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80xi" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet  K80xi;DES:Hewlett-Packard OfficeJet K Series;CMD:MLC,PCL,PML;" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet LX" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet;CMD:MLC,PCL,PML;" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1150C" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;CMD:PCL,MLC,PML,PJL;" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1170C" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;CMD:PCL,MLC,PML,PJL;" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1175C" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;CMD:PCL,MLC,PML,PJL;" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R40" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R45" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R60" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R65" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R80" deviceid="MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;CMD:MLC,PCL,PML,SCL;" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T45" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;CMD:MLC,PCL,PML;" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T65" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;CMD:MLC,PCL,PML;" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;CMD:MLC,PCL,PML;" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40xi" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;CMD:MLC,PCL,PML;" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP OfficeJet" driver="hp-oj" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 370" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 380" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 500" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 750" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 950" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 950xi" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 2110" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 2150" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PSC 2210" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart 7150" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 370" deviceid="MFG:Hewlett-Packard;MDL:Printer/Scanner/Copier 300;CMD:MLC,PCL,PML;" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 380" deviceid="MFG:Hewlett-Packard;MDL:Printer/Scanner/Copier 300;CMD:MLC,PCL,PML;" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 500" deviceid="MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;CMD:MLC,PCL,PML,SCL;" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 750" deviceid="MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;CMD:MLC,PCL,PML;" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950" deviceid="MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;CMD:MLC,PCL,PML;" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950xi" deviceid="MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;CMD:MLC,PCL,PML;" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2110" deviceid="MFG:Hewlett-Packard;MDL:PSC 2100 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2150" deviceid="MFG:Hewlett-Packard;MDL:PSC 2150 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2210" deviceid="MFG:Hewlett-Packard;MDL:PSC 2200 Series;CMD:MLC,PCL,PML,DW-PCL,DYN;" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7150" deviceid="MFG:hp;MDL:photosmart 7150;DES:hp photosmart 7150;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart 7345" driver="hp-psc_7345" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart 7350" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart 7550" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P100" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7350" deviceid="MFG:hp;MDL:photosmart 7350;DES:hp photosmart 7350;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7550" deviceid="MFG:hp;MDL:photosmart 7550;DES:hp photosmart 7550;CMD:MLC,PCL,PML,DW-PCL,DYN,DESKJET;" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P100" deviceid="MFG:HP;MDL:PHOTOSMART 100;DES:hp photosmart 100;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart P130" driver="hp-psc_p130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart P230" driver="hp-psc_p230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer translate="name" name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer translate="name" name="HP PhotoSmart P1115" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1000" deviceid="MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;CMD:MLC,PCL,PML;" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1100" deviceid="MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;CMD:MLC,PCL,PML;" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1115" deviceid="MFG:HP;MDL:PHOTOSMART 1115;DES:hp photosmart 1115;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP PhotoSmart P1215" driver="hp-psc_p1215" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P1218" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer translate="name" name="HP PhotoSmart P1315" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1218" deviceid="MFG:HP;MDL:PHOTOSMART 1218;DES:hp photosmart 1218;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1315" deviceid="MFG:HP;MDL:PHOTOSMART 1315;DES:hp photosmart 1315;CMD:MLC,PCL,PML,BIDI-ECP,ECP18,DW-PCL;" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
       <printer translate="name" name="HP e-printer e20" driver="hp-e-printer_e20" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="IBM 4019" driver="ibm-4019" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="IBM 4029 030 LaserPrinter 10" driver="ibm-4029_030_lp_10" manufacturer="IBM" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="IBM 4312" driver="ibm-4312" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Infoprint 12" deviceid="MFG:IBM;MDL:Infoprint;CMD:PCL5E,PCL6;" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Page Printer 3112" deviceid="MFG:Lexmark International;MDL:IBM 3112 Page Printer;DES:IBM 3112 Page Printer;CMD:PCL 5 Emulation, PostScript Level 2 Emulation, NPAP, PJL;" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec 4353 MF" driver="infotec-4353_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec 4452 MF" driver="infotec-4452_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4651 MF" deviceid="MFG:Lexmark International;MDL:IBM 3112 Page Printer;DES:IBM 3112 Page Printer;CMD:PCL 5 Emulation, PostScript Level 2 Emulation, NPAP, PJL;" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS2022" driver="infotec-is2022" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS2027" driver="infotec-is2027" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS2032" driver="infotec-is2032" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
@@ -1092,183 +1143,183 @@
       <printer translate="name" name="Infotec IS 3090" driver="infotec-is_3090" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS 3110" driver="infotec-is_3110" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Infotec IS 3135" driver="infotec-is_3135" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 2550" driver="infotec-mp_2550" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 2550B" driver="infotec-mp_2550b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 3350" driver="infotec-mp_3350" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 3350B" driver="infotec-mp_3350b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 4000" driver="infotec-mp_4000" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 4000B" driver="infotec-mp_4000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 5000" driver="infotec-mp_5000" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Infotec MP 5000B" driver="infotec-mp_5000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 2550" driver="infotec-mp_2550" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 2550B" driver="infotec-mp_2550b" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 3350" driver="infotec-mp_3350" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 3350B" driver="infotec-mp_3350b" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 4000" driver="infotec-mp_4000" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 4000B" driver="infotec-mp_4000b" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 5000" driver="infotec-mp_5000" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 5000B" driver="infotec-mp_5000b" manufacturer="Infotec" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera F-1010" deviceid="MFG:Kyocera;MDL:F-1010;DES:Kyocera F-1010;" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-600" deviceid="MFG:Kyocera;MDL:Kyocera FS-600;DES:Kyocera FS-600;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-680" deviceid="MFG:Kyocera;MDL:Kyocera FS-680;DES:Kyocera FS-680;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-800" deviceid="MFG:Kyocera;MDL:Kyocera FS-800;DES:Kyocera FS-800;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1000" deviceid="MFG:Kyocera;MDL:Kyocera FS-1000;DES:Kyocera FS-1000;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1010" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1010;DES:Kyocera FS-1010;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1050" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1050;DES:Kyocera FS-1050;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1200" deviceid="MFG:Kyocera;MDL:Kyocera FS-1200;DES:Kyocera FS-1200;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1600" deviceid="MFG:Kyocera;MDL:FS-1600;DES:Kyocera FS-1600;" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1700" deviceid="MFG:Kyocera;MDL:Kyocera FS-1700;DES:Kyocera FS-1700;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1750" deviceid="MFG:Kyocera;MDL:Kyocera FS-1750;DES:Kyocera FS-1750;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1800" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1800;DES:Kyocera FS-1800;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1900" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1900;DES:Kyocera FS-1900;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3500" deviceid="MFG:Kyocera;MDL:FS-3500;DES:Kyocera FS-3500;" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3600" deviceid="MFG:Kyocera;MDL:FS-3600;DES:Kyocera FS-3600;" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3700" deviceid="MFG:Kyocera;MDL:Kyocera FS-3700;DES:Kyocera FS-3700;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3750" deviceid="MFG:Kyocera;MDL:Kyocera FS-3750;DES:Kyocera FS-3750;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3800" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-3800;DES:Kyocera FS-3800;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5800C" deviceid="MFG:Kyocera;MDL:Kyocera FS-5800C;DES:Kyocera FS-5800C;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5900C" deviceid="MFG:Kyocera;MDL:Kyocera FS-5900C;DES:Kyocera FS-5900C;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6500" deviceid="MFG:Kyocera;MDL:FS-6500;DES:Kyocera FS-6500;" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6700" deviceid="MFG:Kyocera;MDL:Kyocera FS-6700;DES:Kyocera FS-6700;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-7000" deviceid="MFG:Kyocera;MDL:Kyocera FS-7000;DES:Kyocera FS-7000;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
       <printer translate="name" name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier 5622" driver="lanier-5622" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier 5627" driver="lanier-5627" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier 5632" driver="lanier-5632" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier 5635" driver="lanier-5635" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier 5645" driver="lanier-5645" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD0105" driver="lanier-ld0105" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-8000C" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-8000C;DES:Kyocera FS-8000C;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9000" deviceid="MFG:Kyocera;MDL:Kyocera FS-9000;DES:Kyocera FS-9000;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9100DN" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-9100DN;DES:Kyocera FS-9100DN;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9500DN" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-9500DN;DES:Kyocera FS-9500DN;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1530" deviceid="MFG:Kyocera Mita;MDL:KM-1530;DES:Kyocera Mita KM-1530;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1810" deviceid="MFG:Kyocera Mita;MDL:KM-1810;DES:Kyocera Mita KM-1810;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2030" deviceid="MFG:Kyocera Mita;MDL:KM-2030;DES:Kyocera Mita KM-2030;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2530" deviceid="MFG:Kyocera Mita;MDL:KM-2530;DES:Kyocera Mita KM-2530;" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-3530" deviceid="MFG:Kyocera Mita;MDL:KM-3530;DES:Kyocera Mita KM-3530;" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4230" deviceid="MFG:Kyocera Mita;MDL:KM-4230;DES:Kyocera Mita KM-4230;" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4530" deviceid="MFG:Kyocera Mita;MDL:KM-4530;DES:Kyocera Mita KM-4530;" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5230" deviceid="MFG:Kyocera Mita;MDL:KM-5230;DES:Kyocera Mita KM-5230;" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5530" deviceid="MFG:Kyocera Mita;MDL:KM-5530;DES:Kyocera Mita KM-5530;" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-6230" deviceid="MFG:Kyocera Mita;MDL:KM-6230;DES:Kyocera Mita KM-6230;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5622" driver="lanier-5622" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5627" driver="lanier-5627" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5632" driver="lanier-5632" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5635" driver="lanier-5635" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5645" driver="lanier-5645" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD0105" driver="lanier-ld0105" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Lanier LD015" driver="lanier-ld015" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD035" driver="lanier-ld035" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD045" driver="lanier-ld045" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD060" driver="lanier-ld060" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD075" driver="lanier-ld075" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD090" driver="lanier-ld090" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD115" driver="lanier-ld115" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD116" driver="lanier-ld116" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD118" driver="lanier-ld118" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD118d" driver="lanier-ld118d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD120" driver="lanier-ld120" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD120d" driver="lanier-ld120d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD122" driver="lanier-ld122" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD127" driver="lanier-ld127" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD132" driver="lanier-ld132" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD135" driver="lanier-ld135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD145" driver="lanier-ld145" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD151" driver="lanier-ld151" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD160" driver="lanier-ld160" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD175" driver="lanier-ld175" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD225" driver="lanier-ld225" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD230" driver="lanier-ld230" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD235" driver="lanier-ld235" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD245" driver="lanier-ld245" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP2500/LD125" driver="lanier-ld125" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 1100/LD1100" driver="lanier-ld1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 1350/LD1135" driver="lanier-ld1135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 1600/LD316" driver="lanier-ld316" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD035" driver="lanier-ld035" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD045" driver="lanier-ld045" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD060" driver="lanier-ld060" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD075" driver="lanier-ld075" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD090" driver="lanier-ld090" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD115" driver="lanier-ld115" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD116" driver="lanier-ld116" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD118" driver="lanier-ld118" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD118d" driver="lanier-ld118d" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD120" driver="lanier-ld120" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD120d" driver="lanier-ld120d" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD122" driver="lanier-ld122" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD127" driver="lanier-ld127" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD132" driver="lanier-ld132" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD135" driver="lanier-ld135" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD145" driver="lanier-ld145" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD151" driver="lanier-ld151" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD160" driver="lanier-ld160" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD175" driver="lanier-ld175" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD225" driver="lanier-ld225" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD230" driver="lanier-ld230" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD235" driver="lanier-ld235" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD245" driver="lanier-ld245" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP2500/LD125" driver="lanier-ld125" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1100/LD1100" driver="lanier-ld1100" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1350/LD1135" driver="lanier-ld1135" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1600/LD316" driver="lanier-ld316" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Lanier MP 161/LD016" driver="lanier-ld016" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2000/LD320d" driver="lanier-ld320d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2510/LD325" driver="lanier-ld325" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2550B/LD425B" driver="lanier-ld425b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2550/LD425" driver="lanier-ld425" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3010/LD330" driver="lanier-ld330" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3350B/LD433B" driver="lanier-ld433b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3350/LD433" driver="lanier-ld433" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3500/LD335" driver="lanier-ld335" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 4000B/LD040B" driver="lanier-ld040b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 4000/LD040" driver="lanier-ld040" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 4500/LD345" driver="lanier-ld345" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 5000B/LD050B" driver="lanier-ld050b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 5000/LD050" driver="lanier-ld050" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 5500/LD255" driver="lanier-ld255" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 6500/LD265" driver="lanier-ld265" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 7500/LD275" driver="lanier-ld275" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 9000/LD190" driver="lanier-ld190" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2000/LD320d" driver="lanier-ld320d" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2510/LD325" driver="lanier-ld325" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2550B/LD425B" driver="lanier-ld425b" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2550/LD425" driver="lanier-ld425" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3010/LD330" driver="lanier-ld330" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3350B/LD433B" driver="lanier-ld433b" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3350/LD433" driver="lanier-ld433" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3500/LD335" driver="lanier-ld335" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4000B/LD040B" driver="lanier-ld040b" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4000/LD040" driver="lanier-ld040" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4500/LD345" driver="lanier-ld345" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5000B/LD050B" driver="lanier-ld050b" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5000/LD050" driver="lanier-ld050" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5500/LD255" driver="lanier-ld255" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 6500/LD265" driver="lanier-ld265" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 7500/LD275" driver="lanier-ld275" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 9000/LD190" driver="lanier-ld190" manufacturer="Lanier" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Optra E220" driver="lexmark-optra_e220" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lexmark Optra E321" driver="lexmark-optra_e321" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E321" deviceid="MFG:Lexmark International;MDL:Lexmark E321;DES:Lexmark E321;CMD:PCL 5 Emulation, PostScript Level 3 For Mac Emulation, NPAP, PJL;" driver="lexmark-optra_e321" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Optra E323" driver="lexmark-optra_e323" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6" deviceid="MFG:MINOLTA;MDL:PagePro 6;CMD:HP ENHANCED PCL5;" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6ex" deviceid="MFG:Minolta;MDL:PagePro   6e;CMD:HP ENHANCED PCL5e,PJL,WinStyler;" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8" deviceid="MFG:MINOLTA;MDL:PagePro 8;CMD:HP ENHANCED PCL6,PJL;" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8L" deviceid="MFG:Minolta;MDL:PagePro 8L;CMD:PrintGear;PCL;PLJ;" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 1100" deviceid="MFG:MINOLTA;MDL:PagePro 1100;CMD:HP ENHANCED PCL6,PJL;" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 870" deviceid="MFG:NEC;MDL:SuperScript 870;DES:SuperScript 870;CMD:PrintGear,PCL,PJL;" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 10515/10518/10512" driver="nrg-10512" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2205/2238/2212" driver="nrg-2212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2705/2738/2712" driver="nrg-2712" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3205/3238/3212" driver="nrg-3212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3525/3508/3502" driver="nrg-3502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3545/3518/3532" driver="nrg-3532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4525/4508/4502" driver="nrg-4502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4545/4518/4532" driver="nrg-4532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 6002/6005/6008" driver="nrg-6008" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 7502/7505/7508" driver="nrg-7508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 9005/9008/9002" driver="nrg-9002" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 1800" deviceid="MFG:NEC;MDL:SuperScript 1800;CMD:PCL6,PCL5E;" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 10515/10518/10512" driver="nrg-10512" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2205/2238/2212" driver="nrg-2212" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2705/2738/2712" driver="nrg-2712" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3205/3238/3212" driver="nrg-3212" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3525/3508/3502" driver="nrg-3502" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3545/3518/3532" driver="nrg-3532" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4525/4508/4502" driver="nrg-4502" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4545/4518/4532" driver="nrg-4532" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 6002/6005/6008" driver="nrg-6008" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 7502/7505/7508" driver="nrg-7508" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 9005/9008/9002" driver="nrg-9002" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG DSm415" driver="nrg-dsm415" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG DSm615" driver="nrg-dsm615" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm616" driver="nrg-dsm616" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm618" driver="nrg-dsm618" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm618d" driver="nrg-dsm618d" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm620" driver="nrg-dsm620" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm620d" driver="nrg-dsm620d" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm622" driver="nrg-dsm622" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm627" driver="nrg-dsm627" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm632" driver="nrg-dsm632" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm635" driver="nrg-dsm635" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm645" driver="nrg-dsm645" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm651" driver="nrg-dsm651" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm660" driver="nrg-dsm660" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm675" driver="nrg-dsm675" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm725" driver="nrg-dsm725" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm730" driver="nrg-dsm730" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm735" driver="nrg-dsm735" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG DSm745" driver="nrg-dsm745" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 1100" driver="nrg-mp_1100" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 1350" driver="nrg-mp_1350" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 1600" driver="nrg-mp_1600" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm616" driver="nrg-dsm616" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm618" driver="nrg-dsm618" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm618d" driver="nrg-dsm618d" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm620" driver="nrg-dsm620" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm620d" driver="nrg-dsm620d" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm622" driver="nrg-dsm622" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm627" driver="nrg-dsm627" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm632" driver="nrg-dsm632" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm635" driver="nrg-dsm635" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm645" driver="nrg-dsm645" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm651" driver="nrg-dsm651" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm660" driver="nrg-dsm660" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm675" driver="nrg-dsm675" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm725" driver="nrg-dsm725" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm730" driver="nrg-dsm730" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm735" driver="nrg-dsm735" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm745" driver="nrg-dsm745" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1100" driver="nrg-mp_1100" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1350" driver="nrg-mp_1350" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1600" driver="nrg-mp_1600" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG MP 161" driver="nrg-mp_161" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 2000" driver="nrg-mp_2000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 2500" driver="nrg-mp_2500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 2510" driver="nrg-mp_2510" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 2550" driver="nrg-mp_2550" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 2550B" driver="nrg-mp_2550b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 3010" driver="nrg-mp_3010" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 3350" driver="nrg-mp_3350" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 3350B" driver="nrg-mp_3350b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 3500" driver="nrg-mp_3500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 4000" driver="nrg-mp_4000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 4000B" driver="nrg-mp_4000b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 4500" driver="nrg-mp_4500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 5000" driver="nrg-mp_5000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 5000B" driver="nrg-mp_5000b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 5500" driver="nrg-mp_5500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 6500" driver="nrg-mp_6500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 7500" driver="nrg-mp_7500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG MP 9000" driver="nrg-mp_9000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2000" driver="nrg-mp_2000" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2500" driver="nrg-mp_2500" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2510" driver="nrg-mp_2510" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2550" driver="nrg-mp_2550" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2550B" driver="nrg-mp_2550b" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3010" driver="nrg-mp_3010" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3350" driver="nrg-mp_3350" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3350B" driver="nrg-mp_3350b" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3500" driver="nrg-mp_3500" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4000" driver="nrg-mp_4000" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4000B" driver="nrg-mp_4000b" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4500" driver="nrg-mp_4500" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5000" driver="nrg-mp_5000" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5000B" driver="nrg-mp_5000b" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5500" driver="nrg-mp_5500" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 6500" driver="nrg-mp_6500" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 7500" driver="nrg-mp_7500" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 9000" driver="nrg-mp_9000" manufacturer="NRG" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Oki OL400" driver="okidata-ol400" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Oki OL400e" driver="okidata-ol400e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Oki OL400ex" driver="okidata-ol400ex" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
@@ -1277,81 +1328,81 @@
       <printer translate="name" name="Oki OL610e/S" driver="okidata-ol610e_s" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Oki OL800" driver="okidata-ol800" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Oki OL810ex" driver="okidata-ol810ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 6e" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 8p" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 10e" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Oki Super 6e" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6e" deviceid="MFG:OKI DATA CORP;MDL:OKIDATA OKIPAGE 6e;DES:OKIDATA OKIPAGE 6e (HP4P);CMD:ENHANCED PCL5,PJL,EPSONFX,IBMPPR,HIPERWINDOWS;" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6ex" deviceid="MFG:OKI DATA CORP;MDL:OKIDATA OKIPAGE 6ex;DES:OKIDATA OKIPAGE 6ex (HP4P);CMD:ENHANCED PCL5,PJL,EPSONFX,IBMPR,HIPERWINDOWS;" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 8p" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 8p;DES:OKIPAGE 8p;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10e" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 10e;DES:OKIPAGE 10e;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10ex" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 10ex;DES:OKIPAGE 10ex;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 14ex" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 14ex;DES:OKIPAGE 14ex;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Super 6e" deviceid="MFG:OKI DATA CORP;MDL:OKIPAGE 14ex;DES:OKIPAGE 14ex;CMD:PJL,PCLXL,PCL,EPSONFX,IBMPPR;" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
       <printer translate="name" name="Olivetti JP350S" driver="olivetti-jp350s" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Olivetti PG 306" driver="olivetti-pg_306" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="PCPI 1030" driver="pcpi-1030" manufacturer="PCPI" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Panasonic KX-P4410" driver="panasonic-kx-p4410" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Panasonic KX-P4450" driver="panasonic-kx-p4450" manufacturer="Panasonic" model="3" parameters="pcl_laser_params" />
       <printer translate="name" name="Panasonic KX-P6150" driver="panasonic-kx-p6150" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Panasonic KX-P6500" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P6500" deviceid="MFG:Panasonic;MDL:KX-P6500;DES:(no such line for this device);CMD:GDI;" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Raven LP-410" driver="raven-lp-410" manufacturer="Raven" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 1022" driver="ricoh-afc_1022" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 1027" driver="ricoh-afc_1027" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 1032" driver="ricoh-afc_1032" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 1035" driver="ricoh-afc_1035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 1045" driver="ricoh-afc_1045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 1060" driver="ricoh-afc_1060" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 1075" driver="ricoh-afc_1075" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1022" driver="ricoh-afc_1022" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1027" driver="ricoh-afc_1027" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1032" driver="ricoh-afc_1032" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1035" driver="ricoh-afc_1035" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1045" driver="ricoh-afc_1045" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1060" driver="ricoh-afc_1060" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1075" driver="ricoh-afc_1075" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Ricoh Aficio 1515" driver="ricoh-afc_1515" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2015" driver="ricoh-afc_2015" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2016" driver="ricoh-afc_2016" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2018" driver="ricoh-afc_2018" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2018D" driver="ricoh-afc_2018d" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2020" driver="ricoh-afc_2020" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2020D" driver="ricoh-afc_2020d" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2022" driver="ricoh-afc_2022" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2027" driver="ricoh-afc_2027" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2032" driver="ricoh-afc_2032" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2035" driver="ricoh-afc_2035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2035e" driver="ricoh-afc_2035e" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2045" driver="ricoh-afc_2045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2045e" driver="ricoh-afc_2045e" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2051" driver="ricoh-afc_2051" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2060" driver="ricoh-afc_2060" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2075" driver="ricoh-afc_2075" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2090" driver="ricoh-afc_2090" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 2105" driver="ricoh-afc_2105" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2015" driver="ricoh-afc_2015" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2016" driver="ricoh-afc_2016" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2018" driver="ricoh-afc_2018" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2018D" driver="ricoh-afc_2018d" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2020" driver="ricoh-afc_2020" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2020D" driver="ricoh-afc_2020d" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2022" driver="ricoh-afc_2022" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2027" driver="ricoh-afc_2027" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2032" driver="ricoh-afc_2032" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2035" driver="ricoh-afc_2035" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2035e" driver="ricoh-afc_2035e" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2045" driver="ricoh-afc_2045" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2045e" driver="ricoh-afc_2045e" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2051" driver="ricoh-afc_2051" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2060" driver="ricoh-afc_2060" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2075" driver="ricoh-afc_2075" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2090" driver="ricoh-afc_2090" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2105" driver="ricoh-afc_2105" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Ricoh Aficio 220" driver="ricoh-afc_220" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 3025" driver="ricoh-afc_3025" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 3030" driver="ricoh-afc_3030" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 3035" driver="ricoh-afc_3035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio 3045" driver="ricoh-afc_3045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3025" driver="ricoh-afc_3025" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3030" driver="ricoh-afc_3030" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3035" driver="ricoh-afc_3035" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3045" driver="ricoh-afc_3045" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Ricoh Aficio 401" driver="ricoh-afc_401" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Ricoh Aficio 700" driver="ricoh-afc_700" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 1100" driver="ricoh-afc_mp_1100" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 1350" driver="ricoh-afc_mp_1350" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 1600" driver="ricoh-afc_mp_1600" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1100" driver="ricoh-afc_mp_1100" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1350" driver="ricoh-afc_mp_1350" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1600" driver="ricoh-afc_mp_1600" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Ricoh Aficio MP 161" driver="ricoh-afc_mp_161" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 2000" driver="ricoh-afc_mp_2000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 2500" driver="ricoh-afc_mp_2500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 2510" driver="ricoh-afc_mp_2510" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 2550" driver="ricoh-afc_mp_2550" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 2550B" driver="ricoh-afc_mp_2550b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 3010" driver="ricoh-afc_mp_3010" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 3350" driver="ricoh-afc_mp_3350" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 3350B" driver="ricoh-afc_mp_3350b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 3500" driver="ricoh-afc_mp_3500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 4000" driver="ricoh-afc_mp_4000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 4000B" driver="ricoh-afc_mp_4000b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 4500" driver="ricoh-afc_mp_4500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 5000" driver="ricoh-afc_mp_5000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 5000B" driver="ricoh-afc_mp_5000b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 5500" driver="ricoh-afc_mp_5500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 6500" driver="ricoh-afc_mp_6500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 7500" driver="ricoh-afc_mp_7500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Ricoh Aficio MP 9000" driver="ricoh-afc_mp_9000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2000" driver="ricoh-afc_mp_2000" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2500" driver="ricoh-afc_mp_2500" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2510" driver="ricoh-afc_mp_2510" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2550" driver="ricoh-afc_mp_2550" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2550B" driver="ricoh-afc_mp_2550b" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3010" driver="ricoh-afc_mp_3010" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3350" driver="ricoh-afc_mp_3350" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3350B" driver="ricoh-afc_mp_3350b" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3500" driver="ricoh-afc_mp_3500" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4000" driver="ricoh-afc_mp_4000" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4000B" driver="ricoh-afc_mp_4000b" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4500" driver="ricoh-afc_mp_4500" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5000" driver="ricoh-afc_mp_5000" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5000B" driver="ricoh-afc_mp_5000b" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5500" driver="ricoh-afc_mp_5500" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 6500" driver="ricoh-afc_mp_6500" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 7500" driver="ricoh-afc_mp_7500" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 9000" driver="ricoh-afc_mp_9000" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-85" driver="samsung-ml-85" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1250" driver="samsung-ml-1250" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1450" driver="samsung-ml-1450" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1450PS" driver="samsung-ml-1450ps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Samsung ML-1650" driver="samsung-ml-1650" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1650" deviceid="MFG:Samsung;MDL:ML-1650;CMD:PCL5E,PCL6;" driver="samsung-ml-1650" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1651N" driver="samsung-ml-1651n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-1750" driver="samsung-ml-1750" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-2150" driver="samsung-ml-2150" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
@@ -1375,62 +1426,62 @@
       <printer translate="name" name="Samsung ML-7300" driver="samsung-ml-7300" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung ML-7300N" driver="samsung-ml-7300n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Samsung QL-5100A" driver="samsung-ql-5100a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Samsung QL-6050" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2522" driver="savin-2522" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2527" driver="savin-2527" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2532" driver="savin-2532" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2535/2235" driver="savin-2235" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2545/2245" driver="savin-2245" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2560" driver="savin-2560" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2575" driver="savin-2575" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung QL-6050" deviceid="MFG:Samsung;MDL:6050;CMD:PCL6;" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2522" driver="savin-2522" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2527" driver="savin-2527" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2532" driver="savin-2532" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2535/2235" driver="savin-2235" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2545/2245" driver="savin-2245" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2560" driver="savin-2560" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2575" driver="savin-2575" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 3515" driver="savin-3515" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 40105" driver="savin-40105" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4015" driver="savin-4015" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4018" driver="savin-4018" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4018d" driver="savin-4018d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4022" driver="savin-4022" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4027" driver="savin-4027" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4035/4135g" driver="savin-4135g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4035e/4135eG" driver="savin-4135eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4045/4145g" driver="savin-4145g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4045e/4145eG" driver="savin-4145eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4051" driver="savin-4051" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4060" driver="savin-4060" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4075" driver="savin-4075" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4090" driver="savin-4090" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 7025" driver="savin-7025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8016" driver="savin-8016" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8020" driver="savin-8020" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8020d" driver="savin-8020d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8025" driver="savin-8025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8025e" driver="savin-8025e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8030" driver="savin-8030" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8030e" driver="savin-8030e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8035/8035g" driver="savin-8035g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8035e" driver="savin-8035e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8045/8045g" driver="savin-8045g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8045e" driver="savin-8045e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8055" driver="savin-8055" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8065" driver="savin-8065" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8075" driver="savin-8075" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8090" driver="savin-8090" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8110" driver="savin-8110" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8135" driver="savin-8135" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 40105" driver="savin-40105" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4015" driver="savin-4015" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4018" driver="savin-4018" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4018d" driver="savin-4018d" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4022" driver="savin-4022" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4027" driver="savin-4027" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4035/4135g" driver="savin-4135g" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4035e/4135eG" driver="savin-4135eg" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4045/4145g" driver="savin-4145g" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4045e/4145eG" driver="savin-4145eg" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4051" driver="savin-4051" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4060" driver="savin-4060" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4075" driver="savin-4075" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4090" driver="savin-4090" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 7025" driver="savin-7025" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8016" driver="savin-8016" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8020" driver="savin-8020" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8020d" driver="savin-8020d" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8025" driver="savin-8025" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8025e" driver="savin-8025e" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8030" driver="savin-8030" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8030e" driver="savin-8030e" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8035/8035g" driver="savin-8035g" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8035e" driver="savin-8035e" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8045/8045g" driver="savin-8045g" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8045e" driver="savin-8045e" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8055" driver="savin-8055" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8065" driver="savin-8065" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8075" driver="savin-8075" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8090" driver="savin-8090" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8110" driver="savin-8110" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8135" driver="savin-8135" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 816" driver="savin-816" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9016" driver="savin-9016" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9021d" driver="savin-9021d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9025" driver="savin-9025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9025b" driver="savin-9025b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9033" driver="savin-9033" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9033b" driver="savin-9033b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9040" driver="savin-9040" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9040b" driver="savin-9040b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9050" driver="savin-9050" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 9050b" driver="savin-9050b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9016" driver="savin-9016" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9021d" driver="savin-9021d" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9025" driver="savin-9025" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9025b" driver="savin-9025b" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9033" driver="savin-9033" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9033b" driver="savin-9033b" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9040" driver="savin-9040" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9040b" driver="savin-9040b" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9050" driver="savin-9050" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9050b" driver="savin-9050b" manufacturer="Savin" model="61" parameters="pcl_laser_params" />
       <printer translate="name" name="Seiko SpeedJET 200" driver="seiko-sj_200" manufacturer="Seiko" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Sharp AR-161" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sharp AR-161" deviceid="MFG:SHARP;MDL:AR-160/200 series;DES:None;CMD:PCL;" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Sharp AR-M257" driver="sharp-ar-m257" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Sony IJP-V100" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Sony IJP-V100" deviceid="MFG:Sony;MDL:All-in-One IJP-V100;CMD:MLC,PCL,PML;" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Star LS-04" driver="star-ls-04" manufacturer="Star" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Star LaserPrinter 8" driver="star-lp_8" manufacturer="Star" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="Tally MT908" driver="tally-mt908" manufacturer="Tally" model="3" parameters="pcl_laser_params" />
@@ -1439,11 +1490,11 @@
       <printer translate="name" name="Xerox DocuPrint C20" driver="xerox-dp_c20" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Xerox DocuPrint N4512" driver="xerox-dp_n4512" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Xerox DocuPrint N4512PS" driver="xerox-dp_n4512ps" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox DocuPrint P12" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P12" deviceid="MFG:XEROX;MDL:DocuPrint P12;DES:Xerox DocuPrint P12;CMD:PrintGear,PCL,PJL;" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P1202" deviceid="MFG:Xerox;MDL:DocuPrint;CMD:PCL5E;" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P8e" deviceid="MFG:Xerox;MDL:DocuPrint P8e;CMD:PCL5E2;" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Xerox WorkCentre M118" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox WorkCentre M118" deviceid="MFG:XEROX;MDL:WorkCentre M118;DES:XEROX WorkCentre M118;" driver="xerox-wc_m118" manufacturer="Xerox" model="61" parameters="pcl_laser_params" />
     </family>
     <family name="lexmark">
       <parameters name="standard_params">
@@ -1452,10 +1503,10 @@
         <parameter type="float" name="Density">2.0</parameter>
       </parameters>
       <printer translate="name" name="Compaq IJ1200" driver="compaq-ij1200" manufacturer="Compaq" model="10042" parameters="standard_params" />
-      <printer translate="name" name="Lexmark X73" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer translate="name" name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark X73" deviceid="MFG:Lexmark;MDL:Lexmark X73;DES:Lexmark X73;CMD:LNPAP;" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z42" deviceid="MFG:Lexmark;MDL:Lexmark Z42;DES:Lexmark Z42;CMD:LNPAP;" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
       <printer translate="name" name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer translate="name" name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z52" deviceid="MFG:Lexmark;MDL:Lexmark Z52;DES:Lexmark Z52;" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
       <printer translate="name" name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052" parameters="standard_params" />
     </family>
     <family name="dyesub">
@@ -1480,6 +1531,7 @@
       <printer translate="name" name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-520" driver="canon-cp520" manufacturer="Canon" model="1004" />
+      <printer translate="name" name="Canon SELPHY-CP-530" driver="canon-cp530" manufacturer="Canon" model="1004" />
       <printer translate="name" name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" />
author	Roger Leigh <rleigh@debian.org>	2010-02-18 18:43:37 +0000
committer	Roger Leigh <rleigh@debian.org>	2010-02-18 18:43:37 +0000
commit	b7a746079a87b24dc0e64362e83463029e26c98f (patch)
tree	4cd968e10cb18bdcd7ed21489f6fdb3e9dc1e0ff /src
parent	0f09a5be038c93c1bd5ca2988e152345bbf74c00 (diff)