diff --git a/src/common/datatypes.xsl b/src/common/datatypes.xsl
new file mode 100644
index 00000000..d675f06d
--- /dev/null
+++ b/src/common/datatypes.xsl
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="3.0">
+    <!--
+         Normalize deprecated datatype names
+         ex. m:datatype-normalize('dateTime-with-timezone') => date-time-with-timezone
+         Note: unknown and valid datatypes will be passed along as-is
+    -->
+    <xsl:function
+        name="m:datatype-normalize" as="xs:string">
+        <xsl:param name="raw-datatype" as="xs:string" />
+        <xsl:variable name="deprecation-map">
+            <!-- these old names are permitted for now, while only deprecated -->
+            <!--metaschema/schema/xml/metaschema.xsd
+                 line 1052 inside  /*/xs:simpleType[@name='SimpleDatatypesType']> -->
+            <entry key="base64Binary">base64</entry>
+            <entry key="dateTime">date-time</entry>
+            <entry key="dateTime-with-timezone">date-time-with-timezone</entry>
+            <entry key="email">email-address</entry>
+            <entry key="nonNegativeInteger">non-negative-integer</entry>
+            <entry key="positiveInteger">positive-integer</entry>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$deprecation-map/entry[@key=$raw-datatype]">
+                <xsl:value-of select="$deprecation-map/entry[@key=$raw-datatype]"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$raw-datatype"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <!-- used in documentation generation pipelines -->
+    <xsl:param name="metaschema-reference-url" as="xs:string">https://pages.nist.gov/metaschema/specification/datatypes</xsl:param>
+    
+    <!--
+         Create an href link to the metaschema documentation for a given datatype
+         Warning this function makes no attempt to validate datatype names, only fixing explicitly deprecated names.
+    -->
+    <xsl:function name="m:datatype-create-link" as="element()">
+        <xsl:param name="raw-datatype" as="xs:string" />
+        <xsl:variable name="datatype" as="xs:string" select="m:datatype-normalize($raw-datatype)" />
+        
+        <xsl:element name="a">
+            <xsl:attribute name="href">
+                <xsl:value-of select="$metaschema-reference-url"/>
+                <xsl:text>/#</xsl:text>
+                <xsl:value-of select="$datatype"/>
+            </xsl:attribute>
+            <xsl:value-of select="$datatype"/>
+        </xsl:element>
+    </xsl:function>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/document/common/common-definitions.xsl b/src/document/common/common-definitions.xsl
index 60bc5bcb..4a944798 100644
--- a/src/document/common/common-definitions.xsl
+++ b/src/document/common/common-definitions.xsl
@@ -6,13 +6,12 @@
     exclude-result-prefixes="#all">
 
     <xsl:import href="common-reference.xsl"/>
+    <xsl:import href="../../common/datatypes.xsl"/>
     
     <xsl:key name="assembly-definition-by-name" match="/METASCHEMA/define-assembly" use="@_key-name"/>
     <xsl:key name="field-definition-by-name" match="/METASCHEMA/define-field"       use="@_key-name"/>
     <xsl:key name="flag-definition-by-name" match="/METASCHEMA/define-flag"         use="@_key-name"/>
-    
-    <xsl:variable name="datatype-page" as="xs:string">/reference/datatypes</xsl:variable>
-    
+
     <xsl:variable name="indenting" as="element()"
         xmlns:output="http://www.w3.org/2010/xslt-xquery-serialization">
         <output:serialization-parameters>
@@ -238,10 +237,10 @@
    
     <!-- override this -->
     <xsl:template mode="metaschema-type" match="*" expand-text="true">{ local-name() }</xsl:template>
-        
+    
     <!-- expect overriding XSLT to provide metaschema type with appropriate link  -->
     <xsl:template mode="metaschema-type" match="*[exists(@as-type)]" expand-text="true">
-        <a href="{$datatype-page}/#{(lower-case(@as-type))}">{ @as-type }</a>
+        <xsl:sequence select="m:datatype-create-link(@as-type)"/>
     </xsl:template>
     
     <xsl:template priority="5" match="choice">
diff --git a/src/document/json/json-docs-hugo-uswds.xsl b/src/document/json/json-docs-hugo-uswds.xsl
index be763b2a..ae62dd7e 100644
--- a/src/document/json/json-docs-hugo-uswds.xsl
+++ b/src/document/json/json-docs-hugo-uswds.xsl
@@ -19,8 +19,6 @@
 
    <xsl:variable name="metaschema-code" select="/*/short-name || '-json'"/>
 
