diff --git a/accname/index.html b/accname/index.html
index 76c61e428..8ae0e36ac 100644
--- a/accname/index.html
+++ b/accname/index.html
@@ -85,39 +85,38 @@
         // Spec URLs
         ariaSpecURLs: {
           ED: "https://w3c.github.io/aria/",
-          WD: "https://www.w3.org/TR/wai-aria-1.2/",
-          FPWD: "https://www.w3.org/TR/wai-aria-1.2/",
-          REC: "https://www.w3.org/TR/wai-aria/",
-        },
-        coreMappingURLs: {
-          ED: "https://w3c.github.io/core-aam/",
-          WD: "https://www.w3.org/TR/core-aam-1.2/",
-          FPWD: "https://www.w3.org/TR/core-aam-1.2/",
-          REC: "https://www.w3.org/TR/core-aam-1.2/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
         },
         accNameURLs: {
           ED: "https://w3c.github.io/accname/",
           WD: "https://www.w3.org/TR/accname-1.2/",
           FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
           REC: "https://www.w3.org/TR/accname-1.2/",
         },
+        coreMappingURLs: {
+          ED: "https://w3c.github.io/core-aam/",
+          WD: "https://www.w3.org/TR/core-aam-1.2/",
+          FPWD: "https://www.w3.org/TR/core-aam-1.2/",
+          CR: "https://www.w3.org/TR/core-aam-1.2/",
+          REC: "https://www.w3.org/TR/core-aam-1.2/",
+        },
         dpubModURLs: {
           ED: "https://w3c.github.io/dpub-aria/",
           FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
           WD: "https://www.w3.org/TR/dpub-aria-1.1/",
           REC: "https://www.w3.org/TR/dpub-aria-1.1/",
         },
-        htmlMappingURLs: {
-          ED: "https://w3c.github.io/html-aam/",
-          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
-          WD: "https://www.w3.org/TR/html-aam/",
-          REC: "https://www.w3.org/TR/html-aam/",
-        },
         graphicsMappingModURLs: {
           ED: "https://w3c.github.io/graphics-aam/",
-          FPWD: "https://www.w3.org/TR/graphics-aam/",
-          WD: "https://www.w3.org/TR/graphics-aam/",
-          REC: "https://www.w3.org/TR/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
         },
         graphicsModURLs: {
           ED: "https://w3c.github.io/graphics-aria/",
@@ -125,13 +124,19 @@
           WD: "https://www.w3.org/TR/graphics-aria/",
           REC: "https://www.w3.org/TR/graphics-aria/",
         },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
         practicesURLs: {
           ED: "https://www.w3.org/WAI/ARIA/apg/",
-          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
           WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
           REC: "https://www.w3.org/WAI/ARIA/apg/",
         },
-
         preProcess: [linkCrossReferences, getParticipants],
         postProcess: [addPlatformMaintainers],
         //Pointing to the 1.2 versions but should remove the version in the publishing branch
diff --git a/core-aam/index.html b/core-aam/index.html
index e98f9fa5f..6323c441f 100644
--- a/core-aam/index.html
+++ b/core-aam/index.html
@@ -119,17 +119,59 @@
 
         // Spec URLs
         ariaSpecURLs: {
-          CR: "https://w3c.github.io/aria/",
-          CRD: "https://w3c.github.io/aria/",
-          PR: "https://www.w3.org/TR/wai-aria/",
-          REC: "https://www.w3.org/TR/wai-aria/",
+          ED: "https://w3c.github.io/aria/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
         },
         accNameURLs: {
-          CR: "https://w3c.github.io/accname/",
-          CRD: "https://w3c.github.io/accname/",
-          PR: "https://www.w3.org/TR/accname-1.2/",
+          ED: "https://w3c.github.io/accname/",
+          WD: "https://www.w3.org/TR/accname-1.2/",
+          FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
           REC: "https://www.w3.org/TR/accname-1.2/",
         },
