diff --git a/CREDITS.md b/CREDITS.md
new file mode 100644
index 0000000..b58b81f
--- /dev/null
+++ b/CREDITS.md
@@ -0,0 +1,183 @@
+gLabels Author
+==============
+
+Jim Evins <evins@snaught.com>
+
+Acknowledgments
+===============
+
+
+Product Templates
+-----------------
+The following people have submitted label templates or information about
+particular products (I apologize if I have missed anybody):
+
+* Mario Blättermann
+* Hap
+* Olivier Berger
+* Marcus Bauer
+* Jochen Hein
+* Jonathan Buzzard
+* Jeff Davis
+* Ludger Solbach
+* Darren Ross
+* George Mitchell
+* Douglas Bollinger
+* Tim Jackson
+* John Stoffel
+* Dany De Bontridder
+* Andy Longton
+* Bostjan Muller
+* John Helms
+* no-exit
+* Mozilla from marela
+* Holger
+* Bill Tihen
+* Dan Gray
+* Keith Hudson
+* Tamas Bondar
+* Erich Pfennig
+* Gwen Patton
+* Miek Gieben
+* Joerg Schmitz-Linneweber
+* David Makovský
+* Oliver Schwank
+* Akkana
+* Ted Poe
+* hans-helmut.belter
+* Uli Wachowitz
+* Stephan Hegel
+* Holger Reinmann
+* Michael Wojciechowski
+* Jim Mueller
+* Mark Fullalove
+* Zamiel Al'Shaitan
+* Philip Paeps
+* Bryan Fields
+* Martin Klaffenboeck
+* Lauri Ampuja
+* Allan Wind
+* Mark S Burgunder
+* Christian Holländer
+* Marvin P. Dickens
+* Julien BLACHE
+* James D Strandboge
+* Linas Jakucionis
+* Henrik Brix Andersen
+* Nigel Titley
+* Sean 'Shaleh' Perry
+* Anthony Brockman
+* Thorsten Hirsch
+* John Ross
+* Mike Machado
+* Rob Elshire
+* Niels
+* Ernst W. Winter
+* regis rampnoux* 
+* Sven Salzwedel
+* Dick Middleton
+* Ian Peake
+* Wayne Schuller
+* Thomas Vill
+* Fred Bacon
+* JBadger
+* Frank Altpeter
+* Matthew J. Lockner
+* Larry Harriman
+* Juan Carlos Valero
+* Nick Hill
+* Ali Akcaagac
+* Dan Clark
+* Peter L. Berghold
+* Vitaly Lipatov
+* Steve Saxon
+* Roman Kreisel
+* Steve Reppucci
+* Lionel CONS
+* Richard Lance
+* Anand Kumria
+* Alexandre Sauvé
+* Ironblade
+* Matthias Mailänder
+* Bernhard Walle
+* Stephen Hilliard
+* Alessandro Zummo
+* Herbert Straub
+* Dennis Böckmann
+* Anon
+* D. Leitner
+* Georg Ostertag
+* Manuel Siggen
+* David Huber
+* Harald Welte
+* Richard Rothwell
+* Gernot Hassenpflug
+* Pau Ruŀlan Ferragut
+* Richard Hurt
+* Phil Endecott
+* Koen Wybo
+* Mark Moeller
+* Bertus W.
+* Oliver Friedrich
+* Dr. Oliver Thiel
+* Jonas Stein
+* Thomas Eggers
+* Marina Delic
+* Russell Knighton
+* Anthony Mark Morningstar
+* Ian Shuttleworth
+* Rudolph Leitgeb
+* E. Travis
+* Stefan Tauner
+* Ralf Moll
+* Kevin Partin
+* Stuart Coyle
+* Jean-Philippe Guérard
+* Arnaud van Cortenbosch
+* Bruce Dagel
+* Schlomo Schapiro
+* Marek Černocký
+* Gaz Davidson
+* Manoj Kumar Choudhary
+* Gorden Tabibi
+* Gebhard Moser
+* Bao
+* Gernot Hassenpflug
+* Malte Skoruppa
+* GHPS
+* Thomas Steinert
+* Windel Bouwman
+
+Previous Versions
+-----------------
+Glabels 4.0 is a complete rewrite.  The following people have made contributions to previous versions,
+which certainly influenced the current version.
+
+* Mario Blättermann <mario.blaettermann@gmail.com> -- Documentation & i18n maintainer
+* Marek Černocký <marek@manet.cz>
+* Jim Patterson <sf.rs9z@ncf.ca>
+* Tim Waugh <twaugh@redhat.com>
+
+* Frederic Ruaudel  <grumz@users.sf.net>
+* Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>
+* Wayne Schuller <k_wayne@linuxpower.org>
+* Austin Henry  <ahenry@users.sourceforge.net> -- EDS and vcard backends
+* nestor di <nestordi@usuarios.retecal.es>  --  excellent splash screen
+* Darren Warner <warnerd@users.sourceforge.net>
+* Javier Donaire Segarra <jyuyu@users.sourceforge.net>
+* Alessandro Zummo <a.zummo@towertech.it>
+* José Dapena Paz <jdapena@igalia.com>
+* Akkana <akkana@shallowsky.com>
+* Dag Wieers <dag@wieers.com>
+* Mário Meyer <mario@meyer.eti.br>
+* Peter Cherriman <glabels-devel2712@bubieyehyeh.me.uk>
+* Daniel Mueller <daniel@danm.de>
+* Samual Lown <sam.lown@gmail.com>
+* Robin Stuart <robin@zint.org.uk>
+
+
+Others
+------
+And many others for their many helpful suggestions and bug reports -- thanks.
+
+
diff --git a/docs/HACKING.md b/docs/HACKING.md
index 33491cf..e61d55f 100644
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -12,6 +12,13 @@ The glabels coding style is documented in the file
 See below for additional guidelines.
 
 
+Product Template Designers:
+===========================
+
+Guidelines for designing product templates are documentd in the file
+[PRODUCT-TEMPLATES.md](PRODUCT-TEMPLATES.md) located in this directory.
+
+
 Translators:
 ============
 
diff --git a/docs/PRODUCT-TEMPLATES.md b/docs/PRODUCT-TEMPLATES.md
new file mode 100644
index 0000000..302b3d9
--- /dev/null
+++ b/docs/PRODUCT-TEMPLATES.md
@@ -0,0 +1,7 @@
+### Guidelines for Creating Product Descriptions
+
+* If possible, Reuse the description of a similar product
+* Only capitalize the first word of description
+* Keep descriptions general
+* Do not repeat the part number or name in the description
+
diff --git a/templates/ascom-iso-templates.xml b/templates/ascom-iso-templates.xml
index 57534cf..14429ac 100644
--- a/templates/ascom-iso-templates.xml
+++ b/templates/ascom-iso-templates.xml
@@ -13,10 +13,10 @@
   <!-- http://www.hovat.co.uk/office_templates.zip		-->
 
   <!-- =================================================================== -->
-  <!-- Ascom A4/24/MKII: Rectangular Labels, 24 per sheet                  -->
+  <!-- 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">
+  <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">
       <Markup-margin size="5"/>
@@ -25,7 +25,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-236: Rectangular Labels, 1 per sheet   	           -->
+  <!-- Ascom ABP-236: Rectangular labels, 1 per sheet   	           -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-236" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -39,7 +39,7 @@
   <Template brand="Ascom" part="ABP-237" equiv="ABP-236"/>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-238: Rectangular Labels, 4 per sheet	                   -->
+  <!-- Ascom ABP-238: Rectangular labels, 4 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-238" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -51,7 +51,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-239: Rectangular Labels, 6 per sheet	                   -->
+  <!-- Ascom ABP-239: Rectangular labels, 6 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-239" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -63,7 +63,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-240: Rectangular Labels, 8 per sheet	                   -->
+  <!-- Ascom ABP-240: Rectangular labels, 8 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-240" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -75,7 +75,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-241: Rectangular Labels, 6 per sheet	                   -->
+  <!-- Ascom ABP-241: Rectangular labels, 6 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-241" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -87,7 +87,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-243: Rectangular Labels, 10 per sheet	                   -->
+  <!-- Ascom ABP-243: Rectangular labels, 10 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-243" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -99,7 +99,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-244: Rectangular Labels, 12 per sheet	                   -->
+  <!-- Ascom ABP-244: Rectangular labels, 12 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-244" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -111,7 +111,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-251: Rectangular Labels, 16 per sheet	                   -->
+  <!-- Ascom ABP-251: Rectangular labels, 16 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-251" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -123,7 +123,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-256: Rectangular Labels, 30 per sheet	                   -->
+  <!-- Ascom ABP-256: Rectangular labels, 30 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-256" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -135,7 +135,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-416: Rectangular Labels, 24 per sheet	                   -->
+  <!-- Ascom ABP-416: Rectangular labels, 24 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-416" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -147,7 +147,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-420: Rectangular Labels, 14 per sheet	                   -->
+  <!-- Ascom ABP-420: Rectangular labels, 14 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-420" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -161,7 +161,7 @@
   <Template brand="Ascom" part="ABP-421" equiv="ABP-420"/>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-422: Rectangular Labels, 16 per sheet	                   -->
+  <!-- Ascom ABP-422: Rectangular labels, 16 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-422" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -175,7 +175,7 @@
   <Template brand="Ascom" part="ABP-423" equiv="ABP-422"/>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-424: Rectangular Labels, 16 per sheet	                   -->
+  <!-- Ascom ABP-424: Rectangular labels, 16 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-424" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -189,7 +189,7 @@
   <Template brand="Ascom" part="ABP-425" equiv="ABP-424"/>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-426: Rectangular Labels, 70 per sheet	                   -->
+  <!-- Ascom ABP-426: Rectangular labels, 70 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-426" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -201,7 +201,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-427: Rectangular Labels, 24 per sheet	                   -->
+  <!-- Ascom ABP-427: Rectangular labels, 24 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-427" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -213,7 +213,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-428: Rectangular Labels, 80 per sheet	                   -->
+  <!-- Ascom ABP-428: Rectangular labels, 80 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-428" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -225,7 +225,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-501: Rectangular Labels, 10 per sheet	                   -->
+  <!-- Ascom ABP-501: Rectangular labels, 10 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-501" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -237,7 +237,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-502: Rectangular Labels, 4 per sheet	                   -->
+  <!-- Ascom ABP-502: Rectangular labels, 4 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-502" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -249,7 +249,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-505: Rectangular Labels, 18 per sheet	                   -->
+  <!-- Ascom ABP-505: Rectangular labels, 18 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-505" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -261,7 +261,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-507: Rectangular Labels, 12 per sheet	                   -->
+  <!-- Ascom ABP-507: Rectangular labels, 12 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-507" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -273,9 +273,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-508: Video Tape Spine Labels, 16 per sheet	           -->
+  <!-- Ascom ABP-508: Video tape spine labels, 16 per sheet	           -->
   <!-- =================================================================== -->
-  <Template brand="Ascom" part="ABP-508" size="A4" _description="Video Tape Spine Labels">
+  <Template brand="Ascom" part="ABP-508" size="A4" _description="Video tape spine labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="media"/>
@@ -286,7 +286,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-509: Rectangular Labels, 12 per sheet	                   -->
+  <!-- Ascom ABP-509: Rectangular labels, 12 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-509" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -298,7 +298,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-510: Rectangular Labels, 84 per sheet	                   -->
+  <!-- Ascom ABP-510: Rectangular labels, 84 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-510" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -310,9 +310,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-515: CD inlet, 2 per sheet		                   -->
+  <!-- Ascom ABP-515: CD/DVD inlet, 2 per sheet		                   -->
   <!-- =================================================================== -->
-  <Template brand="Ascom" part="ABP-515" size="A4" _description="CD Inlet">
+  <Template brand="Ascom" part="ABP-515" size="A4" _description="CD/DVD inlet">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="34mm" height="114mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -322,7 +322,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-518: Rectangular Labels, 24 per sheet	                   -->
+  <!-- Ascom ABP-518: Rectangular labels, 24 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-518" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -334,7 +334,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-519: Rectangular Labels, 36 per sheet	                   -->
+  <!-- Ascom ABP-519: Rectangular labels, 36 per sheet	                   -->
   <!-- =================================================================== -->
   <Template brand="Ascom" part="ABP-519" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml
index 80a0fb4..e631979 100644
--- a/templates/avery-iso-templates.xml
+++ b/templates/avery-iso-templates.xml
@@ -13,9 +13,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery L4730 family: Mini Labels                          -->
+  <!-- Avery L4730 family: Mini labels                          -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="L4730" size="A4" _description="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">
@@ -26,9 +26,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery L4732 family: Mini Labels                                     -->
+  <!-- Avery L4732 family: Mini labels                                     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="L4732" size="A4" _description="Mini Labels">
+  <Template brand="Avery" part="L4732" size="A4" _description="Mini labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="35.6mm" height="16.9mm" round="1.5mm" x_waste="0mm" y_waste="0mm">
@@ -39,9 +39,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery L4770 family: Mini Labels                                     -->
+  <!-- Avery L4770 family: Mini labels                                     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="L4770" size="A4" _description="Mini Labels">
+  <Template brand="Avery" part="L4770" size="A4" _description="Mini labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="45.7mm" height="25.4mm" round="1.5mm" x_waste="0mm" y_waste="0mm">
@@ -56,9 +56,9 @@
   <Template brand="Avery" part="L7654" equiv="L4770"/>
 
   <!-- =================================================================== -->
-  <!-- Avery L4785 family: Name Badges, 10 per sheet                       -->
+  <!-- Avery L4785 family: Name badges, 10 per sheet                       -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="L4785" size="A4" _description="Self-Adhesive Name Badges (Acetate Silk)">
+  <Template brand="Avery" part="L4785" size="A4" _description="Name badge labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.avery.co.uk/avery/en_gb/Products/Naming/Self-Adhesive-Name-Badges/White-self-adhesive-name-badges_L4785_20.htm"/>
@@ -73,9 +73,9 @@
   <Template brand="Avery" part="L4787" equiv="L4785"/>
 
   <!-- =================================================================== -->
-  <!-- Avery L6015 family: CD/DVD Labels, 2 per sheet                      -->
+  <!-- Avery L6015 family: CD/DVD labels, 2 per sheet                      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="L6015" size="A4" _description="CD/DVD Labels">
+  <Template brand="Avery" part="L6015" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.827pt" hole="58.1102pt" waste="9.07087pt">
@@ -86,9 +86,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6121 family: Allround labels.                                 -->
+  <!-- Avery 6121 family: Multipurpose labels.                             -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6121" size="A4" _description="Allround labels">
+  <Template brand="Avery" part="6121" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="107.928pt" height="60.12pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="8.496pt"/>
@@ -178,7 +178,7 @@
   <!-- =================================================================== -->
   <!-- Avery 7165 family: Address labels                                   -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="7165" size="A4" _description="Address Labels">
+  <Template brand="Avery" part="7165" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="280.8pt" height="191.991pt" round="0pt" waste="0pt">
@@ -207,9 +207,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 7414 family: Business Cards, 52mm x 90mm, 10 per sheet        -->
+  <!-- Avery 7414 family: Business cards, 52mm x 90mm, 10 per sheet        -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="7414" size="A4" _description="Business Cards">
+  <Template brand="Avery" part="7414" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255.1" height="147.4" round="0">
@@ -222,9 +222,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 7664 family: Diskette Labels, 70mm x 71.9 mm, 8 per sheet     -->
+  <!-- Avery 7664 family: Diskette labels, 70mm x 71.9 mm, 8 per sheet     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="7664" size="A4" _description="Diskette Labels">
+  <Template brand="Avery" part="7664" size="A4" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="70mm" height="71.9mm" round="2.5mm">
@@ -237,9 +237,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery L7676 family: CD/DVD Labels, 2 per sheet                      -->
+  <!-- Avery L7676 family: CD/DVD labels, 2 per sheet                      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="L7676" size="A4" _description="CD/DVD Labels">
+  <Template brand="Avery" part="L7676" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.827pt" hole="24.9449pt" waste="5.66929pt">
@@ -249,9 +249,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery J8157: Mailing Labels, 33 per sheet	                   -->
+  <!-- Avery J8157: Mailing labels, 33 per sheet	                   -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="J8157" size="A4" _description="Mailing Labels">
+  <Template brand="Avery" part="J8157" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="64mm" height="24.3mm" round="3mm" x_waste="0mm" y_waste="0mm">
@@ -262,9 +262,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 8414 family: Business Cards, 50.8 x 87.0 mm, 10 per sheet     -->
+  <!-- Avery 8414 family: Business cards, 50.8 x 87.0 mm, 10 per sheet     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8414" size="A4" _description="Business Cards">
+  <Template brand="Avery" part="8414" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="246.6" height="144" round="0">
@@ -277,9 +277,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Avery J8435: CD Inlets Booklet part                             -->
+  <!-- Avery J8435: CD/DVD inlets Booklet part                         -->
   <!-- =============================================================== -->
-  <Template brand="Avery" part="8435A" size="A4" _description="CD Booklet">
+  <Template brand="Avery" part="8435A" size="A4" _description="CD/DVD booklet">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="125mm" round="0">
       <Markup-margin size="2mm"/>
@@ -293,9 +293,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Avery J8435: CD Inlets Inlet part                           -->
+  <!-- Avery J8435: CD/DVD inlets Inlet part                           -->
   <!-- =============================================================== -->
-  <Template brand="Avery" part="8435B" size="A4" _description="CD Inlet">
+  <Template brand="Avery" part="8435B" size="A4" _description="CD/DVD inlet">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="122mm" round="0">
       <Markup-margin size="2mm"/>
@@ -312,7 +312,7 @@
   <!-- =================================================================== -->
   <!-- Avery 8651 family: Mailing labels, 38.1 x 21.2 mm, 65 per sheet     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8651" size="A4" _description="Mini Address Labels">
+  <Template brand="Avery" part="8651" size="A4" _description="Mini address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="108" height="60.09" round="5">
@@ -331,7 +331,7 @@
   <!-- =================================================================== -->
   <!-- Avery 8658 family: Identification labels                            -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8658" size="A4" _description="Identification Labels">
+  <Template brand="Avery" part="8658" size="A4" _description="ID labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="25.4mm" height="10mm" round="1mm" x_waste="0mm" y_waste="0mm">
       <Markup-margin size="2mm"/>
@@ -359,9 +359,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Avery J8676A: CD/DVD Labels 2 per sheet                         -->
+  <!-- Avery J8676A: CD/DVD labels 2 per sheet                         -->
   <!-- =============================================================== -->
-  <Template brand="Avery" part="8676" size="A4" _description="CD/DVD Labels">
+  <Template brand="Avery" part="8676" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="17" waste="5">
@@ -374,9 +374,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Avery 18036 Mailing Labels, 70mm x 32mm, 27 per sheet           -->
+  <!-- Avery 18036 Mailing labels, 70mm x 32mm, 27 per sheet           -->
   <!-- =============================================================== -->
-  <Template brand="Avery" part="18036" size="A4" _description="Mailing Labels">
+  <Template brand="Avery" part="18036" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="198" height="91" round="0">
@@ -387,9 +387,9 @@
 
 
   <!-- ============================================================ -->
-  <!-- Avery 32015: Business Cards                                  -->
+  <!-- Avery 32015: Business cards                                  -->
   <!-- ============================================================ -->
-  <Template brand="Avery" part="32015" size="A4" _description="Business Cards">
+  <Template brand="Avery" part="32015" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="85mm" height="54mm" round="0mm">
@@ -402,9 +402,9 @@
 
 
   <!-- ============================================================ -->
-  <!-- Avery 38931 Family: Rectangular Labels                       -->
+  <!-- Avery 38931 Family: Rectangular labels                       -->
   <!-- ============================================================ -->
-  <Template brand="Avery" part="38931" size="A4" _description="Rectangular Labels">
+  <Template brand="Avery" part="38931" 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">
@@ -418,9 +418,9 @@
   
   
   <!-- ============================================================ -->
-  <!-- Avery C32011-10: Business Cards		                    -->
+  <!-- Avery C32011-10: Business cards		                    -->
   <!-- ============================================================ -->
-  <Template brand="Avery" part="C32011-10" size="A4" _description="Business Cards">
+  <Template brand="Avery" part="C32011-10" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="85mm" height="54mm" round="0mm" x_waste="0mm" y_waste="0mm">
diff --git a/templates/avery-other-templates.xml b/templates/avery-other-templates.xml
index bb21ef6..25ccfbd 100644
--- a/templates/avery-other-templates.xml
+++ b/templates/avery-other-templates.xml
@@ -8,10 +8,10 @@
   <!-- ******************************************************************** -->
 
   <!-- =================================================================== -->
-  <!-- Avery 6141 family: File Folder Labels, 5/8'' x 2_3/4'', 7 per sheet -->
+  <!-- Avery 6141 family: File folder labels, 5/8'' x 2_3/4'', 7 per sheet -->
   <!-- =================================================================== -->
   <Template brand="Avery" part="6141" size="Other" width="207pt" height="351pt"
-            _description="File Folder Labels">
+            _description="File folder labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198pt" height="45pt" round="4.5pt" waste="0pt">
       <Markup-margin size="4.5pt"/>
diff --git a/templates/avery-us-templates.xml b/templates/avery-us-templates.xml
index f7ae339..87aae27 100644
--- a/templates/avery-us-templates.xml
+++ b/templates/avery-us-templates.xml
@@ -15,7 +15,7 @@
   <!-- =================================================================== -->
   <!-- Avery 3274.1 family: Square stickers, 2_1/2'' x 2_1/2, 9 per sheetx  -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="3274.1" size="US-Letter" _description="Square Labels">
+  <Template brand="Avery" part="3274.1" size="US-Letter" _description="Square labels">
     <Meta category="label"/>
     <Meta category="square-label"/>
     <Meta category="rectangle-label"/>
@@ -31,7 +31,7 @@
   <!-- =================================================================== -->
   <!-- Avery 3274.2 family: Small round stickers, 1_1/2'', 20 per sheet  x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="3274.2" size="US-Letter" _description="Small Round Labels">
+  <Template brand="Avery" part="3274.2" size="US-Letter" _description="Small round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="0.75in">
@@ -47,7 +47,7 @@
   <!-- =================================================================== -->
   <!-- Avery 3274.3 family: Large round stickers, 2_1/2'', 9 per sheet   x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="3274.3" size="US-Letter" _description="Large Round Labels">
+  <Template brand="Avery" part="3274.3" size="US-Letter" _description="Large round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.25in">
@@ -59,7 +59,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5026 family: File folder labels.                              -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5026" size="US-Letter" _description="File Folder Labels">
+  <Template brand="Avery" part="5026" size="US-Letter" _description="File folder labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="3.4375in" height="0.9375in" round="0.0625in" waste="5pt">
       <Markup-margin size="0.0625in"/>
