From 3443fab8149c9296b35a884b7f0f0554c18b1eef Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 17 Apr 2016 22:39:24 -0400
Subject: [PATCH] Imported latest label database from Gtk version.

---
 templates/avery-iso-templates.xml      |  13 +
 templates/begalabel-templates.xml      | 546 +++++++++++++++++++++++++
 templates/brother-other-templates.xml  |  74 +++-
 templates/cablelabel-templates.xml     |  32 ++
 templates/canon-other-templates.xml    |  23 ++
 templates/categories.xml               |   8 +-
 templates/dymo-other-templates.xml     | 212 ++++++++--
 templates/endisch-templates.xml        |   4 +-
 templates/mayspies-templates.xml       |  12 +
 templates/misc-iso-templates.xml       |   9 +
 templates/rayfilm-templates.xml        |   8 +-
 templates/sheetlabels-us-templates.xml | 288 ++++++++++++-
 templates/vendors.xml                  | 100 ++---
 templates/zweckform-iso-templates.xml  |  38 +-
 14 files changed, 1239 insertions(+), 128 deletions(-)
 create mode 100644 templates/begalabel-templates.xml
 create mode 100644 templates/cablelabel-templates.xml
 create mode 100644 templates/canon-other-templates.xml
 create mode 100644 templates/mayspies-templates.xml

diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml
index 9083776..80a0fb4 100644
--- a/templates/avery-iso-templates.xml
+++ b/templates/avery-iso-templates.xml
@@ -12,6 +12,19 @@
   <!-- ******************************************************************** -->
 
 
+  <!-- =================================================================== -->
+  <!-- Avery L4730 family: Mini Labels                          -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="L4730" size="A4" _description="Mini Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="17.8mm" height="10mm" round="1.6mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="10" ny="27" x0="6mm" y0="13mm" dx="20.3mm" dy="10mm"/>
+    </Label-rectangle>
+  </Template>
+
+
   <!-- =================================================================== -->
   <!-- Avery L4732 family: Mini Labels                                     -->
   <!-- =================================================================== -->
