diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css
index dc11ae915..d77fe5660 100644
--- a/src/components/cardbuilder/card.css
+++ b/src/components/cardbuilder/card.css
@@ -209,6 +209,10 @@ button::-moz-focus-inner {
 }
 
 .cardContent:not(.defaultCardBackground) {
+    background-color: transparent;
+}
+
+.cardBox:not(.visualCardBox) .cardPadder {
     background-color: #242424;
 }
 
@@ -217,7 +221,8 @@ button::-moz-focus-inner {
     border-bottom-right-radius: 0;
 }
 
-.cardContent-shadow {
+.cardContent-shadow,
+.cardBox:not(.visualCardBox) .cardPadder {
     box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37);
 }
 
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index fb36b6758..2fa1fba06 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -1367,9 +1367,6 @@ import 'programStyles';
             let cardScalableClose = '';
 
             let cardContentClass = 'cardContent';
-            if (!options.cardLayout) {
-                cardContentClass += ' cardContent-shadow';
-            }
 
             let blurhashAttrib = '';
             if (blurhash && blurhash.length > 0) {
@@ -1390,7 +1387,7 @@ import 'programStyles';
 
             let cardScalableClass = 'cardScalable';
 
-            cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder-' + shape + '"></div>' + cardImageContainerOpen;
+            cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder cardPadder-' + shape + '"></div>' + cardImageContainerOpen;
             cardBoxClose = '</div>';
             cardScalableClose = '</div>';
 
diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css
index 4b1c91c14..cd0ac8680 100644
--- a/src/themes/appletv/theme.css
+++ b/src/themes/appletv/theme.css
@@ -123,7 +123,7 @@ html {
 
 .paperList,
 .visualCardBox,
-.cardContent:not(.defaultCardBackground) {
+.cardBox:not(.visualCardBox) .cardPadder {
     background-color: rgba(0, 0, 0, 0.1);
 }
 
@@ -464,18 +464,3 @@ html {
 .metadataSidebarIcon {
     color: #00a4dc;
 }
-
-.cardPadder-square,
-.cardPadder-mixedSquare,
-.cardPadder-overflowSquare,
-.cardPadder-portrait,
-.cardPadder-mixedPortrait,
-.cardPadder-overflowPortrait,
-.cardPadder-banner,
-.cardPadder-backdrop,
-.cardPadder-mixedBackdrop,
-.cardPadder-smallBackdrop,
-.cardPadder-overflowBackdrop,
-.cardPadder-overflowSmallBackdrop {
-    background-color: #d2d2d2;
-}
diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css
index 5c1e9ae09..08ab576aa 100644
--- a/src/themes/blueradiance/theme.css
+++ b/src/themes/blueradiance/theme.css
@@ -450,7 +450,7 @@ html {
     color: #4285f4;
 }
 
-.cardContent:not(.defaultCardBackground) {
+.cardBox:not(.visualCardBox) .cardPadder {
     background-color: rgba(0, 0, 0, 0.5);
 }
 
@@ -487,18 +487,3 @@ html {
 .metadataSidebarIcon {
     color: #00a4dc;
 }
-
-.cardPadder-square,
-.cardPadder-mixedSquare,
-.cardPadder-overflowSquare,
-.cardPadder-portrait,
-.cardPadder-mixedPortrait,
-.cardPadder-overflowPortrait,
-.cardPadder-banner,
-.cardPadder-backdrop,
-.cardPadder-mixedBackdrop,
-.cardPadder-smallBackdrop,
-.cardPadder-overflowBackdrop,
-.cardPadder-overflowSmallBackdrop {
-    background-color: #022950;
-}
diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css
index 8ef6a39be..a32e60638 100644
--- a/src/themes/dark/theme.css
+++ b/src/themes/dark/theme.css
@@ -453,18 +453,3 @@ html {
 .metadataSidebarIcon {
     color: #00a4dc;
 }
-
-.cardPadder-square,
-.cardPadder-mixedSquare,
-.cardPadder-overflowSquare,
-.cardPadder-portrait,
-.cardPadder-mixedPortrait,
-.cardPadder-overflowPortrait,
-.cardPadder-banner,
-.cardPadder-backdrop,
-.cardPadder-mixedBackdrop,
-.cardPadder-smallBackdrop,
-.cardPadder-overflowBackdrop,
-.cardPadder-overflowSmallBackdrop {
-    background-color: #202020;
-}
diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css
index 14c7d5f4a..acea3f1d6 100644
--- a/src/themes/light/theme.css
+++ b/src/themes/light/theme.css
@@ -432,7 +432,7 @@ html {
     color: #4285f4;
 }
 
-.cardContent:not(.defaultCardBackground) {
+.cardBox:not(.visualCardBox) .cardPadder {
     background-color: #fff;
 }
 
@@ -444,18 +444,3 @@ html {
 .metadataSidebarIcon {
     color: #00a4dc;
 }
-
-.cardPadder-square,
-.cardPadder-mixedSquare,
-.cardPadder-overflowSquare,
-.cardPadder-portrait,
-.cardPadder-mixedPortrait,
-.cardPadder-overflowPortrait,
-.cardPadder-banner,
-.cardPadder-backdrop,
-.cardPadder-mixedBackdrop,
-.cardPadder-smallBackdrop,
-.cardPadder-overflowBackdrop,
-.cardPadder-overflowSmallBackdrop {
-    background-color: #fff;
-}
diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css
index 79f31d6ba..a311fd310 100644
--- a/src/themes/purplehaze/theme.css
+++ b/src/themes/purplehaze/theme.css
@@ -548,12 +548,13 @@ a[data-role=button] {
 }
 
 .personCard .cardScalable {
-    border-radius: 50%;
+    border-radius: 50% !important;
     border: 1px solid rgb(255, 255, 255);
 }
 
-.cardContent:not(.defaultCardBackground) {
+.cardBox:not(.visualCardBox) .cardPadder {
     background-color: rgba(0, 0, 0, 0.5);
+    border-radius: 1em;
 }
 
 .card:focus .cardBox.visualCardBox,
@@ -561,6 +562,11 @@ a[data-role=button] {
     border-color: #ff77f1 !important;
 }
 
+.card.show-focus:not(.show-animation) .cardBox.visualCardBox,
+.card.show-focus:not(.show-animation) .cardBox:not(.visualCardBox) .cardScalable {
+    border-radius: 1.5em;
+}
+
 .layout-desktop,
 .scrollY {
     scrollbar-width: thin;
@@ -618,23 +624,9 @@ a[data-role=button] {
     right: 20%;
 }
 
-.cardPadder-square,
-.cardPadder-mixedSquare,
-.cardPadder-overflowSquare,
-.cardPadder-portrait,
-.cardPadder-mixedPortrait,
-.cardPadder-overflowPortrait,
-.cardPadder-banner,
-.cardPadder-backdrop,
-.cardPadder-mixedBackdrop,
-.cardPadder-smallBackdrop,
-.cardPadder-overflowBackdrop,
-.cardPadder-overflowSmallBackdrop {
-    background-color: #200c3d;
-}
-
 .personCard .cardPadder-overflowPortrait,
 .personCard .cardPadder-portrait {
     padding-bottom: 100%;
     contain: strict;
+    border-radius: 50% !important;
 }
diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css
index 0e2ff6f5a..97c08caf8 100644
--- a/src/themes/wmc/theme.css
+++ b/src/themes/wmc/theme.css
@@ -430,7 +430,7 @@ html {
     color: #4285f4;
 }
 
-.cardContent:not(.defaultCardBackground) {
+.cardBox:not(.visualCardBox) .cardPadder {
     background-color: #0f3562;
 }
 
@@ -463,18 +463,3 @@ html {
 .metadataSidebarIcon {
     color: #00a4dc;
 }
-
-.cardPadder-square,
-.cardPadder-mixedSquare,
-.cardPadder-overflowSquare,
-.cardPadder-portrait,
-.cardPadder-mixedPortrait,
-.cardPadder-overflowPortrait,
-.cardPadder-banner,
-.cardPadder-backdrop,
-.cardPadder-mixedBackdrop,
-.cardPadder-smallBackdrop,
-.cardPadder-overflowBackdrop,
-.cardPadder-overflowSmallBackdrop {
-    background-color: #0f3562;
-}