@@ -68,9 +68,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Avery 5126 family: Shipping Labels.                                 -->
+  <!-- Avery 5126 family: Shipping labels.                                 -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5126" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="5126" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -87,9 +87,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5159 family: Address Labels, 1_1/2'' x 4'', 14 per sheet      -->
+  <!-- Avery 5159 family: Address labels, 1_1/2'' x 4'', 14 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5159" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5159" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.5in" round="0.0625in" waste="0in">
@@ -100,9 +100,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5160 family: Address Labels, 2_5/8'' x 1'', 20 per sheet      -->
+  <!-- Avery 5160 family: Address labels, 2_5/8'' x 1'', 20 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5160" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5160" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="2.625in" height="1in" round="0.0625in">
@@ -144,9 +144,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5161 family: Address Labels, 1'' x 4'', 20 per sheet        x -->
+  <!-- Avery 5161 family: Address labels, 1'' x 4'', 20 per sheet        x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5161" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5161" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1in" round="0.0625in">
@@ -163,9 +163,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5162 family: Address Labels, 1_1/3'' x 4'', 14 per sheet    x -->
+  <!-- Avery 5162 family: Address labels, 1_1/3'' x 4'', 14 per sheet    x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5162" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5162" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.333333333in" round="0.0625in">
@@ -192,9 +192,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5163 family: Shipping Labels, 4'' x 2'', 10 per sheet       x -->
+  <!-- Avery 5163 family: Shipping labels, 4'' x 2'', 10 per sheet       x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5163" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="5163" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="2in" round="0.125in">
@@ -222,9 +222,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5164 family: Shipping Labels. 4'' x 3_1/3'', 6 per sheet    x -->
+  <!-- Avery 5164 family: Shipping labels. 4'' x 3_1/3'', 6 per sheet    x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5164" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="5164" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="3.333333333in" round="0.125in">
@@ -244,9 +244,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5167 family: Address Labels, 1_3/4'' x 1/2'', 80 per sheet  x -->
+  <!-- Avery 5167 family: Address labels, 1_3/4'' x 1/2'', 80 per sheet  x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5167" size="US-Letter" _description="Return Address Labels">
+  <Template brand="Avery" part="5167" size="US-Letter" _description="Return address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="1.75in" height="0.5in" round="0.0625in">
@@ -271,9 +271,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5168 family:  Shipping Labels 5'' x 3_1/2'', 4 per sheet      -->
+  <!-- Avery 5168 family:  Shipping labels 5'' x 3_1/2'', 4 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5168" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="5168" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.5in" height="5in" round="0.0625in" waste="0in">
@@ -284,9 +284,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5193 family: Round Labels                                     -->
+  <!-- Avery 5193 family: Round labels                                     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5193" size="US-Letter" _description="Round Labels">
+  <Template brand="Avery" part="5193" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="0.8125in" waste="0pt">
@@ -299,9 +299,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5194 family: Round Labels, 12 per sheet.                      -->
+  <!-- Avery 5194 family: Round labels, 12 per sheet.                      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5194" size="US-Letter" _description="Round Labels">
+  <Template brand="Avery" part="5194" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.25in" waste="0pt">
@@ -314,9 +314,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5195 family: Round Labels                                     -->
+  <!-- Avery 5195 family: Round labels                                     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5195" size="US-Letter" _description="Round Labels">
+  <Template brand="Avery" part="5195" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.65625in" waste="0pt">
@@ -329,9 +329,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5196 family: Diskette Labels, 2_3/4'' x 2_3/4'', 9 per sheetx -->
+  <!-- Avery 5196 family: Diskette labels, 2_3/4'' x 2_3/4'', 9 per sheetx -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5196" size="US-Letter" _description="Diskette Labels">
+  <Template brand="Avery" part="5196" size="US-Letter" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="2.75in" height="2.75in" round="0.0625in">
@@ -348,9 +348,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5197 family: Mailing Labels                                   -->
+  <!-- Avery 5197 family: Mailing labels                                   -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5197" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5197" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.5in" round="0.0625in">
@@ -361,9 +361,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5305 family: Tent Cards, 2_1/2'' x 8_1/2'', 2 per sheet       -->
+  <!-- Avery 5305 family: Tent cards, 2_1/2'' x 8_1/2'', 2 per sheet       -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5305" size="US-Letter" _description="Tent Cards">
+  <Template brand="Avery" part="5305" size="US-Letter" _description="Tent cards">
     <Meta category="card"/>
     <Label-rectangle id="0" width="612pt" height="180pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="27pt"/>
@@ -373,9 +373,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5366 family: Filing Labels, 2/3'' x 3_7/16'', 30 per sheet  x -->
+  <!-- Avery 5366 family: Filing labels, 2/3'' x 3_7/16'', 30 per sheet  x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5366" size="US-Letter" _description="Filing Labels">
+  <Template brand="Avery" part="5366" size="US-Letter" _description="Filing labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="3.4375in" height="0.666666667in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
@@ -406,9 +406,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5371 family: Business Cards, 2'' x 3_1/2'', 10 per sheet    x -->
+  <!-- Avery 5371 family: Business cards, 2'' x 3_1/2'', 10 per sheet    x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5371" size="US-Letter" _description="Business Cards">
+  <Template brand="Avery" part="5371" size="US-Letter" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="3.5in" height="2in" round="0">
@@ -459,9 +459,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5388 family: Index Cards, 5'' x 3'', 3 per sheet              -->
+  <!-- Avery 5388 family: Index cards, 5'' x 3'', 3 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5388" size="US-Letter" _description="Index Cards">
+  <Template brand="Avery" part="5388" size="US-Letter" _description="Index cards">
     <Meta category="card"/>
     <Label-rectangle id="0" width="5in" height="3in" round="0pt" waste="0pt">
       <Markup-margin size="0.125in"/>
@@ -474,7 +474,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5389 family: Post Cards, 6'' x 4'', 2 per sheet               -->
+  <!-- Avery 5389 family: Post cards, 6'' x 4'', 2 per sheet               -->
   <!-- =================================================================== -->
   <Template brand="Avery" part="5389" size="US-Letter" _description="Post cards">
     <Meta category="card"/>
@@ -487,9 +487,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5395 family: Name Badge Labels, 2_1/3'' x 3_3/8'', 8 per sheetx -->
+  <!-- Avery 5395 family: Name badge labels, 2_1/3'' x 3_3/8'', 8 per sheetx -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5395" size="US-Letter" _description="Name Badge Labels">
+  <Template brand="Avery" part="5395" size="US-Letter" _description="Name badge labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="3.375in" height="2.333333333in" round="0.1875in" waste="0.0625in">
       <Markup-margin size="0.0625in"/>
@@ -504,9 +504,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5663 family: Mailing Labels                                   -->
+  <!-- Avery 5663 family: Mailing labels                                   -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5663" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5663" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4.25in" height="2in" round="0in">
@@ -517,9 +517,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5824 family: CD/DVD Labels (face only), 2 per sheet         * -->
+  <!-- Avery 5824 family: CD/DVD labels (face only), 2 per sheet         * -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5824" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Avery" part="5824" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -530,10 +530,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5931 family: CD/DVD Labels (face only), 2 per sheet         x -->
+  <!-- Avery 5931 family: CD/DVD labels (face only), 2 per sheet         x -->
   <!-- =================================================================== -->
   <Template brand="Avery" part="5931-Disc" size="US-Letter"
-         _description="CD/DVD Labels (Disc Labels)">
+         _description="CD/DVD labels (disc labels)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="2.3125in" hole="0.8125in" waste="0.0625in">
@@ -569,10 +569,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5931 family: CD/DVD Labels (spine only), 4 per sheet        x -->
+  <!-- Avery 5931 family: CD/DVD labels (spine only), 4 per sheet        x -->
   <!-- =================================================================== -->
   <Template brand="Avery" part="5931-Spine" size="US-Letter" 
-         _description="CD/DVD Labels (Spine Labels)">
+         _description="CD/DVD labels (spine labels)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="0.21875in" height="4.6875in" round="0.0625in" waste="0.0625in">
@@ -603,10 +603,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5997face family: VCR Labels, 1_7/8'' x 3_1/16'', 10 per sheet -->
+  <!-- Avery 5997face family: VCR labels, 1_7/8'' x 3_1/16'', 10 per sheet -->
   <!-- =================================================================== -->
   <Template brand="Avery" part="5997-Face" size="US-Letter"
-         _description="Video Tape Face Labels">
+         _description="Video tape face labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="220" height="133" round="5">
@@ -619,10 +619,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 5997spine family: VCR Labels, 2/3'' x 5_3/4'',15 per sheet    -->
+  <!-- Avery 5997spine family: VCR labels, 2/3'' x 5_3/4'',15 per sheet    -->
   <!-- =================================================================== -->
   <Template brand="Avery" part="5997-Spine" size="US-Letter"
-        _description="Video Tape Spine Labels">
+        _description="Video tape spine labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="414" height="48" round="5">
@@ -635,9 +635,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6490 family: Diskette Labels, 2_11/16'' x 2'', 15 per sheet x -->
+  <!-- Avery 6490 family: Diskette labels, 2_11/16'' x 2'', 15 per sheet x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6490" size="US-Letter" _description="Diskette Labels">
+  <Template brand="Avery" part="6490" size="US-Letter" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="2.6875in" height="2in" round="0.0625in">
@@ -652,9 +652,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6570 family: ID Labels.                                       -->
+  <!-- Avery 6570 family: ID labels.                                       -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6570" size="US-Letter" _description="ID Labels">
+  <Template brand="Avery" part="6570" size="US-Letter" _description="ID labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="126pt" height="90pt" round="4.464pt" x_waste="6.768pt" y_waste="0pt">
       <Markup-margin size="9pt"/>
@@ -664,9 +664,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6573 family: Shipping Labels.                                 -->
+  <!-- Avery 6573 family: Shipping labels.                                 -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6573" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="6573" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="8.12992in" height="5in" round="0.0625in" waste="0">
@@ -677,9 +677,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6871 family: Shipping Labels.                                 -->
+  <!-- Avery 6871 family: Shipping labels.                                 -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6871" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="6871" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="2.375in" height="1.25in" round="0.0625in" waste="0.125in">
@@ -690,9 +690,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6873 family: Shipping Labels.                                 -->
+  <!-- Avery 6873 family: Shipping labels.                                 -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6873" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="6873" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.75in" height="2.0in" round="0.0625in" waste="0.125">
@@ -703,9 +703,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6874 family: Shipping Labels.                                 -->
+  <!-- Avery 6874 family: Shipping labels.                                 -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6874" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="6874" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.75in" height="3.0in" round="0.0625in" waste="0.125">
@@ -716,9 +716,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 6879 family: Address Labels, 1_1/4'' x 3_3/4'', 12 per sheetx -->
+  <!-- Avery 6879 family: Address labels, 1_1/4'' x 3_3/4'', 12 per sheetx -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="6879" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="6879" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.75in" height="1.25in" round="0.0625in" waste="5pt">
@@ -733,7 +733,7 @@
   <!-- =================================================================== -->
   <!-- Avery 8165 family: Full-page label, 8_1/2'' x 11'', 1 per sheet   x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8165" size="US-Letter" _description="Full Sheet Labels">
+  <Template brand="Avery" part="8165" size="US-Letter" _description="Full-page labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="8.5in" height="11.in" round="0">
       <Markup-margin size="0.0625in"/>
@@ -792,7 +792,7 @@
   <!-- =================================================================== -->
   <!-- Avery 8195 family: Return address labels                            -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8195" size="US-Letter" _description="Return Address Labels">
+  <Template brand="Avery" part="8195" size="US-Letter" _description="Return address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="1.75in" height="0.666in" round="0.063in" x_waste="0in" y_waste="0in">
@@ -803,9 +803,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 8373 family: Business Cards, 2'' x 3_1/2'', 8 per sheet     x -->
+  <!-- Avery 8373 family: Business cards, 2'' x 3_1/2'', 8 per sheet     x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8373" size="US-Letter" _description="Business Cards">
+  <Template brand="Avery" part="8373" size="US-Letter" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="3.5in" height="2in" round="0" waste="0.0625in">
@@ -821,9 +821,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Avery 8960 family: CD/DVD Labels.                                   -->
+  <!-- Avery 8960 family: CD/DVD labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8960" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Avery" part="8960" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="14.1732pt" waste="9.07087pt">
@@ -837,7 +837,7 @@
   <!-- Avery labels in tech builitin 152 				    -->
   <!-- http://www.avery.com/help/tech_bulletin.jsp?tech_bull_code=152       -->
   <!-- ******************************************************************** -->
-  <Template brand="Avery" part="LSK-8" size="US-Letter" _description="Divider Labels">
+  <Template brand="Avery" part="LSK-8" size="US-Letter" _description="Divider labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="1.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -845,14 +845,14 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template brand="Avery" part="LSK-8.5" size="US-Letter" _description="Divider Labels">
+  <Template brand="Avery" part="LSK-8.5" size="US-Letter" _description="Divider labels">
     <Meta category="label"/>
     <Label-rectangle id="1" width="1.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="20" x0="0.5in" y0="0.5in" dx="2.13in" dy="0.5in"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Avery" part="LSK-5" size="US-Letter" _description="Divider Labels">
+  <Template brand="Avery" part="LSK-5" size="US-Letter" _description="Divider labels">
     <Meta category="label"/>
     <Label-rectangle id="2" width="1.75in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -860,14 +860,14 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template brand="Avery" part="LSK-5.5" size="US-Letter" _description="Divider Labels">
+  <Template brand="Avery" part="LSK-5.5" size="US-Letter" _description="Divider labels">
     <Meta category="label"/>
     <Label-rectangle id="3" width="1.75in" height="0.5in" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="20" x0="0.5in" y0="0.3in" dx="2.05in" dy="0.5in"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Avery" part="LSK-3" size="US-Letter" _description="Divider Labels">
+  <Template brand="Avery" part="LSK-3" size="US-Letter" _description="Divider labels">
     <Meta category="label"/>
     <Label-rectangle id="4" width="3.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -875,7 +875,7 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template brand="Avery" part="LSK-3.5" size="US-Letter" _description="Divider Labels">
+  <Template brand="Avery" part="LSK-3.5" size="US-Letter" _description="Divider labels">
     <Meta category="label"/>
     <Label-rectangle id="5" width="3.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
diff --git a/templates/begalabel-templates.xml b/templates/begalabel-templates.xml
index b0189b2..49393fa 100644
--- a/templates/begalabel-templates.xml
+++ b/templates/begalabel-templates.xml
@@ -458,7 +458,7 @@
   </Template>
 
 
-  <Template brand="Begalabel" part="M-200 (medium)" size="US-Letter" _description="CD/DVD Labels">
+  <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"/>
@@ -475,7 +475,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="M-400" size="US-Letter" _description="CD/DVD Labels">
+  <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"/>
@@ -484,7 +484,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Begalabel" part="M-600 (medium)" size="US-Letter" _description="CD/DVD Labels">
+  <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"/>
@@ -510,7 +510,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="M-800 (medium)" size="US-Letter" _description="CD/DVD Labels">
+  <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"/>
@@ -527,7 +527,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="M-1000" size="US-Letter" _description="Cassette Tape Face">
+  <Template brand="Begalabel" part="M-1000" size="US-Letter" _description="Cassette labels">
     <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"/>
diff --git a/templates/brother-other-templates.xml b/templates/brother-other-templates.xml
index f24be69..cc554e3 100644
--- a/templates/brother-other-templates.xml
+++ b/templates/brother-other-templates.xml
@@ -8,9 +8,7 @@
    Labels for the Brother QL-500/550/650 PC Label 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.
+   in version 1.1 of the 'Brother-QL-500-ptouch.ppd' file.
 
    Currently only have templates for a few of the popular sizes.
       
@@ -18,7 +16,7 @@
    *********************************************************************
   -->
 
-  <Template brand="Brother" part="DK-1201" size="Other" width="82pt" height="255pt" _description="Standard Address Labels 29mm x 90mm">
+  <Template brand="Brother" part="DK-1201" size="Other" width="82pt" height="255pt" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="82pt" height="255pt" round="4pt" x_waste="0" y_waste="0">
@@ -27,7 +25,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-1202" size="Other" width="176pt" height="283pt" _description="Shipping Labels 62mm x 100mm">
+  <Template brand="Brother" part="DK-1202" size="Other" width="176pt" height="283pt" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="176pt" height="283pt" round="4pt" x_waste="0" y_waste="0">
@@ -36,7 +34,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-1204" size="Other" width="48pt" height="153pt" _description="Multi Purpose Labels 17mm x 54mm">
+  <Template brand="Brother" part="DK-1204" size="Other" width="48pt" height="153pt" _description="Multipurpose labels">
     <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" />
@@ -44,7 +42,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-1208" size="Other" width="108pt" height="255pt" _description="Standard Address Labels 38mm x 90mm">
+  <Template brand="Brother" part="DK-1208" size="Other" width="108pt" height="255pt" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="108pt" height="255pt" round="4pt" x_waste="0" y_waste="0">
@@ -54,58 +52,4 @@
   </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,
-   which is smaller than the media size.  This is because (at least with
-   the Brother driver) coordinates are relative the corner of this area.
-      
-   *********************************************************************
-   *********************************************************************
-  -->
-
-  <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"/>
-    <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-old" size="Other" width="58.93mm" height="93.20mm" _description="Shipping Labels 62mm x 100mm (Old)">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <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-old" size="Other" width="13.97mm" height="47.92mm" _description="Multi Purpose Labels 17mm x 54mm (Old)">
-    <Meta category="label"/>
-    <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-old" size="Other" width="34.91mm" height="83.90mm" _description="Standard Address Labels 38mm x 90mm (Old)">
-    <Meta category="label"/>
-    <Meta category="mail"/>
-    <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>
-  </Template>
-
-
 </Glabels-templates>
diff --git a/templates/cablelabel-templates.xml b/templates/cablelabel-templates.xml
index cbacebe..73de101 100644
--- a/templates/cablelabel-templates.xml
+++ b/templates/cablelabel-templates.xml
@@ -13,9 +13,9 @@
 
 
   <!-- ============================================================ -->
-  <!-- Cable Label Co CableBug: Mini Labels                         -->
+  <!-- Cable Label Co CableBug: Mini labels                         -->
   <!-- ============================================================ -->
-  <Template brand="Cable Label Co" part="CableBug" size="A4" _description="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">
diff --git a/templates/canon-other-templates.xml b/templates/canon-other-templates.xml
index c3f181f..d61ae61 100644
--- a/templates/canon-other-templates.xml
+++ b/templates/canon-other-templates.xml
@@ -6,7 +6,7 @@
   <!-- =================================================================== -->
   <!-- Type J CD/DVD Tray.                                                 -->
   <!-- =================================================================== -->
-  <Template brand="Canon" part="Type J Tray" size="Other" width="135mm" height="295mm" _description="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"/>
diff --git a/templates/categories.xml b/templates/categories.xml
index f15b3d8..283ae18 100644
--- a/templates/categories.xml
+++ b/templates/categories.xml
@@ -9,7 +9,7 @@
   <Category id="rectangle-label"  _name="Rectangular labels"/>
   <Category id="card"             _name="Any card"/>
   <Category id="business-card"    _name="Business cards"/>
-  <Category id="name-badge"       _name="Name Badge"/>
+  <Category id="name-badge"       _name="Name badges"/>
   <Category id="media"            _name="CD/DVD or other media"/>
   <Category id="mail"             _name="Mailing/shipping products"/>
   <Category id="foldable"         _name="Foldable cards"/>
diff --git a/templates/databecker-iso-templates.xml b/templates/databecker-iso-templates.xml
index 1c2d87f..9515df7 100644
--- a/templates/databecker-iso-templates.xml
+++ b/templates/databecker-iso-templates.xml
@@ -3,10 +3,10 @@
 <Glabels-templates xmlns="http://glabels.org/xmlns/3.0/">
 
   <!-- =================================================================== -->
-  <!-- DATA BECKER: Business Cards, 50 x 90 mm, 10 per sheet               -->
+  <!-- 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">
+  <Template brand="DataBecker" part="BC?" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255" height="142" round="0">
@@ -17,9 +17,9 @@
 
  
   <!-- ===================================================================-->
-  <!-- Data Becker CD/DVD Labels (face only), 2 per sheet                 -->
+  <!-- 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)">
+  <Template brand="DataBecker" part="0335" size="A4" _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="164.409" hole="58.1102" waste="5">
@@ -32,9 +32,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- DATA BECKER 0491 Business Cards, 50 x 90 mm, 10 per sheet           -->
+  <!-- DATA BECKER 0491 Business cards, 50 x 90 mm, 10 per sheet           -->
   <!-- =================================================================== -->
-  <Template brand="DataBecker" part="0491" size="A4" _description="Business Cards">
+  <Template brand="DataBecker" part="0491" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="90mm" height="50mm" round="0">
@@ -45,9 +45,9 @@
 
  
   <!-- =================================================================== -->
-  <!-- DATA BECKER 0526 Address Labels.                                    -->
+  <!-- DATA BECKER 0526 Address labels.                                    -->
   <!-- =================================================================== -->
-  <Template brand="DataBecker" part="0526" size="A4" _description="Address Labels">
+  <Template brand="DataBecker" part="0526" size="A4" _description="Address 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">
@@ -58,9 +58,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- DATA BECKER 0562 CD Labels.                                         -->
+  <!-- DATA BECKER 0562 CD/DVD labels.                                     -->
   <!-- =================================================================== -->
-  <Template brand="DataBecker" part="0562" size="A4" _description="CD Labels">
+  <Template brand="DataBecker" part="0562" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="58mm" hole="20.6375mm" waste="2mm">
@@ -72,9 +72,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- DATA BECKER 0598 Address Labels.                                    -->
+  <!-- DATA BECKER 0598 Address labels.                                    -->
   <!-- =================================================================== -->
-  <Template brand="DataBecker" part="0598" size="A4" _description="Address Labels">
+  <Template brand="DataBecker" part="0598" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="274.961pt" height="119.906pt" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -84,10 +84,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- DATA BECKER 0599 Rectangular Labels.                                -->
+  <!-- DATA BECKER 0599 Rectangular labels.                                -->
   <!-- =================================================================== -->
-
-  <Template brand="DataBecker" part="0599" size="A4" _description="Rectangular Labels">
+  <Template brand="DataBecker" part="0599" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="105mm" height="148mm" round="0mm" x_waste="0mm" y_waste="0mm">
diff --git a/templates/dataline-iso-templates.xml b/templates/dataline-iso-templates.xml
index 758b2ae..c701d1d 100644
--- a/templates/dataline-iso-templates.xml
+++ b/templates/dataline-iso-templates.xml
@@ -24,9 +24,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Dataline 57125: Business Cards, 54.0 x 86.0 mm, 10 per sheet        -->
+  <!-- Dataline 57125: Business cards, 54.0 x 86.0 mm, 10 per sheet        -->
   <!-- =================================================================== -->
-  <Template brand="Dataline" part="57125" size="A4" _description="Business Cards">
+  <Template brand="Dataline" part="57125" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="86.00mm" height="54.00mm" round="0">
@@ -36,7 +36,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Dataline 57126: Business Cards, 90.0 x 50.8 mm, 10 per sheet        -->
+  <!-- Dataline 57126: Business cards, 90.0 x 50.8 mm, 10 per sheet        -->
   <!-- =================================================================== -->
   <Template brand="Dataline" part="57126" size="A4" _description="Business cards">
     <Meta category="card"/>
@@ -48,7 +48,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Dataline 57127: Membership Cards, 86.0 x 54.0 mm, 10 per sheet      -->
+  <!-- Dataline 57127: Membership cards, 86.0 x 54.0 mm, 10 per sheet      -->
   <!-- =================================================================== -->
   <Template brand="Dataline" part="57127" size="A4" _description="Membership cards">
     <Meta category="card"/>
@@ -59,9 +59,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Dataline 57130: Shipping Labels, 199.6 x 289.1 mm, 1 per sheet      -->
+  <!-- Dataline 57130: Shipping labels, 199.6 x 289.1 mm, 1 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Dataline" part="57130" size="A4" _description="Shipping Labels">
+  <Template brand="Dataline" part="57130" size="A4" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="199.6mm" height="289.1mm" round="0mm" x_waste="2mm" y_waste="2mm">
@@ -71,9 +71,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Dataline 57131: Shipping Labels, 199.6 x 143.5 mm, 2 per sheet      -->
+  <!-- Dataline 57131: Shipping labels, 199.6 x 143.5 mm, 2 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Dataline" part="57131" size="A4" _description="Shipping Labels">
+  <Template brand="Dataline" part="57131" size="A4" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="199.6mm" height="143.5mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -83,9 +83,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Dataline 57132: Shipping Labels, 99.1 x 139 mm, 1 per sheet  	   -->
+  <!-- Dataline 57132: Shipping labels, 99.1 x 139 mm, 1 per sheet  	   -->
   <!-- =================================================================== -->