-   <xsl:variable name="datatype-page" as="xs:string"> /reference/datatypes</xsl:variable>
-
    <xsl:strip-space elements="*"/>
 
    <xsl:preserve-space elements="p li pre i b em strong a code q"/>
@@ -1182,19 +1180,17 @@
       <xsl:apply-templates select="key('assembly-definitions', @ref)" mode="#current"/>
    </xsl:template>
 
+   <xsl:import href="../../common/datatypes.xsl"/>
+
    <xsl:template mode="metaschema-type" match="define-field[empty(flag | define-flag)]">
       <xsl:variable name="given-type" select="(@as-type, 'string')[1]"/>
-      <a href="{$datatype-page}/#{(lower-case($given-type))}">
-         <xsl:apply-templates mode="#current" select="$given-type"/>
-      </a>
+      <xsl:sequence select="m:datatype-create-link($given-type)"/>
    </xsl:template>
 
    <xsl:template mode="metaschema-type" match="flag | define-flag">
       <xsl:variable name="given-type"
          select="(@as-type, key('flag-definitions', @ref, $home)/@as-type, 'string')[1]"/>
-      <a href="{$datatype-page}/#{(lower-case($given-type))}">
-         <xsl:apply-templates mode="#current" select="$given-type"/>
-      </a>
+      <xsl:sequence select="m:datatype-create-link(@given-type)"/>
    </xsl:template>
 
    <xsl:variable name="numeric-types"
diff --git a/src/document/json/object-map-html.xsl b/src/document/json/object-map-html.xsl
index d1c85c75..36aea4d8 100644
--- a/src/document/json/object-map-html.xsl
+++ b/src/document/json/object-map-html.xsl
@@ -5,6 +5,7 @@
    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    exclude-result-prefixes="#all">
 
+   <xsl:import href="../../common/datatypes.xsl"/>
 
    <xsl:output omit-xml-declaration="true" indent="yes"/>
 
@@ -16,9 +17,7 @@
    <xsl:variable name="path-to-common">
       <xsl:for-each select="tokenize($outline-page,'/')">../</xsl:for-each>
    </xsl:variable>
-   <xsl:variable name="reference-link" select="$path-to-common || $reference-page"/>
-   
-   <xsl:variable name="datatype-page">/reference/datatypes</xsl:variable>
+   <xsl:variable name="reference-link" select="$path-to-common || $reference-page"/> 
    
    <xsl:template match="/" mode="make-page">
       <html lang="en">
@@ -217,8 +216,7 @@ details:not([open]) .show-closed { display: inline }
       <xsl:if test="empty(@_tree-json-id)">
          <xsl:message expand-text="true">not seeing json tree id for { name(.) }</xsl:message>
       </xsl:if>
-      <xsl:variable as="xs:string" name="url-stem" select="replace($reference-link, '.html', '/')" />
-      <a class="OM-name" href="{ $url-stem }#{  @_tree-json-id }">
+      <a class="OM-name" href="{ $reference-link }#{  @_tree-json-id }">
          <xsl:value-of select="(@key,@gi,@name)[1]"/>
       </a>
    </xsl:template>
@@ -279,7 +277,9 @@ details:not([open]) .show-closed { display: inline }
    </xsl:template>
    
    <xsl:template priority="2" mode="inline-link-to" match="m:string" expand-text="true">
-      <span class="OM-datatype"><a href="{$datatype-page}/#{lower-case(@as-type)}">{ @as-type }</a></span>
+      <span class="OM-datatype">
+         <xsl:sequence select="m:datatype-create-link(@as-type)"/>
+      </span>
    </xsl:template>
    
    <xsl:template mode="contents" match="m:array | m:object | m:singleton-or-array | m:group-by-key">
