Index: src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
===================================================================
--- src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css	(revision 55136)
+++ src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css	(working copy)
@@ -510,7 +510,6 @@
 	margin-top: 0.15em;
 }
 
-
 /* Block: Table ------------------------------ */
 
 .editor-styles-wrapper .wp-block-table {
@@ -522,15 +521,6 @@
 	width: 100%;
 }
 
-.editor-styles-wrapper .wp-block-table,
-.editor-styles-wrapper .wp-block-table * {
-	border-color: #dcd7ca;
-}
-
-.editor-styles-wrapper .wp-block-table tr {
-	border: none;
-}
-
 .editor-styles-wrapper .wp-block-table caption {
 	background: #dcd7ca;
 	text-align: center;
Index: src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css
===================================================================
--- src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css	(revision 55136)
+++ src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css	(working copy)
@@ -514,7 +514,6 @@
 	margin-top: 0.15em;
 }
 
-
 /* Block: Table ------------------------------ */
 
 .editor-styles-wrapper .wp-block-table {
@@ -526,15 +525,6 @@
 	width: 100%;
 }
 
-.editor-styles-wrapper .wp-block-table,
-.editor-styles-wrapper .wp-block-table * {
-	border-color: #dcd7ca;
-}
-
-.editor-styles-wrapper .wp-block-table tr {
-	border: none;
-}
-
 .editor-styles-wrapper .wp-block-table caption {
 	background: #dcd7ca;
 	text-align: center;
Index: src/wp-content/themes/twentytwenty/functions.php
===================================================================
--- src/wp-content/themes/twentytwenty/functions.php	(revision 55136)
+++ src/wp-content/themes/twentytwenty/functions.php	(working copy)
@@ -138,6 +138,8 @@
 	// Add theme support for selective refresh for widgets.
 	add_theme_support( 'customize-selective-refresh-widgets' );
 
+	add_theme_support( 'appearance-tools' );
+
 	/*
 	 * Adds `async` and `defer` support for scripts registered or enqueued
 	 * by the theme.
Index: src/wp-content/themes/twentytwenty/inc/custom-css.php
===================================================================
--- src/wp-content/themes/twentytwenty/inc/custom-css.php	(revision 55136)
+++ src/wp-content/themes/twentytwenty/inc/custom-css.php	(working copy)
@@ -139,7 +139,7 @@
 
 			// Borders color.
 			if ( $borders && $borders !== $borders_default ) {
-				twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-code, .editor-styles-wrapper pre, .editor-styles-wrapper .wp-block-preformatted pre, .editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper fieldset, .editor-styles-wrapper .wp-block-table, .editor-styles-wrapper .wp-block-table *, .editor-styles-wrapper .wp-block-table.is-style-stripes, .editor-styles-wrapper .wp-block-latest-posts.is-grid li', 'border-color', $borders );
+				twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-code, .editor-styles-wrapper pre, .editor-styles-wrapper .wp-block-preformatted pre, .editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper fieldset, .editor-styles-wrapper .wp-block-table table:not(.has-border-color), .editor-styles-wrapper .wp-block-table table:not(.has-border-color) *, .editor-styles-wrapper .wp-block-table.is-style-stripes, .editor-styles-wrapper .wp-block-latest-posts.is-grid li', 'border-color', $borders );
 				twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-table caption, .editor-styles-wrapper .wp-block-table.is-style-stripes tbody tr:nth-child(odd)', 'background-color', $borders );
 			}
 
Index: src/wp-content/themes/twentytwenty/style-rtl.css
===================================================================
--- src/wp-content/themes/twentytwenty/style-rtl.css	(revision 55136)
+++ src/wp-content/themes/twentytwenty/style-rtl.css	(working copy)
@@ -898,7 +898,9 @@
 /* Tables ------------------------------------ */
 
 table {
-	border: 0.1rem solid #dcd7ca;
+	border-width: 0.1rem;
+	border-style: solid;
+	border-color: #dcd7ca;
 	border-collapse: collapse;
 	border-spacing: 0;
 	empty-cells: show;
@@ -2740,6 +2742,10 @@
 	color: #fff;
 }
 
+:root .has-accent-border-color {
+	border-color: #cd2653;
+}
+
 :root .has-primary-color {
 	color: #000;
 }
@@ -2749,6 +2755,10 @@
 	color: #f5efe0;
 }
 