diff --git a/templates/begalabel-templates.xml b/templates/begalabel-templates.xml
new file mode 100644
index 0000000..b0189b2
--- /dev/null
+++ b/templates/begalabel-templates.xml
@@ -0,0 +1,546 @@
+<?xml version="1.0"?>
+<Glabels-templates>
+
+  <Template brand="Begalabel" part="RC-50" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/1-1-2-x-1-Rounded-Corner-Label-p15.html"/>
+    <Label-rectangle id="0" width="1.5in" height="1in" round="0.1in" x_waste="0.05in">
+      <Layout nx="5" ny="10" x0="0.25in" y0="0.5in" dx="1.625in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-150" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/1-1-4-x-2-3-8-Address-Labels-Media-Labels-p17.html"/>
+    <Label-rectangle id="0" width="2.375in" height="1.25in" round="0.125in" x_waste="0.05in" y_waste="0.05in">
+      <Layout nx="3" ny="6" x0="0.375in" y0="1.125in" dx="2.66in" dy="1.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-200" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/1-3-4-x-1-1-4-Barcode-Labels-Media-Labels-p18.html"/>
+    <Label-rectangle id="0" width="1.75in" height="1.25in" round="0.125in" x_waste="0.05in">
+      <Layout nx="4" ny="8" x0="0.4687in" y0="0.5in" dx="1.9375in" dy="1.25in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-250" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/1-3-4-x-1-2-Return-Address-Labels-Mailing-Labels-p19.html"/>
+    <Label-rectangle id="0" width="1.75in" height="0.5in" round="0.05in" x_waste="0.05in">
+      <Layout nx="4" ny="20" x0="0.25in" y0="0.5in" dx="2.0625in" dy="0.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-300" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/2-1-4-x-3-4-Address-Labels-Mailing-Labels-p20.html"/>
+    <Label-rectangle id="0" width="2.25in" height="0.75in" round="0.095in" waste="0.05in">
+      <Layout nx="3" ny="10" x0="0.375in" y0="0.625in" dx="2.75in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-350" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/2-5-8-x-1-Address-Labels-Mailing-Labels-p7.html"/>
+    <Label-rectangle id="0" width="2.625in" height="1in" round="0.125in" x_waste="0.05in">
+      <Layout nx="3" ny="10" x0="0.1875in" y0="0.5in" dx="2.75in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-400" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/2-5-8-x-1-1-16-Rounded-Corner-Label-p21.html"/>
+    <Label-rectangle id="0" width="2.625in" height="1.0625in" round="0.07in" x_waste="0.05in">
+      <Layout nx="3" ny="10" x0="0.125in" y0="0.1875in" dx="2.8125in" dy="1.0625in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-450" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-1-2-x-5-Shipping-Labels-Address-Labels-p22.html"/>
+    <Label-rectangle id="0" width="3.5in" height="5in" round="0.1in" x_waste="0.05in">
+      <Layout nx="2" ny="2" x0="0.5in" y0="0.5in" dx="4in" dy="5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-500" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-3-4-x-1-1-4-Address-Labels-Shipping-Labels-p23.html"/>
+    <Label-rectangle id="0" width="3.75in" height="1.25in" round="0.125in" waste="0.05in">
+      <Layout nx="2" ny="6" x0="0.375in" y0="1.125in" dx="4in" dy="1.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-550" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-3-4-x-2-Shipping-Labels-Address-Labels-p24.html"/>
+    <Label-rectangle id="0" width="3.75in" height="2in" round="0.125in" waste="0.05in">
+      <Layout nx="2" ny="4" x0="0.375in" y0="1.125in" dx="4in" dy="2.25in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-600" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-3-4-x-3-Shipping-Labels-Address-Labels-p25.html"/>
+    <Label-rectangle id="0" width="3.75in" height="3in" round="0.095in" waste="0.05in">
+      <Layout nx="2" ny="3" x0="0.375in" y0="0.625in" dx="4in" dy="3.375in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-650" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-3-4-x-4-3-4-Shipping-Labels-Address-Labels-p26.html"/>
+    <Label-rectangle id="0" width="3.75in" height="4.75in" round="0.095in" waste="0.05in">
+      <Layout nx="2" ny="2" x0="0.375in" y0="0.625in" dx="4in" dy="5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-700" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-3-8-x-2-1-3-Name-Badge-Labels-Name-Tag-Labels-p27.html"/>
+    <Label-rectangle id="0" width="3.375in" height="2.3333in" round="0.188in" waste="0.05in">
+      <Layout nx="2" ny="4" x0="0.6875in" y0="0.594in" dx="3.75in" dy="2.52083in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-750" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-7-16-x-15-16-Filing-Labels-File-Folder-Labels-p28.html"/>
+    <Label-rectangle id="0" width="3.4375in" height="0.9375in" round="0.095in" waste="0.05in">
+      <Layout nx="2" ny="9" x0="0.5in" y0="0.5in" dx="4.0625in" dy="1.1328in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-800" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-7-16-x-2-3-Filing-Labels-File-Folder-Labels-p29.html"/>
+    <Label-rectangle id="0" width="3.4375in" height="0.66667in" round="0.095in" x_waste="0.05in">
+      <Layout nx="2" ny="15" x0="0.5in" y0="0.5in" dx="4.0625in" dy="0.66667in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-850" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/-3-x-5-8-Filing-Labels-File-Folder-Labels-p30.html"/>
+    <Label-rectangle id="0" width="3in" height="0.625in" round="0.095in" x_waste="0.05in">
+      <Layout nx="2" ny="16" x0="0.8437in" y0="0.5in" dx="3.8125in" dy="0.625in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-900" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-4-x-2-Rounded-Corner-Label-p31.html"/>
+    <Label-rectangle id="0" width="0.75in" height="2in" round="0.132in" x_waste="0.04in" y_waste="0.05in">
+      <Layout nx="8" ny="5" x0="0.921875in" y0="0.25in" dx="0.8437in" dy="2.1562in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-950" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-x-1-Shipping-Labels-Address-Labels-p9.html"/>
+    <Label-rectangle id="0" width="4in" height="1in" round="0.064in" x_waste="0.05in">
+      <Layout nx="2" ny="10" x0="0.1875in" y0="0.5in" dx="4.125in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-1000" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-x-1-1-2-Shipping-Labels-Address-Labels-p32.html"/>
+    <Label-rectangle id="0" width="4in" height="1.5in" round="0.095in" x_waste="0.05in">
+      <Layout nx="2" ny="6" x0="0.1875in" y0="1in" dx="4.125in" dy="1.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-1050" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-x-1-1-3-Shipping-Labels-Address-Labels-p33.html"/>
+    <Label-rectangle id="0" width="4in" height="1.33333in" round="0.095in" x_waste="0.05in">
+      <Layout nx="2" ny="7" x0="0.1875in" y0="0.83333in" dx="4.125in" dy="1.33333in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-1100" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-x-2-Shipping-Labels-Address-Labels-p10.html"/>
+    <Label-rectangle id="0" width="4in" height="2in" round="0.19in" x_waste="0.05in">
+      <Layout nx="2" ny="5" x0="0.1875in" y0="0.5in" dx="4.125in" dy="2in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-1200" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-x-3-1-3-Shipping-Labels-Address-Labels-p35.html"/>
+    <Label-rectangle id="0" width="4in" height="3.33333in" round="0.16in" x_waste="0.05in">
+      <Layout nx="2" ny="3" x0="0.1875in" y0="0.5in" dx="4.125in" dy="3.33333in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-1225" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-x-3-9-16-Label-Rounded-Corner-Label-p72.html"/>
+    <Label-rectangle id="0" width="4in" height="3.5625in" round="0.07in" x_waste="0.04in">
+      <Layout nx="2" ny="3" x0="0.20315in" y0="0.15625in" dx="4.0937in" dy="3.5625in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-1240" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-x-5-Shipping-Labels-Mailing-Labels-p265.html"/>
+    <Label-rectangle id="0" width="4in" height="5in" round="0.11in" x_waste="0.05in">
+      <Layout nx="2" ny="2" x0="0.16667in" y0="0.5in" dx="4.16667in" dy="5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="RC-1250" size="US-Letter" _description="Rounded rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/8-1-8-x-5-Shipping-Labels-p36.html"/>
+    <Label-rectangle id="0" width="8.125in" height="5in" round="0.09in" x_waste="0.05in">
+      <Layout nx="1" ny="2" x0="0.1875in" y0="0.5in" dx="8.125in" dy="5in"/>
+    </Label-rectangle>
+  </Template>
+
+
+
+  <Template brand="Begalabel" part="AC-50" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/1-1-2-x-1-Label-Angled-Corner-p37.html"/>
+    <Label-rectangle id="0" width="1.5in" height="1in">
+      <Layout nx="5" ny="10" x0="0.5in" y0="0.5in" dx="1.5in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-100" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/1-1-2-x-1-2-Label-Angled-Corner-p38.html"/>
+    <Label-rectangle id="0" width="1.5in" height="0.5in">
+      <Layout nx="5" ny="20" x0="0.5in" y0="0.5in" dx="1.5in" dy="0.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-150" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/17-20-x-11-15-Label-Angled-Corner-p39.html"/>
+    <Label-rectangle id="0" width="0.85in" height="0.7333in">
+      <Layout nx="10" ny="15" x0="0in" y0="0in" dx="0.85in" dy="0.7333in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-200" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/2-x-1-Label-Angled-Corner-p40.html"/>
+    <Label-rectangle id="0" width="2in" height="1in">
+      <Layout nx="4" ny="10" x0="0.25in" y0="0.5in" dx="2in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-250" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/2-5-6-x-1-Label-Angled-Corner-p41.html"/>
+    <Label-rectangle id="0" width="2.8333in" height="1in">
+      <Layout nx="3" ny="11" x0="0in" y0="0in" dx="2.8333in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-450" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/3-4-x-1-2-Label-Angled-Corner-p45.html"/>
+    <Label-rectangle id="0" width="0.75in" height="0.5in">
+      <Layout nx="10" ny="20" x0="0.5in" y0="0.5in" dx="0.75in" dy="0.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-550" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-1-4--x-1-4-7-Label-Angled-Corner-p47.html"/>
+    <Label-rectangle id="0" width="4.25in" height="1.5714in">
+      <Layout nx="2" ny="7" x0="0in" y0="0in" dx="4.25in" dy="1.5714in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-600" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-1-4-x-2-Shipping-Labels-Address-Labels-p48.html"/>
+    <Label-rectangle id="0" width="4.25in" height="2in">
+      <Layout nx="2" ny="5" x0="0in" y0="0.5in" dx="4.25in" dy="2in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-500" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-1-4-x-1-Label-Angled-Corner-p46.html"/>
+    <Label-rectangle id="0" width="4.25in" height="1in">
+      <Layout nx="2" ny="11" x0="0in" y0="0in" dx="4.25in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-700" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-1-4-x-3-2-3-Label-Angled-Corner-p50.html"/>
+    <Label-rectangle id="0" width="4.25in" height="3.6667in">
+      <Layout nx="2" ny="3" x0="0in" y0="0in" dx="4.25in" dy="3.6667in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-750" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/4-1-4-x-5-1-2-Quarter-Sheet-Shipping-Labels-p51.html"/>
+    <Label-rectangle id="0" width="4.25in" height="5.5in">
+      <Layout nx="2" ny="2" x0="0in" y0="0in" dx="4.25in" dy="5.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-800" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/8-1-2-x-1-Label-Angled-Corner-p52.html"/>
+    <Label-rectangle id="0" width="8.5in" height="1in">
+      <Layout nx="1" ny="11" x0="0in" y0="0in" dx="8.5in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-850" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/8-1-2-x-1-4-7-Label-Angled-Corner-p53.html"/>
+    <Label-rectangle id="0" width="8.5in" height="1.5714in">
+      <Layout nx="1" ny="7" x0="0in" y0="0in" dx="8.5in" dy="1.5714in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-1000" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/8-1-2-x-3-2-3-Label-Angled-Corner-p56.html"/>
+    <Label-rectangle id="0" width="8.5in" height="3.6667in">
+      <Layout nx="1" ny="3" x0="0in" y0="0in" dx="8.5in" dy="3.6667in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="AC-1050" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.begalabel.com/8-1-2-x-5-1-2-Half-Sheet-Shipping-Labels-p57.html"/>
+    <Label-rectangle id="0" width="8.5in" height="5.5in">
+      <Layout nx="1" ny="2" x0="0in" y0="0in" dx="8.5in" dy="5.5in"/>
+    </Label-rectangle>
+  </Template>
+
+
+
+  <Template brand="Begalabel" part="O-100" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.begalabel.com/1-inch-Circle-Label-p61.html"/>
+    <Label-round id="0" radius="0.5in" waste="0.05in">
+      <Layout nx="7" ny="9" x0="0.5in" y0="0.4375in" dx="1.125in" dy="1.125in"/>
+    </Label-round>
+  </Template>
+
+  <Template brand="Begalabel" part="O-200" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.begalabel.com/1-1-2-Round-Labels-Circle-Identification-Labels-p62.html"/>
+    <Label-round id="0" radius="0.75in" waste="0.05in">
+      <Layout nx="4" ny="5" x0="0.5in" y0="0.75in" dx="2in" dy="2in"/>
+    </Label-round>
+  </Template>
+
+  <Template brand="Begalabel" part="O-300" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.begalabel.com/1-5-8-Round-Labels-Circle-Identification-Labels-p63.html"/>
+    <Label-round id="0" radius="0.8125in" waste="0.02in">
+      <Layout nx="4" ny="6" x0="0.4375in" y0="0.5in" dx="2in" dy="1.675in"/>
+    </Label-round>
+  </Template>
+
+  <Template brand="Begalabel" part="O-400" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.begalabel.com/2-Inch-Circle-Label-p64.html"/>
+    <Label-round id="0" radius="1in" waste="0.03in">
+      <Layout nx="4" ny="5" x0="0.1562in" y0="0.375in" dx="2.0625in" dy="2.0625in"/>
+    </Label-round>
+  </Template>
+
+  <Template brand="Begalabel" part="O-500" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.begalabel.com/2-1-2-Round-Labels-Circle-Identification-Labels-p65.html"/>
+    <Label-round id="0" radius="1.25in" waste="0.03in">
+      <Layout nx="3" ny="4" x0="0.25in" y0="0.4062in" dx="2.75in" dy="2.5625in"/>
+    </Label-round>
+  </Template>
+
+  <Template brand="Begalabel" part="O-600" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.begalabel.com/3-Inch-Circle-Label-p66.html"/>
+    <Label-round id="0" radius="1.5in" waste="0.05in">
+      <Layout nx="2" ny="3" x0="1.1875in" y0="0.875in" dx="3.125in" dy="3.125in"/>
+    </Label-round>
+  </Template>
+
+  <Template brand="Begalabel" part="O-700" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.begalabel.com/3-5-16-Circle-Label-p67.html"/>
+    <Label-round id="0" radius="1.65625in" waste="0.02in">
+      <Layout nx="2" ny="3" x0="0.625in" y0="0.4843in" dx="3.9375in" dy="3.3594in"/>
+    </Label-round>
+  </Template>
+
+
+
+  <Template brand="Begalabel" part="V-100" size="US-Letter" _description="Elliptical labels">
+    <Meta category="label"/>
+    <Meta category="elliptical-label"/>
+    <Meta product_url="http://www.begalabel.com/1-1-2-x-2-3-Oval-Label-p262.html"/>
+    <Label-ellipse id="0" width="1.5in" height="0.75in" waste="0.03in">
+      <Layout nx="5" ny="11" x0="0.375in" y0="0.5in" dx="1.5625in" dy="0.925in"/>
+    </Label-ellipse>
+  </Template>
+
+  <Template brand="Begalabel" part="V-200" size="US-Letter" _description="Elliptical labels">
+    <Meta category="label"/>
+    <Meta category="elliptical-label"/>
+    <Meta product_url="http://www.begalabel.com/2-x-1-Oval-Label-p263.html"/>
+    <Label-ellipse id="0" width="2in" height="1in" waste="0.05in">
+      <Layout nx="3" ny="9" x0="1in" y0="0.5in" dx="2.25in" dy="1.125in"/>
+    </Label-ellipse>
+  </Template>
+
+  <Template brand="Begalabel" part="V-400" size="US-Letter" _description="Elliptical labels">
+    <Meta category="label"/>
+    <Meta category="elliptical-label"/>
+    <Meta product_url="http://www.begalabel.com/2-1-2-x-1-3-4-Oval-Label-p264.html"/>
+    <Label-ellipse id="0" width="2.5in" height="1.75in" waste="0.05in">
+      <Layout nx="3" ny="5" x0="0.375in" y0="0.875in" dx="2.625in" dy="1.875in"/>
+    </Label-ellipse>
+  </Template>
+
+
+  <Template brand="Begalabel" part="M-200 (medium)" size="US-Letter" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/4-5-8-CD-&amp;-DVD-Label-2-per-sheet-p68.html"/>
+    <Label-cd id="0" radius="2.3125in" hole="0.814in" waste="0.05in">
+      <Layout nx="1" ny="2" x0="1.9375in" y0="0.6875in" dx="5in" dy="5in"/>
+    </Label-cd>
+  </Template>
+  <Template brand="Begalabel" part="M-200 (box)" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/4-5-8-CD-&amp;-DVD-Label-2-per-sheet-p68.html"/>
+    <Label-rectangle id="0" width="0.222in" height="4.69in" round="0.064in" x_waste="0.05in" y_waste="0.05in">
+      <Layout nx="2" ny="2" x0="0.5in" y0="0.585in" dx="0.47in" dy="4.87in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="M-400" size="US-Letter" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/4-1-2-CD-&amp;-DVD-Label-2-per-sheet-p69.html"/>
+    <Label-cd id="0" radius="2.25in" hole="0.814in" waste="0.05in">
+      <Layout nx="1" ny="2" x0="2in" y0="0.5in" dx="5.5in" dy="5.5in"/>
+    </Label-cd>
+  </Template>
+
+  <Template brand="Begalabel" part="M-600 (medium)" size="US-Letter" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/Neato-Compatible-4.52-CD-&amp;-DVD-Label--3-per-sheet-p70.html"/>
+    <Label-cd id="0" radius="2.26in" hole="0.814in" waste="0.025in">
+      <Layout nx="1" ny="2" x0="0.25in" y0="0.25in" dy="5.98in"/>
+      <Layout nx="1" ny="1" x0="3.729in" y0="3.24in"/>
+    </Label-cd>
+  </Template>
+  <Template brand="Begalabel" part="M-600 (box1)" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/Neato-Compatible-4.52-CD-&amp;-DVD-Label--3-per-sheet-p70.html"/>
+    <Label-rectangle id="0" width="2.753in" height="1.973in" round="0.16in" waste="0.025in">
+      <Layout nx="1" ny="2" x0="5.185in" y0="0.748in" dy="7.78in"/>
+    </Label-rectangle>
+  </Template>
+  <Template brand="Begalabel" part="M-600 (box2)" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/Neato-Compatible-4.52-CD-amp;&amp;-DVD-Label--3-per-sheet-p70.html"/>
+    <Label-rectangle id="0" width="3.128in" height="1in" round="0.16in" waste="0.025in">
+      <Layout nx="1" ny="1" x0="0.373in" y0="5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="M-800 (medium)" size="US-Letter" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/4-1-2-Inch-CD-&amp;-DVD-Label-2-per-sheet-p71.html"/>
+    <Label-cd id="0" radius="2.25in" hole="0.814in" waste="0.05in">
+      <Layout nx="1" ny="2" x0="2in" y0="0.5in" dx="5.5in" dy="5.5in"/>
+    </Label-cd>
+  </Template>
+  <Template brand="Begalabel" part="M-800 (box)" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/4-1-2-Inch-CD-&amp;-DVD-Label-2-per-sheet-p71.html"/>
+    <Label-rectangle id="0" width="4.757in" height="0.258in" x_waste="0.05in">
+      <Layout nx="1" ny="2" x0="1.872in" y0="5.242in" dx="4.757in" dy="0.258in"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Begalabel" part="M-1000" size="US-Letter" _description="Cassette Tape Face">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.begalabel.com/3-1-2-x-1-2-3-Inch-Cassette-Tape-Face-Label-12-per-sheet-p76.html"/>
+    <Label-rectangle id="0" width="3.5in" height="1.66667in">
+      <Markup-line x1="0in" y1="0.16in" x2="0.16in" y2="0"/>
+      <Markup-line x1="3.5in" y1="0.16in" x2="3.34in" y2="0"/>
+      <Markup-circle x0="0.875in" y0="0.935in" radius="0.316in"/>
+      <Markup-circle x0="2.628in" y0="0.935in" radius="0.316in"/>
+      <Markup-line x1="0.875in" y1="0.619in" x2="2.628in" y2="0.619in"/>
+      <Markup-line x1="0.875in" y1="1.251in" x2="2.628in" y2="1.251in"/>
+      <Layout nx="2" ny="6" x0="0.5in" y0="0.5in" dx="4in" dy="1.66667in"/>
+    </Label-rectangle>
+  </Template>
+
+
+</Glabels-templates>
diff --git a/templates/brother-other-templates.xml b/templates/brother-other-templates.xml
index 3d296ab..f24be69 100644
--- a/templates/brother-other-templates.xml
+++ b/templates/brother-other-templates.xml
@@ -7,9 +7,61 @@
    *********************************************************************
    Labels for the Brother QL-500/550/650 PC Label Printers
       
