diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
index 033dfbb17d9..485ae134218 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
@@ -2,10 +2,10 @@
 <html lang="en">
 <head>
   <meta charset="utf-8"/>
-  <title>Nimbus colors</title>
+  <title>Colors Used in Nimbus Look and Feel</title>
 </head>
 <!--
- Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -31,212 +31,208 @@
 
 <body>
 <main role="main">
-<h1 id="primaryColors">Primary Colors</h1>
+<h1>Colors Used in Nimbus Look and Feel</h1>
+<h2 id="primaryColors">Primary Colors</h2>
 <table>
-<caption>Primary colors used in Nimbus Look And Feel</caption>
+<caption style="display:none">Primary colors used in Nimbus Look And Feel
+</caption>
 <thead>
-<tr><th>Key</th><th>Value</th><th>Preview</th></tr>
+<tr>
+  <th scope="col">Key</th>
+  <th scope="col">Value</th>
+  <th scope="col">Preview</th>
+</tr>
 </thead>
-<tbody>
+<tbody style="text-align:left">
 <tr>
-<td width="250"><code>control</code></td>
+<th scope="row" width="250"><code>control</code></th>
 <td><pre>#d6d9df (214,217,223)</pre></td>
-
-<td width="100" bgcolor="#d6d9df">&nbsp;</td>
+<td width="100" bgcolor="#d6d9df" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>info</code></td>
+<th scope="row" width="250"><code>info</code></th>
 <td><pre>#f2f2bd (242,242,189)</pre></td>
-<td width="100" bgcolor="#f2f2bd">&nbsp;</td>
+<td width="100" bgcolor="#f2f2bd" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusAlertYellow</code></td>
+<th scope="row" width="250"><code>nimbusAlertYellow</code></th>
 <td><pre>#ffdc23 (255,220,35)</pre></td>
-<td width="100" bgcolor="#ffdc23">&nbsp;</td>
+<td width="100" bgcolor="#ffdc23" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-
-<td width="250"><code>nimbusBase</code></td>
+<th scope="row" width="250"><code>nimbusBase</code></th>
 <td><pre>#33628c (51,98,140)</pre></td>
-<td width="100" bgcolor="#33628c">&nbsp;</td>
+<td width="100" bgcolor="#33628c" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusDisabledText</code></td>
+<th scope="row" width="250"><code>nimbusDisabledText</code></th>
 <td><pre>#8e8f91 (142,143,145)</pre></td>
-<td width="100" bgcolor="#8e8f91">&nbsp;</td>
+<td width="100" bgcolor="#8e8f91" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusFocus</code></td>
+<th scope="row" width="250"><code>nimbusFocus</code></th>
 <td><pre>#73a4d1 (115,164,209)</pre></td>
-
-<td width="100" bgcolor="#73a4d1">&nbsp;</td>
+<td width="100" bgcolor="#73a4d1" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusGreen</code></td>
+<th scope="row" width="250"><code>nimbusGreen</code></th>
 <td><pre>#b0b332 (176,179,50)</pre></td>
-<td width="100" bgcolor="#b0b332">&nbsp;</td>
+<td width="100" bgcolor="#b0b332" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusInfoBlue</code></td>
+<th scope="row" width="250"><code>nimbusInfoBlue</code></th>
 <td><pre>#2f5cb4 (47,92,180)</pre></td>
-<td width="100" bgcolor="#2f5cb4">&nbsp;</td>
+<td width="100" bgcolor="#2f5cb4" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-
-<td width="250"><code>nimbusLightBackground</code></td>
+<th scope="row" width="250"><code>nimbusLightBackground</code></th>
 <td><pre>#ffffff (255,255,255)</pre></td>
-<td width="100" bgcolor="#ffffff">&nbsp;</td>
+<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusOrange</code></td>
+<th scope="row" width="250"><code>nimbusOrange</code></th>
 <td><pre>#bf6204 (191,98,4)</pre></td>
-<td width="100" bgcolor="#bf6204">&nbsp;</td>
+<td width="100" bgcolor="#bf6204" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusRed</code></td>
+<th scope="row" width="250"><code>nimbusRed</code></th>
 <td><pre>#a92e22 (169,46,34)</pre></td>
-
-<td width="100" bgcolor="#a92e22">&nbsp;</td>
+<td width="100" bgcolor="#a92e22" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusSelectedText</code></td>
+<th scope="row" width="250"><code>nimbusSelectedText</code></th>
 <td><pre>#ffffff (255,255,255)</pre></td>
-<td width="100" bgcolor="#ffffff">&nbsp;</td>
+<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusSelectionBackground</code></td>
+<th scope="row" width="250"><code>nimbusSelectionBackground</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a">&nbsp;</td>
+<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-
-<td width="250"><code>text</code></td>
+<th scope="row" width="250"><code>text</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000">&nbsp;</td>
+<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 </tbody>
 </table>
 
-<h1 id="secondaryColors">Secondary Colors</h1>
+<h2 id="secondaryColors">Secondary Colors</h2>
 <table>
-<caption>Secondary colors used in Nimbus Look And Feel </caption>
+<caption style="display:none">Secondary colors used in Nimbus Look And Feel
+</caption>
 <thead>
