diff --git a/Gemfile.lock b/Gemfile.lock
index 9f03b6b9..2ffbf6f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     blankslate (2.1.2.4)
     classifier-reborn (2.2.0)
diff --git a/run-jekyll.bat b/run-jekyll.bat
index 8f711dcc..1344bf6f 100644
--- a/run-jekyll.bat
+++ b/run-jekyll.bat
@@ -1,3 +1,3 @@
-jekyll serve -s source -d output --watch
+bundle exec jekyll serve -s source -d output --watch
 
 pause
\ No newline at end of file
diff --git a/source/implementations/registry/index.html b/source/implementations/registry/index.html
index db88743b..27f947d6 100644
--- a/source/implementations/registry/index.html
+++ b/source/implementations/registry/index.html
@@ -20,12 +20,13 @@
  <td valign="top">Description</td>
  <td valign="top"><strong>Person</strong> <a href="mailto:email">email</a> Phone linkedin</td>
  <td valign="top">
-   <a href="">More Info</a><br/>
+   <a href="https://simplifier.net/">More Info</a><br/>
    <a href="">Presentation</a> <br/>
    <a href="">Video</a>
  </td>
 </tr>
 
+
 //-->
 
 
@@ -42,9 +43,9 @@
  <td valign="top"><strong>Aidbox</strong></td>
  <td valign="top">A cloud FHIR platform for modern web and mobile healthcare applications.</td>
  <td valign="top"><strong>Pavel Smirnov</strong><br><a href="mailto:hello@health-samurai.io">hello@health-samurai.io</a></td>
- <td valign="top">   <a href="http://www.aidbox.io/">www.aidbox.io</a><br/>
+ <td valign="top">   <a href="https://www.health-samurai.io/aidbox">www.health-samurai.io/aidbox</a><br/>
    <a href="http://www.hl7.org/events/fhir/roundtable/2017/03/pdfs/E-24_Pavel-Smirnov.pdf">Presentation</a> <br/>
-   <a href="https://www.youtube.com/watch?v=j1JYWzo-JvI">Video</a> </td>
+   <a href="https://www.youtube.com/watch?v=DVSEfOQzV8I">Video</a> </td>
 </tr>
 
 <tr style="border-bottom: 1px solid lightgray">
@@ -153,6 +154,14 @@
    <a href="https://www.youtube.com/watch?v=jbUP6ywbgbE">Video</a> </td>
 </tr>
 
+<tr style="border-bottom: 1px solid lightgray">
+ <td valign="top"><strong>eConnect</strong></td>
+ <td valign="top">Connecting EHR and EDC for real depends on having a solid standard like FHIR, APIs to connect the systems, and industry expertise to bring them together.</td>
+ <td valign="top"><strong>Geoff Low</strong></td>
+ <td valign="top">   <a href="http://www.hl7.org/events/fhir/roundtable/2017/03/pdfs/B-11_Geoff-Low.pdf">Presentation</a> <br/>
+   <a href="https://www.youtube.com/watch?v=cv_H42onU28">Video</a> </td>
+</tr>
+
 <tr style="border-bottom: 1px solid lightgray">
  <td valign="top"><strong>Encounter Inquiry API</strong></td>
  <td valign="top">Member Encounter Inquiry API: Cambia's business partners access this API to retrieve member/patient encounter data. This API is implmented using the public HAPI FHIR 2.2 library based on STU3 1.8.0 version. This API is deployed on the AWS Cloud and uses RDS MySQL as the persistence store for the FHIR repository. HL7 V2.5.1 ADT messages are ingested from several clinical clearinghouses, transformed into FHIR Encounter resources and loaded into the FHIR repository.</td>
@@ -205,6 +214,24 @@
    <a href="https://www.youtube.com/watch?v=QO4NljkJ9T8">Video</a> </td>
 </tr>
 
+<tr style="border-bottom: 1px solid lightgray">
+ <td valign="top"><strong>Firely Server (aka Vonk)</strong></td>
+ <td valign="top">Firely Server is the turn-key, enterprise-grade FHIR server by Firely. It is built using Microsoft ASP.NET Core, offers cross-platform support and can be hosted on-premise and in the cloud. Firely Server can run either as a full FHIR server using SQL Server or MongoDB for storage, or as a Facade. The Facade connects directly to your proprietary non-FHIR data source or API. Firely Server is highly compliant to the FHIR spec, and supports transactions, bulk data export, SMART on FHIR, validation and internal and external terminology servers. Next to that, Firely Server supports custom resources and provides a plugin framework that makes it highly customizable. We are fully compliant with the ONC’s 21st Century Cures Act, Final Rule (‘all green’ in Inferno) and the CMS Interoperability and Patient Access Final Rule. Try it out yourself using our <a href="https://server.fire.ly/">public endpoint</a> or download a trial version from <a href="https://simplifier.net/firely-server">Simplifier.net</a>.</td>
+ <td valign="top"><a href="mailto:server@fire.ly">server@fire.ly</a></td>
+ <td valign="top">
+   <a href="https://fire.ly/products/firely-server/">More information and download</a><br/>
+ </td>
+</tr>
+
+<tr style="border-bottom: 1px solid lightgray">
+ <td valign="top"><strong>Forge</strong></td>
+ <td valign="top">Forge is the feature complete GUI (graphical user interface) by Firely and the de-facto standard for FHIR “profiling” used by major FHIR implementation projects. It allows users to create FHIR profiles, extensions, logical models, search parameters and operation definitions in an easy to understand desktop user interface, providing real time validation feedback. For collaboration and project-level validation it provides a direct connection to share these FHIR resources on Simplifier.net.</td>
+ <td valign="top"><a href="mailto:forge@fire.ly">forge@fire.ly</a></td>
+ <td valign="top">
+   <a href="https://fire.ly/products/forge/">More information and download</a><br/>
+ </td>
+</tr>
+
 <tr style="border-bottom: 1px solid lightgray">
  <td valign="top"><strong>Green Circle Health Platform</strong></td>
  <td valign="top">Recent winner of health data aggregator challenge-allows family to manage life long health data, augment with personal health and activity data and build health and wellness plan to improve outcomes and well-being</td>
@@ -420,6 +447,17 @@
    <a href="https://www.youtube.com/watch?v=gpzJXksXHe8">Video</a> </td>
 </tr>
 
+<tr style="border-bottom: 1px solid lightgray">
+ <td valign="top"><strong>Simplifier.net</strong></td>
+ <td valign="top"><a href="http://simplifier.net/">Simplifier.net</a> is the FHIR collaboration platform by Firely, with access to all published FHIR content in the world. <a href="http://simplifier.net/">Simplifier.net</a> allows users to document their FHIR projects with an Implementation Guide and create stable, versioned FHIR packages to publicly or privately share with the FHIR implementation community. Simplifier also powers the official HL7 FHIR Registry, making sure that content published on Simplifier is directly visible in all official FHIR channels. Simplifier acts as the 'GitHub' for the FHIR Profiling community and integrates directly with <a href="http://github.com/">Github.com</a> too.</td>
+ <td valign="top"><strong>simplifier@fire.ly</strong> <a href="mailto:simplifier@fire.ly">email</a></td>
+ <td valign="top">
+   <a href="https://fire.ly/products/simplifier-net/">More information and getting started
+
+ </a><br/>
+ </td>
+</tr>
+
 <tr style="border-bottom: 1px solid lightgray">
  <td valign="top"><strong>Smile CDR</strong></td>
  <td valign="top">Smile CDR is a proven enterprise-class FHIR-based clinical data repository as a service. SMILE is a Clinical Data Repository (CDR) built around the HL7 FHIR standard. It is a proven enterprise-class FHIR-based Clinical Data Repository As A Service. It can power your applications and unlock your data. We are powered by HAPI, a well established platform that has been used to successfully integrate healthcare data for over 15 years. Our platform was developed to help organizations overcome data barriers. We support the entire FHIR specification in order to power the next generation of specialized healthcare apps. We support legacy data too with adaptors to other standards (HL7 V2.x, CDA, XML, etc). SMILE is designed to get you up and running quickly</td>
@@ -455,6 +493,15 @@
    <a href="https://www.youtube.com/watch?v=AN0BBdA5ltA">Video</a> </td>
 </tr>
 
+<tr style="border-bottom: 1px solid lightgray">
+ <td valign="top"><strong>Firely Terminal</strong></td>
+ <td valign="top">Firely Terminal is the cross-platform command line FHIR application by Firely. It allows you to automate your FHIR workflows with support for validation, transforming resources between XML and JSON, splitting bundles into individual resources and the reverse and generating snapshots. It also allows for FHIR API interactions, querying over remote and local FHIR resources and synchronization with your <a href="http://simplifier.net/">Simplifier.net</a> projects.</td>
+ <td valign="top"><a href="mailto:info@fire.ly">info@fire.ly</a></td>
+ <td valign="top">
+   <a href="https://fire.ly/products/firely-terminal/">More information and download</a><br/>
+ </td>
+</tr>
+
 <tr style="border-bottom: 1px solid lightgray">
  <td valign="top"><strong>Vibrent Health: S4S – FHIR Application to connect Precision Medicine Initiative (PMI) to EHRs</strong></td>
  <td valign="top">Sync 4 Science (S4S) program will allow individuals to access their health data and send it to researchers. The pilot program will build off existing community standards and specification efforts (e.g., FHIR, SMART Health IT, Argonaut, CMS EHR Incentive Program) to support a key use case, giving patients an easy way to share their health data with researchers. EHR developers-including Allscripts, Athenahealth, Cerner, drchrono, Epic and McKesson-said they will embrace open specs including S4S APIs and FHIR to connect research apps to electronic health records software. Vendors will implement a "consistent, standards-based workflow," building on open specifications such as OAuth and HL7's FHIR protocol.<br><br>S4S goals include developing methods to facilitate individually-controlled clinical data donations to research, accelerate and guide the national ecosystem for patient-mediated data access through APIs thus allowing patients to access data via the application of their choice – giving patients more options to view, aggregate, and understand their health data and collecting information on individual participant preferences on alternative approaches for data donation.</td>
@@ -463,13 +510,5 @@
    <a href="https://www.youtube.com/watch?v=I2uipPk8eio">Video</a> </td>
 </tr>
 
-<tr style="border-bottom: 1px solid lightgray">
- <td valign="top"><strong>eConnect</strong></td>
- <td valign="top">Connecting EHR and EDC for real depends on having a solid standard like FHIR, APIs to connect the systems, and industry expertise to bring them together.</td>
- <td valign="top"><strong>Geoff Low</strong></td>
- <td valign="top">   <a href="http://www.hl7.org/events/fhir/roundtable/2017/03/pdfs/B-11_Geoff-Low.pdf">Presentation</a> <br/>
-   <a href="https://www.youtube.com/watch?v=cv_H42onU28">Video</a> </td>
-</tr>
-
 </tbody>
 </table>