-   These templates work with the Brother Linux Printer CUPS Driver.  It
-   is unknown if these work correctly with the foomatic print driver for
-   these printers.
+   These templates are based on the exact media sizes and measurements
+   in version 1.1 of the 'Brother-QL-500-ptouch.ppd' file.  If these
+   don't work for you, try the old versions (e.g. DK-11201-old) of
+   these templates.
+
+   Currently only have templates for a few of the popular sizes.
+      
+   *********************************************************************
+   *********************************************************************
+  -->
+
+  <Template brand="Brother" part="DK-1201" size="Other" width="82pt" height="255pt" _description="Standard Address Labels 29mm x 90mm">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="82pt" height="255pt" round="4pt" x_waste="0" y_waste="0">
+      <Markup-rect x1="4.25pt" y1="8.5pt" w="73.5pt" h="238pt" r="0" />
+      <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Brother" part="DK-1202" size="Other" width="176pt" height="283pt" _description="Shipping Labels 62mm x 100mm">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="176pt" height="283pt" round="4pt" x_waste="0" y_waste="0">
+      <Markup-rect x1="4.25pt" y1="8.5pt" w="167.5pt" h="266pt" r="0" />
+      <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Brother" part="DK-1204" size="Other" width="48pt" height="153pt" _description="Multi Purpose Labels 17mm x 54mm">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="48pt" height="153pt" round="4pt" x_waste="0" y_waste="0">
+      <Markup-rect x1="4.25pt" y1="8.5pt" w="39.5pt" h="136pt" r="0" />
+      <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Brother" part="DK-1208" size="Other" width="108pt" height="255pt" _description="Standard Address Labels 38mm x 90mm">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="108pt" height="255pt" round="4pt" x_waste="0" y_waste="0">
+      <Markup-rect x1="4.25pt" y1="8.5pt" w="99.5pt" h="238pt" r="0" />
+      <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!--
+   *********************************************************************
+   *********************************************************************
+   Labels for the Brother QL-500/550/650 PC Label Printers
+      
+   These are the older templates that worked with the Brother Linux
+   Printer CUPS Driver.  They do not work correctly with newer versions
+   of the foomatic drivers.
       
    One difference from typical templates is that the template size is
    not the actual media size - it is the size of the printable area,
