diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less
index 4d37107de..ac9083b1b 100755
--- a/src/definitions/collections/grid.less
+++ b/src/definitions/collections/grid.less
@@ -618,10 +618,13 @@ body > .ui.grid {
   Equal Height Columns
 -----------------------*/
 
-.ui.grid > .equal.height.row {
+.ui.grid > .equal.height.row,
+.ui.equal.height.grid  {
   display: table;
   max-width: 100%;
 }
+.ui.equal.height.grid > .column,
+.ui.equal.height.grid > .row > .column,
 .ui.grid > .equal.height.row > .column {
   display: table-cell;
 }
@@ -734,7 +737,7 @@ body > .ui.grid {
     display: inline;
   }
   .ui.doubling.grid > .row > .column {
-    margin-bottom: @stackableRowMargin;
+    margin-bottom: @doublingRowSpacing;
   }
   .ui.two.column.doubling.grid > .row > .column,
   .ui.two.column.doubling.grid > .column,
@@ -882,8 +885,8 @@ body > .ui.grid {
     display: block !important;
     width: auto !important;
 
-    margin: (@stackableRowMargin / 2) 0em 0em !important;
-    padding: (@stackableRowMargin / 2) 0em 0em !important;
+    margin: (@stackableRowSpacing / 2) 0em 0em !important;
+    padding: (@stackableRowSpacing / 2) 0em 0em !important;
 
     box-shadow: none !important;
   }
diff --git a/src/themes/packages/default/collections/form.variables b/src/themes/packages/default/collections/form.variables
index 729fdeacb..7d04a383a 100755
--- a/src/themes/packages/default/collections/form.variables
+++ b/src/themes/packages/default/collections/form.variables
@@ -72,14 +72,14 @@
 @inputFocusBorderRadius: 0em @inputBorderRadius @inputBorderRadius 0em;
 
 /* Error */
-@formErrorBackground: #FDF6F6;
-@formErrorBorder: #DC9494;
-@formErrorColor: @errorTextColor;
+@formErrorColor: @negativeColor;
+@formErrorBorder: @negativeBorderColor;
+@formErrorBackground: @negativeBackgroundColor;
 
 /* Input Error */
 @inputErrorPointerSize: 0.3em;
 @inputErrorBorderRadius: 0em @inputBorderRadius @inputBorderRadius 0em;
-@inputErrorBoxShadow: @inputErrorPointerSize 0em 0em 0em @formErrorBorder inset;
+@inputErrorBoxShadow: @inputErrorPointerSize 0em 0em 0em @formErrorColor inset;
 
 /* Dropdown Error */
 @dropdownErrorHoverBackground: #FFF2F2;
diff --git a/src/themes/packages/default/collections/grid.variables b/src/themes/packages/default/collections/grid.variables
index e955b041c..58c62b425 100755
--- a/src/themes/packages/default/collections/grid.variables
+++ b/src/themes/packages/default/collections/grid.variables
@@ -112,7 +112,8 @@
     Stackable
 ---------------*/
 
-@stackableRowMargin: 1em;
+@stackableRowSpacing: @rowSpacing;
 @stackableGutterWidth: 1.5em;
+@stackableMobileBorder: 1px solid @borderColor;
 
-@stackableMobileBorder: 1px dotted @borderColor;
\ No newline at end of file
+@doublingRowSpacing: @rowSpacing;
diff --git a/src/themes/packages/default/collections/message.variables b/src/themes/packages/default/collections/message.variables
index 8ec255f7a..da1746c7e 100755
--- a/src/themes/packages/default/collections/message.variables
+++ b/src/themes/packages/default/collections/message.variables
@@ -73,8 +73,8 @@
       Variations
 --------------------*/
 
-@small: 0.875rem;
-@medium: 1rem;
-@large: 1.125rem;
-@huge: 1.5rem;
-@massive: 2rem;
+@small: 0.875em;
+@medium: 1em;
+@large: 1.125em;
+@huge: 1.5em;
+@massive: 2em;