-  <Template brand="Dataline" part="57132" size="A4" _description="Shipping Labels">
+  <Template brand="Dataline" part="57132" size="A4" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="99.1mm" height="139mm" round="0mm" x_waste="0mm" y_waste="0mm">
diff --git a/templates/decadry-iso-templates.xml b/templates/decadry-iso-templates.xml
index 21ac6fe..51906bc 100644
--- a/templates/decadry-iso-templates.xml
+++ b/templates/decadry-iso-templates.xml
@@ -31,9 +31,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- DECAdry DLW-1734: Mailing Labels.                                   -->
+  <!-- DECAdry DLW-1734: Mailing labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="DECAdry" part="DLW-1734" size="A4" _description="Mailing Labels">
+  <Template brand="DECAdry" part="DLW-1734" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="99.1mm" height="67.7mm" round="2mm" x_waste="0mm" y_waste="0mm">
@@ -46,9 +46,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- DECAdry DLW-1786: Mailing Labels.                                   -->
+  <!-- DECAdry DLW-1786: Mailing labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="DECAdry" part="DLW-1786" size="A4" _description="Mailing Labels">
+  <Template brand="DECAdry" part="DLW-1786" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="105mm" height="39mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -61,9 +61,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- DECAdry DLW-1787: Mailing Labels.                                   -->
+  <!-- DECAdry DLW-1787: Mailing labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="DECAdry" part="DLW-1787" size="A4" _description="Mailing Labels">
+  <Template brand="DECAdry" part="DLW-1787" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="70mm" height="35mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -76,9 +76,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- DECAdry OCC-3342 Business Cards.                                    -->
+  <!-- DECAdry OCC-3342 Business cards.                                    -->
   <!-- =================================================================== -->
-  <Template brand="DECAdry" part="OCC-3342" size="A4" _description="Business Cards">
+  <Template brand="DECAdry" part="OCC-3342" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="240.945pt" height="153.071pt" round="0pt" x_waste="0pt" y_waste="0pt">
diff --git a/templates/desmat-templates.xml b/templates/desmat-templates.xml
index 6a2847e..40b16b9 100644
--- a/templates/desmat-templates.xml
+++ b/templates/desmat-templates.xml
@@ -13,9 +13,9 @@
 
 
   <!-- ============================================================ -->
-  <!-- Desmat A4ST-3CD - CD Labels, 3 per sheet                     -->
+  <!-- Desmat A4ST-3CD - CD/DVD labels, 3 per sheet                 -->
   <!-- ============================================================ -->
-  <Template brand="Desmat" part="A4ST-3CD" size="A4" _description="CD Labels">
+  <Template brand="Desmat" part="A4ST-3CD" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.desmat.com/product.php?id=34"/>
diff --git a/templates/dymo-other-templates.xml b/templates/dymo-other-templates.xml
index 7193fc9..f21494d 100644
--- a/templates/dymo-other-templates.xml
+++ b/templates/dymo-other-templates.xml
@@ -3,9 +3,9 @@
 <Glabels-templates>
 
   <!-- =================================================================== -->
-  <!-- Dymo 11352 Return Address labels.                                   -->
+  <!-- Dymo 11352 Return address labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="11352" size="Other" width="25mm" height="54mm" _description="Return Address Labels">
+  <Template brand="Dymo" part="11352" size="Other" width="25mm" height="54mm" _description="Return address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://global.dymo.com/deAT/Labels/S0722520.html"/>
@@ -16,9 +16,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Dymo 11353 Multipurpose Labels.                                     -->
+  <!-- Dymo 11353 Multipurpose labels.                                     -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="11353" size="Other" width="13mm" height="25mm" _description="Multipurpose 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="13mm" height="25mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -28,9 +28,9 @@
   </Template>  
   
   <!-- =================================================================== -->
-  <!-- Dymo 11354 Return Address labels.                                   -->
+  <!-- Dymo 11354 Return address labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="11354" size="Other" width="32mm" height="57mm" _description="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">
@@ -40,9 +40,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Dymo 11355 Return Address labels.                                   -->
+  <!-- Dymo 11355 Return address labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="11355" size="Other" width="19mm" height="51mm" _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="19mm" height="51mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -64,9 +64,9 @@
   </Template>   
   
   <!-- =================================================================== -->
-  <!-- Dymo 30327 File Folder labels.                                      -->
+  <!-- Dymo 30327 File folder labels.                                      -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30327" size="Other" width="14mm" height="87mm" _description="File Folder">
+  <Template brand="Dymo" part="30327" size="Other" width="14mm" height="87mm" _description="File folder labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="filing"/>
@@ -77,9 +77,9 @@
   </Template>  
   
   <!-- =================================================================== -->