@@ -20,42 +72,36 @@
    *********************************************************************
   -->
 
-  <Template brand="Brother" part="DK-11201" size="Other" width="25.91mm" height="83.90mm" _description="Standard Address Labels 29mm x 90mm">
+  <Template brand="Brother" part="DK-11201-old" size="Other" width="25.91mm" height="83.90mm" _description="Standard Address Labels 29mm x 90mm (Old)">
     <Meta category="label"/>
     <Meta category="mail"/>
-    <Meta product_url="http://brother.ally.de/product/de/Etikettendrucker/Brother-DK-11201-QL-Adress-Etiketten-29x90-mm-Standard.html"/>
     <Label-rectangle id="0" width="25.91mm" height="83.90mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="29mm" h="90mm" r="1.5mm" />
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-11202" size="Other" width="58.93mm" height="93.20mm" _description="Shipping Labels 62mm x 100mm">
+  <Template brand="Brother" part="DK-11202-old" size="Other" width="58.93mm" height="93.20mm" _description="Shipping Labels 62mm x 100mm (Old)">
     <Meta category="label"/>
     <Meta category="mail"/>
-    <Meta product_url="http://brother.ally.de/product/de/Etikettendrucker/Brother-DK-11202-QL-Versand-Etiketten-62x100-mm.html"/>
     <Label-rectangle id="0" width="58.93mm" height="93.20mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="62mm" h="100mm" r="1.5mm" />
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-11204" size="Other" width="13.97mm" height="47.92mm" _description="Multi Purpose Labels 17mm x 54mm">
+  <Template brand="Brother" part="DK-11204-old" size="Other" width="13.97mm" height="47.92mm" _description="Multi Purpose Labels 17mm x 54mm (Old)">
     <Meta category="label"/>
-    <Meta product_url="http://brother.ally.de/product/de/Etikettendrucker/Brother-DK-11204-QL-Mehrzweck-Etiketten-17x54-mm.html"/>
     <Label-rectangle id="0" width="13.97mm" height="47.92mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="17mm" h="54mm" r="1.5mm" />
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-11208" size="Other" width="34.91mm"
-height="83.90mm" _description="Standard Address Labels 38mm x 90mm">
+  <Template brand="Brother" part="DK-11208-old" size="Other" width="34.91mm" height="83.90mm" _description="Standard Address Labels 38mm x 90mm (Old)">
     <Meta category="label"/>
     <Meta category="mail"/>
-    <Meta product_url="http://brother.ally.de/product/de/Etikettendrucker/Brother-DK-11208-QL-Adress-Etiketten-38x90-mm-gross.html"/>
-    <Label-rectangle id="0" width="34.91mm" height="83.90mm" round="0"
-x_waste="0" y_waste="0">
+    <Label-rectangle id="0" width="34.91mm" height="83.90mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="38mm" h="90mm" r="1.5mm" />
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
     </Label-rectangle>
diff --git a/templates/cablelabel-templates.xml b/templates/cablelabel-templates.xml
new file mode 100644
index 0000000..cbacebe
--- /dev/null
+++ b/templates/cablelabel-templates.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<Glabels-templates>
+
+
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+  <!--                                                                      -->
+  <!-- Cable Label Co A4 products                                           -->
+  <!--                                                                      -->
+  <!-- ******************************************************************** -->
+  <!-- ******************************************************************** -->
+
+
+  <!-- ============================================================ -->
+  <!-- Cable Label Co CableBug: Mini Labels                         -->
+  <!-- ============================================================ -->
+  <Template brand="Cable Label Co" part="CableBug" size="A4" _description="Mini Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="46.7mm" height="7mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="1mm"/>
+      <Layout nx="4" ny="39" x0="12mm" y0="12mm" dx="46.7mm" dy="7mm"/>
+    </Label-rectangle>
+  </Template>
+
+
+</Glabels-templates>
+
+
+
+
diff --git a/templates/canon-other-templates.xml b/templates/canon-other-templates.xml
new file mode 100644
index 0000000..c3f181f
--- /dev/null
+++ b/templates/canon-other-templates.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<Glabels-templates>
+
+
+  <!-- =================================================================== -->
+  <!-- Type J CD/DVD Tray.                                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Canon" part="Type J Tray" size="Other" width="135mm" height="295mm" _description="CD/DVD Tray">
+    <Label-cd id="0" radius="59mm" hole="11mm" waste="2mm">
+      <Markup-margin size="3.175mm"/>
+      <Layout nx="1" ny="1" x0="5.6mm" y0="58.5mm" dx="122mm" dy="122mm"/>
+    </Label-cd>
+  </Template>
+
+  <Template brand="Canon" part="MX920 CD Tray"  equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG5400 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG6300 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG6500 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="iP7200 CD Tray" equiv="Type J Tray"/>
+
+
+</Glabels-templates>
diff --git a/templates/categories.xml b/templates/categories.xml
index 903f37d..f15b3d8 100644
--- a/templates/categories.xml
+++ b/templates/categories.xml
@@ -7,11 +7,13 @@
   <Category id="elliptical-label" _name="Elliptical labels"/>
   <Category id="square-label"     _name="Square labels"/>
   <Category id="rectangle-label"  _name="Rectangular labels"/>
-  <Category id="card"	          _name="Any card"/>
-  <Category id="business-card"	  _name="Business cards"/>
-  <Category id="media"	          _name="CD/DVD or other media"/>
+  <Category id="card"             _name="Any card"/>
+  <Category id="business-card"    _name="Business cards"/>
+  <Category id="name-badge"       _name="Name Badge"/>
+  <Category id="media"            _name="CD/DVD or other media"/>
   <Category id="mail"             _name="Mailing/shipping products"/>
   <Category id="foldable"         _name="Foldable cards"/>
   <Category id="photo"            _name="Photo products"/>
+  <Category id="filing"           _name="Filing labels"/>
 
 </Glabels-categories>
diff --git a/templates/dymo-other-templates.xml b/templates/dymo-other-templates.xml
index 62c0bd9..7193fc9 100644
--- a/templates/dymo-other-templates.xml
+++ b/templates/dymo-other-templates.xml
@@ -2,87 +2,227 @@
 
 <Glabels-templates>
 
-
   <!-- =================================================================== -->
-  <!-- Dymo 99012 Large Address labels.                                    -->
+  <!-- Dymo 11352 Return Address labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99012" size="Other" width="102.047pt" height="252.283pt" _description="Large Address Labels">
+  <Template brand="Dymo" part="11352" size="Other" width="25mm" height="54mm" _description="Return Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
-    <Label-rectangle id="0" width="102.047pt" height="252.283pt" round="0pt" x_waste="0pt" y_waste="0pt">
+    <Meta product_url="http://global.dymo.com/deAT/Labels/S0722520.html"/>
+    <Label-rectangle id="0" width="25mm" height="54mm" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="102.047pt" dy="252.283pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="25mm" dy="54mm"/>
     </Label-rectangle>
   </Template>
-
+  
   <!-- =================================================================== -->
-  <!-- Dymo 99010 Address labels.                                          -->
+  <!-- Dymo 11353 Multipurpose Labels.                                     -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99010" size="Other" width="81pt" height="252pt" _description="Address Labels">
+  <Template brand="Dymo" part="11353" size="Other" width="13mm" height="25mm" _description="Multipurpose Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
-    <Label-rectangle id="0" width="81pt" height="252pt" round="0pt" x_waste="0pt" y_waste="0pt">
+    <Label-rectangle id="0" width="13mm" height="25mm" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="81pt" dy="252pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="13mm" dy="25mm"/>
+    </Label-rectangle>
+  </Template>  
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 11354 Return Address labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="11354" size="Other" width="32mm" height="57mm" _description="Return Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="32mm" height="57mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="32mm" dy="57mm"/>
     </Label-rectangle>
   </Template>