diff --git a/src/document/json/object-reference-html.xsl b/src/document/json/object-reference-html.xsl
index 35275f43..1a8c5035 100644
--- a/src/document/json/object-reference-html.xsl
+++ b/src/document/json/object-reference-html.xsl
@@ -4,6 +4,9 @@
    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0" exclude-result-prefixes="#all">
 
+   <xsl:import href="../../common/datatypes.xsl"/>
+   <xsl:import href="../common/common-reference.xsl"/>
+
    <xsl:output indent="true"/>
    <!-- produces an HTML 'stub' to be inserted into Hugo -->
 
@@ -12,8 +15,6 @@
    <xsl:param name="json-map-page"> json/outline</xsl:param>
    <xsl:param name="json-definitions-page">json/definitions</xsl:param>
 
-   <xsl:variable name="datatype-page" as="xs:string">/reference/datatypes</xsl:variable>
-
    <xsl:template match="metadata/namespace"/>
 
    <xsl:template name="remarks-group">
@@ -182,7 +183,7 @@
    </xsl:template>
 
    <xsl:template mode="metaschema-type" match="*[exists(@as-type)]" expand-text="true">
-      <a href="{$datatype-page}/#{(lower-case(@as-type))}">{ @as-type }</a>
+      <xsl:sequence select="m:datatype-create-link(@as-type)"/>
    </xsl:template>
 
    <xsl:template match="*" mode="report-context" expand-text="true">
@@ -192,9 +193,6 @@
       </xsl:for-each>
    </xsl:template>
 
-
-   <xsl:import href="../common/common-reference.xsl"/>
-
    <xsl:template name="crosslink-to-xml">
       <div class="crosslink">
          <a class="usa-button" href="{$xml-reference-link}#{@_tree-xml-id}">Switch to XML</a>
