From 5003bd33e74c1de3fbe3dd7b5b206aff61f78658 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Thu, 25 Nov 2010 13:27:37 -0500
Subject: [PATCH] Cleanup of template database.

- Alphabetized the templates in the misc-*-templates.xml files.
- Replaced the last of the deprecated "Alias" tags.
- Added TODO comments for questionable part #s and vendors.
---
 templates/avery-iso-templates.xml  |   1 -
 templates/misc-iso-templates.xml   | 666 ++++++++++++++++++++---------
 templates/misc-other-templates.xml |  11 +
 templates/misc-us-templates.xml    | 317 +++++++++-----
 4 files changed, 677 insertions(+), 318 deletions(-)

diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml
index db94eeb8..b899c969 100644
--- a/templates/avery-iso-templates.xml
+++ b/templates/avery-iso-templates.xml
@@ -140,7 +140,6 @@
       <Markup-margin size="5"/>
       <Layout nx="3" ny="4" x0="20.84" y0="10" dx="187.08" dy="204.038"/>
     </Label-rectangle>
-    <Alias brand="Biltema" part="23-756"/>
   </Template>
 
   <Template brand="Avery" part="L7164" equiv="7164"/>
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 09d800d7..e217d804 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -4,39 +4,83 @@
 
 
   <!-- ******************************************************************** -->
-  <!-- Misc. A4 products.                                                   -->
+  <!-- Misc. ISO sized products.                                            -->
   <!-- ******************************************************************** -->
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Agipa                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Sigel LP 800/LP 801/LP 802: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
+  <!-- Agipa 119488: Business Cards, 50 x 90 mm, 10 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Sigel" part="LP 800" size="A4" _description="Business Cards">
+  <Template brand="Agipa" part="119488" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
-    <Label-rectangle id="0" width="85.0mm" height="55.0mm" round="0">
+    <Label-rectangle id="0" width="255" height="142" round="0">
       <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="15.0mm" y0="10.0mm" dx="95.0mm" dy="55.0mm"/>
+      <Layout nx="2" ny="5" x0="43" y0="67" dx="255" dy="142"/>
     </Label-rectangle>
-    <Alias brand="Sigel" part="LP 801"/>
-    <Alias brand="Sigel" part="LP 802"/>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- Sigel DP 830/DP 930: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
-  <!-- =================================================================== -->
-  <Template brand="Sigel" part="DP 830" size="A4" _description="Business Cards">
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- APLI                      -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- ====================================================== -->
+  <!-- APLI 02793: Business Cards, 50,8 x 90 mm, 10 per sheet -->
+  <!-- ====================================================== -->
+  <Template brand="APLI" part="02793" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
-    <Label-rectangle id="0" width="240.9" height="155.9" round="0">
+    <Label-rectangle id="0" width="255.118" height="144" round="0">
       <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="40" y0="31" dx="269" dy="156"/>
+      <Layout nx="2" ny="5" x0="42.5197" y0="62.3622" dx="255.118" dy="144"/>
     </Label-rectangle>
-    <Alias brand="Sigel" part="DP 930"/>
   </Template>
 
+
+  <!-- =================================================================== -->
+  <!-- APLI 1999:  Mailing Labels, 9,9cm x 6,8cm, 8 per sheet              -->
+  <!-- =================================================================== -->
+  <Template brand="APLI" part="1999" size="A4" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="281" height="193" round="5">
+      <Markup-margin size="5"/>
+      <Layout nx="2" ny="4" x0="13" y0="21.890" dx="289" dy="194"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- =================================================================== -->
+  <!-- APLI 01293:  General Labels.                                        -->
+  <!-- =================================================================== -->
+  <Template brand="APLI" part="01293" size="A4" _description="General Labels">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="198.425pt" height="94.3937pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="3" ny="8" x0="0pt" y0="43.3701pt" dx="198.425pt" dy="94.3937pt"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Ascom                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- Ascom A4/24/MKII: Rectangular Labels, 24 per sheet                  -->
   <!-- =================================================================== -->
+  <!-- TODO: Is this the real part #? -->
   <Template brand="Ascom" part="A4/24/MKII" size="A4" _description="Rectangular Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="181" height="96" round="10">
@@ -45,56 +89,111 @@
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Best Office               -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Agipa 119488: Business Cards, 50 x 90 mm, 10 per sheet              -->
+  <!-- Best Office Self-adhesive labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Agipa" part="119488" size="A4" _description="Business Cards">
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="255" height="142" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="43" y0="67" dx="255" dy="142"/>
+  <Template brand="Best Office" part="75753" size="A4" _description="Self-adhesive labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="70mm" height="36mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="3" ny="8" x0="0mm" y0="4mm" dx="70mm" dy="36mm"/>
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Biltema                   -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Ednet BC: Business Cards, 51 x 89 mm, 10 per sheet                  -->
+  <!-- Biltema 23-756: Address labels, 63.50 x 71.98 mm, 12 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Ednet" part="BC" size="A4" _description="Business Cards">
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="253" height="145" round="0">
+  <Template brand="Biltem" part="23-756" size="A4" _description="Address labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="180" height="204.038" round="8.5">
       <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="40" y0="59" dx="253" dy="145"/>
+      <Layout nx="3" ny="4" x0="20.84" y0="10" dx="187.08" dy="204.038"/>
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Bruna                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Ednet 45021: Inkjet/Laser Labels 70x37mm                            -->
+  <!-- Bruna 241301.  Mailing Labels.                                      -->
   <!-- =================================================================== -->
-  <Template brand="Ednet" part="45021" size="A4" _description="Inkjet/Laser Labels 70x37mm">
+  <Template brand="Bruna" part="241301" size="A4" _description="Mailing Labels">
     <Meta category="label"/>