-
+  
   <!-- =================================================================== -->
   <!-- Dymo 11355 Return Address labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="11355" size="Other" width="54pt" height="144pt" _description="Return Address Labels">
+  <Template brand="Dymo" part="11355" size="Other" width="19mm" height="51mm" _description="Return Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
-    <Label-rectangle id="0" width="54pt" height="144pt" round="0pt" x_waste="0pt" y_waste="0pt">
+    <Label-rectangle id="0" width="19mm" height="51mm" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="54pt" dy="144pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="19mm" dy="51mm"/>
     </Label-rectangle>
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Dymo 99014 Shipping Address labels.                                 -->
+  <!-- Dymo 30256 Address labels.                                          -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99014" size="Other" width="167pt" height="288pt" _description="Shipping Address Labels">
+  <Template brand="Dymo" part="30256" size="Other" width="59mm" height="102mm" _description="Address labels">
     <Meta category="label"/>
-    <Meta category="mail"/>
-    <Label-rectangle id="0" width="167pt" height="288pt" round="0pt" x_waste="0pt" y_waste="0pt">
+    <Meta category="media"/>
+    <Label-rectangle id="0" width="59mm" height="102mm" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="167pt" dy="288pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="59mm" dy="102mm"/>
     </Label-rectangle>
-  </Template>
-
+  </Template>   
+  
   <!-- =================================================================== -->
   <!-- Dymo 30327 File Folder labels.                                      -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30327" size="Other" width="41pt" height="248pt" _description="File Folder">
+  <Template brand="Dymo" part="30327" size="Other" width="14mm" height="87mm" _description="File Folder">
     <Meta category="label"/>
-    <Label-rectangle id="0" width="41pt" height="248pt" round="0pt" x_waste="0pt" y_waste="0pt">
+    <Meta category="rectangle-label"/>
+    <Meta category="filing"/>
+    <Label-rectangle id="0" width="14mm" height="87mm" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="41pt" dy="248pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="14mm" dy="87mm"/>
     </Label-rectangle>