diff --git a/src/document/write-hugo-metaschema-docs.xpl b/src/document/write-hugo-metaschema-docs.xpl
new file mode 100644
index 00000000..cfd2c667
--- /dev/null
+++ b/src/document/write-hugo-metaschema-docs.xpl
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step"
+  version="1.0" xmlns:metaschema="http://csrc.nist.gov/ns/metaschema/1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" type="metaschema:make-all-metaschema-docs"
+  name="make-all-metaschema-docs">
+
+  <!-- Purpose: Write Hugo-ready HTML with XML and JSON-oriented metaschema documentation -->
+  <!-- Input: A valid and correct OSCAL Metaschema instance linked to its modules (also valid and
+  correct) -->
+  <!-- Output: Options indicate file names to assign to outputs in serialization -->
+  <!-- Note: See make-metaschema-standalone-docs.xpl for debugging -->
+
+  <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
+  <!-- Ports -->
+
+  <p:input port="source" primary="true" />
+
+  <p:input port="parameters" kind="parameter" />
+
+  <p:option name="output-path" required="true">
+    <p:documentation>
+      The output directory to write to. This should be an absolute URI.
+    </p:documentation>
+  </p:option>
+
+  <p:option name="json-outline-filename" select="'json-outline.html'" />
+  <p:option name="json-reference-filename" select="'json-reference.html'" />
+  <p:option name="json-index-filename" select="'json-index.html'" />
+  <p:option name="json-definitions-filename" select="'json-definitions.html'" />
+  <p:option name="xml-outline-filename" select="'xml-outline.html'" />
+  <p:option name="xml-reference-filename" select="'xml-reference.html'" />
+  <p:option name="xml-index-filename" select="'xml-index.html'" />
+  <p:option name="xml-definitions-filename" select="'xml-definitions.html'" />
+
+  <p:option name="page-base-path" select="''">
+    <p:documentation>
+      The base path that will be prepended to all relative links (e.g. '' or 'model-name/').
+    </p:documentation>
+  </p:option>
+  
+  <p:option name="json-outline-page" select="concat($page-base-path, replace($json-outline-filename, '.html', '/'))" />
+  <p:option name="json-reference-page" select="concat($page-base-path, replace($json-reference-filename, '.html', '/'))" />
+  <p:option name="json-index-page" select="concat($page-base-path, replace($json-index-filename, '.html', '/'))" />
+  <p:option name="json-definitions-page" select="concat($page-base-path, replace($json-definitions-filename, '.html', '/'))" />
+  <p:option name="xml-outline-page" select="concat($page-base-path, replace($xml-outline-filename, '.html', '/'))" />
+  <p:option name="xml-reference-page" select="concat($page-base-path, replace($xml-reference-filename, '.html', '/'))" />
+  <p:option name="xml-index-page" select="concat($page-base-path, replace($xml-index-filename, '.html', '/'))" />
+  <p:option name="xml-definitions-page" select="concat($page-base-path, replace($xml-definitions-filename, '.html', '/'))" />
+
+  <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
+  <!-- Import (subpipeline) -->
+
+  <p:import href="../compose/metaschema-compose.xpl" />
+
+  <p:variable name="xml-outline-uri" select="resolve-uri($xml-outline-filename,     $output-path)" />
+  <p:variable name="xml-reference-uri" select="resolve-uri($xml-reference-filename,   $output-path)" />
+  <p:variable name="xml-index-uri" select="resolve-uri($xml-index-filename,       $output-path)" />
+  <p:variable name="xml-definitions-uri"
+    select="resolve-uri($xml-definitions-filename, $output-path)" />
+  <p:variable name="json-outline-uri" select="resolve-uri($json-outline-filename,    $output-path)" />
+  <p:variable name="json-reference-uri"
+    select="resolve-uri($json-reference-filename,  $output-path)" />
+  <p:variable name="json-index-uri" select="resolve-uri($json-index-filename,      $output-path)" />
+  <p:variable name="json-definitions-uri"
+    select="resolve-uri($json-definitions-filename,$output-path)" />
+
+  <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
+  <!-- Pipeline -->
+
+  <p:identity name="input" />
+
+  <metaschema:metaschema-compose name="compose" />
+
+  <p:identity name="composed" />
+
+  <p:xslt name="make-abstract-map">
+    <p:input port="stylesheet">
+      <p:document href="../compose/make-model-map.xsl" />
+    </p:input>
+  </p:xslt>
+
+  <!-- next step unfolds map (making groups into wrappers)
+     and expands identifiers -->
+  <p:xslt name="unfold-instance-map">
+    <p:input port="stylesheet">
+      <p:document href="../compose/unfold-model-map.xsl" />
+    </p:input>
+  </p:xslt>
+
+  <p:xslt name="annotate-instance-map">
+    <p:input port="stylesheet">
+      <p:document href="../compose/annotate-model-map.xsl" />
+    </p:input>
+  </p:xslt>
+
+  <!--Making
+  the XML model map -->
+  <p:xslt name="make-xml-element-tree">
+    <!--<p:input
+    port="source">
+      <p:pipe port="result" step="unfold-model-map"/>
+    </p:input>-->
+    <p:input port="stylesheet">
+      <p:document href="xml/element-tree.xsl" />
+    </p:input>
+  </p:xslt>
+
+  <p:xslt name="make-xml-model-map">
+    <p:input port="stylesheet">
+      <p:document href="xml/element-map-html.xsl" />
+    </p:input>
+    <p:with-param name="outline-page" select="$xml-outline-page" />
+    <p:with-param name="reference-page" select="$xml-reference-page" />
+  </p:xslt>
+
+  <!-- Done with that. -->
+  <p:sink />
+
+  <p:xslt name="render-xml-element-reference">
+    <p:input port="source">
+      <p:pipe port="result" step="make-xml-element-tree" />
+    </p:input>
+    <p:input port="stylesheet">
+      <p:document href="xml/element-reference-html.xsl" />
+    </p:input>
+    <p:with-param name="xml-reference-page" select="$xml-reference-page" />
+    <p:with-param name="xml-definitions-page" select="$xml-definitions-page" />
+    <p:with-param name="json-reference-page" select="$json-reference-page" />
+    <p:with-param name="xml-map-page" select="$xml-outline-page" />
+  </p:xslt>
+
+  <p:sink />
+
+  <p:xslt name="render-xml-element-index">
+    <p:input port="source">
+      <p:pipe port="result" step="make-xml-element-tree" />
+    </p:input>
+    <p:input port="stylesheet">
+      <p:document href="xml/element-index-html.xsl" />
+    </p:input>
+    <p:with-param name="index-page" select="$xml-index-page" />
+    <p:with-param name="reference-page" select="$xml-reference-page" />
+    <p:with-param name="definitions-page" select="$xml-definitions-page" />
+  </p:xslt>
+
+  <p:sink />
+
+  <!-- For the straight-up definitions directory we go back to the composed metaschema before
+  explosion -->
+  <p:xslt name="render-xml-definitions">
+    <p:input port="source">
+      <p:pipe port="result" step="composed" />
+    </p:input>
+    <p:input port="stylesheet">
+      <!-- XXX fix up / reduce this XSLT (from RC2) -->
+      <p:document href="xml/xml-definitions.xsl" />
+    </p:input>
+    <p:with-param name="xml-definitions-page" select="$xml-definitions-page" />
+    <p:with-param name="json-definitions-page" select="$json-definitions-page" />
+    <p:with-param name="xml-reference-page" select="$xml-reference-page" />
+  </p:xslt>
+
+  <p:sink />
+
+
+  <!--  JSON pipelines start here -->
+  <!--  A representation of the JSON object tree is rendered out from the unfolded blown out model
+  map -->
+  <p:xslt name="make-json-object-tree">
+    <p:input port="source">
+      <p:pipe port="result" step="annotate-instance-map" />
+    </p:input>
+    <p:input port="stylesheet">
+      <p:document href="json/object-tree.xsl" />
+    </p:input>
+  </p:xslt>
+
+  <!-- From this, we first make the model map (ready to inject into the web build) -->
+  <p:xslt name="make-json-model-map">
+    <p:input port="stylesheet">
+      <p:document href="json/object-map-html.xsl" />
+    </p:input>
+    <p:with-param name="outline-page" select="$json-outline-page" />
+    <p:with-param name="reference-page" select="$json-reference-page" />
+  </p:xslt>
+
+  <!-- Done with that. -->
+  <p:sink />
+
+
+  <!--Next,
+  picking up from the object tree we make the main reference document -->
+
+  <!-- Making page contents for site -->
+  <p:xslt name="render-json-object-reference">
+    <p:input port="source">
+      <p:pipe port="result" step="make-json-object-tree" />
+    </p:input>
+    <!--<p:with-option
+    name="initial-mode" select="QName('','make-page')"/>-->
+    <p:input port="stylesheet">
+      <p:document href="json/object-reference-html.xsl" />
+    </p:input>
+    <p:with-param name="json-reference-page" select="$json-reference-page" />
+    <p:with-param name="json-definitions-page" select="$json-definitions-page" />
+    <p:with-param name="xml-reference-page" select="$xml-reference-page" />
+    <p:with-param name="json-map-page" select="$json-outline-page" />
+  </p:xslt>
+
+  <p:sink />
+
+  <!-- The JSON object index is produced from the full blown out instance tree
+       as already rendered into HTML   -->
+  <p:xslt name="render-json-object-index">
+    <!--<p:with-option
+    name="initial-mode" select="QName('','make-page')"/>-->
+    <p:input port="source">
+      <p:pipe port="result" step="make-json-object-tree" />
+    </p:input>
+    <p:input port="stylesheet">
+      <p:document href="json/object-index-html.xsl" />
+    </p:input>
+    <p:with-param name="index-page" select="$json-index-page" />
+    <p:with-param name="reference-page" select="$json-reference-page" />
+    <p:with-param name="definitions-page" select="$json-definitions-page" />
+  </p:xslt>
+
+  <p:sink />
+
+  <!-- For the straight-up definitions directory we go back to the composed metaschema before
+  explosion -->
+  <p:xslt name="render-json-definitions">
+    <p:input port="source">
+      <p:pipe port="result" step="composed" />
+    </p:input>
+    <p:input port="stylesheet">
+      <!-- XXX fix up / reduce this XSLT (from RC2) -->
+      <p:document href="json/json-definitions.xsl" />
+    </p:input>
+    <p:with-param name="json-definitions-page" select="$json-definitions-page" />
+    <p:with-param name="xml-definitions-page" select="$xml-definitions-page" />
+    <p:with-param name="json-reference-page" select="$json-reference-page" />
+  </p:xslt>
+
+  <p:sink />
+
+  <!--<p:xslt
+  name="diagnostic">
+    <p:input port="source">
+      <p:inline><dummy/></p:inline>
+    </p:input>
+    <p:input port="stylesheet">
+      <p:document href="common/pipeline-diagnostic.xsl"/>
+    </p:input>
+    <p:with-param name="test1" select="$json-outline-uri"/>
+    <p:with-param name="test2"  select="$source-doc"/>
+  </p:xslt>-->
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="make-xml-model-map" />
+    </p:input>
+    <p:with-option name="href" select="$xml-outline-uri" />
+  </p:store>
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="render-xml-element-reference" />
+    </p:input>
+    <p:with-option name="href" select="$xml-reference-uri" />
+  </p:store>
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="render-xml-definitions" />
+    </p:input>
+    <p:with-option name="href" select="$xml-definitions-uri" />
+  </p:store>
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="render-xml-element-index" />
+    </p:input>
+    <p:with-option name="href" select="$xml-index-uri" />
+  </p:store>
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="make-json-model-map" />
+    </p:input>
+    <p:with-option name="href" select="$json-outline-uri" />
+  </p:store>
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="render-json-object-reference" />
+    </p:input>
+    <p:with-option name="href" select="$json-reference-uri" />
+  </p:store>
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="render-json-definitions" />
+    </p:input>
+    <p:with-option name="href" select="$json-definitions-uri" />
+  </p:store>
+
+  <p:store method="xhtml" indent="true">
+    <p:input port="source">
+      <p:pipe port="result" step="render-json-object-index" />
+    </p:input>
+    <p:with-option name="href" select="$json-index-uri" />
+  </p:store>
+
+</p:declare-step>
\ No newline at end of file
diff --git a/src/document/xml/element-map-html.xsl b/src/document/xml/element-map-html.xsl
index 8aa8a822..d7e1a65f 100644
--- a/src/document/xml/element-map-html.xsl
+++ b/src/document/xml/element-map-html.xsl
@@ -5,6 +5,8 @@
    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    exclude-result-prefixes="#all">
 