+:root .has-primary-border-color {
+	border-color: #000;
+}
+
 :root .has-secondary-color {
 	color: #6d6d6d;
 }
@@ -2758,6 +2768,10 @@
 	color: #fff;
 }
 
+:root .has-secondary-border-color {
+	border-color: #6d6d6d;
+}
+
 :root .has-subtle-background-color {
 	color: #dcd7ca;
 }
@@ -2767,6 +2781,10 @@
 	color: #000;
 }
 
+:root .has-subtle-background-border-color {
+	border-color: #dcd7ca;
+}
+
 :root .has-background-color {
 	color: #f5efe0;
 }
@@ -2776,6 +2794,9 @@
 	color: #000;
 }
 
+:root .has-background-border-color {
+	border-color: #f5efe0;
+}
 
 /* Block Typography Classes ------------------ */
 
@@ -3163,6 +3184,14 @@
 
 /* Block: Image ------------------------------ */
 
+/* Block: Post Featured Image ---------------- */
+
+.wp-block-post-featured-image img {
+	border-style: solid;
+	border-color: inherit;
+	border-width: inherit;
+}
+
 /* Block: Media And Text --------------------- */
 
 .wp-block-media-text .wp-block-media-text__content {
@@ -3340,6 +3369,15 @@
 
 /* Block: Table ------------------------------ */
 
+/*
+ * Override the block library CSS because it prevents
+ * the theme's default and generated colors from showing:
+ */
+.wp-block-table table:not(.has-border-color) td,
+.wp-block-table table:not(.has-border-color) th {
+	border-color: inherit;
+}
+
 .wp-block-table.is-style-stripes tbody tr:nth-child(odd) {
 	background: #dcd7ca;
 }
Index: src/wp-content/themes/twentytwenty/style.css
===================================================================
--- src/wp-content/themes/twentytwenty/style.css	(revision 55136)
+++ src/wp-content/themes/twentytwenty/style.css	(working copy)
@@ -904,7 +904,9 @@
 /* Tables ------------------------------------ */
 
 table {
-	border: 0.1rem solid #dcd7ca;
+	border-width: 0.1rem;
+	border-style: solid;
+	border-color: #dcd7ca;
 	border-collapse: collapse;
 	border-spacing: 0;
 	empty-cells: show;
@@ -2756,6 +2758,10 @@
 	color: #fff;
 }
 
+:root .has-accent-border-color {
+	border-color: #cd2653;
+}
+
 :root .has-primary-color {
 	color: #000;
 }
@@ -2765,6 +2771,10 @@
 	color: #f5efe0;
 }
 
+:root .has-primary-border-color {
+	border-color: #000;
+}
+
 :root .has-secondary-color {
 	color: #6d6d6d;
 }
@@ -2774,6 +2784,10 @@
 	color: #fff;
 }
 
+:root .has-secondary-border-color {
+	border-color: #6d6d6d;
+}
+
 :root .has-subtle-background-color {
 	color: #dcd7ca;
 }
@@ -2783,6 +2797,10 @@
 	color: #000;
 }
 
+:root .has-subtle-background-border-color {
+	border-color: #dcd7ca;
+}
+
 :root .has-background-color {
 	color: #f5efe0;
 }
@@ -2792,6 +2810,9 @@
 	color: #000;
 }
 
+:root .has-background-border-color {
+	border-color: #f5efe0;
+}
 
 /* Block Typography Classes ------------------ */
 
@@ -3183,6 +3204,14 @@
 
 /* Block: Image ------------------------------ */
 
+/* Block: Post Featured Image ---------------- */
+
+.wp-block-post-featured-image img {
+	border-style: solid;
+	border-color: inherit;
+	border-width: inherit;
+}
+
 /* Block: Media And Text --------------------- */
 
 .wp-block-media-text .wp-block-media-text__content {
@@ -3360,6 +3389,15 @@
 
 /* Block: Table ------------------------------ */
 
+/*
+ * Override the block library CSS because it prevents
+ * the theme's default and generated colors from showing:
+ */
+.wp-block-table table:not(.has-border-color) td,
+.wp-block-table table:not(.has-border-color) th {
+	border-color: inherit;
+}
+
 .wp-block-table.is-style-stripes tbody tr:nth-child(odd) {
 	background: #dcd7ca;
 }