-  </Template>
-
+  </Template>  
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 30258 Multipurpose Labels (was 3.5" Disk labels).              -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="30258" size="Other" width="54mm" height="70mm" _description="Multipurpose Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-rectangle id="0" width="54mm" height="70mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="54mm" dy="70mm"/>
+    </Label-rectangle>
+  </Template>  
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 30332 File Folder labels.                                      -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="30332" size="Other" width="25mm" height="25mm" _description="Multipurpose Labels">
+    <Meta category="label"/>
+    <Meta category="square-label"/>
+    <Meta category="filing"/>
+    <Label-rectangle id="0" width="25mm" height="25mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="25mm" dy="25mm"/>
+    </Label-rectangle>
+  </Template>  
+  
+ <!-- =================================================================== -->
+ <!-- Dymo 30374 Name Badge.                                              -->
+ <!-- =================================================================== -->
+  <Template brand="Dymo" part="30374" size="Other" width="51mm" height="89mm" _description="Name Badges">
+    <Meta category="label"/>
+    <Meta category="name-badge"/>
+    <Label-rectangle id="0" width="51mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="51mm" dy="89mm"/>
+    </Label-rectangle>
+  </Template>   
+  
   <!-- =================================================================== -->
   <!-- Dymo 30376 Hanging Folder labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30376" size="Other" width="41pt" height="144pt" _description="Hanging Folder">
+  <Template brand="Dymo" part="30376" size="Other" width="14mm" height="51mm" _description="Hanging Folder">
     <Meta category="label"/>
-    <Label-rectangle id="0" width="41pt" height="144pt" round="0pt" x_waste="0pt" y_waste="0pt">
+    <Meta category="rectangle-label"/>
+    <Meta category="filing"/>
+    <Label-rectangle id="0" width="14mm" height="51mm" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="41pt" dy="144pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="14mm" dy="51mm"/>
     </Label-rectangle>
   </Template>
-
+  
   <!-- =================================================================== -->
-  <!-- Dymo 30258 3.5" Disk labels.                                        -->
+  <!-- Dymo 30856 Name Badge                                               -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30258" size="Other" width="153pt" height="198pt" _description="3.5in Diskette">
+  <Template brand="Dymo" part="30856" size="Other" width="62mm" height="106mm" _description="Name Badges">
     <Meta category="label"/>
-    <Meta category="media"/>
-    <Label-rectangle id="0" width="153pt" height="198pt" round="0pt" x_waste="0pt" y_waste="0pt">
+    <Meta category="name-badge"/>
+    <Label-rectangle id="0" width="62mm" height="106mm" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
-      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="153pt" dy="198pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="62mm" dy="106mm"/>
+    </Label-rectangle>
+  </Template>  
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 99010 Address labels.                                          -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99010" size="Other" width="28mm" height="89mm" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="28mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="28mm" dy="89mm"/>
+    </Label-rectangle>
+  </Template> 
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 99012 Large Address labels.                                    -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99012" size="Other" width="36mm" height="89mm" _description="Large Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="36mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="36mm" dy="89mm"/>
     </Label-rectangle>
   </Template>
-
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 99013 Large Address labels. Transparent Plastic                -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99013" size="Other" width="36mm" height="89mm" _description="Large Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="36mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="36mm" dy="89mm"/>
+    </Label-rectangle>
+  </Template>
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 99014 Shipping Address labels.                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99014" size="Other" width="54mm" height="101mm" _description="Shipping Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Meta category="name-badge"/>
+    <Label-rectangle id="0" width="54mm" height="101mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="54mm" dy="101mm"/>
+    </Label-rectangle>
+  </Template>
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 99015 Name Badge.                                              -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99015" size="Other" width="54mm" height="70mm" _description="Name Badges">
+    <Meta category="label"/>
+    <Meta category="name-badge"/>
+    <Label-rectangle id="0" width="54mm" height="70mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="54mm" dy="70mm"/>
+    </Label-rectangle>
+  </Template>
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 99017 Hanging Folder labels.                                   -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99017" size="Other" width="12mm" height="50mm" _description="Hanging Folder">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta category="filing"/>
+    <Label-rectangle id="0" width="12mm" height="50mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="12mm" dy="50mm"/>
+    </Label-rectangle>
+  </Template>
+  
+  <!-- =================================================================== -->
+  <!-- Dymo 99019 Lever Arch labels.                                       -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="99019" size="Other" width="59mm" height="190mm" _description="File Folder">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta category="filing"/>
+    <Label-rectangle id="0" width="59mm" height="190mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="59mm" dy="190mm"/>
+    </Label-rectangle>
+  </Template>
+  
 </Glabels-templates>
diff --git a/templates/endisch-templates.xml b/templates/endisch-templates.xml
index 37a5573..565ab6b 100644
--- a/templates/endisch-templates.xml
+++ b/templates/endisch-templates.xml
@@ -58,7 +58,7 @@
     <Meta category="round-label"/>
     <Meta product_url="http://www.endihaft.de/en/endisch_labels/laser/round60_e.html"/>
     <Label-round id="0" radius="30mm" waste="1mm">
-      <Layout nx="3" ny="4" x0="mm8" y0="18mm" dx="67mm" dy="67mm"/>
+      <Layout nx="3" ny="4" x0="8mm" y0="18mm" dx="67mm" dy="67mm"/>
     </Label-round>
   </Template>
 
@@ -73,7 +73,7 @@
   <Template brand="Endisch" part="6500067x" size="A4" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
-    <Label-round id="0" radius="33.75mm" waste="mm">
+    <Label-round id="0" radius="33.75mm" waste="1mm">
       <Layout nx="3" ny="4" x0="1.75mm" y0="8.25mm" dx="69.5mm" dy="71mm"/>
     </Label-round>
   </Template>
diff --git a/templates/mayspies-templates.xml b/templates/mayspies-templates.xml
new file mode 100644
index 0000000..79571d1
--- /dev/null
+++ b/templates/mayspies-templates.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<Glabels-templates xmlns="http://glabels.org/xmlns/3.0/">
+  <Template brand="Mayspies" part="090352" size="A4" _description="CD/DVD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Meta product_url="http://www.mayspies.com/index.php?menu_ID=43"/>
+    <Label-cd id="0" radius="58.5mm" hole="8.5mm" waste="3.2mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="1" ny="2" x0="46.5mm" y0="21.43mm" dx="123.4mm" dy="137mm"/>
+    </Label-cd>
+  </Template>
+</Glabels-templates>
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 66e18c7..5d867a3 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -151,6 +151,15 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Bruna 1166000.  Mailing Labels.                                     -->
+  <!-- =================================================================== -->
+  <Template brand="Bruna" part="1166000" size="A4" _description="Mailing labels">
+    <Label-rectangle id="0" width="70mm" height="37.1mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="9pt"/>
+      <Layout nx="3" ny="8" x0="0mm" y0="0mm" dx="70mm" dy="37.1mm"/>
+    </Label-rectangle>
+  </Template>
 
   <!-- ************************* -->
   <!--                           -->
diff --git a/templates/rayfilm-templates.xml b/templates/rayfilm-templates.xml
index 2e0a922..53045e2 100644
--- a/templates/rayfilm-templates.xml
+++ b/templates/rayfilm-templates.xml
@@ -234,7 +234,7 @@
     <Meta category="label"/>
     <Meta category="square-label"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=0241&amp;vzhled=1"/>
-    <Label-rectangle id="0" width="49mm" height="49mm" round="0mm" x_waste="mm" y_waste="1mm">
+    <Label-rectangle id="0" width="49mm" height="49mm" round="0mm" x_waste="1mm" y_waste="1mm">
       <Layout nx="3" ny="5" x0="26.5mm" y0="16mm" dx="54mm" dy="54mm"/>
     </Label-rectangle>
   </Template>
@@ -1252,8 +1252,8 @@
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=4525&amp;vzhled=1"/>
-    <Label-ellipse id="0" width="45mm" height="25mm" waste="mm">
-      <Layout nx="4" ny="10" x0="mm8" y0="8.02mm" dx="49.67mm" dy="28.44mm"/>
+    <Label-ellipse id="0" width="45mm" height="25mm" waste="1mm">
+      <Layout nx="4" ny="10" x0="8mm" y0="8.02mm" dx="49.67mm" dy="28.44mm"/>
     </Label-ellipse>
   </Template>
 
@@ -1453,7 +1453,7 @@
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=8042&amp;vzhled=1"/>
-    <Label-rectangle id="0" width="85mm" height="140mm" round="mm" x_waste="1.5mm" y_waste="1.5mm">
+    <Label-rectangle id="0" width="85mm" height="140mm" round="1.5mm" x_waste="1.5mm" y_waste="1.5mm">
       <Layout nx="2" ny="2" x0="17.5mm" y0="6mm" dx="90mm" dy="145mm"/>
     </Label-rectangle>
   </Template>
diff --git a/templates/sheetlabels-us-templates.xml b/templates/sheetlabels-us-templates.xml
index 848dbc1..5984361 100644
--- a/templates/sheetlabels-us-templates.xml
+++ b/templates/sheetlabels-us-templates.xml
@@ -35,7 +35,6 @@
     </Label-rectangle>
   </Template>
 
-
   <!-- =================================================================== -->
   <!-- SheetLabels: Address Labels, 20 per sheet	         	   -->
   <!-- =================================================================== -->
@@ -76,6 +75,19 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Shipping Labels, 6 per sheet                           -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL103" size="US-Letter" _description="Shipping Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL103"/>
+    <Label-rectangle id="0" width="4in" height="3.333333333in" round="0.125in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="3" x0="0.15625in" y0="0.5in" dx="4.1875in" dy="3.333333333in"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- SheetLabels: Shipping Labels, 6 per sheet	         		   -->
   <!-- =================================================================== -->
@@ -102,6 +114,19 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Round Labels, 12 per sheet	        		   -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL107" size="US-Letter" _description="Round Labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL107"/>
+    <Label-round id="0" radius="0.8125in" waste="0pt">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="4" ny="6" x0="0.4157in" y0="0.549in" dx="2.0145in" dy="1.6554in"/>
+    </Label-round>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- SheetLabels: Round Labels, 12 per sheet	        		   -->
   <!-- =================================================================== -->
@@ -127,6 +152,18 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangle Labels, 18 per sheet                         -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL11" size="US-Letter" _description="Shipping Labels">
+    <Meta category="label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL11"/>
+    <Label-rectangle id="0" width="2.3125in" height="1.4375in" round="0in" x_waste="0.125in" y_waste="0.125in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="3" ny="6" x0="0.53125in" y0="0.563in" dx="2.5625in" dy="1.688in"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- SheetLabels: CD/DVD Labels (face only), 2 per sheet         	   -->
   <!-- =================================================================== -->
@@ -155,6 +192,32 @@
     </Label-cd>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Round Labels, 63 per sheet                             -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL114" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL114"/>
+    <Label-round id="0" radius="0.5in" waste="0.061in">
+      <Markup-margin size="0.061in"/>
+      <Layout nx="7" ny="9" x0="0.375in" y0="0.5in" dx="1.125in" dy="1.125in"/>
+    </Label-round>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Round Labels, 108 per sheet                            -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL115" size="US-Letter" _description="Round labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL115"/>
+    <Label-round id="0" radius="0.375in" waste="0.031in">
+      <Markup-margin size="0.06in"/>
+      <Layout nx="9" ny="12" x0="0.625in" y0="0.656in" dx="0.812in" dy="0.812in"/>
+    </Label-round>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- SheetLabels: Mailing Labels, 12 per sheet                           -->
   <!-- =================================================================== -->
@@ -213,6 +276,20 @@
     </Label-round>
   </Template>
   
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Round Labels, 30 per sheet		         	           -->
+  <!-- =================================================================== -->  
+  <Template brand="SheetLabels" part="SL125" size="US-Letter" _description="Round Labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL125"/>
+    <Label-round id="0" radius="0.75in" waste="0.062in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="5" ny="6" x0="0.25in" y0="0.5in" dx="1.625in" dy="1.7in"/>
+    </Label-round>
+  </Template>
+  
   
   <!-- =================================================================== -->
   <!-- SheetLabels: Round Labels, 6 per sheet		         	   -->
@@ -240,6 +317,62 @@
       <Layout nx="1" ny="1" x0="1.5in" y0="2.75in" dx="8.5in" dy="5.5in"/>
     </Label-round>
   </Template>
+  
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 4 per sheet	         	   -->
+  <!-- =================================================================== -->  
+  <Template brand="SheetLabels" part="SL145" size="US-Letter" _description="Rectangular labels">
+	<Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL145"/>
+    <Label-rectangle id="0" width="3.5in" height="5in" round="0.1in" x_waste="0.25in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="2" x0="0.5in" y0="0.5in" dx="4in" dy="5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Round Labels, 4 per sheet	         	   -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL200" size="US-Letter" _description="Round Labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL200"/>
+    <Label-round id="0" radius="1.969in" waste="0.03in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="2" x0="0.28125in" y0="1.531in" dx="4in" dy="4in"/>
+    </Label-round>
+  </Template>
+
+  
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Elliptical Labels, 10 per sheet	         	           -->
+  <!-- =================================================================== -->  
+  <Template brand="SheetLabels" part="SL201" size="US-Letter" _description="Oval bottle labels">
+    <Meta category="label"/>
+    <Meta category="elliptical-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL201"/>
+    <Label-ellipse id="0" width="3.937in" height="1.937in" waste="0.03in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="5" x0="0.281in" y0="0.531in" dx="4in" dy="2in"/>
+    </Label-ellipse>
+  </Template>
+  
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Round Labels, 6 per sheet	         	               -->
+  <!-- =================================================================== --> 
+  <Template brand="SheetLabels" part="SL228" size="US-Letter" _description="Round Labels">
+    <Meta category="label"/>
+    <Meta category="round-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL228"/>
+    <Label-round id="0" radius="1.5in" waste="0.25in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="3" x0="0.75in" y0="0.5in" dx="4in" dy="3.5in"/>
+    </Label-round>
+  </Template>
+
 
   <!-- =================================================================== -->
   <!-- SheetLabels: VCR Labels, 1_7/8'' x 3_1/16'', 10 per sheet 	   -->
@@ -254,6 +387,105 @@
       <Layout nx="2" ny="5" x0="80" y0="60.5" dx="236" dy="133"/>
     </Label-rectangle>
   </Template>
+  
+  
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Bottle Labels, 3 per sheet	         	               -->
+  <!-- =================================================================== -->  
+  <Template brand="SheetLabels" part="SL303" size="US-Letter" _description="Bottle labels">
+	<Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL303"/>
+    <Label-rectangle id="0" width="7in" height="3in" round="0.1in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="1" ny="3" x0="0.75in" y0="1in" dx="7in" dy="3in"/>
+    </Label-rectangle>
+  </Template>
+  
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Bottle Labels, 5 per sheet	         	               -->
+  <!-- =================================================================== -->  
+  <Template brand="SheetLabels" part="SL304" size="US-Letter" _description="Bottle labels">
+	<Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL304"/>
+    <Label-rectangle id="0" width="8.5in" height="2in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="1" ny="5" x0="0in" y0="0.5in" dx="8.5in" dy="2in"/>
+    </Label-rectangle>
+  </Template>
+  
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 2 per sheet	         	           -->
+  <!-- =================================================================== -->  
+  <Template brand="SheetLabels" part="SL517" size="US-Letter" _description="Rectangular labels">
+	<Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL517"/>
+    <Label-rectangle id="0" width="6.5in" height="4.5in" round="0.375in" x_waste="0in" y_waste="0.343in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="1" ny="2" x0="1in" y0="0.656in" dx="6.5in" dy="5.1875in"/>
+    </Label-rectangle>
+  </Template>
+  
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 4 per sheet	         	           -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL522" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL522"/>
+    <Label-rectangle id="0" width="4in" height="5in" round="0.16in" x_waste="0.09in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="2" x0="0.125in" y0="0.5in" dx="4.19in" dy="5in"/>
+    </Label-rectangle>
+  </Template>
+  
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 5 per sheet	         	           -->
+  <!-- =================================================================== --> 
+  <Template brand="SheetLabels" part="SL527" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL527"/>
+    <Label-rectangle id="0" width="8in" height="2in" round="0in" x_waste="0.1in" y_waste="0in">
+      <Markup-margin size="0.0625in"/>
+      <Layout nx="1" ny="5" x0="0.25in" y0="0.5in" dx="8.2in" dy="2in"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 10 per sheet        	           -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL529" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL529"/>
+    <Label-rectangle id="0" width="8in" height="1in" round="0in" x_waste="0.1in" y_waste="0in">
+      <Markup-margin size="0.06in"/>
+      <Layout nx="1" ny="10" x0="0.25in" y0="0.5in" dx="8.2in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 6 per sheet         	           -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL530" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL5"/>
+    <Label-rectangle id="0" width="4.25in" height="3.665in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="3" x0="0in" y0="0in" dx="4.25in" dy="3.665in"/>
+    </Label-rectangle>
+  </Template>
+
 
   <!-- =================================================================== -->
   <!-- SheetLabels: Mailing Labels, 10 per sheet                           -->
@@ -281,6 +513,47 @@
     </Label-rectangle>
   </Template>
 
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 21 per sheet	         	   -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL552" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL552"/>
+    <Label-rectangle id="0" width="2.833in" height="1.5in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="3" ny="7" x0="0in" y0="0.25in" dx="2.833in" dy="1.5in"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 40 per sheet	         	   -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL556" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL556"/>
+    <Label-rectangle id="0" width="2in" height="1in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="4" ny="10" x0="0.25in" y0="0.5in" dx="2in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
+
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Rectangular Labels, 50 per sheet	         	   -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL559" size="US-Letter" _description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL559"/>
+    <Label-rectangle id="0" width="1.5in" height="1in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="5" ny="10" x0="0.5in" y0="0.5in" dx="1.5in" dy="1in"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- SheetLabels: CD/DVD Labels (face only), 2 per sheet         	   -->
   <!-- =================================================================== -->
@@ -298,6 +571,19 @@
       <Layout nx="1" ny="2" x0="1.9375in" y0="0.6875in" dx="0" dy="5in"/>
     </Label-cd>
   </Template>
+  
+  <!-- =================================================================== -->
+  <!-- SheetLabels: Mailing Labels, 6 per sheet         	           -->
+  <!-- =================================================================== -->
+  <Template brand="SheetLabels" part="SL573" size="US-Letter" _description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Meta product_url="http://www.sheet-labels.com/labels/SL573"/>
+    <Label-rectangle id="0" width="4in" height="3in" round="0.125in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="2" ny="3" x0="0.19in" y0="1.in" dx="4.125in" dy="3in"/>
+    </Label-rectangle>
+  </Template>
 
 </Glabels-templates>
 
diff --git a/templates/vendors.xml b/templates/vendors.xml
index f3fe152..a515b7b 100644
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -2,53 +2,57 @@
 
 <Glabels-vendors>
 
-  <Vendor name="Agipa"		url="http://www.apli-agipa.com/"           		/>
-  <Vendor name="APLI"		url="http://www.apli.com/softwareyplantillas/apli_soft.aspx"/>
-  <Vendor name="Ascom"		url="http://www.hovat.co.uk/hovat_labelling.html"	/>
-  <Vendor name="Avery"		url="http://www.avery.com/"           			/>
-  <Vendor name="Brother"	url="http://www.brother-usa.com/"     			/>
-  <Vendor name="Dataline"	url="http://www.esselte-dataline.com/uk/"   		/>
-  <Vendor name="DECAdry"	url="http://www.decadry.com/"         			/>
-  <Vendor name="Desmat"		url="www.desmat.com/"	         			/>
-  <Vendor name="DataBecker"	url="http://www.databecker.de/shop/zubehoer/index.php"	/>
-  <Vendor name="Dymo"		url="http://global.dymo.com/"         			/>
-  <Vendor name="Endisch"	url="http://www.endihaft.de/en/"                        />
-  <Vendor name="Geha"		url="http://www.geha.de/index.php?id=1041"     		/>
-  <Vendor name="Great Gizmos"	url="http://www.greatgizmos.co.uk/product_ranges.html"	/>
-  <Vendor name="Hema"		url="http://hema.nl/nl-nl/winkel/kantoor/papier.aspx"	/>
-  <Vendor name="Hama"		url="http://www.hama.de/produkte/pc_+_notebook/buerobedarf/index.hsp"	/>
-  <Vendor name="Herma"		url="http://www.herma.de/"            			/>
-  <Vendor name="Igepa"		url="http://www.igepagroup.com/"                        />
-  <Vendor name="Impact"		url="http://www.impactlabel.com/"      			/>
-  <Vendor name="Kingdom"	url="http://www.kingdom.com/Kingdom-Label-Center-s/20.htm"/>
-  <Vendor name="Kores"		url="http://www.kores.com/products/"			/>
-  <Vendor name="JAC"		url="http://www.tagswiss.ch/deutsch/Etiketten/" 	/>
-  <Vendor name="Maco"		url="http://www.maco.com/"            			/>
-  <Vendor name="Memorex"	url="http://www.memorex.com/en-us/Accessories/Disc-Labeling/"/>
-  <Vendor name="Merax"		url="http://www.merax.com/"/>
-  <Vendor name="Meritline"      url="http://www.meritline.com/"        			/>
-  <Vendor name="Micro Application"      url="http://www.microapp.com/"        		/>
-  <Vendor name="Neato"          url="http://www.neato.com/"            			/>
-  <Vendor name="Netc"           url="http://netcllc.com/site/home.php"      		/>
-  <Vendor name="OfficeMax"      url="http://www.officemax.com/office-supplies/paper"	/>
-  <Vendor name="Online Labels"  url="http://www.onlinelabels.com/"    			/>
-  <Vendor name="PEARL"          url="http://www.pearl.de/"             			/>
-  <Vendor name="Pressit"        url="http://www.pressit.com/label-applicator-systems.html"/>
-  <Vendor name="Poundland"      url="http://www.poundland.co.uk/"			/>
-  <Vendor name="Q_CONNECT"      url="http://www.q-connect.com/"				/>
-  <Vendor name="Rayfilm"	url="http://www.rayfilm.cz/en/"                         />
-  <Vendor name="Ryman"          url="http://www.ryman.co.uk/"				/>
-  <Vendor name="Sanwa"	        url="http://www.sanwapaper.com/"             		/>
-  <Vendor name="Sattleford"     url="http://www.pearl.de/"             			/>
-  <Vendor name="SheetLabels"    url="http://www.sheet-labels.com/"             			/>
-  <Vendor name="Sigel"          url="http://www.sigel.de/de_de/"             		/>
-  <Vendor name="Southworth"     url="http://shop.southworth.com/cats.php?cat=1"		/>
-  <Vendor name="Staples"        url="http://www.staples.de/burobedarf-2"		/>
-  <Vendor name="Stomper"        url="http://www.cdstomper.com/"				/>
-  <Vendor name="Uline"          url="http://www.uline.com/"           			/>
-  <Vendor name="Viking"         url="http://www.viking.de/"           			/>
-  <Vendor name="Worldlabel"     url="http://www.worldlabel.com/"      			/>
-  <Vendor name="Your Design"    url="http://www.pearl.de/"             			/>
-  <Vendor name="Zweckform"      url="http://www.avery-zweckform.com/" 			/>
+  <Vendor name="Agipa"              url="http://www.apli-agipa.com/"/>
+  <Vendor name="APLI"               url="http://www.apli.com/softwareyplantillas/apli_soft.aspx"/>
+  <Vendor name="Ascom"              url="http://www.hovat.co.uk/hovat_labelling.html"/>
+  <Vendor name="Avery"              url="http://www.avery.com/"/>
+  <Vendor name="Begalabel"          url="http://www.begalabel.com/"/>
+  <Vendor name="Brother"            url="http://www.brother.com/"/>
+  <Vendor name="Canon"              url="http://www.canon.com/"/>
+  <Vendor name="Cable Label Co"     url="http://www.thecablelabelco.co.uk/"/>
+  <Vendor name="Dataline"           url="http://www.esselte-dataline.com/uk/"/>
+  <Vendor name="DECAdry"            url="http://www.decadry.com/"/>
+  <Vendor name="Desmat"             url="http://www.desmat.com/"/>
+  <Vendor name="DataBecker"         url="http://www.databecker.de/shop/zubehoer/index.php"/>
+  <Vendor name="Dymo"               url="http://global.dymo.com/"/>
+  <Vendor name="Endisch"            url="http://www.endihaft.de/en/"/>
+  <Vendor name="Geha"               url="http://www.geha.de/index.php?id=1041"/>
+  <Vendor name="Great Gizmos"       url="http://www.greatgizmos.co.uk/product_ranges.html"/>
+  <Vendor name="Hema"               url="http://hema.nl/nl-nl/winkel/kantoor/papier.aspx"/>
+  <Vendor name="Hama"               url="http://www.hama.de/produkte/pc_+_notebook/buerobedarf/index.hsp"/>
+  <Vendor name="Herma"              url="http://www.herma.de/"/>
+  <Vendor name="Igepa"              url="http://www.igepagroup.com/"/>
+  <Vendor name="Impact"             url="http://www.impactlabel.com/"/>
+  <Vendor name="Kingdom"            url="http://www.kingdom.com/Kingdom-Label-Center-s/20.htm"/>
+  <Vendor name="Kores"              url="http://www.kores.com/products/"/>
+  <Vendor name="JAC"                url="http://www.tagswiss.ch/deutsch/Etiketten/"/>
+  <Vendor name="Maco"               url="http://www.maco.com/"/>
+  <Vendor name="Memorex"            url="http://www.memorex.com/en-us/Accessories/Disc-Labeling/"/>
+  <Vendor name="Merax"              url="http://www.merax.com/"/>
+  <Vendor name="Meritline"          url="http://www.meritline.com/"/>
+  <Vendor name="Micro Application"  url="http://www.microapp.com/"/>
+  <Vendor name="Mayspies"           url="http://www.mayspies.com/"/>
+  <Vendor name="Neato"              url="http://www.neato.com/"/>
+  <Vendor name="Netc"               url="http://netcllc.com/site/home.php"/>
+  <Vendor name="OfficeMax"          url="http://www.officemax.com/office-supplies/paper"/>
+  <Vendor name="Online Labels"      url="http://www.onlinelabels.com/"/>
+  <Vendor name="PEARL"              url="http://www.pearl.de/"/>
+  <Vendor name="Pressit"            url="http://www.pressit.com/label-applicator-systems.html"/>
+  <Vendor name="Poundland"          url="http://www.poundland.co.uk/"/>
+  <Vendor name="Q_CONNECT"          url="http://www.q-connect.com/"/>
+  <Vendor name="Rayfilm"            url="http://www.rayfilm.cz/en/"/>
+  <Vendor name="Ryman"              url="http://www.ryman.co.uk/"/>
+  <Vendor name="Sanwa"              url="http://www.sanwapaper.com/"/>
+  <Vendor name="Sattleford"         url="http://www.pearl.de/"/>
+  <Vendor name="SheetLabels"        url="http://www.sheet-labels.com/"/>
+  <Vendor name="Sigel"              url="http://www.sigel.de/de_de/"/>
+  <Vendor name="Southworth"         url="http://shop.southworth.com/cats.php?cat=1"/>
+  <Vendor name="Staples"            url="http://www.staples.de/burobedarf-2"/>
+  <Vendor name="Stomper"            url="http://www.cdstomper.com/"/>
+  <Vendor name="Uline"              url="http://www.uline.com/"/>
+  <Vendor name="Viking"             url="http://www.viking.de/"/>
+  <Vendor name="Worldlabel"         url="http://www.worldlabel.com/"/>
+  <Vendor name="Your Design"        url="http://www.pearl.de/"/>
+  <Vendor name="Zweckform"          url="http://www.avery-zweckform.com/"/>
 
 </Glabels-vendors>
diff --git a/templates/zweckform-iso-templates.xml b/templates/zweckform-iso-templates.xml
index a7ee09e..9a39f5b 100644
--- a/templates/zweckform-iso-templates.xml
+++ b/templates/zweckform-iso-templates.xml
@@ -8,10 +8,23 @@
   <!-- ******************************************************************** -->
 
   <!-- =================================================================== -->
-  <!-- Zweckform 4761: Lever Arch File Labels, 192 x 61 mm, 4 per sheet    -->
+  <!-- Zweckform 4760: Lever Arch File Labels, slim, 7 per sheet           -->
+  <!-- =================================================================== -->
+  <Template brand="Zweckform" part="4760" size="A4" _description="Lever Arch File Labels">
+    <Meta category="label"/>
+    <Meta category="filing"/>
+    <Label-rectangle id="0" width="544.252pt" height="107.717pt" round="5.66929pt" waste="0pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="7" x0="25.5118pt" y0="43.7386pt" dx="544.252pt" dy="107.717pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Zweckform 4761: Lever Arch File Labels, wide, 4 per sheet           -->
   <!-- =================================================================== -->
   <Template brand="Zweckform" part="4761" size="A4" _description="Lever Arch File Labels">
     <Meta category="label"/>
+    <Meta category="filing"/>
     <Label-rectangle id="0" width="544.25" height="172.9" round="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="4" x0="25" y0="75" dx="544.25" dy="172.9"/>
@@ -19,7 +32,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3477: Adress labels                                       -->
+  <!-- Zweckform 3477: Address labels                                      -->
   <!-- =================================================================== -->
   <Template brand="Zweckform" part="3477" size="A4" _description="Address Labels">
     <Meta category="label"/>
@@ -77,10 +90,11 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3688: Ordnerruecken Labels                                -->
+  <!-- Zweckform 3688: Lever Arch File Labels, wide, 4 per sheet           -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3688" size="A4" _description="File Back Labels">
+  <Template brand="Zweckform" part="3688" size="A4" _description="Lever Arch File Labels">
     <Meta category="label"/>
+    <Meta category="filing"/>
     <Label-rectangle id="0" width="544.252pt" height="172.913pt" round="0pt" waste="0pt">
       <Markup-margin size="9.07087pt"/>
       <Layout nx="1" ny="4" x0="28.3465pt" y0="76.5354pt" dx="544.252pt" dy="172.913pt"/>
@@ -258,18 +272,6 @@
     </Label-rectangle>
   </Template>
 
-
-  <!-- =================================================================== -->
-  <!-- Zweckform 4760: File Labels, 192 x 38 mm, 7 per sheet               -->
-  <!-- =================================================================== -->
-  <Template brand="Zweckform" part="4760" size="A4" _description="File Back Labels">
-    <Meta category="label"/>
-    <Label-rectangle id="0" width="544.252pt" height="107.717pt" round="5.66929pt" waste="0pt">
-      <Markup-margin size="9pt"/>
-      <Layout nx="1" ny="7" x0="25.5118pt" y0="43.7386pt" dx="544.252pt" dy="107.717pt"/>
-    </Label-rectangle>
-  </Template>
-
   <!-- =================================================================== -->
   <!-- Zweckform 3348: Adress Labels.                                      -->
   <!-- =================================================================== -->
@@ -283,7 +285,3 @@
   </Template>
 
 </Glabels-templates>
-
-
-
-