-    <Label-rectangle id="0" width="198.425pt" height="104.882pt" round="0pt" x_waste="0pt" y_waste="0pt">
-      <Markup-margin size="0pt"/>
-      <Layout nx="3" ny="8" x0="0pt" y0="0pt" dx="198.425pt" dy="104.882pt"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="198.425pt" height="102.047pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="3" ny="8" x0="0pt" y0="0pt" dx="198.425pt" dy="102.047pt"/>
     </Label-rectangle>
   </Template>
 
-  <!-- ===================================================================-->
-  <!-- Neato brand CD/DVD Labels (face only), 2 per sheet                 -->
-  <!-- ===================================================================-->
-  <Template brand="Neato" part="A4 CD" size="A4" _description="CD/DVD Labels (face only)">
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Celcast                   -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- =================================================================== -->
+  <!-- Celcast IJ37: Fridge magnet (stickers), 52 x 90 mm, 10 per sheet    -->
+  <!-- =================================================================== -->
+  <Template brand="Celcast" part="IJ37" size="A4" _description="Fridge Magnet Stickers">
     <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
+    <Label-rectangle id="0" width="255" height="147.5" round="0">
       <Markup-margin size="5"/>
-      <Layout nx="1" ny="2" x0="125" y0="68.890" dx="0" dy="360"/>        
-    </Label-cd>                                                      
+      <Layout nx="2" ny="5" x0="43" y0="52.7" dx="255" dy="147.5"/>
+    </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Connect                   -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- =================================================================== -->
+  <!-- Connect KF10647 Mailing Labels..                                    -->
+  <!-- =================================================================== -->
+  <Template brand="Connect" part="KF10647" size="A4" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="198.425pt" height="104.882pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="3" ny="8" x0="7.86772e-17pt" y0="11.3386pt" dx="198.425pt" dy="104.882pt"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Data Becker               -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- DATA BECKER: Business Cards, 50 x 90 mm, 10 per sheet               -->
   <!-- =================================================================== -->
+  <!-- TODO: What is the actual part #? -->
   <Template brand="DataBecker" part="BC?" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
@@ -103,7 +202,23 @@
       <Layout nx="2" ny="5" x0="36" y0="69.890" dx="255" dy="142"/>
     </Label-rectangle>
   </Template>
+
  
+  <!-- ===================================================================-->
+  <!-- Data Becker CD/DVD Labels (face only), 2 per sheet                 -->
+  <!-- ===================================================================-->
+  <Template brand="DataBecker" part="0335" size="A4" _description="CD/DVD Labels Standard Format (face only)">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="164.409" hole="58.1102" waste="5">
+      <Markup-margin size="5"/>
+      <Layout nx="1" ny="2" x0="133.228" y0="46.7716" dx="0" dy="419.527"/>
+    </Label-cd>
+  </Template>
+
+  <Template brand="DataBecker" part="0368" equiv="0335"/>
+
+
   <!-- =================================================================== -->
   <!-- DATA BECKER 0491 Business Cards, 50 x 90 mm, 10 per sheet           -->
   <!-- =================================================================== -->
@@ -115,6 +230,7 @@
       <Layout nx="2" ny="5" x0="12.5mm" y0="15mm" dx="94.55mm" dy="54mm"/>
     </Label-rectangle>
   </Template>
+
  
   <!-- =================================================================== -->
   <!-- DATA BECKER 0526 Address Labels.                                    -->
@@ -128,6 +244,7 @@
     </Label-rectangle>
   </Template>
 
+
   <!-- =================================================================== -->
   <!-- DATA BECKER 0562 CD Labels.                                         -->
   <!-- =================================================================== -->
@@ -141,6 +258,7 @@
     </Label-cd>
   </Template>
 
+
   <!-- =================================================================== -->
   <!-- DATA BECKER 0598 Address Labels.                                    -->
   <!-- =================================================================== -->
@@ -153,6 +271,13 @@
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Dataline                  -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- Dataline 57125: Business Cards, 54.0 x 86.0 mm, 10 per sheet        -->
   <!-- =================================================================== -->
@@ -165,66 +290,160 @@
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Ednet                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Hema Etiketten: 65 x 38 mm, 21 per sheet                            -->
+  <!-- Ednet BC: Business Cards, 51 x 89 mm, 10 per sheet                  -->
   <!-- =================================================================== -->
-  <Template brand="Hema" part="Etiketten" size="A4" _description="Rectangular Labels">
-    <Meta category="label"/>
-    <Label-rectangle id="0" width="178" height="108" round="5">
+  <!-- TODO: Is this a real part #? -->
+  <Template brand="Ednet" part="BC" size="A4" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="253" height="145" round="0">
       <Markup-margin size="5"/>
-      <Layout nx="3" ny="7" x0="20" y0="49.890" dx="187" dy="107"/>
+      <Layout nx="2" ny="5" x0="40" y0="59" dx="253" dy="145"/>
     </Label-rectangle>
   </Template>
 
-  <!-- ====================================================== -->
-  <!-- APLI 02793: Business Cards, 50,8 x 90 mm, 10 per sheet -->
-  <!-- ====================================================== -->
-  <Template brand="APLI" part="02793" size="A4" _description="Business Cards">
+
+  <!-- =================================================================== -->
+  <!-- Ednet 45021: Inkjet/Laser Labels 70x37mm                            -->
+  <!-- =================================================================== -->
+  <Template brand="Ednet" part="45021" size="A4" _description="Inkjet/Laser Labels 70x37mm">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="198.425pt" height="104.882pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="3" ny="8" x0="0pt" y0="0pt" dx="198.425pt" dy="104.882pt"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Encre.com                 -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- ===================================================================-->
+  <!-- Encre.com Business Cards, 10 per sheet                             -->
+  <!-- ===================================================================-->
+  <Template brand="Encre.com" part="BCV10" size="A4" _description="Business Cards">  
     <Meta category="card"/>
     <Meta category="business-card"/>