+        coreMappingURLs: {
+          ED: "https://w3c.github.io/core-aam/",
+          WD: "https://www.w3.org/TR/core-aam-1.2/",
+          FPWD: "https://www.w3.org/TR/core-aam-1.2/",
+          CR: "https://www.w3.org/TR/core-aam-1.2/",
+          REC: "https://www.w3.org/TR/core-aam-1.2/",
+        },
+        dpubModURLs: {
+          ED: "https://w3c.github.io/dpub-aria/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
+        },
+        graphicsMappingModURLs: {
+          ED: "https://w3c.github.io/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
+        },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
+        practicesURLs: {
+          ED: "https://www.w3.org/WAI/ARIA/apg/",
+          WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
+          REC: "https://www.w3.org/WAI/ARIA/apg/",
+        },
 
         preProcess: [linkCrossReferences, getParticipants],
         postProcess: [addPlatformMaintainers],
diff --git a/dpub-aam/index.html b/dpub-aam/index.html
index 577d7c563..0df5abe2f 100644
--- a/dpub-aam/index.html
+++ b/dpub-aam/index.html
@@ -92,12 +92,20 @@
         tocIntroductory: true,
         //maxTocLevel: 4,
 
+        // spec URLs
         ariaSpecURLs: {
           ED: "https://w3c.github.io/aria/",
-          FPWD: "https://www.w3.org/TR/wai-aria-1.2/",
-          WD: "https://www.w3.org/TR/wai-aria-1.2/",
-          CR: "https://www.w3.org/TR/wai-aria-1.2/",
-          REC: "https://www.w3.org/TR/wai-aria-1.2/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
+        },
+        accNameURLs: {
+          ED: "https://w3c.github.io/accname/",
+          WD: "https://www.w3.org/TR/accname-1.2/",
+          FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
+          REC: "https://www.w3.org/TR/accname-1.2/",
         },
         coreMappingURLs: {
           ED: "https://w3c.github.io/core-aam/",
@@ -110,34 +118,32 @@
           ED: "https://w3c.github.io/dpub-aria/",
           FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
           WD: "https://www.w3.org/TR/dpub-aria-1.1/",
-          CR: "https://www.w3.org/TR/dpub-aria-1.1/",
           REC: "https://www.w3.org/TR/dpub-aria-1.1/",
         },
-        htmlMappingURLs: {
-          ED: "https://w3c.github.io/html-aam/",
-          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
-          WD: "https://www.w3.org/TR/html-aam/",
-          CR: "https://www.w3.org/TR/html-aam/",
-          REC: "https://www.w3.org/TR/html-aam/",
-        },
         graphicsMappingModURLs: {
           ED: "https://w3c.github.io/graphics-aam/",
-          FPWD: "https://www.w3.org/TR/graphics-aam/",
-          WD: "https://www.w3.org/TR/graphics-aam/",
-          CR: "https://www.w3.org/TR/graphics-aam/",
-          REC: "https://www.w3.org/TR/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
         },
         graphicsModURLs: {
           ED: "https://w3c.github.io/graphics-aria/",
           FPWD: "https://www.w3.org/TR/graphics-aria/",
           WD: "https://www.w3.org/TR/graphics-aria/",
-          CR: "https://www.w3.org/TR/graphics-aria/",
           REC: "https://www.w3.org/TR/graphics-aria/",
         },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
         practicesURLs: {
           ED: "https://www.w3.org/WAI/ARIA/apg/",
-          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
           WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
           CR: "https://www.w3.org/WAI/ARIA/apg/",
           REC: "https://www.w3.org/WAI/ARIA/apg/",
         },
diff --git a/dpub-aria/index.html b/dpub-aria/index.html
index 6e6114456..53ce74a96 100644
--- a/dpub-aria/index.html
+++ b/dpub-aria/index.html
@@ -83,32 +83,60 @@
           CRD: "",
           REC: "",
         },
