diff --git a/common/css/common.css b/common/css/common.css
index 9dc5be9e1..04cd5cddb 100644
--- a/common/css/common.css
+++ b/common/css/common.css
@@ -99,10 +99,10 @@ caption{
 	margin:1em 0 0.1em;
 	padding:0 0 0 0.3em;
 }
-table.role-features th, table.role-features td, table.state-features th, table.state-features td, table.property-features th, table.property-features td, table.value-descriptions th, table.value-descriptions td {
+table.role-features th, table.role-features td, table.state-features th, table.state-features td, table.property-features th, table.property-features td, table.value-descriptions th, table.value-descriptions td, table.state-descriptions th, table.state-descriptions td {
 	min-width:20em;
 }
-table.role-features tbody th, table.state-features tbody th, table.property-features tbody th, table.value-descriptions tbody th {
+table.role-features tbody th, table.state-features tbody th, table.property-features tbody th, table.value-descriptions tbody th, table.state-descriptions tbody th {
     text-align: left !important;
 }
 th+th, td+td{
diff --git a/index.html b/index.html
index 553ea7f0b..771bd5782 100644
--- a/index.html
+++ b/index.html
@@ -10183,6 +10183,8 @@ <h3>Value</h3>
 				<dd>Value representing <code>true</code>, <code>false</code>, <code>mixed</code>, or <code>undefined</code> values. The default value for this value type is <code>undefined</code> unless otherwise specified.</dd>
 				<dt id="valuetype_true-false-undefined">true/false/undefined</dt>
 				<dd>Value representing <code>true</code>, <code>false</code>, or <code>undefined</code> (not applicable). The default value for this value type is <code>undefined</code> unless otherwise specified. For example, an element with <sref>aria-expanded</sref> set to <code>false</code> is not currently expanded; an element with <sref>aria-expanded</sref> set to <code>undefined</code> is not expandable.</dd>
+				<dt id="valuetype_enumerated">enumerated</dt>
+				<dd>Values are limited to a predefined, finite set of states including two special states: <a data-cite="html/common-microsyntaxes.html#missing-value-default">missing value default</a> and <a data-cite="html/common-microsyntaxes.html#invalid-value-default">invalid value default</a>.
 				<dt id="valuetype_idref">ID reference</dt>
 				<dd>Reference to the ID of another <a>element</a> in the same document</dd>
 				<dt id="valuetype_idref_list">ID reference list</dt>
@@ -10492,7 +10494,7 @@ <h2>Definitions of States and Properties (all aria-* attributes)</h2>
 					</tr>
 					<tr>
 						<th class="property-value-head" scope="row">Value:</th>
-						<td class="property-value"><a href="#valuetype_true-false">true/false</a></td>
+						<td class="property-value"><a href="#valuetype_enumerated">Enumerated</a></td>
 					</tr>
 				</tbody>
 			</table>
@@ -10500,21 +10502,25 @@ <h2>Definitions of States and Properties (all aria-* attributes)</h2>
 				<caption>Values:</caption>
 				<thead>
 					<tr>
-						<th scope="col">Value</th>
+						<th scope="col">Value (keyword)</th>
+						<th scope="col">State</th>
 						<th scope="col">Description</th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
 						<th class="value-name" scope="row">false</th>
+						<th class="state-description" scope="row">False</th>
 						<td class="value-description">Assistive technologies will present only the changed node or nodes.</td>
 					</tr>
 					<tr>
 						<th class="value-name" scope="row">true</th>
+						<th class="state-description" scope="row">True</th>
 						<td class="value-description">Assistive technologies will present the entire changed region as a whole, including the author-defined label if one exists.</td>
 					</tr>
 				</tbody>
 			</table>
+			<p>The attribute's <a data-cite="html/common-microsyntaxes.html#missing-value-default">missing value default</a> and <a data-cite="html/common-microsyntaxes.html#invalid-value-default">invalid value default</a> are both the Missing state.</p>
 		</div>
 		<div class="property" id="aria-autocomplete">
 			<pdef>aria-autocomplete</pdef>
@@ -10559,7 +10565,7 @@ <h2>Definitions of States and Properties (all aria-* attributes)</h2>
 					</tr>
 					<tr>
 						<th class="property-value-head" scope="row">Value:</th>
-						<td class="property-value"><a href="#valuetype_token">token</a></td>
+						<td class="property-value"><a href="#valuetype_enumerated">Enumerated</a></td>
 					</tr>
 				</tbody>
 			</table>
@@ -10567,29 +10573,35 @@ <h2>Definitions of States and Properties (all aria-* attributes)</h2>
 				<caption>Values:</caption>
 				<thead>
 					<tr>
-						<th scope="col">Value</th>
+						<th scope="col">Value (keyword)</th>
+						<th scope="col">State</th>
 						<th scope="col">Description</th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
 						<th class="value-name" scope="row">inline</th>
+						<th class="state-description" scope="row">Inline</th>
 						<td class="value-description">When a user is providing input, text suggesting one way to complete the provided input might be dynamically inserted after the caret.</td>
 					</tr>
 					<tr>
 						<th class="value-name" scope="row">list</th>
+						<th class="state-description" scope="row">List</th>
 						<td class="value-description">When a user is providing input, an element containing a collection of values that could complete the provided input might be displayed.</td>
 					</tr>
                     <tr>
                         <th class="value-name" scope="row">both</th>
+						<th class="state-description" scope="row">Both</th>
                         <td class="value-description">When a user is providing input, an element containing a collection of values that could complete the provided input might be displayed. If displayed, one value in the collection is automatically selected, and the text needed to complete the automatically selected value appears after the caret in the input.</td>
                     </tr>
 					<tr>
-						<th class="value-name" scope="row"><strong class="default">none (default)</strong></th>
+						<th class="value-name" scope="row"><strong class="default">none</strong></th>
+						<th class="state-description" scope="row">None</th>
 						<td class="value-description">When a user is providing input, an automatic suggestion that attempts to predict how the user intends to complete the input is not displayed.</td>
 					</tr>
 				</tbody>
 			</table>
+			<p>The attribute's <a data-cite="html/common-microsyntaxes.html#missing-value-default">missing value default</a> and <a data-cite="html/common-microsyntaxes.html#invalid-value-default">invalid value default</a> are both the None state.</p>
 		</div>
 		<div class="property" id="aria-braillelabel">
 			<pdef>aria-braillelabel</pdef>
@@ -10739,7 +10751,7 @@ <h2>Definitions of States and Properties (all aria-* attributes)</h2>
 					</tr>
 					<tr>
 						<th class="state-value-head" scope="row">Value:</th>
-						<td class="state-value"><a href="#valuetype_true-false">true/false</a></td>
+						<td class="property-value"><a href="#valuetype_enumerated">Enumerated</a></td>
 					</tr>
 				</tbody>
 			</table>
@@ -10747,21 +10759,25 @@ <h2>Definitions of States and Properties (all aria-* attributes)</h2>
 				<caption>Values:</caption>
 				<thead>
 					<tr>
-						<th scope="col">Value</th>
+						<th scope="col">Value (keyword)</th>
+						<th scope="col">State</th>
 						<th scope="col">Description</th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						<th class="value-name" scope="row"><strong class="default">false (default)</strong>:</th>
+						<th class="value-name" scope="row"><strong class="default">false</strong>:</th>
+						<th class="state-description" scope="row">False</th>
 						<td class="value-description">There are no expected updates for the element.</td>
 					</tr>
 					<tr>
 						<th class="value-name" scope="row">true</th>
+						<th class="state-description" scope="row">True</th>
 						<td class="value-description">The element is being updated.</td>
 					</tr>
 				</tbody>
 			</table>
+			<p>The attribute's <a data-cite="html/common-microsyntaxes.html#missing-value-default">missing value default</a> and <a data-cite="html/common-microsyntaxes.html#invalid-value-default">invalid value default</a> are both the False state.</p>
 		</div>
 		<div class="state" id="aria-checked">
 			<sdef>aria-checked</sdef>