+   <xsl:import href="../../common/datatypes.xsl"/>
+
    <xsl:output indent="yes"/>
    <xsl:variable as="xs:string" name="model-label" select="string(/map/@prefix)"/>
 
@@ -16,10 +18,7 @@
       <xsl:for-each select="tokenize($outline-page,'/')">../</xsl:for-each>
    </xsl:variable>
    <xsl:variable name="reference-link" select="$path-to-common || $reference-page"/>
-   
-   
-   <xsl:variable name="datatype-page">/reference/datatypes</xsl:variable>
-   
+      
 <!--http://localhost:1313/OSCAL/documentation/schema/catalog-layer/catalog/xml-model-map/
 http://localhost:1313/OSCAL/documentation/schema/catalog-layer/catalog/xml-schema/-->
 
@@ -82,8 +81,7 @@ div.OM-map p { margin: 0ex }
    
    
    <xsl:template match="*[exists(@_tree-xml-id)]" mode="linked-name">
-      <xsl:variable as="xs:string" name="url-stem" select="replace($reference-link, '.html', '/')" />
-      <a class="OM-name" href="{ $url-stem }#{ @_tree-xml-id }">
+      <a class="OM-name" href="{ $reference-link }#{ @_tree-xml-id }">
          <xsl:value-of select="(@gi,@name)[1]"/>
       </a>
    </xsl:template> 