+        // spec URLs
         ariaSpecURLs: {
           ED: "https://w3c.github.io/aria/",
-          WD: "https://www.w3.org/TR/wai-aria-1.1/",
-          CRD: "https://www.w3.org/TR/wai-aria-1.1/",
-          REC: "https://www.w3.org/TR/wai-aria-1.1/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
         },
         accNameURLs: {
           ED: "https://w3c.github.io/accname/",
-          WD: "https://www.w3.org/TR/accname-aam-1.2/",
-          FPWD: "https://www.w3.org/TR/accname-aam-1.2/",
-          CRD: "https://www.w3.org/TR/accname-aam-1.2/",
-          REC: "https://www.w3.org/TR/accname-aam-1.2/",
+          WD: "https://www.w3.org/TR/accname-1.2/",
+          FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
+          REC: "https://www.w3.org/TR/accname-1.2/",
         },
         coreMappingURLs: {
           ED: "https://w3c.github.io/core-aam/",
           WD: "https://www.w3.org/TR/core-aam-1.2/",
           FPWD: "https://www.w3.org/TR/core-aam-1.2/",
-          CRD: "https://www.w3.org/TR/core-aam-1.2/",
+          CR: "https://www.w3.org/TR/core-aam-1.2/",
           REC: "https://www.w3.org/TR/core-aam-1.2/",
         },
+        dpubModURLs: {
+          ED: "https://w3c.github.io/dpub-aria/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
+        },
+        graphicsMappingModURLs: {
+          ED: "https://w3c.github.io/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
+        },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
         practicesURLs: {
-          ED: "https://w3c.github.io/aria-practices/",
-          WD: "https://www.w3.org/TR/wai-aria-practices-1.2/",
-          FPWD: "https://www.w3.org/TR/wai-aria-practices-1.2/",
-          CRD: "https://www.w3.org/TR/wai-aria-practices-1.2/",
-          REC: "https://www.w3.org/TR/wai-aria-practices-1.2/",
+          ED: "https://www.w3.org/WAI/ARIA/apg/",
+          WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
+          REC: "https://www.w3.org/WAI/ARIA/apg/",
         },
         preProcess: [linkCrossReferences, getParticipants],
         postProcess: [ariaAttributeReferences],