-  <!-- Dymo 30258 Multipurpose Labels (was 3.5" Disk labels).              -->
+  <!-- Dymo 30258 Multipurpose labels (was 3.5" Disk labels).              -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30258" size="Other" width="54mm" height="70mm" _description="Multipurpose 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">
@@ -89,9 +89,9 @@
   </Template>  
   
   <!-- =================================================================== -->
-  <!-- Dymo 30332 File Folder labels.                                      -->
+  <!-- Dymo 30332 File folder labels.                                      -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30332" size="Other" width="25mm" height="25mm" _description="Multipurpose Labels">
+  <Template brand="Dymo" part="30332" size="Other" width="25mm" height="25mm" _description="File folder labels">
     <Meta category="label"/>
     <Meta category="square-label"/>
     <Meta category="filing"/>
@@ -102,9 +102,9 @@
   </Template>  
   
  <!-- =================================================================== -->
- <!-- Dymo 30374 Name Badge.                                              -->
+ <!-- Dymo 30374 Name badge.                                              -->
  <!-- =================================================================== -->
-  <Template brand="Dymo" part="30374" size="Other" width="51mm" height="89mm" _description="Name Badges">
+  <Template brand="Dymo" part="30374" size="Other" width="51mm" height="89mm" _description="Name badge labels">
     <Meta category="label"/>
     <Meta category="name-badge"/>
     <Label-rectangle id="0" width="51mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -116,7 +116,7 @@
   <!-- =================================================================== -->
   <!-- Dymo 30376 Hanging Folder labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30376" size="Other" width="14mm" height="51mm" _description="Hanging Folder">
+  <Template brand="Dymo" part="30376" size="Other" width="14mm" height="51mm" _description="Hanging folder labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="filing"/>
@@ -127,9 +127,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Dymo 30856 Name Badge                                               -->
+  <!-- Dymo 30856 Name badge                                               -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="30856" size="Other" width="62mm" height="106mm" _description="Name Badges">
+  <Template brand="Dymo" part="30856" size="Other" width="62mm" height="106mm" _description="Name badge labels">
     <Meta category="label"/>
     <Meta category="name-badge"/>
     <Label-rectangle id="0" width="62mm" height="106mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -141,7 +141,7 @@
   <!-- =================================================================== -->
   <!-- Dymo 99010 Address labels.                                          -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99010" size="Other" width="28mm" height="89mm" _description="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">
@@ -151,9 +151,9 @@
   </Template> 
   
   <!-- =================================================================== -->
-  <!-- Dymo 99012 Large Address labels.                                    -->
+  <!-- Dymo 99012 Large address labels.                                    -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99012" size="Other" width="36mm" height="89mm" _description="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">
@@ -163,9 +163,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Dymo 99013 Large Address labels. Transparent Plastic                -->
+  <!-- Dymo 99013 Large address labels. Transparent Plastic                -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99013" size="Other" width="36mm" height="89mm" _description="Large Address Labels">
+  <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">
@@ -175,9 +175,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Dymo 99014 Shipping Address labels.                                 -->
+  <!-- Dymo 99014 Shipping address labels.                                 -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99014" size="Other" width="54mm" height="101mm" _description="Shipping Address Labels">
+  <Template brand="Dymo" part="99014" size="Other" width="54mm" height="101mm" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta category="name-badge"/>
@@ -188,9 +188,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Dymo 99015 Name Badge.                                              -->
+  <!-- Dymo 99015 Name badge.                                              -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99015" size="Other" width="54mm" height="70mm" _description="Name Badges">
+  <Template brand="Dymo" part="99015" size="Other" width="54mm" height="70mm" _description="Name badge labels">
     <Meta category="label"/>
     <Meta category="name-badge"/>
     <Label-rectangle id="0" width="54mm" height="70mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -202,7 +202,7 @@
   <!-- =================================================================== -->
   <!-- Dymo 99017 Hanging Folder labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99017" size="Other" width="12mm" height="50mm" _description="Hanging Folder">
+  <Template brand="Dymo" part="99017" size="Other" width="12mm" height="50mm" _description="Hanging folder labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="filing"/>
@@ -213,9 +213,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Dymo 99019 Lever Arch labels.                                       -->
+  <!-- Dymo 99019 Lever arch labels.                                       -->
   <!-- =================================================================== -->
-  <Template brand="Dymo" part="99019" size="Other" width="59mm" height="190mm" _description="File Folder">
+  <Template brand="Dymo" part="99019" size="Other" width="59mm" height="190mm" _description="File folder labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="filing"/>
diff --git a/templates/endisch-templates.xml b/templates/endisch-templates.xml
index 565ab6b..03013d7 100644
--- a/templates/endisch-templates.xml
+++ b/templates/endisch-templates.xml
@@ -628,7 +628,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Endisch" part="6510518x" size="A4" _description="Labels A6">
+  <Template brand="Endisch" part="6510518x" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.endihaft.de/en/endisch_labels/laser/105x148_e.html"/>
@@ -698,7 +698,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Endisch" part="6521018x" size="A4" _description="Labels A5">
+  <Template brand="Endisch" part="6521018x" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.endihaft.de/en/endisch_labels/laser/210x148_e.html"/>
@@ -707,7 +707,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Endisch" part="6521029x" size="A4" _description="Labels A4">
+  <Template brand="Endisch" part="6521029x" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.endihaft.de/en/endisch_labels/laser/210x297_e.html"/>
@@ -718,7 +718,7 @@
 
 
 
-  <Template brand="Endisch" part="65420297" size="A3" _description="Labels A3">
+  <Template brand="Endisch" part="65420297" size="A3" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="297mm" height="420mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -726,7 +726,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Endisch" part="SRA3450320" size="SRA3" _description="Labels SRA3">
+  <Template brand="Endisch" part="SRA3450320" size="SRA3" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="320mm" height="450mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -736,7 +736,7 @@
 
 
 
-  <Template brand="Endisch" part="B104147A5" size="A5" _description="Labels A4">
+  <Template brand="Endisch" part="B104147A5" size="A5" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="148mm" height="105mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -744,7 +744,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Endisch" part="B200147A5" size="A5" _description="Labels A4">
+  <Template brand="Endisch" part="B200147A5" size="A5" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="148mm" height="200mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -752,7 +752,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Endisch" part="B210148A5" size="A5" _description="Labels A4">
+  <Template brand="Endisch" part="B210148A5" size="A5" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="148mm" height="210mm" round="0mm" x_waste="0mm" y_waste="0mm">
diff --git a/templates/geha-iso-templates.xml b/templates/geha-iso-templates.xml
index b6ecd31..11a476c 100644
--- a/templates/geha-iso-templates.xml
+++ b/templates/geha-iso-templates.xml
@@ -29,7 +29,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha P68.  Business Cards.                                	   -->
+  <!-- Geha P68.  Business cards.                                	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="P68" size="A4" _description="Business cards">
     <Meta category="card"/>
@@ -44,7 +44,7 @@
   <Template brand="Geha" part="P69" equiv="P68"/>
 
   <!-- =================================================================== -->
-  <!-- Geha P70.  Business Cards.                                	   -->
+  <!-- Geha P70.  Business cards.                                	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="P70" size="A4" _description="Business cards">
     <Meta category="card"/>
@@ -61,7 +61,7 @@
   <Template brand="Geha" part="P73" equiv="P70"/>
 
   <!-- =================================================================== -->
-  <!-- Geha P76.  Greeting Cards.                                	   -->
+  <!-- Geha P76.  Greeting cards.                                	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="P76" size="A4" _description="Greeting cards">
     <Meta category="card"/>
@@ -77,7 +77,7 @@
   <Template brand="Geha" part="P77" equiv="P76"/>
 
   <!-- =================================================================== -->
-  <!-- Geha P78.  Greeting Cards.                                	   -->
+  <!-- Geha P78.  Greeting cards.                                	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="P78" size="A4" _description="Greeting cards">
     <Meta category="card"/>
@@ -93,9 +93,9 @@
   <Template brand="Geha" part="P79" equiv="P78"/>
 
   <!-- =================================================================== -->
-  <!-- Geha P80.  Arch File inserts.                                	   -->
+  <!-- Geha P80.  Arch file inserts.                                	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="P80" size="A4" _description="Arch File inserts">
+  <Template brand="Geha" part="P80" size="A4" _description="Arch file inserts">
     <Meta category="card"/>
     <Meta product_url="http://www.geha.de/index.php?id=837&amp;pid=90891"/>
     <Label-rectangle id="0" width="188mm" height="48mm" round="0mm" x_waste="11mm" y_waste="0mm">
@@ -105,9 +105,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha P81.  Arch File inserts.                                	   -->
+  <!-- Geha P81.  Arch file inserts.                                	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="P81" size="A4" _description="Arch File inserts">
+  <Template brand="Geha" part="P81" size="A4" _description="Arch file inserts">
     <Meta category="card"/>
     <Meta product_url="http://www.geha.de/index.php?id=837&amp;pid=90914"/>
     <Label-rectangle id="0" width="188mm" height="26mm" round="0mm" x_waste="11mm" y_waste="0mm">
@@ -117,9 +117,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z20.  CD/DVD Labels and inlet.                             	   -->
+  <!-- Geha Z20.  CD/DVD labels and inlet.                             	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z20-1" size="A4" _description="CD/DVD Labels">
+  <Template brand="Geha" part="Z20-1" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30200"/>
@@ -131,7 +131,7 @@
 
   <Template brand="Geha" part="Z21-1" equiv="Z20-1"/>
 
-  <Template brand="Geha" part="Z20-2" size="A4" _description="CD/DVD Inlet">
+  <Template brand="Geha" part="Z20-2" size="A4" _description="CD/DVD inlet">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta category="rectangle-label"/>
@@ -145,9 +145,9 @@
   <Template brand="Geha" part="Z21-2" equiv="Z20-2"/>
 
   <!-- =================================================================== -->
-  <!-- Geha Z22.  CD/DVD Labels.                                     	   -->
+  <!-- Geha Z22.  CD/DVD labels.                                     	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z22" size="A4" _description="CD/DVD Labels">
+  <Template brand="Geha" part="Z22" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30101"/>
@@ -174,9 +174,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z25-1.  Video Tape Spine Labels.                           	   -->
+  <!-- Geha Z25-1.  Video tape spine labels.                           	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z25-1" size="A4" _description="Video Tape Spine Labels">
+  <Template brand="Geha" part="Z25-1" size="A4" _description="Video tape spine labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="media"/>
@@ -189,9 +189,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z25-2.  Video Tape Face Labels.                           	   -->
+  <!-- Geha Z25-2.  Video tape face labels.                           	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z25-2" size="A4" _description="Video Tape Face Labels">
+  <Template brand="Geha" part="Z25-2" size="A4" _description="Video tape face labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="media"/>
@@ -203,7 +203,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z40.  Photo Labels.                                     	   -->
+  <!-- Geha Z40.  Photo labels.                                     	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="Z40" size="A4" _description="Photo labels">
     <Meta category="label"/>
@@ -220,7 +220,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z41.  Photo Labels.                                     	   -->
+  <!-- Geha Z41.  Photo labels.                                     	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="Z41" size="A4" _description="Photo labels">
     <Meta category="label"/>
@@ -237,7 +237,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z45.  Photo Labels.                                     	   -->
+  <!-- Geha Z45.  Photo labels.                                     	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="Z45" size="A4" _description="Photo labels">
     <Meta category="label"/>
@@ -254,7 +254,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z46.  Passport Photo Labels.                               	   -->
+  <!-- Geha Z46.  Passport photo labels.                               	   -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="Z46" size="A4" _description="Passport photo labels">
     <Meta category="label"/>
@@ -269,9 +269,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z50.  Large Address Labels.                               	   -->
+  <!-- Geha Z50.  Large address labels.                               	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z50" size="A4" _description="Large Address Labels">
+  <Template brand="Geha" part="Z50" size="A4" _description="Large address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -283,9 +283,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z51.  Medium Address Labels.                               	   -->
+  <!-- Geha Z51.  Medium Address labels.                               	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z51" size="A4" _description="Address Labels">
+  <Template brand="Geha" part="Z51" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -297,9 +297,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z52.  Address Labels.                               	   -->
+  <!-- Geha Z52.  Address labels.                               	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z52" size="A4" _description="Address Labels">
+  <Template brand="Geha" part="Z52" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -311,9 +311,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z53.  Address Labels.                                     	   -->
+  <!-- Geha Z53.  Address labels.                                     	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z53" size="A4" _description="Address Labels">
+  <Template brand="Geha" part="Z53" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -325,9 +325,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z54.  Address Labels.                               	   -->
+  <!-- Geha Z54.  Address labels.                               	   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z54" size="A4" _description="Address Labels">
+  <Template brand="Geha" part="Z54" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta category="rectangle-label"/>
@@ -340,9 +340,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z80.  Arch File Labels.					   -->
+  <!-- Geha Z80.  Arch file labels.					   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z80" size="A4" _description="Arch File Labels">
+  <Template brand="Geha" part="Z80" size="A4" _description="Arch file labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30002"/>
@@ -357,9 +357,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Geha Z81.  Arch File Labels.					   -->
+  <!-- Geha Z81.  Arch file labels.					   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z81" size="A4" _description="Arch File Labels">
+  <Template brand="Geha" part="Z81" size="A4" _description="Arch file labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30026"/>
@@ -373,9 +373,9 @@
   <Template brand="Geha" part="Z89" equiv="Z81"/>
 
   <!-- =================================================================== -->
-  <!-- Geha Z90.  Multi-Purpose Labels.					   -->
+  <!-- Geha Z90.  Multipurpose labels.					   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z90" size="A4" _description="Multi-Purpose Labels">
+  <Template brand="Geha" part="Z90" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30804"/>
@@ -386,9 +386,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z91.  Multi-Purpose Labels.					   -->
+  <!-- Geha Z91.  Multipurpose labels.					   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z91" size="A4" _description="Multi-Purpose Labels">
+  <Template brand="Geha" part="Z91" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30828"/>
@@ -399,9 +399,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z92.  Multi-Purpose Labels.					   -->
+  <!-- Geha Z92.  Multipurpose labels.					   -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z92" size="A4" _description="Multi-Purpose Labels">
+  <Template brand="Geha" part="Z92" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30842"/>
diff --git a/templates/hama-iso-templates.xml b/templates/hama-iso-templates.xml
index de2153e..74e7d61 100644
--- a/templates/hama-iso-templates.xml
+++ b/templates/hama-iso-templates.xml
@@ -92,9 +92,9 @@
   <Template brand="Hama" part="50403" equiv="50402"/>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50430. CD inlets.				                    -->
+  <!-- Hama 50430. CD/DVD inlets.				            -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50430" size="A4" _description="CD inlet">
+  <Template brand="Hama" part="50430" size="A4" _description="CD/DVD inlet">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="119.5mm" height="119.5mm" round="0mm" x_waste="10mm" y_waste="0mm">
@@ -106,9 +106,9 @@
   <Template brand="Hama" part="50431" equiv="50430"/>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50432. CD inlets.				                    -->
+  <!-- Hama 50432. CD/DVD inlets.				            -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50432-1" size="A4" _description="CD inlet (front)">
+  <Template brand="Hama" part="50432-1" size="A4" _description="CD/DVD inlet (front)">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="151mm" height="121mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -118,7 +118,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Hama" part="50432-2" size="A4" _description="CD inlet (back)">
+  <Template brand="Hama" part="50432-2" size="A4" _description="CD/DVD inlet (back)">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="151mm" height="117.5mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -243,7 +243,7 @@
   <!-- ==================================================================== -->
   <!-- Hama 50455. Rectangular labels.			                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50455" size="A4" _description="Rectangular Labels">
+  <Template brand="Hama" part="50455" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="105mm" height="148mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -303,9 +303,9 @@
   </Template>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50480. Arch File labels.			                    -->
+  <!-- Hama 50480. Arch file labels.			                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50480" size="A4" _description="Arch File Labels">
+  <Template brand="Hama" part="50480" size="A4" _description="Arch file labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="190mm" height="38mm" round="0mm" x_waste="10mm" y_waste="0mm">
@@ -315,9 +315,9 @@
   </Template>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50485. Arch File labels.			                    -->
+  <!-- Hama 50485. Arch file labels.			                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50485" size="A4" _description="Arch File labels">
+  <Template brand="Hama" part="50485" size="A4" _description="Arch file labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="190mm" height="58mm" round="0mm" x_waste="10mm" y_waste="0mm">
diff --git a/templates/herma-iso-templates.xml b/templates/herma-iso-templates.xml
index 9d91fcb..f85fa74 100644
--- a/templates/herma-iso-templates.xml
+++ b/templates/herma-iso-templates.xml
@@ -15,7 +15,7 @@
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Ordnerrucken, 6 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4283" size="A4" _description="Arch File Labels (small)">
+  <Template brand="Herma" part="4283" size="A4" _description="Small arch file labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252" height="110.551" round="5">
       <Markup-margin size="5"/>
@@ -30,7 +30,7 @@
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Ordnerrucken, 4 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4284" size="A4" _description="Arch File Labels (large)">
+  <Template brand="Herma" part="4284" size="A4" _description="Large arch file labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252" height="174.331" round="5">
       <Markup-margin size="5"/>
@@ -45,7 +45,7 @@
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Ordnerrucken, 192 x 38 mm, 7 per sheet       -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4293" size="A4" _description="Arch File Labels">
+  <Template brand="Herma" part="4293" size="A4" _description="Arch file labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252" height="107.716" round="5">
       <Markup-margin size="5"/>
@@ -57,9 +57,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Herma 4464: Mailing Labels - 3 columns, 70 x 37.125 mm, 24 per sheet-->
+  <!-- Herma 4464: Mailing labels - 3 columns, 70 x 37.125 mm, 24 per sheet-->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4464" size="A4" _description="Mailing Labels">
+  <Template brand="Herma" part="4464" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="199" height="105" round="0">
@@ -72,7 +72,7 @@
   <!-- =================================================================== -->
   <!-- Otto Versand: Allzweck Etiketten, 38 x 21,2 mm, 65 per sheet        -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4606" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4606" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="107.716" height="60.0945" round="0">
       <Markup-margin size="5"/>
@@ -86,7 +86,7 @@
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Allzweck Etiketten, 48,3 x 16,9 mm           -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4607" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4607" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="136.913" height="47.9055" round="0">
       <Markup-margin size="5"/>
@@ -100,7 +100,7 @@
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Allzweck Etiketten, 44 per sheet             -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4102" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4102" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="136.913" height="72" round="0">
       <Markup-margin size="5"/>
@@ -128,7 +128,7 @@
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Allzweck Etiketten, 24 per sheet             -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4614" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4614" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="187.086" height="95.811" round="0">
       <Markup-margin size="5"/>
@@ -141,9 +141,9 @@
 
   
   <!-- =================================================================== -->
-  <!-- Herma 4620: Mailing Labels - 2 columns, 107 x 37 mm, 16 per sheet   -->
+  <!-- Herma 4620: Mailing labels - 2 columns, 107 x 37 mm, 16 per sheet   -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4620" size="A4" _description="Mailing Labels">
+  <Template brand="Herma" part="4620" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="298" height="105" round="0">
@@ -154,9 +154,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Herma Musteretiketten: Adress Etiketten, 24 per sheet               -->
+  <!-- Herma Musteretiketten: Address Etiketten, 24 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4625" size="A4" _description="Mailing Labels">
+  <Template brand="Herma" part="4625" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="297.638" height="119.905" round="0">
@@ -172,7 +172,7 @@
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Video Etiketten, 12 per sheet          -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4828" size="A4" _description="Video Labels (face only)">
+  <Template brand="Herma" part="4828" size="A4" _description="Video labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="223.086" height="131.811" round="5">
@@ -185,9 +185,9 @@
 
   
   <!-- =================================================================== -->
-  <!-- Herma 4093: CD/DVD Labels, 2 per sheet                              -->
+  <!-- Herma 4093: CD/DVD labels, 2 per sheet                              -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4093" size="A4" _description="CD/DVD Labels">
+  <Template brand="Herma" part="4093" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="164.409pt" hole="58.1102pt" waste="9pt">
@@ -226,7 +226,7 @@
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Disketten Etiketten, 10 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="8803" size="A4" _description="Diskette Labels (face only)">
+  <Template brand="Herma" part="8803" size="A4" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="198.425" height="144" round="5">
@@ -238,9 +238,9 @@
   <Template brand="Herma" part="8839" equiv="8803"/>
 
   <!-- =================================================================== -->
-  <!-- Herma 4457: Superprint Labels 105mm x 48mm, 12 per sheet            -->
+  <!-- Herma 4457: Superprint labels 105mm x 48mm, 12 per sheet            -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4457" size="A4" _description="Rectangular Labels">
+  <Template brand="Herma" part="4457" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="105mm" height="48mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -250,7 +250,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Herma 10809: Superprint Labels 105mm x 148mm, 4 per sheet           -->
+  <!-- Herma 10809: Superprint labels 105mm x 148mm, 4 per sheet           -->
   <!-- =================================================================== -->
     <Template brand="Herma" part="10809" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -262,7 +262,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Herma 4097: Rectangular Labels 45.72mm x 21.2mm, 2 per sheet        -->
+  <!-- Herma 4097: Rectangular labels 45.72mm x 21.2mm, 2 per sheet        -->
   <!-- =================================================================== -->
 
   <Template brand="Herma" part="4097" size="A4" _description="Rectangular labels">
@@ -290,7 +290,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- Herma 4098: Rectangular Labels 63.5mm x 29.6mm, 27 per sheet        -->
+  <!-- Herma 4098: Rectangular labels 63.5mm x 29.6mm, 27 per sheet        -->
   <!-- =================================================================== -->
   <Template brand="Herma" part="4098" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -319,7 +319,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- Herma 4099: Rectangular Labels 96mm x 50.8mm, 10 per sheet	   -->
+  <!-- Herma 4099: Rectangular labels 96mm x 50.8mm, 10 per sheet	   -->
   <!-- =================================================================== -->
   <Template brand="Herma" part="4099" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -342,7 +342,7 @@
   <Template brand="Herma" part="10307" equiv="4099"/>
 
   <!-- =================================================================== -->
-  <!-- Herma 4100: Rectangular Labels 30.48mm x 16.93mm, 96 per sheet	   -->
+  <!-- Herma 4100: Rectangular labels 30.48mm x 16.93mm, 96 per sheet	   -->
   <!-- =================================================================== -->
   <Template brand="Herma" part="4100" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -358,7 +358,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- Herma 4101: Rectangular Labels 43.2mm x 10.3mm, 88 per sheet	   -->
+  <!-- Herma 4101: Rectangular labels 43.2mm x 10.3mm, 88 per sheet	   -->
   <!-- =================================================================== -->
   <Template brand="Herma" part="4101" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
@@ -372,7 +372,7 @@
   <Template brand="Herma" part="4111" equiv="4101"/>
 
   <!-- =================================================================== -->
-  <!-- Herma 4103: Rectangular Labels 63.5mm x 38.1mm, 21 per sheet	   -->
+  <!-- Herma 4103: Rectangular labels 63.5mm x 38.1mm, 21 per sheet	   -->
   <!-- =================================================================== -->
   <Template brand="Herma" part="4103" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
diff --git a/templates/hisago-templates.xml b/templates/hisago-templates.xml
index 6116b6e..6856345 100644
--- a/templates/hisago-templates.xml
+++ b/templates/hisago-templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Glabels-templates>
 
-  <Template brand="Hisago" part="ELM001" size="A4" _description="Labels A4">
+  <Template brand="Hisago" part="ELM001" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=ELM001"/>
@@ -10,7 +10,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Hisago" part="ELM002" size="A4" _description="Labels A5">
+  <Template brand="Hisago" part="ELM002" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=ELM002"/>
@@ -19,7 +19,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Hisago" part="ELM003" size="A4" _description="Labels A6">
+  <Template brand="Hisago" part="ELM003" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=ELM003"/>
@@ -616,8 +616,8 @@
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=GB3201"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
       <Markup-line x1="0mm" y1="148.5mm" x2="210mm" y2="148.5mm"/>
+      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
     </Label-rectangle>
   </Template>
 
@@ -626,9 +626,9 @@
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=GB3202"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
       <Markup-line x1="0mm" y1="99mm" x2="210mm" y2="99mm"/>
       <Markup-line x1="0mm" y1="198mm" x2="210mm" y2="198mm"/>
+      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
     </Label-rectangle>
   </Template>
 
@@ -637,9 +637,9 @@
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=GB3203"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
       <Markup-line x1="0mm" y1="148.5mm" x2="210mm" y2="148.5mm"/>
       <Markup-line x1="105mm" y1="0mm" x2="105mm" y2="297mm"/>
+      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
     </Label-rectangle>
   </Template>
 
@@ -648,10 +648,10 @@
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=GB3205"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
       <Markup-line x1="0mm" y1="99mm" x2="210mm" y2="99mm"/>
       <Markup-line x1="0mm" y1="198mm" x2="210mm" y2="198mm"/>
       <Markup-line x1="105mm" y1="0mm" x2="105mm" y2="297mm"/>
+      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
     </Label-rectangle>
   </Template>
 
@@ -660,11 +660,11 @@
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=GB32065"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
       <Markup-line x1="0mm" y1="74.25mm" x2="210mm" y2="74.25mm"/>
       <Markup-line x1="0mm" y1="148.5mm" x2="210mm" y2="148.5mm"/>
       <Markup-line x1="0mm" y1="222.75mm" x2="210mm" y2="222.75mm"/>
       <Markup-line x1="105mm" y1="0mm" x2="105mm" y2="297mm"/>
+      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
     </Label-rectangle>
   </Template>
 
@@ -690,11 +690,11 @@
     <Meta category="rectangle-label"/>
     <Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP3204"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
-      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
       <Markup-line x1="0mm" y1="59.4mm" x2="210mm" y2="59.4mm"/>
       <Markup-line x1="0mm" y1="118.8mm" x2="210mm" y2="118.8mm"/>
       <Markup-line x1="0mm" y1="178.2mm" x2="210mm" y2="178.2mm"/>
       <Markup-line x1="0mm" y1="237.6mm" x2="210mm" y2="237.6mm"/>
+      <Layout nx="1" ny="1" x0="0mm" y0="0mm" dx="210mm" dy="297mm"/>
     </Label-rectangle>
   </Template>
 
diff --git a/templates/igepa-templates.xml b/templates/igepa-templates.xml
index f83daa3..a137d7a 100644
--- a/templates/igepa-templates.xml
+++ b/templates/igepa-templates.xml
@@ -210,7 +210,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Igepa" part="EA-2100x2970" size="A4" _description="Labels A4">
+  <Template brand="Igepa" part="EA-2100x2970" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -219,7 +219,7 @@
   </Template>
 
 
-  <Template brand="Igepa" part="EA-1900x380W" size="A4" _description="Lever Arch File Labels">
+  <Template brand="Igepa" part="EA-1900x380W" size="A4" _description="Lever arch file labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="192mm" height="38mm" round="2.5mm" x_waste="0mm" y_waste="0mm">
@@ -227,7 +227,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Igepa" part="EA-1900x610W" size="A4" _description="Lever Arch File Labels">
+  <Template brand="Igepa" part="EA-1900x610W" size="A4" _description="Lever arch file labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="192mm" height="61mm" round="2.5mm" x_waste="0mm" y_waste="0mm">
@@ -236,7 +236,7 @@
   </Template>
 
 
-  <Template brand="Igepa" part="EA-CD-ROM2Q" size="A4" _description="CD/DVD Labels">
+  <Template brand="Igepa" part="EA-CD-ROM2Q" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="58.5mm" hole="20.5mm" waste="0mm">
diff --git a/templates/jac-iso-templates.xml b/templates/jac-iso-templates.xml
index 7f5e4f1..4f74c04 100644
--- a/templates/jac-iso-templates.xml
+++ b/templates/jac-iso-templates.xml
@@ -10,7 +10,7 @@
   <!-- JAC CD label sheet with rectangular labels.                          -->
   <!-- ==================================================================== -->
 
-  <Template brand="JAC" part="987349-1" size="A4" _description="CD/DVD Labels">
+  <Template brand="JAC" part="987349-1" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="58mm" hole="20.8mm" waste="0mm">
@@ -34,7 +34,7 @@
   <!-- ******************************************************************** -->
   <!-- JAC 117 CD labels.			                            -->
   <!-- ******************************************************************** -->
-  <Template brand="JAC" part="117" size="A4" _description="CD/DVD Labels">
+  <Template brand="JAC" part="117" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="58.5mm" hole="20mm" waste="5mm">
@@ -451,7 +451,7 @@
   <!-- JAC 210297, 210mm x 297mm, 1 per sheet               	           -->
   <!-- ******************************************************************* -->
 
-  <Template brand="JAC" part="210297" size="A4" _description="Labels A4">
+  <Template brand="JAC" part="210297" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -463,7 +463,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-32 PVC labels, 54 per sheet			           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-32" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-32" size="Other" width="323mm" height="222.25mm" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="16mm" waste="1.1mm">
@@ -475,7 +475,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-50 PVC labels, 20 per sheet    	           	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-50" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-50" size="Other" width="323mm" height="222.25mm" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="25mm" waste="0.9mm">
@@ -487,7 +487,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-67 PVC labels, 12 per sheet 	              	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-67" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-67" size="Other" width="323mm" height="222.25mm" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="33.5mm" waste="2mm">
@@ -499,7 +499,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-100 PVC labels, 6 per sheet	               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-100" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-100" size="Other" width="323mm" height="222.25mm" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="50mm" waste="3mm">
@@ -511,7 +511,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-120 PVC labels, 4 per sheet	               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-120" size="Other" width="250mm" height="258mm" _description="PVC labels">
+  <Template brand="JAC" part="F-120" size="Other" width="250mm" height="258mm" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="60mm" waste="0mm">
@@ -523,7 +523,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-147 PVC labels, 4 per sheet               		           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-147" size="Other" width="323mm" height="304.8mm" _description="PVC labels">
+  <Template brand="JAC" part="F-147" size="Other" width="323mm" height="304.8mm" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="73.5mm" waste="2.5mm">
@@ -535,7 +535,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-2048 PVC labels, 48 per sheet               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-2048" size="Other" width="323mm" height="222.2mm" _description="PVC labels">
+  <Template brand="JAC" part="F-2048" size="Other" width="323mm" height="222.2mm" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="20mm" height="48mm" round="2.5mm" x_waste="2.5mm" y_waste="2.5mm">
@@ -548,7 +548,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-3070 PVC labels, 24 per sheet               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-3070" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-3070" size="Other" width="323mm" height="222.25mm" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="70mm" height="30mm" round="2.5mm" x_waste="2.4mm" y_waste="2.4mm">
@@ -561,7 +561,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-3248 PVC labels, 32 per sheet               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-3248" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-3248" size="Other" width="323mm" height="222.25mm" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="32mm" height="48mm" round="2.5mm" x_waste="2mm" y_waste="2mm">
@@ -574,7 +574,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-32102 PVC labels, 16 per sheet               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-32102" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-32102" size="Other" width="323mm" height="222.25mm" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="32mm" height="102mm" round="2.5mm" x_waste="2.5mm" y_waste="2.5mm">
@@ -587,7 +587,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-68102 PVC labels, 8 per sheet               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-68102" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-68102" size="Other" width="323mm" height="222.25mm" _description="Elliptical labels">
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Label-ellipse id="0" width="68mm" height="102mm" waste="2.5mm">
@@ -599,7 +599,7 @@
   <!-- ******************************************************************* -->
   <!-- JAC F-102150 PVC labels, 4 per sheet               	           -->
   <!-- ******************************************************************* -->
-  <Template brand="JAC" part="F-102150" size="Other" width="323mm" height="222.25mm" _description="PVC labels">
+  <Template brand="JAC" part="F-102150" size="Other" width="323mm" height="222.25mm" _description="Elliptical labels">
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Label-ellipse id="0" width="150mm" height="102mm" waste="2mm">
diff --git a/templates/maco-us-templates.xml b/templates/maco-us-templates.xml
index d48acbd..f0cb49c 100644
--- a/templates/maco-us-templates.xml
+++ b/templates/maco-us-templates.xml
@@ -12,7 +12,7 @@
   <!-- ******************************************************************** -->
 
 
-  <Template brand="Maco" part="LL5805" size="US-Letter" _description="Address Labels">
+  <Template brand="Maco" part="LL5805" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="2.625in" height="1in" round="0.0625in">
@@ -22,7 +22,7 @@
   </Template>
 
 
-  <Template brand="Maco" part="ML-1225" size="US-Letter" _description="Round Labels">
+  <Template brand="Maco" part="ML-1225" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.25in" waste="0pt">
diff --git a/templates/mayspies-templates.xml b/templates/mayspies-templates.xml
index 79571d1..f930098 100644
--- a/templates/mayspies-templates.xml
+++ b/templates/mayspies-templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Glabels-templates xmlns="http://glabels.org/xmlns/3.0/">
-  <Template brand="Mayspies" part="090352" size="A4" _description="CD/DVD Labels">
+  <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"/>
diff --git a/templates/meritline-us-templates.xml b/templates/meritline-us-templates.xml
index 756449f..c5b4e2d 100644
--- a/templates/meritline-us-templates.xml
+++ b/templates/meritline-us-templates.xml
@@ -10,9 +10,9 @@
 
 
   <!-- ===================================================================-->
-  <!-- Meritline Mini CD/DVD Labels (face only), 5 per sheet              -->
+  <!-- Meritline Mini CD/DVD labels (face only), 5 per sheet              -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="176-020-001" size="US-Letter" _description="Mini-CD Labels">
+  <Template brand="Meritline" part="176-020-001" size="US-Letter" _description="Mini CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="110.5" hole="57.5" waste="5">
@@ -26,9 +26,9 @@
   <Template brand="Meritline" part="176-009-001" equiv="176-020-001"/>
 
   <!-- ===================================================================-->
-  <!-- Meritline Address Labels, 30 per sheet			          -->
+  <!-- Meritline Address labels, 30 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-002-001" size="US-Letter" _description="Address Labels">
+  <Template brand="Meritline" part="177-002-001" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="2.625in" height="1in" round="0.0625in">
@@ -38,9 +38,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Address Labels, 20 per sheet			          -->
+  <!-- Meritline Address labels, 20 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-003-001" size="US-Letter" _description="Address Labels">
+  <Template brand="Meritline" part="177-003-001" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1in" round="0.0625in">
@@ -50,9 +50,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Address Labels, 14 per sheet			          -->
+  <!-- Meritline Address labels, 14 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-004-001" size="US-Letter" _description="Address Labels">
+  <Template brand="Meritline" part="177-004-001" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.333333333in" round="0.0625in">
@@ -63,9 +63,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Shipping Labels, 10 per sheet			          -->
+  <!-- Meritline Shipping labels, 10 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-005-001" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Meritline" part="177-005-001" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="2in" round="0.125in">
@@ -75,9 +75,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Shipping Labels, 6 per sheet			          -->
+  <!-- Meritline Shipping labels, 6 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-006-001" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Meritline" part="177-006-001" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="3.333333333in" round="0.125in">
@@ -87,9 +87,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Return Address Labels, 80 per sheet		          -->
+  <!-- Meritline Return address labels, 80 per sheet		          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-008-001" size="US-Letter" _description="Return Address Labels">
+  <Template brand="Meritline" part="177-008-001" size="US-Letter" _description="Return address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="1.75in" height="0.5in" round="0.0625in">
@@ -99,9 +99,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Full Sheet Labels, 1 per sheet			          -->
+  <!-- Meritline Full Sheet labels, 1 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-007-001" size="US-Letter" _description="Full Sheet Labels">
+  <Template brand="Meritline" part="177-007-001" size="US-Letter" _description="Full-page labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="8.5in" height="11.in" round="0">
       <Markup-margin size="0.0625in"/>
@@ -110,9 +110,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Address Labels, 12 per sheet			          -->
+  <!-- Meritline Address labels, 12 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-010-001" size="US-Letter" _description="Address Labels">
+  <Template brand="Meritline" part="177-010-001" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.5in" round="0.0625in">
@@ -122,9 +122,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Round Labels, 24 per sheet			          -->
+  <!-- Meritline Round labels, 24 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-014-001" size="US-Letter" _description="Round Labels">
+  <Template brand="Meritline" part="177-014-001" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="0.8125in" waste="0pt">
@@ -134,9 +134,9 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Diskette Labels, 9 per sheet			          -->
+  <!-- Meritline Diskette labels, 9 per sheet			          -->
   <!-- ===================================================================-->
-  <Template brand="Meritline" part="177-009-001" size="US-Letter" _description="Diskette Labels">
+  <Template brand="Meritline" part="177-009-001" size="US-Letter" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="2.75in" height="2.75in" round="0.0625in">
@@ -146,10 +146,10 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Video Tape Face Labels, 10 per sheet		          -->
+  <!-- Meritline Video tape face labels, 10 per sheet		          -->
   <!-- ===================================================================-->
   <Template brand="Meritline" part="177-012-001" size="US-Letter"
-         _description="Video Tape Face Labels">
+         _description="Video tape face labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="220" height="133" round="5">
@@ -159,10 +159,10 @@
   </Template>
 
   <!-- ===================================================================-->
-  <!-- Meritline Video Tape Spine Labels, 15 per sheet		          -->
+  <!-- Meritline Video tape spine labels, 15 per sheet		          -->
   <!-- ===================================================================-->
   <Template brand="Meritline" part="177-013-001" size="US-Letter"
-        _description="Video Tape Spine Labels">
+        _description="Video tape spine labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="414" height="48" round="5">
diff --git a/templates/microapp-templates.xml b/templates/microapp-templates.xml
index a8a8c15..b006875 100644
--- a/templates/microapp-templates.xml
+++ b/templates/microapp-templates.xml
@@ -7,10 +7,10 @@
   <!-- ******************************************************************** -->
 
   <!-- =================================================================== -->
-  <!-- Micro Application:  Standard Labels, 60.5mm x 29.6mm, 24 per sheet  -->
+  <!-- Micro Application:  Standard labels, 60.5mm x 29.6mm, 24 per sheet  -->
   <!-- =================================================================== -->
 
-  <Template brand="Micro Application" part="5057" size="A4" _description="Standard Labels">
+  <Template brand="Micro Application" part="5057" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.microapp.com/papier_etiquettes_standard_5057.html"/>
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 5d867a3..8e97583 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -15,9 +15,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Agipa 114036: Rectangulars Labels, 48.5 x 18.5 mm, 16 per A5 sheet  -->
+  <!-- Agipa 114036: Rectangular labels, 48.5 x 18.5 mm, 16 per A5 sheet   -->
   <!-- =================================================================== -->
-  <Template brand="Agipa" part="114036" size="A5" _description="Rectangular Labels">
+  <Template brand="Agipa" part="114036" size="A5" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="18.5mm" height="48.5mm" round="10">
@@ -26,9 +26,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Agipa 119488: Business Cards, 50 x 90 mm, 10 per sheet              -->
+  <!-- Agipa 119488: Business cards, 50 x 90 mm, 10 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Agipa" part="119488" 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="255" height="142" round="0">
@@ -45,9 +45,9 @@
   <!-- ************************* -->
 
   <!-- ====================================================== -->
-  <!-- APLI 02793: Business Cards, 50,8 x 90 mm, 10 per sheet -->
+  <!-- APLI 02793: Business cards, 50,8 x 90 mm, 10 per sheet -->
   <!-- ====================================================== -->
-  <Template brand="APLI" part="02793" size="A4" _description="Business Cards">
+  <Template brand="APLI" part="02793" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255.118" height="144" round="0">
@@ -58,9 +58,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- APLI 1999:  Mailing Labels, 9,9cm x 6,8cm, 8 per sheet              -->
+  <!-- APLI 1999:  Mailing labels, 9,9cm x 6,8cm, 8 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="APLI" part="1999" size="A4" _description="Mailing Labels">
+  <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">
@@ -71,9 +71,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- APLI 01293:  General Labels.                                        -->
+  <!-- APLI 01293:  General labels.                                        -->
   <!-- =================================================================== -->
-  <Template brand="APLI" part="01293" size="A4" _description="General Labels">
+  <Template brand="APLI" part="01293" size="A4" _description="Rectangular 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"/>
@@ -83,9 +83,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- APLI 01271:  General Labels.                                        -->
+  <!-- APLI 01271:  General labels.                                        -->
   <!-- =================================================================== -->
-  <Template brand="Apli" part="1271" size="A4" _description="Rectangular Labels">
+  <Template brand="Apli" part="1271" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="70mm" height="30mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -140,9 +140,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Bruna 241301.  Mailing Labels.                                      -->
+  <!-- Bruna 241301.  Mailing labels.                                      -->
   <!-- =================================================================== -->
-  <Template brand="Bruna" part="241301" size="A4" _description="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">
@@ -152,7 +152,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Bruna 1166000.  Mailing Labels.                                     -->
+  <!-- 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">
@@ -170,7 +170,7 @@
   <!-- =================================================================== -->
   <!-- Celcast IJ37: Fridge magnet (stickers), 52 x 90 mm, 10 per sheet    -->
   <!-- =================================================================== -->
-  <Template brand="Celcast" part="IJ37" size="A4" _description="Fridge Magnet Stickers">
+  <Template brand="Celcast" part="IJ37" size="A4" _description="Magnet stickers">
     <Meta category="label"/>
     <Label-rectangle id="0" width="255" height="147.5" round="0">
       <Markup-margin size="5"/>
@@ -186,9 +186,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Connect KF10647 Mailing Labels..                                    -->
+  <!-- Connect KF10647 Mailing labels..                                    -->
   <!-- =================================================================== -->
-  <Template brand="Connect" part="KF10647" size="A4" _description="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">
@@ -205,10 +205,10 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Ednet BC: Business Cards, 51 x 89 mm, 10 per sheet                  -->
+  <!-- Ednet BC: Business cards, 51 x 89 mm, 10 per sheet                  -->
   <!-- =================================================================== -->
   <!-- TODO: Is this a real part #? -->
-  <Template brand="Ednet" part="BC" size="A4" _description="Business Cards">
+  <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">
@@ -219,9 +219,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Ednet 45021: Inkjet/Laser Labels 70x37mm                            -->
+  <!-- Ednet 45021: Inkjet/Laser labels 70x37mm                            -->
   <!-- =================================================================== -->
-  <Template brand="Ednet" part="45021" size="A4" _description="Inkjet/Laser Labels 70x37mm">
+  <Template brand="Ednet" part="45021" size="A4" _description="Rectangular 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"/>
@@ -237,9 +237,9 @@
   <!-- ************************* -->
 
   <!-- ===================================================================-->
-  <!-- Encre.com Business Cards, 10 per sheet                             -->
+  <!-- Encre.com Business cards, 10 per sheet                             -->
   <!-- ===================================================================-->
-  <Template brand="Encre.com" part="BCV10" size="A4" _description="Business Cards">  
+  <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">  
@@ -258,7 +258,7 @@
   <!-- =================================================================== -->
   <!-- EPSON Photo Stickers, 17 x 24 mm, 16 per sheet                      -->
   <!-- =================================================================== -->
-  <Template brand="Epson" part="S041144" size="A6" _description="EPSON Photo Stickers 16">
+  <Template brand="Epson" part="S041144" size="A6" _description="Photo stickers">
     <Meta category="label"/>
     <Label-rectangle id="0" width="48" height="68" round="7">
       <Markup-margin size="5"/>
@@ -274,9 +274,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Fellows 04715 CD/DVD Labels (Face only).                            -->
+  <!-- Fellows 04715 CD/DVD labels (face only).                            -->
   <!-- =================================================================== -->
-  <Template brand="Fellows" part="04715" size="A4" _description="CD Labels">
+  <Template brand="Fellows" part="04715" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -297,7 +297,7 @@
   <!-- 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">
+  <Template brand="Hema" part="Etiketten" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="178" height="108" round="5">
       <Markup-margin size="5"/>
@@ -313,9 +313,9 @@
   <!-- ************************* -->
 
   <!-- ============================================================ -->
-  <!-- Impact LC33 Family: Rectangular Labels                       -->
+  <!-- Impact LC33 Family: Rectangular labels                       -->
   <!-- ============================================================ -->
-  <Template brand="Impact" part="LC33" size="A4" description="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">
@@ -332,9 +332,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Kores KPCV1: Business Cards, 50 x 90 mm, 10 per sheet              -->
+  <!-- Kores KPCV1: Business cards, 50 x 90 mm, 10 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Kores" part="KPCV1" size="A4" _description="Business Cards">
+  <Template brand="Kores" part="KPCV1" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="90mm" height="50mm" round="0">
@@ -351,9 +351,9 @@
   <!-- ************************* -->
 
   <!-- ===================================================================-->
-  <!-- LeLabel 2001.018 CD/DVD Labels, 1 per sheet                        -->
+  <!-- LeLabel 2001.018 CD/DVD labels, 1 per sheet                        -->
   <!-- ===================================================================-->
-  <Template brand="LeLabel" part="2001.018" size="A4" _description="CD/DVD Labels">
+  <Template brand="LeLabel" part="2001.018" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="168.08" hole="54.69" waste="5">
@@ -370,9 +370,9 @@
   <!-- ************************* -->
 
   <!-- ===================================================================-->
-  <!-- Media Line CD/DVD Labels (face only), 2 per sheet                  -->
+  <!-- Media Line CD/DVD labels (face only), 2 per sheet                  -->
   <!-- ===================================================================-->
-  <Template brand="MediaLine" part="760-50475 A4 CD" size="A4" _description="CD/DVD Labels (face only)">
+  <Template brand="MediaLine" part="760-50475 A4 CD" size="A4" _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -389,10 +389,10 @@
   <!-- ************************* -->
 
   <!-- ===================================================================-->
-  <!-- Neato brand CD/DVD Labels (face only), 2 per sheet                 -->
+  <!-- Neato brand CD/DVD labels (face only), 2 per sheet                 -->
   <!-- ===================================================================-->
   <!-- TODO: Is this the actual part #? -->
-  <Template brand="Neato" part="A4 CD" size="A4" _description="CD/DVD Labels (face only)">
+  <Template brand="Neato" part="A4 CD" size="A4" _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -409,7 +409,7 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Poundland 30 Labels.                                                -->
+  <!-- Poundland 30 labels.                                                -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
   <Template brand="Poundland" part="30" size="A4" _description="Labels">
@@ -428,9 +428,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Pressit CD Labels.                                                  -->
+  <!-- Pressit CD/DVD labels.                                              -->
   <!-- =================================================================== -->
-  <Template brand="Pressit" part="50blank" size="A4" _description="CD Labels">
+  <Template brand="Pressit" part="50blank" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -447,9 +447,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Q_CONNECT multi-purpose labels, 8 per sheet.                        -->
+  <!-- Q_CONNECT multipurpose labels, 8 per sheet.                         -->
   <!-- =================================================================== -->
-  <Template brand="Q-CONNECT" part="KF26055" size="A4" _description="Multi-Purpose Labels">
+  <Template brand="Q-CONNECT" part="KF26055" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="99.1mm" height="67.7mm" round="2mm" x_waste="1mm" y_waste="0mm">
@@ -468,10 +468,10 @@
        vendors? -->
 
   <!-- =================================================================== -->
-  <!-- Russian A3 5x9 Business Cards.                                      -->
+  <!-- Russian A3 5x9 Business cards.                                      -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
-  <Template brand="Russian" part="A3 5x9" size="A3" _description="Business Cards">
+  <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">
@@ -482,10 +482,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Russian A4 5x9 Business Cards.                                      -->
+  <!-- Russian A4 5x9 Business cards.                                      -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
-  <Template brand="Russian" part="A4 5x9" size="A4" _description="Business Cards">
+  <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">
@@ -504,7 +504,7 @@
   <!-- =================================================================== -->
   <!-- Ryman P14 Universal labels.                                         -->
   <!-- =================================================================== -->
-  <Template brand="Ryman" part="P14" size="A4" _description="Universal Labels">
+  <Template brand="Ryman" part="P14" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="99.1mm" height="38.1mm" round="0.2mm" x_waste="0mm" y_waste="0mm">
       <Markup-margin size="3.2mm"/>
@@ -514,10 +514,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Ryman Standard CD/DVD Labels.                                       -->
+  <!-- Ryman Standard CD/DVD labels.                                       -->
   <!-- =================================================================== -->
   <!-- Is this the actual part #? -->
-  <Template brand="Ryman" part="Standard CD/DVD" size="A4" _description="CD/DVD Labels">
+  <Template brand="Ryman" part="Standard CD/DVD" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.827pt" hole="58.1102pt" waste="9pt">
@@ -528,9 +528,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Ryman 0215016061 CD/DVD Labels.                                     -->
+  <!-- Ryman 0215016061 CD/DVD labels.                                     -->
   <!-- =================================================================== -->
-  <Template brand="Ryman" part="0215016061" size="A4" _description="CD/DVD Labels">
+  <Template brand="Ryman" part="0215016061" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.827pt" hole="24.0945pt" waste="8.50394pt">
@@ -547,9 +547,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Sanwa LB-CDRJP.  CD Labels.                                         -->
+  <!-- Sanwa LB-CDRJP.  CD/DVD labels.                                     -->
   <!-- =================================================================== -->
-  <Template brand="Sanwa" part="LB-CDRJP" size="A4" _description="CD Labels">
+  <Template brand="Sanwa" part="LB-CDRJP" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="167.244pt" hole="34.0pt" waste="9pt">
@@ -566,7 +566,7 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Sigel LA 505: CD/DVD Labels				           -->
+  <!-- Sigel LA 505: CD/DVD labels				           -->
   <!-- =================================================================== -->
   <Template brand="Sigel" part="LA 505" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
@@ -580,9 +580,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Sigel LP 795: Business Cards, 55.0 x 85.0 mm          		   -->
+  <!-- Sigel LP 795: Business cards, 55.0 x 85.0 mm          		   -->
   <!-- =================================================================== -->
-  <Template brand="Sigel" part="LP 795" size="A4" _description="Business Cards">
+  <Template brand="Sigel" part="LP 795" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="85mm" height="55mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -592,9 +592,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Sigel LP 800/LP 801/LP 802: Business Cards, 55.0 x 85.0 mm          -->
+  <!-- Sigel LP 800/LP 801/LP 802: Business cards, 55.0 x 85.0 mm          -->
   <!-- =================================================================== -->
-  <Template brand="Sigel" part="LP 800" 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="85.0mm" height="55.0mm" round="0">
@@ -608,9 +608,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Sigel DP 830/DP 930: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
+  <!-- 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">
+  <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">
@@ -622,7 +622,7 @@
   <!-- =================================================================== -->
   <!-- Sigel DE 160: Bottle labels, 4 per sheet				   -->
   <!-- =================================================================== -->
-  <Template brand="Sigel" part="DE 160" size="A4" _description="Bottle labels">
+  <Template brand="Sigel" part="DE 160" size="A4" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.sigel.de/en_gb/Workflow/Labels/118/1406-Labels+for+bottles%2C+to+design+and+customize"/>
@@ -642,10 +642,10 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Staples EU Business Cards Supreme.                                  -->
+  <!-- Staples EU Business cards Supreme.                                  -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
-  <Template brand="Staples" part="EU BC Supreme" size="A4" _description="Business Cards">
+  <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">
@@ -657,9 +657,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Staples STAP14 Mailing Labels.                                      -->
+  <!-- Staples STAP14 Mailing labels.                                      -->
   <!-- =================================================================== -->
-  <Template brand="Staples" part="STAP14" size="A4" _description="Mailing Labels">
+  <Template brand="Staples" part="STAP14" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="99mm" height="38mm" round="2mm" x_waste="0mm" y_waste="0mm">
@@ -676,10 +676,10 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- CD STOMPER PRO CD Label Refills, (Face Only) ISO Version            -->
+  <!-- CD STOMPER PRO CD/DVD Label Refills, (face only) ISO Version        -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
-  <Template brand="Stomper" part="PRO A4" size="A4" _description="PRO CD Labels 2-up (face only)">
+  <Template brand="Stomper" part="PRO A4" size="A4" _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58" waste="10">
@@ -699,7 +699,7 @@
   <!-- ===================================================================-->
   <!-- Viking 02204 Etiketten, 21 per sheet                               -->
   <!-- ===================================================================-->
-  <Template brand="Viking" part="02204" size="A4" _description="Etiketten">
+  <Template brand="Viking" part="02204" size="A4" _description="Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198" height="120" round="0">
       <Markup-margin size="5"/>
diff --git a/templates/misc-other-templates.xml b/templates/misc-other-templates.xml
index 273b819..568eb4f 100644
--- a/templates/misc-other-templates.xml
+++ b/templates/misc-other-templates.xml
@@ -13,9 +13,9 @@
   <!-- ******************************************************************** -->
 
   <!-- =================================================================== -->
-  <!-- Merax CD Labels                                                     -->
+  <!-- Merax CD labels                                                     -->
   <!-- =================================================================== -->
-  <Template brand="Merax" part="CD Labels" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Merax" part="CD labels" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.merax.com/products/Labels/cddvd.html"/>
@@ -35,10 +35,10 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- OfficeMax 86112: Multi-Purpose Labels, 2'' x 4'', 3 per sheet       -->
+  <!-- OfficeMax 86112: Multipurpose labels, 2'' x 4'', 3 per sheet        -->
   <!-- =================================================================== -->
   <Template brand="OfficeMax" part="86112" size="Other" width="297pt" height="450pt"
-            _description="Multi-Purpose Labels">
+            _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="288pt" height="144pt" round="9pt" waste="0pt">
       <Markup-margin size="9pt"/>
diff --git a/templates/misc-us-templates.xml b/templates/misc-us-templates.xml
index f5bd868..dc30848 100644
--- a/templates/misc-us-templates.xml
+++ b/templates/misc-us-templates.xml
@@ -16,11 +16,11 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Great Gizmos : CD/DVD Labels (face only), 2 per sheet             * -->
+  <!-- Great Gizmos : CD/DVD labels (face only), 2 per sheet             * -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
   <Template brand="Great Gizmos" part="CD/DVD" size="US-Letter"
-          _description="CD/DVD Labels (face only)">
+          _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -37,10 +37,10 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Imation-SoniX CD/DVD Labels  (Face Only)                          * -->
+  <!-- Imation-SoniX CD/DVD labels  (face only)                          * -->
   <!-- =================================================================== -->
   <Template brand="Imation-SoniX" part="No.5112 15954" size="US-Letter"
-         _description="CD/DVD Labels (Face Only)">
+         _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="167.8" hole="18.5" waste="5">
@@ -57,10 +57,10 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Kingdom L Cassette Labels, 12 per sheet.                            -->
+  <!-- Kingdom L cassette labels, 12 per sheet.                            -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
-  <Template brand="Kingdom" part="L" size="US-Letter" _description="Cassette Labels">
+  <Template brand="Kingdom" part="L" size="US-Letter" _description="Cassette 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">
@@ -77,10 +77,10 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Memorex CD Labels                                                 * -->
+  <!-- Memorex CD/DVD labels                                             * -->
   <!-- =================================================================== -->
   <!-- TODO: Is this the actual part #? -->
-  <Template brand="Memorex" part="CD Labels" size="US-Letter" _description="CD/DVD Labels">
+  <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">
@@ -106,7 +106,7 @@
   <!-- spine is bottom margin, print label sheet BOTTOM FIRST.            -->
   <!-- ===================================================================-->
   <Template brand="Neato" part="Slimline CD Case" size="US-Letter"
-         _description="Slimline CD Case (rightside up)">
+         _description="CD/DVD case (rightside up)">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="394.5" height="342.5" round="0">
@@ -115,7 +115,7 @@
     </Label-rectangle>
   </Template>
   <Template brand="Neato" part="Slimline CD Case, spine" size="US-Letter"
-         _description="Slimline CD Case (upside down)">
+         _description="CD/DVD case (upside down)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="394.5" height="342.5" round="0">
@@ -126,10 +126,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Neato USCD2lbl.NTT: CD/DVD Labels (face only), 2 per sheet          -->
+  <!-- Neato USCD2lbl.NTT: CD/DVD labels (face only), 2 per sheet          -->
   <!-- =================================================================== -->
   <Template brand="Neato" part="USCD2lbl.NTT" size="US-Letter"
-         _description="CD/DVD Labels (face only)">
+         _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="9">
@@ -140,10 +140,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- Neato USCD2lbl.NTT: CD/DVD Labels (rectangles), 2 per sheet         -->
+  <!-- Neato USCD2lbl.NTT: CD/DVD labels (rectangles), 2 per sheet         -->
   <!-- =================================================================== -->
   <Template brand="Neato" part="USCD2lbl Rectangles" size="US-Letter"
-	 _description="CD Template Rectangles">
+	 _description="CD/DVD labels (rectangles)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="77.04" height="234.36" round="10">
@@ -157,7 +157,7 @@
   <!-- 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">
+	 _description="Business card CD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="108" width="171" hole="58" waste="5">
@@ -170,7 +170,7 @@
   <!-- =================================================================== -->
   <!-- Neato 69143: Jewel Case Booklet                                     -->
   <!-- =================================================================== -->
-  <Template brand="Neato" part="69143" size="US-Letter" _description="Jewel Case Booklet">
+  <Template brand="Neato" part="69143" size="US-Letter" _description="CD/DVD 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"/>
@@ -187,9 +187,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Netc Label Stock: DLT Labels, (www.netclabels.com), 30 per sheet    -->
+  <!-- Netc Label Stock: DLT labels, (www.netclabels.com), 30 per sheet    -->
   <!-- =================================================================== -->
-  <Template brand="Netc" part="749303-70001 " size="US-Letter" _description="DLT Labels">
+  <Template brand="Netc" part="749303-70001 " size="US-Letter" _description="DLT labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="162" height="59.4" round="0">
@@ -206,9 +206,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- OfficeMax OM99060 Mailing Labels.                                   -->
+  <!-- OfficeMax OM99060 Mailing labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="OfficeMax" part="OM99060" size="US-Letter" _description="Mailing Labels">
+  <Template brand="OfficeMax" part="OM99060" size="US-Letter" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="203.76pt" height="72pt" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -225,9 +225,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Southworth BC: Business Cards, 2'' x 3_1/2'', 10 per sheet          -->
+  <!-- Southworth BC: Business cards, 2'' x 3_1/2'', 10 per sheet          -->
   <!-- =================================================================== -->
-  <Template brand="Southworth" part="BC554" size="US-Letter" _description="Business Cards">
+  <Template brand="Southworth" part="BC554" size="US-Letter" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://shop.southworth.com/groups.php?cat=1&amp;group=6"/>
@@ -249,9 +249,9 @@
   <!-- ************************* -->
 
   <!-- =================================================================== -->
-  <!-- Staples 598385 CD/DVD Labels.                                       -->
+  <!-- Staples 598385 CD/DVD labels.                                       -->
   <!-- =================================================================== -->
-  <Template brand="Staples" part="598385" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Staples" part="598385" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="2.312in" hole="0.8125in" waste="0.065in">
@@ -269,10 +269,10 @@
   <!-- TODO: Are these the actual part #s? -->
 
   <!-- =================================================================== -->
-  <!-- CD STOMPER PRO CD Label Refills, (Face Only)                      * -->
+  <!-- CD STOMPER PRO CD/DVD Label Refills, (face Only)                  * -->
   <!-- =================================================================== -->
   <Template brand="Stomper" part="PRO CD" size="US-Letter"
-         _description="PRO CD Labels 2-up (face only)">
+         _description="CD/DVD labels (disc only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -286,7 +286,7 @@
   <!-- CD STOMPER PRO Zip Label Refills.                                 * -->
   <!-- =================================================================== -->
   <Template brand="Stomper" part="PRO Zip" size="US-Letter"
-         _description="PRO CD Labels 2-up (Face only)">
+         _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="168" height="142" round="0">
@@ -300,7 +300,7 @@
   <!-- CD STOMPER PRO Spine Label Refills.                               * -->
   <!-- =================================================================== -->
   <Template brand="Stomper" part="PRO Spine" size="US-Letter"
-         _description="PRO CD Labels 2-up (CD spine only)">
+         _description="CD/DVD labels (spine only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="288" height="20" round="0">
diff --git a/templates/online-templates.xml b/templates/online-templates.xml
index 1421403..19b5b5f 100644
--- a/templates/online-templates.xml
+++ b/templates/online-templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Glabels-templates>
 
-  <Template brand="Online Labels" part="OL28" size="US-Letter" _description="SD Card labels, library book labels, classification labels">
+  <Template brand="Online Labels" part="OL28" size="US-Letter" _description="SD card labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="media"/>
@@ -11,7 +11,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2525" size="US-Letter" _description="Jar labels, candle labels">
+  <Template brand="Online Labels" part="OL2525" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2525.htm"/>
@@ -29,7 +29,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL114" size="US-Letter" _description="Classification labels, library book labels">
+  <Template brand="Online Labels" part="OL114" size="US-Letter" _description="Classification labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL114.htm"/>
@@ -38,7 +38,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2520" size="US-Letter" _description="Jar labels, candle labels">
+  <Template brand="Online Labels" part="OL2520" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2520.htm"/>
@@ -47,7 +47,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2680" size="US-Letter" _description="Water bottle labels">
+  <Template brand="Online Labels" part="OL2680" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2680.htm"/>
@@ -56,7 +56,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2530" size="US-Letter" _description="Jar labels, pot labels, candle labels">
+  <Template brand="Online Labels" part="OL2530" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2530.htm"/>
@@ -92,7 +92,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL864" size="US-Letter" _description="Lip balm tube labels">
+  <Template brand="Online Labels" part="OL864" size="US-Letter" _description="Tube labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL864.htm"/>
@@ -132,7 +132,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL1050" size="US-Letter" _description="File labels, return address labels, medical chart labels">
+  <Template brand="Online Labels" part="OL1050" size="US-Letter" _description="File labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -142,7 +142,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2083" size="US-Letter" _description="Lip balm tube labels">
+  <Template brand="Online Labels" part="OL2083" size="US-Letter" _description="Tube labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2083.htm"/>
@@ -160,7 +160,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL3016" size="US-Letter" _description="Jar labels, nutritional labels">
+  <Template brand="Online Labels" part="OL3016" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="square-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL3016.htm"/>
@@ -169,7 +169,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL330" size="US-Letter" _description="Jar labels">
+  <Template brand="Online Labels" part="OL330" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="square-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL330.htm"/>
@@ -187,7 +187,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL8250" size="US-Letter" _description="Wine bottle labels, nutritional labels">
+  <Template brand="Online Labels" part="OL8250" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL8250.htm"/>
@@ -196,19 +196,19 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL663" size="US-Letter" _description="Lip balm tube labels">
+  <Template brand="Online Labels" part="OL663" size="US-Letter" _description="Tube labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL663.htm"/>
     <Label-rectangle id="0" width="2.0625in" height="2.15in" round="0in" x_waste="0.05in" y_waste="0.05in">
-      <Layout nx="3" ny="4" x0="0.6562in" y0="0.825in" dx="2.5625in" dy="2.4in"/>
       <Markup-line x1="0in" y1="0.375in" x2="2.0625in" y2="0.375in"/>
+      <Layout nx="3" ny="4" x0="0.6562in" y0="0.825in" dx="2.5625in" dy="2.4in"/>
     </Label-rectangle>
   </Template>
 
   <!-- OL8325 -->
 
-  <Template brand="Online Labels" part="OL421" size="US-Letter" _description="Lip balm tube labels">
+  <Template brand="Online Labels" part="OL421" size="US-Letter" _description="Tube labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL421.htm"/>
@@ -249,7 +249,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL160" size="US-Letter" _description="Pot labels, coffee and tea labels">
+  <Template brand="Online Labels" part="OL160" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL160.htm"/>
@@ -276,7 +276,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL800" size="US-Letter" _description="Jar labels, candy labels, nutritional labels">
+  <Template brand="Online Labels" part="OL800" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL800.htm"/>
@@ -303,7 +303,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL875" size="US-Letter" _description="Address labels, barcode labels, candy labels">
+  <Template brand="Online Labels" part="OL875" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -381,7 +381,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL1125" size="US-Letter" _description="VHS face labels, nutritional labels">
+  <Template brand="Online Labels" part="OL1125" size="US-Letter" _description="VHS face labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL1125.htm"/>
@@ -399,7 +399,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL5030" size="US-Letter" _description="Jar labels, pot labels, nutritional labels">
+  <Template brand="Online Labels" part="OL5030" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5030.htm"/>
@@ -444,7 +444,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL3043" size="US-Letter" _description="Metal tin container labels, nutritional labels">
+  <Template brand="Online Labels" part="OL3043" size="US-Letter" _description="Metal tin container labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL3043.htm"/>
@@ -453,7 +453,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL5100" size="US-Letter" _description="Bookplate labels, coffee and tea labels">
+  <Template brand="Online Labels" part="OL5100" size="US-Letter" _description="Bookplate labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5100.htm"/>
@@ -462,7 +462,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2590 (first)" size="US-Letter" _description="Amazon FBA shipping labels">
+  <Template brand="Online Labels" part="OL2590 (first)" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2590.htm"/>
@@ -470,7 +470,7 @@
       <Layout nx="1" ny="1" x0="0.25in" y0="0.5in" dx="3.5in" dy="5in"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Online Labels" part="OL2590 (second)" size="US-Letter" _description="Amazon FBA shipping labels">
+  <Template brand="Online Labels" part="OL2590 (second)" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2590.htm"/>
@@ -506,7 +506,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL575" size="US-Letter" _description="Jar labels, coffee and tea labels, nutritional labels">
+  <Template brand="Online Labels" part="OL575" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL575.htm"/>
@@ -515,7 +515,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL172" size="US-Letter" _description="Jar labels, pot labels, coffee and tea labels">
+  <Template brand="Online Labels" part="OL172" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL172.htm"/>
@@ -605,7 +605,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL525" size="US-Letter" _description="Jar labels, Coffee and tea labels">
+  <Template brand="Online Labels" part="OL525" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL525.htm"/>
@@ -623,7 +623,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL475" size="US-Letter" _description="Wine bottle labels">
+  <Template brand="Online Labels" part="OL475" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL475.htm"/>
@@ -632,7 +632,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL432" size="US-Letter" _description="Mail Order Manager labels">
+  <Template brand="Online Labels" part="OL432" size="US-Letter" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL432.htm"/>
@@ -641,7 +641,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL394" size="US-Letter" _description="Liquor bottle labels">
+  <Template brand="Online Labels" part="OL394" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL394.htm"/>
@@ -659,7 +659,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL6675" size="US-Letter" _description="Wine bottle labels">
+  <Template brand="Online Labels" part="OL6675" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL6675.htm"/>
@@ -668,7 +668,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL685" size="US-Letter" _description="Hershey's® chocolate labels">
+  <Template brand="Online Labels" part="OL685" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL685.htm"/>
@@ -677,7 +677,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL1150" size="US-Letter" _description="VHS labels, jar labels, book labels">
+  <Template brand="Online Labels" part="OL1150" size="US-Letter" _description="VHS labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL1150.htm"/>
@@ -686,7 +686,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL5550" size="US-Letter" _description="Jar labels">
+  <Template brand="Online Labels" part="OL5550" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5550.htm"/>
@@ -704,7 +704,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL1499" size="US-Letter" _description="USPS® shipping labels">
+  <Template brand="Online Labels" part="OL1499" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL1499.htm"/>
@@ -713,7 +713,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2515" size="US-Letter" _description="Jar labels, candle labels, metal tin container labels">
+  <Template brand="Online Labels" part="OL2515" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2515.htm"/>
@@ -722,7 +722,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL243" size="US-Letter" _description="USPS® shipping labels">
+  <Template brand="Online Labels" part="OL243" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL243.htm"/>
@@ -731,7 +731,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL8500" size="US-Letter" _description="Jar labels, candle labels">
+  <Template brand="Online Labels" part="OL8500" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL8500.htm"/>
@@ -740,7 +740,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL7000" size="US-Letter" _description="Jar labels, water bottle labels">
+  <Template brand="Online Labels" part="OL7000" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL7000.htm"/>
@@ -749,7 +749,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL6200" size="US-Letter" _description="Jar labels, water bottle labels">
+  <Template brand="Online Labels" part="OL6200" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL6200.htm"/>
@@ -758,7 +758,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL5925" size="US-Letter" _description="Jar labels, water bottle labels, wine bottle labels">
+  <Template brand="Online Labels" part="OL5925" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5925.htm"/>
@@ -767,7 +767,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2921" size="US-Letter" _description="Jar labels, water bottle labels, wine bottle labels">
+  <Template brand="Online Labels" part="OL2921" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2921.htm"/>
@@ -776,7 +776,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL369" size="US-Letter" _description="PayPal® label">
+  <Template brand="Online Labels" part="OL369" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL369.htm"/>
@@ -785,7 +785,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL5450" size="US-Letter" _description="Water bottle labels, jar labels, candle labels">
+  <Template brand="Online Labels" part="OL5450" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5450.htm"/>
@@ -831,7 +831,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL435" size="US-Letter" _description="Water bottle labels">
+  <Template brand="Online Labels" part="OL435" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL435.htm"/>
@@ -897,7 +897,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL1100" size="US-Letter" _description="Medical chart labels, barcode labels">
+  <Template brand="Online Labels" part="OL1100" size="US-Letter" _description="Medical chart labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL1100.htm"/>
@@ -924,7 +924,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL5125" size="US-Letter" _description="Pot labels, barcode labels">
+  <Template brand="Online Labels" part="OL5125" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5125.htm"/>
@@ -951,7 +951,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL3089" size="US-Letter" _description="Jar labels">
+  <Template brand="Online Labels" part="OL3089" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL3089.htm"/>
@@ -1023,7 +1023,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL1825" size="US-Letter" _description="CD case labels">
+  <Template brand="Online Labels" part="OL1825" size="US-Letter" _description="CD/DVD case labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL1825.htm"/>
@@ -1068,7 +1068,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL550" size="US-Letter" _description="Wine bottle labels, nutritional labels">
+  <Template brand="Online Labels" part="OL550" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL550.htm"/>
@@ -1077,7 +1077,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL450" size="US-Letter" _description="Wine bottle labels, shipping labels, UPS® WorldShip® labels">
+  <Template brand="Online Labels" part="OL450" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL450.htm"/>
@@ -1122,7 +1122,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL5950" size="US-Letter" _description="Water bottle labels, shipping labels">
+  <Template brand="Online Labels" part="OL5950" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5950.htm"/>
@@ -1131,7 +1131,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL351" size="US-Letter" _description="VICS labels">
+  <Template brand="Online Labels" part="OL351" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL351.htm"/>
@@ -1140,7 +1140,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL1985" size="US-Letter" _description="Water bottle labels">
+  <Template brand="Online Labels" part="OL1985" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL1985.htm"/>
@@ -1149,7 +1149,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL7800" size="US-Letter" _description="Water bottle labels">
+  <Template brand="Online Labels" part="OL7800" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL7800.htm"/>
@@ -1178,27 +1178,27 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL175" size="US-Letter" _description="Full sheet labels with back slit">
+  <Template brand="Online Labels" part="OL175" size="US-Letter" _description="Full-page labels with back slit">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL175.htm"/>
     <Label-rectangle id="0" width="8.5in" height="11in" round="0in" x_waste="0in" y_waste="0in">
-      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
       <Markup-line x1="4.25in" y1="0in" x2="4.25in" y2="11in"/>
+      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL176" size="US-Letter" _description="Full sheet labels with back slit">
+  <Template brand="Online Labels" part="OL176" size="US-Letter" _description="Full-page labels with back slit">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL176.htm"/>
     <Label-rectangle id="0" width="8.5in" height="11in" round="0in" x_waste="0in" y_waste="0in">
-      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
       <Markup-line x1="0in" y1="1.44in" x2="8.5in" y2="1.44in"/>
+      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL177" size="US-Letter" _description="Full sheet labels">
+  <Template brand="Online Labels" part="OL177" size="US-Letter" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL177.htm"/>
@@ -1207,31 +1207,31 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL179" size="US-Letter" _description="Full sheet labels with back slit">
+  <Template brand="Online Labels" part="OL179" size="US-Letter" _description="Full-page labels with back slit">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL179.htm"/>
     <Label-rectangle id="0" width="8.5in" height="11in" round="0in" x_waste="0in" y_waste="0in">
-      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
       <Markup-line x1="2.83333in" y1="0in" x2="2.83333in" y2="11in"/>
       <Markup-line x1="5.66667in" y1="0in" x2="5.66667in" y2="11in"/>
+      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL713" size="US-Letter" _description="Full sheet labels with back slit">
+  <Template brand="Online Labels" part="OL713" size="US-Letter" _description="Full-page labels with back slit">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL713.htm"/>
     <Label-rectangle id="0" width="8.5in" height="11in" round="0in" x_waste="0in" y_waste="0in">
-      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
       <Markup-line x1="3in" y1="0in" x2="0in" y2="4.15in"/>
       <Markup-line x1="6.5in" y1="0in" x2="0in" y2="8.86in"/>
       <Markup-line x1="8.5in" y1="2.14in" x2="2in" y2="11in"/>
       <Markup-line x1="8.5in" y1="6.85in" x2="5.5in" y2="11in"/>
+      <Layout nx="1" ny="1" x0="0in" y0="0in" dx="8.5in" dy="11in"/>
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL32" size="US-Letter" _description="Lip balm labels">
+  <Template brand="Online Labels" part="OL32" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL32.htm"/>
@@ -1258,7 +1258,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL5275" size="US-Letter" _description="Lip balm labels">
+  <Template brand="Online Labels" part="OL5275" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5275.htm"/>
@@ -1285,7 +1285,7 @@
     </Label-ellipse>
   </Template>
 
-  <Template brand="Online Labels" part="OL1025" size="US-Letter" _description="Candle labels, lip balm labels">
+  <Template brand="Online Labels" part="OL1025" size="US-Letter" _description="Candle labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL1025.htm"/>
@@ -1294,7 +1294,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL6000" size="US-Letter" _description="Candle labels, lip balm labels">
+  <Template brand="Online Labels" part="OL6000" size="US-Letter" _description="Candle labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL6000.htm"/>
@@ -1321,7 +1321,7 @@
     </Label-ellipse>
   </Template>
 
-  <Template brand="Online Labels" part="OL2088" size="US-Letter" _description="Jar labels, candle labels">
+  <Template brand="Online Labels" part="OL2088" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2088.htm"/>
@@ -1335,12 +1335,12 @@
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL158.htm"/>
     <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"/>
       <Markup-line x1="0in" y1="0.75in" x2="1.5in" y2="0.75in"/>
+      <Layout nx="4" ny="5" x0="0.5in" y0="0.75in" dx="2in" dy="2in"/>
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL325" size="US-Letter" _description="Jar labels, candle labels, lip balm labels">
+  <Template brand="Online Labels" part="OL325" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL325.htm"/>
@@ -1367,7 +1367,7 @@
     </Label-ellipse>
   </Template>
 
-  <Template brand="Online Labels" part="OL5375" size="US-Letter" _description="Jar labels, pot labels, candle labels">
+  <Template brand="Online Labels" part="OL5375" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5375.htm"/>
@@ -1385,7 +1385,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL8750" size="US-Letter" _description="Jar labels, candle labels">
+  <Template brand="Online Labels" part="OL8750" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL8750.htm"/>
@@ -1394,7 +1394,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL350" size="US-Letter" _description="Jar labels, nutritional labels, pot labels, soap labels">
+  <Template brand="Online Labels" part="OL350" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL350.htm"/>
@@ -1448,7 +1448,7 @@
     </Label-ellipse>
   </Template>
 
-  <Template brand="Online Labels" part="OL224" size="US-Letter" _description="Jar labels">
+  <Template brand="Online Labels" part="OL224" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL224.htm"/>
@@ -1457,7 +1457,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL5525" size="US-Letter" _description="Jar labels, nutritional labels, soap labels, candle labels, coffee and tea labels">
+  <Template brand="Online Labels" part="OL5525" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL5525.htm"/>
@@ -1502,7 +1502,7 @@
     </Label-ellipse>
   </Template>
 
-  <Template brand="Online Labels" part="OL375" size="US-Letter" _description="Jar labels, candle labels, nutritional labels">
+  <Template brand="Online Labels" part="OL375" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL375.htm"/>
@@ -1511,7 +1511,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL2685" size="US-Letter" _description="Jar labels">
+  <Template brand="Online Labels" part="OL2685" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2685.htm"/>
@@ -1529,7 +1529,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL6050" size="US-Letter" _description="Nutritional labels, soap labels, coffee and tea labels, candle labels">
+  <Template brand="Online Labels" part="OL6050" size="US-Letter" _description="Nutritional labels">
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL6050.htm"/>
@@ -1538,7 +1538,7 @@
     </Label-ellipse>
   </Template>
 
-  <Template brand="Online Labels" part="OL9810" size="US-Letter" _description="Beer bottle labels, jar labels, nutritional labels, soap labels">
+  <Template brand="Online Labels" part="OL9810" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL9810.htm"/>
@@ -1547,7 +1547,7 @@
     </Label-ellipse>
   </Template>
 
-  <Template brand="Online Labels" part="OL7425" size="US-Letter" _description="Beer bottle label, jar label">
+  <Template brand="Online Labels" part="OL7425" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL7425.htm"/>
@@ -1638,7 +1638,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Online Labels" part="OL5600" size="US-Letter" _description="Mini CD labels">
+  <Template brand="Online Labels" part="OL5600" size="US-Letter" _description="Mini CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.onlinelabels.com/OL9990.htm"/>
@@ -1775,9 +1775,9 @@
     <Meta category="media"/>
     <Meta product_url="http://www.onlinelabels.com/OL9985.htm"/>
     <Label-cd id="0" radius="2.3203in" hole="0.2955in" waste="0in">
+      <Markup-margin size="1.5133in"/>
       <Layout nx="1" ny="1" x0="0.525in" y0="0.62in" dx="4.6406in" dy="4.6406in"/>
       <Layout nx="1" ny="1" x0="3.3344in" y0="5.7394in" dx="4.6406in" dy="4.6406in"/>
-      <Markup-margin size="1.5133in"/>
     </Label-cd>
   </Template>
   <Template brand="Online Labels" part="OL9985 (case first)" size="US-Letter" _description="CD/DVD labels">
@@ -1845,7 +1845,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL9300 (first)" size="US-Letter" _description="USPS® shipping labels">
+  <Template brand="Online Labels" part="OL9300 (first)" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -1854,7 +1854,7 @@
       <Layout nx="1" ny="1" x0="0.625in" y0="0.375in" dx="6.78in" dy="4.75in"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Online Labels" part="OL9300 (second)" size="US-Letter" _description="USPS® shipping labels">
+  <Template brand="Online Labels" part="OL9300 (second)" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -1864,7 +1864,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL395" size="US-Letter" _description="USPS® shipping labels">
+  <Template brand="Online Labels" part="OL395" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -1875,7 +1875,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL9520 (first)" size="US-Letter" _description="eBay® shipping labels">
+  <Template brand="Online Labels" part="OL9520 (first)" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -1884,7 +1884,7 @@
       <Layout nx="1" ny="1" x0="0.6194in" y0="0.7722in" dx="7.4in" dy="4.5in"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Online Labels" part="OL9520 (second)" size="US-Letter" _description="eBay® shipping labels">
+  <Template brand="Online Labels" part="OL9520 (second)" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
diff --git a/templates/paper-sizes.xml b/templates/paper-sizes.xml
index e1c655c..fa35c14 100644
--- a/templates/paper-sizes.xml
+++ b/templates/paper-sizes.xml
@@ -3,55 +3,55 @@
 <Glabels-paper-sizes>
 
   <!-- Most popular (at top of list) -->
-  <Paper-size id="A4"           _name="A4"           pwg_size="iso_a4"       width="210mm" height="297mm"/>
-  <Paper-size id="US-Letter"    _name="US Letter"    pwg_size="na_letter"    width="8.5in" height="11in"/>
+  <Paper-size id="A4"           name="A4"           pwg_size="iso_a4"       width="210mm" height="297mm"/>
+  <Paper-size id="US-Letter"    name="US Letter"    pwg_size="na_letter"    width="8.5in" height="11in"/>
 
   <!-- Other US paper sizes -->
-  <Paper-size id="US-Legal"     _name="US Legal"     pwg_size="na_legal"     width="8.5in"  height="14in"/>
-  <Paper-size id="US-Executive" _name="US Executive" pwg_size="na_executive" width="7.25in" height="10.5in"/>
+  <Paper-size id="US-Legal"     name="US Legal"     pwg_size="na_legal"     width="8.5in"  height="14in"/>
+  <Paper-size id="US-Executive" name="US Executive" pwg_size="na_executive" width="7.25in" height="10.5in"/>
 
   <!-- Other ISO A series sizes -->
-  <Paper-size id="A0"           _name="A0"           pwg_size="iso_a0"       width="841mm" height="1189mm"/>
-  <Paper-size id="A1"           _name="A1"           pwg_size="iso_a1"       width="594mm" height="841mm"/>
-  <Paper-size id="A2"           _name="A2"           pwg_size="iso_a2"       width="420mm" height="594mm"/>
-  <Paper-size id="A3"           _name="A3"           pwg_size="iso_a3"       width="297mm" height="420mm"/>
-  <Paper-size id="A5"           _name="A5"           pwg_size="iso_a5"       width="148mm" height="210mm"/>
-  <Paper-size id="A6"           _name="A6"           pwg_size="iso_a6"       width="105mm" height="148mm"/>
-  <Paper-size id="A7"           _name="A7"           pwg_size="iso_a7"       width="74mm"  height="105mm"/>
-  <Paper-size id="A8"           _name="A8"           pwg_size="iso_a8"       width="52mm"  height="74mm"/>
-  <Paper-size id="A9"           _name="A9"           pwg_size="iso_a9"       width="37mm"  height="52mm"/>
-  <Paper-size id="A10"          _name="A10"          pwg_size="iso_a10"      width="26mm"  height="37mm"/>
+  <Paper-size id="A0"           name="A0"           pwg_size="iso_a0"       width="841mm" height="1189mm"/>
+  <Paper-size id="A1"           name="A1"           pwg_size="iso_a1"       width="594mm" height="841mm"/>
+  <Paper-size id="A2"           name="A2"           pwg_size="iso_a2"       width="420mm" height="594mm"/>
+  <Paper-size id="A3"           name="A3"           pwg_size="iso_a3"       width="297mm" height="420mm"/>
+  <Paper-size id="A5"           name="A5"           pwg_size="iso_a5"       width="148mm" height="210mm"/>
+  <Paper-size id="A6"           name="A6"           pwg_size="iso_a6"       width="105mm" height="148mm"/>
+  <Paper-size id="A7"           name="A7"           pwg_size="iso_a7"       width="74mm"  height="105mm"/>
+  <Paper-size id="A8"           name="A8"           pwg_size="iso_a8"       width="52mm"  height="74mm"/>
+  <Paper-size id="A9"           name="A9"           pwg_size="iso_a9"       width="37mm"  height="52mm"/>
+  <Paper-size id="A10"          name="A10"          pwg_size="iso_a10"      width="26mm"  height="37mm"/>
 
   <!-- ISO B series sizes -->
-  <Paper-size id="B0"           _name="B0"           pwg_size="iso_b0"       width="1000mm" height="1414mm"/>
-  <Paper-size id="B1"           _name="B1"           pwg_size="iso_b1"       width="707mm"  height="1000mm"/>
-  <Paper-size id="B2"           _name="B2"           pwg_size="iso_b2"       width="500mm"  height="707mm"/>
-  <Paper-size id="B3"           _name="B3"           pwg_size="iso_b3"       width="353mm"  height="500mm"/>
-  <Paper-size id="B4"           _name="B4"           pwg_size="iso_b4"       width="250mm"  height="353mm"/>
-  <Paper-size id="B5"           _name="B5"           pwg_size="iso_b5"       width="176mm"  height="250mm"/>
-  <Paper-size id="B6"           _name="B6"           pwg_size="iso_b6"       width="125mm"  height="176mm"/>
-  <Paper-size id="B7"           _name="B7"           pwg_size="iso_b7"       width="88mm"   height="125mm"/>
-  <Paper-size id="B8"           _name="B8"           pwg_size="iso_b8"       width="62mm"   height="88mm"/>
-  <Paper-size id="B9"           _name="B9"           pwg_size="iso_b9"       width="44mm"   height="62mm"/>
-  <Paper-size id="B10"          _name="B10"          pwg_size="iso_b10"      width="31mm"   height="44mm"/>
+  <Paper-size id="B0"           name="B0"           pwg_size="iso_b0"       width="1000mm" height="1414mm"/>
+  <Paper-size id="B1"           name="B1"           pwg_size="iso_b1"       width="707mm"  height="1000mm"/>
+  <Paper-size id="B2"           name="B2"           pwg_size="iso_b2"       width="500mm"  height="707mm"/>
+  <Paper-size id="B3"           name="B3"           pwg_size="iso_b3"       width="353mm"  height="500mm"/>
+  <Paper-size id="B4"           name="B4"           pwg_size="iso_b4"       width="250mm"  height="353mm"/>
+  <Paper-size id="B5"           name="B5"           pwg_size="iso_b5"       width="176mm"  height="250mm"/>
+  <Paper-size id="B6"           name="B6"           pwg_size="iso_b6"       width="125mm"  height="176mm"/>
+  <Paper-size id="B7"           name="B7"           pwg_size="iso_b7"       width="88mm"   height="125mm"/>
+  <Paper-size id="B8"           name="B8"           pwg_size="iso_b8"       width="62mm"   height="88mm"/>
+  <Paper-size id="B9"           name="B9"           pwg_size="iso_b9"       width="44mm"   height="62mm"/>
+  <Paper-size id="B10"          name="B10"          pwg_size="iso_b10"      width="31mm"   height="44mm"/>
 
   <!-- Envelopes -->
-  <Paper-size id="number10"     _name="#10 Envelope"     pwg_size="na_number-10" width="4.125in" height="9.5in"/>
-  <Paper-size id="monarch"      _name="Monarch Envelope" pwg_size="na_monarch"   width="3.875in" height="7.5in"/>
-  <Paper-size id="c5"           _name="C5"               pwg_size="iso_c5"       width="162mm"   height="229mm"/>
-  <Paper-size id="c6"           _name="C6"               pwg_size="iso_c6"       width="114mm"   height="162mm"/>
-  <Paper-size id="dl"           _name="DL"               pwg_size="iso_dl"       width="110mm"   height="220mm"/>
+  <Paper-size id="number10"     name="#10 Envelope"     pwg_size="na_number-10" width="4.125in" height="9.5in"/>
+  <Paper-size id="monarch"      name="Monarch Envelope" pwg_size="na_monarch"   width="3.875in" height="7.5in"/>
+  <Paper-size id="c5"           name="C5"               pwg_size="iso_c5"       width="162mm"   height="229mm"/>
+  <Paper-size id="c6"           name="C6"               pwg_size="iso_c6"       width="114mm"   height="162mm"/>
+  <Paper-size id="dl"           name="DL"               pwg_size="iso_dl"       width="110mm"   height="220mm"/>
 
   <!-- ISO 217 -->
-  <Paper-size id="RA0"          _name="RA0"          pwg_size="iso_ra0"		width="860mm" height="1220mm"/>
-  <Paper-size id="RA1"          _name="RA1"          pwg_size="iso_ra1"		width="610mm" height="860mm"/>
-  <Paper-size id="RA2"          _name="RA2"          pwg_size="iso_ra2"		width="430mm" height="610mm"/>
-  <Paper-size id="RA3"          _name="RA3"          pwg_size="iso_ra3"		width="305mm" height="430mm"/>
-  <Paper-size id="RA4"          _name="RA4"          pwg_size="iso_ra4"		width="215mm" height="305mm"/>
-  <Paper-size id="SRA0"         _name="SRA0"         pwg_size="iso_sra0"	width="900mm" height="1280mm"/>
-  <Paper-size id="SRA1"         _name="SRA1"         pwg_size="iso_sra1"	width="640mm" height="900mm"/>
-  <Paper-size id="SRA2"         _name="SRA2"         pwg_size="iso_sra2"	width="450mm" height="640mm"/>
-  <Paper-size id="SRA3"         _name="SRA3"         pwg_size="iso_sra3"	width="320mm" height="450mm"/>
-  <Paper-size id="SRA4"         _name="SRA4"         pwg_size="iso_sra4"	width="225mm" height="320mm"/>
+  <Paper-size id="RA0"          name="RA0"          pwg_size="iso_ra0"		width="860mm" height="1220mm"/>
+  <Paper-size id="RA1"          name="RA1"          pwg_size="iso_ra1"		width="610mm" height="860mm"/>
+  <Paper-size id="RA2"          name="RA2"          pwg_size="iso_ra2"		width="430mm" height="610mm"/>
+  <Paper-size id="RA3"          name="RA3"          pwg_size="iso_ra3"		width="305mm" height="430mm"/>
+  <Paper-size id="RA4"          name="RA4"          pwg_size="iso_ra4"		width="215mm" height="305mm"/>
+  <Paper-size id="SRA0"         name="SRA0"         pwg_size="iso_sra0"	width="900mm" height="1280mm"/>
+  <Paper-size id="SRA1"         name="SRA1"         pwg_size="iso_sra1"	width="640mm" height="900mm"/>
+  <Paper-size id="SRA2"         name="SRA2"         pwg_size="iso_sra2"	width="450mm" height="640mm"/>
+  <Paper-size id="SRA3"         name="SRA3"         pwg_size="iso_sra3"	width="320mm" height="450mm"/>
+  <Paper-size id="SRA4"         name="SRA4"         pwg_size="iso_sra4"	width="225mm" height="320mm"/>
 
 </Glabels-paper-sizes>
diff --git a/templates/pearl-iso-templates.xml b/templates/pearl-iso-templates.xml
index 6b8c6a5..c5af757 100644
--- a/templates/pearl-iso-templates.xml
+++ b/templates/pearl-iso-templates.xml
@@ -7,9 +7,9 @@
   <!-- ******************************************************************** -->
 
   <!-- =================================================================== -->
-  <!-- PEARL: Adress Labels, 70mm x 36mm, 24 per sheet                     -->
+  <!-- PEARL: Address labels, 70mm x 36mm, 24 per sheet                    -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="PE-8004" size="A4" _description="Address Labels">
+  <Template brand="PEARL" part="PE-8004" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-PE8004-2204.shtml"/>
@@ -37,9 +37,9 @@
   <Template brand="PEARL" part="VM-6585" equiv="VM-6085"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Adress Labels, 48.8mm x 25.4mm, 40 per sheet                 -->
+  <!-- PEARL: Address labels, 48.8mm x 25.4mm, 40 per sheet                -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="PE-8008" size="A4" _description="Address Labels">
+  <Template brand="PEARL" part="PE-8008" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-PE8008-2204.shtml"/>
@@ -52,9 +52,9 @@
   <Template brand="PEARL" part="PE-8018" equiv="PE-8008"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Labels, 210mm x 297mm, 1 per sheet                           -->
+  <!-- PEARL: labels, 210mm x 297mm, 1 per sheet                           -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="PE-8007" size="A4" _description="Labels A4">
+  <Template brand="PEARL" part="PE-8007" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-PE8007-2204.shtml"/>
@@ -131,7 +131,7 @@
   <!-- =================================================================== -->
   <!-- PEARL: Bottle labels, 100mm x 130mm, 4 per sheet                    -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-5217" size="A4" _description="Bottle labels">
+  <Template brand="PEARL" part="VM-5217" size="A4" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM5217-2200.shtml"/>
@@ -174,9 +174,9 @@
   <Template brand="PEARL" part="VM-5721" equiv="VM-5221"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Address Labels, 25.4mm x 16.9mm, 102 per sheet               -->
+  <!-- PEARL: Address labels, 25.4mm x 16.9mm, 102 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6083" size="A4" _description="Address Labels">
+  <Template brand="PEARL" part="VM-6083" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM6083-2204.shtml"/>
@@ -189,9 +189,9 @@
   <Template brand="PEARL" part="VM-6583" equiv="VM-6083"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Labels, 105mm x 148 mm, 1 per sheet                          -->
+  <!-- PEARL: labels, 105mm x 148 mm, 1 per sheet                          -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6096" size="A6" _description="Labels A6">
+  <Template brand="PEARL" part="VM-6096" size="A6" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM6096-2204.shtml"/>
@@ -204,9 +204,9 @@
   <Template brand="PEARL" part="VM-6596" equiv="VM-6096"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Labels, 148mm x 210 mm, 1 per sheet                          -->
+  <!-- PEARL: labels, 148mm x 210 mm, 1 per sheet                          -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6097" size="A5" _description="Labels A5">
+  <Template brand="PEARL" part="VM-6097" size="A5" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM6097-2204.shtml"/>
@@ -237,7 +237,7 @@
   <!-- =================================================================== -->
   <!-- PEARL: Photo labels, 210mm x 297mm, 1 per sheet                     -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6206" size="A4" _description="Photo labels semiglossy">
+  <Template brand="PEARL" part="VM-6206" size="A4" _description="Photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="photo"/>
@@ -251,9 +251,9 @@
   <Template brand="PEARL" part="VM-6706" equiv="VM-6206"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Address Labels, 96.5mm x 42.3mm, 12 per sheet                -->
+  <!-- PEARL: Address labels, 96.5mm x 42.3mm, 12 per sheet                -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6232" size="A4" _description="Address Labels (STAMPIT)">
+  <Template brand="PEARL" part="VM-6232" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM6232-2201.shtml"/>
@@ -266,9 +266,9 @@
   <Template brand="PEARL" part="VM-6732" equiv="VM-6232"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Address Labels, 105mm x 74mm, 8 per sheet                    -->
+  <!-- PEARL: Address labels, 105mm x 74mm, 8 per sheet                    -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6233" size="A4" _description="Address Labels (STAMPIT)">
+  <Template brand="PEARL" part="VM-6233" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM6233-2204.shtml"/>
@@ -281,9 +281,9 @@
   <Template brand="PEARL" part="VM-6733" equiv="VM-6233"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Address Labels, 99.1mm x 57mm, 10 per sheet                  -->
+  <!-- PEARL: Address labels, 99.1mm x 57mm, 10 per sheet                  -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6234" size="A4" _description="Address Labels">
+  <Template brand="PEARL" part="VM-6234" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM6234-2204.shtml"/>
@@ -324,9 +324,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Address Labels, 105mm x 41mm, 14 per sheet                   -->
+  <!-- PEARL: Address labels, 105mm x 41mm, 14 per sheet                   -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-8005" size="A4" _description="Address Labels">
+  <Template brand="PEARL" part="VM-8005" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-PE8005-2204.shtml"/>
@@ -359,7 +359,7 @@
   <!-- PEARL: Inlet for CD boxes (front), 120mm x 120mm, 1 per sheet       -->
   <!-- =================================================================== -->
 
-  <Template brand="PEARL" part="VM-5513-1" size="A4" _description="CD inlet (front)">
+  <Template brand="PEARL" part="VM-5513-1" size="A4" _description="CD/DVD inlet (front)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM5513-2214.shtml"/>
@@ -373,7 +373,7 @@
   <!-- PEARL: Inlet for CD boxes (back), 150mm x 117.5mm, 1 per sheet      -->
   <!-- =================================================================== -->
 
-  <Template brand="PEARL" part="VM-5513-2" size="A4" _description="CD inlet (back)">
+  <Template brand="PEARL" part="VM-5513-2" size="A4" _description="CD/DVD inlet (back)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM5513-2214.shtml"/>
@@ -407,7 +407,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Passport photo labels, 45mm x 54mm, 12 per sheet        -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-5040" size="A4" _description="Passport photo labels glossy">
+  <Template brand="Sattleford" part="VM-5040" size="A4" _description="Passport photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="photo"/>
@@ -423,7 +423,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Business cards, 86mm x 54mm, 10 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-5061" size="A4" _description="Business cards punched">
+  <Template brand="Sattleford" part="VM-5061" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://www.pearl.de/a-VM5061-2014.shtml"/>
@@ -438,7 +438,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Business cards, 85mm x 54mm, 10 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-6059" size="A4" _description="Business cards punched dull">
+  <Template brand="Sattleford" part="VM-6059" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://www.pearl.de/a-VM6059-2013.shtml"/>
@@ -453,7 +453,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Business cards, 85mm x 54mm, 10 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-6066" size="A4" _description="Business cards high glossy">
+  <Template brand="Sattleford" part="VM-6066" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://www.pearl.de/a-VM6066-2013.shtml"/>
@@ -483,7 +483,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Passport photo labels, 45mm x 55mm, 12 per sheet        -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-6102" size="A4" _description="Passport photo labels glossy">
+  <Template brand="Sattleford" part="VM-6102" size="A4" _description="Passport photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="photo"/>
@@ -499,7 +499,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Foldable business cards, 180mm x 50mm, 5 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-6200" size="A4" _description="Business cards glossy, both sides printable">
+  <Template brand="Sattleford" part="VM-6200" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta category="foldable"/>
@@ -515,7 +515,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Business cards, 85mm x 54mm, 10 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-6253" size="A4" _description="Business cards punched glossy">
+  <Template brand="Sattleford" part="VM-6253" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://www.pearl.de/a-VM6253-2013.shtml"/>
@@ -530,7 +530,7 @@
   <!-- =================================================================== -->
   <!-- Sattleford: Foldable business cards, 170mm x 54mm, 5 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Sattleford" part="VM-6356" size="A4" _description="Foldable business cards glossy/dull">
+  <Template brand="Sattleford" part="VM-6356" size="A4" _description="Foldable business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta category="foldable"/>
@@ -600,7 +600,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: Membership cards, 85mm x 54.25mm, 8 per sheet          -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6310" size="A4" _description="Membership cards, both sides printable">
+  <Template brand="Your Design" part="VM-6310" size="A4" _description="Membership cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta print="mirrored"/>
@@ -617,7 +617,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 3 per sheet          		   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6352" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6352" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6352-2213.shtml"/>
@@ -631,7 +631,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 3 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6353" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6353" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6353-2213.shtml"/>
@@ -645,7 +645,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 3 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6354" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6354" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6354-2213.shtml"/>
@@ -659,7 +659,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 3 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6355" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6355" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6355-2213.shtml"/>
@@ -673,7 +673,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 2 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6542" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6542" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6542-2213.shtml"/>
@@ -686,7 +686,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 2 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6754" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6754" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6754-2213.shtml"/>
@@ -699,7 +699,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 3 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6852" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6852" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6852-2213.shtml"/>
@@ -713,7 +713,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 3 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6853" size="A4" _description="CD/DVD Labels">
+  <Template brand="PEARL" part="VM-6853" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6853-2213.shtml"/>
@@ -727,7 +727,7 @@
   <!-- =================================================================== -->
   <!-- Your Design: CD/DVD labels, 3 per sheet         			   -->
   <!-- =================================================================== -->
-  <Template brand="Your Design" part="VM-6854" size="A4" _description="CD/DVD Labels">
+  <Template brand="Your Design" part="VM-6854" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6854-2213.shtml"/>
diff --git a/templates/rayfilm-templates.xml b/templates/rayfilm-templates.xml
index 53045e2..cc949a5 100644
--- a/templates/rayfilm-templates.xml
+++ b/templates/rayfilm-templates.xml
@@ -964,7 +964,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="0922" size="A4" _description="Labels A6">
+  <Template brand="Rayfilm" part="0922" size="A4" _description="Rectangular labels">
     <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=0922&amp;vzhled=1"/>
@@ -1139,7 +1139,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="1122" size="A4" _description="Labels A5">
+  <Template brand="Rayfilm" part="1122" size="A4" _description="Rectangular labels">
     <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=1122&amp;vzhled=1"/>
@@ -1148,7 +1148,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="1123" size="A4" _description="Labels A4">
+  <Template brand="Rayfilm" part="1123" size="A4" _description="Rectangular labels">
     <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=1123&amp;vzhled=1"/>
@@ -1157,7 +1157,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="1123A3" size="A3" _description="Labels A3">
+  <Template brand="Rayfilm" part="1123A3" size="A3" _description="Rectangular labels">
     <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=1123A3&amp;vzhled=1"/>
@@ -1166,7 +1166,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="SRA3" size="SRA3" _description="Labels SRA3">
+  <Template brand="Rayfilm" part="SRA3" size="SRA3" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="320mm" height="450mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -1268,7 +1268,7 @@
 
 
 
-  <Template brand="Rayfilm" part="CD32" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD32" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD32&amp;vzhled=1"/>
@@ -1277,7 +1277,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Rayfilm" part="CD13 (medium)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD13 (medium)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD13&amp;vzhled=1"/>
@@ -1286,7 +1286,7 @@
       <Layout nx="1" ny="1" x0="11mm" y0="156mm" dx="116mm" dy="116mm"/>
     </Label-cd>
   </Template>
-  <Template brand="Rayfilm" part="CD13 (box1)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD13 (box1)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="45mm" height="116mm" round="3.45mm" x_waste="1mm" y_waste="1mm">
@@ -1294,7 +1294,7 @@
       <Layout nx="1" ny="1" x0="154mm" y0="156mm" dx="45mm" dy="116mm"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Rayfilm" part="CD13 (box2)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD13 (box2)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="6mm" height="116mm" round="0mm" x_waste="1mm" y_waste="1mm">
@@ -1303,7 +1303,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="CD02" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD02" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD02&amp;vzhled=1"/>
@@ -1312,7 +1312,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Rayfilm" part="CD03 (medium)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD03 (medium)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD03&amp;vzhled=1"/>
@@ -1321,7 +1321,7 @@
       <Layout nx="1" ny="1" x0="81.5mm" y0="155mm" dx="118mm" dy="118mm"/>
     </Label-cd>
   </Template>
-  <Template brand="Rayfilm" part="CD03 (box1)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD03 (box1)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="45mm" height="116mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -1329,7 +1329,7 @@
       <Layout nx="1" ny="1" x0="10.5mm" y0="155mm" dx="45mm" dy="116mm"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Rayfilm" part="CD03 (box2)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD03 (box2)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="6mm" height="116mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -1338,7 +1338,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="CD04 (medium)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD04 (medium)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD04&amp;vzhled=1"/>
@@ -1346,7 +1346,7 @@
       <Layout nx="1" ny="2" x0="46.5mm" y0="25mm" dx="118mm" dy="127mm"/>
     </Label-cd>
   </Template>
-  <Template brand="Rayfilm" part="CD04 (box)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD04 (box)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="25mm" height="80mm" round="0mm" x_waste="1mm" y_waste="1mm">
@@ -1354,7 +1354,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="CD05" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD05" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD05&amp;vzhled=1"/>
@@ -1363,7 +1363,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Rayfilm" part="CD06 (medium)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD06 (medium)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD06&amp;vzhled=1"/>
@@ -1371,7 +1371,7 @@
       <Layout nx="1" ny="2" x0="46.5mm" y0="16mm" dx="148mm" dy="127mm"/>
     </Label-cd>
   </Template>
-  <Template brand="Rayfilm" part="CD06 (box)" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD06 (box)" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="7mm" height="119mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -1382,7 +1382,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="CD07" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD07" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD07&amp;vzhled=1"/>
@@ -1391,7 +1391,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Rayfilm" part="CD08" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD08" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD08&amp;vzhled=1"/>
@@ -1400,7 +1400,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Rayfilm" part="CD09" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD09" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD09&amp;vzhled=1"/>
@@ -1410,7 +1410,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Rayfilm" part="CD12" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD12" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD12&amp;vzhled=1"/>
@@ -1421,7 +1421,7 @@
 
 
 
-  <Template brand="Rayfilm" part="CD35" size="A4" _description="CD/DVD Labels">
+  <Template brand="Rayfilm" part="CD35" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CD35&amp;vzhled=1"/>
@@ -1430,7 +1430,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Rayfilm" part="CRD1" size="A4" _description="Business card CD Labels">
+  <Template brand="Rayfilm" part="CRD1" size="A4" _description="Business card CD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=CRD1&amp;vzhled=1"/>
@@ -1440,7 +1440,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="SCD1" size="A4" _description="Mini CD Labels">
+  <Template brand="Rayfilm" part="SCD1" size="A4" _description="Mini CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=SCD1&amp;vzhled=1"/>
@@ -1476,7 +1476,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="VIZ1" size="A4" _description="Business Cards">
+  <Template brand="Rayfilm" part="VIZ1" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=VIZ1&amp;vzhled=1"/>
@@ -1486,7 +1486,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="VIZ2" size="A4" _description="Business Cards">
+  <Template brand="Rayfilm" part="VIZ2" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=VIZ2&amp;vzhled=1"/>
@@ -1496,7 +1496,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Rayfilm" part="VIZ3" size="A4" _description="Business Cards">
+  <Template brand="Rayfilm" part="VIZ3" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Meta product_url="http://www.rayfilm.cz/e-shop/index2.php?detail_search=4&amp;skupina=-10&amp;9amp6803amp1=VIZ3&amp;vzhled=1"/>
diff --git a/templates/sheetlabels-us-templates.xml b/templates/sheetlabels-us-templates.xml
index 5984361..43cbf3d 100644
--- a/templates/sheetlabels-us-templates.xml
+++ b/templates/sheetlabels-us-templates.xml
@@ -9,7 +9,7 @@
   <!-- ******************************************************************** -->
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 4 per sheet	         	   -->
+  <!-- SheetLabels: Rectangular labels, 4 per sheet	         	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL1" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -23,7 +23,7 @@
   
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 4 per sheet	         	   -->
+  <!-- SheetLabels: Rectangular labels, 4 per sheet	         	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL10" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -36,9 +36,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Address Labels, 20 per sheet	         	   -->
+  <!-- SheetLabels: Address labels, 20 per sheet	         	   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL100" size="US-Letter" _description="Address Labels">
+  <Template brand="SheetLabels" part="SL100" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL100"/>
@@ -49,9 +49,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Address Labels, 14 per sheet        		   -->
+  <!-- SheetLabels: Address labels, 14 per sheet        		   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL101" size="US-Letter" _description="Address Labels">
+  <Template brand="SheetLabels" part="SL101" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL101"/>
@@ -63,9 +63,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Shipping Labels, 10 per sheet        		   -->
+  <!-- SheetLabels: Shipping labels, 10 per sheet        		   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL102" size="US-Letter" _description="Shipping Labels">
+  <Template brand="SheetLabels" part="SL102" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL102"/>
@@ -76,9 +76,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Shipping Labels, 6 per sheet                           -->
+  <!-- SheetLabels: Shipping labels, 6 per sheet                           -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL103" size="US-Letter" _description="Shipping Labels">
+  <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"/>
@@ -89,9 +89,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Shipping Labels, 6 per sheet	         		   -->
+  <!-- SheetLabels: Shipping labels, 6 per sheet                           -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL104" size="US-Letter" _description="Shipping Labels">
+  <Template brand="SheetLabels" part="SL104" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL104"/>
@@ -102,9 +102,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Return Address Labels, 80 per sheet        		   -->
+  <!-- SheetLabels: Return address labels, 80 per sheet        		   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL105" size="US-Letter" _description="Return Address Labels">
+  <Template brand="SheetLabels" part="SL105" size="US-Letter" _description="Return address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
   <Meta product_url="http://www.sheet-labels.com/labels/SL105"/>
@@ -115,9 +115,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 12 per sheet	        		   -->
+  <!-- SheetLabels: Round labels, 12 per sheet	        		   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL107" size="US-Letter" _description="Round Labels">
+  <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"/>
@@ -128,9 +128,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 12 per sheet	        		   -->
+  <!-- SheetLabels: Round labels, 12 per sheet	        		   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL108" size="US-Letter" _description="Round Labels">
+  <Template brand="SheetLabels" part="SL108" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL108"/>
@@ -141,9 +141,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Filing Labels, 30 per sheet	        		   -->
+  <!-- SheetLabels: Filing labels, 30 per sheet	        		   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL109" size="US-Letter" _description="Filing Labels">
+  <Template brand="SheetLabels" part="SL109" size="US-Letter" _description="Filing labels">
     <Meta category="label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL109"/>
     <Label-rectangle id="0" width="3.4375in" height="0.666666667in" round="0.0625in">
@@ -153,9 +153,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangle Labels, 18 per sheet                         -->
+  <!-- SheetLabels: Rectangular labels, 18 per sheet                       -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL11" size="US-Letter" _description="Shipping Labels">
+  <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">
@@ -165,9 +165,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: CD/DVD Labels (face only), 2 per sheet         	   -->
+  <!-- SheetLabels: CD/DVD labels (face only), 2 per sheet         	   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL110" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="SheetLabels" part="SL110" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL110"/>
@@ -178,9 +178,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: CD/DVD Labels (face only), 3 per sheet         	   -->
+  <!-- SheetLabels: CD/DVD labels (face only), 3 per sheet         	   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL113" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="SheetLabels" part="SL113" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL113"/>
@@ -193,7 +193,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 63 per sheet                             -->
+  <!-- SheetLabels: Round labels, 63 per sheet                             -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL114" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
@@ -206,7 +206,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 108 per sheet                            -->
+  <!-- SheetLabels: Round labels, 108 per sheet                            -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL115" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
@@ -219,9 +219,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Mailing Labels, 12 per sheet                           -->
+  <!-- SheetLabels: Mailing labels, 12 per sheet                           -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL116" size="US-Letter" _description="Address Labels">
+  <Template brand="SheetLabels" part="SL116" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL116"/>
@@ -232,9 +232,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Diskette Labels, 2_3/4'' x 2_3/4'', 9 per sheet	   -->
+  <!-- SheetLabels: Diskette labels, 2_3/4'' x 2_3/4'', 9 per sheet	   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL121" size="US-Letter" _description="Diskette Labels">
+  <Template brand="SheetLabels" part="SL121" size="US-Letter" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL121"/>
@@ -245,10 +245,10 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: CD/DVD Labels (face only), 2 per sheet         	   -->
+  <!-- SheetLabels: CD/DVD labels (face only), 2 per sheet         	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL122" size="US-Letter"
-         _description="CD/DVD Labels (Disc Labels)">
+         _description="CD/DVD labels (disc labels)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL122"/>
@@ -264,9 +264,9 @@
   
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 20 per sheet		         	   -->
+  <!-- SheetLabels: Round labels, 20 per sheet		         	   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL123" size="US-Letter" _description="Round Labels">
+  <Template brand="SheetLabels" part="SL123" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL123"/>
@@ -278,9 +278,9 @@
   
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 30 per sheet		         	           -->
+  <!-- SheetLabels: Round labels, 30 per sheet                             -->
   <!-- =================================================================== -->  
-  <Template brand="SheetLabels" part="SL125" size="US-Letter" _description="Round Labels">
+  <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"/>
@@ -292,9 +292,9 @@
   
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 6 per sheet		         	   -->
+  <!-- SheetLabels: Round labels, 6 per sheet		         	   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL128" size="US-Letter" _description="Round Labels">
+  <Template brand="SheetLabels" part="SL128" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL128"/>
@@ -306,9 +306,9 @@
   
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 1 per sheet				   -->
+  <!-- SheetLabels: Round labels, 1 per sheet				   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL129" size="US-Letter" _description="Round Labels">
+  <Template brand="SheetLabels" part="SL129" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL129"/>
@@ -320,7 +320,7 @@
   
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 4 per sheet	         	   -->
+  <!-- SheetLabels: Rectangular labels, 4 per sheet	         	   -->
   <!-- =================================================================== -->  
   <Template brand="SheetLabels" part="SL145" size="US-Letter" _description="Rectangular labels">
 	<Meta category="label"/>
@@ -333,9 +333,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 4 per sheet	         	   -->
+  <!-- SheetLabels: Round labels, 4 per sheet                              -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL200" size="US-Letter" _description="Round Labels">
+  <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"/>
@@ -347,9 +347,9 @@
 
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Elliptical Labels, 10 per sheet	         	           -->
+  <!-- SheetLabels: Elliptical labels, 10 per sheet                        -->
   <!-- =================================================================== -->  
-  <Template brand="SheetLabels" part="SL201" size="US-Letter" _description="Oval bottle labels">
+  <Template brand="SheetLabels" part="SL201" size="US-Letter" _description="Oval bottle/jar labels">
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL201"/>
@@ -361,9 +361,9 @@
   
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Round Labels, 6 per sheet	         	               -->
+  <!-- SheetLabels: Round labels, 6 per sheet                              -->
   <!-- =================================================================== --> 
-  <Template brand="SheetLabels" part="SL228" size="US-Letter" _description="Round Labels">
+  <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"/>
@@ -375,10 +375,10 @@
 
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: VCR Labels, 1_7/8'' x 3_1/16'', 10 per sheet 	   -->
+  <!-- SheetLabels: VCR labels, 1_7/8'' x 3_1/16'', 10 per sheet 	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL302" size="US-Letter"
-         _description="Video Tape Face Labels">
+         _description="Video tape face labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL302"/>
@@ -390,9 +390,9 @@
   
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Bottle Labels, 3 per sheet	         	               -->
+  <!-- SheetLabels: Bottle labels, 3 per sheet                             -->
   <!-- =================================================================== -->  
-  <Template brand="SheetLabels" part="SL303" size="US-Letter" _description="Bottle labels">
+  <Template brand="SheetLabels" part="SL303" size="US-Letter" _description="Bottle/jar labels">
 	<Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL303"/>
@@ -404,9 +404,9 @@
   
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Bottle Labels, 5 per sheet	         	               -->
+  <!-- SheetLabels: Bottle labels, 5 per sheet                             -->
   <!-- =================================================================== -->  
-  <Template brand="SheetLabels" part="SL304" size="US-Letter" _description="Bottle labels">
+  <Template brand="SheetLabels" part="SL304" size="US-Letter" _description="Bottle/jar labels">
 	<Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL304"/>
@@ -418,7 +418,7 @@
   
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 2 per sheet	         	           -->
+  <!-- SheetLabels: Rectangular labels, 2 per sheet                        -->
   <!-- =================================================================== -->  
   <Template brand="SheetLabels" part="SL517" size="US-Letter" _description="Rectangular labels">
 	<Meta category="label"/>
@@ -432,7 +432,7 @@
   
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 4 per sheet	         	           -->
+  <!-- SheetLabels: Rectangular labels, 4 per sheet                        -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL522" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -446,7 +446,7 @@
   
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 5 per sheet	         	           -->
+  <!-- SheetLabels: Rectangular labels, 5 per sheet                        -->
   <!-- =================================================================== --> 
   <Template brand="SheetLabels" part="SL527" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -460,7 +460,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 10 per sheet        	           -->
+  <!-- SheetLabels: Rectangular labels, 10 per sheet        	           -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL529" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -474,7 +474,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 6 per sheet         	           -->
+  <!-- SheetLabels: Rectangular labels, 6 per sheet         	           -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL530" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -488,9 +488,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Mailing Labels, 10 per sheet                           -->
+  <!-- SheetLabels: Mailing labels, 10 per sheet                           -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL540" size="US-Letter" _description="Address Labels">
+  <Template brand="SheetLabels" part="SL540" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL540"/>
@@ -501,9 +501,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Address Labels, 1'' x 4'', 20 per sheet        	   -->
+  <!-- SheetLabels: Address labels, 1'' x 4'', 20 per sheet        	   -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL550" size="US-Letter" _description="Address Labels">
+  <Template brand="SheetLabels" part="SL550" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL550"/>
@@ -515,7 +515,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 21 per sheet	         	   -->
+  <!-- SheetLabels: Rectangular labels, 21 per sheet	         	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL552" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -528,7 +528,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 40 per sheet	         	   -->
+  <!-- SheetLabels: Rectangular labels, 40 per sheet	         	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL556" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -542,7 +542,7 @@
 
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: Rectangular Labels, 50 per sheet	         	   -->
+  <!-- SheetLabels: Rectangular labels, 50 per sheet	         	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL559" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
@@ -555,10 +555,10 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- SheetLabels: CD/DVD Labels (face only), 2 per sheet         	   -->
+  <!-- SheetLabels: CD/DVD labels (face only), 2 per sheet         	   -->
   <!-- =================================================================== -->
   <Template brand="SheetLabels" part="SL563" size="US-Letter"
-         _description="CD/DVD Labels (Disc Labels)">
+         _description="CD/DVD labels (disc labels)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL563"/>
@@ -573,9 +573,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- SheetLabels: Mailing Labels, 6 per sheet         	           -->
+  <!-- SheetLabels: Mailing labels, 6 per sheet         	           -->
   <!-- =================================================================== -->
-  <Template brand="SheetLabels" part="SL573" size="US-Letter" _description="Mailing Labels">
+  <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"/>
diff --git a/templates/uline-us-templates.xml b/templates/uline-us-templates.xml
index 4fe1246..7f6dc07 100644
--- a/templates/uline-us-templates.xml
+++ b/templates/uline-us-templates.xml
@@ -12,7 +12,7 @@
   <!-- ******************************************************************** -->
 
 
-  <Template brand="Uline" part="S-5044" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Uline" part="S-5044" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
diff --git a/templates/worldlabel-us-templates.xml b/templates/worldlabel-us-templates.xml
index 1af2198..095ed85 100644
--- a/templates/worldlabel-us-templates.xml
+++ b/templates/worldlabel-us-templates.xml
@@ -11,7 +11,7 @@
   <!-- ******************************************************************** -->
   <!-- ******************************************************************** -->
 
-  <Template brand="Worldlabel" part="WL-25" size="US-Letter" _description="Return Address Labels">
+  <Template brand="Worldlabel" part="WL-25" size="US-Letter" _description="Return address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="1.75in" height="0.5in" round="0.0625in">
@@ -20,7 +20,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-75" size="US-Letter" _description="Address Labels">
+  <Template brand="Worldlabel" part="WL-75" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1in" round="0.0625in">
@@ -29,7 +29,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-100" size="US-Letter" _description="Address Labels">
+  <Template brand="Worldlabel" part="WL-100" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.333333333in" round="0.0625in">
@@ -39,7 +39,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-125" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Worldlabel" part="WL-125" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="2in" round="0.125in">
@@ -48,7 +48,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-150" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Worldlabel" part="WL-150" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="3.333333333in" round="0.125in">
@@ -57,7 +57,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-157" size="US-Letter" _description="File Folder Labels">
+  <Template brand="Worldlabel" part="WL-157" size="US-Letter" _description="File folder labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="3.4375in" height="0.9375in" round="0.0625in" waste="5pt">
       <Markup-margin size="0.0625in"/>
@@ -65,7 +65,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-159" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Worldlabel" part="WL-159" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="8.12992in" height="5in" round="0.0625in" waste="0">
@@ -74,7 +74,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-160" size="US-Letter" _description="Address Labels">
+  <Template brand="Worldlabel" part="WL-160" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="2.375in" height="1.25in" round="0.0625in" waste="0.125in">
@@ -83,7 +83,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-161" size="US-Letter" _description="Address Labels">
+  <Template brand="Worldlabel" part="WL-161" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.75in" height="1.25in" round="0.0625in" waste="5pt">
@@ -92,7 +92,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-171" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Worldlabel" part="WL-171" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.75in" height="2.0in" round="0.0625in" waste="0.125">
@@ -101,7 +101,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-172" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Worldlabel" part="WL-172" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.75in" height="3.0in" round="0.0625in" waste="0.125">
@@ -110,7 +110,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-175" size="US-Letter" _description="Full Sheet Labels">
+  <Template brand="Worldlabel" part="WL-175" size="US-Letter" _description="Full-page labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="8.5in" height="11.in" round="0">
       <Markup-margin size="0.0625in"/>
@@ -118,7 +118,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-200" size="US-Letter" _description="Filing Labels">
+  <Template brand="Worldlabel" part="WL-200" size="US-Letter" _description="Filing labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="3.4375in" height="0.666666667in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
@@ -126,7 +126,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-225" size="US-Letter" _description="Diskette Labels">
+  <Template brand="Worldlabel" part="WL-225" size="US-Letter" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="2.75in" height="2.75in" round="0.0625in">
@@ -135,7 +135,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-250" size="US-Letter" _description="Address Labels">
+  <Template brand="Worldlabel" part="WL-250" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.5in" round="0.0625in">
@@ -144,7 +144,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-325" size="US-Letter" _description="Round Labels">
+  <Template brand="Worldlabel" part="WL-325" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="0.8125in" waste="0pt">
@@ -153,7 +153,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-350" size="US-Letter" _description="Round Labels">
+  <Template brand="Worldlabel" part="WL-350" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.25in" waste="0pt">
@@ -162,7 +162,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-375" size="US-Letter" _description="Round Labels">
+  <Template brand="Worldlabel" part="WL-375" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.65625in" waste="0pt">
@@ -171,7 +171,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-625" size="US-Letter" _description="Address Labels">
+  <Template brand="Worldlabel" part="WL-625" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4.25in" height="2in" round="0in">
@@ -180,7 +180,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-875" size="US-Letter" _description="Address Labels">
+  <Template brand="Worldlabel" part="WL-875" size="US-Letter" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="2.625in" height="1in" round="0.0625in">
@@ -189,7 +189,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-1125" size="US-Letter" _description="Video Tape Face Labels">
+  <Template brand="Worldlabel" part="WL-1125" size="US-Letter" _description="Video tape face labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="220" height="133" round="5">
@@ -198,7 +198,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-1150" size="US-Letter" _description="Video Tape Spine Labels">
+  <Template brand="Worldlabel" part="WL-1150" size="US-Letter" _description="Video tape spine labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="414" height="48" round="5">
@@ -207,7 +207,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-1200" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Worldlabel" part="WL-1200" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -216,7 +216,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-5075" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Worldlabel" part="WL-5075" size="US-Letter" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="2.3125in" hole="0.8125in" waste="0.0625in">
@@ -229,7 +229,7 @@
     </Label-cd>
   </Template>
 
-  <Template brand="Worldlabel" part="WL-5100" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Worldlabel" part="WL-5100" size="US-Letter" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.5in" height="5in" round="0.0625in" waste="0in">
diff --git a/templates/zweckform-iso-templates.xml b/templates/zweckform-iso-templates.xml
index 9a39f5b..262c5d7 100644
--- a/templates/zweckform-iso-templates.xml
+++ b/templates/zweckform-iso-templates.xml
@@ -8,9 +8,9 @@
   <!-- ******************************************************************** -->
 
   <!-- =================================================================== -->
-  <!-- Zweckform 4760: Lever Arch File Labels, slim, 7 per sheet           -->
+  <!-- Zweckform 4760: Lever arch file labels, slim, 7 per sheet           -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="4760" size="A4" _description="Lever Arch File Labels">
+  <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">
@@ -20,9 +20,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 4761: Lever Arch File Labels, wide, 4 per sheet           -->
+  <!-- Zweckform 4761: Lever arch file labels, wide, 4 per sheet           -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="4761" size="A4" _description="Lever Arch File Labels">
+  <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">
@@ -34,7 +34,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3477: Address labels                                      -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3477" size="A4" _description="Address Labels">
+  <Template brand="Zweckform" part="3477" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="105mm" height="41mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -44,9 +44,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3651: Rectangular Labels, 52 x 29.5 mm, 40 per sheet      -->
+  <!-- Zweckform 3651: Rectangular labels, 52 x 29.5 mm, 40 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3651" size="A4" _description="Rectangular Labels">
+  <Template brand="Zweckform" part="3651" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="147.4016" height="83.6220" round="0">  
       <Markup-margin size="5"/>
@@ -55,9 +55,9 @@
   </Template>
 
   <!-- ====================================================================-->
-  <!-- Zweckform 3654: CD Labels  2 per Template                              -->
+  <!-- Zweckform 3654: CD/DVD labels  2 per Template                       -->
   <!-- ====================================================================-->
-  <Template brand="Zweckform" part="3654" size="A4" _description="CD/DVD Labels">
+  <Template brand="Zweckform" part="3654" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.78" hole="58.09" waste="5">
@@ -67,9 +67,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3659: Rectangular Labels, 97 x 42.125 mm, 12 per sheet    -->
+  <!-- Zweckform 3659: Rectangular labels, 97 x 42.125 mm, 12 per sheet    -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3659" size="A4" _description="Mailing Labels">
+  <Template brand="Zweckform" part="3659" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="274" height="120.5" round="0">  
@@ -79,9 +79,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3669:  Rectangular Labels, 70 x 50.8mm, 15 per sheet      -->
+  <!-- Zweckform 3669:  Rectangular labels, 70 x 50.8mm, 15 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3669" size="A4" _description="QSL-Karten Etiketten 70mm x 50,8mm">
+  <Template brand="Zweckform" part="3669" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198.425" height="144" round="0">
       <Markup-margin size="5"/>
@@ -90,9 +90,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3688: Lever Arch File Labels, wide, 4 per sheet           -->
+  <!-- Zweckform 3688: Lever arch file labels, wide, 4 per sheet           -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3688" size="A4" _description="Lever Arch File 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">
@@ -102,9 +102,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 4732: Multi-purpose Stick+Lift labels                     -->
+  <!-- Zweckform 4732: Multipurpose Stick+Lift labels                      -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="4732" size="A4" _description="Multi-purpose Stick+Lift Labels">
+  <Template brand="Zweckform" part="4732" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="102.047pt" height="48.189pt" round="5.66929pt" waste="0pt">
       <Markup-margin size="5.66929pt"/>
@@ -113,9 +113,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 4746: Video Labels, 147,32 x 20 mm, 13 per sheet          -->
+  <!-- Zweckform 4746: Video labels, 147,32 x 20 mm, 13 per sheet          -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="4746" size="A4" _description="Video Labels (back)">
+  <Template brand="Zweckform" part="4746" size="A4" _description="Video tape spine labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="416.6" height="56.6929" round="5">
@@ -125,9 +125,9 @@
   </Template>
   
   <!-- =================================================================== -->
-  <!-- Zweckform 4780: Allround Labels, 48,5 x 25,4 mm, 40 per sheet       -->
+  <!-- Zweckform 4780: Multipurpose labels, 48,5 x 25,4 mm, 40 per sheet   -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="4780" size="A4" _description="Allround Labels">
+  <Template brand="Zweckform" part="4780" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="137.48" height="72" round="0">
       <Markup-margin size="5"/>
@@ -136,9 +136,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3474: Address Labels, 70 x 37 mm, 24 per sheet            -->
+  <!-- Zweckform 3474: Address labels, 70 x 37 mm, 24 per sheet            -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3474" size="A4" _description="Address Labels">
+  <Template brand="Zweckform" part="3474" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="70mm" height="37mm" round="0">
@@ -148,9 +148,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3475: Address Labels, 70 x 30 mm, 24 per sheet            -->
+  <!-- Zweckform 3475: Address labels, 70 x 30 mm, 24 per sheet            -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3475" size="A4" _description="Address Labels">
+  <Template brand="Zweckform" part="3475" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="198.570" height="102.121" round="0">
@@ -160,9 +160,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3490: Rectangular Labels, 70 x 36 mm, 24 per sheet        -->
+  <!-- Zweckform 3490: Rectangular labels, 70 x 36 mm, 24 per sheet        -->
   <!-- =================================================================== -->
-   <Template brand="Zweckform" part="3490" size="A4" _description="Rectangular Copier Labels">
+   <Template brand="Zweckform" part="3490" size="A4" _description="Rectangular labels">
      <Meta category="label"/>
      <Label-rectangle id="0" width="198.425" height="102.047" round="0">
       <Markup-margin size="5"/>
@@ -171,9 +171,9 @@
    </Template>
 		      
   <!-- =================================================================== -->
-  <!-- Zweckform 4781: Rectangular Labels, 97 x 42.3 mm, 12 per sheet      -->
+  <!-- Zweckform 4781: Rectangular labels, 97 x 42.3 mm, 12 per sheet      -->
   <!-- =================================================================== -->
-   <Template brand="Zweckform" part="4781" size="A4" _description="Rectangular Copier Labels">
+   <Template brand="Zweckform" part="4781" size="A4" _description="Rectangular labels">
      <Meta category="label"/>
      <Label-rectangle id="0" width="274.960" height="119.905" round="0">
       <Markup-margin size="5"/>
@@ -184,7 +184,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 6091: Correction and Cover, 64.6 x 33.8 mm, 24 per sheet  -->
   <!-- =================================================================== -->
-   <Template brand="Zweckform" part="6091" size="A4" _description="Correction and Cover-up Labels">
+   <Template brand="Zweckform" part="6091" size="A4" _description="Correction labels">
      <Meta category="label"/>
      <Label-rectangle id="0" width="183.118" height="95.811" round="0">
       <Markup-margin size="5"/>
@@ -193,9 +193,9 @@
    </Template>
    
   <!-- =================================================================== -->
-  <!-- Zweckform 6015: CD Labels, 2 per Template                           -->
+  <!-- Zweckform 6015: CD/DVD labels, 2 per Template                       -->
   <!-- =================================================================== -->
-   <Template brand="Zweckform" part="6015" size="A4" _description="CD/DVD Labels">
+   <Template brand="Zweckform" part="6015" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
     <Meta category="media"/>
      <Label-cd id="0" radius="165.827" hole="58.110" waste="5">
@@ -205,9 +205,9 @@
    </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 6021: Allround Labels                                     -->
+  <!-- Zweckform 6021: Multipurpose labels                                 -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="6021" size="A4" _description="Allround Labels">
+  <Template brand="Zweckform" part="6021" size="A4" _description="Multipurpose labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="130.392pt" height="47.9055pt" round="0pt" waste="0pt">
       <Markup-margin size="5pt"/>
@@ -217,9 +217,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Zweckform J8435: CD Inlets Booklet part                         -->
+  <!-- Zweckform J8435: CD/DVD inlets Booklet part                     -->
   <!-- =============================================================== -->
-  <Template brand="Zweckform" part="J8435A" size="A4" _description="CD Booklet">
+  <Template brand="Zweckform" part="J8435A" size="A4" _description="CD/DVD booklet">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="125mm" round="0">
       <Markup-margin size="2mm"/>
@@ -232,9 +232,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Zweckform J8435: CD Inlets Inlet part                           -->
+  <!-- Zweckform J8435: CD/DVD inlets Inlet part                       -->
   <!-- =============================================================== -->
-  <Template brand="Zweckform" part="J8435B" size="A4" _description="CD Inlet">
+  <Template brand="Zweckform" part="J8435B" size="A4" _description="CD/DVD inlet">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="122mm" round="0">
       <Markup-margin size="2mm"/>
@@ -248,9 +248,9 @@
 
 
   <!-- =================================================================== -->
-  <!-- Zweckform 32010: Business Cards, 54.0 x 85.0 mm, 10 per sheet       -->
+  <!-- Zweckform 32010: Business cards, 54.0 x 85.0 mm, 10 per sheet       -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="32010" size="A4" _description="Business Cards">
+  <Template brand="Zweckform" part="32010" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="240.94" height="153.07" round="0">
@@ -261,9 +261,9 @@
 
 
   <!-- ============================================================ -->
-  <!-- Avery 32015: Business Cards                                  -->
+  <!-- Avery 32015: Business cards                                  -->
   <!-- ============================================================ -->
-  <Template brand="Zweckform" part="32015" size="A4" _description="Business Cards">
+  <Template brand="Zweckform" part="32015" size="A4" _description="Business cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="85mm" height="54mm" round="0mm">
@@ -273,9 +273,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Zweckform 3348: Adress Labels.                                      -->
+  <!-- Zweckform 3348: Address labels.                                     -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3348" size="A4" _description="Address Labels">
+  <Template brand="Zweckform" part="3348" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="189.921pt" height="107.717pt" round="0pt" x_waste="0pt" y_waste="0pt">
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
index 95d181d..44820ab 100644
--- a/translations/CMakeLists.txt
+++ b/translations/CMakeLists.txt
@@ -20,11 +20,12 @@ set (templates_ts_files
 
 qt5_create_translation (glabels_qm_files
   ${CMAKE_SOURCE_DIR}/glabels ${glabels_ts_files}
+  OPTIONS -no-obsolete
 )
 
 qt5_create_translation (templates_qm_files
   ${CMAKE_CURRENT_BINARY_DIR}/template-strings.h ${templates_ts_files}
-  OPTIONS -locations none
+  OPTIONS -no-obsolete -locations none
 )
 
 add_custom_target (update_translations DEPENDS ${glabels_qm_files} ${templates_qm_files})
diff --git a/translations/templates_C.ts b/translations/templates_C.ts
index 429e30b..ade044a 100644
--- a/translations/templates_C.ts
+++ b/translations/templates_C.ts
@@ -3,82 +3,10 @@
 <TS version="2.1">
 <context>
     <name>XmlStrings</name>
-    <message>
-        <source>#10 Envelope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A10</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Labels (STAMPIT)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Address labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Address labels, barcode labels, candy labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allround Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allround labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amazon FBA shipping labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Any card</source>
         <translation type="unfinished"></translation>
@@ -88,101 +16,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arch File Labels</source>
+        <source>Arch file inserts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arch File Labels (large)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arch File Labels (small)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arch File inserts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arch File labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B10</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B9</source>
+        <source>Arch file labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barcode labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Beer bottle label, jar label</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beer bottle labels, jar labels, nutritional labels, soap labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookplate labels, coffee and tea labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Card CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business card CD Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Business card CD labels</source>
         <translation type="unfinished"></translation>
@@ -196,111 +40,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business cards glossy, both sides printable</source>
+        <source>CD/DVD booklet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business cards high glossy</source>
+        <source>CD/DVD case (rightside up)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business cards punched</source>
+        <source>CD/DVD case (upside down)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business cards punched dull</source>
+        <source>CD/DVD case booklet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business cards punched glossy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD Booklet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD Inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD Template Rectangles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD case labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD inlet (back)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD inlet (front)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Labels (Disc Labels)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Labels (Face Only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Labels (Spine Labels)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Labels (face only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Labels Standard Format (face only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD Tray</source>
+        <source>CD/DVD case labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD/DVD center hub labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CD/DVD inlet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD inlet (back)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD inlet (front)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>CD/DVD labels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CD/DVD labels (disc labels)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD labels (disc only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD labels (rectangles)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD labels (spine labels)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD labels (spine only)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>CD/DVD or other media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Candle labels, lip balm labels</source>
+        <source>CD/DVD tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,15 +112,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cassette Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cassette Tape Face</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Classification labels, library book labels</source>
+        <source>Cassette labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -324,15 +120,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Correction and Cover-up Labels</source>
+        <source>Correction labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DLT Labels</source>
+        <source>DLT labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -347,54 +139,22 @@
         <source>Digital video labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Diskette Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Diskette Labels (face only)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Diskette labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Divider Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EPSON Photo Stickers 16</source>
+        <source>Divider labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elliptical labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Etiketten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Folder Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File folder labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File labels, return address labels, medical chart labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filing Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Filing labels</source>
         <translation type="unfinished"></translation>
@@ -411,36 +171,20 @@
         <source>Foldable business cards</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Foldable business cards glossy/dull</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Foldable cards</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Fridge Magnet Stickers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Sheet Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Full face CD/DVD labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Full sheet labels</source>
+        <source>Full-page labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Full sheet labels with back slit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Labels</source>
+        <source>Full-page labels with back slit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -448,95 +192,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hanging Folder</source>
+        <source>Hanging folder labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hershey&apos;s® chocolate labels</source>
+        <source>ID labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identification Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Index Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inkjet/Laser Labels 70x37mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, Coffee and tea labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, candle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, candle labels, lip balm labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, candle labels, metal tin container labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, candle labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, candy labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, coffee and tea labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, nutritional labels, pot labels, soap labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, nutritional labels, soap labels, candle labels, coffee and tea labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, pot labels, candle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, pot labels, coffee and tea labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, pot labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, water bottle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jar labels, water bottle labels, wine bottle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jewel Case Booklet</source>
+        <source>Index cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -544,55 +208,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Labels A3</source>
+        <source>Large address labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Labels A4</source>
+        <source>Large round labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Labels A5</source>
+        <source>Lever arch file labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Labels A6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Labels SRA3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large Address Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large Round Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lever Arch File Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lip balm labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lip balm tube labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liquor bottle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail Order Manager labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailing Labels</source>
+        <source>Magnet stickers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -607,40 +235,20 @@
         <source>Medical chart labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Medical chart labels, barcode labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Membership cards</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Membership cards, both sides printable</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Metal tin container labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Metal tin container labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Microtube labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini Address Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini CD Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini CD labels</source>
+        <source>Mini CD/DVD labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -648,47 +256,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini Labels</source>
+        <source>Mini address labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-CD Labels</source>
+        <source>Mini labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Monarch Envelope</source>
+        <source>Multipurpose labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Multi Purpose Labels 17mm x 54mm</source>
+        <source>Name badge labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Multi Purpose Labels 17mm x 54mm (Old)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-Purpose Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-purpose Stick+Lift Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multipurpose Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Badge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Badge Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Badges</source>
+        <source>Name badges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -699,30 +283,6 @@
         <source>Nutritional labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Nutritional labels, soap labels, coffee and tea labels, candle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oval bottle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRO CD Labels 2-up (CD spine only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRO CD Labels 2-up (Face only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRO CD Labels 2-up (face only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PVC labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Paper hole reinforcement labels</source>
         <translation type="unfinished"></translation>
@@ -731,82 +291,30 @@
         <source>Passport photo labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Passport photo labels glossy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PayPal® label</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Photo labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Photo labels semiglossy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Photo products</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Photo stickers</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Post cards</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pot labels, barcode labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pot labels, coffee and tea labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Printable mousepad</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>QSL-Karten Etiketten 70mm x 50,8mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rectangular Copier Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rectangular Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Rectangular labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Return Address Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Return address labels</source>
         <translation type="unfinished"></translation>
@@ -819,10 +327,6 @@
         <source>Reverse automobile window stickers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Round Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Round and rectangular labels</source>
         <translation type="unfinished"></translation>
@@ -835,42 +339,14 @@
         <source>Rounded rectangular labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SD Card labels, library book labels, classification labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>SD card labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SRA0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SRA1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SRA2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SRA3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SRA4</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Seal labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Self-Adhesive Name Badges (Acetate Silk)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Self-adhesive film transparent</source>
         <translation type="unfinished"></translation>
@@ -887,72 +363,24 @@
         <source>Self-adhesive window film</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shipping Address Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shipping Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shipping Labels 62mm x 100mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shipping Labels 62mm x 100mm (Old)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Shipping labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Slimline CD Case (rightside up)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slimline CD Case (upside down)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small Round Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Square Labels</source>
+        <source>Small round labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Square labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Standard Address Labels 29mm x 90mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard Address Labels 29mm x 90mm (Old)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard Address Labels 38mm x 90mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard Address Labels 38mm x 90mm (Old)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Target stickers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tent Cards</source>
+        <source>Tent cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -963,90 +391,30 @@
         <source>Triangular labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>US Executive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>US Legal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>US Letter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USPS® shipping labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Universal Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VHS face labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>VHS inlet</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>VHS labels, jar labels, book labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>VHS-C inlet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>VICS labels</source>
+        <source>Video labels (face only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video Labels (back)</source>
+        <source>Video tape face labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video Labels (face only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video Tape Face Labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video Tape Spine Labels</source>
+        <source>Video tape spine labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video-8 inlet</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Water bottle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Water bottle labels, jar labels, candle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Water bottle labels, shipping labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wine bottle labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wine bottle labels, nutritional labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wine bottle labels, shipping labels, UPS® WorldShip® labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Zip disc inlet</source>
         <translation type="unfinished"></translation>
@@ -1056,7 +424,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>eBay® shipping labels</source>
+        <source>Bookplate labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottle/jar labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Candle labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Classification labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oval bottle/jar labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VHS face labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VHS labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large arch file labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small arch file labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tube labels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>