diff --git a/src/definitions/views/card.less b/src/definitions/views/card.less
index e54b47659..2ba0cb37a 100755
--- a/src/definitions/views/card.less
+++ b/src/definitions/views/card.less
@@ -132,6 +132,10 @@
      Content
 ---------------*/
 
+.ui.cards > .card > .content,
+.ui.card > .content {
+
+}
 .ui.cards > .card > .content,
 .ui.card > .content {
   background: @contentBackground;
@@ -158,10 +162,18 @@
   display: block;
   margin: @headerMargin;
   font-family: @headerFont;
+  color: @headerColor;
+}
+
+/* Default Header Size */
+.ui.cards > .card > .content > .header:not(.ui),
+.ui.card > .content > .header:not(.ui) {
   font-weight: @headerFontWeight;
   font-size: @headerFontSize;
-  color: @headerColor;
+  margin-top: @headerLineHeightOffset;
+  line-height: @headerLineHeight;
 }
+
 .ui.cards > .card > .content > .meta + .description,
 .ui.cards > .card > .content > .header + .description,
 .ui.card > .content > .meta + .description,
diff --git a/src/themes/packages/github/views/card.overrides b/src/themes/packages/classic/views/card.overrides
old mode 100755
new mode 100644
similarity index 100%
rename from src/themes/packages/github/views/card.overrides
rename to src/themes/packages/classic/views/card.overrides
diff --git a/src/themes/packages/github/views/card.variables b/src/themes/packages/classic/views/card.variables
old mode 100755
new mode 100644
similarity index 100%
rename from src/themes/packages/github/views/card.variables
rename to src/themes/packages/classic/views/card.variables
diff --git a/src/themes/packages/default/views/card.variables b/src/themes/packages/default/views/card.variables
index 34df79b9c..d1622d09e 100755
--- a/src/themes/packages/default/views/card.variables
+++ b/src/themes/packages/default/views/card.variables
@@ -16,7 +16,7 @@
 @display: block;
 @margin: 1em 0em;
 @minHeight: 0px;
-@padding: 0.5em;
+@padding: 0em;
 @width: 290px;
 @borderWidth: 1px;
 @borderShadow: 0px 0px 0px @borderWidth @solidBorderColor;
@@ -49,8 +49,8 @@
 @imageBorder: none;
 
 /* Content */
-@contentBackground: none;
 @contentMargin: 0em;
+@contentBackground: none;
 @contentPadding: 1em 1em;
 @contentFontSize: 1em;
 @contentBorder: none;
@@ -61,6 +61,8 @@
 @headerMargin: 0em;
 @headerFontWeight: bold;
 @headerFontSize: 1.2em;
+@headerLineHeight: 1.33em;
+@headerLineHeightOffset: -(@lineHeight - 1em) / 2;
 @headerColor: @darkTextColor;
 
 /* Metadata */
@@ -108,8 +110,8 @@
 @extraWidth: auto;
 @extraTop: 0em;
 @extraLeft: 0em;
-@extraMargin: 0em 1em;
-@extraPadding: 0.75em 0em;
+@extraMargin: 0em 0em;
+@extraPadding: 0.75em 1em;
 @extraBoxShadow: none;
 @extraColor: @lightTextColor;
 @extraTransition: color @transitionDuration @transitionEasing;