-    <Label-rectangle id="0" width="255.118" height="144" round="0">
+    <Label-rectangle id="0" width="243.78" height="153.07">  
       <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="42.5197" y0="62.3622" dx="255.118" dy="144"/>
-    </Label-rectangle>
+      <Layout nx="2" ny="5" x0="48.19" y0="42.50" dx="255.12" dy="157.32"/>  
+    </Label-rectangle> 
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Epson                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- APLI 1999:  Mailing Labels, 9,9cm x 6,8cm, 8 per sheet              -->
+  <!-- EPSON Photo Stickers, 17 x 24 mm, 16 per sheet                      -->
   <!-- =================================================================== -->
-  <Template brand="APLI" part="1999" size="A4" _description="Mailing Labels">
+  <Template brand="Epson" part="S041144" size="A6" _description="EPSON Photo Stickers 16">
     <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="281" height="193" round="5">
+    <Label-rectangle id="0" width="48" height="68" round="7">
       <Markup-margin size="5"/>
-      <Layout nx="2" ny="4" x0="13" y0="21.890" dx="289" dy="194"/>
+      <Layout nx="4" ny="4" x0="33" y0="59" dx="59.5" dy="79.5"/>
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Fellows                   -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- APLI 01293:  General Labels.                                        -->
+  <!-- Fellows 04715 CD/DVD Labels (Face only).                            -->
   <!-- =================================================================== -->
-  <Template brand="APLI" part="01293" size="A4" _description="General Labels">
+  <Template brand="Fellows" part="04715" size="A4" _description="CD Labels">
     <Meta category="label"/>
-    <Label-rectangle id="0" width="198.425pt" height="94.3937pt" round="0pt" x_waste="0pt" y_waste="0pt">
-      <Markup-margin size="0pt"/>
-      <Layout nx="3" ny="8" x0="0pt" y0="43.3701pt" dx="198.425pt" dy="94.3937pt"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="2" x0="133.2pt" y0="50.4pt" dx="244.276pt" dy="363.6pt"/>
+    </Label-cd>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Geha                      -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- =================================================================== -->
+  <!-- Geha Z53.  Address Labels.                                     	   -->
+  <!-- =================================================================== -->
+  <Template brand="Geha" part="Z53" size="A4" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30767"/>
+    <Label-rectangle id="0" width="99.1mm" height="38.1mm" round="0.2mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="2" ny="7" x0="3mm" y0="15.9mm" dx="101.6mm" dy="38.1mm"/>
     </Label-rectangle>
   </Template>
 
 
-  <!-- ===================================================================-->
-  <!-- Data Becker CD/DVD Labels (face only), 2 per sheet                 -->
-  <!-- ===================================================================-->
-  <Template brand="DataBecker" part="0335" size="A4" _description="CD/DVD Labels Standard Format (face only)">
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Hema                      -->
+  <!--                           -->
+  <!-- ************************* -->
+  <!-- TODO: Is this a typo of "Herma?" -->
+
+  <!-- =================================================================== -->
+  <!-- Hema Etiketten: 65 x 38 mm, 21 per sheet                            -->
+  <!-- =================================================================== -->
+  <!-- TODO: What is the actual part #? -->
+  <Template brand="Hema" part="Etiketten" size="A4" _description="Rectangular Labels">
     <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-cd id="0" radius="164.409" hole="58.1102" waste="5">
+    <Label-rectangle id="0" width="178" height="108" round="5">
       <Markup-margin size="5"/>
-      <Layout nx="1" ny="2" x0="133.228" y0="46.7716" dx="0" dy="419.527"/>
-    </Label-cd>
-    <Alias brand="DataBecker" part="0368"/>
+      <Layout nx="3" ny="7" x0="20" y0="49.890" dx="187" dy="107"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Impact                    -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- ============================================================ -->
+  <!-- Impact LC33 Family: Rectangular Labels                       -->
+  <!-- ============================================================ -->
+  <Template brand="Impact" part="LC33" size="A4" description="Rectangular Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="70mm" height="25mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3mm"/>
+      <Layout nx="3" ny="11" x0="0mm" y0="10mm" dx="70mm" dy="25mm"/>
+    </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- LeLabel                   -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- ===================================================================-->
   <!-- LeLabel 2001.018 CD/DVD Labels, 1 per sheet                        -->
   <!-- ===================================================================-->
@@ -237,16 +456,12 @@
     </Label-cd>
   </Template>
 
-  <!-- ===================================================================-->
-  <!-- Viking 02204 Etiketten, 21 per sheet                               -->
-  <!-- ===================================================================-->
-  <Template brand="Viking" part="02204" size="A4" _description="Etiketten">
-    <Meta category="label"/>
-    <Label-rectangle id="0" width="198" height="120" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="3" ny="7" x0="0" y0="0" dx="198" dy="120"/>
-    </Label-rectangle>
-  </Template>
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Media Line                -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- ===================================================================-->
   <!-- Media Line CD/DVD Labels (face only), 2 per sheet                  -->
@@ -260,44 +475,54 @@
     </Label-cd>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Neato                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- ===================================================================-->
-  <!-- Encre.com Business Cards, 10 per sheet                             -->
+  <!-- Neato brand CD/DVD Labels (face only), 2 per sheet                 -->
   <!-- ===================================================================-->
-  <Template brand="Encre.com" part="BCV10" size="A4" _description="Business Cards">  
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="243.78" height="153.07">  
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Neato" part="A4 CD" size="A4" _description="CD/DVD Labels (face only)">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="48.19" y0="42.50" dx="255.12" dy="157.32"/>  
-    </Label-rectangle> 
+      <Layout nx="1" ny="2" x0="125" y0="68.890" dx="0" dy="360"/>        
+    </Label-cd>                                                      
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Poundland                 -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Celcast IJ37: Fridge magnet (stickers), 52 x 90 mm, 10 per sheet    -->
+  <!-- Poundland 30 Labels.                                                -->
   <!-- =================================================================== -->
