diff --git a/src/themes/default/collections/form.variables b/src/themes/default/collections/form.variables
index 109259bd8..e9cde9706 100644
--- a/src/themes/default/collections/form.variables
+++ b/src/themes/default/collections/form.variables
@@ -17,9 +17,9 @@
 @fieldMargin: 0em 0em @rowDistance;
 
 /* Form Label */
-@labelDistance: 0.3rem;
+@labelDistance: 0.2857rem;
 @labelMargin: 0em 0em @labelDistance 0em;
-@labelFontSize: 0.9em;
+@labelFontSize: 0.9285em;
 @labelFontWeight: bold;
 @labelTextTransform: none;
 @labelColor: @textColor;
@@ -27,9 +27,9 @@
 /* Input */
 @inputWidth: 100%;
 @inputFontSize: 1em;
-@inputVerticalPadding: 0.8em;
+@inputVerticalPadding: 0.78571em;
 @inputHorizontalPadding: 1em;
-@inputLineHeight: 1.2;
+@inputLineHeight: 1.2142em;
 @inputPadding: (@inputVerticalPadding + ((1em - @inputLineHeight) / 2)) @inputHorizontalPadding;
 @inputBackground: #FFFFFF;
 @inputBorder: 1px solid @borderColor;
@@ -56,7 +56,7 @@
 @textAreaPadding: @inputVerticalPadding @inputHorizontalPadding;
 @textAreaHeight: 12em;
 @textAreaResize: vertical;
-@textAreaLineHeight: 1.33;
+@textAreaLineHeight: 1.2857;
 @textAreaMinHeight: 8em;
 @textAreaMaxHeight: 24em;
 @textAreaBackground: @inputBackground;
diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables
index 5b06f81fe..7cdf13214 100644
--- a/src/themes/default/collections/menu.variables
+++ b/src/themes/default/collections/menu.variables
@@ -16,7 +16,7 @@
 --------------------*/
 
 @margin: 1rem 0rem;
-@verticalPadding: 0.83em;
+@verticalPadding: 0.78571em;
 @horizontalPadding: 0.95em;
 
 @background: #FFFFFF;
diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables
index 8a0fdf689..b2b728ee5 100644
--- a/src/themes/default/elements/button.variables
+++ b/src/themes/default/elements/button.variables
@@ -12,7 +12,7 @@
 /* Style */
 @backgroundColor: #E0E0E0;
 @backgroundImage: none;
-@verticalPadding: 0.8em;
+@verticalPadding: 0.78571em;
 @horizontalPadding: 1.5em;
 
 /* Text */
diff --git a/src/themes/default/elements/input.variables b/src/themes/default/elements/input.variables
index bdb8553f2..0f84ce1a2 100644
--- a/src/themes/default/elements/input.variables
+++ b/src/themes/default/elements/input.variables
@@ -8,10 +8,10 @@
 
 @pageFont: "Helvetica Neue", "Helvetica", Arial;
 
-@verticalPadding: 0.8em;
+@verticalPadding: 0.78571em;
 @horizontalPadding: 1em;
 
-@lineHeight: 1.2em;
+@lineHeight: 1.2142em;
 @lineHeightOffset: ((@lineHeight - 1em) / 2);
 
 @padding: (@verticalPadding - @lineHeightOffset) @horizontalPadding;
diff --git a/src/themes/default/elements/step.variables b/src/themes/default/elements/step.variables
index dce7e2ed9..2e4cdec00 100644
--- a/src/themes/default/elements/step.variables
+++ b/src/themes/default/elements/step.variables
@@ -9,24 +9,23 @@
 @verticalMargin: 0em;
 @horizontalMargin: 0em;
 
-@verticalPadding: 0.8em;
+@verticalPadding: 0.9285em;
 @horizontalPadding: 1.5em;
-@leftPadding: @horizontalPadding + (@arrowSize /2);
+@leftPadding: @horizontalPadding + (@arrowSize / 2);
 
 @transition:
