diff --git a/index.html b/index.html
index 2a88ae7c..04e58dad 100644
--- a/index.html
+++ b/index.html
@@ -369,23 +369,13 @@ <h3>HTML Element Role Mappings</h3>
                 <a data-cite="HTML">`area`</a>
                 <span class="el-context">(no <a data-cite="html/links.html#attr-hyperlink-href">`href`</a> attribute)</span>
               </th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="role">
-                  <span class="type">Roles:</span> `ROLE_SYSTEM_TEXT`; `IA2_ROLE_SHAPE`
-                </div>
-              </td>
-              <td class="uia">
-                <div class="ctrltype">
-                  <span class="type">Control Type:</span> `Text`
-                </div>
-              </td>
-              <td class="atk">
-                <div class="role">
-                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
-                </div>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
               </td>
-              <td class="ax"><div class="general">Not mapped</div></td>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
               <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-article">
@@ -490,34 +480,16 @@ <h3>HTML Element Role Mappings</h3>
               <th>
                 <a data-cite="HTML">`b`</a>
               </th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="general">
-                  No accessible object. Exposed as "font-weight" text attribute on the text container. The value depends on the platform.
-                </div>
-              </td>
-              <td class="uia">
-                <div class="general">
-                  No accessible object. Exposed by the `FontWeight` attribute of the `TextRange` Control Pattern implemented on a parent accessible object.
-                </div>
-              </td>
-              <td class="atk">
-                <div class="general">
-                  No accessible object. Exposed as "font-weight" text attribute on the text container. The value depends on the platform.
-                </div>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
               </td>
-              <td class="ax">
-                <div class="role">
-                  <span class="type">AXRole:</span> `AXGroup`
-                </div>
-                <div class="subrole">
-                  <span class="type">AXSubrole:</span> `(nil)`
-                </div>
-                <div class="roledesc">
-                  <span class="type">AXRoleDescription:</span> `"group"`
-                </div>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="comments">
+                Exposed by platform specific bold font weight text styles.
               </td>
-              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-base">
               <th>
@@ -534,60 +506,31 @@ <h3>HTML Element Role Mappings</h3>
               <th>
                 <a data-cite="HTML">`bdi`</a>
               </th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="general">
-                  No accessible object. May affect on "writing-mode" text attribute on its text container.
-                </div>
-              </td>
-              <td class="uia">
-                <div class="ctrltype">
-                  <span class="type">Control Type:</span> `Text`
-                </div>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
               </td>
-              <td class="atk">
-                <div class="general">
-                  No accessible object. May affect on "writing-mode" text attribute on its text container.
-                </div>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="comments">
+                IA2/ATK: May affect on "writing-mode" text attribute on its text container.
               </td>
-              <td class="ax"></td>
-              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-bdo">
               <th>
                 <a data-cite="HTML">`bdo`</a>
               </th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="role">
-                  <span class="type">Role:</span> `ROLE_SYSTEM_TEXT`
-                </div>
-                <div class="properties">
-                  <span class="type">Text attributes:</span> `writing-mode` on the text container
-                </div>
-              </td>
-              <td class="uia">
-                <div class="ctrltype">
-                  <span class="type">Control Type:</span> `Text`
-                </div>
-              </td>
-              <td class="atk">
-                <div class="general">
-                  No accessible object. Exposed as "writing-mode" text attribute on its text container.
-                </div>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
               </td>
-              <td class="ax">
-                <div class="role">
-                  <span class="type">AXRole:</span> `AXGroup`
-                </div>
-                <div class="subrole">
-                  <span class="type">AXSubrole:</span> `(nil)`
-                </div>
-                <div class="roledesc">
-                  <span class="type">AXRoleDescription:</span> `"group"`
-                </div>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="comments">
+                IA2/ATK: Exposed as "writing-mode" text attribute on its text container.
               </td>
-              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-blockquote">
               <th>
@@ -614,21 +557,11 @@ <h3>HTML Element Role Mappings</h3>
             <tr tabindex="-1" id="el-br">
               <th><a data-cite="HTML">`br`</a></th>
               <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="general">
-                  No accessible object. Exposed as '\n' character
-                  via `IAccessibleText2` interface on the text container.
-                </div>
-              </td>
+              <td class="ia2"><div class="general">Not mapped</div></td>
               <td class="uia"><div class="general">Not mapped</div></td>
