diff --git a/scss/_type.scss b/scss/_type.scss
index f770d20ed8f6155dd7d7330076ed4dbf6392c7f2..98507c281d130ca0d4408752e33573163499901e 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -4,13 +4,16 @@
 
 h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
-  margin-bottom: $headings-margin-bottom;
   font-family: $headings-font-family;
   font-weight: $headings-font-weight;
-  line-height: $headings-line-height;
   color: $headings-color;
 }
 
+h1, h2, h3, h4, h5, h6 {
+  margin-bottom: $headings-margin-bottom;
+  line-height: $headings-line-height;
+}
+
 h1 { font-size: $font-size-h1; }
 h2 { font-size: $font-size-h2; }
 h3 { font-size: $font-size-h3; }
@@ -21,11 +24,11 @@ h6 { font-size: $font-size-h6; }
 // These declarations are kept separate from and placed after
 // the previous tag-based declarations so that the classes beat the tags in
 // the CSS cascade, and thus <h1 class="h2"> will be styled like an h2.
-.h1 { font-size: $font-size-h1; }
-.h2 { font-size: $font-size-h2; }
-.h3 { font-size: $font-size-h3; }
-.h4 { font-size: $font-size-h4; }
-.h5 { font-size: $font-size-h5; }
+.h1, .xxx-large { font-size: $font-size-h1; }
+.h2, .xx-large { font-size: $font-size-h2; }
+.h3, .x-large { font-size: $font-size-h3; }
+.h4, .large { font-size: $font-size-h4; }
+.h5, .larger { font-size: $font-size-h5; }
 .h6 { font-size: $font-size-h6; }
 
 .lead {