-  <Template brand="Celcast" part="IJ37" size="A4" _description="Fridge Magnet Stickers">
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Poundland" part="30" size="A4" _description="Labels">
     <Meta category="label"/>
-    <Label-rectangle id="0" width="255" height="147.5" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="43" y0="52.7" dx="255" dy="147.5"/>
+    <Label-rectangle id="0" width="184.252pt" height="72pt" round="8.50394pt" x_waste="4.25197pt" y_waste="0pt">
+      <Markup-margin size="7.08661pt"/>
+      <Layout nx="3" ny="10" x0="4.25197pt" y0="62.3622pt" dx="201.26pt" dy="72pt"/>
     </Label-rectangle>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- CD STOMPER PRO CD Label Refills, (Face Only) ISO Version            -->
-  <!-- =================================================================== -->
-  <Template brand="Stomper" part="PRO A4" size="A4" _description="PRO CD Labels 2-up (face only)">
-    <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-cd id="0" radius="166.5" hole="58" waste="10">
-      <Markup-margin size="5"/>
-      <Layout nx="1" ny="1" x0="34.5" y0="47" dx="0" dy="0"/>
-      <Layout nx="1" ny="1" x0="223" y0="459" dx="0" dy="0"/>
-    </Label-cd>
-  </Template>
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Pressit                   -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Pressit CD Labels/                                                  -->
+  <!-- Pressit CD Labels.                                                  -->
   <!-- =================================================================== -->
   <Template brand="Pressit" part="50blank" size="A4" _description="CD Labels">
     <Meta category="label"/>
@@ -309,6 +534,49 @@
     </Label-cd>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Russian                   -->
+  <!--                           -->
+  <!-- ************************* -->
+  <!-- TODO: Is this the actual vendor? Or is this a generic for multiple
+       vendors? -->
+
+  <!-- =================================================================== -->
+  <!-- Russian A3 5x9 Business Cards.                                      -->
+  <!-- =================================================================== -->
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Russian" part="A3 5x9" size="A3" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="90mm" height="50mm" round="0">
+      <Markup-margin size="5pt"/>
+      <Layout nx="3" ny="8" x0="14mm" y0="10mm" dx="90mm" dy="50mm"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- =================================================================== -->
+  <!-- Russian A4 5x9 Business Cards.                                      -->
+  <!-- =================================================================== -->
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Russian" part="A4 5x9" size="A4" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="50mm" height="90mm" round="0">
+      <Markup-margin size="5pt"/>
+      <Layout nx="4" ny="3" x0="5mm" y0="13mm" dx="50mm" dy="90mm"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Ryman                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- Ryman P14 Universal labels.                                         -->
   <!-- =================================================================== -->
@@ -320,9 +588,11 @@
     </Label-rectangle>
   </Template>
 
+
   <!-- =================================================================== -->
   <!-- Ryman Standard CD/DVD Labels.                                       -->
   <!-- =================================================================== -->
+  <!-- Is this the actual part #? -->
   <Template brand="Ryman" part="Standard CD/DVD" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -332,6 +602,7 @@
     </Label-cd>
   </Template>
 
+
   <!-- =================================================================== -->
   <!-- Ryman 0215016061 CD/DVD Labels.                                     -->
   <!-- =================================================================== -->
@@ -344,91 +615,84 @@
     </Label-cd>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Sanwa                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Fellows 04715 CD/DVD Labels (Face only).                            -->
+  <!-- Sanwa LB-CDRJP.  CD Labels.                                         -->
   <!-- =================================================================== -->
-  <Template brand="Fellows" part="04715" size="A4" _description="CD Labels">
+  <Template brand="Sanwa" part="LB-CDRJP" size="A4" _description="CD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
+    <Label-cd id="0" radius="167.244pt" hole="34.0pt" waste="9pt">
       <Markup-margin size="9pt"/>
-      <Layout nx="1" ny="2" x0="133.2pt" y0="50.4pt" dx="244.276pt" dy="363.6pt"/>
+      <Layout nx="1" ny="2" x0="29.1969pt" y0="70.8661pt" dx="352.488pt" dy="367.087pt"/>
     </Label-cd>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Sigel                     -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Staples EU Business Cards Supreme.                                  -->
+  <!-- Sigel LP 800/LP 801/LP 802: Business Cards, 55.0 x 85.0 mm          -->
   <!-- =================================================================== -->
-  <Template brand="Staples" part="EU BC Supreme" size="A4" _description="Business Cards">
+  <Template brand="Sigel" part="LP 800" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
-    <Label-rectangle id="0" width="240.945pt" height="155.906pt" round="0pt" x_waste="0pt" y_waste="0pt">
-      <Markup-margin size="9.07087pt"/>
-      <Layout nx="1" ny="5" x0="42.5197pt" y0="28.3465pt" dx="240.945pt" dy="155.906pt"/>
-      <Layout nx="1" ny="5" x0="311.811pt" y0="28.3465pt" dx="240.945pt" dy="155.906pt"/>
+    <Label-rectangle id="0" width="85.0mm" height="55.0mm" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="2" ny="5" x0="15.0mm" y0="10.0mm" dx="95.0mm" dy="55.0mm"/>
     </Label-rectangle>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- Connect KF10647 Mailing Labels..                                    -->
-  <!-- =================================================================== -->
-  <Template brand="Connect" part="KF10647" size="A4" _description="Mailing Labels">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="198.425pt" height="104.882pt" round="0pt" x_waste="0pt" y_waste="0pt">
-      <Markup-margin size="9pt"/>
-      <Layout nx="3" ny="8" x0="7.86772e-17pt" y0="11.3386pt" dx="198.425pt" dy="104.882pt"/>
-    </Label-rectangle>
-  </Template>
+  <Template brand="Sigel" part="LP 801" equiv="LP 800"/>
+  <Template brand="Sigel" part="LP 802" equiv="LP 800"/>
+
 
   <!-- =================================================================== -->
