--- a/master/intro.html	Thu Mar 28 10:18:32 2013 +1100
+++ b/master/intro.html	Thu Mar 28 10:44:32 2013 +1100
@@ -294,8 +294,10 @@
   on them.  See <a href="struct.html#ConditionalProcessing">Conditional processing</a>
   for details.  The conditional processing attributes defined in
   SVG 1.1 are <edit:attributecategory name='conditional processing'/>.</dd>
+</dl>
 
-  <div class="ready-for-wg-review">
+<div class="ready-for-wg-review">
+<dl class="definitions">
   <dt id="TermContextElement">context element</dt>
   <dd>The context element of an element is defined as follows:
   <ul>
@@ -312,8 +314,10 @@
   <p class="issue">Should <a>gradient elements</a> also be
   context elements?</p>
   </dd>
-  </div>
+</dl>
+</div>
 
+<dl class="definitions">
   <dt id="TermCoreAttribute">core attributes</dt>
   <dd>The core attributes are those attributes that can be specified
   on any SVG element.  See <a href="struct.html#CommonAttributes">Common attributes</a>.

--- a/master/linking.html	Thu Mar 28 10:18:32 2013 +1100
+++ b/master/linking.html	Thu Mar 28 10:44:32 2013 +1100
@@ -191,9 +191,9 @@
   <li>the <a>'script'</a> element must reference an external resource that provides the script content</li>
   <li>the <a>'stroke'</a> property (see <a href="painting.html#SpecifyingPaint">Specifying paint</a> for reference rules)</li>
   <li>the <a>'textPath'</a> element must reference a <a>'path'</a> element</li>
-<div class="ready-for-wg-review">
-  <li>the <a>'tref'</a> element can reference any element (including non-SVG elements)</li>
-</div>
+  <li>
+    <div class="ready-for-wg-review">the <a>'tref'</a> element can reference any element (including non-SVG elements)</div>
+  </li>
   <li>the <a>'set'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
   <li>the <a>'use'</a> element can reference any local or non-local resource</li>
 </ul>

--- a/master/painting.html	Thu Mar 28 10:18:32 2013 +1100
+++ b/master/painting.html	Thu Mar 28 10:44:32 2013 +1100
@@ -864,7 +864,7 @@
 related to the angle <var>θ</var> between the segments in user space by the
 formula:</p>
 
-<div role="math" aria-describedby="math-miterlength">
+<div role="math" aria-describedby="#math-miterlength">
   <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
     <mrow>
       <mfrac>
@@ -1023,7 +1023,7 @@
 dash pattern to start the stroke dashing at the beginning of the path.  If the
 value is negative, then the effect is the same as dash offset <var>d</var>:</p>
 
-<div role="math" aria-describedby="math-dashoffset">
+<div role="math" aria-describedby="#math-dashoffset">
   <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
     <mrow>
       <mi>d</mi>
@@ -1363,9 +1363,9 @@
 <p class="issue">Need to do. This isn't as trivial as it first looks since we have to deal
   with rx != ry and an arbitrary rotation.</p>
 