@@ -93,8 +91,10 @@ div.OM-map p { margin: 0ex }
    </xsl:template> 
    
    <xsl:template priority="2" mode="linked-datatype" match="*" expand-text="true">
-      <xsl:variable name="type" select="(lower-case(@as-type),'string')[1]"/>
-      <span class="OM-datatype"><a href="{$datatype-page}/#{$type}">{ $type }</a></span>
+      <xsl:variable name="type" select="(@as-type,'string')[1]"/>
+      <span class="OM-datatype">
+         <xsl:sequence select="m:datatype-create-link($type)"/>
+      </span>
    </xsl:template>
    
    <xsl:template match="m:element">
diff --git a/src/document/xml/element-reference-html.xsl b/src/document/xml/element-reference-html.xsl
index 21a39b08..390c58e9 100644
--- a/src/document/xml/element-reference-html.xsl
+++ b/src/document/xml/element-reference-html.xsl
@@ -4,6 +4,9 @@
    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    exclude-result-prefixes="#all">
+
+   <xsl:import href="../../common/datatypes.xsl"/>
+   
    <!--
    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml"
    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
@@ -15,9 +18,7 @@
    <xsl:param name="json-reference-page">json/reference</xsl:param>
    <xsl:param name="xml-map-page"> xml/outline</xsl:param>
    <xsl:param name="xml-definitions-page">xml/definitions</xsl:param>
