diff --git a/.gitignore b/.gitignore
index fa61639d..7f0284b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ devel/test.php
 .idea/
 lib/tm.conf
 local.sh
+.DS_Store
diff --git a/credits.php b/credits.php
index a417cee4..581d85fa 100644
--- a/credits.php
+++ b/credits.php
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
 <meta charset="utf-8">
@@ -15,7 +15,7 @@
 <p class="text">Travel Mapping is the successor project to the
 dormant <a href="http://cmap.m-plex.com">Clinched Highway
 Mapping</a> (CHM) project, developed and operated by Timothy Reichard.
-Some underlying code and the initial highway data are from CHM.</p>
+Some underlying code and the initial highway data are based on CHM.</p>
 
 <p class="heading">Highway Data Sources</p>
 
@@ -38,7 +38,9 @@
 	      <li><a href="http://maps.nokia.com/services/">Nokia/Ovi Map</a>. Online tile map from NAVTEQ that covers the world.</li>
 	      <li><a href="http://www.mapquest.com/">Mapquest</a>. Online tile map from MapQuest that covers the world.</li>
 	      <li><a href="http://maps.yahoo.com/">Yahoo Maps</a>. Online tile map from Yahoo that covers the world.</li>
-              <li><a href="http://maps.yandex.ru">Yandex Maps</a>. Tile maps of eastern Europe, with street view of major cities.</li>
+          <li><a href="http://maps.yandex.ru">Yandex Maps</a>. Tile maps of eastern Europe, with street view of major cities.</li>
+		  <li><a href="http://www.esri.com/">Esri Maps</a>. Online tile map from Esri that covers the world.</li>
+		  <li><a href="https://here.com/en">HERE maps</a>. Online tile map from HERE, which provides world wide mapping data.</li>
 	    </ul>
 	  </li>
 	  <li>Gazetteers
@@ -479,7 +481,7 @@
 	  </li>
 	  <li>Idaho, USA
 	    <ul>
-	    <li><a href="http://itd.idaho.gov/planning/milepointlog/mplog/index.html">Idaho Milepoint Log</a>. Official route log from the Idaho Transportation Department.</li>
+	    <li><a href="http://itd.idaho.gov/milepointlog/">Idaho Milepoint Log</a>. Official route log from the Idaho Transportation Department.</li>
 	    </ul>
 	  </li>
 	  <li>Illinois, USA
@@ -619,7 +621,7 @@
 	    <ul>
 	    <li>Unofficial Ohio State Highways. John Simpson's directory in development of Ohio highways.</li>
 	    <li><a href="https://www.dot.state.oh.us/maps/Pages/TransMap15.aspx">Ohio Official Highway Map</a>. On-line Ohio state highway map.</li>
-	    <li><a href="https://www.dot.state.oh.us/Divisions/Planning/TechServ/TIM/Pages/Straight-Line-Diagrams.aspx">OHDO Straight Line Diagrams</a>. Comprehensive directory of straight line diagrams of Ohio highways.</li>
+	    <li><a href="https://www.dot.state.oh.us/Divisions/Planning/TechServ/TIM/Pages/Straight-Line-Diagrams.aspx">ODOT Straight Line Diagrams</a>. Comprehensive directory of straight line diagrams of Ohio highways.</li>
 	    </ul>
 	  </li>
 	  <li>Oklahoma, USA
@@ -652,7 +654,9 @@
 	  </li>
 	  <li>South Carolina, USA
 	    <ul>
-<li><a href="http://dbw.scdot.org/GISMapping/default.aspx">GIS/Mapping SCDOT</a>. Official GIS data from the South Carolina Department of Transportation.</li>
+	      <li><a href="http://dbw.scdot.org/GISMapping/default.aspx">GIS/Mapping SCDOT</a>. Official GIS data from the South Carolina Department of Transportation.</li>
+	      <li><a href="http://info.scdot.org/sites/GIS/SitePages/default.aspx">SC Maps</a>.  Official maps from the South Carolina Department of Transportation.</li>
+	      <li><a href="http://www.vahighways.com/scannex/route-log/index.htm">South Carolina Highway Annex</a>.</li>
 	    </ul>
 	  </li>
 	  <li>South Dakota, USA
@@ -663,7 +667,7 @@
 	  </li>
 	  <li>Tennessee, USA
 	    <ul>
-<li><a href="http://www.tdot.state.tn.us/Maps/county/default.htm">http://www.tdot.state.tn.us/Maps/county/default.htm</a>. Tennessee County Maps.</li>
+<li><a href="http://www.tn.gov/tdot/section/maps">TDOT Maps. Official Tennessee State and County Maps.</a></li>
 	    </ul>
 	  </li>
 	  <li>Texas, USA
@@ -686,7 +690,9 @@
 	  </li>
 	  <li>Virginia, USA
 	    <ul>
-<li><a href="http://www.virginiadot.org/info/ct-TrafficCounts.asp">Virginia Traffic Data</a>. Official traffic and highway data from the Virginia Department of Transportation.</li>
+	      <li><a href="http://www.virginiadot.org/info/ct-TrafficCounts.asp">Virginia Traffic Data</a>. Official traffic and highway data from the Virginia Department of Transportation.</li>
+	      <li><a href="http://www.virginiadot.org/travel/maps-default.asp">Virginia DOT Maps</a>.  Official highway maps from the Virginia Department of Transportation</li>
+	      <li><a href="http://www.vahighways.com">Virginia Highways Page</a>.</li>
 	    </ul>
 	  </li>
 	  <li>Washington, USA
@@ -708,6 +714,46 @@
 	  <li>Wyoming, USA
 	    <ul>
 <li><a href="http://corcohighways.org/">Corco Highways</a>. Hobbist site covering state highways.</li>
+<li>GIS
+	<ul>
+	<li><a href="http://www.co.albany.wy.us/map/">Albany County</a></li>
+	<li><a href="http://maps.bighorncountywy.gov/mapserver/map?">Big Horn County</a></li>
+	<li><a href="http://gis.ccgov.net/vantagepointsweb/default.aspx?config=campbellcounty">Campbell County</a></li>
+	<li><a href="http://gis.carbonwy.com/">Carbon County</a></li>
+	<li><a href="https://maps.greenwoodmap.com/converse/map?">Converse County</a></li>
+	<li><a href="http://crookgrowdev.maps.arcgis.com/apps/webappviewer/index.html?id=7238ec86a82749ff9154ee84734f5c33">Crook County</a></li>
+	<li><a href="http://maps.greenwoodmap.com/fremontwy/map?">Fremont County</a></li>
+	<li><a href="http://goshengis.maps.arcgis.com/apps/webappviewer/index.html?id=784bc955c9094dd2a0c511c6e5a754fb">Goshen County</a></li>
+	<li><a href="http://maps.hscounty.com/mapserver/map?">Hot Springs County</a></li>
+	<li><a href="https://maps.greenwoodmap.com/johnson/map?">Johnson County</a></li>
+	<li><a href="https://maps.laramiecounty.com/mapserver/map?">Laramie County</a></li>
+	<li><a href="https://maps.lcwy.org/webmaps/LinCoParcels/">Lincoln County</a></li>
+	<li><a href="https://geosmart.casperwy.gov/">Natrona County</a></li>
+	<li><a href="http://crookgrowdev.maps.arcgis.com/apps/webappviewer/index.html?id=2d541c16c4c94e2ea2a45c9225afd7bd">Niobrara County</a></li>
+	<li><a href="http://maps.greenwoodmap.com/park//map?">Park County</a></li>
+	<li><a href="http://gis.sheridancounty.com/map?">Sheridan County</a></li>
+	<li><a href="http://maps.greenwoodmap.com/sublette/mapserver/map#zcr=6.348759032379672/2746503/1094047/0&lyrs=a15,public,townlim,ownership,roads&filter=(pidn in('30112220099500'))">Sublette County</a></li>
+	<li><a href="https://maps.greenwoodmap.com/sweetwater/map?">Sweetwater County</a></li>
+	<li><a href="http://maps.greenwoodmap.com/tetonwy/mapserver/map">Teton County</a></li>
+	<li><a href="https://maps.greenwoodmap.com/uinta/mapserver/map?">Uinta County</a></li>
+	<li><a href="http://maps.greenwoodmap.com/washakie/map?">Washakie County</a></li>
+	</ul></li>
+<li>Non-GIS county info
+	<ul>
+	<li><a href="https://www.ccgov.net/DocumentCenter/Home/View/2017">Campbell County map (non-Internet Explorer)</a></li>
+	<li><a href="http://conversecounty.org/220/Road-Information">Converse County road numbers</a></li>
+	<li><a href="http://www.plattecountywyoming.com/RoadandBridge/documents/maps/PLATTE%20COUNTY%20ROADS.pdf">Platte County road map</a></li>
+	<li><a href="http://www.niobraracounty.org/_departments/_assessor/_PDF/maps/2016/NiobraraRoadMap.pdf">Niobrara County numbered roads</a></li>
+	<li>Weston County (names and numbers): <a href="http://westongov.com/_departments/_county_assessor/_pdfs/Road_Map.pdf">1</a>, <a href=http://westongov.com/_departments/_growth_development/_pdf/Cnty_Road_Maintenance.pdf>2</a></li>
+	</ul></li>
+<li>Forest Service MVUMs:
+	<ul>
+	<li>Medicine Bow-Routt NF: <a href="https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/stelprd3842002.pdf">Snowy Range</a>, <a href="https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/stelprd3842001.pdf">Sierra Madre</a>, <a href=https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/stelprd3841999.pdf>Pole Mountain</a></li>
+	<li>Bridger-Teton NF: <a href="https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/fseprd499898.pdf">1</a>, <a href=https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/fseprd500963.pdf>2</a></li>
+	<li><a href="https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/fseprd500586.pdf">Shoshone NF</a></li>
+	<li><a href="https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/fseprd497245.pdf">Bighorn NF</a></li>
+	<li>Ashley NF (Flaming Gorge NRA): <a href="https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/stelprdb5432806.pdf">1</a>, <a href=https://www.fs.usda.gov/Internet/FSE_DOCUMENTS/stelprdb5432805.pdf>2</a></li>
+	</ul></li>
 	    </ul>
 	  </li>
 	<li>General
@@ -726,15 +772,18 @@
 
   <ul>
   <li>Eric Bryant (yakra)<br> </li>
+  <li>Evin Fairchild (compdude) </li>
   <li>Dave Filpus (dfilpus)<br>
           <a href="http://roadgeek.filpus.org/">Filpus Roadgeek</a> </li>
   <li>Adam Froehlig (froggie)<br>
       <a href="http://www.ajfroggie.com/">Froggie's Place</a> </li>
-  <li>Si Hollett (si404) </li>
+  <li>Si Hollett (si404)</li>
+  <li>Michael H (michih)</li>
   <li>James Mast (rickmastfan67)<br>
         <a href="http://rickmastfan67.blogspot.com/">Rickmastfan67 Blog</a> </li>
   <li>Jeff Morrison (jeffm)<br>
         <a href="http://www.angelfire.com/ia/jdmorrison/ends/iaends.html">Iowa Highway Ends</a> </li>
+  <li>Mike Roberson (mapmikey)</li>
   <li>Dave S (mapcat)</li>
   <li>Christopher Steig (Bickendan)</li>
   <li>Jim Teresco (terescoj), Primary Back End Development, Developed highway data for New York, Massachusetts, and New Mexico<br>
diff --git a/css/travelMapping.css b/css/travelMapping.css
index 8764b4c8..5b7746ee 100644
--- a/css/travelMapping.css
+++ b/css/travelMapping.css
@@ -53,6 +53,7 @@ table.gratable {
     margin-left: auto;
     margin-right: auto;
     background-color: white;
+    color: black;
 }
 
 table.gratable td, th {
@@ -138,6 +139,13 @@ table.gratable tr.float th {
     background-color: #999999;
 }
 
+div.gm-style, div.gm-style div {
+    -ms-user-select: text !important;
+    -moz-user-select: text !important;
+    -webkit-user-select: text !important;
+    user-select: auto !important;
+}
+
 /* from jdtstyle.css: */
 /*body {
   margin-top: 10px;
@@ -395,3 +403,4 @@ margin-left: 10px;
 	width: 750px;
 	text-align: right;
 }
+
diff --git a/devel/datacheck.php b/devel/datacheck.php
index ed14e573..77029dba 100644
--- a/devel/datacheck.php
+++ b/devel/datacheck.php
@@ -4,6 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
+<link rel="shortcut icon" type="image/png" href="/favicon.png">
 <style type="text/css">
 </style>
 <?php
diff --git a/devel/tools.php b/devel/tools.php
new file mode 100644
index 00000000..a427482e
--- /dev/null
+++ b/devel/tools.php
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
+<!-- jQuery -->
+<script type="application/javascript" src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
+<!-- TableSorter -->
+<script type="application/javascript" src="/lib/jquery.tablesorter.min.js"></script>
+<?php require $_SERVER['DOCUMENT_ROOT']."/lib/tmphpfuncs.php" ?>
+<title>Travel Mapping Developer Tools and Links</title>
+</head>
+
+<body>
+<?php require  $_SERVER['DOCUMENT_ROOT']."/lib/tmheader.php"; ?>
+<h1>Travel Mapping Developer Tools and Links</h1>
+
+
+<p class="text">
+
+This page gathers information, tools, and other links primarily of
+interest to Travel Mapping project contributors.
+Most of the files below are regenerated during each site update.
+</p>
+
+<p class="heading">Developer Tools</p>
+
+<div class="text">
+<ul>
+<li><a href="http://cmap.m-plex.com/tools/manual.php">CHM's Instruction Manual</a> (TM generally follows these rules, but we do need to develop our own manual)</li>
+<li><a href="http://cmap.m-plex.com/tools/wpteditv3/wptedit.html">CHM's WPT file Editor</a> (Goal: develop our own)</li>
+<li><a href="http://courses.teresco.org/metal/hdx/">Highway Data Explorer</a> (HDX) to view graph and near-miss data</li>
+</ul>
+</div>
+
+<p class="heading">Highway Data Development Logs</p>
+
+<?php
+//$sql_command = "select count(*) as c from datacheckErrors join routes on datacheckErrors.route = routes.root join systems on routes.systemName = systems.systemName where systems.level=\"active\" and falsePositive=\"0\"";
+$activedc = tm_count_rows("datacheckErrors", "join routes on datacheckErrors.route = routes.root join systems on routes.systemName = systems.systemName where systems.level=\"active\" and falsePositive=\"0\"");
+?>
+
+<div class="text">
+<ul>
+  <li><a href="datacheck.php">Datacheck</a> (Currently <?php echo $activedc; ?> errors in active systems)<br />
+    These errors should be corrected, or reported as false positives by adding the entry from the last column to the datacheck FP list.</li>
+<li><a href="../logs/datacheck.log">Full datacheck log file</a></li>
+  <li><a href="../logs/unmatchedfps.log">Datacheck false positive entries that did not correspond to any detected datacheck error</a>
+    <br />
+  Cleaning these are low priority tasks for the project.</li>
+<li><a href="../logs/nearmatchfps.log">Datacheck entries that nearly match false positive entries</a></li>
+  <li><a href="../graphs/">Travel Mapping Graph Data</a>
+    <br />
+    Graphs can be loaded into HDX to verify unexpected or broken concurrencies.</li>
+  <li><a href="../graphs/tm-master.nmp">Master Near-Miss Point (NMP) file</a>
+    <br />
+    NMP file can be loaded into HDX to find very nearby points that might be appropriate to combine.</li>
+<li><a href="../logs/nearmisspoints.log">Log of points that are very close together and might be candidates to merge</a></li>
+  <li><a href="../logs/unprocessedwpts.log">List of unprocessed wpt files</a>
+    <br />
+    Waypoint files in the repository that were not processed because they were not listed in any highway system's csv files</li>
+  <li><a href="../logs/pointsinuse.log">Waypoint labels in use by current TM users</a>
+    <br />
+    To be considered if wpt files of active systems are modified to avoid breaking user files, can be loaded to CHM's WPT file Editor.</li>
+  <li><a href="../logs/unusedaltlabels.log">Alternate (i.e., hidden) waypoint labels not in use by current TM users</a>
+    <br />
+    These alternate labels can safely be removed from wpt files.</li>
+</ul>
+</div>
+
+<p class="heading">Web Site Development and Site Update Logs</p>
+
+<div class="text">
+<ul>
+<li><a href="../logs/siteupdate.log">Complete output log from the site update process</a></li>
+<li><a href="../logs/highwaydatastats.log">Log of highway data stats, useful to verify web code</a></li>
+<li><a href="../logs/concurrencies.log">List of highway concurrencies detected</a></li>
+</ul>
+</div>
+
+<?php require  $_SERVER['DOCUMENT_ROOT']."/lib/tmfooter.php"; ?>
+</body>
+<?php
+    $tmdb->close();
+?>
+</html>
diff --git a/devel/updates.php b/devel/updates.php
index 17d25723..d9dac3cd 100644
--- a/devel/updates.php
+++ b/devel/updates.php
@@ -3,6 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
+<link rel="shortcut icon" type="image/png" href="/favicon.png">
 <!-- jQuery -->
 <script type="application/javascript" src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
 <!-- TableSorter -->
diff --git a/graphs/index.php b/graphs/index.php
new file mode 100644
index 00000000..c4445890
--- /dev/null
+++ b/graphs/index.php
@@ -0,0 +1,204 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<?php require $_SERVER['DOCUMENT_ROOT']."/lib/tmphpfuncs.php" ?>
+<title>Travel Mapping Graph Data</title>
+<link rel="stylesheet" type="text/css" href="/css/travelMapping.css">
+<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.15/css/jquery.dataTables.min.css">
+<style>
+table.dataTable tbody td{
+padding:0px;
+}
+</style>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="http://cdn.datatables.net/1.10.15/js/jquery.dataTables.min.js" type="text/javascript"></script>
+</head>
+<body>
+<?php require  $_SERVER['DOCUMENT_ROOT']."/lib/tmheader.php"; ?>
+
+<p class="heading">Travel Mapping Graph Data</p>
+
+<div class="text"> 
+
+This is the repository of graphs generated from the current <a
+href="/">Travel Mapping Project</a> data.  These were created for use
+in the <a href="http://courses.teresco.org/metal/">Map-based
+Educational Tools for Algorithm Learning (METAL)</a> academic project.
+You may contact <a href="http://j.teresco.org/">the author</a> if you
+would like an archive of some or all of the graphs, or if you have
+special requests for a graph of specific subset of the project's data
+to be generated.  If you do decide to make use of these graphs and/or
+the tools described here, please drop a note to <a
+href="http://j.teresco.org/">the author</a>.
+
+</div>
+
+<div class="text">
+
+For each graph, the tables below gives the graph name, a brief
+description, number of vertices and edges in both the collapsed and
+simple <a
+href="http://courses.teresco.org/metal/graph-formats.shtml">formats</a>,
+and links to download the graph files.  <b>Note:</b> larger graphs
+greatly tax the Highway Data Examiner and the Google Maps API.  They
+should all work, but large graphs require a lot of memory for your
+browser and some patience.
+
+</div>
+
+<div class="text">
+
+If you would like a local copy of all of the latest graphs, you can
+download <a href="../graphs.zip">a zip archive of all of them</a>.
+Beware that this is a large file!
+
+</div>
+
+<div class="text"> 
+
+Graphs are copyright &copy; <a href="http://j.teresco.org/">James
+D. Teresco</a>, generated from highway data gathered and maintained by
+<a href="http://tm.teresco.org/credits.php#contributors">Travel
+Mapping Project</a> contributors.  Graphs may be downloaded freely for
+academic use.  Other use prohibited.
+
+</div>
+<p class="subheading">All Graphs</p>
+<p />
+<div style="text-align:center;">
+			<p>Filter by number of vertices (collapsed)</p>
+			from
+			<input type="number" min="1" value="1" id="regMin" style="width:6rem;" onchange="tableFilter(event)">
+			to
+			<input type="number" min="1" value="30000" id="regMax" style="width:6rem;" onchange="tableFilter(event)">
+			vertices
+			<p>Filter by graph type</p>
+			<select id="regFil" onchange="selFilter(event)">
+				<option value="all">All</option>
+			</select>
+			</div>
+			<table class="gratable" id="regTable" border="1">
+			<thead>
+			<tr><th rowspan="2">Graph Description</th><th colspan="3">Collapsed Format Graph</th><th colspan="3">Simple Format Graph</th></tr>
+			<tr><th>Download Link</th><th>Vertices</th><th>Edges</th><th>Download Link</th><th>Vertices</th><th>Edges</th></tr></thead>
+			<tbody id="regBody">
+<?
+$tmconffile = fopen($_SERVER['DOCUMENT_ROOT']."/lib/tm.conf", "r");
+$tmdbname = chop(fgets($tmconffile));
+$tmdbuser = chop(fgets($tmconffile));
+$tmdbpasswd = chop(fgets($tmconffile));
+$tmdbhost = chop(fgets($tmconffile));
+
+
+// make the connection
+//echo "<!-- mysqli connecting to database ".$tmdbname." on ".$tmdbhost." -->\n";
+mysqli_report(MYSQLI_REPORT_STRICT);
+try {
+    $tmdb = new mysqli($tmdbhost, $tmdbuser, $tmdbpasswd, $tmdbname);
+}
+catch ( Exception $e ) {
+   //echoecho "<h1 style='color: red'>Failed to connect to database ".$tmdbname." on ".$tmdbhost." Please try again later.</h1>";
+   exit;
+}
+$result = $tmdb->query("SELECT * FROM graphs");
+$counter = 0;
+$prevRow;
+
+while ($row = $result->fetch_array()) {	
+	//keep track of simple info so we can put it after collapsed
+	if ($counter%2 == 0){		
+		$prevRow = $row;
+	}
+	//produce table row in correct order
+	else {
+		echo "<tr class = ".$row[5].">
+		<td>".$row[1]."</td>
+		<td><a href=".$row[0].">".$row[0]."</a></td>
+		<td class = c".$row[2].">".$row[2]."</td>
+		<td>".$row[3]."</td>";
+		
+		echo "
+		<td><a href=".$prevRow[0].">".$prevRow[0]."</a></td>
+		<td>".$prevRow[2]."</td>
+		<td>".$prevRow[3]."</td>
+		</tr>";
+	}
+	$counter++;
+}
+$values = array();
+$descr = array();
+$result = $tmdb->query("SELECT * FROM graphTypes");
+while ($row = $result->fetch_array()) {	
+	array_push($values, $row[0]);
+	array_push($descr, $row[1]);
+}
+?>
+</tbody>
+</table>
+
+<script>
+$("#regTable").DataTable(
+	{paging: false,
+	info: false
+});
+
+var vals = <?php echo '["' . implode('", "', $values) . '"]' ?>;
+var inner = <?php echo '["' . implode('", "', $descr) . '"]' ?>;
+for (var i=0; i<vals.length; i++){
+	var op = document.createElement("option");
+	op.value = vals[i];
+	op.innerHTML = vals[i] + ": " + inner[i];
+	document.getElementById("regFil").appendChild(op);
+}
+
+function tableFilter(event){
+	if (event.target.value > 0){
+		var str = event.target.id.substring(0,3)+"Body";
+		var tbody = document.getElementById(str);
+		for (var i=1; i<tbody.childNodes.length; i++){
+			if(event.target.id.substring(3) == "Max"){
+				if(parseInt(tbody.childNodes[i].childNodes[5].className.substring(1)) > event.target.value)
+					tbody.childNodes[i].classList.add("hideNumL");
+				else
+					tbody.childNodes[i].classList.remove("hideNumL");
+			}
+			else{
+				if(parseInt(tbody.childNodes[i].childNodes[5].className.substring(1)) < event.target.value)
+					tbody.childNodes[i].classList.add("hideNumS");
+				else
+					tbody.childNodes[i].classList.remove("hideNumS");
+			}
+			hideRow(tbody.childNodes[i]);			
+		}
+	}
+}
+function selFilter(event){	
+	var str = event.target.id.substring(0,3)+"Body";
+		var tbody = document.getElementById(str);
+		for (var i=1; i<tbody.childNodes.length; i++){	
+			if(document.getElementById("regFil").value != "all" && tbody.childNodes[i].className.indexOf(document.getElementById("regFil").value) == -1)
+				tbody.childNodes[i].classList.add("hideType");
+			else
+				tbody.childNodes[i].classList.remove("hideType");
+			hideRow(tbody.childNodes[i]);	
+		}
+}
+function hideRow(elem){
+	if(elem.classList.contains("hideType") || elem.classList.contains("hideNumL") || elem.classList.contains("hideNumS"))
+		elem.style.display = "none";
+	else
+		elem.style.display = "";
+}
+</script>
+<p class="text">
+The most recent site update including graph generation completed at <?php echo tm_update_time(); ?> US/Eastern.
+</p>
+
+<?php require  $_SERVER['DOCUMENT_ROOT']."/lib/tmfooter.php"; ?>
+</body>
+<?php
+    $tmdb->close();
+?>
+</html>
diff --git a/hb/index.php b/hb/index.php
index 7d49ff91..cd7b6149 100644
--- a/hb/index.php
+++ b/hb/index.php
@@ -17,6 +17,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
     <link rel="stylesheet" type="text/css" href="/fonts/roadgeek.css" />
+    <link rel="shortcut icon" type="image/png" href="/favicon.png">
     <style type="text/css">
         #headerbox {
             position: absolute;
@@ -25,7 +26,7 @@
             width: 100%;
             overflow: hidden;
             text-align: center;
-            font-size: 30px;
+            font-size: 20px;
             font-family: "Times New Roman", serif;
             font-style: bold;
         }
@@ -42,30 +43,31 @@
         #pointbox {
             position: fixed;
             left: 0px;
-            top: 70px;
-            right: 400px;
+            top: 30px;
+            right: 275px;
             bottom: 0px;
-            width: 400px;
+            width: 275px;
             overflow: auto;
+            font-size: 18px;
         }
 
         #controlbox {
             position: fixed;
-            top: 65px;
-            bottom: 100px;
+            top: 30px;
+            bottom: 60px;
             height: 100%;
-            left: 400px;
+            left: 300px;
             right: 0px;
             overflow: auto;
             padding: 5px;
-            font-size: 20px;
+            font-size: 18px;
         }
 
         #map {
             position: absolute;
-            top: 100px;
+            top: 70px;
             bottom: 0px;
-            left: 400px;
+            left: 275px;
             right: 0px;
             overflow: hidden;
         }
@@ -86,7 +88,7 @@
         }
 
         #pointbox table {
-            width: 75%;
+            width: 95%;
             margin-bottom: 15px;
         }
 
@@ -98,12 +100,6 @@
     </style>
     <?php require $_SERVER['DOCUMENT_ROOT']."/lib/tmphpfuncs.php" ?>
     <?php
-    $tmuser = "";
-
-    if (array_key_exists("u", $_GET)) {
-        $tmuser = $_GET['u'];
-    }   
-
     // check for region and/or system parameters
     $regions = tm_qs_multi_or_comma_to_array("rg");
     if (count($regions) > 0) {
@@ -127,7 +123,7 @@
 
     // if a specific route is specified, that's what we'll view
     if (array_key_exists("r", $_GET)) {
-        $routeparam = $_GET['r'];
+        $routeparam = tm_validate_root($_GET['r']);
     } else {
         $routeparam = "";
     }
@@ -153,7 +149,7 @@
     </script>
     <title><?php
         if ($routeparam != "") {
-            $sql_command = "SELECT * FROM routes WHERE root = '" . $_GET['r'] . "'";
+            $sql_command = "SELECT * FROM routes WHERE root = '" . $routeparam . "'";
             $res = tmdb_query($sql_command);
             $routeInfo = $res->fetch_array();
             $res->free();
@@ -180,7 +176,8 @@
     tm_system_select(FALSE);
     echo "<label for=\"rg\"> Region: </label>";
     tm_region_select(FALSE);
-    echo "<input type=\"hidden\" name=\"u\" value=\"{$tmuser}\" />";
+    // should be taken care of by the cookie:
+    //echo "<input type=\"hidden\" name=\"u\" value=\"{$tmuser}\" />";
     echo "<input type=\"submit\" value=\"Apply Filter\" /></form>";
 
 } 
@@ -240,8 +237,14 @@ function initFloatingHeaders($table) {
 if ($routeparam != "") {
     require $_SERVER['DOCUMENT_ROOT'] . "/shields/shieldgen.php";
     echo "<div id=\"pointbox\">\n";
-    echo "<span class='bigshield'>" . generate($_GET['r'], true) . "</span>";
-    echo "<span><a href='/user/mapview.php?u={$_GET['u']}&amp;rte={$routeInfo['route']}'>View Associated Routes</a></span>";
+    echo "<span class='bigshield'>" . generate($routeparam, true) . "</span>\n";
+    echo "<span>" . $routeInfo['banner'];
+    if (strlen($routeInfo['city']) > 0) {
+        echo " (" . $routeInfo['city'] . ")";
+    }
+    echo "</span>\n";
+    echo "<span>.list name: <span style='font-family:courier'>" . $routeInfo['region'] . " " . $routeInfo['route'] . $routeInfo['banner'] . $routeInfo['abbrev'] . "</span></span>\n";
+
     echo "<table id='routeInfo' class=\"gratable\"><thead><tr><th colspan='2'>Route Stats</th></tr></thead><tbody>";
     $sql_command = <<<SQL
       SELECT
@@ -263,16 +266,17 @@ function initFloatingHeaders($table) {
         WHERE cr.route = '$routeparam'
 SQL;
     $row = tmdb_query($sql_command) -> fetch_assoc();
+    $totalLength = tm_convert_distance($row['totalMileage']) . " " . $tmunits;
+    $averageTraveled = tm_convert_distance($row['avgMileage']). " " . $tmunits;
     echo <<<HTML
-    <tr><td class="important">Total Mileage</td><td>{$row['totalMileage']} mi</td></tr>
-    <tr><td>LIST Name</td><td>{$routeInfo['region']} {$routeInfo['route']}{$routeInfo['banner']}{$routeInfo['abbrev']}</td></tr> 
+    <tr><td class="important">Total Length</td><td>{$totalLength}</td></tr>
     <tr title="{$row['drivers']}"><td>Total Drivers</td><td>{$row['numDrivers']} ({$row['drivenPct']} %)</td>
     <tr class="link" title="{$row['clinchers']}"><td rowspan="2">Total Clinched</td><td>{$row['numClinched']} ({$row['clinchedPct']} %)</td>
     <tr class="link" title="{$row['clinchers']}"><td>{$row['drivenClinchedPct']} % of drivers</td>
-    s<tr><td>Average Mileage</td><td>{$row['avgMileage']} mi ({$row['mileagePct']} %)</td></tr>
+    <tr><td>Average Traveled</td><td>{$averageTraveled} ({$row['mileagePct']} %)</td></tr>
     </tbody></table>
 HTML;
-    echo "<table id='waypoints' class=\"gratable\"><thead><tr><th colspan=\"3\">Waypoints</th></tr><tr><th>Coordinates</th><th>Name</th><th title='Percent of people who have driven this route who have driven though this point.'>%</th></tr></thead><tbody>\n";
+    echo "<table id='waypoints' class=\"gratable\"><thead><tr><th colspan=\"2\">Waypoints</th></tr><tr><th>Name</th><th title='Percent of people who have driven this route who have driven though this point.'>%</th></tr></thead><tbody>\n";
     $sql_command = <<<SQL
         SELECT pointName, latitude, longitude, driverPercent
         FROM waypoints
@@ -299,7 +303,7 @@ function initFloatingHeaders($table) {
         if (!startsWith($row['pointName'], "+")) {
             $colorFactor = $row['driverPercent'] / 100;
             $colors = [255, 255 - round($colorFactor * 128), 255 - round($colorFactor * 128)];
-            echo "<tr onClick='javascript:LabelClick(" . $waypointnum . ",\"" . $row['pointName'] . "\"," . $row['latitude'] . "," . $row['longitude'] . ",0);'><td>(" . $row['latitude'] . "," . $row['longitude'] . ")</td><td class='link'>" . $row['pointName'] . "</td><td style='background-color: rgb({$colors[0]},{$colors[1]},{$colors[2]})'>{$row['driverPercent']}</td></tr>\n";
+            echo "<tr onClick='javascript:labelClick(" . $waypointnum . ",\"" . $row['pointName'] . "\"," . $row['latitude'] . "," . $row['longitude'] . ",0);'><td class='link'>" . $row['pointName'] . "</td><td style='background-color: rgb({$colors[0]},{$colors[1]},{$colors[2]})'>{$row['driverPercent']}</td></tr>\n";
         }
         $waypointnum = $waypointnum + 1;
     }
@@ -312,26 +316,18 @@ function initFloatingHeaders($table) {
 ENDA;
     if ($routeparam != "") {
         echo "<table><tbody><tr><td>";
-        $sql_command = "SELECT region, route, banner, city FROM routes WHERE root = '" .$routeparam. "';";
-        $res = tmdb_query($sql_command);
-        $row = $res->fetch_assoc();
-        echo $row['region'] . " " . $row['route'];
-        if (strlen($row['banner']) > 0) {
-            echo " " . $row['banner'];
-        }
-        if (strlen($row['city']) > 0) {
-            echo " (" . $row['city'] . ")";
-        }
-        $res->free();
+    	echo "<a href='/user/mapview.php?rte={$routeInfo['route']}'>View Associated Routes</a>";
         echo "</td><td>";
         echo "<input id=\"showMarkers\" type=\"checkbox\" name=\"Show Markers\" onclick=\"showMarkersClicked()\" checked=\"false\" />&nbsp;Show Markers&nbsp;";
         echo "</td><td>";
         echo "<form id=\"userForm\" action=\"/hb/index.php\">";
         echo "User: ";
         tm_user_select();
+	echo "<label>Units: </label>\n";
+        tm_units_select();
         echo "</td><td>";
         echo "<input type=\"hidden\" name=\"r\" value=\"".$routeparam."\" />";
-        echo "<input type=\"submit\" value=\"Select User\" />";
+        echo "<input type=\"submit\" value=\"Apply\" />";
         echo "</td></tr></tbody></table>\n";
     }
     echo <<<ENDB
@@ -396,5 +392,5 @@ function initFloatingHeaders($table) {
 $tmdb->close();
 ?>
 </body>
-<script type="application/javascript" src="../api/waypoints.js.php?<?php echo "r=$routeparam&u=$tmuser";?>"></script>
+<script type="application/javascript" src="../lib/waypoints.js.php?<?php echo "r=$routeparam&u=$tmuser";?>"></script>
 </html>
diff --git a/index.php b/index.php
index 10428aab..b8e0877e 100644
--- a/index.php
+++ b/index.php
@@ -1,3 +1,4 @@
+<?php require $_SERVER['DOCUMENT_ROOT'] . "/lib/tmphpuser.php" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
@@ -76,24 +77,27 @@
 <?php
 echo tm_count_rows("systems", "WHERE level='devel'");
 ?>
- more are in development but are not yet complete.  Active system
-encompass 
+ more are in development but are not yet complete.  These "devel"
+ systems are not yet included in stats or plotted on user maps.
+ Active systems encompass 
 <?php
 echo number_format(tm_count_rows("connectedRoutes", "LEFT JOIN systems ON connectedRoutes.systemName = systems.systemName WHERE systems.level = 'active'"));
 ?>
  routes for
 <?php
-echo number_format(tm_sum_column("overallMileageByRegion", "activeMileage"));
+echo tm_convert_distance(tm_sum_column("overallMileageByRegion", "activeMileage"))." ";
+tm_echo_units();
 ?>
- miles of "clinchable" highways in active systems, and that total is 
+ of "clinchable" highways, and that expands to
 <?php
 echo number_format(tm_count_rows("connectedRoutes", "LEFT JOIN systems ON connectedRoutes.systemName = systems.systemName WHERE systems.level = 'active' OR systems.level = 'preview'"));
 ?>
  routes for
 <?php
-echo number_format(tm_sum_column("overallMileageByRegion", "activePreviewMileage"));
+echo tm_convert_distance(tm_sum_column("overallMileageByRegion", "activePreviewMileage"))." ";
+tm_echo_units();
 ?>
- miles when preview systems are included.
+ when preview systems are included.
 
 </p>
 
@@ -129,6 +133,12 @@
 more information.
 </p>
 
+<p class="text">
+Project news is also posted on the <a
+href="https://twitter.com/TravelMapping">Travel Mapping Twitter feed</a>.
+Follow us!
+</p>
+
 <p class="heading">What's New with Highway Data?</p>
 
 <p class="text">
diff --git a/lib/Intersection.png b/lib/Intersection.png
new file mode 100644
index 00000000..1e7e08e1
Binary files /dev/null and b/lib/Intersection.png differ
diff --git a/empty.gif b/lib/empty.gif
similarity index 100%
rename from empty.gif
rename to lib/empty.gif
diff --git a/hb/smallintersection.png b/lib/smallintersection.png
similarity index 100%
rename from hb/smallintersection.png
rename to lib/smallintersection.png
diff --git a/lib/tmfooter.php b/lib/tmfooter.php
index 08324021..14ad274c 100644
--- a/lib/tmfooter.php
+++ b/lib/tmfooter.php
@@ -2,7 +2,7 @@
 
 <p class="menubar">
 <a href="/credits.php">Credits and Sources</a> &nbsp;&nbsp;&nbsp;
-<a href="/devel/datacheck.php">Datacheck</a> &nbsp;&nbsp;&nbsp;
+<a href="/devel/tools.php">Developer Tools/Links</a> &nbsp;&nbsp;&nbsp;
 <a href="/stats">Raw Stats</a> &nbsp;&nbsp;&nbsp;
 <a href="https://github.com/TravelMapping">TM on GitHub</a>
 </p>
diff --git a/lib/tmjsfuncs.js b/lib/tmjsfuncs.js
index e2c2825c..1820887c 100644
--- a/lib/tmjsfuncs.js
+++ b/lib/tmjsfuncs.js
@@ -1,18 +1,19 @@
 //
-// CHM Data Viewer-related Javascript functions
+// Travel Mapping (TM) Data Viewer-related Javascript functions
+// formerly for Clinched Highway Mapping (CHM) data
 //
-// Load and view data files related to Clinched Highway Mapping (CHM)
-// related academic data sets.
+// Load and view data files related to TM-related academic data sets.
 //
 // Renamed as tmjsfuncs.js as part of the Travel Mapping project
 //
-// Author: Jim Teresco, Siena College, The College of Saint Rose
+// Primary author: Jim Teresco, Siena College, The College of Saint Rose
+// Additional authors: Razie Fathi, Arjol Pengu, Maria Bamundo, Clarice Tarbay
 //
-// Code developed based on examples from 
+// Portions of this code developed based on examples from 
 // http://cmap.m-plex.com/tools/wptedit/wptedit.html
 // http://www.alecjacobson.com/weblog/?p=1645
 //
-// Modification History:
+// Modification History (pre-GitHub):
 //
 // 2011-06-20 JDT  Initial implementation
 // 2011-06-21 JDT  Added .gra support and checkbox for hidden marker display
@@ -32,9 +33,28 @@
 // 2016-06-27 JDT  Removed code not needed by TM
 //
 
-// global variable to hold the map, which will be assigned a google.maps.Map reference
+// IMPORTANT: when making any modifications to code here, especially
+// the loadmap function, note that it is used by various TM pages,
+// where variables are mostly set in code generated by waypoints.js.php,
+// but also by HDX, where variables are set in various places in
+// hdxjsfuncs.js
+
+// get path to lib directory where some images are found,
+// which *might* have been set from an hdx.conf file.
+var tmlibdir = "/lib/";
+try {
+    tmlibdir = tmliburl;
+}
+catch(e) {}
+
+// global variable to hold the map, which will be assigned a
+// google.maps.Map reference
 var map;
 
+// many of the following are given values in code generated by
+// waypoints.js.php for TM functionality, or by functions in
+// hdxjsfuns.js (in EduTools/HighwayDataExaminer) for HDX functionality.
+
 // array of waypoints displayed
 var waypoints = new Array();
 // array of waypoint indices where route changes for region mapping
@@ -53,8 +73,16 @@ var markerinfo = new Array();
 var polypoints = new Array();
 // array of connections on map as google.maps.Polyline overlays
 var connections = new Array();
-// array of graph edges (for graph data, used by HDX, which imports this code)
+
+// array of graph edges (for graph data, used by HDX, which imports this code) -
+// this would be a single list of all graph edges.  When using an adjacency
+// list representation, edges would also be in vertex-based adjacency lists
 var graphEdges = new Array();
+// boolean to determine if graph edges should be generated automatically
+var genEdges = false;
+// boolean to determine if graph edges are in vertex adjacency lists
+var usingAdjacencyLists = false;
+
 // array of segments and clinched for "clinched by traveler" mapping
 var segments = new Array();
 var clinched = new Array();
@@ -62,90 +90,135 @@ var clinched = new Array();
 var mapClinched = false;
 // traveler name for clinched
 var traveler;
-// boolean to determine if graph edges should be generated automatically
-var genEdges = false;
-// boolean to determine if graph edges are in vertex adjacency lists
-var usingAdjacencyLists = false;
 
 // array of objects that define color codes from names in the DB
 var colorCodes = new Array();
-colorCodes[0] = { name: "blue", unclinched: "rgb(100,100,255)", clinched: "rgb(0,0,255)" };
+colorCodes[0] = { name: "blue", unclinched: "rgb(100,100,255)", clinched: "rgb(0,0,220)" };
 colorCodes[1] = { name: "brown", unclinched: "rgb(153,152,102)", clinched: "rgb(153,102,0)" };
-colorCodes[2] = { name: "red", unclinched: "rgb(255,100,100)", clinched: "rgb(255,0,0)" };
-colorCodes[3] = { name: "yellow", unclinched: "rgb(255,255,128)", clinched: "rgb(225,225,0)" };
-colorCodes[4] = { name: "teal", unclinched: "rgb(100,200,200)", clinched: "rgb(0,200,200)" };
-colorCodes[5] = { name: "green", unclinched: "rgb(100,255,100)", clinched: "rgb(0,255,0)" };
-colorCodes[6] = { name: "magenta", unclinched: "rgb(255,100,255)", clinched: "rgb(255,0,255)" };
-colorCodes[7] = { name: "lightsalmon", unclinched: "rgb(255,200,200)", clinched: "rgb(255,160,122)" };
-
-// array of custom color codes to be pulled from query string parameter "colors="
+colorCodes[2] = { name: "red", unclinched: "rgb(255,100,100)", clinched: "rgb(224,0,0)" };
+colorCodes[3] = { name: "yellow", unclinched: "rgb(255,216,100)", clinched: "rgb(232,176,0)" };
+colorCodes[4] = { name: "teal", unclinched: "rgb(100,200,200)", clinched: "rgb(0,140,160)" };
+colorCodes[5] = { name: "green", unclinched: "rgb(100,200,100)", clinched: "rgb(0,224,0)" };
+colorCodes[6] = { name: "magenta", unclinched: "rgb(255,100,255)", clinched: "rgb(208,0,208)" };
+colorCodes[7] = { name: "lightsalmon", unclinched: "rgb(224,162,162)", clinched: "rgb(240,150,115)" };
+
+// array of custom color codes to be pulled from query string parameter
+// "colors="
 var customColorCodes = new Array();
 
+// the window that will pop up when someone clicks on a waypoint's marker
 var infowindow = new google.maps.InfoWindow();
 
-// some map options, from http://cmap.m-plex.com/hb/maptypes.js by Timothy Reichard
-
-var MapnikOptions = { alt: "Show Mapnik road map tiles from OpenStreetMap.org",
-		            getTileUrl: getMapnikTileURL,
-		            maxZoom: 18,
-		            minZoom: 0,
-		            name: "Mapnik",
-		            opacity: 1,
-		            tileSize: new google.maps.Size(256, 256)
-		          };
-
-function getMapnikTileURL(point, zoom)
-{
-    return 'http://tile.openstreetmap.org/' + zoom + '/' + point.x + '/' + point.y + '.png';
+// some of the original map options code is based on
+// http://cmap.m-plex.com/hb/maptypes.js by Timothy Reichard
+
+var MapnikOptions = {
+    alt: "Show Mapnik road map tiles from OpenStreetMap.org",
+    getTileUrl: getMapnikTileURL,
+    maxZoom: 18,
+    minZoom: 0,
+    name: "Mapnik",
+    opacity: 1,
+    tileSize: new google.maps.Size(256, 256)
+};
+
+var OpenStreetMapDEOptions = {
+    alt: "Show OpenStreetMapDE road map tiles from OpenStreetMap.org",
+    getTileUrl: getOpenStreetMapDEURL,
+    maxZoom: 18,
+    minZoom: 0,
+    name: "DE",
+    opacity: 1,
+    tileSize: new google.maps.Size(256, 256)
+};
+
+function getOpenStreetMapDEURL(point, zoom) {
+    return 'http://tile.openstreetmap.de/tiles/osmde/' + zoom + '/' +
+	point.x + '/' + point.y + '.png';
 }
 
-var MQOpenMapOptions = { alt: "Show Mapquest Open Map road map tiles based on OpenStreetMap.org data",
-			       getTileUrl: getMQOpenMapTileURL,
-			       maxZoom: 18,
-			       minZoom: 0,
-			       name: "MQOpenMap",
-			       opacity: 1,
-			       tileSize: new google.maps.Size(256, 256)
-			     };
+var EsriOptions = {
+    alt: "Show Esri road map tiles from OpenStreetMap.org",
+    getTileUrl: EsriURL,
+    maxZoom: 18,
+    minZoom: 0,
+    name: "Esri",
+    opacity: 1,
+    tileSize: new google.maps.Size(256, 256)
+};
+
+function EsriURL(point, zoom) {
+    
+    return 'http://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/' +
+	zoom + '/' + point.y + '/' + point.x;
+}
 
-function getMQOpenMapTileURL(point, zoom)
-{
-    var subdomain = Math.floor( Math.random() * (4 - 1 + 1) ) + 1; // Request tile from random subdomain.
-    return 'http://otile' + subdomain + '.mqcdn.com/tiles/1.0.0/map/' + zoom + '/' + point.x + '/' + point.y + '.jpg';
-    //return 'http://cmap.m-plex.com/hb/ymaptile.php?t=m&s=mq&x=' + point.x + '&y=' + point.y + '&z=' + zoom;
+var OpenStreetMapDEOptions = {
+    alt: "Show OpenStreetMapDE road map tiles from OpenStreetMap.org",
+    getTileUrl: getOpenStreetMapDEURL,
+    maxZoom: 18,
+    minZoom: 0,
+    name: "DE",
+    opacity: 1,
+    tileSize: new google.maps.Size(256, 256)
+};
+
+function getOpenStreetMapDEURL(point, zoom) {
+    
+    return 'http://tile.openstreetmap.de/tiles/osmde/' + zoom + '/' +
+	point.x + '/' + point.y + '.png';
 }
 
-var MQOpenSatOptions = { alt: "Show Mapquest Open Map satellite imagery tiles based on OpenStreetMap.org data",
-			       getTileUrl: getMQOpenSatTileURL,
-			       maxZoom: 18,
-			       minZoom: 0,
-			       name: "MQOpenSat",
-			       opacity: 1,
-			       tileSize: new google.maps.Size(256, 256)
-			     };
+//HERE map tiles
+var HEREOptions = {
+    alt: "Show wego HERE road map tiles from https://wego.here.com",
+    getTileUrl: HEREURL,
+    maxZoom: 18,
+    minZoom: 0,
+    name: "HERE",
+    opacity: 1,
+    tileSize: new google.maps.Size(256, 256)
+};
+
+function HEREURL(point, zoom) {
+    
+    return 'https://1.base.maps.cit.api.here.com/maptile/2.1/maptile/newest/normal.day/' +
+	zoom + '/' + point.x + '/' + point.y +
+	'/256/png8?app_id=VX6plk5zCW0wzrNcN64O&app_code=LcZFksQAhfg7rvZvcZ1lqw';
+}
 
-function getMQOpenSatTileURL(point, zoom)
-{
-    var subdomain = Math.floor( Math.random() * (4 - 1 + 1) ) + 1; // Request tile from random subdomain.
-    return 'http://otile' + subdomain + '.mqcdn.com/tiles/1.0.0/sat/' + zoom + '/' + point.x + '/' + point.y + '.jpg';
-    //return 'http://cmap.m-plex.com/hb/ymaptile.php?t=s&s=mq&x=' + point.x + '&y=' + point.y + '&z=' + zoom;
+function getMapnikTileURL(point, zoom) {
+    
+    return 'http://tile.openstreetmap.org/' + zoom + '/' + point.x + '/' +
+	point.y + '.png';
 }
 
-var BlankOptions = { alt: "Show a blank background",
-				getTileUrl: getBlankURL,
-				maxZoom: 18,
-				minZoom: 0,
-				name: "Blank",
-				opacity: 1,
-				tileSize: new google.maps.Size(256, 256)
-				};
+var BlankOptions = {
+    alt: "Show a blank background",
+    getTileUrl: getBlankURL,
+    maxZoom: 18,
+    minZoom: 0,
+    name: "Blank",
+    opacity: 1,
+    tileSize: new google.maps.Size(256, 256)
+};
 
 function getBlankURL() {
-	return '/empty.gif';
+    return tmlibdir + 'empty.gif';
 }
 
 var intersectionimage = {
-    url: 'smallintersection.png',
+    url: tmlibdir + 'Intersection.png',
+    // This marker is 16x16
+    size: new google.maps.Size(16, 16),
+    // The origin for this image is 0,0.
+    origin: new google.maps.Point(0, 0),
+    // The anchor for this image is the center of the intersection
+    anchor: new google.maps.Point(8, 8)
+};
+
+var oldintersectionimage = {
+    url: tmlibdir + 'smallintersection.png',
     // This marker is 16x16
     size: new google.maps.Size(16, 16),
     // The origin for this image is 0,0.
@@ -156,30 +229,42 @@ var intersectionimage = {
 
 // loadmap constructs and sets up the initial map
 function loadmap() {
-    var typeMQOpenMap = new google.maps.ImageMapType(MQOpenMapOptions);
-    var typeMQOpenSat = new google.maps.ImageMapType(MQOpenSatOptions);
     var typeMapnik = new google.maps.ImageMapType(MapnikOptions);
     var typeBlank = new google.maps.ImageMapType(BlankOptions);
+    var typeOpenStreetMapDE = new google.maps.ImageMapType(OpenStreetMapDEOptions);
+    var typeEsri = new google.maps.ImageMapType(EsriOptions);
+    var typeHERE = new google.maps.ImageMapType(HEREOptions);
 
-    var maptypelist = ['Mapnik', google.maps.MapTypeId.ROADMAP, google.maps.MapTypeId.SATELLITE, google.maps.MapTypeId.HYBRID, google.maps.MapTypeId.TERRAIN, 'Blank'];
-    var maptypecontroloptions = {mapTypeIds: maptypelist, position: google.maps.TOP_RIGHT, style: google.maps.MapTypeControlStyle.DROPDOWN_MENU};
-    //var mapopt = {center: new google.maps.LatLng(42.664529, -73.786470), zoom: 12, mapTypeId: 'Mapnik', mapTypeControl: true, mapTypeControlOptions: maptypecontroloptions, streetViewControl: true, disableDefaultUI: true, panControl: true, zoomControl: true, scaleControl: true, overviewMapControl: true, keyboardShortcuts: true, disableDoubleClickZoom: false};
-    // OLD coordinates are Albertus Hall room 400-2 at The College of Saint Rose
-    //var mapopt = {center: new google.maps.LatLng(42.664529, -73.786470), zoom: 16, mapTypeControl: true, mapTypeControlOptions: maptypecontroloptions};
+    var maptypelist = ['Mapnik', google.maps.MapTypeId.ROADMAP, google.maps.MapTypeId.SATELLITE, google.maps.MapTypeId.HYBRID, google.maps.MapTypeId.TERRAIN, 'DE', 'Esri', 'HERE', 'Blank'];
+    var maptypecontroloptions = {
+        mapTypeIds: maptypelist,
+        position: google.maps.TOP_RIGHT,
+        style: google.maps.MapTypeControlStyle.DROPDOWN_MENU
+    };
 
     // coordinates are Roger Bacon 321 at Siena College
-    var mapopt = {center: new google.maps.LatLng(42.719450, -73.752063), zoom: 16, mapTypeControl: true, mapTypeControlOptions: maptypecontroloptions};
+    var mapopt = {
+        center: new google.maps.LatLng(42.719450, -73.752063),
+        zoom: 16,
+        mapTypeControl: true,
+        mapTypeControlOptions: maptypecontroloptions
+    };
 
     map = new google.maps.Map(document.getElementById("map"), mapopt);
     
-    map.mapTypes.set('MQOpenMap', typeMQOpenMap);
-    map.mapTypes.set('MQOpenSat', typeMQOpenSat);
     map.mapTypes.set('Mapnik', typeMapnik);
     map.mapTypes.set('Blank', typeBlank);
+    map.mapTypes.set('DE', typeOpenStreetMapDE);
+    map.mapTypes.set('Esri', typeEsri);
+    map.mapTypes.set('HERE', typeHERE);
+
+    map.setMapTypeId('Mapnik');
 }
 
 // construct a new Waypoint object (based on similar function by Tim Reichard)
 // now supporting edge adjacency lists
+// these sometimes have a field "intersecting" added to them which is
+// an array of intersecting Routes (defined below)
 function Waypoint(label, lat, lon, elabel, edgeList) {
     this.label = label;
     this.lat = parseFloat(lat).toFixed(6);
@@ -193,6 +278,19 @@ function Waypoint(label, lat, lon, elabel, edgeList) {
     return this;
 }
 
+// construct a Route object to encapsulate information needed for intersecting
+// routes
+function Route(root, route, region, banner, abbrev, city) {
+
+    this.root = root;
+    this.route = route;
+    this.region = region;
+    this.banner = banner;
+    this.abbrev = abbrev;
+    this.city = city;
+    return this;
+}
+
 // update the map to the current set of waypoints and connections
 function updateMap()
 {
@@ -202,16 +300,20 @@ function updateMap()
     }
     connections = new Array();
 
+    // set up to find bounding box of points we plot
     var minlat = 999;
     var maxlat = -999;
     var minlon = 999;
     var maxlon = -999;
 
-    polypoints = new Array();
+    // remove any markers previously on the map
     for (var i = 0; i < markers.length; i++) {
 	markers[i].setMap(null);
     }
+    markers = new Array();
 
+    // set variables that determine if all/only visible/no markers
+    // should be drawn on the map
     var showHidden = false;
     if (document.getElementById('showHidden') != null) {
        showHidden = document.getElementById('showHidden').checked;
@@ -221,8 +323,10 @@ function updateMap()
       showMarkers = document.getElementById('showMarkers').checked;
     }
 
-    markers = new Array();
+    // draw our waypoint markers
     markerinfo = new Array();
+    polypoints = new Array();
+
     var bounds = new google.maps.LatLngBounds();
     for (var i = 0; i < waypoints.length; i++) {
 	minlat = Math.min(minlat, waypoints[i].lat);
@@ -232,7 +336,7 @@ function updateMap()
 	
 	polypoints[i] = new google.maps.LatLng(waypoints[i].lat, waypoints[i].lon);
 	
-	markerinfo[i] = MarkerInfo(i, waypoints[i]);
+	markerinfo[i] = markerInfo(i, waypoints[i]);
 	markers[i] = new google.maps.Marker({
 	    position: polypoints[i],
 	    //map: map,
@@ -240,22 +344,12 @@ function updateMap()
 	    icon: intersectionimage
 	});
 	if (showMarkers && (showHidden || waypoints[i].visible)) {
-	    AddMarker(markers[i], markerinfo[i], i);
+	    addMarker(markers[i], markerinfo[i], i);
 	}
 	bounds.extend(polypoints[i]);
     }
-    
-    var midlat = (minlat + maxlat)/2;
-    var midlon = (minlon + maxlon)/2;
-
-    var nsdist = Mileage(minlat, midlon, maxlat, midlon);
-    var ewdist = Mileage(midlat, minlon, midlat, maxlon);
-    var maxdist = Math.max(nsdist, ewdist);
-  
-    //var zoom = 17 - (12 + Math.floor(Math.log(maxdist/800)/Math.log(2.0)));
-    //zoom = Math.max(zoom, 0);
-    //zoom = Math.min(zoom, 17);
-    //map.setZoom(zoom);
+
+    // set our map view according to the bounds we computed
     map.fitBounds(bounds);
 
     // if this is a graph in HDX, we draw edges as connections,
@@ -283,8 +377,15 @@ function updateMap()
 		}
 	    }
 	    edgePoints[nextPoint] = new google.maps.LatLng(waypoints[v2].lat, waypoints[v2].lon);
-	    connections[i] = new google.maps.Polyline({path: edgePoints, strokeColor: "#0000FF", strokeWeight: 10, strokeOpacity: 0.4, map: map});
-	    //map.addOverlay(connections[i]);
+	    color = getGraphEdgeColor(graphEdges[i]);
+            connections[i] = new google.maps.Polyline({
+                path: edgePoints,
+                strokeColor: color,
+                strokeWeight: 10,
+                strokeOpacity: 0.4,
+                map: map
+            });
+	    edgeListener(i);
 	}
     }
     else if (usingAdjacencyLists) {
@@ -311,35 +412,23 @@ function updateMap()
 			}
 		    }
 		    edgePoints[nextPoint] = new google.maps.LatLng(waypoints[thisEdge.v2].lat, waypoints[thisEdge.v2].lon);
-		    // count the commas, which tell us how many
-		    // concurrent routes are represented, as they will
-		    // be comma-separated, then use that to choose a
-		    // color to indicate the number of routes
-		    // following the edge
-		    concurrent = thisEdge.label.split(",").length;
-		    color = "";
-		    switch (concurrent) {
-		    case 1:
-			color = "#0000FF";
-			break;
-		    case 2:
-			color = "#00FF00";
-			break;
-		    case 3:
-			color = "#FF00FF";
-			break;
-		    case 4:
-			color = "#FFFF00";
-			break;
-		    default:
-			color = "#FF0000";
-			break;
-		    }
-		    connections[edgeNum] = new google.maps.Polyline({path: edgePoints, strokeColor: color, strokeWeight: 10, strokeOpacity: 0.4, map: map});
+		    
+		    color = getGraphEdgeColor(thisEdge);
+                    connections[edgeNum] = new google.maps.Polyline({
+                        path: edgePoints,
+                        strokeColor: color,
+                        strokeWeight: 10,
+                        strokeOpacity: 0.4,
+                        map: map
+                    });
+		    edgeListener(edgeNum);
 		    edgeNum++;
 		}
 	    }
 	}
+        google.maps.event.clearListeners(map, 'zoom_changed');
+        google.maps.event.addListener(map, 'zoom_changed', zoomChange);
+        zoomChange();
     }
     // connecting waypoints in order to plot a path
     else if (mapClinched) {
@@ -351,7 +440,6 @@ function updateMap()
 	var weight = 2;
 	if (newRouteIndices.length > 0) {
 	    // if newRouteIndices is not empty, we're plotting multiple routes
-	    //DBG.write("Multiple clinched routes!");
 	    var nextSegment = 0;
 	    for (var route = 0; route < newRouteIndices.length; route++) {
 		var start = newRouteIndices[route];
@@ -362,7 +450,6 @@ function updateMap()
 		else {
 		    end = newRouteIndices[route+1]-1;
 		}
-		//DBG.write("route = " + route + ", start = " + start + ", end = " + end);
 		// support for clinch colors from systems.csv
 		var unclinchedColor = "rgb(200,200,200)"; //"#cccccc";
 		var clinchedColor = "rgb(255,128,128)"; //"#ff8080";
@@ -388,40 +475,36 @@ function updateMap()
 		    var edgePoints = new Array(2);
 		    edgePoints[0] = new google.maps.LatLng(waypoints[i].lat, waypoints[i].lon);
 		    edgePoints[1] = new google.maps.LatLng(waypoints[i+1].lat, waypoints[i+1].lon);
-		    var segmentLength = Mileage(waypoints[i].lat,
-						waypoints[i].lon,
-						waypoints[i+1].lat,
-						waypoints[i+1].lon);
+		    var segmentLength = distanceInMiles(waypoints[i].lat,
+							waypoints[i].lon,
+							waypoints[i+1].lat,
+							waypoints[i+1].lon);
 		    totalMiles += segmentLength;
-		    //DBG.write("i = " + i);
 		    var color = unclinchedColor;
 		    var opacity = 0.3;
 		    if (segments[nextSegment] == clinched[nextClinchedCheck]) {
-			//DBG.write("Clinched!");
 			color = clinchedColor;
 			zIndex = zIndex + 10;
 			nextClinchedCheck++;
 			clinchedMiles += segmentLength;
 			opacity = 0.85;
 		    }
-		    connections[nextSegment] = new google.maps.Polyline(
-			{path: edgePoints, strokeColor: color, strokeWeight: weight, strokeOpacity: opacity,
-			 zIndex : zIndex, map: map});
-		    nextSegment++;
+                    connections[nextSegment] = new google.maps.Polyline({
+                        path: edgePoints,
+                        strokeColor: color,
+                        strokeWeight: weight,
+                        strokeOpacity: opacity,
+                        zIndex: zIndex,
+                        map: map
+                    });
+		    edgeListener(nextSegment);
+                    nextSegment++;
 		}	
 	    }
-	    // set up listener for changes to zoom level and adjust strokeWeight in response
-	    //DBG.write("Setting up zoom_changed");
+	    // set up listener for changes to zoom level and adjust
+	    // strokeWeight in response
 	    google.maps.event.clearListeners(map, 'zoom_changed');
 	    google.maps.event.addListener(map, 'zoom_changed', zoomChange); 
-//	    google.maps.event.addListener(map, 'zoom_changed', function() {
-//		var level = map.getZoom();
-//		var weight = Math.floor(level);
-//		DBG.write("Zoom level " + level + ", weight = " + weight);
-//		for (var i=0; i<connections.length; i++) {
-//		    connections[i].setOptions({strokeWeight: weight});
-//		}
-//	    });
 	}
 	else {
 	    // single route
@@ -429,10 +512,10 @@ function updateMap()
 		var edgePoints = new Array(2);
 		edgePoints[0] = new google.maps.LatLng(waypoints[i].lat, waypoints[i].lon);
 		edgePoints[1] = new google.maps.LatLng(waypoints[i+1].lat, waypoints[i+1].lon);
-		var segmentLength = Mileage(waypoints[i].lat,
-					    waypoints[i].lon,
-					    waypoints[i+1].lat,
-					    waypoints[i+1].lon);
+		var segmentLength = distanceInMiles(waypoints[i].lat,
+						    waypoints[i].lon,
+						    waypoints[i+1].lat,
+						    waypoints[i+1].lon);
 		totalMiles += segmentLength;
 		var color = "#cccccc";
 		if (segments[i] == clinched[nextClinchedCheck]) {
@@ -440,7 +523,14 @@ function updateMap()
 		    nextClinchedCheck++;
 		    clinchedMiles += segmentLength;
 		}
-		connections[i] = new google.maps.Polyline({path: edgePoints, strokeColor: color, strokeWeight: 10, strokeOpacity: 0.75, map: map});
+                connections[i] = new google.maps.Polyline({
+                    path: edgePoints,
+                    strokeColor: color,
+                    strokeWeight: 10,
+                    strokeOpacity: 0.75,
+                    map: map
+                });
+		edgeListener(i);
 	    }
 	}
         if (document.getElementById('controlboxinfo') != null) {
@@ -448,14 +538,49 @@ function updateMap()
         }
     }
     else if (genEdges) {
-	connections[0] = new google.maps.Polyline({path: polypoints, strokeColor: "#0000FF", strokeWeight: 10, strokeOpacity: 0.75, map: map});
-	//map.addOverlay(connections[0]);
+        connections[0] = new google.maps.Polyline({
+            path: polypoints,
+            strokeColor: "#0000FF",
+            strokeWeight: 10,
+            strokeOpacity: 0.75,
+            map: map
+        });
+	google.maps.event.addListener(connections[0], 'click', function(){edgeClick(0);});
     }
     // don't think this should not be needed, but an attempt to get
     // hidden waypoints to be hidden when first created
     showHiddenClicked();
 }
 
+// find a color to use to draw an edge in a graph, where colors represent
+// the number of concurrent routes on a segment
+function getGraphEdgeColor(edge) {
+    // count the commas, which tell us how many concurrent routes are
+    // represented, as they will be comma-separated, then use that to
+    // choose a color to indicate the number of routes following the
+    // edge
+    concurrent = edge.label.split(",").length;
+    color = "";
+    switch (concurrent) {
+    case 1:
+	color = "#0000FF";
+	break;
+    case 2:
+	color = "#00FF00";
+	break;
+    case 3:
+	color = "#FF00FF";
+	break;
+    case 4:
+	color = "#FFFF00";
+	break;
+    default:
+	color = "#FF0000";
+	break;
+    }
+    return color;
+}
+
 function zoomChange() {
 
     var level = map.getZoom();
@@ -464,23 +589,38 @@ function zoomChange() {
     else if (level < 12) newWeight = 6;
     else if (level < 15) newWeight = 10;
     else newWeight = 16;
-    //DBG.write("zoomChange: Zoom level " + level + ", newWeight = " + newWeight);
     for (var i=0; i<connections.length; i++) {
-	//connections[i].setMap(null);
 	connections[i].setOptions({strokeWeight: newWeight});
     }
 }
 
-function AddMarker(marker, markerinfo, i) {
+// variable that would be set by any code that wishes to register
+// an additional function to be called on a marker click
+var labelClickCallback = null;
+
+// set that variable
+function registerMarkerClickListener(func) {
+
+    labelClickCallback = func;
+}
+
+function addMarker(marker, markerinfo, i) {
 
     marker.setMap(map);
     google.maps.event.addListener(marker, 'click', function() {
 	infowindow.setContent(markerinfo);
 	infowindow.open(map, marker);
+	if (labelClickCallback != null) {
+	    labelClickCallback(i);
+	}
 	});
 }
 
-function LabelClick(i, label, lat, lon, errors) {
+// note: there is also a labelClickHDX used when selecting start and
+// end vertices for HDX algorithm visualizations
+// this one is only called by the HB when someone clicks on
+// a waypoint in the table (not on the map)
+function labelClick(i, label, lat, lon, errors) {
 
     map.panTo(new google.maps.LatLng(lat, lon)); 
     //infowindow.setContent(info);
@@ -488,14 +628,81 @@ function LabelClick(i, label, lat, lon, errors) {
     infowindow.open(map, markers[i]);
 }
 
-function MarkerInfo(i, wpt) {
+// handle clicks on edges
+function edgeClick(i){
+
+    var v1 = waypoints[graphEdges[i].v1];
+    var v2 = waypoints[graphEdges[i].v2];
+    var midlat = (parseFloat(v1.lat) + parseFloat(v2.lat))/2.0;
+    var midlon = (parseFloat(v1.lon) + parseFloat(v2.lon))/2.0;
+    map.panTo(new google.maps.LatLng(midlat, midlon));
+    infowindow.setContent(edgeInfo(i));
+    infowindow.setPosition(new google.maps.LatLng(midlat, midlon));
+    infowindow.open(map);
+}
+
+function markerInfo(i, wpt) {
+
+    var intersections = "";
+    if (wpt.hasOwnProperty('intersecting')) {
+	intersections = "<p>Intersecting/Concurrent Routes:<br />";
+	for (var j = 0; j < wpt.intersecting.length; j++) {
+	    r = wpt.intersecting[j];
+	    intersections+="<a href=\"/hb/?r=" + r.root + "\">" + r.region + " " + r.route + " " + r.banner;
+	    if (r.city != "") {
+		intersections+="(" + r.city + ")";
+	    }
+	    intersections += "</a><br />";
+	}
+	intersections += "</p>";
+    }
+    return '<p style="line-height:160%;"><span style="font-size:24pt;color:black;">' + wpt.label + '</span><br><b>Waypoint ' + i + '<\/b><br><b><a target="_blank" href="http://www.openstreetmap.org/?lat='+wpt.lat+'&lon='+wpt.lon+'">Coords.:<\a><\/b> ' + wpt.lat + '&deg;, ' + wpt.lon + '&deg;<\/p>' + intersections;
+
+}
 
-    return '<p style="line-height:160%;"><span style="font-size:24pt;">' + wpt.label + '</span><br><b>Waypoint ' + (i+1) + '<\/b><br><b>Coords.:<\/b> ' + wpt.lat + '&deg;, ' + wpt.lon + '&deg;<\/p>';
+function edgeInfo(i){
 
+    return '<p style="line-height:160%;"><span style="font-size:24pt; color:black">' +
+	graphEdges[i].label + '</span><br><b>Edge Number: ' + (i) +
+	'<\/b><br><b>Endpoints:<\/b> ' +
+	waypoints[graphEdges[i].v1].label + ' <-> ' +
+	waypoints[graphEdges[i].v2].label +
+	'<br><b>Distance: </b>' +
+	edgeLengthInMiles(graphEdges[i]).toFixed(4) + ' mi</p>';
+}
+
+
+// compute the length of an edge in miles
+function edgeLengthInMiles(e) {
+
+    if (!e.hasOwnProperty("length")) {
+	let len = 0.0;
+	if (e.via == null) {
+	    // no intermediate points: easy case
+	    len = distanceInMiles(waypoints[e.v1].lat, waypoints[e.v1].lon,
+				  waypoints[e.v2].lat, waypoints[e.v2].lon);
+	}
+	else {
+	    // account for intermediate points in "via" array
+	    len = distanceInMiles(waypoints[e.v1].lat, waypoints[e.v1].lon,
+				  parseFloat(e.via[0]), parseFloat(e.via[1]));
+	    for (var pos = 0; pos < e.via.length - 2; pos += 2) {
+		len += distanceInMiles(parseFloat(e.via[pos]),
+				       parseFloat(e.via[pos+1]),
+				       parseFloat(e.via[pos+2]),
+				       parseFloat(e.via[pos+3]));
+	    }
+	    len += distanceInMiles(parseFloat(e.via[e.via.length-2]),
+				   parseFloat(e.via[e.via.length-1]),
+				   waypoints[e.v2].lat, waypoints[e.v2].lon);
+	}
+	e.length = len;
+    }
+    return e.length;
 }
 
 // compute distance in miles between two lat/lon points
-function Mileage(lat1, lon1, lat2, lon2) {
+function distanceInMiles(lat1, lon1, lat2, lon2) {
     if(lat1 == lat2 && lon1 == lon2)
 	return 0.;
     
@@ -506,7 +713,7 @@ function Mileage(lat1, lon1, lat2, lon2) {
 }
 
 // compute distance in feet between two lat/lon points
-function Feet(lat1, lon1, lat2, lon2) {
+function distanceInFeet(lat1, lon1, lat2, lon2) {
     if(lat1 == lat2 && lon1 == lon2)
 	return 0.;
     
@@ -523,12 +730,11 @@ function showHiddenClicked() {
     if (document.getElementById('showHidden') != null) {
 	showHidden = document.getElementById('showHidden').checked;
     }
-    //DBG.write("showHiddenClicked: showHidden is " + showHidden);
     if (showHidden) {
 	// add in the hidden markers
 	for (var i = 0; i < waypoints.length; i++) {
 	    if (!waypoints[i].visible) {
-		AddMarker(markers[i], markerinfo[i], i);
+		addMarker(markers[i], markerinfo[i], i);
 	    }
 	}
     }
@@ -542,6 +748,24 @@ function showHiddenClicked() {
     }
 }
 
+// GraphEdge constructor, vertex numbers can come in as strings or
+// numbers, will store as numbers
+function GraphEdge(v1, v2, label, via) {
+
+    if (typeof v1 === 'string') {
+	this.v1 = parseInt(v1);
+	this.v2 = parseInt(v2);
+    }
+    else {
+	this.v1 = v1;
+	this.v2 = v2;
+    }
+    this.label = label;
+    this.via = via;
+
+    return this;
+}
+
 // callback for when the hideMarkers checkbox is clicked
 function showMarkersClicked() {
 
@@ -549,7 +773,7 @@ function showMarkersClicked() {
     if (showThem) {
 	for (var i = 0; i < waypoints.length; i++) {
 	    if (waypoints[i].visible) {
-		AddMarker(markers[i], markerinfo[i], i);
+		addMarker(markers[i], markerinfo[i], i);
 	    }
 	}
     }
@@ -560,9 +784,18 @@ function showMarkersClicked() {
     }
 }
 
+// listen for clicks on edges
+function edgeListener(i){
+    google.maps.event.addListener(connections[i],
+				  'click',
+				  function(e){
+				      edgeClick(i);
+				  });
+}
+
 function redirect(url) {
-	var win = window.open(url);
-	win.focus();
+    var win = window.open(url);
+    win.focus();
 }
 
 // JS debug window by Mike Maddox from
diff --git a/lib/tmphpfuncs.php b/lib/tmphpfuncs.php
index 02312861..eecf3537 100644
--- a/lib/tmphpfuncs.php
+++ b/lib/tmphpfuncs.php
@@ -42,7 +42,7 @@
 $gmaps_api_key = chop(fgets($tmconffile));
 fclose($tmconffile);
 
-if (array_key_exists("dbname", $_GET)) {
+if (array_key_exists("dbname", $_GET) && ctype_alpha($_GET['dbname'])) {
     $tmdbname = $_GET['dbname'];
 }
 
@@ -196,13 +196,31 @@ function tm_user_select() {
     echo "</select>\n";
 }
 
+
+
+// function to generate a units selection "select" object
+function tm_units_select() {
+    global $tmunits;
+    global $tm_supported_units;
+    echo "<select name=\"units\">\n";
+    foreach ($tm_supported_units as $unit => $conv) {
+        echo "<option value=\"".$unit."\"";
+        if ($unit == $tmunits) {
+	    echo " selected=\"selected\"";
+        }
+	echo ">".$unit."</option>\n";
+    }
+    echo "</select>\n";
+}
+
 // function to generate a user selection input form
-function tm_user_select_form() {
-    // TODO: action should come as a parameter
-    echo "<form id=\"userselect\" action=\".\"><p>\n";
+function tm_user_select_form($action = "\".\"") {
+    echo "<form id=\"userselect\" action=".$action."><p>\n";
     echo "<label>Current User: </label>\n";
     tm_user_select();
-    echo "<input type=\"submit\" value=\"Select User\" />\n";
+    echo "<label>Units: </label>\n";
+    tm_units_select();
+    echo "<input type=\"submit\" value=\"Apply\" />\n";
     echo "</p></form>\n";
 }
 
@@ -349,6 +367,43 @@ function tm_fetch_user_row_with_rank($res, $rankBy) {
     return $row;
 }
 
+// additional metric/non-metric units support functions
+
+// simply return the string representation
+function tm_echo_units() {
+    global $tmunits;
+    echo $tmunits;
+}
+
+// convert to the currently-selected units
+function tm_convert_distance($mileage) {
+
+    global $tmunits;
+    global $tm_supported_units;
+    return number_format($mileage * $tm_supported_units[$tmunits], 2, '.', '');
+}
+
+// validate a string as a possible "root": must be letters, followed by
+// a period, followed by some number of letters and numbers.  No other
+// characters allowed, and no longer than 32 total characters in length.
+function tm_validate_root($root) {
+
+    if (strlen($root) > 32) {
+        return "toolong.root";
+    }
+    $array = explode('.', $root);
+    if (count($array) != 2) {
+       return "noregion.root";
+    }
+    if (!ctype_alpha($array[0])) {
+       return "badregion.root";
+    }
+    if (!ctype_alnum($array[1])) {
+       return "badroute.root";
+    }
+    return $root;
+}
+
 // functions from http://stackoverflow.com/questions/834303/startswith-and-endswith-functions-in-php
 
 function startsWith($haystack, $needle) {
diff --git a/lib/tmphpuser.php b/lib/tmphpuser.php
index b51135c2..dffa86ea 100644
--- a/lib/tmphpuser.php
+++ b/lib/tmphpuser.php
@@ -7,18 +7,56 @@
      This has to be done before any output is generated to avoid
      a warning from setcookie, so this file should be required
      as the first line of any other php file that needs to use it.
+
+     Also take care of the $tmunits variable based on the units=
+     QS parameter and/or the "units" cookie.
 */
 
 // u= is the user, stored in $tmuser variable, can also come from the
 // lastuser cookie, and will be stored in that cookie when specified
+// note: must be alphanumeric (plus underscores) or is ignored
 define("TM_NO_USER", "null");
 $tmuser = TM_NO_USER;
 
 if (array_key_exists("u", $_GET)) {
-    $tmuser = $_GET['u'];
-    setcookie("lastuser", $tmuser, time() + (86400 * 30), "/");
+    $tmusertemp = str_replace("_", "", $_GET['u']);
+    if (ctype_alnum($tmusertemp)) {
+        $tmuser = $_GET['u'];
+        setcookie("lastuser", $tmuser, time() + (86400 * 30), "/");
+    }
 } else if (isset($_COOKIE['lastuser'])) {
     header("Location: ?u=" . $_COOKIE['lastuser'] . "&" . parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY)); /* Redirect browser */
     exit;
 }
+
+// units= is the units preference, stored in $tmunits variable, can
+// also come from units cookie, and will be stored in that cookie
+// when specified
+$tmunits = "miles";
+// associative array of supported units and their conversions from miles
+$tm_supported_units = array(
+  "miles"=>1.0,
+  "km"=>1.609344,
+  "ft"=>5280,
+  "meters"=>1609.344
+);
+
+
+if (array_key_exists("units", $_GET)) {
+   $unitsparam = strtolower($_GET['units']);
+   if (array_key_exists($unitsparam, $tm_supported_units)) {
+      $tmunits = $unitsparam;
+      setcookie("units", $unitsparam, time() + (86400 * 30), "/");
+   }
+   else {
+      // default to miles for unknown units
+      $tmunits = "miles";
+      setcookie("units", "miles", time() + (86400 * 30), "/");
+   }
+}
+else if (isset($_COOKIE['units'])) {
+   header("Location: ?units=" .$_COOKIE['units'] . "&" . parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY)); /* Redirect browser */
+   exit;
+}
+
 ?>
diff --git a/api/waypoints.js.php b/lib/waypoints.js.php
similarity index 91%
rename from api/waypoints.js.php
rename to lib/waypoints.js.php
index 41851c5d..36ad2ba4 100644
--- a/api/waypoints.js.php
+++ b/lib/waypoints.js.php
@@ -199,7 +199,7 @@ function select_route_set () {
     
     function select_single_route ()
     {
-        $routeparam = $_GET['r'];
+        $routeparam = strtolower($_GET['r']);
 
         if (array_key_exists('u', $_GET)) {
             $tmuser = $_GET['u'];
@@ -214,6 +214,21 @@ function select_single_route ()
             $pointnum = 0;
             while ($row = $res->fetch_assoc()) {
                 echo "waypoints[$pointnum] = new Waypoint(\"{$row['pointName']}\",{$row['latitude']},{$row['longitude']});\n";
+		if ($row['pointName'][0] === '+') {
+                    $pointnum = $pointnum + 1;
+		    continue;
+		}
+		$sql_command = "SELECT DISTINCT w.root, r.route, r.region, r.banner, r.abbrev, r.city FROM waypoints AS w LEFT JOIN routes AS r ON w.root = r.root WHERE w.latitude='".$row['latitude']."' AND w.longitude='".$row['longitude']."';";
+		$res2 = tmdb_query($sql_command);
+		if ($res2->num_rows > 1) {
+		   echo "waypoints[$pointnum].intersecting = new Array();\n";
+	           while ($match_row = $res2->fetch_assoc()) {
+		       if ($match_row['root'] != $routeparam) {	 
+	   	           echo "waypoints[$pointnum].intersecting.push(new Route(\"".$match_row['root']."\",\"".$match_row['route']."\",\"".$match_row['region']."\",\"".$match_row['banner']."\",\"".$match_row['abbrev']."\",\"".$match_row['city']."\"));\n";
+		       }
+		   }
+                }
+		$res2->free();
                 $pointnum = $pointnum + 1;
             }
             $res->free();
@@ -261,4 +276,4 @@ function waypointsFromSQL() {
         else { select_route_set(); }
     ?>
     genEdges = true;
-}
\ No newline at end of file
+}
diff --git a/shields/clinched.php b/shields/clinched.php
index 321f92b0..d4de6a56 100644
--- a/shields/clinched.php
+++ b/shields/clinched.php
@@ -13,6 +13,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
     <link rel="stylesheet" type="text/css" href="/fonts/roadgeek.css" />
+    <link rel="shortcut icon" type="image/png" href="/favicon.png">
 </head>
 <body>
 <?php require  $_SERVER['DOCUMENT_ROOT']."/lib/tmheader.php"; ?>
@@ -104,4 +105,4 @@
 <?php
     $tmdb->close();
 ?>
-</html>
\ No newline at end of file
+</html>
diff --git a/shields/shieldgen.php b/shields/shieldgen.php
index 06b2656b..d620e41a 100644
--- a/shields/shieldgen.php
+++ b/shields/shieldgen.php
@@ -20,8 +20,60 @@ function generate($r, $force_reload = false)
     }
 
     switch ($row['systemName']) {
+        case 'canab': case 'canqca': //uses different shields for 1, 2, 3 digits
+            $routeNum = $row['route'];
+            $routeNum = str_replace("AB", "", $routeNum);
+            $routeNum = str_replace("A-", "", $routeNum);
+            if (strlen($routeNum) > 1) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");
+            }
+            if (strlen($routeNum) > 2) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide3.svg");
+            }
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+        case 'cansph':
+            $region = explode(".", $r)[0];
+            $routeNum = str_replace(strtoupper($region), "", $row['route']);
+            if (strlen($routeNum) > 2) {
+                if (file_exists("{$dir}/template_can" . $region . "_wide.svg")) {
+                    $svg = file_get_contents("{$dir}/template_can" . $region . "_wide.svg");
+                } else {
+                    $svg = file_get_contents("{$dir}/generic_wide.svg");
+                }
+            } else {
+                if (file_exists("{$dir}/template_can" . $region . ".svg")) {
+                    $svg = file_get_contents("{$dir}/template_can" . $region . ".svg");
+                } else {
+                    $svg = file_get_contents("{$dir}/generic.svg");
+                }
+            }
+            $region = strtoupper($region);
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            $svg = str_replace("***SYS***", $region, $svg);
+            break;
+            
         case 'cantch': //do nothing
             break;
+            
+        case 'canyt':
+            $routeNum = str_replace("YT", "", $row['route']); //gets rid of the extra YT on BC ones
+            if (file_exists("{$dir}/template_canyt" . $routeNum . ".svg")) {
+                $svg = file_get_contents("{$dir}/template_canyt" . $routeNum . ".svg");
+            } 
+            else {
+                $svg = file_get_contents("{$dir}/generic_wide.svg");
+            }
+            break;
+            
+        case 'mexd':
+            $routeNum = str_replace("MEX", "", $row['route']);
+            $routeNum = str_replace("D", "", $routeNum); //handled by template
+            if (strlen($routeNum) > 2) {
+                $svg = file_get_contents("{$dir}/template_mexd_wide.svg");
+            }
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
 
         case 'usai':
         case 'usaif':
@@ -84,7 +136,7 @@ function generate($r, $force_reload = false)
                     $svg = file_get_contents("{$dir}/generic_wide.svg");
                 }
             } else {
-                if (file_exists("template_usa" . $region . ".svg")) {
+                if (file_exists("{$dir}/template_usa" . $region . ".svg")) {
                     $svg = file_get_contents("{$dir}/template_usa" . $region . ".svg");
                 } else {
                     $svg = file_get_contents("{$dir}/generic.svg");
@@ -93,33 +145,191 @@ function generate($r, $force_reload = false)
             $region = strtoupper($region);
             $svg = str_replace("***NUMBER***", $routeNum, $svg);
             $svg = str_replace("***SYS***", $region, $svg);
+            $svg = str_replace("***LETTER***", "", $svg); //hack to kill off the suffix for usaar
+            break;
+
+        case 'belb': case 'hunm': case 'lvaa': case 'lvap': case 'nldp': case 'nldr': case 'pola': case 'pols': case 'svkd': case 'svkr':
+            // replace placeholder
+            $svg = str_replace("***NUMBER***", $row['route'], $svg);
             break;
 
-        case 'chea': case 'deua': case 'deub': case 'ltuk':
-            // remove prefix
-            $routeNum = str_replace("A", "", $row['route']);;
+        case 'andcg':
+            // replace placeholder, use wide svg file for 4-digit numbers
+            if (strlen($row['route']) > 3) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");
+            }
+            $svg = str_replace("***NUMBER***", $row['route'], $svg);
+            break;
+
+        case 'itaa':
+            // replace placeholder, use wide svg file for 5-/7-digit numbers
+            if (strlen($row['route']) > 4) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide5.svg");
+            }
+            if (strlen($row['route']) > 6) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide7.svg");
+            }
+            $svg = str_replace("***NUMBER***", $row['route'], $svg);
+            break;
+
+        case 'alakt': case 'alavt': case 'canmbw': case 'chea': case 'czed': case 'czei': case 'czeii': case 'deua': case 'dnksr': case 'deub': case 'estp': case 'estt': case 'finkt': case 'hunf': case 'islth': case 'ltuk': case 'poldk': case 'poldw': case 'svki': case 'swel':
+            // replace placeholder, remove prefix
+            $routeNum = str_replace("A", "", $row['route']);
             $routeNum = str_replace("B", "", $routeNum);
+            $routeNum = str_replace("DK", "", $routeNum);
+            $routeNum = str_replace("DW", "", $routeNum);
+            $routeNum = str_replace("D", "", $routeNum);
+            $routeNum = str_replace("F", "", $routeNum);
+            $routeNum = str_replace("I", "", $routeNum);
+            $routeNum = str_replace("Kt", "", $routeNum);
             $routeNum = str_replace("K", "", $routeNum);
+            $routeNum = str_replace("L", "", $routeNum);
+            $routeNum = str_replace("Rte", "", $routeNum);
+            $routeNum = str_replace("SR", "", $routeNum);
+            $routeNum = str_replace("TH", "", $routeNum);
+            $routeNum = str_replace("T", "", $routeNum);
+            $routeNum = str_replace("Vt", "", $routeNum);
             $svg = str_replace("***NUMBER***", $routeNum, $svg);
             break;
 
-        case 'autb': case 'cheh':
-            // remove prefix, use wide svg file
-            $routeNum = str_replace("B", "", $routeNum);
-            $routeNum = str_replace("H", "", $routeNum);
-            $routeNum = str_replace("L", "", $routeNum);
+        case 'nlds':
+            // replace placeholder, remove prefix and suffix
+            $routeNum = substr($row['route'], 1, 3);
             $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+
+        case 'autb': case 'luxn':
+            // replace placeholder, remove prefix, use wide svg file for 3-digit numbers
+            $routeNum = str_replace("B", "", $row['route']);
+            $routeNum = str_replace("L", "", $routeNum);
+            $routeNum = str_replace("N", "", $routeNum);
             if (strlen($routeNum) > 2) {
                     $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");
             }
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+
+        case 'cheh': case 'dnkpr': case 'finvt': case 'norrv': case 'swer':
+            // replace placeholder, remove prefix, use wide svg files for 2-/3-digit numbers
+            $routeNum = str_replace("Fv", "", $row['route']);
+            $routeNum = str_replace("H", "", $routeNum);
+            $routeNum = str_replace("N", "", $routeNum);
+            $routeNum = str_replace("PR", "", $routeNum);
+            $routeNum = str_replace("Rv", "", $routeNum);
+            $routeNum = str_replace("R", "", $routeNum);
+            $routeNum = str_replace("Vt", "", $routeNum);
+            if (strlen($routeNum) > 1) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");
+            }
+            if (strlen($routeNum) > 2) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide3.svg");
+            }
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
             break;
 
-        case 'eure':
+        case 'beln0': case 'beln1': case 'beln2': case 'beln3': case 'beln4': case 'beln5': case 'beln6': case 'beln7': case 'beln8': case 'beln9': case 'beln':
+            // replace placeholder, remove prefix, use wide svg files for 2-/3-digit numbers (Belgian workaround till beln is merged again)
+            $routeNum = str_replace("N", "", $row['route']);
+            $svg = file_get_contents("{$dir}/template_beln.svg");
+            if (strlen($routeNum) > 1) {
+                    $svg = file_get_contents("{$dir}/template_beln_wide.svg");
+            }
+            if (strlen($routeNum) > 2) {
+                    $svg = file_get_contents("{$dir}/template_beln_wide3.svg");
+            }
             $svg = str_replace("***NUMBER***", $routeNum, $svg);
-            // use wide svg file
+            break;
+
+        case 'norfv0': case 'norfv1': case 'norfv2': case 'norfv3': case 'norfv4': case 'norfv5': case 'norfv6': case 'norfv7': case 'norfv8': case 'norfv9': case 'norfv':
+            // replace placeholder, remove prefix, use wide svg files for 2-/3-digit numbers (Norwegian workaround till norfv is merged again)
+            $routeNum = str_replace("Fv", "", $row['route']);
+            $svg = file_get_contents("{$dir}/template_norfv.svg");
+            if (strlen($routeNum) > 1) {
+                    $svg = file_get_contents("{$dir}/template_norfv_wide.svg");
+            }
             if (strlen($routeNum) > 2) {
+                    $svg = file_get_contents("{$dir}/template_norfv_wide3.svg");
+            }
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+
+        case 'roudn':
+            // replace placeholder, remove prefix, use wide svg file for 4-digit numbers
+            $routeNum = str_replace("DN", "", $row['route']);
+            if (strlen($routeNum) > 3) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");
+            }
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+
+        case 'prta': case 'prtip': case 'prtic':
+            // replace placeholder, add blank after prefix
+            $routeNum = str_replace("A", "A ", $row['route']);
+            $routeNum = str_replace("IC", "IC ", $routeNum);
+            $routeNum = str_replace("IP", "IP ", $routeNum);
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+
+        case 'fraa': case 'fran': case 'frht': case 'spmn': case 'mtqa': case 'glpn': case 'gufn': case 'reun': case 'mara': case 'tuna': case 'mtqn':
+            // replace placeholder, add blank after prefix, use wide svg files
+            $routeNum = str_replace("A", "A ", $row['route']);
+            $routeNum = str_replace("N", "N ", $routeNum);
+            //$routeNum = str_replace("T", "T", $routeNum); //no blank required!
+            $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide" . strlen($routeNum) . ".svg");
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+            
+        case 'nclt':
+            // replace placeholder, add blank after prefix, use wide svg files
+            $routeNum = str_replace("T", "RT ", $row['route']);
+            $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide" . strlen($routeNum) . ".svg");
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+
+        case 'espn':
+            // replace placeholder, add hyphen after prefix, use wide svg files
+            $routeNum = str_replace("N", "N-", $row['route']);
+            $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide" . strlen($routeNum) . ".svg");
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+            break;
+
+        case 'bela': case 'belr': case 'eure': case 'luxa': case 'luxb': case 'roua':
+            // replace placeholder, use wide svg file for 3-digit numbers
+            if (strlen($row['route']) > 2) {
                     $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");
             }
+            $svg = str_replace("***NUMBER***", $row['route'], $svg);
+            break;
+
+        case 'nlda':
+            // replace placeholder, use wide svg files for 3-/4-digit numbers
+            if (strlen($row['route']) > 2) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");
+            }
+            if (strlen($row['route']) > 3) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide4.svg");
+            }
+            $svg = str_replace("***NUMBER***", $row['route'], $svg);
+            break;
+
+        case 'espa':
+            // replace placeholder, use wide svg files for 3-/4-/5-digit numbers (Spain is simplified: national (blue) motorway signs are generally used for national and regional motorways, numbering w/o "-" (e.g. A1 instead of A-1))
+            if (strlen($row['route']) > 2) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide3.svg");
+            }
+            if (strlen($row['route']) > 3) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide4.svg");
+            }
+            if (strlen($row['route']) > 4) {
+                    $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide5.svg");
+            }
+            $svg = str_replace("***NUMBER***", $row['route'], $svg);
+            break;
+
+        case 'deubwl': case 'deubyst': case 'deubbl': case 'deuhel': case 'deumvl': case 'deunil': case 'deunwl': case 'deurpl': case 'deusll': case 'deusns': case 'deustl': case 'deushl': case 'deuthl':
+            // replace placeholder, use wide svg files (German Landesstrassen)
+            $svg = file_get_contents("{$dir}/template_deul" . strlen($row['route']) . ".svg");
+            $svg = str_replace("***NUMBER***", $row['route'], $svg);
             break;
 
         case 'gbnm':case 'nirm':
@@ -131,7 +341,7 @@ function generate($r, $force_reload = false)
             break;
 
         case 'gbnam':case 'niram':
-            $routeNum = str_replace("M", "", $row['route']);;
+            $routeNum = str_replace("M", "", $row['route']);
             $routeNum = str_replace("A", "", $routeNum);
             if (strlen($routeNum) > 2) {
                 $svg = file_get_contents("{$dir}/template_gbnam_wide.svg");
@@ -139,12 +349,13 @@ function generate($r, $force_reload = false)
             $svg = str_replace("***NUMBER***", $routeNum, $svg);
             break;
             
-        case 'islth': //uses same shield, no wide
-            $routeNum = str_replace("TH", "", $row['route']);
+        case 'twnf':
+            $routeNum = str_replace("F", "", $row['route']);
+            $routeNum = str_replace("A", "甲", $routeNum); //suffix - hope there's no unicode issues
             $svg = str_replace("***NUMBER***", $routeNum, $svg);
             break;
 
-        case 'usasf': case 'usanp': case 'eursf': case 'usakyp': case 'gbrtr':
+        case 'usasf': case 'usanp': case 'cannf': case 'eursf': case 'usakyp': case 'gbrtr':
             $lines = explode(',',preg_replace('/(?!^)[A-Z]{3,}(?=[A-Z][a-z])|[A-Z][a-z]/', ',$0', $row['route']));
             $index = 0;
             foreach($lines as $line) {
@@ -158,6 +369,58 @@ function generate($r, $force_reload = false)
                 $index++;
             }
             break;
+            
+        case 'usaar':
+            $matches = [];
+            $routeNum = str_replace('AR', "", $row['route']);
+            if (preg_match('/(?<number>[0-9]+)(?<letter>[A-Za-z]+)/', $routeNum, $matches)) {
+                $svg = str_replace("***NUMBER***", $matches['number'], $svg);
+                $svg = str_replace("***LETTER***", $matches['letter'], $svg);
+                break;
+            }
+            else {
+                $svg = str_replace("***NUMBER***", $routeNum, $svg);
+                $svg = str_replace("***LETTER***", "", $svg);
+                break;
+            }
+
+        case 'usanh':
+            $matches = [];
+            $routeNum = str_replace('NH', "", $row['route']);
+            if (preg_match('/(?<number>[0-9]+)(?<letter>[A-Za-z]+)/', $routeNum, $matches)) {
+                $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide4.svg");
+                $svg = str_replace("***NUMBER***", $matches['number'], $svg);
+                $svg = str_replace("***LETTER***", $matches['letter'], $svg);
+                break;
+            }
+            elseif (strlen($routeNum) > 2) {
+                $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide.svg");  
+            }
+            $svg = str_replace("***NUMBER***", $routeNum, $svg);
+                
+            break;
+            
+        case 'usanes':
+            $matches = [];
+            $routeNum = str_replace('NE', "", $row['route']);
+            if ($routeNum[0] == 'L') {
+                $svg_path = "{$dir}/template_usanes_link.svg";
+            	$svg = file_get_contents($svg_path);
+            	$routeNum = str_replace('L', "", $routeNum);
+            	preg_match('/(?<number>[0-9]+)(?<letter>[A-Za-z]+)/', $routeNum, $matches);
+            }
+            else { //S
+                $svg_path = "{$dir}/template_usanes_spur.svg";
+                $svg = file_get_contents($svg_path);
+            	$routeNum = str_replace('S', "", $routeNum);
+            	preg_match('/(?<number>[0-9]+)(?<letter>[A-Za-z]+)/', $routeNum, $matches);
+            }
+            $svg = str_replace("***NUMBER***", $matches['number'], $svg);
+            $svg = str_replace("***LETTER***", $matches['letter'], $svg);
+        break;
+            
+        //the following cases are meant to fall through to the default
+        //TODO: fix this
 
         case 'usatx': case 'usatxl': case 'usatxs':
             if ($row['root'] == 'tx.nasa1' or $row['systemName'] != 'usatx' or $row['banner'] != "") {
@@ -196,16 +459,6 @@ function generate($r, $force_reload = false)
                 break;
             }
 
-        case 'usanh':
-            $matches = [];
-            $routeNum = str_replace('NH', "", $row['route']);
-            if (preg_match('/(?<number>[0-9]+)(?<letter>[A-Za-z]+)/', $routeNum, $matches)) {
-                $svg = file_get_contents("{$dir}/template_" . $row['systemName'] . "_wide4.svg");
-                $svg = str_replace("***NUMBER***", $matches['number'], $svg);
-                $svg = str_replace("***LETTER***", $matches['letter'], $svg);
-                break;
-            }
-
         default:
             $region = strtoupper(explode(".", $r)[0]);
             $routeNum = str_replace($region, "", $row['route']);
diff --git a/shields/template_alakt.svg b/shields/template_alakt.svg
new file mode 100644
index 00000000..5718f297
--- /dev/null
+++ b/shields/template_alakt.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="160px" version="1.1" viewBox="0 0 160 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="160" y="0" x="0" fill="#0091ff"/>
+    <rect rx="10" ry="10" height="112" width="152" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="100" width="140" y="10.25" x="10.25" fill="#0091ff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_alavt.svg b/shields/template_alavt.svg
new file mode 100644
index 00000000..2c91d973
--- /dev/null
+++ b/shields/template_alavt.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="120px" version="1.1" viewBox="0 0 120 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="120" y="0" x="0" fill="#ff163c"/>
+    <rect rx="10" ry="10" height="112" width="112" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="100" width="100" y="10.25" x="10.25" fill="#ff163c"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="60">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_alba.svg b/shields/template_alba.svg
new file mode 100644
index 00000000..a0313912
--- /dev/null
+++ b/shields/template_alba.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" version="1.1" viewBox="0 0 300 300">
+  <path id="pathOttagono" d="m25 25 125-20 125 20 20 125-20 125-125 20-125-20-20-125 20-125z" stroke="#fff" stroke-width="10" fill="#08842c"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="180px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#fff">
+    <tspan x="155" y="210">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_andcg.svg b/shields/template_andcg.svg
new file mode 100644
index 00000000..c59fb9db
--- /dev/null
+++ b/shields/template_andcg.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350" height="150" viewBox="0 0 350 150" version="1.1">
+  <g fill-rule="evenodd">
+    <rect rx="16" ry="16" height="150" width="350" y="0" x="0" fill="#000"/>
+    <rect rx="12" ry="12" height="134" width="334" y="8" x="8" fill="#fe0000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="170px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#fff">
+      <tspan y="130" x="175">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_andcg_wide.svg b/shields/template_andcg_wide.svg
new file mode 100644
index 00000000..94d64b45
--- /dev/null
+++ b/shields/template_andcg_wide.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350" height="150" viewBox="0 0 350 150" version="1.1">
+  <g fill-rule="evenodd">
+    <rect rx="16" ry="16" height="150" width="350" y="0" x="0" fill="#000"/>
+    <rect rx="12" ry="12" height="134" width="334" y="8" x="8" fill="#fe0000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#fff">
+      <tspan y="100" x="175">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/shields/template_bela.svg b/shields/template_bela.svg
new file mode 100644
index 00000000..0167cc4f
--- /dev/null
+++ b/shields/template_bela.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="68.3" width="86.4" version="1.1" viewBox="0 0 86.4 68.3">
+  <path fill="#fff" d="m7.13 0h72.7c3.64 0 6.62 3.53 6.62 7.84v52.7c0 4.31-2.98 7.84-6.62 7.84h-73.1c-3.72 0-6.7-3.5-6.7-7.8v-53.1c-0.00000178-4.29 3.49-7.4 7.13-7.4z"/>
+  <path fill="#fff" d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path d="m7.73 2.75h70.9c3.49 0 5.41 2.27 5.41 6.22v50.6c0 3.95-2.17 5.93-5.66 5.93h-70.6c-3.49 0-5.41-2.39-5.41-6.34v-50.9c0-3.89 1.92-5.51 5.36-5.51z"/>
+  <path fill="#fff" d="m8.44 5.33h69.5c3.29 0 3.99 1.26 3.99 4.91v48.2c0 3.65-1.52 4.55-4.8 4.55h-67.8c-3.29 0-4.8-1.2-4.8-4.79v-49.1c0-3.59 0.708-3.77 3.94-3.77z"/>
+  <path d="m8.44 5.33h69.5c3.29 0 3.99 1.26 3.99 4.91v48.2c0 3.65-1.52 4.55-4.8 4.55h-67.8c-3.29 0-4.8-1.2-4.8-4.79v-49.1c0-3.59 0.708-3.77 3.94-3.77z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#000">
+     <tspan y="55" x="60">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_bela_wide.svg b/shields/template_bela_wide.svg
new file mode 100644
index 00000000..7019f676
--- /dev/null
+++ b/shields/template_bela_wide.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="68.3" width="102" version="1.1" viewBox="0 0 102 68.3">
+  <path fill="#0071b3" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path fill="#fff" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path fill="#fff" d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path fill="#fff" d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z"/>
+  <path d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#000">
+     <tspan y="55" x="67">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_belb.svg b/shields/template_belb.svg
new file mode 100644
index 00000000..719dff5e
--- /dev/null
+++ b/shields/template_belb.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="68.3" width="102" version="1.1" viewBox="0 0 101.952 68.347">
+  <path fill="#0071b3" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path fill="#fff" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path fill="#fff" d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path fill="#fff" d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z"/>
+  <path d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#000">
+     <tspan y="55" x="67">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_beln.svg b/shields/template_beln.svg
new file mode 100644
index 00000000..4f15f8fe
--- /dev/null
+++ b/shields/template_beln.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="68.3" width="102" version="1.1" viewBox="0 0 101.952 68.347">
+  <path fill="#0071b3" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <path fill="#fff" d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path fill="#0071b3" d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z"/>
+  <path d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <polygon points="37.5 24.5 37.5 54.8 33.7 54.8 25.6 34 25.6 55.1 22.1 55.1 22.1 24.5 26.6 24.5 33.8 43.9 33.8 24.5" fill="#fff" transform="translate(7.53)"/>
+  <g fill="#fff" transform="translate(4.63)"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#fff">
+    <tspan y="55" x="90">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_beln_wide.svg b/shields/template_beln_wide.svg
new file mode 100644
index 00000000..98fdfc79
--- /dev/null
+++ b/shields/template_beln_wide.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="68.3" width="102" version="1.1" viewBox="0 0 101.952 68.347">
+  <path fill="#0071b3" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <path fill="#fff" d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <path fill="#0071b3" d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z"/>
+  <path d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <polygon points="37.5 54.8 33.7 54.8 25.6 34 25.6 55.1 22.1 55.1 22.1 24.5 26.6 24.5 33.8 43.9 33.8 24.5 37.5 24.5" fill="#fff" transform="translate(-1.59)"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#fff">
+    <tspan y="55" x="90">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_beln_wide3.svg b/shields/template_beln_wide3.svg
new file mode 100644
index 00000000..8bc038d4
--- /dev/null
+++ b/shields/template_beln_wide3.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="67.6" width="119" version="1.1" viewBox="0 0 119.42222 67.587757">
+  <path fill="#0071b3" d="m0.114 34v-26.4c0-4.13 3.93-7.47 8.6-7.47h102c4.82 0 8.74 3.34 8.74 7.47l0.0943 26.4 0.0943 26c0 4.13-4.16 7.59-8.98 7.59h-102c-4.72 0-8.65-3.34-8.65-7.39v-26.3l0.0466 0.159z"/>
+  <path d="m0.111 34v-26.4c0-4.13 3.93-7.47 8.6-7.47h102c4.82 0 8.74 3.34 8.74 7.47l0.0943 26.4 0.0943 26c0 4.13-4.16 7.59-8.98 7.59h-102c-4.72 0-8.65-3.34-8.65-7.39v-26.3l0.0466 0.159z" stroke="#0071b3" stroke-miterlimit="3.86" stroke-width=".129" fill="none"/>
+  <path fill="#fff" d="m117 33.9 0.0465 26.2c0 3.06-3.13 5.72-6.74 5.72h-102c-3.56 0-6.46-2.66-6.46-5.72l0.0466-26v-26.9c0-2.9 2.67-5.25 6.03-5.25h102c3.56 0 6.74 2.46 6.74 5.61v26.3h-0.0465z"/>
+  <path d="m117 33.9 0.0465 26.2c0 3.06-3.13 5.73-6.73 5.73h-102c-3.55 0-6.45-2.66-6.45-5.73l0.0466-26v-26.9c0-2.9 2.67-5.25 6.03-5.25h102c3.55 0 6.73 2.46 6.73 5.61v26.4h-0.0465z" stroke="#fff" stroke-miterlimit="3.86" stroke-width=".216" fill="none"/>
+  <path fill="#0071b3" d="m115 33.8 0.0465 26.2c0 2.15-2.25 4.02-4.72 4.02h-102c-2.48 0-4.58-1.79-4.58-3.94v-26.1l0.0466-26.4c0-2.15 2.1-3.94 4.58-3.94h102c2.48 0 4.49 1.83 4.49 3.98l0.0943 26.2z"/>
+  <path d="m115 33.8 0.0465 26.2c0 2.15-2.25 4.02-4.72 4.02h-102c-2.48 0-4.58-1.79-4.58-3.94v-26.1l0.0466-26.4c0-2.15 2.1-3.94 4.58-3.94h102c2.48 0 4.49 1.83 4.49 3.98l0.0943 26.2z" stroke="#0071b3" stroke-miterlimit="3.86" stroke-width=".216" fill="none"/>
+  <polygon points="25.5 54.8 21.7 54.8 13.6 34 13.6 55.1 10.1 55.1 10.1 24.5 14.6 24.5 21.8 43.9 21.8 24.5 25.5 24.5" fill="#fff" transform="translate(-1.59)"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#fff">
+    <tspan y="55" x="90">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_belr.svg b/shields/template_belr.svg
new file mode 100644
index 00000000..0167cc4f
--- /dev/null
+++ b/shields/template_belr.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="68.3" width="86.4" version="1.1" viewBox="0 0 86.4 68.3">
+  <path fill="#fff" d="m7.13 0h72.7c3.64 0 6.62 3.53 6.62 7.84v52.7c0 4.31-2.98 7.84-6.62 7.84h-73.1c-3.72 0-6.7-3.5-6.7-7.8v-53.1c-0.00000178-4.29 3.49-7.4 7.13-7.4z"/>
+  <path fill="#fff" d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path d="m7.73 2.75h70.9c3.49 0 5.41 2.27 5.41 6.22v50.6c0 3.95-2.17 5.93-5.66 5.93h-70.6c-3.49 0-5.41-2.39-5.41-6.34v-50.9c0-3.89 1.92-5.51 5.36-5.51z"/>
+  <path fill="#fff" d="m8.44 5.33h69.5c3.29 0 3.99 1.26 3.99 4.91v48.2c0 3.65-1.52 4.55-4.8 4.55h-67.8c-3.29 0-4.8-1.2-4.8-4.79v-49.1c0-3.59 0.708-3.77 3.94-3.77z"/>
+  <path d="m8.44 5.33h69.5c3.29 0 3.99 1.26 3.99 4.91v48.2c0 3.65-1.52 4.55-4.8 4.55h-67.8c-3.29 0-4.8-1.2-4.8-4.79v-49.1c0-3.59 0.708-3.77 3.94-3.77z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#000">
+     <tspan y="55" x="60">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_belr_wide.svg b/shields/template_belr_wide.svg
new file mode 100644
index 00000000..7019f676
--- /dev/null
+++ b/shields/template_belr_wide.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="68.3" width="102" version="1.1" viewBox="0 0 102 68.3">
+  <path fill="#0071b3" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path fill="#fff" d="m8.41 0h85.7c4.3 0 7.82 3.53 7.82 7.84v52.7c0 4.31-3.52 7.84-7.82 7.84h-86.4c-4.28 0-7.8-3.5-7.8-7.8v-53.1c0-4.29 4.12-7.4 8.41-7.4z"/>
+  <path fill="#fff" d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path d="m9.13 2.75h83.7c4.12 0 6.38 2.27 6.38 6.22v50.6c0 3.95-2.56 5.93-6.68 5.93h-83.3c-4.12 0-6.38-2.39-6.38-6.34v-50.9c0-3.89 2.27-5.51 6.32-5.51z"/>
+  <path fill="#fff" d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z"/>
+  <path d="m9.96 5.33h82c3.88 0 4.71 1.26 4.71 4.91v48.2c0 3.65-1.79 4.55-5.67 4.55h-80c-3.9 0-5.69-1.2-5.69-4.8v-49.1c0-3.59 0.835-3.77 4.65-3.77z" stroke-miterlimit="3.86" stroke-width="0" fill="none"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#000">
+     <tspan y="55" x="67">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_canab.svg b/shields/template_canab.svg
new file mode 100644
index 00000000..dea82cb9
--- /dev/null
+++ b/shields/template_canab.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="600.22" width="450.23" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 450.23 600.224"><metadata id="metadata514"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs id="defs512"><clipPath id="clipPath546" clipPathUnits="userSpaceOnUse"><path id="path548" d="m253.8 378h108v30.321h-108v-30.321z"/></clipPath></defs><path id="path5" d="m0.61477 38.481v523.26c0.03998 20.92 16.946 37.84 37.86 37.87h373.28c20.909-0.03 37.817-16.955 37.859-37.868v-523.26c-0.05-20.919-16.95-37.837-37.86-37.868h-373.28c-20.919 0.03076-37.825 16.949-37.865 37.869" stroke="#000" stroke-width=".99956" fill="#fff"/><text id="routenum" style="text-anchor:middle;text-align:center" xml:space="preserve" transform="scale(1.0012 .99882)" line-height="125%" font-size="301.98px" y="457.19986" x="224.94469" font-family="Roadgeek 2005 Blend C3B" fill="#000000"><tspan id="tspan3326" y="457.19986" x="224.9447" font-family="&apos;Roadgeek 2014 Series EM&apos;" fill="#000000">***NUMBER***</tspan></text>
+<rect id="rect11" height="581.12" width="427.6" y="9.557" x="11.317" fill="none"/><path id="path13" fill-rule="evenodd" d="m423.59 442.61v-265.24h-396.94v265.24s-5.6752 44.326 34.729 65.069l163.74 77.917 163.74-77.917c40.402-20.743 34.725-65.068 34.725-65.068m-41.11 52.36-157.35 74.87-157.73-75.04c-30.347-15.59-26.896-49.04-26.749-50.46l0.10486-0.82054v-251.91h368.75v251.82l0.0932 0.92055c0.15729 1.4237 3.6002 34.865-27.119 50.635"/><g id="g542" transform="matrix(3.489 0 0 -3.489 -852.8 1460.8)"><g id="g544" clip-path="url(#clipPath546)"><g id="g550" transform="translate(273.64 384.78)"><path id="path552" d="m0 0c1.359 0.496 3.084 1.22 4.903 2.173 0.245-2.076 0.512-3.584 0.809-4.694-1.332 0.482-3.232 1.256-5.712 2.521m19.642-5.323c-1.051 0.156-2.432 1.59-2.85 3.948-0.753 4.245-0.307 8.434 0.94 14.675 0.236 1.181 1.043 3.227-1.521 3.621-0.814 0.125-0.391-0.276-0.62-1.356-0.986-4.649-4.788-7.998-8.605-10.244-0.399 5.321-0.235 11.232 0.766 14.857 0.845 3.057 1.851 2.494 0.604 3.138-1.312 0.677-2.722-0.218-3.863-2.495-1.14-2.276-6.397-14.645-14.791-22.993-4.296-4.272-8.182-2.072-8.96-1.415-0.633 0.535-0.867-0.29-0.083-1.136 3.476-3.746 8.551-1.598 10.399 0.25 5.107 5.107 11.046 16.097 13.448 20.759-0.222-2.626-0.296-7.03 0.193-12.19-2.6-1.267-4.931-2.012-6.029-2.299-1.191-0.312-1.927-0.798-1.949-1.35-0.024-0.603 0.776-1.114 1.931-1.662 2.058-0.975 8.082-3.823 9.568-4.686 1.271-0.738 1.892-0.161 2.268 0.634 0.492 1.038-0.857 1.637-2.164 2.028-0.502 1.747-0.905 4.1-1.172 6.69 3.063 1.885 6.079 4.396 7.818 7.533-0.438-2.622-1.561-11.54 1.254-15.31 0.62-0.83 1.99-1.738 3.327-1.605 0.628 0.063 0.947 0.476 0.884 0.606s-0.424-0.052-0.793 0.002"/></g><g id="g554" transform="translate(299.44 384.35)"><path id="path556" d="m0 0c-0.987-0.1-2.035-0.191-3.139-0.275 0.415 3.144 2.051 7.514 4.088 6.811 1.175-0.405 0.555-4.086-0.949-6.536m-2.584-2.166c-0.357-0.055-0.652-0.05-0.885-0.008 0.139 0.122 0.227 0.298 0.227 0.508 0 0.133 0.004 0.273 0.012 0.418 0.552 0.024 1.416 0.087 2.444 0.186-0.539-0.593-1.147-1.004-1.798-1.104m12.558 7.474c1.3 1.206 1.945 1.121 2.116 0.795 0.368-0.701-1.162-3.171-4.091-4.524 0.252 1.331 0.952 2.781 1.975 3.729m39.848-7.515c-4.02 0-5.058 3.125-5.252 4.673-0.129 1.027 0.093 2.515-1.684 2.317-1.243-0.138-2.367-2.559-3.943-4.598-1.353-1.75-1.958-1.583-1.643-0.081 0.393 1.883 1.962 6.297 3.759 6.62 0.831 0.149 1.127-1.313 1.51-0.399 0.383 0.915 0.032 2.891-1.828 2.891-1.302 0-2.865-1.38-4.146-2.953-1.117-1.37-6.762-9.678-9.129-7.885-1.107 0.839-1.016 4.253-0.32 8.277 2.808 1.083 5.146 0.728 6.467 0.094 0.652-0.313 0.743-0.267 0.463 0.451-0.41 1.055-2.67 2.702-6.202 1.945-0.083-0.018-0.167-0.038-0.251-0.059 0.284 1.306 0.615 2.633 0.976 3.923 0.33 1.182 1.3 3.228-1.232 3.622-0.805 0.125-0.463-0.265-0.729-1.356-0.49-2.008-1.106-4.611-1.553-7.228-2.081-1.198-4.019-3.2-5.438-5.835 0.246 1.215 0.627 2.558 0.654 3.466 0.027 0.954-0.627 1.166-0.882 1.239-0.554 0.159-1.226-0.117-1.889-1.052-1.551-2.185-3.514-5.641-6.499-7.092-2.139-1.04-3.078 0.007-3.132 1.62 0.423 0.128 0.802 0.263 1.121 0.404 3.878 1.719 5.209 4.311 4.225 5.889-0.935 1.499-3.609 1.044-5.721-1.18-1.039-1.096-1.841-2.979-1.934-4.695-0.895-0.193-1.925-0.365-3.074-0.519 1.821 2.955 1.663 6.951-1 7.623-3.092 0.782-4.654-2.221-5.317-4.717 0.204 2.497 0.604 5.539 1.167 8.361 0.237 1.182 1.044 3.228-1.52 3.621-0.814 0.126-0.688-0.253-0.621-1.355 0.091-1.48-1.547-10.438-0.691-14.374-1.104-0.356-1.551-1.185-0.132-2.061 0.977-0.602 3.129-0.803 5.303 0.269 0.78 0.384 1.454 0.925 2.017 1.56 1.295 0.167 2.656 0.375 3.897 0.622 0.213-1.724 1.338-3.046 3.952-2.803 3.717 0.345 7.018 4.911 8.264 7.112-0.225-2.359-1.759-7.509 0.858-7.244 1.025 0.104 0.579 0.266 0.643 1.153 0.225 3.103 2.81 5.734 5.365 7.346-0.443-3.8-0.289-7.195 1.434-8.272 3.171-1.983 7.662 3.238 10.134 6.431-1.259-2.835-1.971-6.469-0.08-7.022 2.216-0.649 3.964 3.029 6.009 5.844 0.239-2.02 1.586-5.501 7.018-5.501 2.441 0 4.514 0.689 6.05 1.779h-2.418c-0.902-0.539-1.928-0.871-3.026-0.871m2.746 10.666v-9.795h0.28c2.129 1.272 3.558 3.705 3.555 5.709-0.002 1.728-0.919 1.641-0.815 1.885 0.298 0.694 2.463 0.296 2.588-2.147 0.106-2.071-0.977-4.077-2.91-5.447h7.098v9.795h-9.796z"/></g></g></g></svg>
diff --git a/shields/template_canab_wide.svg b/shields/template_canab_wide.svg
new file mode 100644
index 00000000..cc5bcb59
--- /dev/null
+++ b/shields/template_canab_wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="600.22" width="450.23" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 450.23 600.224"><metadata id="metadata514"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs id="defs512"><clipPath id="clipPath546" clipPathUnits="userSpaceOnUse"><path id="path548" d="m253.8 378h108v30.321h-108v-30.321z"/></clipPath></defs><path id="path5" d="m0.61477 38.481v523.26c0.03998 20.92 16.946 37.84 37.86 37.87h373.28c20.909-0.03 37.817-16.955 37.859-37.868v-523.26c-0.05-20.919-16.95-37.837-37.86-37.868h-373.28c-20.919 0.03076-37.825 16.949-37.865 37.869" stroke="#000" stroke-width=".99956" fill="#fff"/><text id="routenum" style="text-anchor:middle;text-align:center" xml:space="preserve" transform="scale(1.0012 .99882)" line-height="125%" font-size="301.98px" y="457.19986" x="224.94469" font-family="Roadgeek 2005 Blend C3B" fill="#000000"><tspan id="tspan3326" y="457.19986" x="224.9447" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000">***NUMBER***</tspan></text>
+<rect id="rect11" height="581.12" width="427.6" y="9.557" x="11.317" fill="none"/><path id="path13" fill-rule="evenodd" d="m423.59 442.61v-265.24h-396.94v265.24s-5.6752 44.326 34.729 65.069l163.74 77.917 163.74-77.917c40.402-20.743 34.725-65.068 34.725-65.068m-41.11 52.36-157.35 74.87-157.73-75.04c-30.347-15.59-26.896-49.04-26.749-50.46l0.10486-0.82054v-251.91h368.75v251.82l0.0932 0.92055c0.15729 1.4237 3.6002 34.865-27.119 50.635"/><g id="g542" transform="matrix(3.489 0 0 -3.489 -852.8 1460.8)"><g id="g544" clip-path="url(#clipPath546)"><g id="g550" transform="translate(273.64 384.78)"><path id="path552" d="m0 0c1.359 0.496 3.084 1.22 4.903 2.173 0.245-2.076 0.512-3.584 0.809-4.694-1.332 0.482-3.232 1.256-5.712 2.521m19.642-5.323c-1.051 0.156-2.432 1.59-2.85 3.948-0.753 4.245-0.307 8.434 0.94 14.675 0.236 1.181 1.043 3.227-1.521 3.621-0.814 0.125-0.391-0.276-0.62-1.356-0.986-4.649-4.788-7.998-8.605-10.244-0.399 5.321-0.235 11.232 0.766 14.857 0.845 3.057 1.851 2.494 0.604 3.138-1.312 0.677-2.722-0.218-3.863-2.495-1.14-2.276-6.397-14.645-14.791-22.993-4.296-4.272-8.182-2.072-8.96-1.415-0.633 0.535-0.867-0.29-0.083-1.136 3.476-3.746 8.551-1.598 10.399 0.25 5.107 5.107 11.046 16.097 13.448 20.759-0.222-2.626-0.296-7.03 0.193-12.19-2.6-1.267-4.931-2.012-6.029-2.299-1.191-0.312-1.927-0.798-1.949-1.35-0.024-0.603 0.776-1.114 1.931-1.662 2.058-0.975 8.082-3.823 9.568-4.686 1.271-0.738 1.892-0.161 2.268 0.634 0.492 1.038-0.857 1.637-2.164 2.028-0.502 1.747-0.905 4.1-1.172 6.69 3.063 1.885 6.079 4.396 7.818 7.533-0.438-2.622-1.561-11.54 1.254-15.31 0.62-0.83 1.99-1.738 3.327-1.605 0.628 0.063 0.947 0.476 0.884 0.606s-0.424-0.052-0.793 0.002"/></g><g id="g554" transform="translate(299.44 384.35)"><path id="path556" d="m0 0c-0.987-0.1-2.035-0.191-3.139-0.275 0.415 3.144 2.051 7.514 4.088 6.811 1.175-0.405 0.555-4.086-0.949-6.536m-2.584-2.166c-0.357-0.055-0.652-0.05-0.885-0.008 0.139 0.122 0.227 0.298 0.227 0.508 0 0.133 0.004 0.273 0.012 0.418 0.552 0.024 1.416 0.087 2.444 0.186-0.539-0.593-1.147-1.004-1.798-1.104m12.558 7.474c1.3 1.206 1.945 1.121 2.116 0.795 0.368-0.701-1.162-3.171-4.091-4.524 0.252 1.331 0.952 2.781 1.975 3.729m39.848-7.515c-4.02 0-5.058 3.125-5.252 4.673-0.129 1.027 0.093 2.515-1.684 2.317-1.243-0.138-2.367-2.559-3.943-4.598-1.353-1.75-1.958-1.583-1.643-0.081 0.393 1.883 1.962 6.297 3.759 6.62 0.831 0.149 1.127-1.313 1.51-0.399 0.383 0.915 0.032 2.891-1.828 2.891-1.302 0-2.865-1.38-4.146-2.953-1.117-1.37-6.762-9.678-9.129-7.885-1.107 0.839-1.016 4.253-0.32 8.277 2.808 1.083 5.146 0.728 6.467 0.094 0.652-0.313 0.743-0.267 0.463 0.451-0.41 1.055-2.67 2.702-6.202 1.945-0.083-0.018-0.167-0.038-0.251-0.059 0.284 1.306 0.615 2.633 0.976 3.923 0.33 1.182 1.3 3.228-1.232 3.622-0.805 0.125-0.463-0.265-0.729-1.356-0.49-2.008-1.106-4.611-1.553-7.228-2.081-1.198-4.019-3.2-5.438-5.835 0.246 1.215 0.627 2.558 0.654 3.466 0.027 0.954-0.627 1.166-0.882 1.239-0.554 0.159-1.226-0.117-1.889-1.052-1.551-2.185-3.514-5.641-6.499-7.092-2.139-1.04-3.078 0.007-3.132 1.62 0.423 0.128 0.802 0.263 1.121 0.404 3.878 1.719 5.209 4.311 4.225 5.889-0.935 1.499-3.609 1.044-5.721-1.18-1.039-1.096-1.841-2.979-1.934-4.695-0.895-0.193-1.925-0.365-3.074-0.519 1.821 2.955 1.663 6.951-1 7.623-3.092 0.782-4.654-2.221-5.317-4.717 0.204 2.497 0.604 5.539 1.167 8.361 0.237 1.182 1.044 3.228-1.52 3.621-0.814 0.126-0.688-0.253-0.621-1.355 0.091-1.48-1.547-10.438-0.691-14.374-1.104-0.356-1.551-1.185-0.132-2.061 0.977-0.602 3.129-0.803 5.303 0.269 0.78 0.384 1.454 0.925 2.017 1.56 1.295 0.167 2.656 0.375 3.897 0.622 0.213-1.724 1.338-3.046 3.952-2.803 3.717 0.345 7.018 4.911 8.264 7.112-0.225-2.359-1.759-7.509 0.858-7.244 1.025 0.104 0.579 0.266 0.643 1.153 0.225 3.103 2.81 5.734 5.365 7.346-0.443-3.8-0.289-7.195 1.434-8.272 3.171-1.983 7.662 3.238 10.134 6.431-1.259-2.835-1.971-6.469-0.08-7.022 2.216-0.649 3.964 3.029 6.009 5.844 0.239-2.02 1.586-5.501 7.018-5.501 2.441 0 4.514 0.689 6.05 1.779h-2.418c-0.902-0.539-1.928-0.871-3.026-0.871m2.746 10.666v-9.795h0.28c2.129 1.272 3.558 3.705 3.555 5.709-0.002 1.728-0.919 1.641-0.815 1.885 0.298 0.694 2.463 0.296 2.588-2.147 0.106-2.071-0.977-4.077-2.91-5.447h7.098v9.795h-9.796z"/></g></g></g></svg>
diff --git a/shields/template_canab_wide3.svg b/shields/template_canab_wide3.svg
new file mode 100644
index 00000000..da00f2f1
--- /dev/null
+++ b/shields/template_canab_wide3.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="600.22" width="450.23" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 450.23 600.224"><metadata id="metadata514"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs id="defs512"><clipPath id="clipPath546" clipPathUnits="userSpaceOnUse"><path id="path548" d="m253.8 378h108v30.321h-108v-30.321z"/></clipPath></defs><path id="path5" d="m0.61477 38.481v523.26c0.03998 20.92 16.946 37.84 37.86 37.87h373.28c20.909-0.03 37.817-16.955 37.859-37.868v-523.26c-0.05-20.919-16.95-37.837-37.86-37.868h-373.28c-20.919 0.03076-37.825 16.949-37.865 37.869" stroke="#000" stroke-width=".99956" fill="#fff"/><text id="routenum" style="text-anchor:middle;text-align:center" xml:space="preserve" transform="scale(1.0012 .99882)" line-height="125%" font-size="301.98px" y="457.19986" x="224.94469" font-family="Roadgeek 2005 Blend C3B" fill="#000000"><tspan id="tspan3326" y="457.19986" x="224.9447" font-family="&apos;Roadgeek 2014 Series B&apos;" fill="#000000">***NUMBER***</tspan></text>
+<rect id="rect11" height="581.12" width="427.6" y="9.557" x="11.317" fill="none"/><path id="path13" fill-rule="evenodd" d="m423.59 442.61v-265.24h-396.94v265.24s-5.6752 44.326 34.729 65.069l163.74 77.917 163.74-77.917c40.402-20.743 34.725-65.068 34.725-65.068m-41.11 52.36-157.35 74.87-157.73-75.04c-30.347-15.59-26.896-49.04-26.749-50.46l0.10486-0.82054v-251.91h368.75v251.82l0.0932 0.92055c0.15729 1.4237 3.6002 34.865-27.119 50.635"/><g id="g542" transform="matrix(3.489 0 0 -3.489 -852.8 1460.8)"><g id="g544" clip-path="url(#clipPath546)"><g id="g550" transform="translate(273.64 384.78)"><path id="path552" d="m0 0c1.359 0.496 3.084 1.22 4.903 2.173 0.245-2.076 0.512-3.584 0.809-4.694-1.332 0.482-3.232 1.256-5.712 2.521m19.642-5.323c-1.051 0.156-2.432 1.59-2.85 3.948-0.753 4.245-0.307 8.434 0.94 14.675 0.236 1.181 1.043 3.227-1.521 3.621-0.814 0.125-0.391-0.276-0.62-1.356-0.986-4.649-4.788-7.998-8.605-10.244-0.399 5.321-0.235 11.232 0.766 14.857 0.845 3.057 1.851 2.494 0.604 3.138-1.312 0.677-2.722-0.218-3.863-2.495-1.14-2.276-6.397-14.645-14.791-22.993-4.296-4.272-8.182-2.072-8.96-1.415-0.633 0.535-0.867-0.29-0.083-1.136 3.476-3.746 8.551-1.598 10.399 0.25 5.107 5.107 11.046 16.097 13.448 20.759-0.222-2.626-0.296-7.03 0.193-12.19-2.6-1.267-4.931-2.012-6.029-2.299-1.191-0.312-1.927-0.798-1.949-1.35-0.024-0.603 0.776-1.114 1.931-1.662 2.058-0.975 8.082-3.823 9.568-4.686 1.271-0.738 1.892-0.161 2.268 0.634 0.492 1.038-0.857 1.637-2.164 2.028-0.502 1.747-0.905 4.1-1.172 6.69 3.063 1.885 6.079 4.396 7.818 7.533-0.438-2.622-1.561-11.54 1.254-15.31 0.62-0.83 1.99-1.738 3.327-1.605 0.628 0.063 0.947 0.476 0.884 0.606s-0.424-0.052-0.793 0.002"/></g><g id="g554" transform="translate(299.44 384.35)"><path id="path556" d="m0 0c-0.987-0.1-2.035-0.191-3.139-0.275 0.415 3.144 2.051 7.514 4.088 6.811 1.175-0.405 0.555-4.086-0.949-6.536m-2.584-2.166c-0.357-0.055-0.652-0.05-0.885-0.008 0.139 0.122 0.227 0.298 0.227 0.508 0 0.133 0.004 0.273 0.012 0.418 0.552 0.024 1.416 0.087 2.444 0.186-0.539-0.593-1.147-1.004-1.798-1.104m12.558 7.474c1.3 1.206 1.945 1.121 2.116 0.795 0.368-0.701-1.162-3.171-4.091-4.524 0.252 1.331 0.952 2.781 1.975 3.729m39.848-7.515c-4.02 0-5.058 3.125-5.252 4.673-0.129 1.027 0.093 2.515-1.684 2.317-1.243-0.138-2.367-2.559-3.943-4.598-1.353-1.75-1.958-1.583-1.643-0.081 0.393 1.883 1.962 6.297 3.759 6.62 0.831 0.149 1.127-1.313 1.51-0.399 0.383 0.915 0.032 2.891-1.828 2.891-1.302 0-2.865-1.38-4.146-2.953-1.117-1.37-6.762-9.678-9.129-7.885-1.107 0.839-1.016 4.253-0.32 8.277 2.808 1.083 5.146 0.728 6.467 0.094 0.652-0.313 0.743-0.267 0.463 0.451-0.41 1.055-2.67 2.702-6.202 1.945-0.083-0.018-0.167-0.038-0.251-0.059 0.284 1.306 0.615 2.633 0.976 3.923 0.33 1.182 1.3 3.228-1.232 3.622-0.805 0.125-0.463-0.265-0.729-1.356-0.49-2.008-1.106-4.611-1.553-7.228-2.081-1.198-4.019-3.2-5.438-5.835 0.246 1.215 0.627 2.558 0.654 3.466 0.027 0.954-0.627 1.166-0.882 1.239-0.554 0.159-1.226-0.117-1.889-1.052-1.551-2.185-3.514-5.641-6.499-7.092-2.139-1.04-3.078 0.007-3.132 1.62 0.423 0.128 0.802 0.263 1.121 0.404 3.878 1.719 5.209 4.311 4.225 5.889-0.935 1.499-3.609 1.044-5.721-1.18-1.039-1.096-1.841-2.979-1.934-4.695-0.895-0.193-1.925-0.365-3.074-0.519 1.821 2.955 1.663 6.951-1 7.623-3.092 0.782-4.654-2.221-5.317-4.717 0.204 2.497 0.604 5.539 1.167 8.361 0.237 1.182 1.044 3.228-1.52 3.621-0.814 0.126-0.688-0.253-0.621-1.355 0.091-1.48-1.547-10.438-0.691-14.374-1.104-0.356-1.551-1.185-0.132-2.061 0.977-0.602 3.129-0.803 5.303 0.269 0.78 0.384 1.454 0.925 2.017 1.56 1.295 0.167 2.656 0.375 3.897 0.622 0.213-1.724 1.338-3.046 3.952-2.803 3.717 0.345 7.018 4.911 8.264 7.112-0.225-2.359-1.759-7.509 0.858-7.244 1.025 0.104 0.579 0.266 0.643 1.153 0.225 3.103 2.81 5.734 5.365 7.346-0.443-3.8-0.289-7.195 1.434-8.272 3.171-1.983 7.662 3.238 10.134 6.431-1.259-2.835-1.971-6.469-0.08-7.022 2.216-0.649 3.964 3.029 6.009 5.844 0.239-2.02 1.586-5.501 7.018-5.501 2.441 0 4.514 0.689 6.05 1.779h-2.418c-0.902-0.539-1.928-0.871-3.026-0.871m2.746 10.666v-9.795h0.28c2.129 1.272 3.558 3.705 3.555 5.709-0.002 1.728-0.919 1.641-0.815 1.885 0.298 0.694 2.463 0.296 2.588-2.147 0.106-2.071-0.977-4.077-2.91-5.447h7.098v9.795h-9.796z"/></g></g></g></svg>
diff --git a/shields/template_canmbw.svg b/shields/template_canmbw.svg
new file mode 100644
index 00000000..0072f89e
--- /dev/null
+++ b/shields/template_canmbw.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 801 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="layer1" transform="translate(-37.5 -293.86)">
+  <g id="g3638">
+   <path id="rect2816" d="m63 294.36h750c13.85 0 25 11.15 25 25l-100 550c0 13.85-11.15 25-25 25h-550c-13.85 0-25-11.15-25-25l-100-550c0-13.85 11.15-25 25-25z" stroke="#000" fill="#fff"/>
+   <path id="rect3590" d="m103.4 509.77h666.19c8.31 0 16 6.69 16 15l-63 340.19c0 8.31-6.69 15-15 15h-540.19c-8.31 0-15-6.69-15-15l-63-340.19c0-8.31 5.69-15 14-15z" stroke="#000" stroke-width="9.8079" fill="#fff"/>
+   <path id="rect3592" fill="#006a4d" d="m63 304.36h750c8.31 0 15 6.69 15 15l-30 160c0 8.31-9.69 15-18 15h-685c-8.31 0-16-6.69-16-15l-31-160c0-8.31 6.69-15 15-15z"/>
+  </g>
+  <g id="text3646" fill="#fff">
+   <path id="path3657" d="m235.6 477.78-34.269-58.35h-47.931v58.35h-29.407v-155.14h94.703c6.792 0.00015 13.198 1.3123 19.219 3.9363 6.0201 2.47 11.191 5.9432 15.514 10.42 4.4764 4.3224 7.9497 9.4164 10.42 15.282 2.6241 5.866 3.9362 12.118 3.9363 18.755-0.00017 10.497-3.0103 19.913-9.0304 28.249-6.0204 8.1814-14.125 14.047-24.313 17.598l35.427 60.897h-34.269m2.7786-106.74c-0.00013-2.4697-0.54041-4.8624-1.6208-7.178-0.92633-2.3154-2.3156-4.3221-4.1679-6.0203-1.6982-1.8523-3.7821-3.2416-6.2518-4.1679-2.3156-1.0804-4.8626-1.6207-7.6411-1.6208h-65.297v38.205h65.297c2.7785 0.00009 5.3255-0.463 7.6411-1.3893 2.4697-1.0805 4.5537-2.4698 6.2518-4.1679 1.8523-1.8523 3.2415-3.9362 4.1679-6.2518 1.0804-2.3154 1.6207-4.7852 1.6208-7.4096"/>
+   <path id="path3659" d="m389.84 421.28c-0.00012 8.1814-1.4666 15.823-4.3994 22.923-2.9331 7.1008-6.8694 13.353-11.809 18.755-4.9398 5.2484-10.651 9.4163-17.135 12.504-6.3291 2.933-12.967 4.3994-19.913 4.3994-7.1009-0.00001-13.816-1.4665-20.145-4.3994-6.329-3.0873-11.886-7.2552-16.671-12.504-4.7854-5.4028-8.5673-11.655-11.346-18.755-2.7786-7.1008-4.1679-14.742-4.1679-22.923-0.00002-8.49 1.3121-16.363 3.9363-23.618 2.7786-7.2551 6.4833-13.507 11.114-18.755 4.7853-5.4027 10.342-9.5706 16.671-12.504 6.3289-3.0872 13.198-4.6308 20.608-4.631 6.792 0.00012 13.353 1.5438 19.682 4.631 6.4833 3.0874 12.195 7.3325 17.135 12.735 4.9396 5.4029 8.8759 11.732 11.809 18.987 3.0872 7.2553 4.6308 14.974 4.631 23.155m-31.491 0c-0.00009-4.1678-0.61756-8.1041-1.8524-11.809-1.235-3.7047-2.8558-6.8692-4.8625-9.4935-2.0068-2.7785-4.3223-4.9396-6.9464-6.4834-2.6243-1.5436-5.3257-2.3154-8.1042-2.3155-3.0874 0.00008-5.9431 0.77191-8.5673 2.3155-2.4699 1.5437-4.7082 3.7049-6.7149 6.4834-1.8524 2.6243-3.3189 5.7888-4.3994 9.4935-1.0806 3.7048-1.6209 7.6412-1.6208 11.809-0.00005 4.0136 0.54023 7.7955 1.6208 11.346 1.0805 3.5504 2.547 6.6378 4.3994 9.2619 2.0067 2.6242 4.245 4.7082 6.7149 6.2518 2.6242 1.5437 5.4799 2.3155 8.5673 2.3155 2.7785 0.00003 5.4799-0.7718 8.1042-2.3155 2.6241-1.5436 4.9396-3.6276 6.9464-6.2518 2.0067-2.6242 3.6275-5.7115 4.8625-9.2619 1.2348-3.5504 1.8523-7.3323 1.8524-11.346"/>
+   <path id="path3661" d="m493.04 477.78v-7.178c-2.7787 1.8524-5.4029 3.396-7.8726 4.631-2.4699 1.0806-4.8626 1.9296-7.178 2.547-2.3156 0.61746-4.7082 1.0034-7.178 1.1577-2.3156 0.30873-4.8626 0.4631-7.6411 0.4631-6.9465 0-12.967-0.84901-18.061-2.547-4.9398-1.8524-9.4935-4.7853-13.661-8.7988-3.5504-3.5504-6.329-7.6411-8.3357-12.272-2.0068-4.7853-3.0102-9.8022-3.0101-15.051v-76.179h31.027v65.76c-0.00006 5.4028 1.698 9.9566 5.0941 13.661 3.396 3.7048 8.0269 5.5572 13.893 5.5572 2.7785 0.00003 5.4027-0.46306 7.8726-1.3893 2.6241-1.0805 4.8624-2.4698 6.7149-4.1679 2.0067-1.698 3.6275-3.6276 4.8625-5.7887 1.2348-2.1611 1.8523-4.3994 1.8524-6.7149v-66.918h31.027v113.23h-29.407"/>
+   <path id="path3663" d="m601.87 391.87v42.373c-0.00007 5.2485 0.84894 9.262 2.547 12.041 1.698 2.6242 5.4027 3.7048 11.114 3.2417 4.0134-0.3087 6.8692-1.0805 8.5673-2.3155 1.8523-1.2349 4.0906-3.2416 6.7149-6.0203l-8.1042 32.185c-2.6243 1.0806-4.631 2.0068-6.0203 2.7786-1.3894 0.77183-2.7015 1.3893-3.9363 1.8524-1.0806 0.46309-2.3927 0.77182-3.9363 0.92619-1.3894 0.30873-3.4733 0.4631-6.2518 0.4631-10.651 0-18.524-3.0101-23.618-9.0304-4.9397-6.0202-7.4096-14.588-7.4096-25.702v-52.793h-21.302v-26.86h21.302v-33.111l30.333-12.041v44.689h28.944v27.323h-28.944"/>
+   <path id="path3665" d="m679.99 431.01c1.698 6.4834 4.6309 11.577 8.7988 15.282 4.1678 3.5504 8.7216 5.3256 13.661 5.3256 6.4833 0.00003 12.272-3.4732 17.366-10.42l21.302 18.524c-5.866 6.9465-11.886 11.963-18.061 15.051-6.1747 3.0873-13.044 4.631-20.608 4.631-7.2552 0-14.125-1.4665-20.608-4.3994-6.4834-3.0873-12.195-7.2552-17.135-12.504-4.9397-5.2484-8.876-11.423-11.809-18.524-2.933-7.2551-4.3994-15.051-4.3994-23.386-0.00002-8.1813 1.3893-15.822 4.1679-22.923 2.9329-7.1007 6.7921-13.275 11.577-18.524 4.7853-5.4027 10.342-9.6478 16.671-12.735 6.3289-3.0872 12.967-4.6308 19.913-4.631 9.2619 0.00012 17.752 2.7015 25.47 8.1042 7.8725 5.2485 13.893 12.349 18.061 21.302 2.161 5.2485 3.7818 10.728 4.8625 16.44 1.0804 5.5572 1.6207 11.886 1.6208 18.987v4.3994h-70.854m38.669-25.702c-2.1612-5.7115-4.631-9.725-7.4096-12.041-2.6243-2.4698-6.0975-3.7047-10.42-3.7048-4.1679 0.00009-8.0271 1.3894-11.577 4.1679-3.3961 2.6243-5.9431 6.4834-7.6411 11.577h37.048"/>
+  </g>
+  <text id="text3652" style="text-anchor:middle;text-align:center" font-family="Lucida Bright" font-weight="bold" xml:space="preserve" font-size="397.18px" line-height="100%" stroke="#000000" y="828.31317" x="438.73062" stroke-width="33.098px" fill="none"><tspan id="tspan3654" style="text-anchor:middle;text-align:center" font-weight="normal" font-size="397.18px" line-height="100%" y="828.31317" x="438.73062" font-family="&apos;Roadgeek 2014 Series EM&apos;" fill="#000000">***NUMBER***</tspan></text>
+ </g>
+</svg>
diff --git a/shields/template_canmbw_wide.svg b/shields/template_canmbw_wide.svg
new file mode 100644
index 00000000..7abc0708
--- /dev/null
+++ b/shields/template_canmbw_wide.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 801 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="layer1" transform="translate(-37.5 -293.86)">
+  <g id="g3638">
+   <path id="rect2816" d="m63 294.36h750c13.85 0 25 11.15 25 25l-100 550c0 13.85-11.15 25-25 25h-550c-13.85 0-25-11.15-25-25l-100-550c0-13.85 11.15-25 25-25z" stroke="#000" fill="#fff"/>
+   <path id="rect3590" d="m103.4 509.77h666.19c8.31 0 16 6.69 16 15l-63 340.19c0 8.31-6.69 15-15 15h-540.19c-8.31 0-15-6.69-15-15l-63-340.19c0-8.31 5.69-15 14-15z" stroke="#000" stroke-width="9.8079" fill="#fff"/>
+   <path id="rect3592" fill="#006a4d" d="m63 304.36h750c8.31 0 15 6.69 15 15l-30 160c0 8.31-9.69 15-18 15h-685c-8.31 0-16-6.69-16-15l-31-160c0-8.31 6.69-15 15-15z"/>
+  </g>
+  <g id="text3646" fill="#fff">
+   <path id="path3657" d="m235.6 477.78-34.269-58.35h-47.931v58.35h-29.407v-155.14h94.703c6.792 0.00015 13.198 1.3123 19.219 3.9363 6.0201 2.47 11.191 5.9432 15.514 10.42 4.4764 4.3224 7.9497 9.4164 10.42 15.282 2.6241 5.866 3.9362 12.118 3.9363 18.755-0.00017 10.497-3.0103 19.913-9.0304 28.249-6.0204 8.1814-14.125 14.047-24.313 17.598l35.427 60.897h-34.269m2.7786-106.74c-0.00013-2.4697-0.54041-4.8624-1.6208-7.178-0.92633-2.3154-2.3156-4.3221-4.1679-6.0203-1.6982-1.8523-3.7821-3.2416-6.2518-4.1679-2.3156-1.0804-4.8626-1.6207-7.6411-1.6208h-65.297v38.205h65.297c2.7785 0.00009 5.3255-0.463 7.6411-1.3893 2.4697-1.0805 4.5537-2.4698 6.2518-4.1679 1.8523-1.8523 3.2415-3.9362 4.1679-6.2518 1.0804-2.3154 1.6207-4.7852 1.6208-7.4096"/>
+   <path id="path3659" d="m389.84 421.28c-0.00012 8.1814-1.4666 15.823-4.3994 22.923-2.9331 7.1008-6.8694 13.353-11.809 18.755-4.9398 5.2484-10.651 9.4163-17.135 12.504-6.3291 2.933-12.967 4.3994-19.913 4.3994-7.1009-0.00001-13.816-1.4665-20.145-4.3994-6.329-3.0873-11.886-7.2552-16.671-12.504-4.7854-5.4028-8.5673-11.655-11.346-18.755-2.7786-7.1008-4.1679-14.742-4.1679-22.923-0.00002-8.49 1.3121-16.363 3.9363-23.618 2.7786-7.2551 6.4833-13.507 11.114-18.755 4.7853-5.4027 10.342-9.5706 16.671-12.504 6.3289-3.0872 13.198-4.6308 20.608-4.631 6.792 0.00012 13.353 1.5438 19.682 4.631 6.4833 3.0874 12.195 7.3325 17.135 12.735 4.9396 5.4029 8.8759 11.732 11.809 18.987 3.0872 7.2553 4.6308 14.974 4.631 23.155m-31.491 0c-0.00009-4.1678-0.61756-8.1041-1.8524-11.809-1.235-3.7047-2.8558-6.8692-4.8625-9.4935-2.0068-2.7785-4.3223-4.9396-6.9464-6.4834-2.6243-1.5436-5.3257-2.3154-8.1042-2.3155-3.0874 0.00008-5.9431 0.77191-8.5673 2.3155-2.4699 1.5437-4.7082 3.7049-6.7149 6.4834-1.8524 2.6243-3.3189 5.7888-4.3994 9.4935-1.0806 3.7048-1.6209 7.6412-1.6208 11.809-0.00005 4.0136 0.54023 7.7955 1.6208 11.346 1.0805 3.5504 2.547 6.6378 4.3994 9.2619 2.0067 2.6242 4.245 4.7082 6.7149 6.2518 2.6242 1.5437 5.4799 2.3155 8.5673 2.3155 2.7785 0.00003 5.4799-0.7718 8.1042-2.3155 2.6241-1.5436 4.9396-3.6276 6.9464-6.2518 2.0067-2.6242 3.6275-5.7115 4.8625-9.2619 1.2348-3.5504 1.8523-7.3323 1.8524-11.346"/>
+   <path id="path3661" d="m493.04 477.78v-7.178c-2.7787 1.8524-5.4029 3.396-7.8726 4.631-2.4699 1.0806-4.8626 1.9296-7.178 2.547-2.3156 0.61746-4.7082 1.0034-7.178 1.1577-2.3156 0.30873-4.8626 0.4631-7.6411 0.4631-6.9465 0-12.967-0.84901-18.061-2.547-4.9398-1.8524-9.4935-4.7853-13.661-8.7988-3.5504-3.5504-6.329-7.6411-8.3357-12.272-2.0068-4.7853-3.0102-9.8022-3.0101-15.051v-76.179h31.027v65.76c-0.00006 5.4028 1.698 9.9566 5.0941 13.661 3.396 3.7048 8.0269 5.5572 13.893 5.5572 2.7785 0.00003 5.4027-0.46306 7.8726-1.3893 2.6241-1.0805 4.8624-2.4698 6.7149-4.1679 2.0067-1.698 3.6275-3.6276 4.8625-5.7887 1.2348-2.1611 1.8523-4.3994 1.8524-6.7149v-66.918h31.027v113.23h-29.407"/>
+   <path id="path3663" d="m601.87 391.87v42.373c-0.00007 5.2485 0.84894 9.262 2.547 12.041 1.698 2.6242 5.4027 3.7048 11.114 3.2417 4.0134-0.3087 6.8692-1.0805 8.5673-2.3155 1.8523-1.2349 4.0906-3.2416 6.7149-6.0203l-8.1042 32.185c-2.6243 1.0806-4.631 2.0068-6.0203 2.7786-1.3894 0.77183-2.7015 1.3893-3.9363 1.8524-1.0806 0.46309-2.3927 0.77182-3.9363 0.92619-1.3894 0.30873-3.4733 0.4631-6.2518 0.4631-10.651 0-18.524-3.0101-23.618-9.0304-4.9397-6.0202-7.4096-14.588-7.4096-25.702v-52.793h-21.302v-26.86h21.302v-33.111l30.333-12.041v44.689h28.944v27.323h-28.944"/>
+   <path id="path3665" d="m679.99 431.01c1.698 6.4834 4.6309 11.577 8.7988 15.282 4.1678 3.5504 8.7216 5.3256 13.661 5.3256 6.4833 0.00003 12.272-3.4732 17.366-10.42l21.302 18.524c-5.866 6.9465-11.886 11.963-18.061 15.051-6.1747 3.0873-13.044 4.631-20.608 4.631-7.2552 0-14.125-1.4665-20.608-4.3994-6.4834-3.0873-12.195-7.2552-17.135-12.504-4.9397-5.2484-8.876-11.423-11.809-18.524-2.933-7.2551-4.3994-15.051-4.3994-23.386-0.00002-8.1813 1.3893-15.822 4.1679-22.923 2.9329-7.1007 6.7921-13.275 11.577-18.524 4.7853-5.4027 10.342-9.6478 16.671-12.735 6.3289-3.0872 12.967-4.6308 19.913-4.631 9.2619 0.00012 17.752 2.7015 25.47 8.1042 7.8725 5.2485 13.893 12.349 18.061 21.302 2.161 5.2485 3.7818 10.728 4.8625 16.44 1.0804 5.5572 1.6207 11.886 1.6208 18.987v4.3994h-70.854m38.669-25.702c-2.1612-5.7115-4.631-9.725-7.4096-12.041-2.6243-2.4698-6.0975-3.7047-10.42-3.7048-4.1679 0.00009-8.0271 1.3894-11.577 4.1679-3.3961 2.6243-5.9431 6.4834-7.6411 11.577h37.048"/>
+  </g>
+  <text id="text3652" style="text-anchor:middle;text-align:center" font-family="Lucida Bright" font-weight="bold" xml:space="preserve" font-size="397.18px" line-height="100%" stroke="#000000" y="828.31317" x="438.73062" stroke-width="33.098px" fill="none"><tspan id="tspan3654" style="text-anchor:middle;text-align:center" font-weight="normal" font-size="290px" line-height="100%" font-stretch="narrower" y="800" x="438.73062" font-family="&apos;Roadgeek 2014 Series EM&apos;" fill="#000000">***NUMBER***</tspan></text>
+ </g>
+</svg>
diff --git a/shields/template_cannba.svg b/shields/template_cannba.svg
new file mode 100644
index 00000000..ba628556
--- /dev/null
+++ b/shields/template_cannba.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="601" width="601" version="1.1" xml:space="preserve" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 601.00003 601.00003" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata4"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g3818"><rect id="rect3793" style="color:#000000" rx="37.5" ry="37.5" height="600" width="600" stroke="#999" y=".49425" x=".50575" fill="#fff"/><rect id="rect3795" style="color:#000000" rx="25" ry="25" height="575.5" width="575.5" y="12.75" x="12.75"/></g><rect id="rect3816" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="25.5" x="25.5" fill="#006a4d"/><path id="path21" fill="#fff" d="m516.18 123.2 21.193-13.615-12.9-17.514-7.4344 3.6622 6.5593 11.738-12.571 8.3861 5.1528 7.3428zm1.7772 274.64-10.062-137.1-17.396-11.106 20.528-51.311-33.521 4.5137 13.355-19.753 6.7533-43.725 9.203-7.831-21.884-22.608h-43.195l-52.87 32.847 13.918-39.179-19.282-32.055-29.663 6.6186-14.474-14.474 6.6099-16.427-121.26 38.732-21.732-11.392v-13.198h-104.11v19.408h-21.177v40.699l-31.289 25.91h-15.914v14.112h20.469l22.346-12.412 10.121 24.848v274.39l-15.038 15.232 38.459 27.399 1.6921 43.557 13.24 17.312 7.0809-11.199 9.009 9.4056 42.159-7.5357-8.0703 13.227 122.54-15.99-11.418-12.597-7.1995-7.9313-11.325-12.487-5.5408-6.1131 2.619-4.6312 18.633-32.914-13.472 37.428 12.613 11.03 9.7333-21.134-4.2776 25.908 23.424 20.478 119.65-26.633 10.879 12.454 27.196-50.175-3.0652 45.191 9.9866-19.972v-9.5479l97.57-50.94-52.55-38.33zm24.342-304.33 12.462-9.6913v-15.275h-10.912l3.216 13.337-8.6394 3.7549 3.8735 7.8731zm-330.79 28.65v33.225c0 1.0691 0.22741 1.7762 0.68222 2.1469 0.45483 0.3535 1.3892 0.65635 2.8205 0.90101v1.3472h-22.364v-1.3472c1.5746-0.27807 2.5974-0.61432 3.0695-1.0023 0.46776-0.40417 0.70272-1.0778 0.70272-2.0456v-46.664c0-1.0357-0.24789-1.7427-0.74151-2.1469-0.49253-0.38692-1.5035-0.707-3.0318-0.95166v-1.3472h28.03v1.3472c-0.73287 0.10993-1.33 0.29424-1.7848 0.56367-0.46345 0.28669-0.71563 0.62296-0.75767 1.0444 0 0.37075 0.15197 0.75767 0.47205 1.1284 0.30286 0.38691 0.859 0.85035 1.6339 1.3979l42.462 30.699v-31.735c0-1.0691-0.23603-1.7762-0.69839-2.1469-0.47206-0.3535-1.4992-0.67359-3.0738-0.95166v-1.3472h22.364v1.3472c-1.4733 0.27807-2.4336 0.62294-2.8539 1.0357-0.43757 0.41279-0.64882 1.1026-0.64882 2.0628v46.664c0 1.0357 0.22742 1.7427 0.68223 2.1469 0.45482 0.38691 1.3892 0.69083 2.8205 0.90101v1.3472h-25.774v-1.3472c0.77491-0.1013 1.3806-0.29424 1.8193-0.56367 0.42895-0.27808 0.64881-0.60679 0.64881-0.98508 0-0.3783-0.15951-0.76631-0.47206-1.1618-0.31255-0.39554-0.83311-0.85035-1.5574-1.372l-44.45-32.191zm81.565 37.62v-1.3472c1.566-0.27807 2.5931-0.61432 3.0652-1.0185 0.47205-0.39554 0.70701-1.0778 0.70701-2.0542v-46.681c0-1.0185-0.2522-1.718-0.7415-2.1135-0.49686-0.38693-1.5067-0.69839-3.0318-0.94305v-1.3472h52.928c8.7902 0 15.645 1.2459 20.545 3.7388 4.9006 2.4929 7.359 5.9525 7.359 10.382 0 2.5424-0.88378 4.7659-2.6351 6.6692-1.76 1.9109-4.4124 3.52-7.9733 4.8165 4.4458 1.5919 7.7211 3.4855 9.8432 5.6917s3.1913 4.8499 3.1913 7.9151c0 5.1366-2.7957 9.1438-8.3861 12.007-5.5828 2.8625-13.472 4.2863-23.677 4.2863h-51.194zm48.499-46.613h-27.483v12.125h29.588c4.698 0 8.1673-0.48823 10.407-1.4733 2.2568-0.97645 3.3852-2.4842 3.3852-4.5137 0-2.2655-1.1791-3.8562-3.52-4.7659-2.3571-0.90856-6.4741-1.372-12.377-1.372zm-1.9529 22.094h-25.53v15.089h24.948c7.8558 0 13.245-0.56366 16.184-1.6921 2.9304-1.137 4.4037-3.0813 4.4037-5.8264 0-2.6437-1.5832-4.5633-4.7325-5.7682-3.1492-1.205-8.2428-1.802-15.273-1.802z"/><text id="text3898" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="279.4px" line-height="100%" y="400.50003" x="298.83652" font-family="Sans" fill="#000000"><tspan id="tspan3900" font-weight="bold" y="400.50003" x="298.83652" font-family="&apos;Helvetica World&apos;,&apos;Helvetica&apos;&apos;Arial&apos;,&apos;Liberation Sans&apos;,&apos;Sans&apos;" fill="#000000">***NUMBER***</tspan></text>
+</svg>
diff --git a/shields/template_cannbc_wide.svg b/shields/template_cannbc_wide.svg
new file mode 100644
index 00000000..445ffd5e
--- /dev/null
+++ b/shields/template_cannbc_wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="601" width="601" version="1.1" xml:space="preserve" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 601.00003 601.00003" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata4"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g3818"><rect id="rect3793" style="color:#000000" rx="37.5" ry="37.5" height="600" width="600" stroke="#999" y=".49425" x=".50575" fill="#fff"/><rect id="rect3795" style="color:#000000" rx="25" ry="25" height="575.5" width="575.5" y="12.75" x="12.75"/></g><rect id="rect3816" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="25.5" x="25.5" fill="#003478"/><path id="path21" fill="#fff" d="m516.18 123.2 21.193-13.615-12.9-17.514-7.4344 3.6622 6.5593 11.738-12.571 8.3861 5.1528 7.3428zm1.7772 274.64-10.062-137.1-17.396-11.106 20.528-51.311-33.521 4.5137 13.355-19.753 6.7533-43.725 9.203-7.831-21.884-22.608h-43.195l-52.87 32.847 13.918-39.179-19.282-32.055-29.663 6.6186-14.474-14.474 6.6099-16.427-121.26 38.732-21.732-11.392v-13.198h-104.11v19.408h-21.177v40.699l-31.289 25.91h-15.914v14.112h20.469l22.346-12.412 10.121 24.848v274.39l-15.038 15.232 38.459 27.399 1.6921 43.557 13.24 17.312 7.0809-11.199 9.009 9.4056 42.159-7.5357-8.0703 13.227 122.54-15.99-11.418-12.597-7.1995-7.9313-11.325-12.487-5.5408-6.1131 2.619-4.6312 18.633-32.914-13.472 37.428 12.613 11.03 9.7333-21.134-4.2776 25.908 23.424 20.478 119.65-26.633 10.879 12.454 27.196-50.175-3.0652 45.191 9.9866-19.972v-9.5479l97.57-50.94-52.55-38.33zm24.342-304.33 12.462-9.6913v-15.275h-10.912l3.216 13.337-8.6394 3.7549 3.8735 7.8731zm-330.79 28.65v33.225c0 1.0691 0.22741 1.7762 0.68222 2.1469 0.45483 0.3535 1.3892 0.65635 2.8205 0.90101v1.3472h-22.364v-1.3472c1.5746-0.27807 2.5974-0.61432 3.0695-1.0023 0.46776-0.40417 0.70272-1.0778 0.70272-2.0456v-46.664c0-1.0357-0.24789-1.7427-0.74151-2.1469-0.49253-0.38692-1.5035-0.707-3.0318-0.95166v-1.3472h28.03v1.3472c-0.73287 0.10993-1.33 0.29424-1.7848 0.56367-0.46345 0.28669-0.71563 0.62296-0.75767 1.0444 0 0.37075 0.15197 0.75767 0.47205 1.1284 0.30286 0.38691 0.859 0.85035 1.6339 1.3979l42.462 30.699v-31.735c0-1.0691-0.23603-1.7762-0.69839-2.1469-0.47206-0.3535-1.4992-0.67359-3.0738-0.95166v-1.3472h22.364v1.3472c-1.4733 0.27807-2.4336 0.62294-2.8539 1.0357-0.43757 0.41279-0.64882 1.1026-0.64882 2.0628v46.664c0 1.0357 0.22742 1.7427 0.68223 2.1469 0.45482 0.38691 1.3892 0.69083 2.8205 0.90101v1.3472h-25.774v-1.3472c0.77491-0.1013 1.3806-0.29424 1.8193-0.56367 0.42895-0.27808 0.64881-0.60679 0.64881-0.98508 0-0.3783-0.15951-0.76631-0.47206-1.1618-0.31255-0.39554-0.83311-0.85035-1.5574-1.372l-44.45-32.191zm81.565 37.62v-1.3472c1.566-0.27807 2.5931-0.61432 3.0652-1.0185 0.47205-0.39554 0.70701-1.0778 0.70701-2.0542v-46.681c0-1.0185-0.2522-1.718-0.7415-2.1135-0.49686-0.38693-1.5067-0.69839-3.0318-0.94305v-1.3472h52.928c8.7902 0 15.645 1.2459 20.545 3.7388 4.9006 2.4929 7.359 5.9525 7.359 10.382 0 2.5424-0.88378 4.7659-2.6351 6.6692-1.76 1.9109-4.4124 3.52-7.9733 4.8165 4.4458 1.5919 7.7211 3.4855 9.8432 5.6917s3.1913 4.8499 3.1913 7.9151c0 5.1366-2.7957 9.1438-8.3861 12.007-5.5828 2.8625-13.472 4.2863-23.677 4.2863h-51.194zm48.499-46.613h-27.483v12.125h29.588c4.698 0 8.1673-0.48823 10.407-1.4733 2.2568-0.97645 3.3852-2.4842 3.3852-4.5137 0-2.2655-1.1791-3.8562-3.52-4.7659-2.3571-0.90856-6.4741-1.372-12.377-1.372zm-1.9529 22.094h-25.53v15.089h24.948c7.8558 0 13.245-0.56366 16.184-1.6921 2.9304-1.137 4.4037-3.0813 4.4037-5.8264 0-2.6437-1.5832-4.5633-4.7325-5.7682-3.1492-1.205-8.2428-1.802-15.273-1.802z"/><text id="text3898" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="243.81px" line-height="100%" y="388" x="300.67859" font-family="Sans" fill="#000000"><tspan id="tspan3900" font-weight="bold" y="388" x="300.67859" font-family="&apos;Helvetica World&apos;,&apos;Helvetica&apos;&apos;Arial&apos;,&apos;Liberation Sans&apos;,&apos;Sans&apos;" fill="#000000">***NUMBER***</tspan></text>
+</svg>
diff --git a/shields/template_cannbl_wide.svg b/shields/template_cannbl_wide.svg
new file mode 100644
index 00000000..f8cf8485
--- /dev/null
+++ b/shields/template_cannbl_wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="601" width="601" version="1.1" xml:space="preserve" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 601.00003 601.00003" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata4"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g3818"><rect id="rect3793" style="color:#000000" rx="37.5" ry="37.5" height="600" width="600" stroke="#999" y=".49425" x=".50575" fill="#fff"/><rect id="rect3795" style="color:#000000" rx="25" ry="25" height="575.5" width="575.5" y="12.75" x="12.75"/></g><path id="path21" fill="#fff" d="m516.18 123.2 21.193-13.615-12.9-17.514-7.4344 3.6622 6.5593 11.738-12.571 8.3861 5.1528 7.3428zm1.7772 274.64-10.062-137.1-17.396-11.106 20.528-51.311-33.521 4.5137 13.355-19.753 6.7533-43.725 9.203-7.831-21.884-22.608h-43.195l-52.87 32.847 13.918-39.179-19.282-32.055-29.663 6.6186-14.474-14.474 6.6099-16.427-121.26 38.732-21.732-11.392v-13.198h-104.11v19.408h-21.177v40.699l-31.289 25.91h-15.914v14.112h20.469l22.346-12.412 10.121 24.848v274.39l-15.038 15.232 38.459 27.399 1.6921 43.557 13.24 17.312 7.0809-11.199 9.009 9.4056 42.159-7.5357-8.0703 13.227 122.54-15.99-11.418-12.597-7.1995-7.9313-11.325-12.487-5.5408-6.1131 2.619-4.6312 18.633-32.914-13.472 37.428 12.613 11.03 9.7333-21.134-4.2776 25.908 23.424 20.478 119.65-26.633 10.879 12.454 27.196-50.175-3.0652 45.191 9.9866-19.972v-9.5479l97.57-50.94-52.55-38.33zm24.342-304.33 12.462-9.6913v-15.275h-10.912l3.216 13.337-8.6394 3.7549 3.8735 7.8731zm-330.79 28.65v33.225c0 1.0691 0.22741 1.7762 0.68222 2.1469 0.45483 0.3535 1.3892 0.65635 2.8205 0.90101v1.3472h-22.364v-1.3472c1.5746-0.27807 2.5974-0.61432 3.0695-1.0023 0.46776-0.40417 0.70272-1.0778 0.70272-2.0456v-46.664c0-1.0357-0.24789-1.7427-0.74151-2.1469-0.49253-0.38692-1.5035-0.707-3.0318-0.95166v-1.3472h28.03v1.3472c-0.73287 0.10993-1.33 0.29424-1.7848 0.56367-0.46345 0.28669-0.71563 0.62296-0.75767 1.0444 0 0.37075 0.15197 0.75767 0.47205 1.1284 0.30286 0.38691 0.859 0.85035 1.6339 1.3979l42.462 30.699v-31.735c0-1.0691-0.23603-1.7762-0.69839-2.1469-0.47206-0.3535-1.4992-0.67359-3.0738-0.95166v-1.3472h22.364v1.3472c-1.4733 0.27807-2.4336 0.62294-2.8539 1.0357-0.43757 0.41279-0.64882 1.1026-0.64882 2.0628v46.664c0 1.0357 0.22742 1.7427 0.68223 2.1469 0.45482 0.38691 1.3892 0.69083 2.8205 0.90101v1.3472h-25.774v-1.3472c0.77491-0.1013 1.3806-0.29424 1.8193-0.56367 0.42895-0.27808 0.64881-0.60679 0.64881-0.98508 0-0.3783-0.15951-0.76631-0.47206-1.1618-0.31255-0.39554-0.83311-0.85035-1.5574-1.372l-44.45-32.191zm81.565 37.62v-1.3472c1.566-0.27807 2.5931-0.61432 3.0652-1.0185 0.47205-0.39554 0.70701-1.0778 0.70701-2.0542v-46.681c0-1.0185-0.2522-1.718-0.7415-2.1135-0.49686-0.38693-1.5067-0.69839-3.0318-0.94305v-1.3472h52.928c8.7902 0 15.645 1.2459 20.545 3.7388 4.9006 2.4929 7.359 5.9525 7.359 10.382 0 2.5424-0.88378 4.7659-2.6351 6.6692-1.76 1.9109-4.4124 3.52-7.9733 4.8165 4.4458 1.5919 7.7211 3.4855 9.8432 5.6917s3.1913 4.8499 3.1913 7.9151c0 5.1366-2.7957 9.1438-8.3861 12.007-5.5828 2.8625-13.472 4.2863-23.677 4.2863h-51.194zm48.499-46.613h-27.483v12.125h29.588c4.698 0 8.1673-0.48823 10.407-1.4733 2.2568-0.97645 3.3852-2.4842 3.3852-4.5137 0-2.2655-1.1791-3.8562-3.52-4.7659-2.3571-0.90856-6.4741-1.372-12.377-1.372zm-1.9529 22.094h-25.53v15.089h24.948c7.8558 0 13.245-0.56366 16.184-1.6921 2.9304-1.137 4.4037-3.0813 4.4037-5.8264 0-2.6437-1.5832-4.5633-4.7325-5.7682-3.1492-1.205-8.2428-1.802-15.273-1.802z"/><text id="text3898" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="208.98px" line-height="100%" y="375.5" x="300.65308" font-family="Sans" fill="#000000"><tspan id="tspan3900" font-weight="bold" y="375.5" x="300.65308" font-family="&apos;Helvetica World&apos;,&apos;Helvetica&apos;&apos;Arial&apos;,&apos;Liberation Sans&apos;,&apos;Sans&apos;d" fill="#000000">***NUMBER***</tspan></text>
+</svg>
diff --git a/shields/template_cannf.svg b/shields/template_cannf.svg
new file mode 100644
index 00000000..1e797de9
--- /dev/null
+++ b/shields/template_cannf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="640" height="480" viewBox="0 0 640 480"><g transform="scale(-1-1)"><rect width="640" height="480" x="-640" y="-480" rx="30" fill="#006b5d"/><rect ry="26.13" rx="26.26" y="-473.2" x="-632.56" height="466.4" width="625.12" fill="none" stroke="#fff" stroke-linejoin="round" stroke-linecap="square" stroke-width="14.88"/></g><text x="315.42" y="152.87" font-family="&apos;Roadgeek 2014 Series EM&apos;" letter-spacing="0" word-spacing="0" text-anchor="middle" text-align="center" fill="#fff" line-height="100%" font-size="160"><tspan x="315.42" y="152.87"><tspan line-height="84%">***NUMBER1***</tspan></tspan><tspan x="315.42" y="272.87" line-height="84%">***NUMBER2***</tspan><tspan x="315.42" y="392.87"><tspan line-height="84%">***NUMBER3***</tspan></tspan></text></svg>
\ No newline at end of file
diff --git a/shields/template_canqca.svg b/shields/template_canqca.svg
new file mode 100644
index 00000000..7ea00147
--- /dev/null
+++ b/shields/template_canqca.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="Layer_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="289.02" width="217" version="1.0" xml:space="preserve" y="0" x="0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 217 289.0195313"><metadata id="metadata16"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g5"><path id="path7" fill-rule="evenodd" fill="#fff" d="m216.5 0.5v168c0 90-108 120-108 120s-108-30-108-120v-168h216z"/><path id="path9" d="m216.5 0.5v168c0 90-108 120-108 120s-108-30-108-120v-168h216z" stroke="#000" stroke-miterlimit="3.8637" fill="none"/></g><path id="path11" fill-rule="evenodd" fill="#003f87" d="m210.5 168.5c0 78.97-88.87 109.64-102 113.74-13.133-4.1-102-34.77-102-113.74v-84h204v84z"/><g id="g13" fill="#af1e2d"><polygon id="polygon15" points="6.5 6.5 210.5 6.5 210.5 78.5 6.5 78.5"/></g><path id="path19" fill-rule="evenodd" fill="#fff" d="m108.5 217.46c1.57 1.57 2.93 3.04 4.02 4.67 3.04 4.53 4.07 9.46 2.37 13.45-3.39 8.43-4.69 10.57-4.69 17.29h2.41c0.15-7.39 3.24-12.33 7.84-13.82 2.03-0.7 4.65-0.35 7.06 1.88 2.98 2.76 3.85 10.36-4.9 11.82 0.93-1.24 0.85-3.95-1-4.91-1.42-0.64-3.02-0.39-3.76 0.16-1.21 0.65-2.37 2.75-2.37 4.87l4.16-0.01v4.18l-8.62-0.01c0.11 2.15 1.41 3.87 3.83 4.83-0.31 0.9-1.77 2.75-3.78 2.62-0.39 1.95-0.77 3.05-2.57 4.82-1.8-1.77-2.18-2.87-2.57-4.82-2.01 0.13-3.47-1.72-3.78-2.62 2.42-0.96 3.72-2.68 3.83-4.83l-8.614 0.01-0.002-4.18 4.156 0.01c0-2.12-1.16-4.22-2.365-4.87-0.747-0.55-2.345-0.8-3.761-0.16-1.851 0.96-1.93 3.67-1.005 4.91-8.745-1.46-7.877-9.06-4.898-11.82 2.407-2.23 5.032-2.58 7.057-1.88 4.602 1.49 7.692 6.43 7.842 13.82h2.41c0-6.72-1.3-8.86-4.68-17.29-1.71-3.99-0.68-8.92 2.36-13.45 1.09-1.63 2.45-3.1 4.02-4.67z"/><text id="text1342" style="text-anchor:middle;text-align:center" line-height="125.00000%" font-size="146px" y="202.79219" x="108.49201" font-family="Roadgeek 2005 Series EM" xml:space="preserve" fill="#ffffff"><tspan id="tspan1344" style="text-anchor:middle;text-align:center" font-size="146px" line-height="125.00000%" y="202.79219" x="108.49201" font-family="&apos;Roadgeek 2014 Series EM&apos;">***NUMBER***</tspan></text>
+<path id="path16" d="m21.307 24.879s123.08-8.782 175.22-5.516l0.036-2.119s-134.04-0.939-175.22 5.518l-0.043 2.117z" fill="#fff"/><g id="g18" fill="#fff"><polygon id="polygon20" points="130.81 40.479 19 67.805 45.326 67.805"/><polygon id="polygon22" points="53.102 67.805 75.16 67.805 137.15 38.93 132.87 39.976"/></g><g id="g24" fill="#fff"><polygon id="polygon26" points="139.46 39.214 105.89 67.805 138.72 67.805"/><polygon id="polygon28" points="142.01 67.805 175.03 67.805 139.8 38.93 139.61 39.09"/></g><g fill="#fff"><rect id="rect30" height="6.5" width="1.25" y="22.544" x="38"/><rect id="rect32" height="6.5" width="1.25" y="21.108" x="67.875"/><rect id="rect34" height="6.5" width="1.25" y="19.294" x="97.25"/><rect id="rect36" height="6.5" width="1.25" y="18.858" x="127.75"/><rect id="rect38" height="6.5" width="1.25" y="18.379" x="156.07"/><rect id="rect40" height="6.5" width="1.25" y="18.379" x="186.28"/><path id="path42" d="m21.384 29.923v30.199h10.861l26.226-4.238 6.357-23.046 23.577-1.325 7.417 30.729h9.536l8.213-5.562 7.682-27.285h39.735l8.213 27.814 10.595 6.357h13.511l3.179-39.205c0.01-0.001-145.15-0.265-175.09 5.562zm77.116 25.371l-5.5-24.25h3.25l5.75 19.75-3.5 4.5zm7.39-11.332l-4.555-13.334h10.333l-5.78 13.334z"/></g></svg>
diff --git a/shields/template_canqca_wide.svg b/shields/template_canqca_wide.svg
new file mode 100644
index 00000000..6828ca2f
--- /dev/null
+++ b/shields/template_canqca_wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="Layer_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="289.02" width="217" version="1.0" xml:space="preserve" y="0" x="0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 217 289.0195313"><metadata id="metadata16"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g5"><path id="path7" fill-rule="evenodd" fill="#fff" d="m216.5 0.5v168c0 90-108 120-108 120s-108-30-108-120v-168h216z"/><path id="path9" d="m216.5 0.5v168c0 90-108 120-108 120s-108-30-108-120v-168h216z" stroke="#000" stroke-miterlimit="3.8637" fill="none"/></g><path id="path11" fill-rule="evenodd" fill="#003f87" d="m210.5 168.5c0 78.97-88.87 109.64-102 113.74-13.133-4.1-102-34.77-102-113.74v-84h204v84z"/><g id="g13" fill="#af1e2d"><polygon id="polygon15" points="6.5 6.5 210.5 6.5 210.5 78.5 6.5 78.5"/></g><path id="path19" fill-rule="evenodd" fill="#fff" d="m108.5 217.46c1.57 1.57 2.93 3.04 4.02 4.67 3.04 4.53 4.07 9.46 2.37 13.45-3.39 8.43-4.69 10.57-4.69 17.29h2.41c0.15-7.39 3.24-12.33 7.84-13.82 2.03-0.7 4.65-0.35 7.06 1.88 2.98 2.76 3.85 10.36-4.9 11.82 0.93-1.24 0.85-3.95-1-4.91-1.42-0.64-3.02-0.39-3.76 0.16-1.21 0.65-2.37 2.75-2.37 4.87l4.16-0.01v4.18l-8.62-0.01c0.11 2.15 1.41 3.87 3.83 4.83-0.31 0.9-1.77 2.75-3.78 2.62-0.39 1.95-0.77 3.05-2.57 4.82-1.8-1.77-2.18-2.87-2.57-4.82-2.01 0.13-3.47-1.72-3.78-2.62 2.42-0.96 3.72-2.68 3.83-4.83l-8.614 0.01-0.002-4.18 4.156 0.01c0-2.12-1.16-4.22-2.365-4.87-0.747-0.55-2.345-0.8-3.761-0.16-1.851 0.96-1.93 3.67-1.005 4.91-8.745-1.46-7.877-9.06-4.898-11.82 2.407-2.23 5.032-2.58 7.057-1.88 4.602 1.49 7.692 6.43 7.842 13.82h2.41c0-6.72-1.3-8.86-4.68-17.29-1.71-3.99-0.68-8.92 2.36-13.45 1.09-1.63 2.45-3.1 4.02-4.67z"/><text id="text1342" style="text-anchor:middle;text-align:center" line-height="125.00000%" font-size="146px" y="202.79219" x="108.49201" font-family="Roadgeek 2005 Series EM" xml:space="preserve" fill="#ffffff"><tspan id="tspan1344" style="text-anchor:middle;text-align:center" font-size="146px" line-height="125.00000%" y="202.79219" x="108.49201" font-family="&apos;Roadgeek 2014 Series D&apos;">***NUMBER***</tspan></text>
+<path id="path16" d="m21.307 24.879s123.08-8.782 175.22-5.516l0.036-2.119s-134.04-0.939-175.22 5.518l-0.043 2.117z" fill="#fff"/><g id="g18" fill="#fff"><polygon id="polygon20" points="130.81 40.479 19 67.805 45.326 67.805"/><polygon id="polygon22" points="53.102 67.805 75.16 67.805 137.15 38.93 132.87 39.976"/></g><g id="g24" fill="#fff"><polygon id="polygon26" points="139.46 39.214 105.89 67.805 138.72 67.805"/><polygon id="polygon28" points="142.01 67.805 175.03 67.805 139.8 38.93 139.61 39.09"/></g><g fill="#fff"><rect id="rect30" height="6.5" width="1.25" y="22.544" x="38"/><rect id="rect32" height="6.5" width="1.25" y="21.108" x="67.875"/><rect id="rect34" height="6.5" width="1.25" y="19.294" x="97.25"/><rect id="rect36" height="6.5" width="1.25" y="18.858" x="127.75"/><rect id="rect38" height="6.5" width="1.25" y="18.379" x="156.07"/><rect id="rect40" height="6.5" width="1.25" y="18.379" x="186.28"/><path id="path42" d="m21.384 29.923v30.199h10.861l26.226-4.238 6.357-23.046 23.577-1.325 7.417 30.729h9.536l8.213-5.562 7.682-27.285h39.735l8.213 27.814 10.595 6.357h13.511l3.179-39.205c0.01-0.001-145.15-0.265-175.09 5.562zm77.116 25.371l-5.5-24.25h3.25l5.75 19.75-3.5 4.5zm7.39-11.332l-4.555-13.334h10.333l-5.78 13.334z"/></g></svg>
diff --git a/shields/template_canqca_wide3.svg b/shields/template_canqca_wide3.svg
new file mode 100644
index 00000000..93b23b75
--- /dev/null
+++ b/shields/template_canqca_wide3.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="Layer_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="289.02" width="217" version="1.0" xml:space="preserve" y="0" x="0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 217 289.0195313"><metadata id="metadata16"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g id="g5"><path id="path7" fill-rule="evenodd" fill="#fff" d="m216.5 0.5v168c0 90-108 120-108 120s-108-30-108-120v-168h216z"/><path id="path9" d="m216.5 0.5v168c0 90-108 120-108 120s-108-30-108-120v-168h216z" stroke="#000" stroke-miterlimit="3.8637" fill="none"/></g><path id="path11" fill-rule="evenodd" fill="#003f87" d="m210.5 168.5c0 78.97-88.87 109.64-102 113.74-13.133-4.1-102-34.77-102-113.74v-84h204v84z"/><g id="g13" fill="#af1e2d"><polygon id="polygon15" points="6.5 6.5 210.5 6.5 210.5 78.5 6.5 78.5"/></g><path id="path19" fill-rule="evenodd" fill="#fff" d="m108.5 217.46c1.57 1.57 2.93 3.04 4.02 4.67 3.04 4.53 4.07 9.46 2.37 13.45-3.39 8.43-4.69 10.57-4.69 17.29h2.41c0.15-7.39 3.24-12.33 7.84-13.82 2.03-0.7 4.65-0.35 7.06 1.88 2.98 2.76 3.85 10.36-4.9 11.82 0.93-1.24 0.85-3.95-1-4.91-1.42-0.64-3.02-0.39-3.76 0.16-1.21 0.65-2.37 2.75-2.37 4.87l4.16-0.01v4.18l-8.62-0.01c0.11 2.15 1.41 3.87 3.83 4.83-0.31 0.9-1.77 2.75-3.78 2.62-0.39 1.95-0.77 3.05-2.57 4.82-1.8-1.77-2.18-2.87-2.57-4.82-2.01 0.13-3.47-1.72-3.78-2.62 2.42-0.96 3.72-2.68 3.83-4.83l-8.614 0.01-0.002-4.18 4.156 0.01c0-2.12-1.16-4.22-2.365-4.87-0.747-0.55-2.345-0.8-3.761-0.16-1.851 0.96-1.93 3.67-1.005 4.91-8.745-1.46-7.877-9.06-4.898-11.82 2.407-2.23 5.032-2.58 7.057-1.88 4.602 1.49 7.692 6.43 7.842 13.82h2.41c0-6.72-1.3-8.86-4.68-17.29-1.71-3.99-0.68-8.92 2.36-13.45 1.09-1.63 2.45-3.1 4.02-4.67z"/><text id="text1342" style="text-anchor:middle;text-align:center" line-height="125.00000%" font-size="146px" y="202.79219" x="108.49201" font-family="Roadgeek 2005 Series EM" xml:space="preserve" fill="#ffffff"><tspan id="tspan1344" style="text-anchor:middle;text-align:center" font-size="146px" line-height="125.00000%" y="202.79219" x="108.49201" font-family="&apos;Roadgeek 2014 Series B&apos;">***NUMBER***</tspan></text>
+<path id="path16" d="m21.307 24.879s123.08-8.782 175.22-5.516l0.036-2.119s-134.04-0.939-175.22 5.518l-0.043 2.117z" fill="#fff"/><g id="g18" fill="#fff"><polygon id="polygon20" points="130.81 40.479 19 67.805 45.326 67.805"/><polygon id="polygon22" points="53.102 67.805 75.16 67.805 137.15 38.93 132.87 39.976"/></g><g id="g24" fill="#fff"><polygon id="polygon26" points="139.46 39.214 105.89 67.805 138.72 67.805"/><polygon id="polygon28" points="142.01 67.805 175.03 67.805 139.8 38.93 139.61 39.09"/></g><g fill="#fff"><rect id="rect30" height="6.5" width="1.25" y="22.544" x="38"/><rect id="rect32" height="6.5" width="1.25" y="21.108" x="67.875"/><rect id="rect34" height="6.5" width="1.25" y="19.294" x="97.25"/><rect id="rect36" height="6.5" width="1.25" y="18.858" x="127.75"/><rect id="rect38" height="6.5" width="1.25" y="18.379" x="156.07"/><rect id="rect40" height="6.5" width="1.25" y="18.379" x="186.28"/><path id="path42" d="m21.384 29.923v30.199h10.861l26.226-4.238 6.357-23.046 23.577-1.325 7.417 30.729h9.536l8.213-5.562 7.682-27.285h39.735l8.213 27.814 10.595 6.357h13.511l3.179-39.205c0.01-0.001-145.15-0.265-175.09 5.562zm77.116 25.371l-5.5-24.25h3.25l5.75 19.75-3.5 4.5zm7.39-11.332l-4.555-13.334h10.333l-5.78 13.334z"/></g></svg>
diff --git a/shields/template_cansk.svg b/shields/template_cansk.svg
new file mode 100644
index 00000000..32f52e5c
--- /dev/null
+++ b/shields/template_cansk.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 750" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect id="rect7555-7" rx="29.95" ry="29.96" height="749" width="599" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+ <path id="path5807-2" fill="#003882" d="m300 720-228.31-92.91c-24.941-10.14-41.69-36.74-41.69-60.34v-336.75h540v336.75c0 23.599-16.749 50.196-41.688 60.344l-228.31 92.91z"/>
+ <text id="text3048" style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="365px" line-height="125%" y="545.62" x="300.79062" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#ffffff"><tspan id="tspan3050" y="545.62" x="300.79062" style="text-anchor:middle;text-align:center" fill="#ffffff">***NUMBER***</tspan></text>
+ <path id="rect3294" fill="#003882" d="m30 30h540v180h-540v-180z"/>
+ <g id="g3948" fill="#fff" transform="translate(-1.3853)">
+  <g id="g3903">
+   <path id="path3121" opacity=".6" d="m112.44 127.9 46.714 0.32217 4.8325 52.191-55.09 0.64433z"/>
+   <path id="path3123" opacity=".6" d="m111.15 115.01c4.2059-18.451 12.882-35.959 35.116-50.58l-18.37-11.595c-36.691 12.665-43.005 34.124-47.68 56.057 8.3969-4.5354 19.108-3.0372 30.928 6.1211z"/>
+   <path id="path3125" opacity=".6" d="m113.08 123.71 45.747 0.64433c1.1242-6.6934-2.1164-19.499 33.505-18.041-3.67-17.403-9.56-33.534-25.14-44.132-51.18 12.079-50.94 55.582-54.12 61.532z"/>
+  </g>
+  <g id="g3903-1" transform="translate(165.11)">
+   <path id="path3121-5" opacity=".6" d="m112.44 127.9 46.714 0.32217 4.8325 52.191-55.09 0.64433z"/>
+   <path id="path3123-1" opacity=".6" d="m111.15 115.01c4.2059-18.451 12.882-35.959 35.116-50.58l-18.37-11.595c-36.691 12.665-43.005 34.124-47.68 56.057 8.3969-4.5354 19.108-3.0372 30.928 6.1211z"/>
+   <path id="path3125-0" opacity=".6" d="m113.08 123.71 45.747 0.64433c1.1242-6.6934-2.1164-19.499 33.505-18.041-3.67-17.403-9.56-33.534-25.14-44.132-51.18 12.079-50.94 55.582-54.12 61.532z"/>
+  </g>
+  <g id="g3903-9" transform="translate(330.22)">
+   <path id="path3121-7" opacity=".6" d="m112.44 127.9 46.714 0.32217 4.8325 52.191-55.09 0.64433z"/>
+   <path id="path3123-3" opacity=".6" d="m111.15 115.01c4.2059-18.451 12.882-35.959 35.116-50.58l-18.37-11.595c-36.691 12.665-43.005 34.124-47.68 56.057 8.3969-4.5354 19.108-3.0372 30.928 6.1211z"/>
+   <path id="path3125-08" opacity=".6" d="m113.08 123.71 45.747 0.64433c1.1242-6.6934-2.1164-19.499 33.505-18.041-3.67-17.403-9.56-33.534-25.14-44.132-51.18 12.079-50.94 55.582-54.12 61.532z"/>
+  </g>
+ </g>
+</svg>
diff --git a/shields/template_cansk_wide.svg b/shields/template_cansk_wide.svg
new file mode 100644
index 00000000..32f52e5c
--- /dev/null
+++ b/shields/template_cansk_wide.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 750" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect id="rect7555-7" rx="29.95" ry="29.96" height="749" width="599" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+ <path id="path5807-2" fill="#003882" d="m300 720-228.31-92.91c-24.941-10.14-41.69-36.74-41.69-60.34v-336.75h540v336.75c0 23.599-16.749 50.196-41.688 60.344l-228.31 92.91z"/>
+ <text id="text3048" style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="365px" line-height="125%" y="545.62" x="300.79062" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#ffffff"><tspan id="tspan3050" y="545.62" x="300.79062" style="text-anchor:middle;text-align:center" fill="#ffffff">***NUMBER***</tspan></text>
+ <path id="rect3294" fill="#003882" d="m30 30h540v180h-540v-180z"/>
+ <g id="g3948" fill="#fff" transform="translate(-1.3853)">
+  <g id="g3903">
+   <path id="path3121" opacity=".6" d="m112.44 127.9 46.714 0.32217 4.8325 52.191-55.09 0.64433z"/>
+   <path id="path3123" opacity=".6" d="m111.15 115.01c4.2059-18.451 12.882-35.959 35.116-50.58l-18.37-11.595c-36.691 12.665-43.005 34.124-47.68 56.057 8.3969-4.5354 19.108-3.0372 30.928 6.1211z"/>
+   <path id="path3125" opacity=".6" d="m113.08 123.71 45.747 0.64433c1.1242-6.6934-2.1164-19.499 33.505-18.041-3.67-17.403-9.56-33.534-25.14-44.132-51.18 12.079-50.94 55.582-54.12 61.532z"/>
+  </g>
+  <g id="g3903-1" transform="translate(165.11)">
+   <path id="path3121-5" opacity=".6" d="m112.44 127.9 46.714 0.32217 4.8325 52.191-55.09 0.64433z"/>
+   <path id="path3123-1" opacity=".6" d="m111.15 115.01c4.2059-18.451 12.882-35.959 35.116-50.58l-18.37-11.595c-36.691 12.665-43.005 34.124-47.68 56.057 8.3969-4.5354 19.108-3.0372 30.928 6.1211z"/>
+   <path id="path3125-0" opacity=".6" d="m113.08 123.71 45.747 0.64433c1.1242-6.6934-2.1164-19.499 33.505-18.041-3.67-17.403-9.56-33.534-25.14-44.132-51.18 12.079-50.94 55.582-54.12 61.532z"/>
+  </g>
+  <g id="g3903-9" transform="translate(330.22)">
+   <path id="path3121-7" opacity=".6" d="m112.44 127.9 46.714 0.32217 4.8325 52.191-55.09 0.64433z"/>
+   <path id="path3123-3" opacity=".6" d="m111.15 115.01c4.2059-18.451 12.882-35.959 35.116-50.58l-18.37-11.595c-36.691 12.665-43.005 34.124-47.68 56.057 8.3969-4.5354 19.108-3.0372 30.928 6.1211z"/>
+   <path id="path3125-08" opacity=".6" d="m113.08 123.71 45.747 0.64433c1.1242-6.6934-2.1164-19.499 33.505-18.041-3.67-17.403-9.56-33.534-25.14-44.132-51.18 12.079-50.94 55.582-54.12 61.532z"/>
+  </g>
+ </g>
+</svg>
diff --git a/shields/template_canyt1.svg b/shields/template_canyt1.svg
new file mode 100644
index 00000000..65e0f7bc
--- /dev/null
+++ b/shields/template_canyt1.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#ec2302"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3768" d="m331.59 170.59-0.28479 234.88c-0.0243 20 20 15 40 20 3.4926 0.87316 3.4175 9 0 9h-135c-4.1337 0-3.3262-8.1685 0-9 20-5 40 0 40-20v-185c0-4.714-4.448-9.2792-10-10-9.7036-1.2597-22.942 1.333-30.379 1.0913-3.9936-0.12977-8.2928-2.0008-8.7785-5.4022-0.6008-4.207 4.3126-9.1796 8.5534-9.4538 30.392-1.9651 55.727-14.287 84.184-27.911 5.0703-2.4275 11.712-4.172 11.705 1.8007z" fill="#ec2302"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt10.svg b/shields/template_canyt10.svg
new file mode 100644
index 00000000..756c173b
--- /dev/null
+++ b/shields/template_canyt10.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3780" d="m413.61 380.65c-6.4301 16.875-14.324 28.5-25.594 28.046-11.921-0.48085-21.155-10.465-25.546-26.318-7.3495-26.534-10.294-53.983-10-81.279 0.38869-36.03-0.50982-59.169 6.8487-80.803 4.4866-13.19 13.978-27.679 26.852-27.765 13.103-0.0872 22.277 12.499 27.701 27.89 7.4169 21.045 8.8178 45.375 9.144 68.363 0.71406 50.32-0.68962 68.992-9.4058 91.866zm53.165-15.901c5.9353-24.276 9.4297-44.381 8.0387-80.99-0.84162-22.15-4.816-50.185-11.141-64.217-7.0647-15.672-17.118-28.715-28.222-37.248-15.12-11.619-32.629-17.185-49.55-16.891-12.576 0.21824-25.121 6.0752-36.63 13.829-10.998 7.4092-21.873 17.041-30 30.577-8.3074 13.836-14.003 31.494-17.749 49.381-4.8031 22.933-5.2002 54.586-2.2509 73.544 3.7895 24.358 7.4674 37.511 15 52.896 7.8006 15.932 18.308 29.473 30 38.222 10.561 7.9027 22.743 9.9792 34.457 11.538 9.3363 1.2423 18.889 0.91923 28.09-1.8042 11.413-3.3781 20.944-6.4714 32.872-17.806 14.327-13.614 22.8-33.495 27.087-51.028z"/>
+  <path id="path3768" d="m230.37 168.97-0.28479 234.88c-0.0243 20 20 15 40 20 3.4926 0.8732 3.4174 9 0 9h-135c-4.1337 0-3.3262-8.1684 0-9 20-5 40 0 40-20v-185c0-4.714-4.448-9.2792-10-10-9.7036-1.2597-22.942 1.333-30.379 1.0913-3.9936-0.12977-8.2928-2.0008-8.7785-5.4022-0.6008-4.207 4.3126-9.1796 8.5534-9.4538 30.392-1.9651 55.727-14.287 84.184-27.911 5.0703-2.4275 11.712-4.172 11.705 1.8007z"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt11.svg b/shields/template_canyt11.svg
new file mode 100644
index 00000000..463a5c49
--- /dev/null
+++ b/shields/template_canyt11.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#0609a6"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3768" d="m241.59 170.59-0.28479 234.88c-0.0243 20 20 15 40 20 3.4926 0.87316 3.4175 9 0 9h-135c-4.1337 0-3.3262-8.1685 0-9 20-5 40 0 40-20v-185c0-4.714-4.448-9.2792-10-10-9.7036-1.2597-22.942 1.333-30.379 1.0913-3.9936-0.12977-8.2928-2.0008-8.7785-5.4022-0.6008-4.207 4.3126-9.1796 8.5534-9.4538 30.392-1.9651 55.727-14.287 84.184-27.911 5.0703-2.4275 11.712-4.172 11.705 1.8007z" fill="#0609a6"/>
+  <path id="path3757" d="m421.59 170.59-0.28479 234.88c-0.0243 20 20 15 40 20 3.4926 0.87316 3.4175 9 0 9h-135c-4.1337 0-3.3262-8.1685 0-9 20-5 40 0 40-20v-185c0-4.714-4.448-9.2792-10-10-9.7036-1.2597-22.942 1.333-30.379 1.0913-3.9936-0.12977-8.2928-2.0008-8.7785-5.4022-0.6008-4.207 4.3126-9.1796 8.5534-9.4538 30.392-1.9651 55.727-14.287 84.184-27.911 5.0703-2.4275 11.712-4.172 11.705 1.8007z" fill="#0609a6"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt2.svg b/shields/template_canyt2.svg
new file mode 100644
index 00000000..5b34abcf
--- /dev/null
+++ b/shields/template_canyt2.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#f29500"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3786" d="m226.56 437.32h143.93c8.7425 0 18.182-6.1409 22.49-14.078 5.9097-10.889 4.5901-25.98 0-37.541-1.6229-4.0874-4.8099-8.6765-8.9959-9.3852-6.6185-1.1205-11.287 9.3852-17.992 9.3852h-67.469c-3.3526 0-6.8686-6.912-4.4979-9.3852l80.963-84.466c7.1119-7.4196 11.183-17.943 13.494-28.156 2.4114-10.656 2.1102-22.122 0-32.848-2.2958-11.669-6.6114-23.217-13.494-32.848-6.3111-8.8313-15.202-15.844-24.49-21.463-9.0146-5.4534-19.128-9.455-29.486-11.385-13.265-2.4721-27.118-1.9526-40.481 0-10.81 1.5794-21.578 4.6054-31.486 9.3852-8.8319 4.261-17.408 9.715-24.289 16.893-6.8805 7.1783-12.469 15.961-16.193 25.34-2.9256 7.3687-4.498 15.487-4.498 23.463 0 7.9759 0.42183 16.715 4.498 23.463 3.997 6.6166 10.88 11.605 17.992 14.078 7.1119 2.4732 15.315 2.2664 22.49 0 5.1739-1.6343 10.213-4.9032 13.494-9.3852 2.8779-3.931 4.5597-9.1318 4.4979-14.078-0.0831-6.6547-5.7727-12.161-6.5228-18.77-0.7097-6.2526-0.0448-12.856 2.0249-18.77 1.8538-5.2978 4.9432-10.345 8.9959-14.078 5.0267-4.6295 11.441-7.8917 17.992-9.3852 6.5804-1.5002 13.936-1.8916 20.196 0.70303 7.2658 3.0117 13.183 9.4504 17.587 16.19 3.9536 6.0514 5.9788 13.435 7.1967 20.647 0.98856 5.8538 1.2556 12.034 0 17.832-1.5371 7.0975-3.4094 13.627-8.9959 19.709l-103.45 112.62c-6.0489 6.5851-11.16 14.673-13.494 23.463-1.6009 6.0298-2.682 13.174 0 18.77 3.3526 6.9953 10.495 14.078 17.992 14.078z" stroke="#000" stroke-width=".91885px" fill="#f29500"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt3.svg b/shields/template_canyt3.svg
new file mode 100644
index 00000000..83d74a1c
--- /dev/null
+++ b/shields/template_canyt3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#a6293b"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3769" d="m215.33 388.64c0.39908-30.507 49.069-27.943 49.157-0.31574 0.0712 22.237 10.198 31.7 35.949 30.944 16.959-0.49777 28.898-28.121 28.942-54.159 0.0535-31.841-16.463-58.488-45.595-58.471-7.998 0.005-18.022-5.0585-18.56-13.038-0.4141-6.131 5.5737-14.913 16.664-15.655 17.527-1.1719 34.619-27.418 37.433-48.709 2.7347-20.685-6.9154-43.399-24.068-43.955-11.501-0.37287-21.052 11.598-21.597 26.931-1.3103 36.902-48.173 35.492-48.13-2.8051 0.026-23.166 34.3-51.103 72.743-51.748 17.46-0.29307 37.834 1.2164 56.686 18.505 20.05 21.393 16.012 61.166 8.3757 80.748-5.5528 14.239-16.388 23.084-16.512 31.554-0.135 9.2759 14.379 14.488 24.829 26.112 15.904 17.691 14.687 35.453 13.206 58.224-1.2408 19.074-14.594 38.65-30.482 52.324-20.076 17.278-35.186 18.841-66.119 18.09-32.54-0.79013-73.261-28.779-72.924-54.578z" fill="#a6293b"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt37.svg b/shields/template_canyt37.svg
new file mode 100644
index 00000000..71899dbe
--- /dev/null
+++ b/shields/template_canyt37.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#a6293b"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3769" d="m121.29 388.64c0.39908-30.507 49.069-27.943 49.157-0.31574 0.0712 22.237 10.198 31.7 35.949 30.944 16.959-0.49777 28.898-28.121 28.942-54.159 0.0535-31.841-16.463-58.488-45.595-58.471-7.998 0.005-18.022-5.0585-18.56-13.038-0.4141-6.131 5.5737-14.913 16.664-15.655 17.527-1.1719 34.619-27.418 37.433-48.709 2.7347-20.685-6.9154-43.399-24.068-43.955-11.501-0.37287-21.052 11.598-21.597 26.931-1.3103 36.902-48.173 35.492-48.13-2.8051 0.026-23.166 34.3-51.103 72.743-51.748 17.46-0.29307 37.834 1.2164 56.686 18.505 20.05 21.393 16.012 61.166 8.3757 80.748-5.5528 14.239-16.388 23.084-16.512 31.554-0.135 9.2759 14.379 14.488 24.829 26.112 15.904 17.691 14.687 35.453 13.206 58.224-1.2408 19.074-14.594 38.65-30.482 52.324-20.076 17.278-35.186 18.841-66.119 18.09-32.54-0.79013-73.261-28.779-72.924-54.578z" fill="#a6293b"/>
+  <path id="path3771" d="m343.35 411.77c24.99-70.997 43.921-118.64 78.579-196.74 4.0958-9.2301 1.7716-13.255-3.5787-13.255h-60c-7.1801 0-10.054 2.5804-15 10-10 15-25 21.171-25 0v-30c0-13.269 6.9561-20 25-20h110c20 0 30.253 10.087 25 25-30.708 87.173-62.251 180.1-75 230-2.7674 10.832-5.5149 20-18 20h-32c-10.792 0-16.297-7.1102-10-25z" fill="#a6293b"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt4.svg b/shields/template_canyt4.svg
new file mode 100644
index 00000000..500a3cfe
--- /dev/null
+++ b/shields/template_canyt4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#a6293b"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3789" d="m239.06 342.27c-3.4443 0-6.0715-4.487-4.656-8.8514 11.262-34.726 27.342-68.119 54.501-107.07 2.5498-3.6573 8.4712-2.299 8.4712 3.0187v112.91zm58.316 30.162v35.381c0 7.4143-13.222 6.4158-18.443 9.4179-6.5283 4.1445-7.6793 19.577 3.6561 19.577h89.427c8.7677 0 9.9345-15.976 2.9421-19.258-5.2332-2.4566-15.457-1.842-15.457-10.055v-35.063h30.28c15.008 0 14.372-30.162 0.039-30.162h-30.319v-153.06c0-25.23-41.207-31.49-55.597-18.232-46.156 42.526-84.559 104.22-102.87 176.25-3.2844 12.92 3.1356 25.21 18.007 25.21z" fill="#a6293b"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt5.svg b/shields/template_canyt5.svg
new file mode 100644
index 00000000..e47f11b4
--- /dev/null
+++ b/shields/template_canyt5.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#0609a6"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3780" d="m251.66 307.94c15-5 26.3-11.098 40-10 12.652 1.0138 26.77 5.3365 35 15 8.911 10.463 10 26.256 10 40s-2.2651 28.64-10 40c-8.0689 11.851-20.766 23.285-35 25-8.9109 1.0733-18.986-3.3376-25-10-8.1302-9.0068-2.2511-25.663-10-35-4.7601-5.7356-12.553-9.6902-20-10-8.9675-0.373-19.968 2.5679-25 10-6.5407 9.6608-5.6556 24.796 0 35 7.6222 13.752 25.185 19.735 40 25 12.661 4.4998 26.572 5.4906 40 5 16.985-0.62059 34.297-3.4956 50-10 11.104-4.5993 21.873-11.146 30-20 8.3074-9.0501 14.003-20.599 17.749-32.299 4.8032-15 6.1007-33.903 2.2509-48.103-4.285-15.806-7.4674-24.535-15-34.598-7.8006-10.421-18.168-19.574-30-25-9.2153-4.2257-19.862-5-30-5s-20.237 2.2683-30 5c-8.6433 2.4184-16.032 10.373-25 10-3.7236-0.15488-10-1.2732-10-5v-45c0-4.714 5.286-10 10-10h60c22.669 0 39.399-15.882 55-40 5.1338-7.9362-1.499-14.827-10-15-4.7238-0.0962-22.866 10-35 10h-95c-4.714 0-10 5-10 10v115c0 25 16.485 12.838 25 10z" fill="#0609a6"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt6.svg b/shields/template_canyt6.svg
new file mode 100644
index 00000000..ed6d8422
--- /dev/null
+++ b/shields/template_canyt6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#0a9875"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3780" d="m275.19 313.14c5.9401-11.154 14.324-23.353 30.096-23.055 11.926 0.22483 20.255 12.734 24.646 23.103 7.3495 17.355 7.5496 28.565 7.2989 43.151-0.247 14.374-1.2909 28.101-8.6495 42.251-4.4866 8.6276-12.642 18.188-22.351 18.749-10.68 0.61765-21.377-7.5862-26.801-17.653-7.4169-13.765-10.088-26.206-10.945-40.004-0.97108-15.644 0.68963-35.248 6.7047-46.543zm-68.29 6.4053c0.1491 18.963 1.0751 37.623 5.9677 55.521 3.8268 13.999 8.6359 20.729 14.961 29.907 7.0647 10.251 17.118 18.782 28.222 24.363 15.12 7.5999 32.629 11.24 49.55 11.048 12.576-0.14275 25.121-3.9737 36.63-9.045 10.998-4.8462 21.873-11.146 30-20 8.3074-9.0501 14.003-20.599 17.749-32.299 4.8031-15 5.2002-35.704 2.2509-48.103-3.7895-15.932-7.4674-24.535-15-34.598-7.8006-10.421-18.168-19.574-30-25-9.2153-4.2257-19.862-4.923-30-5-6.8939-0.0523-13.807 1.2466-20.45 3.09-7.6613 2.126-14.452 6.7539-22.048 9.0996-2.6546 0.81968-4.0384 1.5371-4.0384-2.1897 0-15 7.2834-31.307 13.984-43.749 4.7187-8.7623 16.163-20.035 26.894-28.759 11.365-9.239 21.425-13.367 33.261-16.553 17.149-4.6168 29.849-7.2871 32.081-11.669 4.2898-8.4224-1.499-14.827-10-15-4.7238-0.0962-23.999 0.61092-35.955 2.6785-12.885 2.2283-34.265 12.739-43.749 18.463-9.7101 5.8605-29.139 20.005-40.559 33.238-13.76 15.944-25.413 34.357-32.469 54.2-5.6824 15.98-7.388 36.583-7.2797 50.357z" fill="#0a9875"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt7.svg b/shields/template_canyt7.svg
new file mode 100644
index 00000000..3e8e753b
--- /dev/null
+++ b/shields/template_canyt7.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#a6293b"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3771" d="m244.82 413c24.99-70.997 43.921-118.64 78.579-196.74 4.09-9.23 1.77-13.26-3.58-13.26h-60c-7.1801 0-10.054 2.5804-15 10-10 15-25 21.171-25 0v-30c0-13.269 6.9561-20 25-20h110c20 0 30.253 10.087 25 25-30.708 87.173-62.251 180.1-75 230-2.7674 10.832-5.5149 20-18 20h-32c-10.792 0-16.297-7.1102-10-25z" fill="#a6293b"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt8.svg b/shields/template_canyt8.svg
new file mode 100644
index 00000000..d0f2a024
--- /dev/null
+++ b/shields/template_canyt8.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375" fill="#a6293b"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3769" d="m217.81 385.67c0.39908-30.507 49.069-27.943 49.157-0.31574 0.0712 22.237 10.198 31.7 35.949 30.944 16.959-0.49777 28.898-28.121 28.942-54.159 0.0535-31.841-21.075-55.893-28.874-55.876-7.998 0.0178-34.742-7.6531-35.281-15.633-0.4141-6.131 22.27-24.285 33.385-24.303 11.472-0.0188 17.898-18.769 20.713-40.06 2.7347-20.685-6.9154-43.399-24.068-43.955-11.501-0.37287-21.052 11.598-21.597 26.931-1.3103 36.902-48.173 35.492-48.13-2.8051 0.026-23.166 34.3-51.103 72.743-51.748 17.46-0.29307 37.834 1.2164 56.686 18.505 20.05 21.393 16.012 61.166 8.3757 80.748-5.5528 14.239-16.388 23.084-16.512 31.554-0.135 9.2759 14.379 14.488 24.829 26.112 15.904 17.691 14.687 35.453 13.206 58.224-1.2408 19.074-14.594 38.65-30.482 52.324-20.076 17.278-35.186 18.841-66.119 18.09-32.54-0.79013-73.261-28.779-72.924-54.578z" fill="#a6293b"/>
+  <path id="path3769-3" d="m380.03 385.67c-0.39908-30.507-49.069-27.943-49.157-0.31574-0.0712 22.237-10.198 31.7-35.949 30.944-16.959-0.49777-28.898-28.121-28.942-54.159-0.0535-31.841 25.688-55.605 34.64-55.876 7.9943-0.24192 28.977-7.6531 29.516-15.633 0.4141-6.131-19.387-24.287-30.502-24.303-12.914-0.0188-20.781-18.769-23.596-40.06-2.7347-20.685 6.9154-43.399 24.068-43.955 11.501-0.37287 21.052 11.598 21.597 26.931 1.3103 36.902 48.173 35.492 48.13-2.8051-0.026-23.166-34.3-51.103-72.743-51.748-17.46-0.29307-37.834 1.2164-56.686 18.505-20.05 21.393-16.012 61.166-8.3757 80.748 5.5528 14.239 16.388 23.084 16.512 31.554 0.135 9.2759-14.379 14.488-24.829 26.112-15.904 17.691-14.687 35.453-13.206 58.224 1.2408 19.074 14.594 38.65 30.482 52.324 20.076 17.278 35.186 18.841 66.119 18.09 32.54-0.79013 73.261-28.779 72.924-54.578z" fill="#a6293b"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_canyt9.svg b/shields/template_canyt9.svg
new file mode 100644
index 00000000..09542232
--- /dev/null
+++ b/shields/template_canyt9.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3607" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="g3778">
+  <rect id="rect3617" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="0.5" x="0.5" fill="#fff"/>
+  <rect id="rect4130" rx="28.125" ry="28.125" height="581.25" width="581.25" y="10.375" x="9.375"/>
+  <rect id="rect3776" style="color:#000000" rx="12.5" ry="12.5" height="550" width="550" y="26" x="25" fill="#fff"/>
+  <path id="path3780" d="m325.81 287.86c-5.9401 11.154-14.324 23.353-30.096 23.055-11.926-0.22483-20.255-12.734-24.646-23.103-7.3495-17.355-7.5496-28.565-7.2989-43.151 0.247-14.374 1.2909-28.101 8.6495-42.251 4.4866-8.6276 12.642-18.188 22.351-18.749 10.68-0.61765 21.377 7.5862 26.801 17.653 7.4169 13.765 10.088 26.206 10.945 40.004 0.97108 15.644-0.68963 35.248-6.7047 46.543zm68.29-6.4053c-0.1491-18.963-1.0751-37.623-5.9677-55.521-3.8268-13.999-8.6359-20.729-14.961-29.907-7.0647-10.251-17.118-18.782-28.222-24.363-15.12-7.5999-32.629-11.24-49.55-11.048-12.576 0.14275-25.121 3.9737-36.63 9.045-10.998 4.8462-21.873 11.146-30 20-8.3074 9.0501-14.003 20.599-17.749 32.299-4.8031 15-5.2002 35.704-2.2509 48.103 3.7895 15.932 7.4674 24.535 15 34.598 7.8006 10.421 18.168 19.574 30 25 9.2153 4.2257 19.862 4.923 30 5 6.8939 0.0523 13.807-1.2466 20.45-3.09 7.6613-2.126 14.452-6.7539 22.048-9.0996 2.6546-0.81968 4.0384-1.5371 4.0384 2.1897 0 15-7.2834 31.307-13.984 43.749-4.7187 8.7623-16.163 20.035-26.894 28.759-11.365 9.239-21.425 13.367-33.261 16.553-17.149 4.6168-29.849 7.2871-32.081 11.669-4.2898 8.4224 1.499 14.827 10 15 4.7238 0.0962 23.999-0.61092 35.955-2.6785 12.885-2.2283 34.265-12.739 43.749-18.463 9.7101-5.8605 29.139-20.005 40.559-33.238 13.76-15.944 25.413-34.357 32.469-54.2 5.6824-15.98 7.388-36.583 7.2797-50.357z"/>
+ </g>
+ <text id="text4140" style="text-anchor:middle;text-align:center" font-family="Roadgeek 2005 Series D" xml:space="preserve" font-size="12px" line-height="100%" stroke="#000000" y="93" x="299" stroke-width="1px" fill="none"><tspan id="tspan4142" y="93" x="299"/></text>
+</svg>
diff --git a/shields/template_czed.svg b/shields/template_czed.svg
new file mode 100644
index 00000000..28f3ee4a
--- /dev/null
+++ b/shields/template_czed.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="10" ry="10" height="192" width="320" y="0" x="0" fill="#cd151d"/>
+    <rect rx="10" ry="10" height="184" width="312" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="172" width="300" y="10.25" x="10.25" fill="#cd151d"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="150" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_czei.svg b/shields/template_czei.svg
new file mode 100644
index 00000000..c2fd8d4e
--- /dev/null
+++ b/shields/template_czei.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="10" ry="10" height="192" width="320" y="0" x="0" fill="#01498e"/>
+    <rect rx="10" ry="10" height="184" width="312" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="172" width="300" y="10.25" x="10.25" fill="#01498e"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="150" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_czeii.svg b/shields/template_czeii.svg
new file mode 100644
index 00000000..c2fd8d4e
--- /dev/null
+++ b/shields/template_czeii.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="10" ry="10" height="192" width="320" y="0" x="0" fill="#01498e"/>
+    <rect rx="10" ry="10" height="184" width="312" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="172" width="300" y="10.25" x="10.25" fill="#01498e"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="150" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_deul2.svg b/shields/template_deul2.svg
new file mode 100644
index 00000000..82da1bf0
--- /dev/null
+++ b/shields/template_deul2.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="120px" version="1.1" viewBox="0 0 120 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="120" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="112" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+       <tspan y="100" x="60">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_deul3.svg b/shields/template_deul3.svg
new file mode 100644
index 00000000..3ca252b3
--- /dev/null
+++ b/shields/template_deul3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="200px" version="1.1" viewBox="0 0 200 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="200" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="192" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+       <tspan y="100" x="100">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_deul4.svg b/shields/template_deul4.svg
new file mode 100644
index 00000000..b4fd24e3
--- /dev/null
+++ b/shields/template_deul4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="245px" version="1.1" viewBox="0 0 245 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="245" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="237" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+       <tspan y="100" x="122">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_deul5.svg b/shields/template_deul5.svg
new file mode 100644
index 00000000..bd59ab92
--- /dev/null
+++ b/shields/template_deul5.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="290px" version="1.1" viewBox="0 0 290 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="290" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="282" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+       <tspan y="100" x="145">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_deul6.svg b/shields/template_deul6.svg
new file mode 100644
index 00000000..49738a9b
--- /dev/null
+++ b/shields/template_deul6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="330px" version="1.1" viewBox="0 0 330 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="330" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="322" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+       <tspan y="100" x="165">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_dnkpr.svg b/shields/template_dnkpr.svg
new file mode 100644
index 00000000..aeda929e
--- /dev/null
+++ b/shields/template_dnkpr.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="120px" version="1.1" viewBox="0 0 120 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="120" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="112" y="4.25" x="4.25" fill="#ffd610"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="60">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_dnkpr_wide.svg b/shields/template_dnkpr_wide.svg
new file mode 100644
index 00000000..62316642
--- /dev/null
+++ b/shields/template_dnkpr_wide.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="160px" version="1.1" viewBox="0 0 160 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="160" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="152" y="4.25" x="4.25" fill="#ffd610"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_dnksr.svg b/shields/template_dnksr.svg
new file mode 100644
index 00000000..5e6c76b2
--- /dev/null
+++ b/shields/template_dnksr.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="200px" version="1.1" viewBox="0 0 200 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="200" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="192" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="100">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espa.svg b/shields/template_espa.svg
new file mode 100644
index 00000000..64c4775d
--- /dev/null
+++ b/shields/template_espa.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="260px" height="135px" version="1.1" viewBox="0 0 260 135">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="260" height="135" x="0" y="0" fill="#00309a"/>
+    <rect rx="10" ry="10" width="252" height="127" x="4.25" y="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="240" height="115" x="10.25" y="10.25" fill="#00309a"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="130">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espa_wide3.svg b/shields/template_espa_wide3.svg
new file mode 100644
index 00000000..7461186d
--- /dev/null
+++ b/shields/template_espa_wide3.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="320px" height="135px" version="1.1" viewBox="0 0 320 135">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="320" height="135" x="0" y="0" fill="#00309a"/>
+    <rect rx="10" ry="10" width="312" height="127" x="4.25" y="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="300" height="115" x="10.25" y="10.25" fill="#00309a"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espa_wide4.svg b/shields/template_espa_wide4.svg
new file mode 100644
index 00000000..fabec373
--- /dev/null
+++ b/shields/template_espa_wide4.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="380px" height="135px" version="1.1" viewBox="0 0 380 135">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="380" height="135" x="0" y="0" fill="#00309a"/>
+    <rect rx="10" ry="10" width="372" height="127" x="4.25" y="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="360" height="115" x="10.25" y="10.25" fill="#00309a"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="190">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espa_wide5.svg b/shields/template_espa_wide5.svg
new file mode 100644
index 00000000..8c00c5a2
--- /dev/null
+++ b/shields/template_espa_wide5.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="440px" height="135px" version="1.1" viewBox="0 0 440 135">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="440" height="135" x="0" y="0" fill="#00309a"/>
+    <rect rx="10" ry="10" width="432" height="127" x="4.25" y="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="420" height="115" x="10.25" y="10.25" fill="#00309a"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="220">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espn_wide3.svg b/shields/template_espn_wide3.svg
new file mode 100644
index 00000000..33943a3d
--- /dev/null
+++ b/shields/template_espn_wide3.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ff0000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espn_wide4.svg b/shields/template_espn_wide4.svg
new file mode 100644
index 00000000..928afa1e
--- /dev/null
+++ b/shields/template_espn_wide4.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" version="1.1" viewBox="0 0 250 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="250" height="100" x="0" y="0" fill="#ff0000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="125" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espn_wide5.svg b/shields/template_espn_wide5.svg
new file mode 100644
index 00000000..46cf175a
--- /dev/null
+++ b/shields/template_espn_wide5.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300px" height="100px" version="1.1" viewBox="0 0 300 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="300" height="100" x="0" y="0" fill="#ff0000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="150" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_espn_wide6.svg b/shields/template_espn_wide6.svg
new file mode 100644
index 00000000..8f1e5ee4
--- /dev/null
+++ b/shields/template_espn_wide6.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350px" height="100px" version="1.1" viewBox="0 0 350 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="350" height="100" x="0" y="0" fill="#ff0000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="175" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_estp.svg b/shields/template_estp.svg
new file mode 100644
index 00000000..88f36ddf
--- /dev/null
+++ b/shields/template_estp.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="240px" version="1.1" viewBox="0 0 240 192">
+  <g fill-rule="evenodd">
+    <rect rx="10" ry="10" height="192" width="240" y="0" x="0" fill="#ef2b2f"/>
+    <rect rx="10" ry="10" height="184" width="232" y="2" x="2" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="172" width="220" y="8" x="8" fill="#ef2b2f"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="150" x="118">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_estt.svg b/shields/template_estt.svg
new file mode 100644
index 00000000..b2f8a7d0
--- /dev/null
+++ b/shields/template_estt.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="200px" version="1.1" viewBox="0 0 200 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="200" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="192" y="4.25" x="4.25" fill="#f8e415"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="100">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_finkt.svg b/shields/template_finkt.svg
new file mode 100644
index 00000000..5c227496
--- /dev/null
+++ b/shields/template_finkt.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="120px" version="1.1" viewBox="0 0 120 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="120" y="0" x="0" fill="#ffd90f"/>
+    <rect rx="10" ry="10" height="112" width="112" y="4.25" x="4.25" fill="#000000"/>
+    <rect rx="10" ry="10" height="100" width="100" y="10.25" x="10.25" fill="#ffd90f"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000000">
+       <tspan y="94" x="60">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_finvt.svg b/shields/template_finvt.svg
new file mode 100644
index 00000000..96c873ed
--- /dev/null
+++ b/shields/template_finvt.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="160px" version="1.1" viewBox="0 0 160 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="160" y="0" x="0" fill="#ff163c"/>
+    <rect rx="10" ry="10" height="112" width="152" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="100" width="140" y="10.25" x="10.25" fill="#ff163c"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_finvt_wide.svg b/shields/template_finvt_wide.svg
new file mode 100644
index 00000000..96c873ed
--- /dev/null
+++ b/shields/template_finvt_wide.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="160px" version="1.1" viewBox="0 0 160 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="160" y="0" x="0" fill="#ff163c"/>
+    <rect rx="10" ry="10" height="112" width="152" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="100" width="140" y="10.25" x="10.25" fill="#ff163c"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fraa_wide3.svg b/shields/template_fraa_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_fraa_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fraa_wide4.svg b/shields/template_fraa_wide4.svg
new file mode 100644
index 00000000..7d92eadd
--- /dev/null
+++ b/shields/template_fraa_wide4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" version="1.1" viewBox="0 0 250 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="250" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="250" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="125" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fraa_wide5.svg b/shields/template_fraa_wide5.svg
new file mode 100644
index 00000000..0d905baf
--- /dev/null
+++ b/shields/template_fraa_wide5.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300px" height="100px" version="1.1" viewBox="0 0 300 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="300" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="300" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="150" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fraa_wide6.svg b/shields/template_fraa_wide6.svg
new file mode 100644
index 00000000..f57d12a1
--- /dev/null
+++ b/shields/template_fraa_wide6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350px" height="100px" version="1.1" viewBox="0 0 350 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="350" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="350" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="175" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fran_wide3.svg b/shields/template_fran_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_fran_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fran_wide4.svg b/shields/template_fran_wide4.svg
new file mode 100644
index 00000000..7d92eadd
--- /dev/null
+++ b/shields/template_fran_wide4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" version="1.1" viewBox="0 0 250 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="250" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="250" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="125" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fran_wide5.svg b/shields/template_fran_wide5.svg
new file mode 100644
index 00000000..0d905baf
--- /dev/null
+++ b/shields/template_fran_wide5.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300px" height="100px" version="1.1" viewBox="0 0 300 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="300" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="300" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="150" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_fran_wide6.svg b/shields/template_fran_wide6.svg
new file mode 100644
index 00000000..f57d12a1
--- /dev/null
+++ b/shields/template_fran_wide6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350px" height="100px" version="1.1" viewBox="0 0 350 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="350" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="350" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="175" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_frht_wide3.svg b/shields/template_frht_wide3.svg
new file mode 100644
index 00000000..45ee201e
--- /dev/null
+++ b/shields/template_frht_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#175dcf"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_frht_wide4.svg b/shields/template_frht_wide4.svg
new file mode 100644
index 00000000..56a6b90e
--- /dev/null
+++ b/shields/template_frht_wide4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" version="1.1" viewBox="0 0 250 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="250" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="250" height="100" x="0" y="0" fill="#175dcf"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="125" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_frht_wide5.svg b/shields/template_frht_wide5.svg
new file mode 100644
index 00000000..4b7e4983
--- /dev/null
+++ b/shields/template_frht_wide5.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300px" height="100px" version="1.1" viewBox="0 0 300 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="300" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="300" height="100" x="0" y="0" fill="#175dcf"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="150" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_glpn_wide3.svg b/shields/template_glpn_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_glpn_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_glpn_wide4.svg b/shields/template_glpn_wide4.svg
new file mode 100644
index 00000000..7d92eadd
--- /dev/null
+++ b/shields/template_glpn_wide4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" version="1.1" viewBox="0 0 250 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="250" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="250" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="125" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_glpn_wide6.svg b/shields/template_glpn_wide6.svg
new file mode 100644
index 00000000..f57d12a1
--- /dev/null
+++ b/shields/template_glpn_wide6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350px" height="100px" version="1.1" viewBox="0 0 350 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="350" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="350" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="175" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_gufn_wide3.svg b/shields/template_gufn_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_gufn_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_gufn_wide6.svg b/shields/template_gufn_wide6.svg
new file mode 100644
index 00000000..f57d12a1
--- /dev/null
+++ b/shields/template_gufn_wide6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350px" height="100px" version="1.1" viewBox="0 0 350 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="350" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="350" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="175" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_hunf.svg b/shields/template_hunf.svg
new file mode 100644
index 00000000..7d7b0622
--- /dev/null
+++ b/shields/template_hunf.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" y="0px" x="0px" width="208px" height="160px" viewBox="0 0 208 160" version="1.1">
+  <g transform="scale(2) translate(0, 0) rotate(0)">
+    <g transform="scale(1) translate(0,0) rotate(0)">
+      <path d="m52 0h-52v53.3c0.588 5.79 4.47 10.7 9.97 12.6l42 10.2 42-10.1c5.49-1.92 9.38-6.85 9.97-12.6v-53.4h-52z" fill="#008000"/>
+      <path d="m52 2h-50v49.8c0 6.01 4.12 11.2 9.97 12.6l40 9.6 40-9.61c5.9-1.4 10-6.6 10-12.6v-49.8h-50z" fill="#fff"/>
+      <path d="m52 7h-45v44.8c-0.158 3.38 1.83 6.5 4.97 7.78l40 9.3 38.9-9.33c3.6-0.9 6.1-4.2 6.1-7.8v-44.8h-45z" fill="#008000"/>
+      <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#fff">
+        <tspan y="55" x="99">***NUMBER***</tspan>
+      </text>
+    </g>
+  </g>
+</svg>
diff --git a/shields/template_hunm.svg b/shields/template_hunm.svg
new file mode 100644
index 00000000..3ba093ce
--- /dev/null
+++ b/shields/template_hunm.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" y="0px" x="0px" width="208px" height="160px" viewBox="0 0 208 160"  version="1.1">
+  <g transform="scale(2) translate(0, 0) rotate(0)">
+    <g transform="scale(1) translate(0,0) rotate(0)">
+      <path d="m52 0h-52v53.3c0.588 5.79 4.47 10.7 9.97 12.6l42 10.2 42-10.1c5.49-1.92 9.38-6.85 9.97-12.6v-53.4h-52z" fill="#00008B"/>
+      <path d="m52 2h-50v49.8c0 6.01 4.12 11.2 9.97 12.6l40 9.6 40-9.61c5.9-1.4 10-6.6 10-12.6v-49.8h-50z" fill="#fff"/>
+      <path d="m52 7h-45v44.8c-0.158 3.38 1.83 6.5 4.97 7.78l40 9.3 38.9-9.33c3.6-0.9 6.1-4.2 6.1-7.8v-44.8h-45z" fill="#00008B"/>
+      <text letter-spacing="10px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="60px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#fff">
+        <tspan y="55" x="92">***NUMBER***</tspan>
+      </text>
+    </g>
+  </g>
+</svg>
diff --git a/shields/template_itaa.svg b/shields/template_itaa.svg
new file mode 100644
index 00000000..a0313912
--- /dev/null
+++ b/shields/template_itaa.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" version="1.1" viewBox="0 0 300 300">
+  <path id="pathOttagono" d="m25 25 125-20 125 20 20 125-20 125-125 20-125-20-20-125 20-125z" stroke="#fff" stroke-width="10" fill="#08842c"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="180px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#fff">
+    <tspan x="155" y="210">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_itaa_wide5.svg b/shields/template_itaa_wide5.svg
new file mode 100644
index 00000000..a9d950e3
--- /dev/null
+++ b/shields/template_itaa_wide5.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" version="1.1" viewBox="0 0 300 300">
+  <path id="pathOttagono" d="m25 25 125-20 125 20 20 125-20 125-125 20-125-20-20-125 20-125z" stroke="#fff" stroke-width="10" fill="#08842c"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="140px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#fff">
+    <tspan x="155" y="198">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_itaa_wide7.svg b/shields/template_itaa_wide7.svg
new file mode 100644
index 00000000..5a0020c9
--- /dev/null
+++ b/shields/template_itaa_wide7.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" version="1.1" viewBox="0 0 300 300">
+  <path id="pathOttagono" d="m25 25 125-20 125 20 20 125-20 125-125 20-125-20-20-125 20-125z" stroke="#fff" stroke-width="10" fill="#08842c"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="80px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#fff">
+    <tspan x="155" y="170">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_luxa.svg b/shields/template_luxa.svg
new file mode 100644
index 00000000..cae11d39
--- /dev/null
+++ b/shields/template_luxa.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="180px" version="1.1" viewBox="0 0 180 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="180" y="0" x="0" fill="#1410cc"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="140px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="90">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_luxa_wide.svg b/shields/template_luxa_wide.svg
new file mode 100644
index 00000000..a5c35f45
--- /dev/null
+++ b/shields/template_luxa_wide.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="250px" version="1.1" viewBox="0 0 250 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="250" y="0" x="0" fill="#1410cc"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="140px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="125">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_luxb.svg b/shields/template_luxb.svg
new file mode 100644
index 00000000..cae11d39
--- /dev/null
+++ b/shields/template_luxb.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="180px" version="1.1" viewBox="0 0 180 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="180" y="0" x="0" fill="#1410cc"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="140px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="90">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_luxb_wide.svg b/shields/template_luxb_wide.svg
new file mode 100644
index 00000000..a5c35f45
--- /dev/null
+++ b/shields/template_luxb_wide.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="250px" version="1.1" viewBox="0 0 250 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="250" y="0" x="0" fill="#1410cc"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="140px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="125">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_luxn.svg b/shields/template_luxn.svg
new file mode 100644
index 00000000..19e1b2d3
--- /dev/null
+++ b/shields/template_luxn.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="180px" version="1.1" viewBox="0 0 180 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="180" y="0" x="0" fill="#ed1d24"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="140px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="88">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_luxn_wide.svg b/shields/template_luxn_wide.svg
new file mode 100644
index 00000000..daa30172
--- /dev/null
+++ b/shields/template_luxn_wide.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="250px" version="1.1" viewBox="0 0 250 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="250" y="0" x="0" fill="#ed1d24"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="140px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="106" x="127">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_lvaa.svg b/shields/template_lvaa.svg
new file mode 100644
index 00000000..3e5ed0ad
--- /dev/null
+++ b/shields/template_lvaa.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#cc3333"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_lvap.svg b/shields/template_lvap.svg
new file mode 100644
index 00000000..32b61f86
--- /dev/null
+++ b/shields/template_lvap.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#2c286d"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_mara_wide3.svg b/shields/template_mara_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_mara_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_mara_wide5.svg b/shields/template_mara_wide5.svg
new file mode 100644
index 00000000..0d905baf
--- /dev/null
+++ b/shields/template_mara_wide5.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300px" height="100px" version="1.1" viewBox="0 0 300 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="300" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="300" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="150" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_mexd.svg b/shields/template_mexd.svg
new file mode 100644
index 00000000..787f22d7
--- /dev/null
+++ b/shields/template_mexd.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3755" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 798.25 1064.1" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="layer1" transform="translate(-90.929 -189)">
+  <g id="g4749">
+   <path id="path4549" d="m106.25 0-106.25 106.25v265.72c13.586 23.46 21.375 50.71 21.375 79.78s-7.789 56.28-21.375 79.75c0 251.96 168.31 464.58 398.62 531.6 230.32-67.02 398.63-279.65 398.63-531.6-13.586-23.465-21.375-50.685-21.375-79.75s7.7885-56.316 21.375-79.781v-265.72l-106.28-106.25c-41.94 27.675-92.18 43.781-146.19 43.781-54 0-104.22-16.111-146.16-43.781 0 0.0047843-0.02-0.0047836-0.03 0-41.93 27.675-92.15 43.781-146.15 43.781-54.01 0-104.25-16.106-146.19-43.781z" transform="translate(91.429 189.5)" stroke="#000" fill="#fff"/>
+   <path id="rect4435" d="m398.59 41.406c-43.288 24.075-93.111 37.812-146.16 37.812-50.749 0-98.578-12.552-140.53-34.719l-76.469 76.469v242c13.65 26.626 21.375 56.804 21.375 88.781 0 31.978-7.725 62.155-21.375 88.781l0.03125 0.0625h-0.03125c0 231.68 152.03 418.77 361.78 485.06l1.4062 0.2238 1.4062-0.2238c209.75-66.24 361.79-253.33 361.79-485.01-13.67-26.64-21.37-56.84-21.37-88.84 0-32.002 7.7053-62.203 21.375-88.844v-241.94l-76.5-76.5c-41.957 22.171-89.777 34.75-140.53 34.75-53.061 0-102.89-13.725-146.19-37.812zm-0.09 39.844c44.236 21.383 93.855 33.406 146.28 33.406 47.323 0 92.364-9.7766 133.22-27.406l48.375 48.375v201h-655.5v-201l48.656-48.656c40.845 17.619 85.881 27.406 133.19 27.406 52.227 0 101.67-11.898 145.78-33.125zm-320.44 290.81h641.12c-9.15 24.84-14.18 51.68-14.18 79.69 0 34.637 7.6789 67.468 21.375 96.938 0.004 0.009-0.004 0.0226 0 0.0312-0.0134 211.8-136.43 374.66-326.19 439.59-0.76615 0.34524-0.61757 0.16327-2.0654 0.65503-2.6616-1.1921-2.8438-1.1105-4.872-1.9988-187.77-65.81-322.36-227.89-322.36-438.28 13.689-29.47 21.339-62.31 21.339-96.94 0-28.011-4.9979-54.852-14.156-79.688z" transform="translate(91.429 189.5)"/>
+   <g id="text4593">
+    <path id="path4702" d="m276.31 505.24v-104.66l-21.091 66.173-21.618-66.173v104.66h-22.409v-176.64h22.409l21.618 62.482 21.091-62.482h22.146v176.64h-22.146"/>
+    <path id="path4704" d="m336.83 505.24v-176.64h65.119v22.937h-42.71v45.346h28.473v23.464h-28.473v61.955h45.082v22.937h-67.492"/>
+    <path id="path4706" d="m480.34 505.24-17.4-53.255-17.137 53.255h-24.255l29.791-90.428-28.473-86.21h24.782l15.291 49.037 16.346-49.037h23.991l-28.473 86.21 29.791 90.428h-24.255"/>
+    <path id="path4708" d="m532.5 505.24v-176.64h22.409v176.64h-22.409"/>
+    <path id="path4710" d="m664.43 463.58c-0.00009 3.5152-0.088 6.4152-0.26364 8.7001-0.00009 2.2849-0.088 4.3061-0.26364 6.0637-0.17585 1.5819-0.43949 3.0758-0.79092 4.4819-0.3516 1.4061-0.791 2.9-1.3182 4.4819-1.4062 6.5031-4.9213 11.688-10.546 15.555-5.6244 3.691-12.391 5.5364-20.3 5.5364-8.9638 0-16.346-1.8455-22.146-5.5364-5.6243-3.8667-9.8426-9.9304-12.655-18.191-2.4606-7.3819-4.3061-16.873-5.5364-28.473-1.2303-11.776-1.8455-24.782-1.8455-39.019-0.00002-4.0424 0.0879-8.4363 0.26364-13.182 0.17574-4.7454 0.43938-9.4909 0.79091-14.236 0.52727-4.9211 1.0545-9.5788 1.5818-13.973 0.52726-4.3938 1.1424-8.3484 1.8455-11.864 2.2848-13.533 6.2394-23.2 11.864-29 5.8-5.7999 13.973-8.6999 24.518-8.7001 10.018 0.00018 18.103 2.9881 24.255 8.9637 6.1515 5.8002 9.6667 14.149 10.546 25.046h-22.937c-0.35158-3.6908-1.5819-6.4151-3.6909-8.1728-1.9334-1.9332-4.394-2.8999-7.3819-2.9-4.0425 0.00016-7.2062 1.4062-9.491 4.2182-2.2849 2.8123-4.1304 7.1184-5.5364 12.918-0.87884 3.5153-1.5819 7.1184-2.1091 10.809-0.35156 3.5153-0.70308 7.2941-1.0546 11.336-0.1758 3.8668-0.35155 8.1729-0.52728 12.918-0.00003 4.7456-0.00003 10.018 0 15.818-0.00003 6.1517-0.00003 11.6 0 16.346 0.17573 4.5698 0.35148 8.788 0.52728 12.655 0.35148 3.691 0.703 7.2941 1.0546 10.809 0.52724 3.3395 1.2303 6.8546 2.1091 10.546 1.406 5.8001 3.1636 10.282 5.2728 13.446 2.2848 2.9879 5.2727 4.4819 8.9637 4.4819 4.0424 0.00002 7.0303-1.6697 8.9637-5.0091 1.9333-3.3394 2.9-8.9637 2.9-16.873h22.937"/>
+    <path id="path4712" d="m774.51 416.65c-0.0001 4.7456-0.0001 10.37 0 16.873-0.0001 6.3274-0.35162 12.918-1.0546 19.773-0.52737 6.8546-1.5819 13.621-3.1637 20.3-1.4062 6.5031-3.691 12.391-6.8546 17.664-2.988 5.097-6.9426 9.2274-11.864 12.391-4.7456 3.1637-10.721 4.7455-17.927 4.7455-7.3819 0-13.534-1.5818-18.455-4.7455-4.7455-3.1637-8.7001-7.294-11.864-12.391-2.9879-5.2728-5.2728-11.161-6.8546-17.664-1.4061-6.6788-2.3728-13.446-2.9-20.3-0.52729-6.8546-0.79093-13.446-0.79092-19.773-0.00001-6.3273-0.00001-11.952 0-16.873-0.00001-5.0969-0.00001-10.809 0-17.137-0.00001-6.503 0.26363-13.094 0.79092-19.773 0.70302-6.6787 1.8454-13.182 3.4273-19.509 1.5818-6.5029 3.8667-12.215 6.8546-17.137 2.9879-5.0968 6.8546-9.1393 11.6-12.127 4.9212-3.1635 10.985-4.7453 18.191-4.7455 7.2061 0.00018 13.182 1.582 17.927 4.7455 4.9212 2.9881 8.8758 7.0305 11.864 12.127 3.1636 5.0972 5.4484 10.897 6.8546 17.4 1.5817 6.3275 2.6363 12.831 3.1637 19.509 0.70294 6.679 1.0545 13.27 1.0546 19.773-0.0001 6.3274-0.0001 11.952 0 16.873m-23.464 0c-0.00007-2.4605-0.0879-5.8-0.26364-10.018-0.00007-4.2181-0.17583-8.7879-0.52727-13.709-0.35159-5.0969-0.87887-10.194-1.5818-15.291-0.7031-5.2726-1.7577-10.018-3.1637-14.236-1.2304-4.2181-2.8122-7.6454-4.7455-10.282-1.9334-2.6362-4.3062-3.9544-7.1182-3.9546-3.3395 0.00016-6.1516 1.4062-8.4364 4.2182-2.1092 2.6365-3.8668 6.1517-5.2728 10.546-1.2304 4.2184-2.197 8.9639-2.9 14.236-0.52731 5.2729-0.96671 10.458-1.3182 15.555-0.1758 4.9214-0.26368 9.4911-0.26364 13.709 0.17572 4.0426 0.2636 7.1184 0.26364 9.2274-0.00004 1.9334-0.0879 5.0092-0.26364 9.2274-0.00004 4.0425 0.0878 8.6123 0.26364 13.709 0.35148 5.0971 0.79088 10.37 1.3182 15.818 0.703 5.4486 1.6697 10.37 2.9 14.764 1.406 4.394 3.1636 8.085 5.2728 11.073 2.2848 2.8122 5.097 4.2182 8.4364 4.2182 3.3394 0.00002 6.0636-1.406 8.1728-4.2182 2.109-2.9879 3.7788-6.6788 5.0091-11.073 1.406-4.394 2.3727-9.3152 2.9-14.764 0.5272-5.4485 0.87872-10.721 1.0546-15.818 0.35145-5.097 0.43933-9.6667 0.26364-13.709-0.00007-4.2181-0.00007-7.2939 0-9.2274"/>
+   </g>
+  </g>
+  <text id="text4597" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" transform="scale(1 .99999)" line-height="125%" font-size="527.28px" y="986.75238" x="490.1087" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan4599" y="986.75238" x="490.1087">***NUMBER***</tspan></text>
+ </g>
+ <g id="text4861">
+  <path id="path4885" d="m436.4 886.8c0 10.7-1.6 20.1-4.9 28.2-3.2 8-7.8 14.4-13.8 19-2 1.9-4.4 3.3-7.1 4.3-2.6 1-5.3 1.5-8.1 1.7h-38.4v-106.2h34.3c2.6 0 4.9 0.1 6.8 0.3 2 0.1 3.8 0.4 5.4 0.8s3 1 4.3 1.7 2.6 1.6 4.1 2.7c5.6 4.9 9.9 11.4 12.9 19.5s4.5 17.4 4.5 28m-17.1 0c0-7.2-0.8-13.6-2.4-19.2-1.5-5.6-3.5-9.8-6.2-12.5-1.4-1.3-3-2.3-4.8-3.2-1.8-0.8-3.8-1.3-6-1.3h-19v72.4h16.8c2.7 0 5-0.3 6.8-1 1.9-0.6 3.6-1.7 5.1-3.2 3.2-3.2 5.6-7.5 7.1-13 1.7-5.6 2.6-11.9 2.6-19"/>
+ </g>
+</svg>
diff --git a/shields/template_mexd_wide.svg b/shields/template_mexd_wide.svg
new file mode 100644
index 00000000..28f09e95
--- /dev/null
+++ b/shields/template_mexd_wide.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg3755" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 798.25 1064.1" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="layer1" transform="translate(-90.929 -189)">
+  <g id="g4749">
+   <path id="path4549" d="m106.25 0-106.25 106.25v265.72c13.586 23.46 21.375 50.71 21.375 79.78s-7.789 56.28-21.375 79.75c0 251.96 168.31 464.58 398.62 531.6 230.32-67.02 398.63-279.65 398.63-531.6-13.586-23.465-21.375-50.685-21.375-79.75s7.7885-56.316 21.375-79.781v-265.72l-106.28-106.25c-41.94 27.675-92.18 43.781-146.19 43.781-54 0-104.22-16.111-146.16-43.781 0 0.0047843-0.02-0.0047836-0.03 0-41.93 27.675-92.15 43.781-146.15 43.781-54.01 0-104.25-16.106-146.19-43.781z" transform="translate(91.429 189.5)" stroke="#000" fill="#fff"/>
+   <path id="rect4435" d="m398.59 41.406c-43.288 24.075-93.111 37.812-146.16 37.812-50.749 0-98.578-12.552-140.53-34.719l-76.469 76.469v242c13.65 26.626 21.375 56.804 21.375 88.781 0 31.978-7.725 62.155-21.375 88.781l0.03125 0.0625h-0.03125c0 231.68 152.03 418.77 361.78 485.06l1.4062 0.2238 1.4062-0.2238c209.75-66.24 361.79-253.33 361.79-485.01-13.67-26.64-21.37-56.84-21.37-88.84 0-32.002 7.7053-62.203 21.375-88.844v-241.94l-76.5-76.5c-41.957 22.171-89.777 34.75-140.53 34.75-53.061 0-102.89-13.725-146.19-37.812zm-0.09 39.844c44.236 21.383 93.855 33.406 146.28 33.406 47.323 0 92.364-9.7766 133.22-27.406l48.375 48.375v201h-655.5v-201l48.656-48.656c40.845 17.619 85.881 27.406 133.19 27.406 52.227 0 101.67-11.898 145.78-33.125zm-320.44 290.81h641.12c-9.15 24.84-14.18 51.68-14.18 79.69 0 34.637 7.6789 67.468 21.375 96.938 0.004 0.009-0.004 0.0226 0 0.0312-0.0134 211.8-136.43 374.66-326.19 439.59-0.76615 0.34524-0.61757 0.16327-2.0654 0.65503-2.6616-1.1921-2.8438-1.1105-4.872-1.9988-187.77-65.81-322.36-227.89-322.36-438.28 13.689-29.47 21.339-62.31 21.339-96.94 0-28.011-4.9979-54.852-14.156-79.688z" transform="translate(91.429 189.5)"/>
+   <g id="text4593">
+    <path id="path4702" d="m276.31 505.24v-104.66l-21.091 66.173-21.618-66.173v104.66h-22.409v-176.64h22.409l21.618 62.482 21.091-62.482h22.146v176.64h-22.146"/>
+    <path id="path4704" d="m336.83 505.24v-176.64h65.119v22.937h-42.71v45.346h28.473v23.464h-28.473v61.955h45.082v22.937h-67.492"/>
+    <path id="path4706" d="m480.34 505.24-17.4-53.255-17.137 53.255h-24.255l29.791-90.428-28.473-86.21h24.782l15.291 49.037 16.346-49.037h23.991l-28.473 86.21 29.791 90.428h-24.255"/>
+    <path id="path4708" d="m532.5 505.24v-176.64h22.409v176.64h-22.409"/>
+    <path id="path4710" d="m664.43 463.58c-0.00009 3.5152-0.088 6.4152-0.26364 8.7001-0.00009 2.2849-0.088 4.3061-0.26364 6.0637-0.17585 1.5819-0.43949 3.0758-0.79092 4.4819-0.3516 1.4061-0.791 2.9-1.3182 4.4819-1.4062 6.5031-4.9213 11.688-10.546 15.555-5.6244 3.691-12.391 5.5364-20.3 5.5364-8.9638 0-16.346-1.8455-22.146-5.5364-5.6243-3.8667-9.8426-9.9304-12.655-18.191-2.4606-7.3819-4.3061-16.873-5.5364-28.473-1.2303-11.776-1.8455-24.782-1.8455-39.019-0.00002-4.0424 0.0879-8.4363 0.26364-13.182 0.17574-4.7454 0.43938-9.4909 0.79091-14.236 0.52727-4.9211 1.0545-9.5788 1.5818-13.973 0.52726-4.3938 1.1424-8.3484 1.8455-11.864 2.2848-13.533 6.2394-23.2 11.864-29 5.8-5.7999 13.973-8.6999 24.518-8.7001 10.018 0.00018 18.103 2.9881 24.255 8.9637 6.1515 5.8002 9.6667 14.149 10.546 25.046h-22.937c-0.35158-3.6908-1.5819-6.4151-3.6909-8.1728-1.9334-1.9332-4.394-2.8999-7.3819-2.9-4.0425 0.00016-7.2062 1.4062-9.491 4.2182-2.2849 2.8123-4.1304 7.1184-5.5364 12.918-0.87884 3.5153-1.5819 7.1184-2.1091 10.809-0.35156 3.5153-0.70308 7.2941-1.0546 11.336-0.1758 3.8668-0.35155 8.1729-0.52728 12.918-0.00003 4.7456-0.00003 10.018 0 15.818-0.00003 6.1517-0.00003 11.6 0 16.346 0.17573 4.5698 0.35148 8.788 0.52728 12.655 0.35148 3.691 0.703 7.2941 1.0546 10.809 0.52724 3.3395 1.2303 6.8546 2.1091 10.546 1.406 5.8001 3.1636 10.282 5.2728 13.446 2.2848 2.9879 5.2727 4.4819 8.9637 4.4819 4.0424 0.00002 7.0303-1.6697 8.9637-5.0091 1.9333-3.3394 2.9-8.9637 2.9-16.873h22.937"/>
+    <path id="path4712" d="m774.51 416.65c-0.0001 4.7456-0.0001 10.37 0 16.873-0.0001 6.3274-0.35162 12.918-1.0546 19.773-0.52737 6.8546-1.5819 13.621-3.1637 20.3-1.4062 6.5031-3.691 12.391-6.8546 17.664-2.988 5.097-6.9426 9.2274-11.864 12.391-4.7456 3.1637-10.721 4.7455-17.927 4.7455-7.3819 0-13.534-1.5818-18.455-4.7455-4.7455-3.1637-8.7001-7.294-11.864-12.391-2.9879-5.2728-5.2728-11.161-6.8546-17.664-1.4061-6.6788-2.3728-13.446-2.9-20.3-0.52729-6.8546-0.79093-13.446-0.79092-19.773-0.00001-6.3273-0.00001-11.952 0-16.873-0.00001-5.0969-0.00001-10.809 0-17.137-0.00001-6.503 0.26363-13.094 0.79092-19.773 0.70302-6.6787 1.8454-13.182 3.4273-19.509 1.5818-6.5029 3.8667-12.215 6.8546-17.137 2.9879-5.0968 6.8546-9.1393 11.6-12.127 4.9212-3.1635 10.985-4.7453 18.191-4.7455 7.2061 0.00018 13.182 1.582 17.927 4.7455 4.9212 2.9881 8.8758 7.0305 11.864 12.127 3.1636 5.0972 5.4484 10.897 6.8546 17.4 1.5817 6.3275 2.6363 12.831 3.1637 19.509 0.70294 6.679 1.0545 13.27 1.0546 19.773-0.0001 6.3274-0.0001 11.952 0 16.873m-23.464 0c-0.00007-2.4605-0.0879-5.8-0.26364-10.018-0.00007-4.2181-0.17583-8.7879-0.52727-13.709-0.35159-5.0969-0.87887-10.194-1.5818-15.291-0.7031-5.2726-1.7577-10.018-3.1637-14.236-1.2304-4.2181-2.8122-7.6454-4.7455-10.282-1.9334-2.6362-4.3062-3.9544-7.1182-3.9546-3.3395 0.00016-6.1516 1.4062-8.4364 4.2182-2.1092 2.6365-3.8668 6.1517-5.2728 10.546-1.2304 4.2184-2.197 8.9639-2.9 14.236-0.52731 5.2729-0.96671 10.458-1.3182 15.555-0.1758 4.9214-0.26368 9.4911-0.26364 13.709 0.17572 4.0426 0.2636 7.1184 0.26364 9.2274-0.00004 1.9334-0.0879 5.0092-0.26364 9.2274-0.00004 4.0425 0.0878 8.6123 0.26364 13.709 0.35148 5.0971 0.79088 10.37 1.3182 15.818 0.703 5.4486 1.6697 10.37 2.9 14.764 1.406 4.394 3.1636 8.085 5.2728 11.073 2.2848 2.8122 5.097 4.2182 8.4364 4.2182 3.3394 0.00002 6.0636-1.406 8.1728-4.2182 2.109-2.9879 3.7788-6.6788 5.0091-11.073 1.406-4.394 2.3727-9.3152 2.9-14.764 0.5272-5.4485 0.87872-10.721 1.0546-15.818 0.35145-5.097 0.43933-9.6667 0.26364-13.709-0.00007-4.2181-0.00007-7.2939 0-9.2274"/>
+   </g>
+  </g>
+  <text id="text4597" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" transform="scale(1 .99999)" line-height="125%" font-size="527.28px" y="986.75238" x="490.1087" font-family="&apos;Roadgeek 2014 Series B&apos;" fill="#000000"><tspan id="tspan4599" y="986.75238" x="490.1087">***NUMBER***</tspan></text>
+ </g>
+ <g id="text4861">
+  <path id="path4885" d="m436.4 886.8c0 10.7-1.6 20.1-4.9 28.2-3.2 8-7.8 14.4-13.8 19-2 1.9-4.4 3.3-7.1 4.3-2.6 1-5.3 1.5-8.1 1.7h-38.4v-106.2h34.3c2.6 0 4.9 0.1 6.8 0.3 2 0.1 3.8 0.4 5.4 0.8s3 1 4.3 1.7 2.6 1.6 4.1 2.7c5.6 4.9 9.9 11.4 12.9 19.5s4.5 17.4 4.5 28m-17.1 0c0-7.2-0.8-13.6-2.4-19.2-1.5-5.6-3.5-9.8-6.2-12.5-1.4-1.3-3-2.3-4.8-3.2-1.8-0.8-3.8-1.3-6-1.3h-19v72.4h16.8c2.7 0 5-0.3 6.8-1 1.9-0.6 3.6-1.7 5.1-3.2 3.2-3.2 5.6-7.5 7.1-13 1.7-5.6 2.6-11.9 2.6-19"/>
+ </g>
+</svg>
diff --git a/shields/template_mtqa_wide3.svg b/shields/template_mtqa_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_mtqa_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_mtqn_wide3.svg b/shields/template_mtqn_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_mtqn_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_mtqn_wide6.svg b/shields/template_mtqn_wide6.svg
new file mode 100644
index 00000000..f57d12a1
--- /dev/null
+++ b/shields/template_mtqn_wide6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350px" height="100px" version="1.1" viewBox="0 0 350 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="350" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="350" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="175" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_nclt_wide4.svg b/shields/template_nclt_wide4.svg
new file mode 100644
index 00000000..7d92eadd
--- /dev/null
+++ b/shields/template_nclt_wide4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" version="1.1" viewBox="0 0 250 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="250" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="250" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="125" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_nlda.svg b/shields/template_nlda.svg
new file mode 100644
index 00000000..baef34a1
--- /dev/null
+++ b/shields/template_nlda.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="165" width="300" version="1.1" viewBox="0 0 300 165">
+  <g transform="translate(-734 -426)">
+  <g transform="matrix(.997 0 0 .994 3.4e3 -842)">
+  <g transform="translate(.0077 1.23e3)">
+    <path d="m-2.65e3 47.8h263c8.09 0 14.6 6.37 14.6 14.3v128c0 7.91-6.51 14.3-14.6 14.3h-263c-8.09 0-14.6-6.37-14.6-14.3v-128c0-7.91 6.51-14.3 14.6-14.3z" stroke="#fff" stroke-width="8.04" fill="#ea2127"/>
+    <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m-2.65e3 43.8c-10.2 0-18.6 8.18-18.6 18.3v128c0 10.1 8.41 18.3 18.6 18.3h263c10.2 0 18.6-8.18 18.6-18.3v-128c0-10.1-8.41-18.3-18.6-18.3z" stroke="#505050" fill="none"/>
+  </g></g></g>
+  <text letter-spacing="10px" text-anchor="middle" word-spacing="10px" text-align="center" font-size="140px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#fff">
+     <tspan y="130" x="145">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_nlda_wide.svg b/shields/template_nlda_wide.svg
new file mode 100644
index 00000000..11eaf0d0
--- /dev/null
+++ b/shields/template_nlda_wide.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="165" width="400" version="1.1" viewBox="0 0 400 165">
+  <g transform="translate(-254 -345)">
+  <g transform="matrix(.997 0 0 .994 2.51e3 277)">
+  <g transform="translate(-.0077 703)">
+    <path d="m-2.24e3 -631h358c9.47 0 17.1 6.37 17.1 14.3v128c0 7.91-7.62 14.3-17.1 14.3h-358c-9.47 0-17.1-6.37-17.1-14.3v-128c0-7.91 7.62-14.3 17.1-14.3z" stroke="#fff" stroke-width="8.03" fill="#ea2127"/>
+    <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m-2.24e3 -635c-11.3 0-21.1 7.77-21.1 18.2v128c0 10.5 9.83 18.3 21.1 18.3h358c11.3 0 21.1-7.8 21.1-18.3v-128c0-10.5-9.83-18.2-21.1-18.2z" stroke="#505050" fill="none"/>
+  </g></g></g>
+  <text letter-spacing="10px" text-anchor="middle" word-spacing="10px" text-align="center" font-size="140px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#fff">
+     <tspan y="130" x="200">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_nlda_wide4.svg b/shields/template_nlda_wide4.svg
new file mode 100644
index 00000000..fc8e62dd
--- /dev/null
+++ b/shields/template_nlda_wide4.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="165" width="500" version="1.1" viewBox="0 0 500 165">
+  <g transform="translate(-131 -307)">
+  <g transform="translate(3.03e3 -275)">
+  <g transform="translate(-1.15e3 1.19e3)">
+    <path d="m-1.73e3 -609h457c9.45 0 17.1 6.33 17.1 14.2v128c0 7.86-7.61 14.2-17.1 14.2h-457c-9.45 0-17.1-6.33-17.1-14.2v-128c0-7.86 7.61-14.2 17.1-14.2z" stroke="#fff" stroke-width="8" fill="#ea2127"/>
+    <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m-1.73e3 -613c-11.2 0-21 7.76-21 18.2v128c0 10.4 9.78 18.1 21 18.1h457c11.2 0 21.1-7.73 21.1-18.1v-128c0-10.4-9.81-18.2-21.1-18.2z" stroke="#505050" fill="none"/>
+  </g></g></g>
+  <text letter-spacing="10px" text-anchor="middle" word-spacing="10px" text-align="center" font-size="140px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#fff">
+     <tspan y="130" x="235">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_nldp.svg b/shields/template_nldp.svg
new file mode 100644
index 00000000..12a68a7a
--- /dev/null
+++ b/shields/template_nldp.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="220" height="120" viewBox="0 0 220 120" version="1.1">
+  <rect ry="10" height="120" width="220" y="0" x="0" fill="#f7bd00"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+    <tspan y="90" x="110">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_nldr.svg b/shields/template_nldr.svg
new file mode 100644
index 00000000..4a3fc6f5
--- /dev/null
+++ b/shields/template_nldr.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="170" height="120" viewBox="0 0 170 120" version="1.1">
+  <rect ry="10" height="120" width="170" y="0" x="0" fill="#f7bd00"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+    <tspan y="90" x="85">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_nlds.svg b/shields/template_nlds.svg
new file mode 100644
index 00000000..5b1c2fe4
--- /dev/null
+++ b/shields/template_nlds.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="301" width="620" version="1.1" viewBox="0 0 620 301">
+  <g transform="translate(-362 -238)">
+    <path d="m362 478 75.1 26 76.7 19.3 77.7 10.4 79.4 4.34 80.2-4.34 77.7-10.4 76.8-19.3 75-26v-180l-75-26.3-76.8-18.3-77.7-11.3-80.2-4.34-79.4 4.34-77.7 11.3-76.7 18.3-75.1 26.3v180" stroke="#646464" fill="#fff"/>
+    <path d="m384 442 1.75 10.4 3.47 8.67 6.1 6.26 9.6 5.06 57.6 19.3 63.7 13 69.8 8.67 75 2.65 75.9-2.65 69.8-8.67 63.7-13 57.6-19.3 8.73-5.06 6.97-6.26 3.5-8.67 1.72-10.4v-107l-1.72-10.6-3.5-7.71-6.97-6.99-8.73-4.34-57.6-20.2-63.7-13-69.8-8.67-75.9-2.65-75 2.65-69.8 8.67-63.7 13-57.6 20.2-9.6 4.34-6.1 6.99-3.47 7.71-1.75 10.6v107z" stroke="#231f20" stroke-width="19.6" fill="#fff"/>
+    <g>
+      <path d="m511 429c-0.00009 9.44-3.56 16.8-10.7 22-7.12 5.2-17.2 7.8-30.4 7.8-8.48 0-16.2-0.684-23.2-2.05-6.84-1.51-13.4-3.83-19.7-6.98l9.24-21.8c1.09 0.274 2.87 0.821 5.34 1.64 2.46 0.684 5.2 1.44 8.21 2.26 3.15 0.821 6.36 1.57 9.65 2.26 3.42 0.684 6.57 1.03 9.44 1.03 6.43 0.00002 11-0.616 13.8-1.85 2.74-1.23 4.11-3.01 4.11-5.34-0.00006-1.37-0.205-2.53-0.616-3.49-0.274-0.958-1.03-1.78-2.26-2.46-1.23-0.821-3.01-1.57-5.34-2.26-2.19-0.821-5.2-1.78-9.03-2.87-7.53-1.92-13.5-3.83-18.1-5.75-4.52-2.05-8.14-4.17-10.9-6.36-3.42-2.74-6.16-6.02-8.21-9.85-1.92-3.83-2.87-7.94-2.87-12.3-0.00001-8.76 3.49-15.6 10.5-20.5 7.12-4.93 16.6-7.39 28.5-7.39 6.57 0.0001 13 0.821 19.3 2.46 6.43 1.51 13 4.04 19.7 7.6l-9.03 21.8c-4.65-2.74-9.58-4.79-14.8-6.16-5.06-1.37-9.99-2.05-14.8-2.05-5.2 0.00008-8.96 0.547-11.3 1.64-2.33 0.958-3.49 2.67-3.49 5.13-0.00003 1.23 0.205 2.33 0.616 3.28 0.547 0.821 1.44 1.57 2.67 2.26 1.23 0.684 2.94 1.37 5.13 2.05 2.33 0.684 5.27 1.37 8.83 2.05 13.8 2.74 23.9 6.84 30.2 12.3 6.29 5.34 9.44 12.7 9.44 22"/>
+    </g>
+  </g>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="240px" line-height="100%" y="0" x="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+    <tspan y="220" x="330">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_norfv.svg b/shields/template_norfv.svg
new file mode 100644
index 00000000..cd67ceba
--- /dev/null
+++ b/shields/template_norfv.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="120px" version="1.1" viewBox="0 0 120 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="120" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="112" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="60">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_norfv_wide.svg b/shields/template_norfv_wide.svg
new file mode 100644
index 00000000..f1b80a40
--- /dev/null
+++ b/shields/template_norfv_wide.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="160px" version="1.1" viewBox="0 0 160 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="160" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="152" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_norfv_wide3.svg b/shields/template_norfv_wide3.svg
new file mode 100644
index 00000000..5e6c76b2
--- /dev/null
+++ b/shields/template_norfv_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="200px" version="1.1" viewBox="0 0 200 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="200" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="192" y="4.25" x="4.25" fill="#fff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="100">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_norrv.svg b/shields/template_norrv.svg
new file mode 100644
index 00000000..65ed4811
--- /dev/null
+++ b/shields/template_norrv.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="120px" version="1.1" viewBox="0 0 120 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="120" y="0" x="0" fill="#019165"/>
+    <rect rx="10" ry="10" height="112" width="112" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="100" width="100" y="10.25" x="10.25" fill="#019165"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="60">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_norrv_wide.svg b/shields/template_norrv_wide.svg
new file mode 100644
index 00000000..9e4977a6
--- /dev/null
+++ b/shields/template_norrv_wide.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="160px" version="1.1" viewBox="0 0 160 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="160" y="0" x="0" fill="#019165"/>
+    <rect rx="10" ry="10" height="112" width="152" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="100" width="140" y="10.25" x="10.25" fill="#019165"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_norrv_wide3.svg b/shields/template_norrv_wide3.svg
new file mode 100644
index 00000000..dcfd3285
--- /dev/null
+++ b/shields/template_norrv_wide3.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="200px" version="1.1" viewBox="0 0 200 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="200" y="0" x="0" fill="#019165"/>
+    <rect rx="10" ry="10" height="112" width="192" y="4.25" x="4.25" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="100" width="180" y="10.25" x="10.25" fill="#019165"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="100">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_pola.svg b/shields/template_pola.svg
new file mode 100644
index 00000000..fc871c22
--- /dev/null
+++ b/shields/template_pola.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#ed2224"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_poldk.svg b/shields/template_poldk.svg
new file mode 100644
index 00000000..fc871c22
--- /dev/null
+++ b/shields/template_poldk.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#ed2224"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_poldw.svg b/shields/template_poldw.svg
new file mode 100644
index 00000000..a0a46c0d
--- /dev/null
+++ b/shields/template_poldw.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="200px" version="1.1" viewBox="0 0 200 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="200" y="0" x="0" fill="#000"/>
+    <rect rx="0" ry="0" height="112" width="192" y="4.25" x="4.25" fill="#fafd4a"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="120px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000">
+      <tspan y="100" x="100">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_pols.svg b/shields/template_pols.svg
new file mode 100644
index 00000000..fc871c22
--- /dev/null
+++ b/shields/template_pols.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#ed2224"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_prta.svg b/shields/template_prta.svg
new file mode 100644
index 00000000..7743f9a2
--- /dev/null
+++ b/shields/template_prta.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="240px" height="100px" version="1.1" viewBox="0 0 240 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="240" height="100" x="0" y="0" fill="#0000ff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan x="120" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_prtic.svg b/shields/template_prtic.svg
new file mode 100644
index 00000000..42331edb
--- /dev/null
+++ b/shields/template_prtic.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="240px" height="100px" version="1.1" viewBox="0 0 240 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="240" height="100" x="0" y="0" fill="#000000"/>
+    <rect rx="0" ry="0" width="236" height="96" x="2" y="2" fill="#ffffff"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#000000">
+      <tspan x="120" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_prtip.svg b/shields/template_prtip.svg
new file mode 100644
index 00000000..a8fe1a07
--- /dev/null
+++ b/shields/template_prtip.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="240px" height="100px" version="1.1" viewBox="0 0 240 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="240" height="100" x="0" y="0" fill="#ff0000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan x="120" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_reun_wide3.svg b/shields/template_reun_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_reun_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_reun_wide4.svg b/shields/template_reun_wide4.svg
new file mode 100644
index 00000000..7d92eadd
--- /dev/null
+++ b/shields/template_reun_wide4.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" version="1.1" viewBox="0 0 250 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="250" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="250" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="125" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_reun_wide5.svg b/shields/template_reun_wide5.svg
new file mode 100644
index 00000000..0d905baf
--- /dev/null
+++ b/shields/template_reun_wide5.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="300px" height="100px" version="1.1" viewBox="0 0 300 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="300" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="300" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="150" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_reun_wide6.svg b/shields/template_reun_wide6.svg
new file mode 100644
index 00000000..f57d12a1
--- /dev/null
+++ b/shields/template_reun_wide6.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="350px" height="100px" version="1.1" viewBox="0 0 350 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="350" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="350" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="175" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_roua.svg b/shields/template_roua.svg
new file mode 100644
index 00000000..ea32531a
--- /dev/null
+++ b/shields/template_roua.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="140px" version="1.1" viewBox="0 0 140 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="140" y="0" x="0" fill="#008000"/>
+    <rect rx="0" ry="0" height="116" width="136" y="2" x="2" fill="#ffffff"/>
+    <rect rx="0" ry="0" height="112" width="132" y="4" x="4" fill="#008000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="110px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="97" x="70">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_roua_wide.svg b/shields/template_roua_wide.svg
new file mode 100644
index 00000000..180903eb
--- /dev/null
+++ b/shields/template_roua_wide.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="180px" version="1.1" viewBox="0 0 180 120">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="120" width="180" y="0" x="0" fill="#008000"/>
+    <rect rx="0" ry="0" height="116" width="176" y="2" x="2" fill="#ffffff"/>
+    <rect rx="0" ry="0" height="112" width="172" y="4" x="4" fill="#008000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="110px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="97" x="90">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_roudn.svg b/shields/template_roudn.svg
new file mode 100644
index 00000000..a9ae8041
--- /dev/null
+++ b/shields/template_roudn.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="600px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600" height="600px">
+  <path stroke-linejoin="round" stroke="#000" d="m305 67.1c47.7 0.42 127-31.3 170-57.1l115 115c-21.2 30.1-33.6 66.8-33.6 106 0 28.5 6.43 55.4 17.9 79.5 9.92 20.8 15.7 44.6 15.7 69.2 0 88.4-71.6 160-160 160h-25.1c-42.3 0-80.1 19.5-105 50-24.8-30.5-62.5-50-105-50h-25.1c-88.4 0-160-71.6-160-160 0-24.6 5.76-48.3 15.7-69.2 11.5-24.1 17.9-51 17.9-79.5-0.001-39.6-12.4-76.2-33.6-106l115-115c42.3 22.2 130 57 180 57.1z" fill="#DC0000"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="480px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#ffffff">
+    <tspan y="460" x="300">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_roudn_wide.svg b/shields/template_roudn_wide.svg
new file mode 100644
index 00000000..19ad9dd8
--- /dev/null
+++ b/shields/template_roudn_wide.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="600px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600" height="600px">
+  <path stroke-linejoin="round" stroke="#000" d="m305 67.1c47.7 0.42 127-31.3 170-57.1l115 115c-21.2 30.1-33.6 66.8-33.6 106 0 28.5 6.43 55.4 17.9 79.5 9.92 20.8 15.7 44.6 15.7 69.2 0 88.4-71.6 160-160 160h-25.1c-42.3 0-80.1 19.5-105 50-24.8-30.5-62.5-50-105-50h-25.1c-88.4 0-160-71.6-160-160 0-24.6 5.76-48.3 15.7-69.2 11.5-24.1 17.9-51 17.9-79.5-0.001-39.6-12.4-76.2-33.6-106l115-115c42.3 22.2 130 57 180 57.1z" fill="#DC0000"/>
+  <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="300px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Engschrift&apos;" fill="#ffffff">
+    <tspan y="400" x="300">***NUMBER***</tspan>
+  </text>
+</svg>
diff --git a/shields/template_spmn_wide3.svg b/shields/template_spmn_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_spmn_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_svkd.svg b/shields/template_svkd.svg
new file mode 100644
index 00000000..b1972048
--- /dev/null
+++ b/shields/template_svkd.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#d92a27"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_svki.svg b/shields/template_svki.svg
new file mode 100644
index 00000000..3bbcfc5c
--- /dev/null
+++ b/shields/template_svki.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#2c286d"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="180px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_svkr.svg b/shields/template_svkr.svg
new file mode 100644
index 00000000..b1972048
--- /dev/null
+++ b/shields/template_svkr.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="192px" width="320px" version="1.1" viewBox="0 0 320 192">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" height="192" width="320" y="0" x="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" height="180" width="308" y="6" x="6" fill="#d92a27"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="160px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan y="157" x="160">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_swel.svg b/shields/template_swel.svg
new file mode 100644
index 00000000..93a69e37
--- /dev/null
+++ b/shields/template_swel.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="240px" version="1.1" viewBox="0 0 240 120">
+  <g fill-rule="evenodd">
+    <rect rx="5" ry="5" height="120" width="240" y="0" x="0" fill="#ffffff"/>
+    <rect rx="5" ry="5" height="112" width="232" y="4.25" x="4.25" fill="#0C479D"/>
+    <text letter-spacing="10px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="120">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_swer.svg b/shields/template_swer.svg
new file mode 100644
index 00000000..630ccf8e
--- /dev/null
+++ b/shields/template_swer.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="140px" version="1.1" viewBox="0 0 140 120">
+  <g fill-rule="evenodd">
+    <rect rx="5" ry="5" height="120" width="140" y="0" x="0" fill="#ffffff"/>
+    <rect rx="5" ry="5" height="112" width="132" y="4.25" x="4.25" fill="#0C479D"/>
+    <text letter-spacing="10px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="70">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_swer_wide.svg b/shields/template_swer_wide.svg
new file mode 100644
index 00000000..5029a5d2
--- /dev/null
+++ b/shields/template_swer_wide.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="120px" width="190px" version="1.1" viewBox="0 0 190 120">
+  <g fill-rule="evenodd">
+    <rect rx="5" ry="5" height="120" width="190" y="0" x="0" fill="#ffffff"/>
+    <rect rx="5" ry="5" height="112" width="182" y="4.25" x="4.25" fill="#0C479D"/>
+    <text letter-spacing="10px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="100px" line-height="100%" y="60" x="100" font-family="&apos;Roadgeek 2005 Mittelschrift&apos;" fill="#ffffff">
+      <tspan y="94" x="95">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_tuna_wide3.svg b/shields/template_tuna_wide3.svg
new file mode 100644
index 00000000..ecc4af44
--- /dev/null
+++ b/shields/template_tuna_wide3.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200px" height="100px" version="1.1" viewBox="0 0 200 100">
+  <g fill-rule="evenodd">
+    <rect rx="0" ry="0" width="200" height="100" x="0" y="0" fill="#ffffff"/>
+    <rect rx="10" ry="10" width="200" height="100" x="0" y="0" fill="#d40000"/>
+    <text letter-spacing="0px" text-anchor="middle" word-spacing="0px" text-align="center" font-size="90px" line-height="100%" x="0" y="0" font-family="&apos;Roadgeek 2005 Transport Heavy&apos;" fill="#ffffff">
+      <tspan x="100" y="80">***NUMBER***</tspan>
+    </text>
+  </g>
+</svg>
diff --git a/shields/template_twnf.svg b/shields/template_twnf.svg
new file mode 100644
index 00000000..135a5996
--- /dev/null
+++ b/shields/template_twnf.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="700pt" width="700pt" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 700 700">
+ <metadata id="metadata20">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g stroke-width=".09375">
+  <path id="path4" d="m320.6 17.6c5.4-1.3 11-1.3 16.5-2.6 9.2 0 18.5-0.2 27.7 0.1 3.1 1.5 6.6 0.4 9.8 1.3 24.2 4 48.4 11.2 69 25 6.2 4 12.1 8.5 17.8 13.2 4.3 2.6 6.9 7.2 11.2 9.8 2.2 1.4 3.8 3.6 5.2 5.8 10.7 10.5 19.5 22.9 27.2 35.8 3.4 6.7 7 13.4 9.4 20.6 1.2 3.5 2.1 7.1 3.7 10.5 3.7 0 7.6-0.6 11.1 0.8 3.7 0.5 7.6-0.6 11.2 0.7 15.5 1.7 30.7 6 45.2 11.8 4.6 2 8.9 4.7 13.7 6.3 5.7 3.3 11.2 6.8 16.9 10.1 4.9 3.3 9.5 7.2 14.4 10.6 3.6 2.7 6.1 6.7 10 9 2.2 1.4 3.8 3.6 5.2 5.8 2.6 3 5.8 5.6 8.4 8.6 3.6 5.1 7.5 9.9 11 15 2.7 4.6 5.4 9.2 8.4 13.6 2 5.7 5.2 10.8 7.7 16.3 5.6 13.3 9 27.3 11.6 41.4 0.2 2.1-0.1 4.3 0.7 6.3 1.1 4.5-0.6 9.4 1.3 13.8 0.2 5.8 0.2 11.7 0 17.6-1.2 2.6-0.9 5.4-0.9 8.2-2.8 20-8.9 39.7-18.3 57.7-1.7 3.3-3.3 6.7-5.1 9.9-3.8 5.3-6.6 11.2-10.8 16.3-2.8 4.1-6.1 7.8-9.1 11.8-4.7 4.9-9.6 9.7-14.5 14.6-4.7 3.7-9.4 7.4-14.2 10.9 0 1.6-0.1 3.1 0.1 4.6 2.8 8.7 5 17.7 6.3 26.8 1.1 3.1 0.1 6.5 1.5 9.6 0.2 10.2 0.2 20.4 0 30.6-1.4 3.1-0.4 6.5-1.5 9.6-5.6 38.4-24.5 74.6-52.6 101.4-6.1 6.4-13.4 11.3-20.2 16.8-6.7 3.5-12.3 8.7-19.3 11.7-6.2 3.3-12.6 6.2-19.2 8.8-6.3 1.8-12.2 5-18.7 6.3-6.1 2.3-12.6 2.9-19 4-3.7 1.3-7.9-0.2-11.6 1.5-4.3 0.3-8.5 0-12.8 0.1-3.4-0.1-7 0.5-10.2-0.9-3.7-0.4-7.5 0.5-11-0.9-4.1-0.1-8-1.2-12-2-6.7-0.6-13-3-19.4-4.6-16-4.9-31.5-12.1-45.1-21.9-1.8-1.3-3.5-2.8-5.5-3.8-2.4-0.4-4.3 1.5-6.2 2.7-23 16.2-50.3 26.5-78.2 29.8-4.4 1.5-9.3-0.4-13.6 1.5-5.6 0.1-11.4 0.7-16.9-0.9-3.1-0.2-6.4 0.4-9.5-0.4-2.5-1-5.3-0.3-7.8-1.2-10.1-1.3-20-4.2-29.7-7.3-18.2-6.9-35.9-15.7-50.9-28.1-3.7-3-7.6-5.7-10.8-9.2-5.1-5.6-11.1-10.3-15.5-16.5-14.8-16.2-25.6-35.8-32.3-56.7-3.3-11.9-6.9-24-7.6-36.4-1.9-4.6 0.3-9.8-1.7-14.4-0.2-3.9-0.2-7.8 0-11.6 1.5-3.6 0.7-7.5 0.9-11.2 1.5-9.7 2.7-19.6 6.1-28.9 0.9-2.8 2.5-5.7 1.8-8.7-4.5-5-10.7-8.1-15.2-13.1-6.1-6.6-13.1-12.3-18.5-19.5-5.4-5.7-9.3-12.7-13.8-19.2-3.2-6.1-7.2-11.9-9.5-18.5-7.3-16-12.3-33.2-14.3-50.7-1.1-2.9-0.3-6.2-0.7-9.2-1.4-3.2-0.8-6.8-0.9-10.2 0.1-3.6-0.2-7.2 0.1-10.8 1.8-4 0.1-8.5 1.5-12.6 2.7-22.1 10.1-43.6 20.8-63.2 2.9-4.2 4.9-8.9 8.2-12.8 3.2-4.5 5.8-9.4 9.6-13.5 2.4-4.1 6.7-6.6 9.2-10.7 1.5-2.5 4-4 6.3-5.7 8.8-9.2 19.6-15.9 30.3-22.7 6-3.1 11.5-6.9 17.9-9.1 17.6-8 36.5-14.1 55.9-15 5.5-1.8 11.4-0.6 17.1-0.9 8.5-24.2 21.2-47.4 39.3-65.8 2.3-3.6 5.5-6.5 8.6-9.4 3.2-1.7 5.2-4.8 8.2-6.8 23.2-18.8 51-32.4 80.6-37.4m-3 32.2c-21 4.8-40.7 14.9-57.2 28.6-27.9 22.8-47.9 56.2-51.8 92.3-10.8-1.5-21.6-2.6-32.5-2-25.8 1.2-51.2 9.5-72.7 23.7-23 15.2-41.7 37.1-52.6 62.4-12.4 28.9-16.2 61.8-8 92.3 10.5 40.8 38.7 77.5 77.4 95-1.4 3.8-3.3 7.3-5.1 11-11 25.2-14.7 53.6-10 80.8 3.6 22.8 13 44.7 26.9 63.1 15 20.3 35.8 36 58.8 46.4 42 18.2 92.6 13.7 131.7-9.9 10.6-6.3 19.9-14.5 28.6-23.3 3.2 1.8 5.4 5.1 8.3 7.5 8.9 8 18.9 14.9 29.5 20.4 29.9 15.7 65.3 20.3 98.2 12.8 30-6.5 57.1-23.5 77.5-46.3 38.3-43.6 46.1-111.7 17.5-162.4 10.3-5.4 20.4-11.3 29.2-18.9 15.7-12.6 28.2-28.9 37.2-46.8 13.4-26.8 18-57.8 13.2-87.4-5.1-29.4-18.6-57.7-40.2-78.7-29.8-29.3-72.7-45.6-114.5-41.5-4.5 0.3-8.8 1.6-13.3 1.8-1.7-12-4.7-23.8-9.4-35-15.1-38-47.5-68.5-86.2-81.7-25.7-9.1-54-10-80.5-4.2z" stroke="#fff" fill="#fff"/>
+  <path id="path6" d="m317.6 49.8c26.5-5.8 54.8-4.9 80.5 4.2 38.7 13.2 71.1 43.7 86.2 81.7 4.7 11.2 7.7 23 9.4 35 4.5-0.2 8.8-1.5 13.3-1.8 41.8-4.1 84.7 12.2 114.5 41.5 21.6 21 35.1 49.3 40.2 78.7 4.8 29.6 0.2 60.6-13.2 87.4-9 17.9-21.5 34.2-37.2 46.8-8.8 7.6-18.9 13.5-29.2 18.9 28.6 50.7 20.8 118.8-17.5 162.4-20.4 22.8-47.5 39.8-77.5 46.3-32.9 7.5-68.3 2.9-98.2-12.8-10.6-5.5-20.6-12.4-29.5-20.4-2.9-2.4-5.1-5.7-8.3-7.5-8.7 8.8-18 17-28.6 23.3-39.1 23.6-89.7 28.1-131.7 9.9-23-10.4-43.8-26.1-58.8-46.4-13.9-18.4-23.3-40.3-26.9-63.1-4.7-27.2-1-55.6 10-80.8 1.8-3.7 3.7-7.2 5.1-11-38.7-17.5-66.9-54.2-77.4-95-8.2-30.5-4.4-63.4 8-92.3 10.9-25.3 29.6-47.2 52.6-62.4 21.5-14.2 46.9-22.5 72.7-23.7 10.9-0.6 21.7 0.5 32.5 2 3.9-36.1 23.9-69.5 51.8-92.3 16.5-13.7 36.2-23.8 57.2-28.6m26.2 28.7c-23.5 1.5-46.4 10.7-64.4 25.9-15.8 13.2-27.9 30.9-34.3 50.5-7 20.2-7.5 42.5-2.2 63.1-4.9-2.3-9.4-5.5-14.5-7.4-33.2-15.4-73.9-12.5-104.8 7-33.1 20.1-53.9 58.7-52.7 97.4 0.5 22.2 7.8 44.3 20.7 62.4 10.6 14.7 24.8 26.9 41 35.1 13.6 6.5 28.4 10.9 43.5 11.6-3.6 3.5-7.5 6.6-10.8 10.3-14.6 15.6-24.6 35.5-28.3 56.6-3.9 21.8-1.1 44.8 7.9 65 14.8 34 47.5 59.3 84.1 64.9 36.5 6.3 75.4-7.3 100.3-34.6 9.2-10.2 16.8-21.9 21.8-34.7 0.8 1.4 1.5 2.7 2.2 4.1 11.2 26.2 33.2 47.6 59.7 58.3 18.8 7.8 39.9 10.1 60 7 18-3 35.2-10.3 49.7-21.3 16.7-12.5 29.7-29.7 37-49.2 13.5-34.4 8.2-75.6-13.8-105.4-5.4-7.9-12.3-14.5-19.2-21 5.6-0.8 11.2-1.2 16.7-2.5 35.4-7.3 66.1-33.1 79.6-66.6 14.8-35 9.8-77.6-12.8-108.2-12.6-17.4-30.3-31-50.3-38.7-17.3-6.7-36.3-8.7-54.7-6.7-16.2 2.4-31.9 8.1-45.9 16.7 8.9-33.5 1-70.8-20.7-97.7-22.2-28.4-58.9-44.5-94.8-41.9z" stroke="#007a36" fill="#007a36"/>
+  <path id="path8" d="m343.8 78.5c35.9-2.6 72.6 13.5 94.8 41.9 21.7 26.9 29.6 64.2 20.7 97.7 14-8.6 29.7-14.3 45.9-16.7 18.4-2 37.4 0 54.7 6.7 20 7.7 37.7 21.3 50.3 38.7 22.6 30.6 27.6 73.2 12.8 108.2-13.5 33.5-44.2 59.3-79.6 66.6-5.5 1.3-11.1 1.7-16.7 2.5 6.9 6.5 13.8 13.1 19.2 21 22 29.8 27.3 71 13.8 105.4-7.3 19.5-20.3 36.7-37 49.2-14.5 11-31.7 18.3-49.7 21.3-20.1 3.1-41.2 0.8-60-7-26.5-10.7-48.5-32.1-59.7-58.3-0.7-1.4-1.4-2.7-2.2-4.1-5 12.8-12.6 24.5-21.8 34.7-24.9 27.3-63.8 40.9-100.3 34.6-36.6-5.6-69.3-30.9-84.1-64.9-9-20.2-11.8-43.2-7.9-65 3.7-21.1 13.7-41 28.3-56.6 3.3-3.7 7.2-6.8 10.8-10.3-15.1-0.7-29.9-5.1-43.5-11.6-16.2-8.2-30.4-20.4-41-35.1-12.9-18.1-20.2-40.2-20.7-62.4-1.2-38.7 19.6-77.3 52.7-97.4 30.9-19.5 71.6-22.4 104.8-7 5.1 1.9 9.6 5.1 14.5 7.4-5.3-20.6-4.8-42.9 2.2-63.1 6.4-19.6 18.5-37.3 34.3-50.5 18-15.2 40.9-24.4 64.4-25.9" stroke="#fff" fill="#fff"/>
+  <path id="path14" d="m407.4 310.7c13.2-2.5 27.6-1.3 39.1 5.8 9.6 5.9 16.3 15.7 19.8 26.2 4.7 13.9 5.7 28.8 5.6 43.3-0.3 16.8-2.9 34-11.1 48.8-5.8 10.5-14.8 19.8-26.5 23.4-14.1 4.3-30.4 2.6-42.5-6-9.7-6.8-15.8-17.5-19.5-28.6-5.1-16.3-5.9-33.5-5-50.4 1.1-15.3 3.9-31.2 12.7-44.2 6.3-9.4 16.3-16.1 27.4-18.3z" stroke="#fff" fill="#fff"/>
+ </g>
+ <text id="text2997" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="354.67px" y="503.80768" x="352.8215" font-family="&apos;Roadgeek 2014 Series EM&apos;" line-height="125%" fill="#000000"><tspan id="tspan2999" x="352.8215" y="503.80768">***NUMBER***</tspan></text>
+</svg>
diff --git a/shields/template_usaar.svg b/shields/template_usaar.svg
new file mode 100644
index 00000000..d0ae51a7
--- /dev/null
+++ b/shields/template_usaar.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata7">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1">
+  <path id="rect1872" style="color:#000000" d="m37.5 0h525c20.78 0 37.5 16.725 37.5 37.5v525c0 20.775-16.725 37.5-37.5 37.5h-525c-20.775 0-37.5-16.72-37.5-37.5v-525c0-20.775 16.725-37.5 37.5-37.5z"/>
+  <path id="path3797" fill="#fff" d="m91.76 534.55v-40.451h-28.268-28.268v-149.81-149.81l-10.986-82.291c-6.042-45.266-11.155-83.398-11.362-84.743l-0.376-2.447h257.9 257.9l3.3158 1.5513c5.2867 2.4733 7.6976 5.6125 9.2753 12.077 1.1736 4.8087 1.2501 5.9964 0.63112 9.7865-0.38745 2.3725-1.0746 7.1027-1.527 10.512-0.65122 4.9077-1.4548 7.6243-3.8597 13.049-2.8865 6.5105-3.0481 7.1744-3.2553 13.375l-0.21804 4.5243 2.4914 3.7942 2.4914 1.7942h24.869 24.869v15.836 15.836l0.1151 1.083c-1.5771 4.254-1.8845 6.0136-1.8845 10.789l-3.9992 11.706-6.5912 16.556c-7.6315 16.484-8.6426 19.066-9.0554 23.123-0.63099 6.2018-5.1558 26.673-7.5378 34.102-1.0664 3.3262-3.0312 10.34-4.3663 15.586-2.5189 9.8983-2.1889 11.203-9.5516 22.134-1.7596 2.6124-5.5915 8.3705-5.6057 11.332-0.004 0.857-1.6535 6.7841-6.1093 15.616-4.4686 8.857-8.4804 17.666-8.9465 19.646-0.99056 4.2063-16.809 33.215-28.818 52.847-6.8405 11.183-8.7158 14.922-15.499 30.905-4.8476 11.422-8.0643 19.912-8.6518 22.835-0.51428 2.5588-1.3604 6.5608-1.8801 8.8933-0.71617 3.214-0.9481 8.5496-0.95802 22.038l-0.0131 15.797 2.1692 8.6695c1.1931 3.6682 2.7668 9.1443 3.4971 12.169 0.73038 3.0248 1.7457 8.3387 2.2564 9.3643 0.78911 1.585 0.90061 4.5425 0.74306 31.029l-0.18543 29.165-2.0885 6.2724c-1.1488 2.3498-3.3395 5.7575-4.8684 7.5727-1.5288 1.8152-2.7797 3.4941-2.7797 3.731 0 0.6043-1.6885 2.2918-2.3107 2.3093-0.2838 0.008-1.2227 0.5886-2.0865 1.2903-1.5503 1.2595-3.9343 1.2761-186.1 1.2904h-184.54v-40.451z"/>
+  <text id="text4692" style="text-anchor:middle;text-align:center" xml:space="preserve" font-size="434.15px" line-height="125%" y="446.09152" x="258.92001" font-family="&apos;Roadgeek 2014 Series B&apos;"><tspan id="tspan4694" y="446.09152" x="258.92001">***NUMBER***</tspan></text>
+  <text id="text3763" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="186.01px" line-height="100%" y="275" x="479.33929" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan3765" y="275" x="479.33929">***LETTER***</tspan></text>
+ </g>
+</svg>
diff --git a/shields/template_usaar_wide.svg b/shields/template_usaar_wide.svg
new file mode 100644
index 00000000..dad7864e
--- /dev/null
+++ b/shields/template_usaar_wide.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 750 600" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata7">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1">
+  <g id="g3759">
+   <path id="rect1872" style="color:#000000" d="m37.5 0h675c20.78 0 37.5 16.725 37.5 37.5v525c0 20.775-16.725 37.5-37.5 37.5h-675c-20.775 0-37.5-16.72-37.5-37.5v-525c0-20.775 16.725-37.5 37.5-37.5z"/>
+   <path id="path3797" fill="#fff" d="m112.44 534.55v-40.451h-35.642-35.642v-149.81-149.81l-13.856-82.3c-7.618-45.256-14.065-83.388-14.326-84.733l-0.474-2.447h325.18 325.18l4.1808 1.5513c6.6658 2.4733 9.7057 5.6125 11.695 12.077 1.4797 4.8087 1.5762 5.9964 0.79576 9.7865-0.48852 2.3725-1.3549 7.1027-1.9253 10.512-0.8211 4.9077-1.8343 7.6243-4.8665 13.049-3.6395 6.5105-3.8432 7.1744-4.1045 13.375l-0.27492 4.5243 3.1413 3.7942 3.1413 1.7942h31.357 31.357v15.836 15.836l0.14513 1.083c-1.9886 4.254-2.3761 6.0136-2.3761 10.789l-5.0425 11.706-8.3106 16.556c-9.6223 16.484-10.897 19.066-11.418 23.123-0.79559 6.2018-6.5007 26.673-9.5042 34.102-1.3446 3.3262-3.822 10.34-5.5053 15.586-3.176 9.8983-2.7599 11.203-12.043 22.134-2.2187 2.6124-7.0501 8.3705-7.068 11.332-0.005 0.857-2.0849 6.7841-7.703 15.616-5.6343 8.857-10.693 17.666-11.28 19.646-1.249 4.2063-21.194 33.215-36.336 52.847-8.625 11.183-10.989 14.922-19.542 30.905-6.1122 11.422-10.168 19.912-10.909 22.835-0.64844 2.5588-1.7152 6.5608-2.3706 8.8933-0.90299 3.214-1.1954 8.5496-1.2079 22.038l-0.0165 15.797 2.7351 8.6695c1.5043 3.6682 3.4885 9.1443 4.4094 12.169 0.92091 3.0248 2.2012 8.3387 2.845 9.3643 0.99496 1.585 1.1356 4.5425 0.9369 31.029l-0.2338 29.165-2.6334 6.2724c-1.4485 2.3498-4.2106 5.7575-6.1384 7.5727-1.9277 1.8152-3.5048 3.4941-3.5048 3.731 0 0.6043-2.129 2.2918-2.9135 2.3093-0.35783 0.008-1.5417 0.5886-2.6308 1.2903-1.9547 1.2595-4.9606 1.2761-234.64 1.2904h-232.66v-40.451z"/>
+  </g>
+  <text id="text2987" style="word-spacing:0px;letter-spacing:0px;text-anchor:end;text-align:end" xml:space="preserve" font-size="447.76px" line-height="100%" y="450" x="569.49927" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan2989" y="450" x="569.49927" font-family="&apos;Roadgeek 2014 Series B&apos;" fill="#000000">***NUMBER***</tspan></text>
+  <text id="text3763" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="186.01px" line-height="100%" y="275" x="609.33954" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan3765" y="275" x="609.33954">***LETTER***</tspan></text>
+ </g>
+</svg>
diff --git a/shields/template_usaas_wide.svg b/shields/template_usaas_wide.svg
new file mode 100644
index 00000000..ac864923
--- /dev/null
+++ b/shields/template_usaas_wide.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 300 300" xml:space="preserve" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 300 300"><g id="svg2350"><path id="path2744" d="m12.786 299.75c-3.997-0.625-7.083-2.968-8.598-6.526-1.569-3.685-1.703-6.958-2.07-50.671-0.147-17.554-0.475-54.32-0.727-81.705-0.252-27.37-0.577-65.52-0.722-84.759s-0.395-41.676-0.556-49.861c-0.342-17.345-0.077-19.198 3.237-22.652 3.804-3.965-9.214-3.656 146.11-3.478l138.79 0.159 2.939 1.532c3.834 1.998 5.529 4.485 6.104 8.96 0.233 1.812 0.556 20.645 0.717 41.85 0.16 21.205 0.402 53.146 0.537 70.981 0.316 41.869 0.669 78.396 1.207 125.27 0.468 40.728 0.497 40.117-2.092 44.193-1.639 2.582-5.221 4.479-9.167 4.855-1.751 0.166-27.547 0.439-57.323 0.605s-61.525 0.381-70.553 0.477c-22.279 0.237-81.129 0.73-116.36 0.977-15.909 0.12-30.072 0.03-31.484-0.19z" fill="#006400"/><path id="path2742" d="m214.27 269.34c79.103-0.446 72.471-0.315 73.687-1.462 0.971-0.917 1.03-1.477 1.03-9.773 0-12.029 0.87-11.156-11.347-11.393-5.212-0.101-9.849-0.389-10.304-0.641-0.494-0.273-0.936-1.332-1.096-2.627-0.147-1.193-0.37-25.41-0.497-53.815-0.213-48.174-0.172-51.699 0.606-52.426 0.653-0.611 2.492-0.816 8.5-0.951 6.711-0.15 7.795-0.293 8.696-1.145 1.113-1.051 1.322-3.012 0.549-5.135-0.266-0.728-0.716-2.868-1-4.757-0.691-4.597-4.004-15.858-6.791-23.093-2.336-6.062-7.533-16.008-10.771-20.613-1.872-2.664-2.503-3.61-4.775-7.169-3.643-5.703-16.015-19.161-22.48-24.454-1.616-1.324-4.482-3.687-6.369-5.25-1.886-1.564-4.27-3.3-5.297-3.856-1.026-0.557-3.023-1.784-4.438-2.726-4.947-3.299-16.775-9.326-22.847-11.641-5.493-2.095-8.598-3.094-17.638-5.675-1.482-0.423-5.34-1.145-8.574-1.604-3.233-0.458-6.981-1.068-8.329-1.354-2.812-0.597-24.973-0.239-31.846 0.514-4.795 0.525-10.467 1.506-11.112 1.921-0.223 0.144-1.451 0.458-2.73 0.699-3.831 0.722-8.527 2.02-11.39 3.146-1.482 0.583-3.577 1.325-4.655 1.648-5.187 1.555-19.577 8.664-24.832 12.267-1.273 0.874-3.923 2.612-5.889 3.865-3.475 2.214-10.666 7.97-12.149 9.725-0.404 0.479-3.127 3.126-6.051 5.885-5.204 4.909-12.651 14.02-17.182 21.021-1.238 1.912-2.9 4.396-3.694 5.519-4.26 6.03-13.875 30.877-15.216 39.323-0.312 1.965-0.897 5.102-1.301 6.972-0.556 2.579-0.601 3.657-0.185 4.468 0.302 0.588 0.596 1.107 0.654 1.154 0.058 0.046 3.94 0.219 8.628 0.383 8.43 0.295 8.533 0.312 9.459 1.607 0.894 1.25 0.947 2.851 1.174 35.49 0.131 18.8 0.303 42.454 0.382 52.565 0.082 10.498-0.053 18.986-0.314 19.791-0.257 0.789-0.92 1.517-1.512 1.657-0.579 0.138-5.104 0.345-10.056 0.458-11.889 0.273-11.093-0.525-11.063 11.109l0.022 8.73 1.368 1.227 1.368 1.227 71.122-0.252c39.127-0.15 96.047-0.41 126.5-0.58z"/><path id="path2740" d="m49.172 247.66c-5.639-0.328-5.616-0.287-5.573-9.948 0.018-3.938-0.125-27.333-0.317-51.99s-0.206-45.623-0.032-46.591c0.191-1.064 0.745-1.999 1.398-2.364 0.822-0.459 26.414-0.601 106.82-0.591 98.358 0.012 105.8 0.073 106.56 0.871 0.743 0.774 0.834 3.065 0.933 23.437 0.264 54.823 0.23 84.561-0.097 85.112-0.194 0.327-0.896 0.811-1.559 1.072-0.722 0.286-33.624 0.579-81.896 0.729-44.379 0.139-89.95 0.312-101.27 0.385-11.301 0.08-22.54 0.02-24.958-0.12z" fill="#006400"/><path id="path2728" d="m25.395 128.47c-0.688-0.717-0.607-2.77 0.265-6.689 0.882-3.962 2.982-11.083 3.916-13.275 0.359-0.843 1.246-3.141 1.971-5.106 1.96-5.315 5.168-11.859 8.172-16.668 1.466-2.348 3.29-5.303 4.052-6.566 4.003-6.637 15.392-19.103 24.076-26.354 6.876-5.741 14.861-11.167 21.549-14.642 9.693-5.036 19.62-8.669 30.315-11.095 2.695-0.611 5.781-1.314 6.859-1.562 3.857-0.888 14.854-1.622 23.762-1.586 12.058 0.049 20.727 0.863 27.682 2.601 1.078 0.269 4.054 0.98 6.614 1.58 16.977 3.976 38.204 15.404 53.22 28.652 7.04 6.211 16.499 17.505 20.529 24.51 1.03 1.791 2.52 4.125 3.31 5.186 2.191 2.942 9.061 17.854 10.872 23.603 3.394 10.768 3.688 11.875 3.688 13.854 0 1.12-0.31 2.479-0.688 3.019-0.677 0.964-2.935 0.982-125.18 1.015-82.006 0.03-124.65-0.13-124.98-0.47z" fill="#006400"/></g><g id="Layer_2"><g id="g12" fill="#fff"><path id="path14" d="m86.043 87.621l-2.438-7.251h-7.72l-2.438 7.251h-4.174l8.532-25.843h3.879l8.532 25.843h-4.173zm-6.242-18.668l-2.548 7.251h4.95l-2.402-7.251z"/><path id="path16" d="m109.31 87.621v-14.966l-5.726 14.966-5.725-14.966v14.966h-3.916v-25.843h3.916l5.725 14.503 5.726-14.503h3.915v25.843h-3.91z"/><path id="path18" d="m119.14 87.621v-25.843h14.59v4.088h-10.675v6.326h7.203v4.166h-7.203v7.097h11.451v4.166h-15.37z"/><path id="path20" d="m151.28 87.621l-3.99-11.263h-4.691v11.263h-3.916v-25.843h8.163c0.96 0 1.785 0.058 2.475 0.174 0.689 0.115 1.342 0.328 1.958 0.636 0.541 0.283 1.039 0.649 1.496 1.099 0.455 0.45 0.85 0.964 1.182 1.543s0.59 1.196 0.775 1.852 0.277 1.305 0.277 1.948c0 0.694-0.092 1.369-0.277 2.025s-0.443 1.273-0.775 1.852-0.738 1.099-1.219 1.562-1.004 0.823-1.57 1.08l4.359 12.073h-4.25zm-0.19-18.591c0-0.54-0.135-1.054-0.406-1.543-0.271-0.488-0.652-0.874-1.145-1.157-0.32-0.179-0.616-0.302-0.887-0.366s-0.727-0.097-1.367-0.097h-4.691v6.326h4.691c0.615 0 1.065-0.025 1.348-0.077 0.283-0.051 0.585-0.167 0.905-0.347 0.492-0.282 0.874-0.675 1.145-1.176 0.28-0.503 0.41-1.023 0.41-1.563z"/><path id="path22" d="m159.7 87.621v-25.843h3.989v25.843h-3.99z"/><path id="path24" d="m178.46 88.084c-1.847 0-3.374-0.373-4.58-1.119-1.207-0.746-2.204-1.915-2.992-3.51-0.567-1.157-1.01-2.507-1.33-4.05-0.32-1.542-0.48-3.124-0.48-4.744 0-2.057 0.246-4.024 0.739-5.901 0.492-1.877 1.169-3.395 2.031-4.551 0.739-0.951 1.631-1.671 2.678-2.16 1.047-0.488 2.272-0.733 3.676-0.733 1.871 0 3.417 0.424 4.636 1.273s2.247 2.186 3.084 4.011l-3.656 1.62c-0.346-0.54-0.659-0.99-0.942-1.35s-0.579-0.642-0.887-0.849c-0.308-0.206-0.641-0.347-0.997-0.424-0.357-0.077-0.77-0.116-1.237-0.116-1.01 0-1.854 0.245-2.53 0.733-0.678 0.489-1.226 1.312-1.644 2.469-0.32 0.771-0.561 1.685-0.721 2.739-0.16 1.055-0.24 2.134-0.24 3.24 0 1.415 0.136 2.771 0.406 4.069 0.271 1.299 0.652 2.359 1.146 3.182 0.443 0.669 0.96 1.17 1.552 1.504 0.591 0.334 1.316 0.501 2.179 0.501 0.837 0 1.563-0.238 2.18-0.714 0.615-0.476 1.169-1.24 1.662-2.295l3.73 1.466c-1.49 3.806-3.97 5.709-7.47 5.709z"/><path id="path26" d="m205.9 87.621l-2.438-7.251h-7.72l-2.438 7.251h-4.174l8.533-25.843h3.878l8.533 25.843h-4.17zm-6.24-18.668l-2.549 7.251h4.95l-2.4-7.251z"/><path id="path28" d="m227.18 87.621l-9.456-17.511v17.511h-3.915v-25.843h3.915l9.013 16.508v-16.508h3.916v25.843h-3.47z"/></g><g id="g30" fill="#fff"><path id="path32" d="m112.68 114.05c0 1.183-0.209 2.276-0.628 3.279-0.419 1.002-1.022 1.877-1.81 2.623-0.689 0.643-1.496 1.138-2.419 1.485s-1.915 0.521-2.973 0.521c-2.143 0-3.971-0.598-5.485-1.793-1.515-1.196-2.691-2.783-3.528-4.764l3.731-1.427c0.517 1.234 1.231 2.179 2.143 2.835 0.911 0.656 1.958 0.984 3.14 0.984 1.157 0 2.087-0.367 2.789-1.1s1.053-1.639 1.053-2.719c0-0.849-0.216-1.543-0.646-2.083-0.431-0.54-0.991-0.996-1.681-1.369-0.689-0.373-1.447-0.7-2.271-0.983-0.825-0.283-1.644-0.591-2.457-0.926-0.369-0.154-0.825-0.373-1.367-0.656s-1.065-0.675-1.57-1.176-0.936-1.125-1.293-1.871-0.535-1.659-0.535-2.739c0-1.26 0.197-2.333 0.591-3.221 0.394-0.887 0.929-1.607 1.607-2.16 0.677-0.552 1.489-0.958 2.438-1.215 0.948-0.257 1.977-0.386 3.084-0.386 1.748 0 3.208 0.476 4.377 1.427 1.169 0.952 2.062 2.237 2.678 3.857l-3.472 1.08c-0.197-0.411-0.456-0.784-0.776-1.119-0.271-0.283-0.646-0.54-1.126-0.771s-1.065-0.359-1.754-0.386c-0.443-0.025-0.905 0.007-1.385 0.097s-0.905 0.25-1.274 0.482c-0.369 0.231-0.665 0.547-0.886 0.945-0.222 0.399-0.309 0.894-0.259 1.485 0.049 0.797 0.381 1.408 0.998 1.832 0.615 0.424 1.367 0.791 2.253 1.1 0.887 0.308 1.84 0.624 2.863 0.945 1.021 0.322 1.963 0.785 2.826 1.389 0.862 0.604 1.582 1.415 2.161 2.43 0.59 1.02 0.88 2.37 0.88 4.07z"/><path id="path34" d="m131.44 121.49l-2.438-7.251h-7.72l-2.438 7.251h-4.174l8.532-25.843h3.879l8.532 25.843h-4.17zm-6.24-18.67l-2.548 7.251h4.95l-2.4-7.25z"/><path id="path36" d="m154.71 121.49v-14.966l-5.726 14.966-5.725-14.966v14.966h-3.916v-25.84h3.916l5.725 14.503 5.726-14.503h3.914v25.843h-3.91z"/><path id="path38" d="m181.56 108.61c0 2.058-0.234 4.025-0.702 5.901-0.468 1.877-1.133 3.395-1.994 4.551-1.38 1.929-3.374 2.893-5.984 2.893-1.749 0-3.189-0.373-4.321-1.119-1.133-0.746-2.068-1.915-2.808-3.51-0.517-1.105-0.936-2.449-1.256-4.031s-0.48-3.144-0.48-4.687c0-2.134 0.24-4.114 0.721-5.94 0.48-1.826 1.139-3.356 1.977-4.59 0.738-0.977 1.618-1.703 2.641-2.179 1.021-0.476 2.247-0.714 3.676-0.714 1.575 0 2.918 0.373 4.025 1.119 1.108 0.746 2.057 1.916 2.845 3.51 0.517 1.157 0.923 2.507 1.219 4.05s0.44 3.13 0.44 4.75zm-3.91 0c0-1.466-0.124-2.822-0.37-4.069s-0.615-2.308-1.107-3.182c-0.395-0.668-0.844-1.157-1.349-1.466s-1.127-0.488-1.865-0.54c-0.961-0.051-1.761 0.181-2.401 0.694-0.641 0.515-1.17 1.35-1.588 2.507-0.32 0.771-0.561 1.704-0.721 2.796-0.16 1.093-0.24 2.179-0.24 3.259 0 1.389 0.123 2.726 0.37 4.011 0.245 1.286 0.615 2.34 1.107 3.163 0.394 0.669 0.862 1.17 1.404 1.504 0.541 0.334 1.206 0.501 1.994 0.501 0.911 0 1.668-0.257 2.271-0.771 0.604-0.514 1.114-1.35 1.533-2.507 0.123-0.334 0.246-0.739 0.369-1.215s0.228-0.977 0.314-1.504 0.153-1.061 0.203-1.601c0.06-0.55 0.09-1.08 0.09-1.59z"/><path id="path40" d="m201.62 121.49l-2.438-7.251h-7.72l-2.438 7.251h-4.174l8.533-25.843h3.878l8.533 25.843h-4.17zm-6.24-18.67l-2.549 7.251h4.95l-2.4-7.25z"/></g><text id="text42" font-size="111.87" font-family="&apos;Roadgeek 2014 Series D&apos;" transform="matrix(.9874 0 0 1 51.54 228.7)" fill="#FFFFFF">***NUMBER***</text>
+</g></svg>
diff --git a/shields/template_usamp.svg b/shields/template_usamp.svg
new file mode 100644
index 00000000..a8c5960f
--- /dev/null
+++ b/shields/template_usamp.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 601 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="layer1" transform="translate(-52.344 -245.38)">
+  <rect id="rect3755" rx="150" ry="150" height="300" width="525" y="270.89" x="90.349" fill="#fff"/>
+  <g id="g3759">
+   <rect id="rect2985" rx="37.5" ry="37.5" height="600" width="600" stroke="#000" y="245.89" x="52.849" fill="#fff"/>
+   <rect id="rect3757" rx="35" ry="35" height="595" width="595" y="248.39" x="55.349"/>
+  </g>
+  <path id="rect3773" d="m25.5 25.5v90c0 83.1 66.9 150 150 150l-150 310h550l-150-310c83.1 0 150-66.9 150-150s-0.56014-90 0-90h-550z" transform="translate(52.344 245.38)" fill="#fff"/>
+  <text id="text3780" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="447.76px" line-height="125%" y="695.88818" x="357.00116" font-family="Arial" fill="#000000"><tspan id="tspan3782" style="text-anchor:middle;text-align:center" y="695.88818" x="357.00116" font-family="&apos;Roadgeek 2014 Series B&apos;">***NUMBER***</tspan></text>
+ </g>
+</svg>
diff --git a/shields/template_usamp_wide.svg b/shields/template_usamp_wide.svg
new file mode 100644
index 00000000..3cfcb946
--- /dev/null
+++ b/shields/template_usamp_wide.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 751 601" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g id="layer1" transform="translate(-52.349 -245.39)">
+  <path id="rect3755" fill="#fff" d="m240.35 270.89h225c83.1 0 150 66.9 150 150s-66.9 150-150 150h-225c-83.1 0-150-66.9-150-150s66.9-150 150-150z"/>
+  <g id="g3759">
+   <path id="rect2985" d="m90.349 245.89h675c20.775 0 37.5 16.725 37.5 37.5v525c0 20.775-16.725 37.5-37.5 37.5h-675c-20.775 0-37.5-16.725-37.5-37.5v-525c0-20.775 16.725-37.5 37.5-37.5z" stroke="#000" fill="#fff"/>
+   <path id="rect3757" d="m90.349 248.39h675c19.39 0 35 15.61 35 35v525c0 19.39-15.61 35-35 35h-675c-19.39 0-35-15.61-35-35v-525c0-19.39 15.61-35 35-35z"/>
+  </g>
+  <path id="rect3773" d="m25.5 25.5v90c0 83.1 66.9 150 150 150l-150 310h700l-150-310c83.1 0 150-66.9 150-150s-0.56014-90 0-90z" transform="translate(52.344 245.38)" fill="#fff"/>
+  <text id="text3780" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="447.76px" line-height="125%" y="695.88818" x="426.73291" font-family="Arial" fill="#000000"><tspan id="tspan3782" style="text-anchor:middle;text-align:center" y="695.88818" x="426.73291" font-family="&apos;Roadgeek 2014 Series B&apos;">***NUMBER***</tspan></text>
+ </g>
+</svg>
diff --git a/shields/template_usanes_link.svg b/shields/template_usanes_link.svg
new file mode 100644
index 00000000..bab008de
--- /dev/null
+++ b/shields/template_usanes_link.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg43960" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata43965">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-554.39 236.83)">
+  <g id="g44799">
+   <rect id="rect44797" rx="37.5" ry="37.5" height="600" width="600" y="-236.83" x="554.39"/>
+   <path id="rect44794" d="m25 25h550l-100 550h-350z" transform="translate(554.39 -236.83)" fill="#fff"/>
+  </g>
+  <text id="text44828" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="334.82px" line-height="100%" y="63.171711" x="798.16663" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan44830" y="63.171711" x="798.16663">***NUMBER***</tspan></text>
+  <text id="text44842" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="251.87px" line-height="100%" y="63.172192" x="1007.9865" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan44844" y="63.172192" x="1007.9865">***LETTER***</tspan></text>
+  <g id="text45180">
+   <path id="path45213" d="m740.19 238.17v-99.702h14.286v86.458h36.458v13.244h-50.744"/>
+   <path id="path45215" d="m805 238.17v-99.702h13.988v99.702h-13.988"/>
+   <path id="path45217" d="m886.13 238.17-30.804-66.815v66.815h-14.286v-99.702h14.286l27.381 59.821v-59.821h14.286v99.702h-10.863"/>
+   <path id="path45219" d="m959.56 238.17-17.56-48.661-9.0774 16.815v31.845h-14.286v-99.702h14.286v39.881l22.768-39.881h16.518l-20.685 34.97 23.065 64.732h-15.03"/>
+  </g>
+ </g>
+</svg>
diff --git a/shields/template_usanes_spur.svg b/shields/template_usanes_spur.svg
new file mode 100644
index 00000000..46d1fdcf
--- /dev/null
+++ b/shields/template_usanes_spur.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg43960" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata43965">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-554.39 236.83)">
+  <g id="g44799">
+   <rect id="rect44797" rx="37.5" ry="37.5" height="600" width="600" y="-236.83" x="554.39"/>
+   <path id="rect44794" d="m25 25h550l-100 550h-350z" transform="translate(554.39 -236.83)" fill="#fff"/>
+  </g>
+  <text id="text44828" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="334.82px" line-height="100%" y="63.171711" x="798.16663" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan44830" y="63.171711" x="798.16663">***NUMBER***</tspan></text>
+  <text id="text44842" style="word-spacing:0px;letter-spacing:0px;text-anchor:middle;text-align:center" xml:space="preserve" font-size="251.87px" line-height="100%" y="63.172192" x="1007.9865" font-family="&apos;Roadgeek 2014 Series C&apos;" fill="#000000"><tspan id="tspan44844" y="63.172192" x="1007.9865">***LETTER***</tspan></text>
+  <g id="text45180">
+   <path id="path45185" d="m772.76 210.94c-0.00006 4.0675-0.7441 7.8869-2.2321 11.458-1.389 3.4722-3.3731 6.498-5.9524 9.0774-2.4802 2.5794-5.4068 4.6627-8.7798 6.25-3.2738 1.4881-6.8453 2.2321-10.714 2.2321-4.3651 0-8.2838-0.84326-11.756-2.5298s-6.3988-3.9682-8.7798-6.8452-4.2163-6.2004-5.506-9.9702-1.9345-7.6885-1.9345-11.756h13.988c-0.00002 2.0834 0.24799 4.1667 0.74404 6.25 0.59522 1.9842 1.4385 3.8195 2.5298 5.506 1.1904 1.5873 2.6289 2.877 4.3155 3.869 1.7857 0.99208 3.9186 1.4881 6.3988 1.4881 1.8849 0.00002 3.6706-0.39681 5.3572-1.1905 1.7857-0.79364 3.2738-1.8849 4.4643-3.2738 1.2896-1.3889 2.2817-2.9762 2.9762-4.7619 0.7936-1.8849 1.1904-3.8194 1.1905-5.8036-0.00005-2.877-0.59529-5.4067-1.7857-7.5893-1.1905-2.2817-3.2738-4.5635-6.25-6.8452-0.49607-0.49599-0.69448-0.74401-0.59523-0.74405 0.0992-0.0992-0.19846-0.39678-0.89286-0.89286-0.69448-0.49598-2.1826-1.4384-4.4643-2.8274-2.1826-1.488-5.8036-3.9682-10.863-7.4405-4.0675-2.7777-7.1429-6.0019-9.2262-9.6726-1.9841-3.7698-2.9762-7.8868-2.9762-12.351-0.00001-3.5714 0.64483-6.8948 1.9345-9.9702 1.2897-3.1745 3.0754-5.9523 5.3571-8.3333 2.3809-2.3809 5.1091-4.2162 8.1845-5.506 3.0754-1.3888 6.3988-2.0832 9.9702-2.0833 3.5714 0.0001 6.8452 0.64494 9.8214 1.9345 3.0754 1.2898 5.7043 3.0755 7.8869 5.3572 2.2817 2.2818 4.0674 5.01 5.3571 8.1845 1.3888 3.1747 2.1329 6.6469 2.2321 10.417h-13.69c-0.19846-3.4722-1.3889-6.2499-3.5714-8.3333-2.1826-2.0832-4.8612-3.1249-8.0357-3.125-3.2738 0.00009-6.0516 1.0914-8.3333 3.2738-2.2818 2.1826-3.4226 4.9108-3.4226 8.1845-0.00002 2.4802 0.64482 4.5636 1.9345 6.25 1.2896 1.6866 3.7698 3.5715 7.4405 5.6548 9.623 5.5556 16.617 11.21 20.982 16.964 4.4642 5.754 6.6964 12.252 6.6964 19.494"/>
+   <path id="path45187" d="m845.4 166.45c-0.00007 9.127-2.2818 16.071-6.8452 20.833-4.4643 4.762-10.913 7.1429-19.345 7.1429h-15.476v43.75h-14.286v-99.702h29.762c3.869 0.0001 7.3908 0.69455 10.565 2.0833 3.2738 1.2898 6.0515 3.1747 8.3333 5.6548 2.3809 2.381 4.1666 5.3076 5.3572 8.7798 1.2896 3.4723 1.9344 7.2917 1.9345 11.458m-13.988 0c-0.00006-4.1666-1.1905-7.5396-3.5714-10.119-2.381-2.5793-5.506-3.869-9.375-3.869h-14.732v28.274h14.732c4.1666 0.00006 7.3412-1.24 9.5238-3.7202 2.2817-2.4801 3.4226-6.0019 3.4226-10.565"/>
+   <path id="path45189" d="m915.16 208.41c-0.00006 1.9842-0.0993 3.7699-0.29762 5.3571-0.0993 1.5873-0.29768 3.0754-0.59523 4.4643-0.29769 1.2897-0.69451 2.5794-1.1905 3.869-0.4961 1.2897-1.0913 2.5794-1.7857 3.869-2.4802 4.0675-5.9028 7.4405-10.268 10.119-4.2659 2.5794-8.7798 3.869-13.542 3.869-4.9604 0-9.6726-1.2897-14.137-3.869-4.3651-2.5794-7.7877-5.9524-10.268-10.119-0.69446-1.2897-1.2897-2.5794-1.7857-3.869-0.49605-1.2897-0.89287-2.5794-1.1905-3.869-0.29763-1.3889-0.54565-2.877-0.74405-4.4643-0.0992-1.5873-0.14882-3.373-0.14881-5.3571v-69.94h14.286v71.726c-0.00003 4.7619 1.2896 8.5814 3.869 11.458 2.5793 2.877 5.9524 4.3155 10.119 4.3155 3.869 0.00002 7.0436-1.4385 9.5238-4.3155 2.5793-2.877 3.869-6.6964 3.869-11.458v-71.726h14.286v69.94"/>
+   <path id="path45191" d="m978.03 238.17-13.244-46.875h-13.69v46.875h-14.286v-99.702h29.762c3.869 0.0001 7.3908 0.64494 10.565 1.9345 3.2738 1.2898 6.0515 3.0755 8.3333 5.3571 2.3809 2.2818 4.1666 5.1092 5.3572 8.4821 1.2896 3.2739 1.9344 6.8949 1.9345 10.863-0.00007 5.9524-1.1905 11.012-3.5714 15.179-2.381 4.1667-5.9524 7.1429-10.714 8.9286l14.286 48.958h-14.732m0.74405-73.065c-0.00006-3.869-1.1905-6.9444-3.5714-9.2262-2.381-2.2817-5.506-3.4225-9.375-3.4226h-14.732v25.149h14.732c4.1666 0.00006 7.3412-1.0416 9.5238-3.125 2.2817-2.1825 3.4226-5.3075 3.4226-9.375"/>
+  </g>
+ </g>
+</svg>
diff --git a/stat.php b/stat.php
index 219826d0..9f2918b9 100644
--- a/stat.php
+++ b/stat.php
@@ -9,6 +9,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="/css/travelMapping.css"/>
+    <link rel="shortcut icon" type="image/png" href="/favicon.png">
     <!-- jQuery -->
     <script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
     <!-- TableSorter -->
@@ -46,23 +47,24 @@
 </script>
 <?php require $_SERVER['DOCUMENT_ROOT'] . "/lib/tmheader.php"; ?>
 <h1>Traveler Statistics</h1>
+<?php tm_user_select_form("\"\""); ?>
 <table style="margin: auto">
     <?php
-    $totalMileage = round(tm_sum_column("overallMileageByRegion", "activeMileage"));
-    $totalPreviewMileage = round(tm_sum_column("overallMileageByRegion", "activePreviewMileage"));
-    if ($tmuser == TM_NO_USER) {
-        echo "<form id=\"userselect\" action=\"\"><p>\n";
-        echo "<label>Current User: </label>\n";
-        tm_user_select();
-        echo "<input type=\"submit\" value=\"Select User\" />\n";
-        echo "</p></form>\n";
-    }else{
+    $totalMileage = round(tm_sum_column("overallMileageByRegion", "activeMileage"), 2);
+    $totalPreviewMileage = round(tm_sum_column("overallMileageByRegion", "activePreviewMileage"), 2);
+//    if ($tmuser == TM_NO_USER) {
+//        echo "<form id=\"userselect\" action=\"\"><p>\n";
+//        echo "<label>Current User: </label>\n";
+//        tm_user_select();
+//        echo "<input type=\"submit\" value=\"Select User\" />\n";
+//        echo "</p></form>\n";
+//    }else{
         echo <<<HTML
             <tr><td colspan="2">
                 <table class="gratable" id="usertable">
                     <thead>
                     <tr><th colspan="5">Current User</th></tr>
-                    <tr><th>User</th><th>Active Mileage</th><th>Rank</th><th>Active + Preview Mileage</th><th>Rank</th></tr>
+                    <tr><th>User</th><th>Active Distance Traveled</th><th>Rank</th><th>Active + Preview Distance Traveled</th><th>Rank</th></tr>
                     </thead><tbody>
 HTML;
         echo "<tr onClick=\"window.document.location='/user?u={$tmuser}';\">";
@@ -77,7 +79,9 @@
         $res = tmdb_query($sql);
         $row = tm_fetch_user_row_with_rank($res, 'clinchedMileage');
         echo "<td>{$row['traveler']}</td>";
-        echo "<td>{$row['clinchedMileage']} / {$totalMileage} ({$row['percentage']}%)</td>";
+        echo "<td>".tm_convert_distance($row['clinchedMileage'])." of ".tm_convert_distance($totalMileage)." ";
+	tm_echo_units();
+	echo " ({$row['percentage']}%)</td>";
         echo "<td>{$row['rank']}</td>";
 
         $sql = <<<SQL
@@ -90,26 +94,28 @@
 SQL;
         $res = tmdb_query($sql);
         $row = tm_fetch_user_row_with_rank($res, 'clinchedMileage');
-        echo "<td>{$row['clinchedMileage']} / {$totalPreviewMileage} ({$row['percentage']}%)</td>";
+        echo "<td>".tm_convert_distance($row['clinchedMileage'])." of ".tm_convert_distance($totalPreviewMileage)." ";
+	tm_echo_units();
+	echo " ({$row['percentage']}%)</td>";
         echo "<td>{$row['rank']}</td>";
         echo <<<HTML
                     </tr>
                     </tbody></table>
             </td></tr>
 HTML;
-    }
+//    }
     ?>
     <tr>
         <td>
             <table class="gratable tablesorter rankingstable">
                 <thead>
                 <tr>
-                    <th colspan="5">Traveler Mileage in Active Systems</th>
+                    <th colspan="5">Travels in Active Systems</th>
                 </tr>
                 <tr>
                     <th class="sortable">Rank</th>
                     <th class="sortable">Username</th>
-                    <th class="sortable">Miles Traveled</th>
+                    <th class="sortable">Distance Traveled (<?php tm_echo_units(); ?>)</th>
                     <th class="sortable">%</th>
                 </tr>
                 </thead>
@@ -131,9 +137,10 @@
                     } else {
                         $highlight = '';
                     }
+		    $print_distance = tm_convert_distance($row['clinchedMileage']);
                     echo <<<HTML
                 <tr class="$highlight" onClick="window.document.location='/user?u={$row['traveler']}';">
-                <td>{$rank}</td><td>{$row['traveler']}</td><td>{$row['clinchedMileage']}</td><td>{$row['percentage']}%</td>
+                <td>{$rank}</td><td>{$row['traveler']}</td><td>{$print_distance}</td><td>{$row['percentage']}%</td>
                 </tr>
 HTML;
                     $rank++;
@@ -148,12 +155,12 @@
             <table class="gratable tablesorter rankingstable">
                 <thead>
                 <tr>
-                    <th colspan="5">Traveler Mileage in Active and Preview Systems</th>
+                    <th colspan="5">Travels in Active and Preview Systems</th>
                 </tr>
                 <tr>
                     <th class="sortable">Rank</th>
                     <th class="sortable">Username</th>
-                    <th class="sortable">Miles Traveled</th>
+                    <th class="sortable">Distance Traveled (<?php tm_echo_units(); ?>)</th>
                     <th class="sortable">%</th>
                 </tr>
                 </thead>
@@ -175,9 +182,10 @@
                     } else {
                         $highlight = '';
                     }
+		    $print_distance = tm_convert_distance($row['clinchedMileage']);
                     echo <<<HTML
                 <tr class="$highlight" onClick="window.document.location='/user?u={$row['traveler']}';">
-                <td>{$rank}</td><td>{$row['traveler']}</td><td>{$row['clinchedMileage']}</td><td>{$row['percentage']}%</td>
+                <td>{$rank}</td><td>{$row['traveler']}</td><td>{$print_distance}</td><td>{$row['percentage']}%</td>
                 </tr>
 HTML;
                     $rank++;
@@ -192,4 +200,4 @@
 </table>
 </body>
 <?php require $_SERVER['DOCUMENT_ROOT'] . "/lib/tmfooter.php"; ?>
-</html>
\ No newline at end of file
+</html>
diff --git a/updateprod.csh b/updateprod.csh
deleted file mode 100644
index 5fa81900..00000000
--- a/updateprod.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/csh -f
-scp *.php blizzard.teresco.org:/home/www/tm/
-foreach dir (user lib devel hb shields css)
-  scp $dir/*.{php,js,svg,css} blizzard.teresco.org:/home/www/tm/$dir
-end
diff --git a/updateserver.sh b/updateserver.sh
new file mode 100644
index 00000000..5e644321
--- /dev/null
+++ b/updateserver.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+# Copy files from working directory of Web repository to the server
+#
+set -e
+shopt -s nullglob
+server=blizzard.teresco.org
+basedir=/home/www/
+rootdir=tmtest
+shieldsdir=
+otherdirs="user lib devel hb css graphs"
+while (( "$#" )); do
+
+    if [ "$1" == "--prod" ]; then
+	rootdir=tm
+    fi
+
+    if [ "$1" == "--shields" ]; then
+	shieldsdir=shields
+    fi
+    
+    shift
+done
+
+echo "Updating to $server:$basedir$rootdir, directories $otherdirs $shieldsdir"
+scp *.php $server:$basedir$rootdir
+for dir in $otherdirs $shieldsdir; do
+    scp $dir/*.{php,js,svg,css,png} $server:$basedir$rootdir/$dir
+done
diff --git a/updatetest.csh b/updatetest.csh
deleted file mode 100644
index 81b00751..00000000
--- a/updatetest.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/csh -f
-scp *.php blizzard.teresco.org:/home/www/tmtest/
-foreach dir (user lib devel hb shields css)
-  scp $dir/*.{php,js,svg,css} blizzard.teresco.org:/home/www/tmtest/$dir
-end
diff --git a/user/index.php b/user/index.php
index b46d099a..d4395829 100644
--- a/user/index.php
+++ b/user/index.php
@@ -10,6 +10,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
+    <link rel="shortcut icon" type="image/png" href="/favicon.png">
     <style type="text/css">
         #body {
             left: 0px;
@@ -103,13 +104,15 @@
             $res = tmdb_query($sql_command);
             $row = $res->fetch_assoc();
             $res->free();
-            echo "<tr class='notclickable' style=\"background-color:#EEEEFF\"><td>Miles Driven</td>";
-	    echo "<td>" . $row['clinchedActiveMileage'];
-	    echo "/" . $row['totalActiveMileage'] . " mi (";
-	    echo $row['activePercentage'] . "%) Rank: TBD</td>";
-	    echo "<td>" . $row['clinchedActivePreviewMileage'];
-	    echo "/" . $row['totalActivePreviewMileage'] . " mi (";
-	    echo $row['activePreviewPercentage'] . "%) Rank: TBD</td>";
+            echo "<tr class='notclickable' style=\"background-color:#EEEEFF\"><td>Distance Traveled</td>";
+	    echo "<td>" . tm_convert_distance($row['clinchedActiveMileage']);
+	    echo "/" . tm_convert_distance($row['totalActiveMileage']) . " ";
+	    tm_echo_units();
+	    echo " (" . $row['activePercentage'] . "%) Rank: TBD</td>";
+	    echo "<td>" . tm_convert_distance($row['clinchedActivePreviewMileage']);
+	    echo "/" . tm_convert_distance($row['totalActivePreviewMileage']) . " ";
+	    tm_echo_units();
+	    echo " (" . $row['activePreviewPercentage'] . "%) Rank: TBD</td>";
 	    echo "</tr>";
 
 
@@ -136,7 +139,7 @@
 	    $activePreviewRoutes = $row['total'];
 	    $res->free();
 
-            $sql_command = "SELECT COUNT(ccr.route) AS driven, SUM(ccr.clinched) AS clinched, ROUND(COUNT(ccr.route) / ".$activeRoutes." * 100,2) AS drivenPercent, ROUND(SUM(ccr.clinched) / ".$activeRoutes." * 100,2) AS clinchedPercent FROM connectedRoutes AS cr LEFT JOIN clinchedConnectedRoutes AS ccr ON cr.firstRoot = ccr.route AND traveler = '" . $tmuser . "' LEFT JOIN routes ON ccr.route = routes.root LEFT JOIN systems ON routes.systemName = systems.systemName WHERE (systems.level = 'active' OR systems.level = 'preview');";
+            $sql_command = "SELECT COUNT(ccr.route) AS driven, SUM(ccr.clinched) AS clinched, ROUND(COUNT(ccr.route) / ".$activePreviewRoutes." * 100,2) AS drivenPercent, ROUND(SUM(ccr.clinched) / ".$activePreviewRoutes." * 100,2) AS clinchedPercent FROM connectedRoutes AS cr LEFT JOIN clinchedConnectedRoutes AS ccr ON cr.firstRoot = ccr.route AND traveler = '" . $tmuser . "' LEFT JOIN routes ON ccr.route = routes.root LEFT JOIN systems ON routes.systemName = systems.systemName WHERE (systems.level = 'active' OR systems.level = 'preview');";
             $res = tmdb_query($sql_command);
             $row = $res->fetch_assoc();
 	    $activePreviewDriven = $row['driven'];
@@ -146,7 +149,7 @@
 	    $res->free();
 
             echo "<tr onclick=\"window.open('/shields/clinched.php?u={$tmuser}&amp;cort=traveled')\">";
-	    echo "<td>Routes Driven</td>";
+	    echo "<td>Routes Traveled</td>";
 	    echo "<td>".$activeDriven." of " . $activeRoutes . " (" . $activeDrivenPct . "%) Rank: TBD</td>";
 	    echo "<td>".$activePreviewDriven." of " . $activePreviewRoutes . " (" . $activePreviewDrivenPct . "%) Rank: TBD</td>";
 	    echo "</tr>";
@@ -169,12 +172,12 @@
         <tr>
             <th class="sortable">Country</th>
             <th class="sortable">Region</th>
-            <th class="sortable">Clinched (mi)</th>
-            <th class="sortable">Overall (mi)</th>
-            <th class="sortable">% Clinched</th>
-            <th class="sortable">Clinched (mi)</th>
-            <th class="sortable">Overall (mi)</th>
-            <th class="sortable">% Clinched</th>
+            <th class="sortable">Clinched (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">Overall (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">%</th>
+            <th class="sortable">Clinched (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">Overall (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">%</th>
             <th colspan="2">Map</th>
         </tr>
         </thead>
@@ -204,7 +207,7 @@
             }
             $activePreviewPercent = round($row['clinchedActivePreviewMileage'] / $row['totalActivePreviewMileage'] * 100.0, 2);
 	    $activePreviewPercent = sprintf('%0.2f', $activePreviewPercent);
-            echo "<tr onclick=\"window.document.location='/user/region.php?u=" . $tmuser . "&amp;rg=" . $row['code'] . "'\"><td>" . $row['country'] . "</td><td>" . $row['name'] . "</td><td>" . sprintf('%0.2f', $row['clinchedActiveMileage']) . "</td><td>" . sprintf('%0.2f', $row['totalActiveMileage']) . "</td><td>" . $activePercent . "%</td><td>" . sprintf('%0.2f', $row['clinchedActivePreviewMileage']) . "</td><td>" . sprintf('%0.2f', $row['totalActivePreviewMileage']) . "</td><td>" . $activePreviewPercent . "%</td><td class='link'><a href=\"/user/mapview.php?u=" . $tmuser . "&amp;rg=" . $row['code'] . "\">Map</a></td><td class='link'><a href='/hb?rg={$row['code']}'>HB</a></td></tr>";
+            echo "<tr onclick=\"window.document.location='/user/region.php?u=" . $tmuser . "&amp;rg=" . $row['code'] . "'\"><td>" . $row['country'] . "</td><td>" . $row['name'] . "</td><td>" . tm_convert_distance($row['clinchedActiveMileage']) . "</td><td>" . tm_convert_distance($row['totalActiveMileage']) . "</td><td>" . $activePercent . "%</td><td>" . tm_convert_distance($row['clinchedActivePreviewMileage']) . "</td><td>" . tm_convert_distance($row['totalActivePreviewMileage']) . "</td><td>" . $activePreviewPercent . "%</td><td class='link'><a href=\"/user/mapview.php?u=" . $tmuser . "&amp;rg=" . $row['code'] . "\">Map</a></td><td class='link'><a href='/hb?rg={$row['code']}'>HB</a></td></tr>";
         }
         $res->free();
         ?>
@@ -219,9 +222,9 @@
             <th class="sortable">System Name</th>
             <th class="sortable">Tier</th>
             <th class="sortable">Status</th>
-            <th class="sortable">Clinched Mileage</th>
-            <th class="sortable">Total Mileage</th>
-            <th class="sortable">Percent</th>
+            <th class="sortable">Clinched (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">Total (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">% Clinched</th>
             <th colspan="2">Map</th>
         </tr>
         </thead>
@@ -259,8 +262,8 @@
             echo "<td>" . $row['fullName'] . "</td>";
             echo "<td>Tier " . $row['tier'] . "</td>";
             echo "<td>" . $row['level'] . "</td>";
-            echo "<td>" . $row['clinchedMileage'] . "</td>";
-            echo "<td>" . $row['totalMileage'] . "</td>";
+            echo "<td>" . tm_convert_distance($row['clinchedMileage']) . "</td>";
+            echo "<td>" . tm_convert_distance($row['totalMileage']) . "</td>";
             echo "<td>" . $row['percentage'] . "%</td>";
             echo "<td class='link'><a href=\"/user/mapview.php?u={$tmuser}&amp;sys={$row['systemName']}\">Map</a></td>";
             echo "<td class='link'><a href='/hb?sys={$row['systemName']}'>HB</a></td></tr>";
diff --git a/user/mapview.php b/user/mapview.php
index 6202d6dc..9c005380 100644
--- a/user/mapview.php
+++ b/user/mapview.php
@@ -16,6 +16,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
+    <link rel="shortcut icon" type="image/png" href="/favicon.png">
     <style type="text/css">
         #controlbox {
             position: absolute;
@@ -208,16 +209,20 @@ function initFloatingHeaders($table) {
     <table id="routesTable" class="gratable tablesorter">
         <thead>
             <tr class="float" ><th class="sortable routeName">Route</th><th class="sortable systemName">System</th>
-                <th class="sortable clinched">Clinched</th><th class="sortable overall">Overall</th><th class="sortable percent">%</th></tr>
+                <th class="sortable clinched">Clinched (<?php tm_echo_units(); ?>)</th><th class="sortable overall">Overall (<?php tm_echo_units(); ?>)</th><th class="sortable percent">%</th></tr>
         </thead>
         <tbody>
-        <!-- TEMP FIX: dummy table line to account for the fact that the
+        <!-- TEMP FIX: 1 dummy table lines to account for the fact that the
 	styling places the table header row above on top of the first
-	row of data in the table -->
+	two rows of data in the table -->
         <tr><td class='routeName'>DUMMY</td>
             <td class='link systemName'>1. syst</td>
             <td class="clinched">0000</td><td class='overall'>0000</td><td class='percent'>0.00%</td>
 	</tr>
+        <tr><td class='routeName'>DUMMY</td>
+            <td class='link systemName'>2. syst</td>
+            <td class="clinched">0000</td><td class='overall'>0000</td><td class='percent'>0.00%</td>
+	</tr>
         <?php
 	// TODO: a toggle to include/exclude devel routes?
         $sql_command = <<<SQL
@@ -264,7 +269,7 @@ function initFloatingHeaders($table) {
                 <td class='link systemName'>{$row['tier']}. <a href='/user/system.php?u={$_GET['u']}&amp;sys={$row['systemName']}'>{$row['systemName']}</a></td>
                 <td class="clinched">
 HTML
-.$row['clinched']."</td><td class='overall'>".$row['total']."</td><td class='percent'>".$pct."%</td></tr>\n";
+.tm_convert_distance($row['clinched'])."</td><td class='overall'>".tm_convert_distance($row['total'])."</td><td class='percent'>".$pct."%</td></tr>\n";
         }
         ?>
         </tbody>
@@ -282,5 +287,5 @@ function initFloatingHeaders($table) {
     $tmdb->close();
 ?>
 
-<script type="application/javascript" src="../api/waypoints.js.php?<?php echo $_SERVER['QUERY_STRING']?>"></script>
+<script type="application/javascript" src="../lib/waypoints.js.php?<?php echo $_SERVER['QUERY_STRING']?>"></script>
 </html>
diff --git a/user/region.php b/user/region.php
index 957bbabe..a7b5c9e0 100644
--- a/user/region.php
+++ b/user/region.php
@@ -11,14 +11,31 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
+    <link rel="shortcut icon" type="image/png" href="/favicon.png">
     <style type="text/css">
 
+    	table.travelersTable {
+    	    font-size: 10pt;
+    	    border: 1px solid black;
+    	    border-spacing: 0px;
+    	    margin-left: auto;
+    	    margin-right: auto;
+    	    background-color: white;
+        }
+	
         table.gratable {
             max-width: 50%;
             width: 700px;
             margin-bottom: 15px;
             margin-top: 15px;
         }
+	
+        table.travelersTable {
+            max-width: 50%;
+            width: 100px;
+            margin-bottom: 15px;
+            margin-top: 15px;
+        }
 
         #mapholder {
             position: relative;
@@ -121,12 +138,15 @@ function redirect($link) {
         <?php tm_user_select(); ?>
         <label>Region: </label>
 	<?php tm_region_select(FALSE); ?>
+	<label>Units: </label>
+	<?php tm_units_select(); ?>
         <input type="submit" value="Update Map and Stats" />
     </form>
-    <a href="/user/index.php">Back to User Page</a>
+    Scroll down to see statistical reports below the map --
+    <a href="/user/index.php">User Page</a>
     <?php
         echo " -- <a href='/user/mapview.php?u={$tmuser}&rg={$region}'>View Larger Map</a>";
-        echo "<h1>Traveler Stats for {$tmuser} in {$region}:</h1>";
+        echo "<h1>Traveler Statistics for {$tmuser} in {$region}</h1>";
     ?>
 </div>
 <?php
@@ -146,11 +166,10 @@ function redirect($link) {
         </div>
         <div id="map"></div>
     </div>
-    <h6>TIP: Click on a column head to sort. Hold SHIFT in order to sort by multiple columns.</h6>
     <table class="gratable" id="overallTable">
         <thead>
-            <tr><th colspan="3">Overall Region Stats</th></tr>
-	    <tr><td /><td>Active Systems</td><td>Active+Preview Systems</td></tr>
+            <tr><th colspan="3">Overall <?php echo "$region"; ?> Region Statistics</th></tr>
+	    <tr><th /><th>Active Systems</th><th>Active+Preview Systems</th></tr>
         </thead>
         <tbody>
             <?php
@@ -159,42 +178,58 @@ function redirect($link) {
             SELECT o.activeMileage AS totalActiveMileage, c.traveler, c.activeMileage as activeClinched, round(c.activeMileage / o.activeMileage * 100, 2) AS activePercentage
             FROM clinchedOverallMileageByRegion AS c
             LEFT JOIN overallMileageByRegion AS o ON c.region = o.region
-            WHERE c.region = '$region'
+            WHERE c.region = '$region' AND c.activeMileage > 0
             ORDER BY activePercentage DESC;
 SQL;
-            $res = tmdb_query($sql_command);
-            $row = tm_fetch_user_row_with_rank($res, 'activePercentage');
-            $res->free();
-            $link = "redirect('/user/mapview.php?u=" . $tmuser . "&amp;rg=" . $region . "')";
+            $activeRes = tmdb_query($sql_command);
+            $row = tm_fetch_user_row_with_rank($activeRes, 'activePercentage');
+//            $link = "redirect('/user/mapview.php?u=" . $tmuser . "&amp;rg=" . $region . "')";
 	    $activeTotalMileage = $row['totalActiveMileage'];
 	    $activeClinchedMileage = $row['activeClinched'];
 	    $activeMileagePercentage = $row['activePercentage'];
 	    $activeMileageRank = $row['rank'];
 
+	    // build arrays that will form the contents of the travelers
+	    // by region stats for active systems
+	    $activeTravelerInfo = array();
+	    $activeRes->data_seek(0);
+	    while ($row = $activeRes->fetch_assoc()) {
+		$activeTravelerInfo[$row['traveler']]['activeClinched'] = $row['activeClinched'];
+		$activeTravelerInfo[$row['traveler']]['activePercentage'] = $row['activePercentage'];
+            }
+
 	    // and active+preview
             $sql_command = <<<SQL
             SELECT o.activePreviewMileage AS totalActivePreviewMileage, c.traveler, c.activePreviewMileage as activePreviewClinched, round(c.activePreviewMileage / o.activePreviewMileage * 100, 2) AS activePreviewPercentage
             FROM clinchedOverallMileageByRegion AS c
             LEFT JOIN overallMileageByRegion AS o ON c.region = o.region
-            WHERE c.region = '$region'
+            WHERE c.region = '$region' AND c.activePreviewMileage > 0
             ORDER BY activePreviewPercentage DESC;
 SQL;
-            $res = tmdb_query($sql_command);
-            $row = tm_fetch_user_row_with_rank($res, 'activePreviewPercentage');
-            $res->free();
-            $link = "redirect('/user/mapview.php?u=" . $tmuser . "&amp;rg=" . $region . "')";
+            $activePreviewRes = tmdb_query($sql_command);
+            $row = tm_fetch_user_row_with_rank($activePreviewRes, 'activePreviewPercentage');
+//            $link = "redirect('/user/mapview.php?u=" . $tmuser . "&amp;rg=" . $region . "')";
 	    $activePreviewTotalMileage = $row['totalActivePreviewMileage'];
 	    $activePreviewClinchedMileage = $row['activePreviewClinched'];
 	    $activePreviewMileagePercentage = $row['activePreviewPercentage'];
 	    $activePreviewMileageRank = $row['rank'];
- 
-            echo "<tr class='notclickable' style=\"background-color:#EEEEFF\"><td>Miles Driven</td>";
-	    echo "<td>" . $activeClinchedMileage;
-	    echo "/" . $activeTotalMileage . " mi (";
+
+	    // build arrays that will form the contents of the travelers
+	    // by region stats for active+preview systems
+	    $activePreviewTravelerInfo = array();
+	    $activePreviewRes->data_seek(0);
+	    while ($row = $activePreviewRes->fetch_assoc()) {
+		$activePreviewTravelerInfo[$row['traveler']]['activePreviewClinched'] = $row['activePreviewClinched'];
+		$activePreviewTravelerInfo[$row['traveler']]['activePreviewPercentage'] = $row['activePreviewPercentage'];
+            }
+
+            echo "<tr class='notclickable' style=\"background-color:#EEEEFF\"><td>Distance Traveled</td>";
+	    echo "<td>" . tm_convert_distance($activeClinchedMileage);
+	    echo " of " . tm_convert_distance($activeTotalMileage) . " " . $tmunits . " (";
 	    echo $activeMileagePercentage . "%) ";
 	    echo "Rank: " . $activeMileageRank . "</td>";
-	    echo "<td>" . $activePreviewClinchedMileage;
-	    echo "/" . $activePreviewTotalMileage . " mi (";
+	    echo "<td>" . tm_convert_distance($activePreviewClinchedMileage);
+	    echo " of " . tm_convert_distance($activePreviewTotalMileage) . " " .$tmunits . " (";
 	    echo $activePreviewMileagePercentage . "%) ";
 	    echo "Rank: " . $activePreviewMileageRank . "</td>";
 	    echo "</tr>";
@@ -222,14 +257,23 @@ function redirect($link) {
             ORDER BY clinchedPct DESC;
 SQL;
 
-            $res = tmdb_query($sql_command);
-            $row = tm_fetch_user_row_with_rank($res, 'clinchedPct');
-            $res->free();
+            $activeDrivenRes = tmdb_query($sql_command);
+            $row = tm_fetch_user_row_with_rank($activeDrivenRes, 'clinchedPct');
 	    $drivenActiveRoutes = $row['driven'];
 	    $drivenActiveRoutesPct = $row['drivenPct'];
 	    $clinchedActiveRoutes = $row['clinched'];
 	    $clinchedActiveRoutesPct = $row['clinchedPct'];
 	    $clinchedActiveRoutesRank = $row['rank'];
+	    $activeDrivenRes->data_seek(0);
+            $row = tm_fetch_user_row_with_rank($activeDrivenRes, 'drivenPct');
+	    $drivenActiveRoutesRank = $row['rank'];
+
+	    // add to the table of travelers by region stats
+	    $activeDrivenRes->data_seek(0);
+	    while ($row = $activeDrivenRes->fetch_assoc()) {
+		$activeTravelerInfo[$row['traveler']]['driven'] = $row['driven'];
+		$activeTravelerInfo[$row['traveler']]['clinched'] = $row['clinched'];
+            }
 
             $sql_command = <<<SQL
             SELECT
@@ -249,21 +293,30 @@ function redirect($link) {
             ORDER BY clinchedPct DESC;
 SQL;
 
-            $res = tmdb_query($sql_command);
-            $row = tm_fetch_user_row_with_rank($res, 'clinchedPct');
-            $res->free();
+            $activePreviewDrivenRes = tmdb_query($sql_command);
+            $row = tm_fetch_user_row_with_rank($activePreviewDrivenRes, 'clinchedPct');
 	    $drivenActivePreviewRoutes = $row['driven'];
 	    $drivenActivePreviewRoutesPct = $row['drivenPct'];
 	    $clinchedActivePreviewRoutes = $row['clinched'];
 	    $clinchedActivePreviewRoutesPct = $row['clinchedPct'];
 	    $clinchedActivePreviewRoutesRank = $row['rank'];
+	    $activePreviewDrivenRes->data_seek(0);
+            $row = tm_fetch_user_row_with_rank($activePreviewDrivenRes, 'drivenPct');
+	    $drivenActivePreviewRoutesRank = $row['rank'];
+
+	    // add to the table of travelers by region stats
+	    $activePreviewDrivenRes->data_seek(0);
+	    while ($row = $activePreviewDrivenRes->fetch_assoc()) {
+		$activePreviewTravelerInfo[$row['traveler']]['driven'] = $row['driven'];
+		$activePreviewTravelerInfo[$row['traveler']]['clinched'] = $row['clinched'];
+            }
 
 
 
             echo "<tr onClick=\"window.open('/shields/clinched.php?u={$tmuser}')\">";
 	    echo "<td>Routes Driven</td>";
-	    echo "<td>".$drivenActiveRoutes." of " . $totalActiveRoutes . " (" . $drivenActiveRoutesPct . "%) Rank: TBD</td>";
-	    echo "<td>".$drivenActivePreviewRoutes." of " . $totalActivePreviewRoutes . " (" . $drivenActivePreviewRoutesPct . "%) Rank: TBD</td>";
+	    echo "<td>".$drivenActiveRoutes." of " . $totalActiveRoutes . " (" . $drivenActiveRoutesPct . "%) Rank: ".$drivenActiveRoutesRank."</td>";
+	    echo "<td>".$drivenActivePreviewRoutes." of " . $totalActivePreviewRoutes . " (" . $drivenActivePreviewRoutesPct . "%) Rank: ".$drivenActivePreviewRoutesRank."</td>";
 	    echo "</tr>";
 
             echo "<tr onClick=\"window.open('/shields/clinched.php?u={$tmuser}')\">";
@@ -279,36 +332,33 @@ function redirect($link) {
         <caption>TIP: Click on a column head to sort. Hold SHIFT in order to sort by multiple columns.</caption>
         <thead>
         <tr>
-            <th colspan="6">Clinched Mileage by System</th>
+            <th colspan="6">Statistics by System</th>
         </tr>
         <tr>
             <th class="sortable">System Code</th>
             <th class="sortable">System Name</th>
-            <th class="sortable">Clinched Mileage</th>
-            <th class="sortable">Total Mileage</th>
-            <th class="sortable">Percent</th>
+            <th class="sortable">Clinched (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">Total (<?php tm_echo_units(); ?>)</th>
+            <th class="sortable">%</th>
             <th class="nonsortable">Map</th>
         </tr>
         </thead>
         <tbody>
         <?php
         $sql_command = <<<SQL
-          SELECT
-            sys.systemName,
-            sys.tier,
-            sys.level AS status,
-            sys.fullName,
-            COALESCE(ROUND(SUM(cr.mileage), 2), 0) AS clinchedMileage,
-            COALESCE(ROUND(SUM(r.mileage), 2), 0) AS totalMileage,
-            COALESCE(ROUND(SUM(cr.mileage) / SUM(r.mileage) * 100, 2), 0) AS percentage
-          FROM systems as sys
-          INNER JOIN routes AS r
-            ON r.systemName = sys.systemName
-          LEFT JOIN clinchedRoutes AS cr
-            ON cr.route = r.root AND cr.traveler = '{$tmuser}'
-          WHERE r.region = '{$region}'
-          GROUP BY r.systemName
-          ORDER BY sys.tier, sys.systemName;
+	SELECT
+	  systems.fullName,
+	  miByRegion.systemName,
+          ROUND(IFNULL(clinchedByRegion.mileage, 0), 2) as clinchedMileage,
+          ROUND(miByRegion.mileage, 2) as totalMileage,
+          ROUND(IFNULL(clinchedByRegion.mileage, 0) / miByRegion.mileage * 100, 2) as percentage
+        FROM systemMileageByRegion as miByRegion
+        LEFT JOIN clinchedSystemMileageByRegion as clinchedByRegion                         ON clinchedByRegion.systemName = miByRegion.systemName AND
+	       clinchedByRegion.region = '{$region}' AND
+	       clinchedByRegion.traveler='{$tmuser}'
+	       LEFT JOIN systems ON miByRegion.systemName = systems.systemName
+	       WHERE miByRegion.region = '{$region}'
+         ORDER BY percentage DESC;
 SQL;
 
         $res = tmdb_query($sql_command);
@@ -316,8 +366,8 @@ function redirect($link) {
             echo "<tr onClick=\"window.open('/user/system.php?u=" . $tmuser . "&sys=" . $row['systemName'] . "&amp;rg=" . $region . "')\" class=\"status-" . $row['status'] . "\">";
             echo "<td>" . $row['systemName'] . "</td>";
             echo "<td>" . $row['fullName'] . "</td>";
-            echo "<td>" . $row['clinchedMileage'] . "</td>";
-            echo "<td>" . $row['totalMileage'] . "</td>";
+            echo "<td>" . tm_convert_distance($row['clinchedMileage']) . "</td>";
+            echo "<td>" . tm_convert_distance($row['totalMileage']) . "</td>";
             echo "<td>" . $row['percentage'] . "%</td>";
             echo "<td class='link'><a href='/hb?rg={$region}&amp;sys={$row['systemName']}'>HB</a></td></tr>";
         }
@@ -327,8 +377,8 @@ function redirect($link) {
     </table>
     <table class="gratable tablesorter" id="routesTable">
         <thead>
-            <tr><th colspan="7">Stats by Route: (<?php echo "<a href=\"/user/mapview.php?u=".$tmuser."&amp;rg=".$region."\">" ?>Full Map)</a></th></tr>
-            <tr><th class="sortable">Tier</th><th class="sortable">Route</th><th class="sortable">#</th><th class="sortable">Clinched Mileage</th><th class="sortable">Total Mileage</th><th class="sortable">%</th><th class="nonsortable">Map</th></tr>
+            <tr><th colspan="7">Statistics by Route: (<?php echo "<a href=\"/user/mapview.php?u=".$tmuser."&amp;rg=".$region."\">" ?>Full Map)</a></th></tr>
+            <tr><th class="sortable">Tier</th><th class="sortable">Route</th><th class="sortable">#</th><th class="sortable">Clinched (<?php tm_echo_units(); ?>)</th><th class="sortable">Total (<?php tm_echo_units(); ?>)</th><th class="sortable">%</th><th class="nonsortable">Map</th></tr>
         </thead>
         <tbody>
             <?php
@@ -356,8 +406,8 @@ function redirect($link) {
                     }
                     echo "</td>";
                     echo "<td>{$row['systemName']}.{$row['root']}</td>";
-                    echo "<td>".$row['clinchedMileage']."</td>";
-                    echo "<td>".$row['totalMileage']."</td>";
+                    echo "<td>".tm_convert_distance($row['clinchedMileage'])."</td>";
+                    echo "<td>".tm_convert_distance($row['totalMileage'])."</td>";
                     echo "<td>".$row['percentage']."%</td>";
                     echo "<td class='link'><a href='/hb?u={$tmuser}&amp;r={$row['root']}'>HB</a></td></tr>";
                 }
@@ -365,12 +415,71 @@ function redirect($link) {
             ?>
         </tbody>
     </table>
+
+
+    <table class="travelersTable">
+    <thead>
+      <tr><th colspan="2">Travelers in Region <?php echo "$region"; ?></th></tr>
+      <tr><th>Active Systems</th><th>Active+Preview Systems</th></tr>
+    </thead>
+    <tbody>
+    <tr><td>
+    <table class="gratable tablesorter" id="activeTravelersTable" style="width: auto;">
+        <thead>
+            <tr><th class="sortable">Traveler</th><th class="sortable">Distance Traveled (<?php tm_echo_units(); ?>)</th><th>%</th><th class="sortable">Traveled Routes</th><th class="sortable">Clinched Routes</th></tr>
+        </thead>
+        <tbody>
+	  <tr style=><td>TOTAL CLINCHABLE</td><td><?php echo tm_convert_distance($activeTotalMileage); ?></td><td>100.00%</td><td><?php echo "$totalActiveRoutes"; ?></td><td><?php echo "$totalActiveRoutes"; ?></td></tr>
+	  <?php
+	  foreach ($activeTravelerInfo as $traveler => $stats) {
+	      if ($traveler == "") {
+                  continue;  // this happens, but how?!
+              }
+              if ($traveler == $tmuser) {
+                  $highlight = 'user-highlight';
+              } else {
+                 $highlight = '';
+              }
+	      echo "<tr class=\"".$highlight."\" onClick=\"window.document.location='?u=".$traveler."&rg=$region'\"><td>".$traveler."</td><td>".tm_convert_distance($stats['activeClinched'])."</td><td>".$stats['activePercentage']."%</td><td>".$stats['driven']."</td><td>".$stats['clinched']."</td></tr>\n";
+          }
+	  ?>
+	</tbody>
+	</table>
+    </td><td>
+    <table class="gratable tablesorter" id="activePreviewTravelersTable" style="width: auto;">
+        <thead>
+            <tr><th class="sortable">Traveler</th><th class="sortable">Distance Traveled (<?php tm_echo_units(); ?>)</th><th>%</th><th class="sortable">Traveled Routes</th><th class="sortable">Clinched Routes</th></tr>
+        </thead>
+        <tbody>
+	  <tr style=><td>TOTAL CLINCHABLE</td><td><?php echo tm_convert_distance($activePreviewTotalMileage); ?></td><td>100.00%</td><td><?php echo "$totalActivePreviewRoutes"; ?></td><td><?php echo "$totalActivePreviewRoutes"; ?></td></tr>
+	  <?php
+	  foreach ($activePreviewTravelerInfo as $traveler => $stats) {
+	      if ($traveler == "") {
+	          continue;  // this happens, but how?!
+              }
+              if ($traveler == $tmuser) {
+                  $highlight = 'user-highlight';
+              } else {
+                 $highlight = '';
+              }
+	      echo "<tr class=\"".$highlight."\" onClick=\"window.document.location='?u=".$traveler."&rg=$region'\"><td>".$traveler."</td><td>".tm_convert_distance($stats['activePreviewClinched'])."</td><td>".$stats['activePreviewPercentage']."%</td><td>".$stats['driven']."</td><td>".$stats['clinched']."</td></tr>\n";
+          }
+	  ?>
+	</tbody>
+	</table>
+    </td></tr></table>
+    
+
 </div>
 </div>
 <?php require  $_SERVER['DOCUMENT_ROOT']."/lib/tmfooter.php"; ?>
 </body>
 <?php
+    $activeRes->free();
+    $activeDrivenRes->free();
+    $activePreviewRes->free();
+    $activePreviewDrivenRes->free();
     $tmdb->close();
 ?>
-<script type="application/javascript" src="../api/waypoints.js.php?<?php echo $_SERVER['QUERY_STRING']?>"></script>
+<script type="application/javascript" src="../lib/waypoints.js.php?<?php echo $_SERVER['QUERY_STRING']?>"></script>
 </html>
diff --git a/user/smallintersection.png b/user/smallintersection.png
deleted file mode 100644
index aff56fbe..00000000
Binary files a/user/smallintersection.png and /dev/null differ
diff --git a/user/system.php b/user/system.php
index 01325a84..68c62351 100644
--- a/user/system.php
+++ b/user/system.php
@@ -12,6 +12,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
+    <link rel="shortcut icon" type="image/png" href="/favicon.png">
     <style type="text/css">
         table.gratable {
             max-width: 50%;
@@ -125,6 +126,8 @@
 	<?php tm_system_select(FALSE); ?>
         <label>Region: </label>
 	<?php tm_region_select(FALSE); ?>
+	<label>Units: </label>
+	<?php tm_units_select(); ?>
         <input type="submit" value="Update Map and Stats" />
     </form>
     <a href="/user/index.php">Back to User Page</a>
@@ -135,7 +138,7 @@
         }
         echo "'>View Larger Map</a>";
         echo "<h1>";
-        echo "Traveler Stats for " . $tmuser . " on " . $systemName;
+        echo "Traveler Statistics for " . $tmuser . " on " . $systemName;
         if ($region != "") {
             echo " in " . $regionName;
         }
@@ -157,7 +160,7 @@
         <div id="controlboxinfo"></div>
         <div id="map"></div>
         <table class="gratable tablesorter" id="overallTable">
-            <thead><tr><th colspan="2">System Stats</th></tr></thead>
+            <thead><tr><th colspan="2">System Statistics for <?php echo "$systemName"; ?></th></tr></thead>
             <tbody>
             <?php
 	    // get overall stats either for entire system or within
@@ -195,7 +198,7 @@
             $res->free();
 	    $percentage = $row['clinchedMileage'] / $system_mileage * 100;
             $link = "window.open('/shields/clinched.php?u=" . $tmuser . "&amp;sys=" . $system . "')";
-            echo "<tr style=\"background-color:#EEEEFF\"><td>Miles Driven</td><td>".sprintf('%0.2f', $row['clinchedMileage'])." of ".sprintf('%0.2f', $system_mileage)." mi (".sprintf('%0.2f',$percentage)."%) Rank: {$row['rank']}</td></tr>";
+            echo "<tr style=\"background-color:#EEEEFF\"><td>Distance Traveled</td><td>".tm_convert_distance($row['clinchedMileage'])." of ".tm_convert_distance($system_mileage)." ".$tmunits." (".sprintf('%0.2f',$percentage)."%) Rank: {$row['rank']}</td></tr>";
 
             //Second, fetch routes clinched/driven
             if ($region == "") {
@@ -230,7 +233,7 @@
             $res = tmdb_query($sql_command);
             $row = tm_fetch_user_row_with_rank($res, 'clinched');
             $res->free();
-            echo "<tr onClick=\"" . $link . "\"><td>Routes Driven</td><td>" . $row['driven'] . " of ".$totalRoutes." (" . round($row['driven'] / $totalRoutes * 100, 2) ."%)</td></tr>";
+            echo "<tr onClick=\"" . $link . "\"><td>Routes Traveled</td><td>" . $row['driven'] . " of ".$totalRoutes." (" . round($row['driven'] / $totalRoutes * 100, 2) ."%)</td></tr>";
 	    echo "<tr onClick=\"" . $link . "\"><td>Routes Clinched</td><td>" . $row['clinched'] . " of " . $totalRoutes . " (" . round($row['clinched'] / $totalRoutes * 100, 2) . "%) Rank: {$row['rank']}</td></tr>\n";
             ?>
             </tbody>
@@ -241,11 +244,11 @@
                 <table class="gratable tablesorter" id="regionsTable">
                     <caption>TIP: Click on a column head to sort. Hold SHIFT in order to sort by multiple columns.</caption>
                     <thead>
-                    <tr><th colspan="4">Statistics Per Region</th></tr>
+                    <tr><th colspan="4">Statistics by Region</th></tr>
                     <tr>
                         <th class="sortable">Region</th>
-                        <th class="sortable">Clinched Mileage</th>
-                        <th class="sortable">Total Mileage</th>
+                        <th class="sortable">Clinched ({$tmunits})</th>
+                        <th class="sortable">Total ({$tmunits})</th>
                         <th class="sortable">%</th>
                     </tr>
                     </thead>
@@ -265,11 +268,13 @@
 SQL;
             $res = tmdb_query($sql_command);
             while ($row = $res->fetch_assoc()) {
+		$clinched = tm_convert_distance($row['clinchedMileage']);
+		$total = tm_convert_distance($row['totalMileage']);
                 echo <<<HTML
                 <tr onclick='window.open("/user/system.php?u={$tmuser}&sys={$system}&rg={$row['region']}")'>
                     <td>{$row['region']}</td>
-                    <td>{$row['clinchedMileage']}</td>
-                    <td>{$row['totalMileage']}</td>
+                    <td>{$clinched}</td>
+                    <td>{$total}</td>
                     <td>{$row['percentage']}%</td>
                 </tr>
 HTML;
@@ -281,7 +286,7 @@
         <table class="gratable tablesorter" id="routeTable">
             <thead>
             <tr>
-                <th colspan="8">Statistics per Route</th>
+                <th colspan="8">Statistics by Route</th>
             </tr>
             <tr>
                 <th class="nonsortable">Route</th>
@@ -289,9 +294,9 @@
                 <th class="nonsortable">Banner</th>
                 <th class="nonsortable">Abbrev</th>
                 <th class="nonsortable">Section</th>
-                <th class="sortable">Clinched Mileage</th>
-                <th class="sortable">Total Mileage</th>
-                <th class="sortable">Percentage</th>
+                <th class="sortable">Clinched (<?php tm_echo_units(); ?>)</th>
+                <th class="sortable">Total (<?php tm_echo_units(); ?>)</th>
+                <th class="sortable">%</th>
             </tr>
             </thead>
             <tbody>
@@ -320,9 +325,9 @@
                 echo "<td>" . $row['banner'] . "</td>";
                 echo "<td>" . $row['abbrev'] . "</td>";
                 echo "<td>" . $row['city'] . "</td>";
-                echo "<td>" . $row['clinchedMileage'] . "</td>";
-                echo "<td>" . $row['totalMileage'] . "</td>";
-                echo "<td>" . $row['percentage'] . "%</td></tr>";
+                echo "<td>" . tm_convert_distance($row['clinchedMileage']) . "</td>";
+                echo "<td>" . tm_convert_distance($row['totalMileage']) . "</td>";
+                echo "<td>" . $row['percentage'] . "%</td></tr>\n";
             }
             $res->free();
             ?>
@@ -335,5 +340,5 @@
 <?php
     $tmdb->close();
 ?>
-<script type="application/javascript" src="../api/waypoints.js.php?<?php echo $_SERVER['QUERY_STRING']?>"></script>
+<script type="application/javascript" src="../lib/waypoints.js.php?<?php echo $_SERVER['QUERY_STRING']?>"></script>
 </html>

Graph Description	Collapsed Format Graph			Simple Format Graph
Graph Description	Download Link	Vertices	Edges	Download Link	Vertices	Edges
".$row[1]."	".$row[0]."	".$row[2]."	".$row[3]."	".$prevRow[0]."	".$prevRow[2]."	".$prevRow[3]."