-<p>For a quadratic Bézier:
-
-  <div role="math" aria-describedby="math-quadratic-start">
+<p>For a quadratic Bézier:</p>
+
+  <div role="math" aria-describedby="#math-quadratic-start">
     <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
       <mi>&#x03BA;<!-- κ --></mi>
       <mo stretchy="false">(</mo>
@@ -1431,7 +1431,7 @@
     <pre id="math-quadratic-start">$$\kappa(0) = {2\over3}{(P_1-P_0)\times((P_0-P_1)+(P_2-P_1))\over|P_1-P_0|^3}$$</pre>
   </div>
 
-  <div role="math" aria-describedby="math-quadratic-end">
+  <div role="math" aria-describedby="#math-quadratic-end">
     <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
       <mi>&#x03BA;<!-- κ --></mi>
       <mo stretchy="false">(</mo>
@@ -1497,14 +1497,14 @@
     <pre id="math-quadratic-end">$$\kappa(0) = {2\over3}{(P_1-P_0)\times((P_0-P_1)+(P_2-P_1))\over|P_1-P_0|^3}$$</pre>
   </div>
 
-  Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
+  <p>Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
   signed curvatures at the start and end of the path segment
   respectively, and the <var>P</var>'s are the three points that
   define the quadratic Bézier.</p>
 
-<p>For a cubic Bézier:
-
-  <div role="math" aria-describedby="math-cubic-start">
+<p>For a cubic Bézier:</p>
+
+  <div role="math" aria-describedby="#math-cubic-start">
     <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
       <mi>&#x03BA;<!-- κ --></mi>
       <mo stretchy="false">(</mo>
@@ -1570,7 +1570,7 @@
     <pre id="math-cubic-start">$$\kappa(0) = {2\over3}{(P_1-P_0)\times((P_0-P_1)+(P_2-P_1))\over|P_1-P_0|^3}$$</pre>
   </div>
 
-  <div role="math" aria-describedby="math-cubic-end">
+  <div role="math" aria-describedby="#math-cubic-end">
     <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
       <mi>&#x03BA;<!-- κ --></mi>
       <mo stretchy="false">(</mo>
@@ -1636,7 +1636,7 @@
     <pre id="math-cubic-end">$$\kappa(1) = {2\over3}{(P_3-P_2)\times((P_1-P_2)+(P_3-P_2))\over|P_3-P_2|^3}$$</pre>
   </div>
 
-  Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
+  <p>Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
   signed curvatures at the start and end of the path segment
   respectively, and the <var>P</var>'s are the four points that define
   the cubic Bézier. Note, if
@@ -1723,61 +1723,44 @@
          effects through this property but this version restricts it to being able to
          specify the non-scaling stroke behavior. </p>
 
-      <div id="VectorEffectProperty" class="propdef">
-         <dl>
-            <dt id="propdef-vector-effect">
-               <span class="index-def propdef-title prop-name" title="'vector-effect'">'vector-effect'</span>
-            </dt>
-            <dd>
-               <table summary="vector-effect property" class="propinfo" cellspacing="0" cellpadding="0">
-                  <tr valign="baseline">
-                     <td>
-                        <em>Value:</em>   </td>
-                     <td> non-scaling-stroke | none | <a class="noxref" href="http://www.w3.org/TR/CSS2/cascade.html#value-def-inherit"><span class="value-inst-inherit noxref">inherit</span></a>
-                     </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Initial:</em>   </td>
-                     <td> none </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Applies to:</em>   </td>
-                     <td>
-                        <a href="intro.html#TermGraphicsElement"><span class="svg-term">graphics elements</span></a>
-                     </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Inherited:</em>   </td>
-                     <td> no </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Percentages:</em>   </td>
-                     <td> N/A </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Media:</em>   </td>
-                     <td> visual </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em><a href="animate.html#Animatable">Animatable</a>:</em>   </td>
-                     <td> yes </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Computed value:</em>   </td>
-                     <td> Specified value, except inherit </td>
-                  </tr>
-               </table>
-            </dd>
-         </dl>
-      </div>
-
+<table class="propdef">
+  <tr>
+    <th>Name:</th>
+    <td><dfn id="VectorEffectProperty">vector-effect</dfn></td>
+  </tr>
+  <tr>
+    <th>Value:</th>
+    <td>non-scaling-stroke | none</td>
+  </tr>
+  <tr>
+    <th>Initial:</th>
+    <td>none</td>
+  </tr>
+  <tr>
+    <th>Applies to:</th>
+    <td><a>graphics elements</a></td>
+  </tr>
+  <tr>
+    <th>Inherited:</th>
+    <td>no</td>
+  </tr>
+  <tr>
+    <th>Percentages:</th>
+    <td>N/A</td>
+  </tr>
+  <tr>
+    <th>Media:</th>
+    <td>visual</td>
+  </tr>
+  <tr>
+    <th>Computed&#160;value:</th>
+    <td>as specified</td>
+  </tr>
+  <tr>
+    <th><a>Animatable</a>:</th>
+    <td>yes</td>
+  </tr>
+</table>
 
       <dl>
          <dt class="prop-value"> none </dt>
@@ -2246,7 +2229,7 @@
   </div>
 </div>
 
-<h3 id="MarkerReferences">Referencing <a>'marker element'</a> elements</h3>
+<h3 id="MarkerReferences">Referencing <span class="element-name">'marker'</span> elements</h3>
 
 <p>A number of marker properties allow specifying a <a>'marker element'</a> using a <a>&lt;marker-ref&gt;</a> value.</p>
 
@@ -3330,7 +3313,7 @@
 three sRGB color components, <var>C<sub>linear</sub></var> is the corresponding
 linearized RGB color component, and all color values are between 0 and 1:</p>
 
-<div role="math" aria-describedby="math-linearRGB">
+<div role="math" aria-describedby="#math-linearRGB">
   <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
     <mrow>
       <msub>