-  background-color 0.1s ease,
-  opacity 0.1s ease,
-  color 0.1s ease,
-  box-shadow 0.1s ease
+  background-color @transitionDuration @transitionEasing,
+  opacity @transitionDuration @transitionEasing,
+  color @transitionDuration @transitionEasing,
+  box-shadow @transitionDuration @transitionEasing
 ;
 @borderRadius: @defaultBorderRadius;
-@lineHeight: 1.2;
+@lineHeight: 1.142em;
 
 @backgroundColor: #FFFFFF;
 @background: @backgroundColor;
 @borderRadius: 0em;
-
-@boxShadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.15);
+@boxShadow: 0px 0px 0px 1px @borderColor;
 
 /* Icon */
 @iconDistance: 0.6em;
@@ -36,12 +35,12 @@
 /* Title */
 @titleFontFamily: @headerFont;
 @titleFontWeight: bold;
-@titleFontSize: 1.1em;
+@titleFontSize: 1.0714em;
 @titleColor: @darkTextColor;
 
 /* Description */
 @descriptionDistance: 0.1em;
-@descriptionFontSize: 0.9em;
+@descriptionFontSize: 0.9285em;
 @descriptionFontWeight: normal;
 @descriptionColor: @textColor;
 
@@ -52,7 +51,7 @@
 @arrowBackgroundColor: @backgroundColor;
 @arrowTopOffset: 50%;
 @arrowRightOffset: 0em;
-@arrowBorderColor: rgba(0, 0, 0, 0.1);
+@arrowBorderColor: @borderColor;
 
 
 /*-------------------
diff --git a/src/themes/default/modules/popup.variables b/src/themes/default/modules/popup.variables
index 668e9099b..4ed18a43d 100644
--- a/src/themes/default/modules/popup.variables
+++ b/src/themes/default/modules/popup.variables
@@ -15,7 +15,7 @@
 @boxShadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
 @color: @textColor;
 
-@verticalPadding: 0.8em;
+@verticalPadding: 0.833em;
 @horizontalPadding: 1em;
 @fontWeight: normal;
 @fontStyle: normal;
@@ -89,7 +89,7 @@
 @invertedArrowColor: @black;
 
 /* Sizes */
-@small: 0.8rem;
-@medium: 0.875rem;
+@small: 0.785714rem;
+@medium: 0.85714rem;
 @large: 1rem;
-@huge: 1.1rem;
\ No newline at end of file
+@huge: 1.14285rem;
\ No newline at end of file
diff --git a/src/themes/default/modules/search.variables b/src/themes/default/modules/search.variables
index a688ad0bc..77f0665cb 100644
--- a/src/themes/default/modules/search.variables
+++ b/src/themes/default/modules/search.variables
@@ -4,7 +4,7 @@
 
 /* Search Prompt */
 @promptFontSize: 1em;
-@promptVerticalPadding: 0.8em;
+@promptVerticalPadding: 0.78571em;
 @promptHorizontalPadding: 1em;
 @promptLineHeight: 1.2;
 @promptPadding: (@promptVerticalPadding + ((1em - @promptLineHeight) / 2)) @promptHorizontalPadding;
diff --git a/src/themes/flat/collections/form.variables b/src/themes/flat/collections/form.variables
index bf27abee7..6f9b522ec 100644
--- a/src/themes/flat/collections/form.variables
+++ b/src/themes/flat/collections/form.variables
@@ -14,13 +14,13 @@
 @fieldMargin: 0em 0em 1em;
 
 /* Form Label */
-@labelFontSize: 0.8em;
+@labelFontSize: 0.7857em;
 @labelTextTransform: uppercase;
 
 @groupedLabelTextTransform: none;
 
 /* Input */
-@inputVerticalPadding: 0.8em;
+@inputVerticalPadding: 0.7857em;
 @inputHorizontalPadding: 0.5em;
 @inputBackground: transparent;
 @inputBorder: none;