diff --git a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
index 54be1bacfef..e6790a53bcf 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
@@ -5,7 +5,7 @@
   <title>AWT Desktop Properties</title>
 </head>
 <!--
- Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020, 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
@@ -54,7 +54,6 @@ setting, they may not be available in environments that do
 not support them. In the event that a desktop property is
 unavailable for any reason, the implementation will return
 <code>null</code>.
-<p>
 <table border=1>
 <caption>The following table summarizes the desktop properties documented
 here, and their value types.</caption>
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 09744f4f351..5595dec0536 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
@@ -5,7 +5,7 @@
   <title>Colors Used in Nimbus Look and Feel</title>
 </head>
 <!--
- Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020, 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
@@ -37,6 +37,11 @@
 <table>
 <caption style="display:none">Primary colors used in Nimbus Look And Feel
 </caption>
+<colgroup>
+    <col style="width: 250px">
+    <col>
+    <col style="width: 100px">
+</colgroup>
 <thead>
 <tr>
   <th scope="col">Key</th>
@@ -46,74 +51,74 @@
 </thead>
 <tbody style="text-align:left">
 <tr>
-<th scope="row" width="250"><code>control</code></th>
+<th scope="row"><code>control</code></th>
 <td><pre>#d6d9df (214,217,223)</pre></td>
-<td width="100" bgcolor="#d6d9df" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #d6d9df" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>info</code></th>
+<th scope="row"><code>info</code></th>
 <td><pre>#f2f2bd (242,242,189)</pre></td>
-<td width="100" bgcolor="#f2f2bd" aria-label="Color preview">&nbsp;</td>
+<td style="background-color:  #f2f2bd" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusAlertYellow</code></th>
+<th scope="row"><code>nimbusAlertYellow</code></th>
 <td><pre>#ffdc23 (255,220,35)</pre></td>
-<td width="100" bgcolor="#ffdc23" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #ffdc23" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusBase</code></th>
+<th scope="row"><code>nimbusBase</code></th>
 <td><pre>#33628c (51,98,140)</pre></td>
-<td width="100" bgcolor="#33628c" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #33628c" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusDisabledText</code></th>
+<th scope="row"><code>nimbusDisabledText</code></th>
 <td><pre>#8e8f91 (142,143,145)</pre></td>
-<td width="100" bgcolor="#8e8f91" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #8e8f91" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusFocus</code></th>
+<th scope="row"><code>nimbusFocus</code></th>
 <td><pre>#73a4d1 (115,164,209)</pre></td>
-<td width="100" bgcolor="#73a4d1" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #73a4d1" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusGreen</code></th>
+<th scope="row"><code>nimbusGreen</code></th>
 <td><pre>#b0b332 (176,179,50)</pre></td>
-<td width="100" bgcolor="#b0b332" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #b0b332" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusInfoBlue</code></th>
+<th scope="row"><code>nimbusInfoBlue</code></th>
 <td><pre>#2f5cb4 (47,92,180)</pre></td>
-<td width="100" bgcolor="#2f5cb4" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #2f5cb4" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusLightBackground</code></th>
+<th scope="row"><code>nimbusLightBackground</code></th>
 <td><pre>#ffffff (255,255,255)</pre></td>
-<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #ffffff" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusOrange</code></th>
+<th scope="row"><code>nimbusOrange</code></th>
 <td><pre>#bf6204 (191,98,4)</pre></td>
-<td width="100" bgcolor="#bf6204" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #bf6204" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusRed</code></th>
+<th scope="row"><code>nimbusRed</code></th>
 <td><pre>#a92e22 (169,46,34)</pre></td>
-<td width="100" bgcolor="#a92e22" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #a92e22" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusSelectedText</code></th>
+<th scope="row"><code>nimbusSelectedText</code></th>
 <td><pre>#ffffff (255,255,255)</pre></td>