diff --git a/graphics-aam/index.html b/graphics-aam/index.html
index 037ed677c..3d9c71635 100644
--- a/graphics-aam/index.html
+++ b/graphics-aam/index.html
@@ -56,7 +56,6 @@
         formerEditors: [
           {
             name: "Joanmarie Diggs",
-            url: "https://www.igalia.com",
             mailto: "jdiggs@igalia.com",
             company: "Igalia, S.L.",
             companyURL: "https://www.igalia.com",
@@ -65,7 +64,6 @@
           },
           {
             name: "Michael Cooper",
-            url: "http://www.w3.org",
             mailto: "cooper@w3.org",
             company: "W3C",
             companyURL: "http://www.w3.org",
@@ -125,47 +123,35 @@
         tocIntroductory: true,
         //maxTocLevel: 4,
 
+        // Spec URLs
         ariaSpecURLs: {
           ED: "https://w3c.github.io/aria/",
-          FPWD: "https://www.w3.org/TR/wai-aria-1.1/",
-          WD: "https://www.w3.org/TR/wai-aria-1.1/",
-          CR: "https://www.w3.org/TR/wai-aria-1.1/",
-          PR: "https://www.w3.org/TR/wai-aria-1.1/",
-          REC: "https://www.w3.org/TR/wai-aria-1.1/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
         },
         accNameURLs: {
           ED: "https://w3c.github.io/accname/",
-          FPWD: "https://www.w3.org/TR/accname-1.1/",
-          WD: "https://www.w3.org/TR/accname-1.1/",
-          CR: "https://www.w3.org/TR/accname-1.1/",
-          PR: "https://www.w3.org/TR/accname-1.1/",
-          REC: "https://www.w3.org/TR/accname-1.1/",
+          WD: "https://www.w3.org/TR/accname-1.2/",
+          FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
+          REC: "https://www.w3.org/TR/accname-1.2/",
         },
         coreMappingURLs: {
           ED: "https://w3c.github.io/core-aam/",
-          FPWD: "https://www.w3.org/TR/core-aam-1.1/",
-          WD: "https://www.w3.org/TR/core-aam-1.1/",
-          CR: "https://www.w3.org/TR/core-aam-1.1/",
-          PR: "https://www.w3.org/TR/core-aam-1.1/",
-          REC: "https://www.w3.org/TR/core-aam-1.1/",
+          WD: "https://www.w3.org/TR/core-aam-1.2/",
+          FPWD: "https://www.w3.org/TR/core-aam-1.2/",
+          CR: "https://www.w3.org/TR/core-aam-1.2/",
+          REC: "https://www.w3.org/TR/core-aam-1.2/",
         },
         dpubModURLs: {
           ED: "https://w3c.github.io/dpub-aria/",
-          FPWD: "https://www.w3.org/TR/dpub-aria-1.0/",
-          WD: "https://www.w3.org/TR/dpub-aria-1.0/",
-          CR: "https://www.w3.org/TR/dpub-aria-1.0/",
-          PR: "https://www.w3.org/TR/dpub-aria-1.0/",
-          REC: "https://www.w3.org/TR/dpub-aria-1.0/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
         },
-        graphicsModURLs: {
-          ED: "https://w3c.github.io/graphics-aria/",
-          FPWD: "https://www.w3.org/TR/graphics-aria-1.0/",
-          WD: "https://www.w3.org/TR/graphics-aria-1.0/",
-          CR: "https://www.w3.org/TR/graphics-aria-1.0/",
-          PR: "https://www.w3.org/TR/graphics-aria-1.0/",
-          REC: "https://www.w3.org/TR/graphics-aria-1.0/",
-        },
-        graphicsMappingURLs: {
+        graphicsMappingModURLs: {
           ED: "https://w3c.github.io/graphics-aam/",
           FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
           WD: "https://www.w3.org/TR/graphics-aam-1.0/",
@@ -173,6 +159,26 @@
           PR: "https://www.w3.org/TR/graphics-aam-1.0/",
           REC: "https://www.w3.org/TR/graphics-aam-1.0/",
         },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
+        practicesURLs: {
+          ED: "https://www.w3.org/WAI/ARIA/apg/",
+          WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
+          REC: "https://www.w3.org/WAI/ARIA/apg/",
+        },
+
         preProcess: [linkCrossReferences, getParticipants],
         postProcess: [],
         definitionMap: [],
diff --git a/graphics-aria/index.html b/graphics-aria/index.html
index 7d52d5001..6ea64492a 100644
--- a/graphics-aria/index.html
+++ b/graphics-aria/index.html
@@ -142,17 +142,63 @@
         // Spec URLs
         ariaSpecURLs: {
           ED: "https://w3c.github.io/aria/",
-          FPWD: "https://www.w3.org/TR/wai-aria-1.1/",
-          WD: "https://www.w3.org/TR/wai-aria-1.1/",
-          CR: "https://www.w3.org/TR/wai-aria-1.1/",
-          PR: "https://www.w3.org/TR/wai-aria-1.1/",
-          REC: "https://www.w3.org/TR/wai-aria-1.1/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
+        },
+        accNameURLs: {
+          ED: "https://w3c.github.io/accname/",
+          WD: "https://www.w3.org/TR/accname-1.2/",
+          FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
+          REC: "https://www.w3.org/TR/accname-1.2/",
+        },
+        coreMappingURLs: {
+          ED: "https://w3c.github.io/core-aam/",
+          WD: "https://www.w3.org/TR/core-aam-1.2/",
+          FPWD: "https://www.w3.org/TR/core-aam-1.2/",
+          CR: "https://www.w3.org/TR/core-aam-1.2/",
+          REC: "https://www.w3.org/TR/core-aam-1.2/",
+        },
+        dpubModURLs: {
+          ED: "https://w3c.github.io/dpub-aria/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
+        },
+        graphicsMappingModURLs: {
+          ED: "https://w3c.github.io/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
+        },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
+        practicesURLs: {
+          ED: "https://www.w3.org/WAI/ARIA/apg/",
+          WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
+          REC: "https://www.w3.org/WAI/ARIA/apg/",
         },
 
         preProcess: [linkCrossReferences, getParticipants],
         postProcess: [ariaAttributeReferences],
         definitionMap: [],
-        xref: ["core-aam", "accname", "wai-aria"],
+        xref: ["core-aam-1.2", "accname", "wai-aria-1.3", "DOM", "HTML", "infra"],
       };
     </script>
     <style>
@@ -298,10 +344,10 @@ <h2>Authoring Practices</h2>
           <h3>Authoring Tools</h3>
           <p>
             Many of the requirements in the definitions of the <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> and Graphics
-            <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> <a data-lt="role">roles</a>, <a data-lt="state">states</a> and <a data-lt="property">properties</a> can be checked
-            automatically during the development process, similar to other quality control processes used for validating code. To assist authors who are creating graphics, these tools can compare the
-            semantic structure of Graphics <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> roles from the <abbr title="Document Object Model">DOM</abbr> to that defined in this
-            specification and notify the author of errors or simply create templates that enforce that structure.
+            <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> <a data-lt="role">roles</a>, <a data-lt="state">states</a> and [=ARIA/properties=] can be checked automatically during
+            the development process, similar to other quality control processes used for validating code. To assist authors who are creating graphics, these tools can compare the semantic structure of
+            Graphics <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> roles from the <abbr title="Document Object Model">DOM</abbr> to that defined in this specification and notify
+            the author of errors or simply create templates that enforce that structure.
           </p>
         </section>
 
@@ -338,9 +384,9 @@ <h2>Assistive Technologies</h2>
     <section class="normative" id="conformance">
       <h2>Conformance</h2>
       <p>
-        The main content of this specification is <a class="termref">normative</a> and defines requirements that impact conformance claims. Introductory material, appendices, sections marked as
-        "non-normative" and their subsections, diagrams, examples, and notes are <a class="termref">informative</a> (non-normative). Non-normative material provides advisory information to help
-        interpret the guidelines but does not create requirements that impact a conformance claim.
+        The main content of this specification is [=ARIA/normative=} and defines requirements that impact conformance claims. Introductory material, appendices, sections marked as "non-normative" and
+        their subsections, diagrams, examples, and notes are [=ARIA/informative=] (non-normative). Non-normative material provides advisory information to help interpret the guidelines but does not
+        create requirements that impact a conformance claim.
       </p>
       <p>
         Normative sections provide requirements that <a class="termref">user agents</a> must follow for an implementation to conform to this specification. The keywords <em class="rfc2119">MUST</em>,
@@ -361,7 +407,7 @@ <h1>Graphics Roles</h1>
       <p>
         This section defines additions to the
         <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr>
-        <a class="termref">role</a> <a class="termref">taxonomy</a> and describes the characteristics and properties of all <a data-lt="role" class="termref">roles</a>. See
+        <a class="termref">role</a> [=ARIA/taxonomy=] and describes the characteristics and properties of all <a data-lt="role" class="termref">roles</a>. See
         <a href="#roles" class="specref">ARIA Roles</a> for descriptions of the fields provided by this module.
       </p>
       <p>
diff --git a/html-aam/index.html b/html-aam/index.html
index f8f943325..bc367429b 100644
--- a/html-aam/index.html
+++ b/html-aam/index.html
@@ -51,10 +51,11 @@
 
         // Spec URLs
         ariaSpecURLs: {
-          CR: "https://w3c.github.io/aria/",
-          CRD: "https://w3c.github.io/aria/",
-          PR: "https://www.w3.org/TR/wai-aria/",
-          REC: "https://www.w3.org/TR/wai-aria/",
+          ED: "https://w3c.github.io/aria/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
         },
         accNameURLs: {
           ED: "https://w3c.github.io/accname/",
@@ -70,6 +71,39 @@
           CR: "https://www.w3.org/TR/core-aam-1.2/",
           REC: "https://www.w3.org/TR/core-aam-1.2/",
         },
+        dpubModURLs: {
+          ED: "https://w3c.github.io/dpub-aria/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
+        },
+        graphicsMappingModURLs: {
+          ED: "https://w3c.github.io/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
+        },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
+        practicesURLs: {
+          ED: "https://www.w3.org/WAI/ARIA/apg/",
+          WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
+          REC: "https://www.w3.org/WAI/ARIA/apg/",
+        },
 
         xref: ["HTML", "core-aam", "accname", "wai-aria", "dom", "infra"],
         preProcess: [linkCrossReferences, getParticipants],
diff --git a/index.html b/index.html
index 3f3e5a65c..9bcaf5e56 100644
--- a/index.html
+++ b/index.html
@@ -144,6 +144,32 @@
           "CR": "https://www.w3.org/TR/core-aam-1.2/",
           "REC": "https://www.w3.org/TR/core-aam-1.2/"
         },
+        dpubModURLs: {
+          ED: "https://w3c.github.io/dpub-aria/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
+        },
+        graphicsMappingModURLs: {
+          ED: "https://w3c.github.io/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
+        },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
         practicesURLs: {
           "ED": "https://www.w3.org/WAI/ARIA/apg/",
           "WD" : "https://www.w3.org/WAI/ARIA/apg/",
diff --git a/mathml-aam/index.html b/mathml-aam/index.html
index 25ba9b839..085cbc830 100644
--- a/mathml-aam/index.html
+++ b/mathml-aam/index.html
@@ -37,22 +37,58 @@
 
         ariaSpecURLs: {
           ED: "https://w3c.github.io/aria/",
-          WD: "https://w3c.github.io/aria/",
-          CR: "https://w3c.github.io/aria/",
-          PR: "https://www.w3.org/TR/wai-aria-1.1/",
-          REC: "https://www.w3.org/TR/wai-aria/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
+        },
+        accNameURLs: {
+          ED: "https://w3c.github.io/accname/",
+          WD: "https://www.w3.org/TR/accname-1.2/",
+          FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
+          REC: "https://www.w3.org/TR/accname-1.2/",
         },
-
-        // ED pointing to latest draft due to ED links not
-        // appropriately mapping on the core-aam spec.
         coreMappingURLs: {
           ED: "https://w3c.github.io/core-aam/",
-          CR: "https://w3c.github.io/core-aam/",
-          WD: "https://w3c.github.io/core-aam/",
-          FPWD: "https://www.w3.org/TR/core-aam-1.1/",
-          REC: "https://www.w3.org/TR/wai-aria-implementation/",
+          WD: "https://www.w3.org/TR/core-aam-1.2/",
+          FPWD: "https://www.w3.org/TR/core-aam-1.2/",
+          CR: "https://www.w3.org/TR/core-aam-1.2/",
+          REC: "https://www.w3.org/TR/core-aam-1.2/",
+        },
+        dpubModURLs: {
+          ED: "https://w3c.github.io/dpub-aria/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
+        },
+        graphicsMappingModURLs: {
+          ED: "https://w3c.github.io/graphics-aam/",
+          FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          WD: "https://www.w3.org/TR/graphics-aam-1.0/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
+        },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
+        practicesURLs: {
+          ED: "https://www.w3.org/WAI/ARIA/apg/",
+          WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
+          REC: "https://www.w3.org/WAI/ARIA/apg/",
         },
-
         preProcess: [linkCrossReferences, getParticipants],
         postProcess: [],
         definitionMap: [],
diff --git a/svg-aam/index.html b/svg-aam/index.html
index dea1af1bc..9238a1a5f 100644
--- a/svg-aam/index.html
+++ b/svg-aam/index.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
   <head>
     <title>SVG Accessibility API Mappings</title>
-    <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove" defer="defer"></script>
+    <script src="https://www.w3.org/Tools/respec/respec-w3c" class="remove" defer="defer"></script>
     <script src="../common/script/resolveReferences.js" class="remove"></script>
     <script src="../common/biblio.js" class="remove" defer="defer"></script>
     <script src="../common/script/participants.js" class="remove"></script>
@@ -100,38 +100,61 @@
         tocIntroductory: true,
         //maxTocLevel: 4,
 
+        // spec URLs
         ariaSpecURLs: {
           ED: "https://w3c.github.io/aria/",
-          FPWD: "https://www.w3.org/TR/wai-aria-1.1/",
-          WD: "https://www.w3.org/TR/wai-aria-1.1/",
-          REC: "https://www.w3.org/TR/wai-aria/",
+          FPWD: "https://www.w3.org/TR/wai-aria-1.3/",
+          WD: "https://www.w3.org/TR/wai-aria-1.3/",
+          CR: "https://www.w3.org/TR/wai-aria-1.3/",
+          REC: "https://www.w3.org/TR/wai-aria-1.3/",
         },
         accNameURLs: {
           ED: "https://w3c.github.io/accname/",
-          WD: "https://www.w3.org/TR/accname-1.1/",
-          FPWD: "https://www.w3.org/TR/accname-1.1/",
-          REC: "https://www.w3.org/TR/accname/",
+          WD: "https://www.w3.org/TR/accname-1.2/",
+          FPWD: "https://www.w3.org/TR/accname-1.2/",
+          CR: "https://www.w3.org/TR/accname-1.2/",
+          REC: "https://www.w3.org/TR/accname-1.2/",
         },
-
         coreMappingURLs: {
           ED: "https://w3c.github.io/core-aam/",
-          WD: "https://www.w3.org/TR/core-aam-1.1/",
-          FPWD: "https://www.w3.org/TR/core-aam-1.1/",
-          REC: "https://www.w3.org/TR/wai-aria-implementation/",
+          WD: "https://www.w3.org/TR/core-aam-1.2/",
+          FPWD: "https://www.w3.org/TR/core-aam-1.2/",
+          CR: "https://www.w3.org/TR/core-aam-1.2/",
+          REC: "https://www.w3.org/TR/core-aam-1.2/",
         },
-        htmlMappingURLs: {
-          ED: "https://w3c.github.io/html-aam/",
-          WD: "https://www.w3.org/TR/html-aam-1.0/",
-          FPWD: "http://www.w3.org/TR/html-aam-1.0/",
-          REC: "http://www.w3.org/TR/wai-aria-implementation/",
+        dpubModURLs: {
+          ED: "https://w3c.github.io/dpub-aria/",
+          FPWD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          WD: "https://www.w3.org/TR/dpub-aria-1.1/",
+          REC: "https://www.w3.org/TR/dpub-aria-1.1/",
         },
         graphicsMappingModURLs: {
           ED: "https://w3c.github.io/graphics-aam/",
           FPWD: "https://www.w3.org/TR/graphics-aam-1.0/",
           WD: "https://www.w3.org/TR/graphics-aam-1.0/",
-          REC: "https://www.w3.org/TR/graphics-aam/",
+          CR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          PR: "https://www.w3.org/TR/graphics-aam-1.0/",
+          REC: "https://www.w3.org/TR/graphics-aam-1.0/",
+        },
+        graphicsModURLs: {
+          ED: "https://w3c.github.io/graphics-aria/",
+          FPWD: "https://www.w3.org/TR/graphics-aria/",
+          WD: "https://www.w3.org/TR/graphics-aria/",
+          REC: "https://www.w3.org/TR/graphics-aria/",
+        },
+        htmlMappingURLs: {
+          ED: "https://w3c.github.io/html-aam/",
+          FPWD: "https://www.w3.org/TR/html-aam-1.0/",
+          WD: "https://www.w3.org/TR/html-aam/",
+          REC: "https://www.w3.org/TR/html-aam/",
+        },
+        practicesURLs: {
+          ED: "https://www.w3.org/WAI/ARIA/apg/",
+          WD: "https://www.w3.org/WAI/ARIA/apg/",
+          FPWD: "https://www.w3.org/WAI/ARIA/apg/",
+          CR: "https://www.w3.org/WAI/ARIA/apg/",
+          REC: "https://www.w3.org/WAI/ARIA/apg/",
         },
-
         preProcess: [linkCrossReferences, getParticipants],
       };
     </script>