-  <!-- Poundland 30 Labels.                                                -->
+  <!-- Sigel DP 830/DP 930: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
   <!-- =================================================================== -->
-  <Template brand="Poundland" part="30" size="A4" _description="Labels">
-    <Meta category="label"/>
-    <Label-rectangle id="0" width="184.252pt" height="72pt" round="8.50394pt" x_waste="4.25197pt" y_waste="0pt">
-      <Markup-margin size="7.08661pt"/>
-      <Layout nx="3" ny="10" x0="4.25197pt" y0="62.3622pt" dx="201.26pt" dy="72pt"/>
+  <Template brand="Sigel" part="DP 830" size="A4" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="240.9" height="155.9" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="2" ny="5" x0="40" y0="31" dx="269" dy="156"/>
     </Label-rectangle>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- Sanwa LB-CDRJP.  CD Labels.                                         -->
-  <!-- =================================================================== -->
-  <Template brand="Sanwa" part="LB-CDRJP" size="A4" _description="CD Labels">
-    <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-cd id="0" radius="167.244pt" hole="34.0pt" waste="9pt">
-      <Markup-margin size="9pt"/>
-      <Layout nx="1" ny="2" x0="29.1969pt" y0="70.8661pt" dx="352.488pt" dy="367.087pt"/>
-    </Label-cd>
-  </Template>
+  <Template brand="Sigel" part="DP 930" equiv="DP 830"/>
 
-  <!-- =================================================================== -->
-  <!-- Bruna 241301.  Mailing Labels.                                      -->
-  <!-- =================================================================== -->
-  <Template brand="Bruna" part="241301" size="A4" _description="Mailing Labels">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="198.425pt" height="102.047pt" round="0pt" x_waste="0pt" y_waste="0pt">
-      <Markup-margin size="9pt"/>
-      <Layout nx="3" ny="8" x0="0pt" y0="0pt" dx="198.425pt" dy="102.047pt"/>
-    </Label-rectangle>
-  </Template>
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Staples                   -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Geha Z53.  Address Labels.                                     	   -->
+  <!-- Staples EU Business Cards Supreme.                                  -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z53" size="A4" _description="Address Labels">
-    <Meta category="label"/>
-    <Meta category="rectangle-label"/>
-    <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30767"/>
-    <Label-rectangle id="0" width="99.1mm" height="38.1mm" round="0.2mm" x_waste="0mm" y_waste="0mm">
-      <Markup-margin size="3.2mm"/>
-      <Layout nx="2" ny="7" x0="3mm" y0="15.9mm" dx="101.6mm" dy="38.1mm"/>
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Staples" part="EU BC Supreme" size="A4" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="240.945pt" height="155.906pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="9.07087pt"/>
+      <Layout nx="1" ny="5" x0="42.5197pt" y0="28.3465pt" dx="240.945pt" dy="155.906pt"/>
+      <Layout nx="1" ny="5" x0="311.811pt" y0="28.3465pt" dx="240.945pt" dy="155.906pt"/>
     </Label-rectangle>
   </Template>
 
+
   <!-- =================================================================== -->
   <!-- Staples STAP14 Mailing Labels.                                      -->
   <!-- =================================================================== -->
@@ -441,66 +705,42 @@
     </Label-rectangle>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- Best Office Self-adhesive labels.                                   -->
-  <!-- =================================================================== -->
-  <Template brand="Best Office" part="75753" size="A4" _description="Self-adhesive labels">
-    <Meta category="label"/>
-    <Meta category="rectangle-label"/>
-    <Label-rectangle id="0" width="70mm" height="36mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Markup-margin size="3.2mm"/>
-      <Layout nx="3" ny="8" x0="0mm" y0="4mm" dx="70mm" dy="36mm"/>
-    </Label-rectangle>
-  </Template>
 
-  <!-- ******************************************************************** -->
-  <!-- Misc. A6 products.                                                   -->
-  <!-- ******************************************************************** -->
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Stomper                   -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- EPSON Photo Stickers, 17 x 24 mm, 16 per sheet                      -->
+  <!-- CD STOMPER PRO CD Label Refills, (Face Only) ISO Version            -->
   <!-- =================================================================== -->
-  <Template brand="Epson" part="S041144" size="A6" _description="EPSON Photo Stickers 16">
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Stomper" part="PRO A4" size="A4" _description="PRO CD Labels 2-up (face only)">
     <Meta category="label"/>
-    <Label-rectangle id="0" width="48" height="68" round="7">
+    <Meta category="media"/>
+    <Label-cd id="0" radius="166.5" hole="58" waste="10">
       <Markup-margin size="5"/>
-      <Layout nx="4" ny="4" x0="33" y0="59" dx="59.5" dy="79.5"/>
-    </Label-rectangle>
-  </Template>
-
-
-  <!-- ============================================================ -->
-  <!-- Impact LC33 Family: Rectangular Labels                       -->
-  <!-- ============================================================ -->
-  <Template brand="Impact" part="LC33" size="A4" description="Rectangular Labels">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="70mm" height="25mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Markup-margin size="3mm"/>
-      <Layout nx="3" ny="11" x0="0mm" y0="10mm" dx="70mm" dy="25mm"/>
-    </Label-rectangle>
+      <Layout nx="1" ny="1" x0="34.5" y0="47" dx="0" dy="0"/>
+      <Layout nx="1" ny="1" x0="223" y0="459" dx="0" dy="0"/>
+    </Label-cd>
   </Template>
 
 
