Index: src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
===================================================================
--- src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css	(working copy)
@@ -351,11 +351,13 @@
 }
 
 .is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
-	color: #d1e4dd;
+	background: #000;
+	color: #fff;
+	text-decoration: none;
 }
 
 .is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-	color: #d1e4dd;
+	color: #fff;
 }
 
 .has-background-white .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
@@ -379,7 +381,7 @@
 	background-color: #f1f1f1;
 }
 
-.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link {
 	background: none;
 }
 
Index: src/wp-content/themes/twentytwentyone/assets/css/ie.css
===================================================================
--- src/wp-content/themes/twentytwentyone/assets/css/ie.css	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/assets/css/ie.css	(working copy)
@@ -2192,11 +2192,13 @@
 }
 
 .is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
-	color: #d1e4dd;
+	background: #000;
+	color: #fff;
+	text-decoration: none;
 }
 
 .is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-	color: #d1e4dd;
+	color: #fff;
 }
 
 .has-background-white .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
@@ -2220,7 +2222,7 @@
 	background-color: #f1f1f1;
 }
 
-.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link {
 	background: none;
 }
 
Index: src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css
===================================================================
--- src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css	(working copy)
@@ -17,18 +17,6 @@
 		--table--stripes-background-color: rgba(240, 240, 240, 0.15);
 	}
 
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button),
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-		background: #000;
-		color: #fff;
-		text-decoration: none;
-	}
-
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus,
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav.custom-logo-link:focus {
-		background: none;
-	}
-
 	.is-dark-theme.is-dark-theme img {
 		filter: brightness(0.85) contrast(1.1);
 	}
Index: src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css
===================================================================
--- src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css	(working copy)
@@ -17,18 +17,6 @@
 		--table--stripes-background-color: rgba(240, 240, 240, 0.15);
 	}
 
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button),
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-		background: #000;
-		color: #fff;
-		text-decoration: none;
-	}
-
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus,
-	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav.custom-logo-link:focus {
-		background: none;
-	}
-
 	.is-dark-theme.is-dark-theme img {
 		filter: brightness(0.85) contrast(1.1);
 	}
Index: src/wp-content/themes/twentytwentyone/assets/css/style-editor.css
===================================================================
--- src/wp-content/themes/twentytwentyone/assets/css/style-editor.css	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/assets/css/style-editor.css	(working copy)
@@ -488,9 +488,14 @@
 	background: rgba(255, 255, 255, 0.9);
 }
 
-.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button),
+.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
+	background: var(--global--color-black);
+	color: var(--global--color-white);
+	text-decoration: none;
+}
+
 .is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-	color: var(--wp--style--color--link, var(--global--color-background));
+	color: var(--wp--style--color--link, var(--global--color-white));
 }
 
 .has-background-white .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
@@ -514,7 +519,7 @@
 	background-color: #f1f1f1;
 }
 
-.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link {
 	background: none;
 }
 
Index: src/wp-content/themes/twentytwentyone/assets/sass/04-elements/links.scss
===================================================================
--- src/wp-content/themes/twentytwentyone/assets/sass/04-elements/links.scss	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/assets/sass/04-elements/links.scss	(working copy)
@@ -25,9 +25,14 @@
 	background: rgba(255, 255, 255, .9);
 
 	// Change text color when the body background is dark.
-	.is-dark-theme &,
-	.is-dark-theme & .meta-nav {
-		color: var(--wp--style--color--link, var(--global--color-background));
+	.is-dark-theme & {
+		background: var(--global--color-black);
+		color: var(--global--color-white);
+		text-decoration: none;
+
+		.meta-nav {
+			color: var(--wp--style--color--link, var(--global--color-white));
+		}
 	}
 
 	// Change colors when the body background is white.
@@ -53,10 +58,7 @@
 	}
 
 	&.custom-logo-link {
-
-		&:focus {
-			background: none;
-		}
+		background: none;
 	}
 
 	img {
Index: src/wp-content/themes/twentytwentyone/assets/sass/style-dark-mode.scss
===================================================================
--- src/wp-content/themes/twentytwentyone/assets/sass/style-dark-mode.scss	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/assets/sass/style-dark-mode.scss	(working copy)
@@ -16,20 +16,6 @@
 		--table--stripes-border-color: rgba(240, 240, 240, 0.15);
 		--table--stripes-background-color: rgba(240, 240, 240, 0.15);
 
-		.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button),
-		.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-			background: #000;
-			color: #fff;
-			text-decoration: none;
-
-			&.custom-logo-link {
-
-				&:focus {
-					background: none;
-				}
-			}
-		}
-
 		img {
 			filter: brightness(.85) contrast(1.1);
 		}
Index: src/wp-content/themes/twentytwentyone/style-rtl.css
===================================================================
--- src/wp-content/themes/twentytwentyone/style-rtl.css	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/style-rtl.css	(working copy)
@@ -1660,9 +1660,14 @@
 	background: rgba(255, 255, 255, 0.9);
 }
 
-.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button),
+.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
+	background: var(--global--color-black);
+	color: var(--global--color-white);
+	text-decoration: none;
+}
+
 .is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-	color: var(--wp--style--color--link, var(--global--color-background));
+	color: var(--wp--style--color--link, var(--global--color-white));
 }
 
 .has-background-white .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
@@ -1686,7 +1691,7 @@
 	background-color: #f1f1f1;
 }
 
-.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link {
 	background: none;
 }
 
Index: src/wp-content/themes/twentytwentyone/style.css
===================================================================
--- src/wp-content/themes/twentytwentyone/style.css	(revision 50407)
+++ src/wp-content/themes/twentytwentyone/style.css	(working copy)
@@ -1670,9 +1670,14 @@
 	background: rgba(255, 255, 255, 0.9);
 }
 
-.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button),
+.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
+	background: var(--global--color-black);
+	color: var(--global--color-white);
+	text-decoration: none;
+}
+
 .is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav {
-	color: var(--wp--style--color--link, var(--global--color-background));
+	color: var(--wp--style--color--link, var(--global--color-white));
 }
 
 .has-background-white .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) {
@@ -1696,7 +1701,7 @@
 	background-color: #f1f1f1;
 }
 
-.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link {
 	background: none;
 }