-              <td class="atk">
-                <div class="general">
-                  No accessible object. Exposed as '\n' character
-                  via `AtkText` interface on the text container.
-                </div>
-              </td>
+              <td class="atk"><div class="general">Not mapped</div></td>
               <td class="ax"><div class="general">Not mapped</div></td>
-              <td class="comments"></td>
+              <td class="comments">May be exposed as '\n' character by the platform interface.</td>
             </tr>
             <tr tabindex="-1" id="el-button">
               <th>
@@ -801,11 +734,13 @@ <h3>HTML Element Role Mappings</h3>
               <th>
                 <a data-cite="HTML">`data`</a>
               </th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2"><div class="general">Not mapped</div></td>
-              <td class="uia"><div class="general">Not mapped</div></td>
-              <td class="atk"><div class="general">Not mapped</div></td>
-              <td class="ax"><div class="general">Not mapped</div></td>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
+              </td>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
               <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-datalist">
@@ -1295,34 +1230,16 @@ <h3>HTML Element Role Mappings</h3>
               <th>
                 <a data-cite="HTML">`i`</a>
               </th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="general">No accessible object.</div>
-                <div class="properties">
-                  <span class="type">Text attributes:</span> `font-style:italic` on the text container
-                </div>
-              </td>
-              <td class="uia">
-                <div class="general">No accessible object. Exposed by the `IsItalic` attribute of the `TextRange` Control Pattern implemented on a parent accessible object.
-                </div>
-              </td>
-              <td class="atk">
-                <div class="general">
-                  No accessible object. Exposed as "font-style:italic" text attribute on its text container.
-                </div>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
               </td>
-              <td class="ax">
-                <div class="role">
-                  <span class="type">AXRole:</span> `AXGroup`
-                </div>
-                <div class="subrole">
-                  <span class="type">AXSubrole:</span> `(nil)`
-                </div>
-                <div class="roledesc">
-                  <span class="type">AXRoleDescription:</span> `"group"`
-                </div>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="comments">
+                Exposed by platform specific italic text styles.
               </td>
-              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-iframe">
               <th>
@@ -2743,35 +2660,16 @@ <h3>HTML Element Role Mappings</h3>
             </tr>
             <tr tabindex="-1" id="el-small">
               <th><a data-cite="HTML">`small`</a></th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="general">No accessible object.</div>
-                <div class="properties">
-                  <span class="type">Text attributes:</span> `font-size` on the text container
-                </div>
-              </td>
-              <td class="uia">
-                <div class="general">No accessible object. Exposed by `FontSize` attribute of the `TextRange` Control Pattern implemented on a parent accessible object.
-                </div>
-              </td>
-              <td class="atk">
-                <div class="general">
-                  No accessible object. Exposed as "font-size"
-                  text attribute on the text container.
-                </div>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
               </td>
-              <td class="ax">
-                <div class="role">
-                  <span class="type">AXRole:</span> `AXGroup`
-                </div>
-                <div class="subrole">
-                  <span class="type">AXSubrole:</span> `(nil)`
-                </div>
-                <div class="roledesc">
-                  <span class="type">AXRoleDescription:</span> `"group"`
-                </div>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="comments">
+                Exposed by platform specific font size styles.
               </td>
-              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-source">
               <th><a data-cite="HTML">`source`</a></th>
@@ -3088,22 +2986,16 @@ <h3>HTML Element Role Mappings</h3>
             </tr>
             <tr tabindex="-1" id="el-u">
               <th><a data-cite="HTML">`u`</a></th>
-              <td class="aria">No corresponding role</td>
-              <td class="ia2">
-                <div class="general">No accessible object. Exposed as "text-underline-style:solid" text attribute on its text container.
-                </div>
-              </td>
-              <td class="uia">
-                <div class="general">No accessible object. Exposed by `UnderlineStyle` attribute of the `TextRange` Control Pattern implemented on a parent accessible object.
-                </div>
+              <td class="aria">
+                <a class="core-mapping" href="#role-map-generic">`generic`</a> role
               </td>
-              <td class="atk">
-                <div class="general">No accessible object. Exposed as
-                  "text-underline-style:solid" text attribute on its text container.
-                </div>
+              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
+              <td class="comments">
+                Exposed by platform specific underline text styles.
               </td>
-              <td class="ax">Not mapped</td>
-              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-ul">
               <th><a data-cite="HTML">`ul`</a></th>