-  <!-- ******************************************************************** -->
-  <!-- Templates for A4 and A3 media, size 50 x 90 mm                       -->
-  <!-- ******************************************************************** -->
-  
-  <Template brand="Russian" part="A3 5x9" size="A3" _description="Business Cards">
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="90mm" height="50mm" round="0">
-      <Markup-margin size="5pt"/>
-      <Layout nx="3" ny="8" x0="14mm" y0="10mm" dx="90mm" dy="50mm"/>
-    </Label-rectangle>
-  </Template>
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Viking                    -->
+  <!--                           -->
+  <!-- ************************* -->
 
-  <Template brand="Russian" part="A4 5x9" size="A4" _description="Business Cards">
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="50mm" height="90mm" round="0">
-      <Markup-margin size="5pt"/>
-      <Layout nx="4" ny="3" x0="5mm" y0="13mm" dx="50mm" dy="90mm"/>
+  <!-- ===================================================================-->
+  <!-- Viking 02204 Etiketten, 21 per sheet                               -->
+  <!-- ===================================================================-->
+  <Template brand="Viking" part="02204" size="A4" _description="Etiketten">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="198" height="120" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="3" ny="7" x0="0" y0="0" dx="198" dy="120"/>
     </Label-rectangle>
   </Template>
 
diff --git a/templates/misc-other-templates.xml b/templates/misc-other-templates.xml
index 00f385c7..19197fab 100644
--- a/templates/misc-other-templates.xml
+++ b/templates/misc-other-templates.xml
@@ -3,6 +3,17 @@
 <Glabels-templates>
 
 
+  <!-- ******************************************************************** -->
+  <!-- Misc. non-standard sized products.                                   -->
+  <!-- ******************************************************************** -->
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- OfficeMax                 -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- OfficeMax 86112: Multi-Purpose Labels, 2'' x 4'', 3 per sheet       -->
   <!-- =================================================================== -->
diff --git a/templates/misc-us-templates.xml b/templates/misc-us-templates.xml
index 2a588848..98db2ebf 100644
--- a/templates/misc-us-templates.xml
+++ b/templates/misc-us-templates.xml
@@ -5,123 +5,102 @@
 
 
   <!-- ******************************************************************** -->
-  <!-- Misc. US-Letter products.                                            -->
+  <!-- Misc. US sized products.                                             -->
   <!-- ******************************************************************** -->
 
-  <!-- =================================================================== -->
-  <!-- Southworth BC: Business Cards, 2'' x 3_1/2'', 10 per sheet          -->
-  <!-- =================================================================== -->
-  <Template brand="Southworth" part="BC" size="US-Letter" _description="Business Cards">
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="252" height="144" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="2" ny="5" x0="36" y0="36" dx="288" dy="144"/>
-    </Label-rectangle>
-  </Template>
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Great Gizmos              -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Memorex CD Labels                                                 * -->
+  <!-- Great Gizmos : CD/DVD Labels (face only), 2 per sheet             * -->
   <!-- =================================================================== -->
-  <Template brand="Memorex" part="CD Labels" size="US-Letter" _description="CD/DVD Labels">
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Great Gizmos" part="CD/DVD" size="US-Letter"
+          _description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
-      <Layout nx="1" ny="1" x0="40.5" y0="45" dx="0" dy="0"/>
-      <Layout nx="1" ny="1" x0="238.5" y0="414" dx="0" dy="0"/>
+      <Layout nx="1" ny="2" x0="139.5" y0="42.52" dx="0" dy="374.17"/>
     </Label-cd>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Imation-SoniX             -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Neato USCD2lbl.NTT: CD/DVD Labels (face only), 2 per sheet          -->
+  <!-- Imation-SoniX CD/DVD Labels  (Face Only)                          * -->
   <!-- =================================================================== -->
-  <Template brand="Neato" part="USCD2lbl.NTT" size="US-Letter"
-         _description="CD/DVD Labels (face only)">
+  <Template brand="Imation-SoniX" part="No.5112 15954" size="US-Letter"
+         _description="CD/DVD Labels (Face Only)">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-cd id="0" radius="166.5" hole="58.5" waste="9">
+    <Label-cd id="0" radius="167.8" hole="18.5" waste="5">
       <Markup-margin size="5"/>
-      <Layout nx="1" ny="2" x0="139.5" y0="49.5" dx="0" dy="360"/>
+      <Layout nx="1" ny="1" x0="40.5" y0="370" dx="0" dy="0"/>
     </Label-cd>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Kingdom                   -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
-  <!-- Neato USCD2lbl.NTT: CD/DVD Labels (rectangles), 2 per sheet         -->
+  <!-- Kingdom L Cassette Labels, 12 per sheet.                            -->
   <!-- =================================================================== -->
-  <Template brand="Neato" part="USCD2lbl Rectangles" size="US-Letter"
-	 _description="CD Template Rectangles">
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Kingdom" part="L" size="US-Letter" _description="Cassette Labels">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-rectangle id="0" width="77.04" height="234.36" round="10">
-      <Markup-margin size="2.016"/>
-      <Layout nx="2" ny="1" x0="51.3" y0="279.72" dx="433.44" dy="0"/>
+    <Label-rectangle id="0" width="252pt" height="117pt" round="9pt" x_waste="2.376pt" y_waste="2.376pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="2" ny="6" x0="33.12pt" y0="27pt" dx="261pt" dy="126.144pt"/>
     </Label-rectangle>
   </Template>
 
-  <!-- =================================================================== -->
-  <!-- Neato CLP-192328/26: HandiCD-R 50MB, 3" x 2_1/8'', 9 per sheet      -->
-  <!-- =================================================================== -->
-  <Template brand="Neato" part="HandiCD-R" size="US-Letter"
-	 _description="Business Card CD">
-    <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-cd id="0" radius="108" width="171" hole="58" waste="5">
-      <Markup-margin size="5"/>
-      <Layout nx="3" ny="3" x0="36.5" y0="54" dx="184.5" dy="234"/>
-    </Label-cd>
-  </Template>
 