diff --git a/source/packages/fhir.tx.support.r2/0.3.0/package.tgz b/source/packages/fhir.tx.support.r2/0.3.0/package.tgz
new file mode 100644
index 00000000..93a953f5
Binary files /dev/null and b/source/packages/fhir.tx.support.r2/0.3.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r2/package-list.json b/source/packages/fhir.tx.support.r2/package-list.json
index a9912500..12917f60 100644
--- a/source/packages/fhir.tx.support.r2/package-list.json
+++ b/source/packages/fhir.tx.support.r2/package-list.json
@@ -4,13 +4,21 @@
   "canonical": "http://fhir.org/packages/fhir.tx.support.r2",
   "introduction": "Supporting Terminology Resources for R2 servers",
   "list": [
+    {
+      "version": "0.3.0",
+      "desc": "Fix Dependency",
+      "path": "http://fhir.org/packages/fhir.tx.support.r2/0.3.0",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-24"
+    },
     {
       "version": "0.2.1",
       "desc": "Fix FHIR Versions in package description",
       "path": "http://fhir.org/packages/fhir.tx.support.r2/0.2.1",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-05-13"
     },
     {
diff --git a/source/packages/fhir.tx.support.r2/package.tgz b/source/packages/fhir.tx.support.r2/package.tgz
index 7a4ce8ad..93a953f5 100644
Binary files a/source/packages/fhir.tx.support.r2/package.tgz and b/source/packages/fhir.tx.support.r2/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.10.0/package.tgz b/source/packages/fhir.tx.support.r3/0.10.0/package.tgz
new file mode 100644
index 00000000..c226f4b4
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.10.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.11.0/package.tgz b/source/packages/fhir.tx.support.r3/0.11.0/package.tgz
new file mode 100644
index 00000000..acad9e91
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.11.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.12.0/package.tgz b/source/packages/fhir.tx.support.r3/0.12.0/package.tgz
new file mode 100644
index 00000000..ac8d8a68
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.12.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.13.0/package.tgz b/source/packages/fhir.tx.support.r3/0.13.0/package.tgz
new file mode 100644
index 00000000..23b44259
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.13.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.5.0/package.tgz b/source/packages/fhir.tx.support.r3/0.5.0/package.tgz
new file mode 100644
index 00000000..3c5f0f59
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.5.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.6.0/package.tgz b/source/packages/fhir.tx.support.r3/0.6.0/package.tgz
new file mode 100644
index 00000000..8e3aa43c
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.6.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.7.0/package.tgz b/source/packages/fhir.tx.support.r3/0.7.0/package.tgz
new file mode 100644
index 00000000..1c7c6519
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.7.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.8.0/package.tgz b/source/packages/fhir.tx.support.r3/0.8.0/package.tgz
new file mode 100644
index 00000000..9f2fcd1e
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.8.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/0.9.0/package.tgz b/source/packages/fhir.tx.support.r3/0.9.0/package.tgz
new file mode 100644
index 00000000..adaa2c59
Binary files /dev/null and b/source/packages/fhir.tx.support.r3/0.9.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r3/package-list.json b/source/packages/fhir.tx.support.r3/package-list.json
index de21857d..d7d90aaa 100644
--- a/source/packages/fhir.tx.support.r3/package-list.json
+++ b/source/packages/fhir.tx.support.r3/package-list.json
@@ -4,13 +4,85 @@
   "canonical": "http://fhir.org/packages/fhir.tx.support.r3",
   "introduction": "Supporting Terminology Resources for R3 servers",
   "list": [
+    {
+      "version": "0.13.0",
+      "desc": "Add MVX, MDC and ICD-10 (WHO)",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.13.0",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2021-06-15"
+    },
+    {
+      "version": "0.12.0",
+      "desc": "Update CVX code system version",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.12.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2021-04-16"
+    },
+    {
+      "version": "0.11.0",
+      "desc": "Update CVX code system",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.11.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2021-04-15"
+    },
+    {
+      "version": "0.10.0",
+      "desc": "Update ICD-9-CM codes",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.10.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-12-10"
+    },
+    {
+      "version": "0.9.0",
+      "desc": "Add jurisdiction and fix ATC",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.9.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-12-01"
+    },
+    {
+      "version": "0.8.0",
+      "desc": "Update ICD-10-CM to list all codes",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.8.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-11-17"
+    },
+    {
+      "version": "0.7.0",
+      "desc": "Update ATC code system",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.7.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-10-20"
+    },
+    {
+      "version": "0.6.0",
+      "desc": "fix dependency",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.6.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-10-08"
+    },
+    {
+      "version": "0.5.0",
+      "desc": "fix dependency",
+      "path": "http://fhir.org/packages/fhir.tx.support.r3/0.5.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-24"
+    },
     {
       "version": "0.4.0",
       "desc": "fix NUCC abstract codes",
       "path": "http://fhir.org/packages/fhir.tx.support.r3/0.4.0",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-08-05"
     },
     {
diff --git a/source/packages/fhir.tx.support.r3/package.tgz b/source/packages/fhir.tx.support.r3/package.tgz
index 770a34db..23b44259 100644
Binary files a/source/packages/fhir.tx.support.r3/package.tgz and b/source/packages/fhir.tx.support.r3/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.10.0/package.tgz b/source/packages/fhir.tx.support.r4/0.10.0/package.tgz
new file mode 100644
index 00000000..d5223ba7
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.10.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.11.0/package.tgz b/source/packages/fhir.tx.support.r4/0.11.0/package.tgz
new file mode 100644
index 00000000..c1240db3
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.11.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.12.0/package.tgz b/source/packages/fhir.tx.support.r4/0.12.0/package.tgz
new file mode 100644
index 00000000..b521a072
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.12.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.13.0/package.tgz b/source/packages/fhir.tx.support.r4/0.13.0/package.tgz
new file mode 100644
index 00000000..dd497281
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.13.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.5.0/package.tgz b/source/packages/fhir.tx.support.r4/0.5.0/package.tgz
new file mode 100644
index 00000000..f07eb5a2
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.5.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.6.0/package.tgz b/source/packages/fhir.tx.support.r4/0.6.0/package.tgz
new file mode 100644
index 00000000..968bbb88
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.6.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.7.0/package.tgz b/source/packages/fhir.tx.support.r4/0.7.0/package.tgz
new file mode 100644
index 00000000..9c7d25d4
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.7.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.8.0/package.tgz b/source/packages/fhir.tx.support.r4/0.8.0/package.tgz
new file mode 100644
index 00000000..10f83a67
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.8.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/0.9.0/package.tgz b/source/packages/fhir.tx.support.r4/0.9.0/package.tgz
new file mode 100644
index 00000000..bdcc9f15
Binary files /dev/null and b/source/packages/fhir.tx.support.r4/0.9.0/package.tgz differ
diff --git a/source/packages/fhir.tx.support.r4/package-list.json b/source/packages/fhir.tx.support.r4/package-list.json
index f1b184cd..09c97704 100644
--- a/source/packages/fhir.tx.support.r4/package-list.json
+++ b/source/packages/fhir.tx.support.r4/package-list.json
@@ -4,13 +4,85 @@
   "canonical": "http://fhir.org/packages/fhir.tx.support.r4",
   "introduction": "Supporting Terminology Resources for R4 servers",
   "list": [
+    {
+      "version": "0.13.0",
+      "desc": "Add MVX, MDC and ICD-10 (WHO)",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.13.0",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2021-06-15"
+    },
+    {
+      "version": "0.12.0",
+      "desc": "Update CVX code system version",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.12.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2021-04-16"
+    },
+    {
+      "version": "0.11.0",
+      "desc": "Update CVX code system",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.11.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2021-04-15"
+    },
+    {
+      "version": "0.10.0",
+      "desc": "Update ICD-9-CM codes",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.10.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-12-10"
+    },
+    {
+      "version": "0.9.0",
+      "desc": "Add jurisdiction value set",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.9.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-12-01"
+    },
+    {
+      "version": "0.8.0",
+      "desc": "Update ICD-10-CM to list all codes",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.8.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-11-17"
+    },
+    {
+      "version": "0.7.0",
+      "desc": "Update ATC Code system",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.7.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-10-20"
+    },
+    {
+      "version": "0.6.0",
+      "desc": "Update NUCC Package",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.6.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-10-08"
+    },
+    {
+      "version": "0.5.0",
+      "desc": "Fix Dependency",
+      "path": "http://fhir.org/packages/fhir.tx.support.r4/0.5.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-24"
+    },
     {
       "version": "0.4.0",
       "desc": "Fix NUCC abstract codes",
       "path": "http://fhir.org/packages/fhir.tx.support.r4/0.4.0",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-08-05"
     },
     {
diff --git a/source/packages/fhir.tx.support.r4/package.tgz b/source/packages/fhir.tx.support.r4/package.tgz
index 17108c0a..dd497281 100644
Binary files a/source/packages/fhir.tx.support.r4/package.tgz and b/source/packages/fhir.tx.support.r4/package.tgz differ
diff --git a/source/packages/hl7.fhir.pubpack/0.0.8/package.tgz b/source/packages/hl7.fhir.pubpack/0.0.8/package.tgz
new file mode 100644
index 00000000..4db09672
Binary files /dev/null and b/source/packages/hl7.fhir.pubpack/0.0.8/package.tgz differ
diff --git a/source/packages/hl7.fhir.pubpack/0.0.9/package.tgz b/source/packages/hl7.fhir.pubpack/0.0.9/package.tgz
new file mode 100644
index 00000000..7a0de074
Binary files /dev/null and b/source/packages/hl7.fhir.pubpack/0.0.9/package.tgz differ
diff --git a/source/packages/hl7.fhir.pubpack/package-list.json b/source/packages/hl7.fhir.pubpack/package-list.json
index 0659405c..50b2d284 100644
--- a/source/packages/hl7.fhir.pubpack/package-list.json
+++ b/source/packages/hl7.fhir.pubpack/package-list.json
@@ -4,13 +4,29 @@
   "canonical": "http://fhir.org/packages/hl7.fhir.pubpack",
   "introduction": "This package contains miscellaineous binaries files to support publishing IGs (mostly images)",
   "list": [
+    {
+      "version": "0.0.9",
+      "desc": "Add icons for questionnaire rendering",
+      "path": "http://fhir.org/packages/hl7.fhir.pubpack/0.0.9",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2021-06-16"
+    },
+    {
+      "version": "0.0.8",
+      "desc": "Add prism to pubpack",
+      "path": "http://fhir.org/packages/hl7.fhir.pubpack/0.0.8",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-12-01"
+    },
     {
       "version": "0.0.7",
       "desc": "Fix Code System Comparison template",
       "path": "http://fhir.org/packages/hl7.fhir.pubpack/0.0.7",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-07-31"
     },
     {
diff --git a/source/packages/hl7.fhir.pubpack/package.tgz b/source/packages/hl7.fhir.pubpack/package.tgz
index cd2a3631..7a0de074 100644
Binary files a/source/packages/hl7.fhir.pubpack/package.tgz and b/source/packages/hl7.fhir.pubpack/package.tgz differ
diff --git a/source/packages/hl7.fhir.xver-extensions/0.0.5/package.tgz b/source/packages/hl7.fhir.xver-extensions/0.0.5/package.tgz
new file mode 100644
index 00000000..61748c49
Binary files /dev/null and b/source/packages/hl7.fhir.xver-extensions/0.0.5/package.tgz differ
diff --git a/source/packages/hl7.fhir.xver-extensions/0.0.6/package.tgz b/source/packages/hl7.fhir.xver-extensions/0.0.6/package.tgz
new file mode 100644
index 00000000..45d2ae5b
Binary files /dev/null and b/source/packages/hl7.fhir.xver-extensions/0.0.6/package.tgz differ
diff --git a/source/packages/hl7.fhir.xver-extensions/package-list.json b/source/packages/hl7.fhir.xver-extensions/package-list.json
index 7207106a..33f2f07c 100644
--- a/source/packages/hl7.fhir.xver-extensions/package-list.json
+++ b/source/packages/hl7.fhir.xver-extensions/package-list.json
@@ -4,13 +4,29 @@
   "canonical": "http://fhir.org/packages/hl7.fhir.xver-extensions",
   "introduction": "Special Package for cross-version extension support",
   "list": [
+    {
+      "version": "0.0.6",
+      "desc": "fix stated FHIRversion for package",
+      "path": "http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.6",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-12-10"
+    },
+    {
+      "version": "0.0.5",
+      "desc": "Update R5 to 4.5.0",
+      "path": "http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.5",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-17"
+    },
     {
       "version": "0.0.4",
       "desc": "Update R5 to 4.4.0",
       "path": "http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.4",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-05-05"
     },
     {
diff --git a/source/packages/hl7.fhir.xver-extensions/package.tgz b/source/packages/hl7.fhir.xver-extensions/package.tgz
index 9b49b38b..45d2ae5b 100644
Binary files a/source/packages/hl7.fhir.xver-extensions/package.tgz and b/source/packages/hl7.fhir.xver-extensions/package.tgz differ
diff --git a/source/packages/package-feed.bak b/source/packages/package-feed.bak
index 2399b054..6bcd9397 100644
--- a/source/packages/package-feed.bak
+++ b/source/packages/package-feed.bak
@@ -4,11 +4,261 @@
     <description>New Support Packages published by FHIR Foundation</description>
     <link>http://fhir.org/packages/package-feed.xml</link>
     <generator>HL7 FHIR Publication tooling</generator>
-    <lastBuildDate>Tue, 25 Aug 2020 03:48:09</lastBuildDate>
+    <lastBuildDate>Tue, 15 Jun 2021 09:33:00</lastBuildDate>
     <atom:link href="http://fhir.org/packages/package-feed.xml" rel="self" type="application/rss+xml"/>
     <pubDate>Thu, 07 Nov 2019 03:11:36</pubDate>
     <language>en</language>
     <ttl>600</ttl>
+    <item>
+      <title>fhir.tx.support.r3#0.13.0</title>
+      <description>Add MVX, MDC and ICD-10 (WHO)</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.13.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.13.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Tue, 15 Jun 2021 09:33:00</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.13.0</title>
+      <description>Add MVX, MDC and ICD-10 (WHO)</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.13.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.13.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Tue, 15 Jun 2021 09:32:57</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.12.0</title>
+      <description>Update CVX code system version</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.12.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.12.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Fri, 16 Apr 2021 06:56:29</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.12.0</title>
+      <description>Update CVX code system version</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.12.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.12.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Fri, 16 Apr 2021 06:56:27</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.11.0</title>
+      <description>Update CVX code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.11.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.11.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 15 Apr 2021 06:03:00</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.11.0</title>
+      <description>Update CVX code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.11.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.11.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 15 Apr 2021 06:02:58</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.10.0</title>
+      <description>Update ICD-9-CM codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.10.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.10.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 10 Dec 2020 02:51:57</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.10.0</title>
+      <description>Update ICD-9-CM codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.10.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.10.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 10 Dec 2020 02:51:54</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.xver-extensions#0.0.6</title>
+      <description>fix stated FHIRversion for package</description>
+      <link>http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.6/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.6/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.tool</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 10 Dec 2020 02:38:35</pubDate>
+    </item>
+    <item>
+      <title>us.nlm.vsac#0.4.0</title>
+      <description>update for new value sets</description>
+      <link>http://fhir.org/packages/us.nlm.vsac/0.4.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/us.nlm.vsac/0.4.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 10:00:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.9.0</title>
+      <description>Add jurisdiction and fix ATC</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.9.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.9.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 09:59:57</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.9.0</title>
+      <description>Add jurisdiction value set</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.9.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.9.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 09:59:55</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.pubpack#0.0.8</title>
+      <description>Add prism to pubpack</description>
+      <link>http://fhir.org/packages/hl7.fhir.pubpack/0.0.8/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.pubpack/0.0.8/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.tool</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 09:59:52</pubDate>
+    </item>
+    <item>
+      <title>us.nlm.vsac#0.3.0</title>
+      <description>fix character set issues in ICD-10 for 'Charcôt's' (2.16.840.1.113883.3.666.5.903 and 2.16.840.1.113883.3.666.5.2259)</description>
+      <link>http://fhir.org/packages/us.nlm.vsac/0.3.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/us.nlm.vsac/0.3.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 17 Nov 2020 08:47:11</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.8.0</title>
+      <description>Update ICD-10-CM to list all codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.8.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.8.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Tue, 17 Nov 2020 08:47:06</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.8.0</title>
+      <description>Update ICD-10-CM to list all codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.8.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.8.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 17 Nov 2020 08:47:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.7.0</title>
+      <description>Update ATC code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.7.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.7.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Tue, 20 Oct 2020 04:35:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.7.0</title>
+      <description>Update ATC Code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.7.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.7.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 20 Oct 2020 04:35:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.6.0</title>
+      <description>fix dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.6.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.6.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Thu, 08 Oct 2020 10:17:10</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.6.0</title>
+      <description>Update NUCC Package</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.6.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.6.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 08 Oct 2020 10:17:09</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.5.0</title>
+      <description>fix dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.5.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.5.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Thu, 24 Sep 2020 03:09:25</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r2#0.3.0</title>
+      <description>Fix Dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r2/0.3.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r2/0.3.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>1.0.2</fhir:version>
+      <pubDate>Thu, 24 Sep 2020 03:09:24</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.5.0</title>
+      <description>Fix Dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.5.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.5.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 24 Sep 2020 03:09:24</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.xver-extensions#0.0.5</title>
+      <description>Update R5 to 4.5.0</description>
+      <link>http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.5/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.5/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.tool</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 17 Sep 2020 12:50:45</pubDate>
+    </item>
+    <item>
+      <title>us.nlm.vsac#0.2.0</title>
+      <description>Fix canonical URL to http://cts.nlm.nih.gov/fhir/ValueSet/</description>
+      <link>http://fhir.org/packages/us.nlm.vsac/0.2.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/us.nlm.vsac/0.2.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Fri, 04 Sep 2020 05:43:05</pubDate>
+    </item>
     <item>
       <title>us.nlm.vsac#0.1.0</title>
       <description>First Publication</description>
diff --git a/source/packages/package-feed.xml b/source/packages/package-feed.xml
index 6efdfa75..7f606ab8 100644
--- a/source/packages/package-feed.xml
+++ b/source/packages/package-feed.xml
@@ -4,11 +4,261 @@
     <description>New Support Packages published by FHIR Foundation</description>
     <link>http://fhir.org/packages/package-feed.xml</link>
     <generator>HL7 FHIR Publication tooling</generator>
-    <lastBuildDate>Fri, 04 Sep 2020 05:43:05</lastBuildDate>
+    <lastBuildDate>Wed, 16 Jun 2021 12:08:18</lastBuildDate>
     <atom:link href="http://fhir.org/packages/package-feed.xml" rel="self" type="application/rss+xml"/>
     <pubDate>Thu, 07 Nov 2019 03:11:36</pubDate>
     <language>en</language>
     <ttl>600</ttl>
+    <item>
+      <title>hl7.fhir.pubpack#0.0.9</title>
+      <description>Add icons for questionnaire rendering</description>
+      <link>http://fhir.org/packages/hl7.fhir.pubpack/0.0.9/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.pubpack/0.0.9/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.tool</fhir:kind>
+      <fhir:version>4.0</fhir:version>
+      <pubDate>Wed, 16 Jun 2021 12:08:18</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.13.0</title>
+      <description>Add MVX, MDC and ICD-10 (WHO)</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.13.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.13.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Tue, 15 Jun 2021 09:33:00</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.13.0</title>
+      <description>Add MVX, MDC and ICD-10 (WHO)</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.13.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.13.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Tue, 15 Jun 2021 09:32:57</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.12.0</title>
+      <description>Update CVX code system version</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.12.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.12.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Fri, 16 Apr 2021 06:56:29</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.12.0</title>
+      <description>Update CVX code system version</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.12.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.12.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Fri, 16 Apr 2021 06:56:27</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.11.0</title>
+      <description>Update CVX code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.11.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.11.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 15 Apr 2021 06:03:00</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.11.0</title>
+      <description>Update CVX code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.11.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.11.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 15 Apr 2021 06:02:58</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.10.0</title>
+      <description>Update ICD-9-CM codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.10.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.10.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 10 Dec 2020 02:51:57</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.10.0</title>
+      <description>Update ICD-9-CM codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.10.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.10.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>current</fhir:version>
+      <pubDate>Thu, 10 Dec 2020 02:51:54</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.xver-extensions#0.0.6</title>
+      <description>fix stated FHIRversion for package</description>
+      <link>http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.6/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.6/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.tool</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 10 Dec 2020 02:38:35</pubDate>
+    </item>
+    <item>
+      <title>us.nlm.vsac#0.4.0</title>
+      <description>update for new value sets</description>
+      <link>http://fhir.org/packages/us.nlm.vsac/0.4.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/us.nlm.vsac/0.4.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 10:00:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.9.0</title>
+      <description>Add jurisdiction and fix ATC</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.9.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.9.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 09:59:57</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.9.0</title>
+      <description>Add jurisdiction value set</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.9.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.9.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 09:59:55</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.pubpack#0.0.8</title>
+      <description>Add prism to pubpack</description>
+      <link>http://fhir.org/packages/hl7.fhir.pubpack/0.0.8/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.pubpack/0.0.8/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.tool</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 01 Dec 2020 09:59:52</pubDate>
+    </item>
+    <item>
+      <title>us.nlm.vsac#0.3.0</title>
+      <description>fix character set issues in ICD-10 for 'Charcôt's' (2.16.840.1.113883.3.666.5.903 and 2.16.840.1.113883.3.666.5.2259)</description>
+      <link>http://fhir.org/packages/us.nlm.vsac/0.3.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/us.nlm.vsac/0.3.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 17 Nov 2020 08:47:11</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.8.0</title>
+      <description>Update ICD-10-CM to list all codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.8.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.8.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Tue, 17 Nov 2020 08:47:06</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.8.0</title>
+      <description>Update ICD-10-CM to list all codes</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.8.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.8.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 17 Nov 2020 08:47:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.7.0</title>
+      <description>Update ATC code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.7.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.7.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Tue, 20 Oct 2020 04:35:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.7.0</title>
+      <description>Update ATC Code system</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.7.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.7.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Tue, 20 Oct 2020 04:35:04</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.6.0</title>
+      <description>fix dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.6.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.6.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Thu, 08 Oct 2020 10:17:10</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.6.0</title>
+      <description>Update NUCC Package</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.6.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.6.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 08 Oct 2020 10:17:09</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r3#0.5.0</title>
+      <description>fix dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r3/0.5.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r3/0.5.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>3.0.2</fhir:version>
+      <pubDate>Thu, 24 Sep 2020 03:09:25</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r2#0.3.0</title>
+      <description>Fix Dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r2/0.3.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r2/0.3.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>1.0.2</fhir:version>
+      <pubDate>Thu, 24 Sep 2020 03:09:24</pubDate>
+    </item>
+    <item>
+      <title>fhir.tx.support.r4#0.5.0</title>
+      <description>Fix Dependency</description>
+      <link>http://fhir.org/packages/fhir.tx.support.r4/0.5.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.tx.support.r4/0.5.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.ig</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 24 Sep 2020 03:09:24</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.xver-extensions#0.0.5</title>
+      <description>Update R5 to 4.5.0</description>
+      <link>http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.5/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.xver-extensions/0.0.5/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.tool</fhir:kind>
+      <fhir:version>4.0.1</fhir:version>
+      <pubDate>Thu, 17 Sep 2020 12:50:45</pubDate>
+    </item>
     <item>
       <title>us.nlm.vsac#0.2.0</title>
       <description>Fix canonical URL to http://cts.nlm.nih.gov/fhir/ValueSet/</description>
@@ -16,7 +266,7 @@
       <guid isPermaLink="true">http://fhir.org/packages/us.nlm.vsac/0.2.0/package.tgz</guid>
       <dc:creator>FHIR Project</dc:creator>
       <fhir:kind>fhir.ig</fhir:kind>
-      <fhir:version>4.0</fhir:version>
+      <fhir:version>4.0.1</fhir:version>
       <pubDate>Fri, 04 Sep 2020 05:43:05</pubDate>
     </item>
     <item>
diff --git a/source/packages/us.nlm.vsac/0.3.0/package.tgz b/source/packages/us.nlm.vsac/0.3.0/package.tgz
new file mode 100644
index 00000000..80e028a5
Binary files /dev/null and b/source/packages/us.nlm.vsac/0.3.0/package.tgz differ
diff --git a/source/packages/us.nlm.vsac/0.4.0/package.tgz b/source/packages/us.nlm.vsac/0.4.0/package.tgz
new file mode 100644
index 00000000..04568c1a
Binary files /dev/null and b/source/packages/us.nlm.vsac/0.4.0/package.tgz differ
diff --git a/source/packages/us.nlm.vsac/package-list.json b/source/packages/us.nlm.vsac/package-list.json
index 77e0cfea..82f93c0d 100644
--- a/source/packages/us.nlm.vsac/package-list.json
+++ b/source/packages/us.nlm.vsac/package-list.json
@@ -4,13 +4,29 @@
   "canonical": "http://fhir.org/packages/us.nlm.vsac",
   "introduction": "FHIR Distribution for the the VSAC CDA Documents",
   "list": [
+    {
+      "version": "0.4.0",
+      "desc": "update for new value sets",
+      "path": "http://fhir.org/packages/us.nlm.vsac/0.4.0",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-12-01"
+    },
+    {
+      "version": "0.3.0",
+      "desc": "fix character set issues in ICD-10 for \u0027Charcôt\u0027s\u0027 (2.16.840.1.113883.3.666.5.903 and 2.16.840.1.113883.3.666.5.2259)",
+      "path": "http://fhir.org/packages/us.nlm.vsac/0.3.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-11-17"
+    },
     {
       "version": "0.2.0",
       "desc": "Fix canonical URL to http://cts.nlm.nih.gov/fhir/ValueSet/",
       "path": "http://fhir.org/packages/us.nlm.vsac/0.2.0",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-09-04"
     },
     {
diff --git a/source/packages/us.nlm.vsac/package.tgz b/source/packages/us.nlm.vsac/package.tgz
index f253f460..04568c1a 100644
Binary files a/source/packages/us.nlm.vsac/package.tgz and b/source/packages/us.nlm.vsac/package.tgz differ
diff --git a/source/templates/fhir.base.template/0.2.0/full-ig.zip b/source/templates/fhir.base.template/0.2.0/full-ig.zip
new file mode 100644
index 00000000..b08e4b0c
Binary files /dev/null and b/source/templates/fhir.base.template/0.2.0/full-ig.zip differ
diff --git a/source/templates/fhir.base.template/0.2.0/index.html b/source/templates/fhir.base.template/0.2.0/index.html
new file mode 100644
index 00000000..501bf2a8
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.0/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: fhir.base.template---  <p><b>Template fhir.base.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as fhir.base.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/fhir.base.template/history.html">full version history is published</a></p>
diff --git a/source/templates/fhir.base.template/0.2.0/package.manifest.json b/source/templates/fhir.base.template/0.2.0/package.manifest.json
new file mode 100644
index 00000000..b2421ebe
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.0/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.0",
+  "date": "20200926014532",
+  "notForPublication": true,
+  "name": "fhir.base.template"
+}
\ No newline at end of file
diff --git a/source/templates/fhir.base.template/0.2.0/package.tgz b/source/templates/fhir.base.template/0.2.0/package.tgz
new file mode 100644
index 00000000..a6512e18
Binary files /dev/null and b/source/templates/fhir.base.template/0.2.0/package.tgz differ
diff --git a/source/templates/fhir.base.template/0.2.0/qa.html b/source/templates/fhir.base.template/0.2.0/qa.html
new file mode 100644
index 00000000..9e1a0db7
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.0/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template fhir.base.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as fhir.base.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/fhir.base.template/0.2.0/qa.json b/source/templates/fhir.base.template/0.2.0/qa.json
new file mode 100644
index 00000000..940b6d9b
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.0/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/fhir.base.template",
+  "package-id": "fhir.base.template",
+  "ig-ver": "0.2.0",
+  "date": "Sat, 26 Sep, 2020 01:45:32 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/fhir.base.template/0.2.1/full-ig.zip b/source/templates/fhir.base.template/0.2.1/full-ig.zip
new file mode 100644
index 00000000..885ce91e
Binary files /dev/null and b/source/templates/fhir.base.template/0.2.1/full-ig.zip differ
diff --git a/source/templates/fhir.base.template/0.2.1/index.html b/source/templates/fhir.base.template/0.2.1/index.html
new file mode 100644
index 00000000..501bf2a8
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.1/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: fhir.base.template---  <p><b>Template fhir.base.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as fhir.base.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/fhir.base.template/history.html">full version history is published</a></p>
diff --git a/source/templates/fhir.base.template/0.2.1/package.manifest.json b/source/templates/fhir.base.template/0.2.1/package.manifest.json
new file mode 100644
index 00000000..0f64fc22
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.1/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.1",
+  "date": "20200929144718",
+  "notForPublication": true,
+  "name": "fhir.base.template"
+}
\ No newline at end of file
diff --git a/source/templates/fhir.base.template/0.2.1/package.tgz b/source/templates/fhir.base.template/0.2.1/package.tgz
new file mode 100644
index 00000000..a031ce44
Binary files /dev/null and b/source/templates/fhir.base.template/0.2.1/package.tgz differ
diff --git a/source/templates/fhir.base.template/0.2.1/qa.html b/source/templates/fhir.base.template/0.2.1/qa.html
new file mode 100644
index 00000000..9e1a0db7
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.1/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template fhir.base.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as fhir.base.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/fhir.base.template/0.2.1/qa.json b/source/templates/fhir.base.template/0.2.1/qa.json
new file mode 100644
index 00000000..6926be9e
--- /dev/null
+++ b/source/templates/fhir.base.template/0.2.1/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/fhir.base.template",
+  "package-id": "fhir.base.template",
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:18 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/fhir.base.template/full-ig.zip b/source/templates/fhir.base.template/full-ig.zip
index 06ae71b6..885ce91e 100644
Binary files a/source/templates/fhir.base.template/full-ig.zip and b/source/templates/fhir.base.template/full-ig.zip differ
diff --git a/source/templates/fhir.base.template/package-list.json b/source/templates/fhir.base.template/package-list.json
index 0535bcc7..2aef5134 100644
--- a/source/templates/fhir.base.template/package-list.json
+++ b/source/templates/fhir.base.template/package-list.json
@@ -11,14 +11,30 @@
       "status": "ci-build",
       "current": true
     },
+    {
+      "version": "0.2.1",
+      "desc": "update to correct versions of prism.js",
+      "path": "http://fhir.org/templates/fhir.base.template/0.2.1",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.2.0",
+      "desc": "Syntax highlighting for xml | json | turtle etc",
+      "path": "http://fhir.org/templates/fhir.base.template/0.2.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-26"
+    },
     {
       "version": "0.1.1",
       "desc": "Copy button, mapping folder, better overrides",
-      "path": "http://fhir.org/templates/fhir.base.template/0.1.0",
+      "path": "http://fhir.org/templates/fhir.base.template/0.1.1",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
-      "date": "2020-07-08"
+      "date": "2020-06-15"
     },
     {
       "version": "0.1.0",
diff --git a/source/templates/fhir.base.template/package.manifest.json b/source/templates/fhir.base.template/package.manifest.json
index 277ba229..0f64fc22 100644
--- a/source/templates/fhir.base.template/package.manifest.json
+++ b/source/templates/fhir.base.template/package.manifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "0.1.1",
-  "date": "20200708172902",
+  "version": "0.2.1",
+  "date": "20200929144718",
+  "notForPublication": true,
   "name": "fhir.base.template"
 }
\ No newline at end of file
diff --git a/source/templates/fhir.base.template/package.tgz b/source/templates/fhir.base.template/package.tgz
index b1f38bb2..a031ce44 100644
Binary files a/source/templates/fhir.base.template/package.tgz and b/source/templates/fhir.base.template/package.tgz differ
diff --git a/source/templates/fhir.base.template/qa.json b/source/templates/fhir.base.template/qa.json
index daaec4f3..6926be9e 100644
--- a/source/templates/fhir.base.template/qa.json
+++ b/source/templates/fhir.base.template/qa.json
@@ -1,8 +1,8 @@
 {
   "url": "http://fhir.org/templates/fhir.base.template",
   "package-id": "fhir.base.template",
-  "ig-ver": "0.1.1",
-  "date": "Wed, 08 Jul, 2020 17:29:02 +1000",
-  "version": "4.4.0",
-  "tool": "4.4.0 (3)"
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:18 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/0.2.0/full-ig.zip b/source/templates/hl7.au.base.template/0.2.0/full-ig.zip
new file mode 100644
index 00000000..d23f5ed5
Binary files /dev/null and b/source/templates/hl7.au.base.template/0.2.0/full-ig.zip differ
diff --git a/source/templates/hl7.au.base.template/0.2.0/index.html b/source/templates/hl7.au.base.template/0.2.0/index.html
new file mode 100644
index 00000000..6ddf8307
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.0/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.au.base.template---  <p><b>Template hl7.au.base.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.base.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.base.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.au.base.template/0.2.0/package.manifest.json b/source/templates/hl7.au.base.template/0.2.0/package.manifest.json
new file mode 100644
index 00000000..89aa8de3
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.0/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.0",
+  "date": "20200926014529",
+  "notForPublication": true,
+  "name": "hl7.au.base.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/0.2.0/package.tgz b/source/templates/hl7.au.base.template/0.2.0/package.tgz
new file mode 100644
index 00000000..6e95adfb
Binary files /dev/null and b/source/templates/hl7.au.base.template/0.2.0/package.tgz differ
diff --git a/source/templates/hl7.au.base.template/0.2.0/qa.html b/source/templates/hl7.au.base.template/0.2.0/qa.html
new file mode 100644
index 00000000..75d90d5d
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.0/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.au.base.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.base.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/0.2.0/qa.json b/source/templates/hl7.au.base.template/0.2.0/qa.json
new file mode 100644
index 00000000..8990868e
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.0/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.base.template",
+  "package-id": "hl7.au.base.template",
+  "ig-ver": "0.2.0",
+  "date": "Sat, 26 Sep, 2020 01:45:29 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/0.2.1/full-ig.zip b/source/templates/hl7.au.base.template/0.2.1/full-ig.zip
new file mode 100644
index 00000000..e4bd0c2e
Binary files /dev/null and b/source/templates/hl7.au.base.template/0.2.1/full-ig.zip differ
diff --git a/source/templates/hl7.au.base.template/0.2.1/index.html b/source/templates/hl7.au.base.template/0.2.1/index.html
new file mode 100644
index 00000000..6ddf8307
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.1/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.au.base.template---  <p><b>Template hl7.au.base.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.base.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.base.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.au.base.template/0.2.1/package.manifest.json b/source/templates/hl7.au.base.template/0.2.1/package.manifest.json
new file mode 100644
index 00000000..3d53126e
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.1/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.1",
+  "date": "20200929144716",
+  "notForPublication": true,
+  "name": "hl7.au.base.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/0.2.1/package.tgz b/source/templates/hl7.au.base.template/0.2.1/package.tgz
new file mode 100644
index 00000000..a683bcfc
Binary files /dev/null and b/source/templates/hl7.au.base.template/0.2.1/package.tgz differ
diff --git a/source/templates/hl7.au.base.template/0.2.1/qa.html b/source/templates/hl7.au.base.template/0.2.1/qa.html
new file mode 100644
index 00000000..75d90d5d
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.1/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.au.base.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.base.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/0.2.1/qa.json b/source/templates/hl7.au.base.template/0.2.1/qa.json
new file mode 100644
index 00000000..6788cf80
--- /dev/null
+++ b/source/templates/hl7.au.base.template/0.2.1/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.base.template",
+  "package-id": "hl7.au.base.template",
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:16 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/full-ig.zip b/source/templates/hl7.au.base.template/full-ig.zip
index b95ec2f5..e4bd0c2e 100644
Binary files a/source/templates/hl7.au.base.template/full-ig.zip and b/source/templates/hl7.au.base.template/full-ig.zip differ
diff --git a/source/templates/hl7.au.base.template/package-list.json b/source/templates/hl7.au.base.template/package-list.json
index 4825740c..81523091 100644
--- a/source/templates/hl7.au.base.template/package-list.json
+++ b/source/templates/hl7.au.base.template/package-list.json
@@ -11,13 +11,29 @@
       "status": "ci-build",
       "current": true
     },
+    {
+      "version": "0.2.1",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.au.base.template/0.2.1",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.2.0",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.au.base.template/0.2.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-26"
+    },
     {
       "version": "0.1.2",
       "desc": "Upgrade for dependency on fhir.base.template",
       "path": "http://fhir.org/templates/hl7.au.base.template/0.1.2",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-07-08"
     },
     {
diff --git a/source/templates/hl7.au.base.template/package.manifest.json b/source/templates/hl7.au.base.template/package.manifest.json
index b46a809b..3d53126e 100644
--- a/source/templates/hl7.au.base.template/package.manifest.json
+++ b/source/templates/hl7.au.base.template/package.manifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "0.1.2",
-  "date": "20200708172858",
+  "version": "0.2.1",
+  "date": "20200929144716",
+  "notForPublication": true,
   "name": "hl7.au.base.template"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.au.base.template/package.tgz b/source/templates/hl7.au.base.template/package.tgz
index 36651e8e..a683bcfc 100644
Binary files a/source/templates/hl7.au.base.template/package.tgz and b/source/templates/hl7.au.base.template/package.tgz differ
diff --git a/source/templates/hl7.au.base.template/qa.json b/source/templates/hl7.au.base.template/qa.json
index b2ba73b7..6788cf80 100644
--- a/source/templates/hl7.au.base.template/qa.json
+++ b/source/templates/hl7.au.base.template/qa.json
@@ -1,8 +1,8 @@
 {
   "url": "http://fhir.org/templates/hl7.base.template",
   "package-id": "hl7.au.base.template",
-  "ig-ver": "0.1.2",
-  "date": "Wed, 08 Jul, 2020 17:28:58 +1000",
-  "version": "4.4.0",
-  "tool": "4.4.0 (3)"
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:16 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/0.2.0/full-ig.zip b/source/templates/hl7.au.fhir.template/0.2.0/full-ig.zip
new file mode 100644
index 00000000..35778370
Binary files /dev/null and b/source/templates/hl7.au.fhir.template/0.2.0/full-ig.zip differ
diff --git a/source/templates/hl7.au.fhir.template/0.2.0/index.html b/source/templates/hl7.au.fhir.template/0.2.0/index.html
new file mode 100644
index 00000000..6652c0d3
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.0/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.au.fhir.template---  <p><b>Template hl7.au.fhir.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.fhir.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.au.fhir.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.au.fhir.template/0.2.0/package.manifest.json b/source/templates/hl7.au.fhir.template/0.2.0/package.manifest.json
new file mode 100644
index 00000000..6b54e2e9
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.0/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.0",
+  "date": "20200926014529",
+  "notForPublication": true,
+  "name": "hl7.au.fhir.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/0.2.0/package.tgz b/source/templates/hl7.au.fhir.template/0.2.0/package.tgz
new file mode 100644
index 00000000..acee3e96
Binary files /dev/null and b/source/templates/hl7.au.fhir.template/0.2.0/package.tgz differ
diff --git a/source/templates/hl7.au.fhir.template/0.2.0/qa.html b/source/templates/hl7.au.fhir.template/0.2.0/qa.html
new file mode 100644
index 00000000..b2629247
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.0/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.au.fhir.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.fhir.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/0.2.0/qa.json b/source/templates/hl7.au.fhir.template/0.2.0/qa.json
new file mode 100644
index 00000000..ef54dd60
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.0/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.au.fhir.template",
+  "package-id": "hl7.au.fhir.template",
+  "ig-ver": "0.2.0",
+  "date": "Sat, 26 Sep, 2020 01:45:29 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/0.2.1/full-ig.zip b/source/templates/hl7.au.fhir.template/0.2.1/full-ig.zip
new file mode 100644
index 00000000..317a512f
Binary files /dev/null and b/source/templates/hl7.au.fhir.template/0.2.1/full-ig.zip differ
diff --git a/source/templates/hl7.au.fhir.template/0.2.1/index.html b/source/templates/hl7.au.fhir.template/0.2.1/index.html
new file mode 100644
index 00000000..6652c0d3
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.1/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.au.fhir.template---  <p><b>Template hl7.au.fhir.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.fhir.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.au.fhir.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.au.fhir.template/0.2.1/package.manifest.json b/source/templates/hl7.au.fhir.template/0.2.1/package.manifest.json
new file mode 100644
index 00000000..1721245e
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.1/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.1",
+  "date": "20200929144716",
+  "notForPublication": true,
+  "name": "hl7.au.fhir.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/0.2.1/package.tgz b/source/templates/hl7.au.fhir.template/0.2.1/package.tgz
new file mode 100644
index 00000000..5d4b203a
Binary files /dev/null and b/source/templates/hl7.au.fhir.template/0.2.1/package.tgz differ
diff --git a/source/templates/hl7.au.fhir.template/0.2.1/qa.html b/source/templates/hl7.au.fhir.template/0.2.1/qa.html
new file mode 100644
index 00000000..b2629247
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.1/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.au.fhir.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.au.fhir.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/0.2.1/qa.json b/source/templates/hl7.au.fhir.template/0.2.1/qa.json
new file mode 100644
index 00000000..6e685c1b
--- /dev/null
+++ b/source/templates/hl7.au.fhir.template/0.2.1/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.au.fhir.template",
+  "package-id": "hl7.au.fhir.template",
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:16 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/full-ig.zip b/source/templates/hl7.au.fhir.template/full-ig.zip
index 77515188..317a512f 100644
Binary files a/source/templates/hl7.au.fhir.template/full-ig.zip and b/source/templates/hl7.au.fhir.template/full-ig.zip differ
diff --git a/source/templates/hl7.au.fhir.template/package-list.json b/source/templates/hl7.au.fhir.template/package-list.json
index 7e262b5b..4949cc16 100644
--- a/source/templates/hl7.au.fhir.template/package-list.json
+++ b/source/templates/hl7.au.fhir.template/package-list.json
@@ -11,13 +11,29 @@
       "status": "ci-build",
       "current": true
     },
+    {
+      "version": "0.2.1",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.fhir.template/0.2.1",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.2.0",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.fhir.template/0.2.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-26"
+    },
     {
       "version": "0.1.2",
       "desc": "Upgrade for dependency on fhir.base.template",
       "path": "http://fhir.org/templates/hl7.fhir.template/0.1.2",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-07-08"
     },
     {
diff --git a/source/templates/hl7.au.fhir.template/package.manifest.json b/source/templates/hl7.au.fhir.template/package.manifest.json
index e42dd84f..1721245e 100644
--- a/source/templates/hl7.au.fhir.template/package.manifest.json
+++ b/source/templates/hl7.au.fhir.template/package.manifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "0.1.2",
-  "date": "20200708172858",
+  "version": "0.2.1",
+  "date": "20200929144716",
+  "notForPublication": true,
   "name": "hl7.au.fhir.template"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.au.fhir.template/package.tgz b/source/templates/hl7.au.fhir.template/package.tgz
index 4346491b..5d4b203a 100644
Binary files a/source/templates/hl7.au.fhir.template/package.tgz and b/source/templates/hl7.au.fhir.template/package.tgz differ
diff --git a/source/templates/hl7.au.fhir.template/qa.json b/source/templates/hl7.au.fhir.template/qa.json
index 4e4c400d..6e685c1b 100644
--- a/source/templates/hl7.au.fhir.template/qa.json
+++ b/source/templates/hl7.au.fhir.template/qa.json
@@ -1,8 +1,8 @@
 {
   "url": "http://fhir.org/templates/hl7.au.fhir.template",
   "package-id": "hl7.au.fhir.template",
-  "ig-ver": "0.1.2",
-  "date": "Wed, 08 Jul, 2020 17:28:58 +1000",
-  "version": "4.4.0",
-  "tool": "4.4.0 (3)"
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:16 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/0.3.0/full-ig.zip b/source/templates/hl7.base.template/0.3.0/full-ig.zip
new file mode 100644
index 00000000..7a419c4a
Binary files /dev/null and b/source/templates/hl7.base.template/0.3.0/full-ig.zip differ
diff --git a/source/templates/hl7.base.template/0.3.0/index.html b/source/templates/hl7.base.template/0.3.0/index.html
new file mode 100644
index 00000000..db759750
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.0/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.base.template---  <p><b>Template hl7.base.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.base.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.base.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.base.template/0.3.0/package.manifest.json b/source/templates/hl7.base.template/0.3.0/package.manifest.json
new file mode 100644
index 00000000..0190dce8
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.0/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.3.0",
+  "date": "20200926014530",
+  "notForPublication": true,
+  "name": "hl7.base.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/0.3.0/package.tgz b/source/templates/hl7.base.template/0.3.0/package.tgz
new file mode 100644
index 00000000..fce3e3b5
Binary files /dev/null and b/source/templates/hl7.base.template/0.3.0/package.tgz differ
diff --git a/source/templates/hl7.base.template/0.3.0/qa.html b/source/templates/hl7.base.template/0.3.0/qa.html
new file mode 100644
index 00000000..075b89c3
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.0/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.base.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.base.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/0.3.0/qa.json b/source/templates/hl7.base.template/0.3.0/qa.json
new file mode 100644
index 00000000..aaa14724
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.0/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.base.template",
+  "package-id": "hl7.base.template",
+  "ig-ver": "0.3.0",
+  "date": "Sat, 26 Sep, 2020 01:45:30 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/0.3.1/full-ig.zip b/source/templates/hl7.base.template/0.3.1/full-ig.zip
new file mode 100644
index 00000000..466da8b8
Binary files /dev/null and b/source/templates/hl7.base.template/0.3.1/full-ig.zip differ
diff --git a/source/templates/hl7.base.template/0.3.1/index.html b/source/templates/hl7.base.template/0.3.1/index.html
new file mode 100644
index 00000000..db759750
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.1/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.base.template---  <p><b>Template hl7.base.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.base.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.base.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.base.template/0.3.1/package.manifest.json b/source/templates/hl7.base.template/0.3.1/package.manifest.json
new file mode 100644
index 00000000..e4c820c6
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.1/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.3.1",
+  "date": "20200929144717",
+  "notForPublication": true,
+  "name": "hl7.base.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/0.3.1/package.tgz b/source/templates/hl7.base.template/0.3.1/package.tgz
new file mode 100644
index 00000000..8ac38159
Binary files /dev/null and b/source/templates/hl7.base.template/0.3.1/package.tgz differ
diff --git a/source/templates/hl7.base.template/0.3.1/qa.html b/source/templates/hl7.base.template/0.3.1/qa.html
new file mode 100644
index 00000000..075b89c3
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.1/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.base.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.base.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/0.3.1/qa.json b/source/templates/hl7.base.template/0.3.1/qa.json
new file mode 100644
index 00000000..5e7e6144
--- /dev/null
+++ b/source/templates/hl7.base.template/0.3.1/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.base.template",
+  "package-id": "hl7.base.template",
+  "ig-ver": "0.3.1",
+  "date": "Tue, 29 Sep, 2020 14:47:17 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/full-ig.zip b/source/templates/hl7.base.template/full-ig.zip
index 35c4069c..466da8b8 100644
Binary files a/source/templates/hl7.base.template/full-ig.zip and b/source/templates/hl7.base.template/full-ig.zip differ
diff --git a/source/templates/hl7.base.template/package-list.json b/source/templates/hl7.base.template/package-list.json
index bc07f472..718229a1 100644
--- a/source/templates/hl7.base.template/package-list.json
+++ b/source/templates/hl7.base.template/package-list.json
@@ -11,13 +11,29 @@
       "status": "ci-build",
       "current": true
     },
+    {
+      "version": "0.3.1",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.base.template/0.3.1",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.3.0",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.base.template/0.3.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-26"
+    },
     {
       "version": "0.2.1",
       "desc": "Upgrade for dependency on fhir.base.template",
       "path": "http://fhir.org/templates/hl7.base.template/0.2.1",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-07-08"
     },
     {
diff --git a/source/templates/hl7.base.template/package.manifest.json b/source/templates/hl7.base.template/package.manifest.json
index 3e9cc3cf..e4c820c6 100644
--- a/source/templates/hl7.base.template/package.manifest.json
+++ b/source/templates/hl7.base.template/package.manifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "0.2.1",
-  "date": "20200708172900",
+  "version": "0.3.1",
+  "date": "20200929144717",
+  "notForPublication": true,
   "name": "hl7.base.template"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.base.template/package.tgz b/source/templates/hl7.base.template/package.tgz
index 59737326..8ac38159 100644
Binary files a/source/templates/hl7.base.template/package.tgz and b/source/templates/hl7.base.template/package.tgz differ
diff --git a/source/templates/hl7.base.template/qa.json b/source/templates/hl7.base.template/qa.json
index 79578c9b..5e7e6144 100644
--- a/source/templates/hl7.base.template/qa.json
+++ b/source/templates/hl7.base.template/qa.json
@@ -1,8 +1,8 @@
 {
   "url": "http://fhir.org/templates/hl7.base.template",
   "package-id": "hl7.base.template",
-  "ig-ver": "0.2.1",
-  "date": "Wed, 08 Jul, 2020 17:29:00 +1000",
-  "version": "4.4.0",
-  "tool": "4.4.0 (3)"
+  "ig-ver": "0.3.1",
+  "date": "Tue, 29 Sep, 2020 14:47:17 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/0.2.0/full-ig.zip b/source/templates/hl7.cda.template/0.2.0/full-ig.zip
new file mode 100644
index 00000000..df959e82
Binary files /dev/null and b/source/templates/hl7.cda.template/0.2.0/full-ig.zip differ
diff --git a/source/templates/hl7.cda.template/0.2.0/index.html b/source/templates/hl7.cda.template/0.2.0/index.html
new file mode 100644
index 00000000..24b6c104
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.0/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.cda.template---  <p><b>Template hl7.cda.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.cda.template in your IG configuration.</p>
+  <p>A <a href="http://github.com/HL7/ig-template-hl7/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.cda.template/0.2.0/package.manifest.json b/source/templates/hl7.cda.template/0.2.0/package.manifest.json
new file mode 100644
index 00000000..04ac4d96
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.0/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.0",
+  "date": "20200926014531",
+  "notForPublication": true,
+  "name": "hl7.cda.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/0.2.0/package.tgz b/source/templates/hl7.cda.template/0.2.0/package.tgz
new file mode 100644
index 00000000..ce791913
Binary files /dev/null and b/source/templates/hl7.cda.template/0.2.0/package.tgz differ
diff --git a/source/templates/hl7.cda.template/0.2.0/qa.html b/source/templates/hl7.cda.template/0.2.0/qa.html
new file mode 100644
index 00000000..40ed249b
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.0/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.cda.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.cda.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/0.2.0/qa.json b/source/templates/hl7.cda.template/0.2.0/qa.json
new file mode 100644
index 00000000..d31535ed
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.0/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://github.com/HL7/ig-template-hl7",
+  "package-id": "hl7.cda.template",
+  "ig-ver": "0.2.0",
+  "date": "Sat, 26 Sep, 2020 01:45:31 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/0.2.1/full-ig.zip b/source/templates/hl7.cda.template/0.2.1/full-ig.zip
new file mode 100644
index 00000000..7adfcf66
Binary files /dev/null and b/source/templates/hl7.cda.template/0.2.1/full-ig.zip differ
diff --git a/source/templates/hl7.cda.template/0.2.1/index.html b/source/templates/hl7.cda.template/0.2.1/index.html
new file mode 100644
index 00000000..24b6c104
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.1/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.cda.template---  <p><b>Template hl7.cda.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.cda.template in your IG configuration.</p>
+  <p>A <a href="http://github.com/HL7/ig-template-hl7/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.cda.template/0.2.1/package.manifest.json b/source/templates/hl7.cda.template/0.2.1/package.manifest.json
new file mode 100644
index 00000000..a797a063
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.1/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.2.1",
+  "date": "20200929144717",
+  "notForPublication": true,
+  "name": "hl7.cda.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/0.2.1/package.tgz b/source/templates/hl7.cda.template/0.2.1/package.tgz
new file mode 100644
index 00000000..3ff61077
Binary files /dev/null and b/source/templates/hl7.cda.template/0.2.1/package.tgz differ
diff --git a/source/templates/hl7.cda.template/0.2.1/qa.html b/source/templates/hl7.cda.template/0.2.1/qa.html
new file mode 100644
index 00000000..40ed249b
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.1/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.cda.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.cda.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/0.2.1/qa.json b/source/templates/hl7.cda.template/0.2.1/qa.json
new file mode 100644
index 00000000..3e8a1b08
--- /dev/null
+++ b/source/templates/hl7.cda.template/0.2.1/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://github.com/HL7/ig-template-hl7",
+  "package-id": "hl7.cda.template",
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:17 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/full-ig.zip b/source/templates/hl7.cda.template/full-ig.zip
index 1b431aa1..7adfcf66 100644
Binary files a/source/templates/hl7.cda.template/full-ig.zip and b/source/templates/hl7.cda.template/full-ig.zip differ
diff --git a/source/templates/hl7.cda.template/package-list.json b/source/templates/hl7.cda.template/package-list.json
index 0c384533..d2c65575 100644
--- a/source/templates/hl7.cda.template/package-list.json
+++ b/source/templates/hl7.cda.template/package-list.json
@@ -11,13 +11,29 @@
       "status": "ci-build",
       "current": true
     },
+    {
+      "version": "0.2.1",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.cda.template/0.2.1",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.2.0",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.cda.template/0.2.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-26"
+    },
     {
       "version": "0.1.2",
       "desc": "Upgrade for dependency on fhir.base.template",
       "path": "http://fhir.org/templates/hl7.cda.template/0.1.2",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-07-08"
     },
     {
diff --git a/source/templates/hl7.cda.template/package.manifest.json b/source/templates/hl7.cda.template/package.manifest.json
index 61e2b89b..a797a063 100644
--- a/source/templates/hl7.cda.template/package.manifest.json
+++ b/source/templates/hl7.cda.template/package.manifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "0.1.2",
-  "date": "20200708172901",
+  "version": "0.2.1",
+  "date": "20200929144717",
+  "notForPublication": true,
   "name": "hl7.cda.template"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.cda.template/package.tgz b/source/templates/hl7.cda.template/package.tgz
index 2f96d86a..3ff61077 100644
Binary files a/source/templates/hl7.cda.template/package.tgz and b/source/templates/hl7.cda.template/package.tgz differ
diff --git a/source/templates/hl7.cda.template/qa.json b/source/templates/hl7.cda.template/qa.json
index bc2fea6c..3e8a1b08 100644
--- a/source/templates/hl7.cda.template/qa.json
+++ b/source/templates/hl7.cda.template/qa.json
@@ -1,8 +1,8 @@
 {
   "url": "http://github.com/HL7/ig-template-hl7",
   "package-id": "hl7.cda.template",
-  "ig-ver": "0.1.2",
-  "date": "Wed, 08 Jul, 2020 17:29:01 +1000",
-  "version": "4.4.0",
-  "tool": "4.4.0 (3)"
+  "ig-ver": "0.2.1",
+  "date": "Tue, 29 Sep, 2020 14:47:17 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.0/full-ig.zip b/source/templates/hl7.fhir.template/0.3.0/full-ig.zip
new file mode 100644
index 00000000..6db72bc8
Binary files /dev/null and b/source/templates/hl7.fhir.template/0.3.0/full-ig.zip differ
diff --git a/source/templates/hl7.fhir.template/0.3.0/index.html b/source/templates/hl7.fhir.template/0.3.0/index.html
new file mode 100644
index 00000000..e67735e8
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.0/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.fhir.template---  <p><b>Template hl7.fhir.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.fhir.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.fhir.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.fhir.template/0.3.0/package.manifest.json b/source/templates/hl7.fhir.template/0.3.0/package.manifest.json
new file mode 100644
index 00000000..62e45699
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.0/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.3.0",
+  "date": "20200926014527",
+  "notForPublication": true,
+  "name": "hl7.fhir.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.0/package.tgz b/source/templates/hl7.fhir.template/0.3.0/package.tgz
new file mode 100644
index 00000000..0b164c99
Binary files /dev/null and b/source/templates/hl7.fhir.template/0.3.0/package.tgz differ
diff --git a/source/templates/hl7.fhir.template/0.3.0/qa.html b/source/templates/hl7.fhir.template/0.3.0/qa.html
new file mode 100644
index 00000000..1ee75ff4
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.0/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.fhir.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.fhir.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.0/qa.json b/source/templates/hl7.fhir.template/0.3.0/qa.json
new file mode 100644
index 00000000..d3e9e20d
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.0/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.fhir.template",
+  "package-id": "hl7.fhir.template",
+  "ig-ver": "0.3.0",
+  "date": "Sat, 26 Sep, 2020 01:45:27 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.1/full-ig.zip b/source/templates/hl7.fhir.template/0.3.1/full-ig.zip
new file mode 100644
index 00000000..3a2d4318
Binary files /dev/null and b/source/templates/hl7.fhir.template/0.3.1/full-ig.zip differ
diff --git a/source/templates/hl7.fhir.template/0.3.1/index.html b/source/templates/hl7.fhir.template/0.3.1/index.html
new file mode 100644
index 00000000..e67735e8
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.1/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.fhir.template---  <p><b>Template hl7.fhir.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.fhir.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.fhir.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.fhir.template/0.3.1/package.manifest.json b/source/templates/hl7.fhir.template/0.3.1/package.manifest.json
new file mode 100644
index 00000000..ef418c3f
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.1/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.3.1",
+  "date": "20200929144714",
+  "notForPublication": true,
+  "name": "hl7.fhir.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.1/package.tgz b/source/templates/hl7.fhir.template/0.3.1/package.tgz
new file mode 100644
index 00000000..afefc8c6
Binary files /dev/null and b/source/templates/hl7.fhir.template/0.3.1/package.tgz differ
diff --git a/source/templates/hl7.fhir.template/0.3.1/qa.html b/source/templates/hl7.fhir.template/0.3.1/qa.html
new file mode 100644
index 00000000..1ee75ff4
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.1/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.fhir.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.fhir.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.1/qa.json b/source/templates/hl7.fhir.template/0.3.1/qa.json
new file mode 100644
index 00000000..b4e936e1
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.1/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.fhir.template",
+  "package-id": "hl7.fhir.template",
+  "ig-ver": "0.3.1",
+  "date": "Tue, 29 Sep, 2020 14:47:14 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.2/full-ig.zip b/source/templates/hl7.fhir.template/0.3.2/full-ig.zip
new file mode 100644
index 00000000..ec5b1d93
Binary files /dev/null and b/source/templates/hl7.fhir.template/0.3.2/full-ig.zip differ
diff --git a/source/templates/hl7.fhir.template/0.3.2/index.html b/source/templates/hl7.fhir.template/0.3.2/index.html
new file mode 100644
index 00000000..e67735e8
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.2/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: hl7.fhir.template---  <p><b>Template hl7.fhir.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.fhir.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/hl7.fhir.template/history.html">full version history is published</a></p>
diff --git a/source/templates/hl7.fhir.template/0.3.2/package.manifest.json b/source/templates/hl7.fhir.template/0.3.2/package.manifest.json
new file mode 100644
index 00000000..a44c2df5
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.2/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.3.2",
+  "date": "20200929152252",
+  "notForPublication": true,
+  "name": "hl7.fhir.template"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.2/package.tgz b/source/templates/hl7.fhir.template/0.3.2/package.tgz
new file mode 100644
index 00000000..f3d7a70a
Binary files /dev/null and b/source/templates/hl7.fhir.template/0.3.2/package.tgz differ
diff --git a/source/templates/hl7.fhir.template/0.3.2/qa.html b/source/templates/hl7.fhir.template/0.3.2/qa.html
new file mode 100644
index 00000000..1ee75ff4
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.2/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template hl7.fhir.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as hl7.fhir.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/0.3.2/qa.json b/source/templates/hl7.fhir.template/0.3.2/qa.json
new file mode 100644
index 00000000..cae21691
--- /dev/null
+++ b/source/templates/hl7.fhir.template/0.3.2/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/hl7.fhir.template",
+  "package-id": "hl7.fhir.template",
+  "ig-ver": "0.3.2",
+  "date": "Tue, 29 Sep, 2020 15:22:52 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/full-ig.zip b/source/templates/hl7.fhir.template/full-ig.zip
index ba19012c..ec5b1d93 100644
Binary files a/source/templates/hl7.fhir.template/full-ig.zip and b/source/templates/hl7.fhir.template/full-ig.zip differ
diff --git a/source/templates/hl7.fhir.template/package-list.json b/source/templates/hl7.fhir.template/package-list.json
index 14388bcb..c8f57c13 100644
--- a/source/templates/hl7.fhir.template/package-list.json
+++ b/source/templates/hl7.fhir.template/package-list.json
@@ -11,13 +11,37 @@
       "status": "ci-build",
       "current": true
     },
+    {
+      "version": "0.3.2",
+      "desc": "Fix search link",
+      "path": "http://fhir.org/templates/hl7.fhir.template/0.3.2",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.3.1",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.fhir.template/0.3.1",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.3.0",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/hl7.fhir.template/0.3.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-26"
+    },
     {
       "version": "0.2.1",
       "desc": "Upgrade for dependency on fhir.base.template",
       "path": "http://fhir.org/templates/hl7.fhir.template/0.2.1",
       "status": "release",
       "sequence": "Publications",
-      "current": true,
       "date": "2020-07-08"
     },
     {
diff --git a/source/templates/hl7.fhir.template/package.manifest.json b/source/templates/hl7.fhir.template/package.manifest.json
index 6f40b458..a44c2df5 100644
--- a/source/templates/hl7.fhir.template/package.manifest.json
+++ b/source/templates/hl7.fhir.template/package.manifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "0.2.1",
-  "date": "20200708172856",
+  "version": "0.3.2",
+  "date": "20200929152252",
+  "notForPublication": true,
   "name": "hl7.fhir.template"
 }
\ No newline at end of file
diff --git a/source/templates/hl7.fhir.template/package.tgz b/source/templates/hl7.fhir.template/package.tgz
index fa7eff64..f3d7a70a 100644
Binary files a/source/templates/hl7.fhir.template/package.tgz and b/source/templates/hl7.fhir.template/package.tgz differ
diff --git a/source/templates/hl7.fhir.template/qa.json b/source/templates/hl7.fhir.template/qa.json
index c4ce7f60..cae21691 100644
--- a/source/templates/hl7.fhir.template/qa.json
+++ b/source/templates/hl7.fhir.template/qa.json
@@ -1,8 +1,8 @@
 {
   "url": "http://fhir.org/templates/hl7.fhir.template",
   "package-id": "hl7.fhir.template",
-  "ig-ver": "0.2.1",
-  "date": "Wed, 08 Jul, 2020 17:28:56 +1000",
-  "version": "4.4.0",
-  "tool": "4.4.0 (3)"
+  "ig-ver": "0.3.2",
+  "date": "Tue, 29 Sep, 2020 15:22:52 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
 }
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/0.3.0/full-ig.zip b/source/templates/ihe.fhir.template/0.3.0/full-ig.zip
new file mode 100644
index 00000000..7b4dfe3a
Binary files /dev/null and b/source/templates/ihe.fhir.template/0.3.0/full-ig.zip differ
diff --git a/source/templates/ihe.fhir.template/0.3.0/index.html b/source/templates/ihe.fhir.template/0.3.0/index.html
new file mode 100644
index 00000000..a1efddb3
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.0/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: ihe.fhir.template---  <p><b>Template ihe.fhir.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as ihe.fhir.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/ihe.fhir.template/history.html">full version history is published</a></p>
diff --git a/source/templates/ihe.fhir.template/0.3.0/package.manifest.json b/source/templates/ihe.fhir.template/0.3.0/package.manifest.json
new file mode 100644
index 00000000..9c79286c
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.0/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.3.0",
+  "date": "20200926014532",
+  "notForPublication": true,
+  "name": "ihe.fhir.template"
+}
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/0.3.0/package.tgz b/source/templates/ihe.fhir.template/0.3.0/package.tgz
new file mode 100644
index 00000000..c33364b1
Binary files /dev/null and b/source/templates/ihe.fhir.template/0.3.0/package.tgz differ
diff --git a/source/templates/ihe.fhir.template/0.3.0/qa.html b/source/templates/ihe.fhir.template/0.3.0/qa.html
new file mode 100644
index 00000000..b064cabb
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.0/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template ihe.fhir.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as ihe.fhir.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/0.3.0/qa.json b/source/templates/ihe.fhir.template/0.3.0/qa.json
new file mode 100644
index 00000000..1bb0f8b7
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.0/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/ihe.fhir.template",
+  "package-id": "ihe.fhir.template",
+  "ig-ver": "0.3.0",
+  "date": "Sat, 26 Sep, 2020 01:45:32 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/0.3.1/full-ig.zip b/source/templates/ihe.fhir.template/0.3.1/full-ig.zip
new file mode 100644
index 00000000..507b65f9
Binary files /dev/null and b/source/templates/ihe.fhir.template/0.3.1/full-ig.zip differ
diff --git a/source/templates/ihe.fhir.template/0.3.1/index.html b/source/templates/ihe.fhir.template/0.3.1/index.html
new file mode 100644
index 00000000..a1efddb3
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.1/index.html
@@ -0,0 +1,3 @@
+---layout: pagetitle: ihe.fhir.template---  <p><b>Template ihe.fhir.template</b></p>
+  <p>You can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as ihe.fhir.template in your IG configuration.</p>
+  <p>A <a href="http://fhir.org/templates/ihe.fhir.template/history.html">full version history is published</a></p>
diff --git a/source/templates/ihe.fhir.template/0.3.1/package.manifest.json b/source/templates/ihe.fhir.template/0.3.1/package.manifest.json
new file mode 100644
index 00000000..abd39820
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.1/package.manifest.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.3.1",
+  "date": "20200929144718",
+  "notForPublication": true,
+  "name": "ihe.fhir.template"
+}
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/0.3.1/package.tgz b/source/templates/ihe.fhir.template/0.3.1/package.tgz
new file mode 100644
index 00000000..8aa12c7f
Binary files /dev/null and b/source/templates/ihe.fhir.template/0.3.1/package.tgz differ
diff --git a/source/templates/ihe.fhir.template/0.3.1/qa.html b/source/templates/ihe.fhir.template/0.3.1/qa.html
new file mode 100644
index 00000000..b064cabb
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.1/qa.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>Template QA Page</title></head><body><p><b>Template ihe.fhir.template</b></p><p>You  can <a href="package.tgz">download the template</a>, though you should not need to; just refer to the template as ihe.fhir.template in your IG configuration.</p></body></html>
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/0.3.1/qa.json b/source/templates/ihe.fhir.template/0.3.1/qa.json
new file mode 100644
index 00000000..70b16af7
--- /dev/null
+++ b/source/templates/ihe.fhir.template/0.3.1/qa.json
@@ -0,0 +1,8 @@
+{
+  "url": "http://fhir.org/templates/ihe.fhir.template",
+  "package-id": "ihe.fhir.template",
+  "ig-ver": "0.3.1",
+  "date": "Tue, 29 Sep, 2020 14:47:18 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
+}
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/full-ig.zip b/source/templates/ihe.fhir.template/full-ig.zip
index c3a56fa4..507b65f9 100644
Binary files a/source/templates/ihe.fhir.template/full-ig.zip and b/source/templates/ihe.fhir.template/full-ig.zip differ
diff --git a/source/templates/ihe.fhir.template/package-list.json b/source/templates/ihe.fhir.template/package-list.json
index 0d13baad..4162e869 100644
--- a/source/templates/ihe.fhir.template/package-list.json
+++ b/source/templates/ihe.fhir.template/package-list.json
@@ -11,12 +11,28 @@
       "status": "ci-build",
       "current": true
     },
+    {
+      "version": "0.3.1",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/ihe.fhir.template/0.3.1",
+      "status": "release",
+      "sequence": "Publications",
+      "current": true,
+      "date": "2020-09-29"
+    },
+    {
+      "version": "0.3.0",
+      "desc": "Upgrade for dependency on fhir.base.template",
+      "path": "http://fhir.org/templates/ihe.fhir.template/0.3.0",
+      "status": "release",
+      "sequence": "Publications",
+      "date": "2020-09-26"
+    },
     {
       "version": "0.2.0",
       "desc": "04-07-2020 - using proper colors and remove unneeded files",
       "path": "https://build.fhir.org/ig/IHE/ihe-ig-template/0.2.0",
       "status": "release",
-      "current": true,
       "date": "2020-07-08"
     },
     {
diff --git a/source/templates/ihe.fhir.template/package.manifest.json b/source/templates/ihe.fhir.template/package.manifest.json
index 0830e10e..abd39820 100644
--- a/source/templates/ihe.fhir.template/package.manifest.json
+++ b/source/templates/ihe.fhir.template/package.manifest.json
@@ -1,5 +1,6 @@
 {
-  "version": "0.2.0",
-  "date": "20200708172902",
+  "version": "0.3.1",
+  "date": "20200929144718",
+  "notForPublication": true,
   "name": "ihe.fhir.template"
 }
\ No newline at end of file
diff --git a/source/templates/ihe.fhir.template/package.tgz b/source/templates/ihe.fhir.template/package.tgz
index 39ce74b1..8aa12c7f 100644
Binary files a/source/templates/ihe.fhir.template/package.tgz and b/source/templates/ihe.fhir.template/package.tgz differ
diff --git a/source/templates/ihe.fhir.template/qa.json b/source/templates/ihe.fhir.template/qa.json
index 86820d08..70b16af7 100644
--- a/source/templates/ihe.fhir.template/qa.json
+++ b/source/templates/ihe.fhir.template/qa.json
@@ -1,8 +1,8 @@
 {
   "url": "http://fhir.org/templates/ihe.fhir.template",
   "package-id": "ihe.fhir.template",
-  "ig-ver": "0.2.0",
-  "date": "Wed, 08 Jul, 2020 17:29:02 +1000",
-  "version": "4.4.0",
-  "tool": "4.4.0 (3)"
+  "ig-ver": "0.3.1",
+  "date": "Tue, 29 Sep, 2020 14:47:18 +1000",
+  "version": "4.5.0",
+  "tool": "4.5.0 (3)"
 }
\ No newline at end of file
diff --git a/source/templates/package-feed.xml b/source/templates/package-feed.xml
index 3c10c2bb..9eb3952b 100644
--- a/source/templates/package-feed.xml
+++ b/source/templates/package-feed.xml
@@ -4,11 +4,146 @@
     <description>New Support Packages published by FHIR Foundation</description>
     <link>http://fhir.org/packages/package-feed.xml</link>
     <generator>HL7 FHIR Publication tooling</generator>
-    <lastBuildDate>Wed, 08 Jul 2020 05:29:03</lastBuildDate>
+    <lastBuildDate>Tue, 29 Sep 2020 03:22:57</lastBuildDate>
     <atom:link href="http://fhir.org/packages/package-feed.xml" rel="self" type="application/rss+xml"/>
     <pubDate>Thu, 07 Nov 2019 03:11:36</pubDate>
     <language>en</language>
     <ttl>600</ttl>
+    <item>
+      <title>hl7.fhir.template#0.3.2</title>
+      <description>Fix search link</description>
+      <link>http://fhir.org/packages/hl7.fhir.template/0.3.2/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.template/0.3.2/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 03:22:57</pubDate>
+    </item>
+    <item>
+      <title>fhir.base.template#0.2.1</title>
+      <description>update to correct versions of prism.js</description>
+      <link>http://fhir.org/packages/fhir.base.template/0.2.1/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.base.template/0.2.1/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 02:47:19</pubDate>
+    </item>
+    <item>
+      <title>ihe.fhir.template#0.3.1</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/ihe.fhir.template/0.3.1/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/ihe.fhir.template/0.3.1/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 02:47:19</pubDate>
+    </item>
+    <item>
+      <title>hl7.cda.template#0.2.1</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.cda.template/0.2.1/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.cda.template/0.2.1/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 02:47:19</pubDate>
+    </item>
+    <item>
+      <title>hl7.base.template#0.3.1</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.base.template/0.3.1/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.base.template/0.3.1/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 02:47:19</pubDate>
+    </item>
+    <item>
+      <title>hl7.au.fhir.template#0.2.1</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.au.fhir.template/0.2.1/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.au.fhir.template/0.2.1/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 02:47:19</pubDate>
+    </item>
+    <item>
+      <title>hl7.au.base.template#0.2.1</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.au.base.template/0.2.1/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.au.base.template/0.2.1/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 02:47:19</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.template#0.3.1</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.fhir.template/0.3.1/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.template/0.3.1/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Tue, 29 Sep 2020 02:47:19</pubDate>
+    </item>
+    <item>
+      <title>fhir.base.template#0.2.0</title>
+      <description>Syntax highlighting for xml | json | turtle etc</description>
+      <link>http://fhir.org/packages/fhir.base.template/0.2.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/fhir.base.template/0.2.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Sat, 26 Sep 2020 01:45:33</pubDate>
+    </item>
+    <item>
+      <title>ihe.fhir.template#0.3.0</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/ihe.fhir.template/0.3.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/ihe.fhir.template/0.3.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Sat, 26 Sep 2020 01:45:33</pubDate>
+    </item>
+    <item>
+      <title>hl7.cda.template#0.2.0</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.cda.template/0.2.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.cda.template/0.2.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Sat, 26 Sep 2020 01:45:33</pubDate>
+    </item>
+    <item>
+      <title>hl7.base.template#0.3.0</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.base.template/0.3.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.base.template/0.3.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Sat, 26 Sep 2020 01:45:33</pubDate>
+    </item>
+    <item>
+      <title>hl7.au.fhir.template#0.2.0</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.au.fhir.template/0.2.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.au.fhir.template/0.2.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Sat, 26 Sep 2020 01:45:33</pubDate>
+    </item>
+    <item>
+      <title>hl7.au.base.template#0.2.0</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.au.base.template/0.2.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.au.base.template/0.2.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Sat, 26 Sep 2020 01:45:33</pubDate>
+    </item>
+    <item>
+      <title>hl7.fhir.template#0.3.0</title>
+      <description>Upgrade for dependency on fhir.base.template</description>
+      <link>http://fhir.org/packages/hl7.fhir.template/0.3.0/package.tgz</link>
+      <guid isPermaLink="true">http://fhir.org/packages/hl7.fhir.template/0.3.0/package.tgz</guid>
+      <dc:creator>FHIR Project</dc:creator>
+      <fhir:kind>fhir.template</fhir:kind>
+      <pubDate>Sat, 26 Sep 2020 01:45:33</pubDate>
+    </item>
     <item>
       <title>fhir.base.template#0.1.1</title>
       <description>Copy button, mapping folder, better overrides</description>