-<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #ffffff" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusSelectionBackground</code></th>
+<th scope="row"><code>nimbusSelectionBackground</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>text</code></th>
+<th scope="row"><code>text</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -122,6 +127,11 @@
 <table>
 <caption style="display:none">Secondary colors used in Nimbus Look And Feel
 </caption>
+<colgroup>
+    <col style="width: 250px">
+    <col>
+    <col style="width: 100px">
+</colgroup>
 <thead>
 <tr>
   <th scope="col">Key</th>
@@ -131,109 +141,109 @@
 </thead>
 <tbody style="text-align:left">
 <tr>
-<th scope="row" width="250"><code>activeCaption</code></th>
+<th scope="row"><code>activeCaption</code></th>
 <td><pre>#babec6 (186,190,198)</pre></td>
-<td width="100" bgcolor="#babec6" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #babec6" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>background</code></th>
+<th scope="row"><code>background</code></th>
 <td><pre>#d6d9df (214,217,223)</pre></td>
-<td width="100" bgcolor="#d6d9df" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #d6d9df" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>controlDkShadow</code></th>
+<th scope="row"><code>controlDkShadow</code></th>
 <td><pre>#a4abb8 (164,171,184)</pre></td>
-<td width="100" bgcolor="#a4abb8" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #a4abb8" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>controlHighlight</code></th>
+<th scope="row"><code>controlHighlight</code></th>
 <td><pre>#e9ecf2 (233,236,242)</pre></td>
-<td width="100" bgcolor="#e9ecf2" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #e9ecf2" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>controlLHighlight</code></th>
+<th scope="row"><code>controlLHighlight</code></th>
 <td><pre>#f7f8fa (247,248,250)</pre></td>
-<td width="100" bgcolor="#f7f8fa" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #f7f8fa" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>controlShadow</code></th>
+<th scope="row"><code>controlShadow</code></th>
 <td><pre>#ccd3e0 (204,211,224)</pre></td>
-<td width="100" bgcolor="#ccd3e0" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #ccd3e0" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>controlText</code></th>
+<th scope="row"><code>controlText</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>desktop</code></th>
+<th scope="row"><code>desktop</code></th>
 <td><pre>#3d6079 (61,96,121)</pre></td>
-<td width="100" bgcolor="#3d6079" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #3d6079" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>inactiveCaption</code></th>
+<th scope="row"><code>inactiveCaption</code></th>
 <td><pre>#bdc1c8 (189,193,200)</pre></td>
-<td width="100" bgcolor="#bdc1c8" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #bdc1c8" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>infoText</code></th>
+<th scope="row"><code>infoText</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>menu</code></th>
+<th scope="row"><code>menu</code></th>
 <td><pre>#edeff2 (237,239,242)</pre></td>
-<td width="100" bgcolor="#edeff2" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #edeff2" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>menuText</code></th>
+<th scope="row"><code>menuText</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusBlueGrey</code></th>
+<th scope="row"><code>nimbusBlueGrey</code></th>
 <td><pre>#a9b0be (169,176,190)</pre></td>
-<td width="100" bgcolor="#a9b0be" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #a9b0be" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusBorder</code></th>
+<th scope="row"><code>nimbusBorder</code></th>
 <td><pre>#9297a1 (146,151,161)</pre></td>
-<td width="100" bgcolor="#9297a1" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #9297a1" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>nimbusSelection</code></th>
+<th scope="row"><code>nimbusSelection</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>scrollbar</code></th>
+<th scope="row"><code>scrollbar</code></th>
 <td><pre>#cdd0d5 (205,208,213)</pre></td>
-<td width="100" bgcolor="#cdd0d5" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #cdd0d5" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>textBackground</code></th>
+<th scope="row"><code>textBackground</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>textForeground</code></th>
+<th scope="row"><code>textForeground</code></th>
 <td><pre>#000000 (0,0,0)</pre></td>