-  <!-- =================================================================== -->
-  <!-- Neato 69143: Jewel Case Booklet                                     -->
-  <!-- =================================================================== -->
-  <Template brand="Neato" part="69143" size="US-Letter" _description="Jewel Case Booklet">
-    <Meta category="media"/>
-    <Label-rectangle id="0" width="4.75in" height="9.5in" round="0in" x_waste="0in" y_waste="0in">
-      <Markup-margin size="0.125in"/>
-      <Markup-line x1="0in" y1="4.75in" x2="4.75in" y2="4.75in"/>
-      <Layout nx="1" ny="1" x0="1.875in" y0="0.75in" dx="4.75in" dy="9.5in"/>
-    </Label-rectangle>
-  </Template>
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Memorex                   -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- CD STOMPER PRO CD Label Refills, (Face Only)                      * -->
+  <!-- Memorex CD Labels                                                 * -->
   <!-- =================================================================== -->
-  <Template brand="Stomper" part="PRO CD" size="US-Letter"
-         _description="PRO CD Labels 2-up (face only)">
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Memorex" part="CD Labels" size="US-Letter" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
       <Markup-margin size="5"/>
-      <Layout nx="1" ny="1" x0="34" y0="43" dx="0" dy="0"/>
-      <Layout nx="1" ny="1" x0="245" y0="416" dx="0" dy="0"/>
+      <Layout nx="1" ny="1" x0="40.5" y0="45" dx="0" dy="0"/>
+      <Layout nx="1" ny="1" x0="238.5" y0="414" dx="0" dy="0"/>
     </Label-cd>
   </Template>
 
-  <Template brand="Stomper" part="PRO Zip" size="US-Letter"
-         _description="PRO CD Labels 2-up (Face only)">
-    <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-rectangle id="0" width="168" height="142" round="0">
-      <Markup-margin size="5"/>
-      <Layout nx="1" ny="2" x0="407" y0="68" dx="0" dy="142"/>
-      <Layout nx="1" ny="2" x0="37" y0="440" dx="0" dy="142"/>
-    </Label-rectangle>
-  </Template>
 
-  <Template brand="Stomper" part="PRO Spine" size="US-Letter"
-         _description="PRO CD Labels 2-up (CD spine only)">
-    <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-rectangle id="0" width="288" height="20" round="0">
-      <Markup-margin size="2"/>
-      <Layout nx="2" ny="1" x0="18" y0="385" dx="288" dy="0"/>
-    </Label-rectangle>
-  </Template>
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Meritline                 -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- ===================================================================-->
   <!-- Meritline Mini CD/DVD Labels (face only), 5 per sheet              -->
   <!-- ===================================================================-->
+  <!-- TODO: Is this the actual part #? -->
   <Template brand="Meritline" part="Mini-CD" size="US-Letter" _description="Mini-CD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -132,6 +111,15 @@
     </Label-cd>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Neato                     -->
+  <!--                           -->
+  <!-- ************************* -->
+  <!-- TODO: None of the Neato part #s do not seem to follow a consistent
+       pattern.  What are the actual part #s of these items. -->
+
   <!-- ===================================================================-->
   <!-- Neato Slimline CD Jewel Case Insert, 2 per sheet.                  -->
   <!-- Left margin area is CD spine; ignore other margins.                -->
@@ -157,67 +145,87 @@
     </Label-rectangle>
   </Template>
 
+
   <!-- =================================================================== -->
-  <!-- Great Gizmos : CD/DVD Labels (face only), 2 per sheet             * -->
+  <!-- Neato USCD2lbl.NTT: CD/DVD Labels (face only), 2 per sheet          -->
   <!-- =================================================================== -->
-  <Template brand="Great Gizmos" part="CD/DVD" size="US-Letter"
-          _description="CD/DVD Labels (face only)">
+  <Template brand="Neato" part="USCD2lbl.NTT" size="US-Letter"
+         _description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="9">
       <Markup-margin size="5"/>
-      <Layout nx="1" ny="2" x0="139.5" y0="42.52" dx="0" dy="374.17"/>
+      <Layout nx="1" ny="2" x0="139.5" y0="49.5" dx="0" dy="360"/>
     </Label-cd>
   </Template>
 
+
   <!-- =================================================================== -->
-  <!-- Imation-SoniX CD/DVD Labels  (Face Only)                          * -->
+  <!-- Neato USCD2lbl.NTT: CD/DVD Labels (rectangles), 2 per sheet         -->
   <!-- =================================================================== -->
-  <Template brand="Imation-SoniX" part="No.5112 15954" size="US-Letter"
-         _description="CD/DVD Labels (Face Only)">
+  <Template brand="Neato" part="USCD2lbl Rectangles" size="US-Letter"
+	 _description="CD Template Rectangles">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-cd id="0" radius="167.8" hole="18.5" waste="5">
-      <Markup-margin size="5"/>
-      <Layout nx="1" ny="1" x0="40.5" y0="370" dx="0" dy="0"/>
-    </Label-cd>
+    <Label-rectangle id="0" width="77.04" height="234.36" round="10">
+      <Markup-margin size="2.016"/>
+      <Layout nx="2" ny="1" x0="51.3" y0="279.72" dx="433.44" dy="0"/>
+    </Label-rectangle>
   </Template>
 
+
   <!-- =================================================================== -->
-  <!-- Netc Label Stock: DLT Labels, (www.netclabels.com), 30 per sheet    -->
+  <!-- Neato CLP-192328/26: HandiCD-R 50MB, 3" x 2_1/8'', 9 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Netc" part="749303-70001 " size="US-Letter" _description="DLT Labels">
+  <Template brand="Neato" part="HandiCD-R" size="US-Letter"
+	 _description="Business Card CD">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-rectangle id="0" width="162" height="59.4" round="0">
-      <Markup-margin size="18"/>
-      <Layout nx="3" ny="10" x0="36" y0="45" dx="189" dy="72"/>
-    </Label-rectangle>
+    <Label-cd id="0" radius="108" width="171" hole="58" waste="5">
+      <Markup-margin size="5"/>
+      <Layout nx="3" ny="3" x0="36.5" y0="54" dx="184.5" dy="234"/>
+    </Label-cd>
   </Template>
 