-
-   <xsl:variable name="datatype-page" as="xs:string">/reference/datatypes</xsl:variable>
-
+  
    <xsl:template match="metadata/json-base-uri"/>
 
    <xsl:template name="remarks-group">
@@ -185,7 +186,7 @@
          <div class="body">
             <p>
                <xsl:text>This use of the </xsl:text>
-               <a href="{$datatype-page}/#markup-multiline">markup-multiline</a>
+               <xsl:value-of select="m:datatype-create-link('markup-multiline')"/>
                <xsl:text> type permits unwrapped block-level markup.</xsl:text>
             </p>
          </div>
@@ -225,7 +226,7 @@
    </xsl:template>
 
    <xsl:template mode="metaschema-type" match="*[exists(@as-type)]" expand-text="true">
-      <a href="{$datatype-page}/#{(lower-case(@as-type))}">{ @as-type }</a>
+      <xsl:sequence select="m:datatype-create-link(@as-type)"/>
    </xsl:template>
 
    <xsl:import href="../common/common-reference.xsl"/>
diff --git a/src/document/xml/xml-docs-hugo-uswds.xsl b/src/document/xml/xml-docs-hugo-uswds.xsl
index 8c11a2ab..0f4abe53 100644
--- a/src/document/xml/xml-docs-hugo-uswds.xsl
+++ b/src/document/xml/xml-docs-hugo-uswds.xsl
@@ -5,6 +5,8 @@
    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    exclude-result-prefixes="#all">
 
+   <xsl:import href="../../common/datatypes.xsl"/>
+
    <!-- Purpose: XSLT 3.0 stylesheet for Metaschema display (HTML): XML version -->
    <!-- Input:   Metaschema -->
    <!-- Output:  HTML  -->
@@ -32,8 +34,6 @@
 
    <xsl:variable name="metaschema-code" select="/*/short-name || '-xml'"/>
 
-   <xsl:variable name="datatype-page" as="xs:string"> /reference/datatypes</xsl:variable>
-
    <xsl:strip-space elements="*"/>
 
    <xsl:preserve-space elements="p li pre i b em strong a code q"/>
@@ -1106,21 +1106,16 @@
       <xsl:apply-templates select="key('assembly-definitions', @ref)" mode="#current"/>
    </xsl:template>
 
-
    <xsl:template mode="metaschema-type" match="flag | define-flag">
       <xsl:variable name="given-type"
          select="(@as-type, key('flag-definitions', @ref)/@as-type, 'string')[1]"/>
-      <a href="{$datatype-page}/#{(lower-case($given-type))}">
-         <xsl:apply-templates mode="#current" select="$given-type"/>
-      </a>
+      <xsl:sequence select="m:datatype-create-link($given-type)"/>
    </xsl:template>
 
    <xsl:template mode="metaschema-type" match="define-field">
       <xsl:variable name="given-type"
          select="(@as-type, key('field-definitions', @ref)/@as-type, 'string')[1]"/>
-      <a href="{$datatype-page}/#{(lower-case($given-type))}">
-         <xsl:apply-templates mode="#current" select="$given-type"/>
-      </a>
+      <xsl:sequence select="m:datatype-create-link($given-type)"/>
    </xsl:template>
 
    <xsl:template mode="metaschema-type" match="define-assembly">element</xsl:template>