-<tr><th>Key</th><th>Value</th><th>Preview</th></tr>
+<tr>
+  <th scope="col">Key</th>
+  <th scope="col">Value</th>
+  <th scope="col">Preview</th>
+</tr>
 </thead>
-<tbody>
+<tbody style="text-align:left">
 <tr>
-<td width="250"><code>activeCaption</code></td>
-
+<th scope="row" width="250"><code>activeCaption</code></th>
 <td><pre>#babec6 (186,190,198)</pre></td>
-<td width="100" bgcolor="#babec6">&nbsp;</td>
+<td width="100" bgcolor="#babec6" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>background</code></td>
+<th scope="row" width="250"><code>background</code></th>
 <td><pre>#d6d9df (214,217,223)</pre></td>
-<td width="100" bgcolor="#d6d9df">&nbsp;</td>
+<td width="100" bgcolor="#d6d9df" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>controlDkShadow</code></td>
+<th scope="row" width="250"><code>controlDkShadow</code></th>
 <td><pre>#a4abb8 (164,171,184)</pre></td>
-<td width="100" bgcolor="#a4abb8">&nbsp;</td>
-
+<td width="100" bgcolor="#a4abb8" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>controlHighlight</code></td>
+<th scope="row" width="250"><code>controlHighlight</code></th>
 <td><pre>#e9ecf2 (233,236,242)</pre></td>
-<td width="100" bgcolor="#e9ecf2">&nbsp;</td>
+<td width="100" bgcolor="#e9ecf2" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>controlLHighlight</code></td>
+<th scope="row" width="250"><code>controlLHighlight</code></th>
 <td><pre>#f7f8fa (247,248,250)</pre></td>
-<td width="100" bgcolor="#f7f8fa">&nbsp;</td>
+<td width="100" bgcolor="#f7f8fa" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>controlShadow</code></td>
-
+<th scope="row" width="250"><code>controlShadow</code></th>
 <td><pre>#ccd3e0 (204,211,224)</pre></td>
-<td width="100" bgcolor="#ccd3e0">&nbsp;</td>
+<td width="100" bgcolor="#ccd3e0" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>controlText</code></td>
+<th scope="row" width="250"><code>controlText</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000">&nbsp;</td>
+<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>desktop</code></td>
+<th scope="row" width="250"><code>desktop</code></th>
 <td><pre>#3d6079 (61,96,121)</pre></td>
-<td width="100" bgcolor="#3d6079">&nbsp;</td>
-
+<td width="100" bgcolor="#3d6079" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>inactiveCaption</code></td>
+<th scope="row" width="250"><code>inactiveCaption</code></th>
 <td><pre>#bdc1c8 (189,193,200)</pre></td>
-<td width="100" bgcolor="#bdc1c8">&nbsp;</td>
+<td width="100" bgcolor="#bdc1c8" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>infoText</code></td>
+<th scope="row" width="250"><code>infoText</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000">&nbsp;</td>
+<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>menu</code></td>
-
+<th scope="row" width="250"><code>menu</code></th>
 <td><pre>#edeff2 (237,239,242)</pre></td>
-<td width="100" bgcolor="#edeff2">&nbsp;</td>
+<td width="100" bgcolor="#edeff2" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>menuText</code></td>
+<th scope="row" width="250"><code>menuText</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000">&nbsp;</td>
+<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusBlueGrey</code></td>
+<th scope="row" width="250"><code>nimbusBlueGrey</code></th>
 <td><pre>#a9b0be (169,176,190)</pre></td>
-<td width="100" bgcolor="#a9b0be">&nbsp;</td>
-
+<td width="100" bgcolor="#a9b0be" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusBorder</code></td>
+<th scope="row" width="250"><code>nimbusBorder</code></th>
 <td><pre>#9297a1 (146,151,161)</pre></td>
-<td width="100" bgcolor="#9297a1">&nbsp;</td>
+<td width="100" bgcolor="#9297a1" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>nimbusSelection</code></td>
+<th scope="row" width="250"><code>nimbusSelection</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a">&nbsp;</td>
+<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>scrollbar</code></td>
-
+<th scope="row" width="250"><code>scrollbar</code></th>
 <td><pre>#cdd0d5 (205,208,213)</pre></td>
-<td width="100" bgcolor="#cdd0d5">&nbsp;</td>
+<td width="100" bgcolor="#cdd0d5" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>textBackground</code></td>
+<th scope="row" width="250"><code>textBackground</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a">&nbsp;</td>
+<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>textForeground</code></td>
+<th scope="row" width="250"><code>textForeground</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000">&nbsp;</td>
-
+<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>textHighlight</code></td>
+<th scope="row" width="250"><code>textHighlight</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a">&nbsp;</td>
+<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>textHighlightText</code></td>
+<th scope="row" width="250"><code>textHighlightText</code></th>
 <td><pre>#ffffff (255,255,255)</pre></td>
-<td width="100" bgcolor="#ffffff">&nbsp;</td>
+<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<td width="250"><code>textInactiveText</code></td>
-
+<th scope="row" width="250"><code>textInactiveText</code></th>
 <td><pre>#8e8f91 (142,143,145)</pre></td>
-<td width="100" bgcolor="#8e8f91">&nbsp;</td>
+<td width="100" bgcolor="#8e8f91" aria-label="Color preview">&nbsp;</td>
 </tr>
 </tbody>
 </table>