+
   <!-- =================================================================== -->
-  <!-- Tough-Tags TTLW-2016 Microtube labels, 85 per sheet.                -->
+  <!-- Neato 69143: Jewel Case Booklet                                     -->
   <!-- =================================================================== -->
-  <Template brand="Tough-Tags" part="TTLW-2016" size="US-Letter" _description="Microtube labels">
-    <Meta category="label"/>
-    <Label-rectangle id="0" width="92.16" height="36" round="5">
-      <Markup-margin size="5"/>
-      <Layout nx="5" ny="17" x0="68" y0="4.17" dx="100.8" dy="45.3"/>
+  <Template brand="Neato" part="69143" size="US-Letter" _description="Jewel Case Booklet">
+    <Meta category="media"/>
+    <Label-rectangle id="0" width="4.75in" height="9.5in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Markup-line x1="0in" y1="4.75in" x2="4.75in" y2="4.75in"/>
+      <Layout nx="1" ny="1" x0="1.875in" y0="0.75in" dx="4.75in" dy="9.5in"/>
     </Label-rectangle>
-  </Template> 
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Netc                      -->
+  <!--                           -->
+  <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Kingdom L Cassette Labels, 12 per sheet.                            -->
+  <!-- Netc Label Stock: DLT Labels, (www.netclabels.com), 30 per sheet    -->
   <!-- =================================================================== -->
-  <Template brand="Kingdom" part="L" size="US-Letter" _description="Cassette Labels">
+  <Template brand="Netc" part="749303-70001 " size="US-Letter" _description="DLT Labels">
     <Meta category="label"/>
     <Meta category="media"/>
-    <Label-rectangle id="0" width="252pt" height="117pt" round="9pt" x_waste="2.376pt" y_waste="2.376pt">
-      <Markup-margin size="9pt"/>
-      <Layout nx="2" ny="6" x0="33.12pt" y0="27pt" dx="261pt" dy="126.144pt"/>
+    <Label-rectangle id="0" width="162" height="59.4" round="0">
+      <Markup-margin size="18"/>
+      <Layout nx="3" ny="10" x0="36" y0="45" dx="189" dy="72"/>
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- OfficeMax                 -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- OfficeMax OM99060 Mailing Labels.                                   -->
   <!-- =================================================================== -->
@@ -230,6 +238,13 @@
     </Label-rectangle>
   </Template>
 
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Online Labels             -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- Online Labels OL1025 Round Labels.                                  -->
   <!-- =================================================================== -->
@@ -243,6 +258,32 @@
   </Template>
 
 
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Southworth                -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- =================================================================== -->
+  <!-- Southworth BC: Business Cards, 2'' x 3_1/2'', 10 per sheet          -->
+  <!-- =================================================================== -->
+  <!-- TODO: Is this the actual part #? -->
+  <Template brand="Southworth" part="BC" size="US-Letter" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="252" height="144" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="2" ny="5" x0="36" y0="36" dx="288" dy="144"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Staples                   -->
+  <!--                           -->
+  <!-- ************************* -->
+
   <!-- =================================================================== -->
   <!-- Staples 598385 CD/DVD Labels.                                       -->
   <!-- =================================================================== -->
@@ -256,6 +297,74 @@
   </Template>
 
 
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Stomper                   -->
+  <!--                           -->
+  <!-- ************************* -->
+  <!-- TODO: Are these the actual part #s? -->
+
+  <!-- =================================================================== -->
+  <!-- CD STOMPER PRO CD Label Refills, (Face Only)                      * -->
+  <!-- =================================================================== -->
+  <Template brand="Stomper" part="PRO CD" size="US-Letter"
+         _description="PRO CD Labels 2-up (face only)">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
+      <Markup-margin size="5"/>
+      <Layout nx="1" ny="1" x0="34" y0="43" dx="0" dy="0"/>
+      <Layout nx="1" ny="1" x0="245" y0="416" dx="0" dy="0"/>
+    </Label-cd>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- CD STOMPER PRO Zip Label Refills.                                 * -->
+  <!-- =================================================================== -->
+  <Template brand="Stomper" part="PRO Zip" size="US-Letter"
+         _description="PRO CD Labels 2-up (Face only)">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-rectangle id="0" width="168" height="142" round="0">
+      <Markup-margin size="5"/>
+      <Layout nx="1" ny="2" x0="407" y0="68" dx="0" dy="142"/>
+      <Layout nx="1" ny="2" x0="37" y0="440" dx="0" dy="142"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- CD STOMPER PRO Spine Label Refills.                               * -->
+  <!-- =================================================================== -->
+  <Template brand="Stomper" part="PRO Spine" size="US-Letter"
+         _description="PRO CD Labels 2-up (CD spine only)">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-rectangle id="0" width="288" height="20" round="0">
+      <Markup-margin size="2"/>
+      <Layout nx="2" ny="1" x0="18" y0="385" dx="288" dy="0"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Tough-Tags                -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- =================================================================== -->
+  <!-- Tough-Tags TTLW-2016 Microtube labels, 85 per sheet.                -->
+  <!-- =================================================================== -->
+  <Template brand="Tough-Tags" part="TTLW-2016" size="US-Letter" _description="Microtube labels">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="92.16" height="36" round="5">
+      <Markup-margin size="5"/>
+      <Layout nx="5" ny="17" x0="68" y0="4.17" dx="100.8" dy="45.3"/>
+    </Label-rectangle>
+  </Template> 
+
+
+
 </Glabels-templates>
 
 
-- 
2.39.5