-<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #000000" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>textHighlight</code></th>
+<th scope="row"><code>textHighlight</code></th>
 <td><pre>#39698a (57,105,138)</pre></td>
-<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #39698a" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>textHighlightText</code></th>
+<th scope="row"><code>textHighlightText</code></th>
 <td><pre>#ffffff (255,255,255)</pre></td>
-<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #ffffff" aria-label="Color preview">&nbsp;</td>
 </tr>
 <tr>
-<th scope="row" width="250"><code>textInactiveText</code></th>
+<th scope="row"><code>textInactiveText</code></th>
 <td><pre>#8e8f91 (142,143,145)</pre></td>
-<td width="100" bgcolor="#8e8f91" aria-label="Color preview">&nbsp;</td>
+<td style="background-color: #8e8f91" aria-label="Color preview">&nbsp;</td>
 </tr>
 </tbody>
 </table>
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
index 6346d52a430..04c70e22ad7 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
@@ -6,7 +6,7 @@
   <style type="text/css">tbody th {font-weight:normal;text-align:left}</style>
 </head>
 <!--
-Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2020, 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
@@ -189,7 +189,7 @@ with the keyboard. </td>
 </table>
 <br>
 <h2>JFileChooser</h2>
-<table cellpadding="2" cellspacing="2" border="1" style="width: 100%; text-align: left;">
+<table border="1" style="text-align: left; width: 100%;">
 <caption>JFileChooser Specific Properties</caption>
   <thead>
     <tr>
@@ -349,7 +349,7 @@ of the file chooser.<br>
 </table>
 <br>
 <h2><a id="JInternalFrame"></a>JInternalFrame</h2>
-<table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
+<table border="1" style="text-align: left; width: 100%;">
 <caption>JInternalFrame Specific Properties</caption>
   <thead><tr>
       <th scope="col" style="vertical-align: top; text-align: center;">Property<br>
@@ -381,7 +381,7 @@ the system menu will be shown.<br>
 <p>JInternalFrameTitlePane is the control bar located at the top of the
 internal frame similar to that found in a frame.<br>
 </p>
-<table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
+<table border="1" style="text-align: left; width: 100%;">
 <caption>JInternalFrameTitlePane Specific Properties</caption>
   <thead><tr>
       <th scope="col" style="vertical-align: top; text-align: center;">Property<br>
@@ -720,7 +720,7 @@ it follows the other buttons. 	</td>
 <br>
 <h2><a id="JProgressBar"></a>JProgressBar<br>
 </h2>
-<table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
+<table border="1" style="text-align: left; width: 100%;">
 <caption>JProgressBar Specific Properties</caption>
   <thead><tr>
       <th scope="col" style="vertical-align: top; text-align: center;">Property</th>
@@ -975,7 +975,7 @@ setOneTouchExpandable. 	</td>
 </table>
 <br>
 <h2><a id="JSlider"></a>JSlider</h2>
-<table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
+<table border="1" style="text-align: left; width: 100%;">
 <caption>JSlider Specific Properties</caption>
   <thead><tr>
       <th scope="col" style="vertical-align: top; text-align: center;">Property<br>
@@ -1034,7 +1034,7 @@ of the slider.<br>
 </table>
 <br>
 <h2><a id="JTabbedPane"></a>JTabbedPane</h2>
-<table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
+<table border="1" style="text-align: left; width: 100%;">
 <caption>JTabbedPane Specific Properties</caption>
   <thead><tr>
       <th scope="col" style="vertical-align: top; text-align: center;">Property</th>
@@ -1300,7 +1300,7 @@ JToggleButton.<br>
 </p>
 <h2><a id="textProperties"></a>Text Properties<br>
 </h2>
-<table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
+<table border="1" style="text-align: left; width: 100%;">
 <caption>Text classes common properties</caption>
   <thead><tr>
       <th scope="col" style="vertical-align: top; text-align: center;">Property</th>