diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid
index a30805ae2..2b7d73f98 100755
--- a/assets/timber.scss.liquid
+++ b/assets/timber.scss.liquid
@@ -41,7 +41,6 @@
   #Collection Filters
   #Breadcrumbs
   #Product Page
-  #Blogs and Comments
   #Notes and Form Feedback
   #Cart Page
 ==============================================================================*/
@@ -978,14 +977,6 @@ hr {
     margin-bottom: $gutter / 2;
   }
 
-  ul, ol {
-    margin-left: 35px;
-  }
-
-  ul {
-    @extend ul.disc;
-  }
-
   li {
     margin-bottom: 0.4em;
   }
@@ -1019,9 +1010,11 @@ html input[disabled] {
   cursor: default;
 }
 
-.btn {
+.btn,
+.rte .btn {
   display: inline-block;
   padding: 8px 10px;
+  width: auto;
   margin: 0;
   line-height: 1.42;
   font-weight: bold;
@@ -1060,7 +1053,7 @@ html input[disabled] {
 }
 
 .btn--secondary,
-input.btn--secondary {
+.rte .btn--secondary {
   @extend .btn;
   background-color: $colorBtnSecondary;
 
@@ -1103,20 +1096,26 @@ input.btn--secondary {
   #Lists
 ==============================================================================*/
 ul, ol {
-  margin: 0 0 $gutter;
+  margin: 0 0 ($gutter / 2) 20px;
   padding: 0;
+
+  &.inline-list {
+    margin-left: 0;
+  }
 }
 
-ul { list-style: none outside; }
 ol { list-style: decimal; }
 ul ul, ul ol,
 ol ol, ol ul { margin: 4px 0 5px 20px; }
 li { margin-bottom: 0.25em; }
 
-ol, ul.square, ul.disc { margin-left: 20px; }
 ul.square { list-style: square outside; }
 ul.disc { list-style: disc outside; }
 ol.alpha { list-style: lower-alpha outside; }
+.no-bullets {
+  list-style: none outside;
+  margin-left: 0;
+}
 
 .inline-list li {
   display: inline-block;
@@ -1220,48 +1219,29 @@ img.auto,
   #Forms
 ==============================================================================*/
 form {
-  margin-bottom: $gutter;
+  margin-bottom: 0;
 }
 
-input,
-textarea,
-button,
-select {
-  font-size: 1em;
+/*================ Prevent zoom on touch devices in active inputs ================*/
+@include at-query($max, $medium) {
+  input,
+  textarea {
+    font-size: 16px;
+  }
 }
 
 button,
-input[type="text"],
-input[type="search"],
-input[type="password"],
-input[type="email"],
-input[type="file"],
-input[type="number"],
-input[type="tel"],
-input[type="submit"],
-input[type="url"],
+input,
 textarea {
   -webkit-appearance: none;
   -moz-appearance: none;
 }
 
-input,
-textarea,
-select,
-fieldset {
-  border-radius: $radius;
-  max-width: 100%;
-
-  &.input-full {
-    width: 100%;
-  }
-}
-
-input,
-select,
-textarea {
-  padding: 8px 10px;
-  line-height: 1.42;
+button {
+  background: none;
+  border: none;
+  display: inline-block;
+  cursor: pointer;
 }
 
 fieldset {
@@ -1274,40 +1254,18 @@ legend {
   padding: 0;
 }
 
-optgroup {
-  font-weight: bold;
-}
-
-input {
-  display: inline-block;
-  width: auto;
-}
-
 button,
 input[type="submit"] {
   cursor: pointer;
 }
 
-input[type="submit"] {
-  @extend .btn;
-}
-
-/*================ Input width and border ================*/
-input[type="text"],
-input[type="search"],
-input[type="password"],
-input[type="email"],
-input[type="file"],
-input[type="number"],
-input[type="tel"],
-input[type="url"],
+input,
 textarea,
 select {
   border: 1px solid $colorBorder;
-  width: 100%;
   max-width: 100%;
-  display: block;
-  margin: 0 0 1em;
+  padding: 8px 10px;
+  border-radius: $radius;
 
   &:focus {
     border: 1px solid darken($colorBorder, 10%);
@@ -1319,17 +1277,38 @@ select {
     background-color: $disabledGrey;
     border-color: $disabledBorder;
   }
+
+  &.input-full {
+    width: 100%;
+  }
 }
 
 textarea {
   min-height: 100px;
 }
 
+/*================ Input element overrides ================*/
 input[type="checkbox"],
 input[type="radio"] {
   display: inline;
-  margin: 0;
+  margin: 0 8px 0 0;
   padding: 0;
+  width: auto;
+}
+
+input[type="checkbox"] {
+  -webkit-appearance: checkbox;
+  -moz-appearance: checkbox;
+}
+
+input[type="radio"] {
+  -webkit-appearance: radio;
+  -moz-appearance: radio;
+}
+
+input[type="image"] {
+  padding-left: 0;
+  padding-right: 0;
 }
 
 select {
@@ -1356,6 +1335,10 @@ select {
   }
 }
 
+optgroup {
+  font-weight: bold;
+}
+
 // Force option color (affects IE only)
 option {
   color: #000;
@@ -1367,78 +1350,45 @@ select::-ms-expand {
 }
 
 /*================ Form labels ================*/
-label,
-legend {
-  display: block;
-  margin-bottom: 2px;
-  font-weight: bold;
-
-  &.inline {
-    display: inline;
-  }
+.label--hidden {
+  display: inline-block;
+  height: 0;
+  width: 0;
+  margin-bottom: 0;
+  overflow: hidden;
 
-  .form-horizontal &.label--hidden,
-  &.label--hidden {
-    height: 0;
-    width: 0;
-    margin-bottom: 0;
-    overflow: hidden;
-
-    .ie9 &,
-    .lt-ie9 & {
-      height: auto;
-      width: auto;
-      margin-bottom: 2px;
-      overflow: visible;
-    }
+  // No placeholders, so force show labels
+  .ie9 &,
+  .lt-ie9 & {
+    height: auto;
+    width: auto;
+    margin-bottom: 2px;
+    overflow: visible;
   }
 }
 
-/*================ We don't want the same label treatment for checkboxes/radios ================*/
-input[type="checkbox"] + label,
-input[type="radio"] + label {
-  font-weight: normal;
-}
-
 label[for] {
   cursor: pointer;
 }
 
-.label-hint {
-  color: #999;
-}
-
 /*================ Horizontal Form ================*/
-form.form-horizontal,
-.form-horizontal {
-  margin-bottom: 0;
-
-  input[type="text"],
-  input[type="search"],
-  input[type="password"],
-  input[type="email"],
-  input[type="file"],
-  input[type="number"],
-  input[type="tel"],
-  input[type="url"],
-  textarea,
+.form-vertical {
+  input,
   select,
-  label {
+  textarea {
+    display: block;
+    margin-bottom: 10px;
+  }
+
+  input[type="radio"],
+  input[type="checkbox"] {
     display: inline-block;
-    margin-bottom: 0;
-    width: auto;
   }
 }
 
 /*================ Error styles ================*/
-input[type="text"],
-input[type="search"],
-input[type="password"],
-input[type="email"],
-input[type="file"],
-input[type="number"],
-input[type="tel"],
-input[type="url"],
+input,
+select,
 textarea {
   &.error {
     border-color: $errorRed;
@@ -1496,7 +1446,6 @@ label.error {
 
 .input-group .input-group-field {
   width: 100%;
-  margin-bottom: 0;
 }
 
 .input-group-btn {
@@ -1882,11 +1831,6 @@ label.error {
     margin: 0 auto;
     text-align: center;
   }
-
-  .input-group,
-  .input-group-field {
-    margin-bottom: 0;
-  }
 }
 
 
@@ -1895,7 +1839,6 @@ label.error {
 ==============================================================================*/
 .site-footer {
   background-color: $colorFooterBg;
-  border-top: 1px solid $colorBorder;
   padding: $gutter 0;
   color: $colorFooterText;
 
@@ -1987,18 +1930,6 @@ label.error {
   }
 }
 
-/*============================================================================
-  #Blogs and Comments
-==============================================================================*/
-.comment {
-  margin-bottom: $gutter;
-
-  & + & {
-    border-top: 1px solid $colorBorder;
-    padding-top: $gutter;
-  }
-}
-
 
 /*============================================================================
   #Notes and Form Feedback
diff --git a/snippets/blog-sidebar.liquid b/snippets/blog-sidebar.liquid
index d4c2799b9..f40216ba7 100755
--- a/snippets/blog-sidebar.liquid
+++ b/snippets/blog-sidebar.liquid
@@ -3,7 +3,7 @@
   Recent blog posts
 {% endcomment %}
 <h4>{{ 'blogs.sidebar.recent_articles' | t }}</h4>
-<ul>
+<ul class="no-bullets">
   {% for article in blogs[blog.handle].articles limit:6 %}
     <li>
       <a href="{{ article.url }}">{{ article.title }}</a>
@@ -18,7 +18,7 @@
 {% endcomment %}
 {% if blog.all_tags.size > 0 %}
   <h4>{{ 'blogs.sidebar.categories' | t }}</h4>
-  <ul>
+  <ul class="no-bullets">
     {% for tag in blog.all_tags %}
       {% if current_tags contains tag %}
       <li>{{ tag }}</li>
diff --git a/snippets/footer.liquid b/snippets/footer.liquid
index 915d2fedb..e6a38dc33 100755
--- a/snippets/footer.liquid
+++ b/snippets/footer.liquid
@@ -32,7 +32,7 @@
       {% if settings.footer_quicklinks_enable %}
         <div class="grid__item {{ footer_column_width }}">
           <h3>{{ 'layout.footer.linklist_title' | t }}</h3>
-          <ul>
+          <ul class="no-bullets">
             {% for link in linklists[settings.footer_quicklinks_linklist].links %}
               <li><a href="{{ link.url }}">{{ link.title }}</a></li>
             {% endfor %}
diff --git a/templates/article.liquid b/templates/article.liquid
index b34f82734..2a9f21a51 100755
--- a/templates/article.liquid
+++ b/templates/article.liquid
@@ -42,7 +42,7 @@
     {% comment %}
       Show off meta information like comments and tags.
     {% endcomment %}
-    <ul>
+    <ul class="inline-list">
       {% include 'tags-article' %}
     </ul>
 
@@ -92,7 +92,7 @@
           {% endif %}
 
           {% if number_of_comments > 0 %}
-            <ul>
+            <ul class="no-bullets">
               {% comment %}
                 If a comment was just submitted with no blank field, show it.
               {% endcomment %}
@@ -109,6 +109,10 @@
                 <li id="{{ comment.id }}" class="comment{% unless number_of_comments > article.comments_count %}{% if forloop.first %} first{% endif %}{% endunless %}{% if forloop.last %} last {% endif %}">
                   {% include 'comment' %}
                 </li>
+
+                {% unless forloop.last %}
+                  <li><hr></li>
+                {% endunless %}
               {% endfor %}
             </ul>
 
@@ -126,50 +130,52 @@
           {% comment %}
             Comment submission form
           {% endcomment %}
-          {% form 'new_comment', article %}
+          <div class="form-vertical">
+            {% form 'new_comment', article %}
 
-            {% comment %}
-              #AddCommentTitle is used simply as an anchor link
-            {% endcomment %}
-            <h3 id="AddCommentTitle">{{ 'blogs.comments.title' | t }}</h3>
+              {% comment %}
+                #AddCommentTitle is used simply as an anchor link
+              {% endcomment %}
+              <h3 id="AddCommentTitle">{{ 'blogs.comments.title' | t }}</h3>
 
-            {{ form.errors | default_errors }}
+              {{ form.errors | default_errors }}
 
-            <div class="grid">
+              <div class="grid">
 
-              <div class="grid__item large--one-half">
-                <label for="CommentAuthor" class="label--hidden">{{ 'blogs.comments.name' | t }}</label>
-                <input {% if form.errors contains "author" %} class="error"{% endif %} type="text" name="comment[author]" placeholder="{{ 'blogs.comments.name' | t }}" id="CommentAuthor" value="{{ form.author }}" autocapitalize="words">
+                <div class="grid__item large--one-half">
+                  <label for="CommentAuthor" class="label--hidden">{{ 'blogs.comments.name' | t }}</label>
+                  <input {% if form.errors contains "author" %} class="error"{% endif %} type="text" name="comment[author]" placeholder="{{ 'blogs.comments.name' | t }}" id="CommentAuthor" value="{{ form.author }}" autocapitalize="words">
 
-                <label for="CommentEmail" class="label--hidden">{{ 'blogs.comments.email' | t }}</label>
-                <input {% if form.errors contains "email" %} class="error"{% endif %} type="email" name="comment[email]" placeholder="{{ 'blogs.comments.email' | t }}" id="CommentEmail" value="{{ form.email }}" autocorrect="off" autocapitalize="off">
-              </div>
+                  <label for="CommentEmail" class="label--hidden">{{ 'blogs.comments.email' | t }}</label>
+                  <input {% if form.errors contains "email" %} class="error"{% endif %} type="email" name="comment[email]" placeholder="{{ 'blogs.comments.email' | t }}" id="CommentEmail" value="{{ form.email }}" autocorrect="off" autocapitalize="off">
+                </div>
 
-              <div class="grid__item">
-                <label for="CommentBody" class="label--hidden">{{ 'blogs.comments.message' | t }}</label>
-                <textarea {% if form.errors contains "body" %} class="error"{% endif %} name="comment[body]" id="CommentBody" placeholder="{{ 'blogs.comments.message' | t }}">{{ form.body }}</textarea>
-              </div>
+                <div class="grid__item">
+                  <label for="CommentBody" class="label--hidden">{{ 'blogs.comments.message' | t }}</label>
+                  <textarea {% if form.errors contains "body" %} class="error"{% endif %} name="comment[body]" id="CommentBody" placeholder="{{ 'blogs.comments.message' | t }}">{{ form.body }}</textarea>
+                </div>
 
-            </div>
+              </div>
 
-            {% if blog.moderated? %}
-              <p>{{ 'blogs.comments.moderated' | t }}</p>
-            {% endif %}
+              {% if blog.moderated? %}
+                <p>{{ 'blogs.comments.moderated' | t }}</p>
+              {% endif %}
 
-            <input type="submit" class="btn" value="{{ 'blogs.comments.post' | t }}">
+              <input type="submit" class="btn" value="{{ 'blogs.comments.post' | t }}">
 
-            {% comment %}
-              Assign variable to be used after timber.init() is run in theme.liquid
-            {% endcomment %}
-            {% if form.errors %}
-              {% assign newHash = 'AddCommentTitle' %}
-            {% endif %}
+              {% comment %}
+                Assign variable to be used after timber.init() is run in theme.liquid
+              {% endcomment %}
+              {% if form.errors %}
+                {% assign newHash = 'AddCommentTitle' %}
+              {% endif %}
 
-            {% if form.posted_successfully? %}
-              {% assign newHash = 'Comments' %}
-            {% endif %}
+              {% if form.posted_successfully? %}
+                {% assign newHash = 'Comments' %}
+              {% endif %}
 
-          {% endform %}
+            {% endform %}
+          </div>
 
         </div>
       {% endpaginate %}
diff --git a/templates/blog.liquid b/templates/blog.liquid
index d688f28e7..62890354f 100755
--- a/templates/blog.liquid
+++ b/templates/blog.liquid
@@ -52,10 +52,7 @@
       {% comment %}
         Show off meta information like number of comments and tags.
       {% endcomment %}
-      <ul>
-        {% comment %}
-          comments_enabled? and moderated? are the only instances of punctuation in liquid tags.
-        {% endcomment %}
+      <ul class="inline-list">
         {% if blog.comments_enabled? %}
         <li>
           <a href="{{ article.url }}#Comments">
diff --git a/templates/customers/activate_account.liquid b/templates/customers/activate_account.liquid
index f499d72d0..1e3c6bb94 100755
--- a/templates/customers/activate_account.liquid
+++ b/templates/customers/activate_account.liquid
@@ -10,23 +10,25 @@
     {% comment %}
       This form must use 'activate_customer_password'
     {% endcomment %}
-    {% form 'activate_customer_password' %}
+    <div class="form-vertical">
+      {% form 'activate_customer_password' %}
 
-      {{ form.errors | default_errors }}
+        {{ form.errors | default_errors }}
 
-      <label for="CustomerPassword" class="label--hidden">{{ 'customer.activate_account.password' | t }}</label>
-      <input type="password" value="" name="customer[password]" id="CustomerPassword" placeholder="{{ 'customer.activate_account.password' | t }}">
+        <label for="CustomerPassword" class="label--hidden">{{ 'customer.activate_account.password' | t }}</label>
+        <input type="password" value="" name="customer[password]" id="CustomerPassword" class="input-full" placeholder="{{ 'customer.activate_account.password' | t }}">
 
-      <label for="CustomerPasswordConfirmation" class="label--hidden">{{ 'customer.activate_account.password_confirm' | t }}</label>
-      <input type="password" value="" name="customer[password_confirmation]" id="CustomerPasswordConfirmation" placeholder="{{ 'customer.activate_account.password_confirm' | t }}">
+        <label for="CustomerPasswordConfirmation" class="label--hidden">{{ 'customer.activate_account.password_confirm' | t }}</label>
+        <input type="password" value="" name="customer[password_confirmation]" id="CustomerPasswordConfirmation" class="input-full" placeholder="{{ 'customer.activate_account.password_confirm' | t }}">
 
-      <div class="text-center">
-        <p>
-          <input type="submit" class="btn" value="{{ 'customer.activate_account.submit' | t }}">
-        </p>
-        <input type="submit" class="btn--secondary" name="decline" value="{{ 'customer.activate_account.cancel' | t }}">
-      </div>
-    {% endform %}
+        <div class="text-center">
+          <p>
+            <input type="submit" class="btn btn--full" value="{{ 'customer.activate_account.submit' | t }}">
+          </p>
+          <input type="submit" class="btn--secondary" name="decline" value="{{ 'customer.activate_account.cancel' | t }}">
+        </div>
+      {% endform %}
+    </div>
 
   </div>
 </div>
diff --git a/templates/customers/addresses.liquid b/templates/customers/addresses.liquid
index 03314650f..a47f528c6 100755
--- a/templates/customers/addresses.liquid
+++ b/templates/customers/addresses.liquid
@@ -29,7 +29,7 @@
     {% comment %}
       Add address form, hidden by default
     {% endcomment %}
-    <div id="AddAddress" style="display: none;">
+    <div id="AddAddress" class="form-vertical" style="display: none;">
       {% form 'customer_address', customer.new_address %}
 
         <h2>{{ 'customer.addresses.add_new' | t }}</h2>
@@ -38,49 +38,49 @@
 
           <div class="grid__item one-half small--one-whole">
             <label for="AddressFirstNameNew">{{ 'customer.addresses.first_name' | t }}</label>
-            <input type="text" id="AddressFirstNameNew" class="address_form" name="address[first_name]" value="{{form.first_name}}" autocapitalize="words">
+            <input type="text" id="AddressFirstNameNew" class="input-full" name="address[first_name]" value="{{form.first_name}}" autocapitalize="words">
           </div>
 
           <div class="grid__item one-half small--one-whole">
             <label for="AddressLastNameNew">{{ 'customer.addresses.last_name' | t }}</label>
-            <input type="text" id="AddressLastNameNew" class="address_form" name="address[last_name]" value="{{form.last_name}}" autocapitalize="words">
+            <input type="text" id="AddressLastNameNew" class="input-full" name="address[last_name]" value="{{form.last_name}}" autocapitalize="words">
           </div>
 
         </div>
 
         <label for="AddressCompanyNew">{{ 'customer.addresses.company' | t }}</label>
-        <input type="text" id="AddressCompanyNew" class="address_form" name="address[company]" value="{{form.company}}" autocapitalize="words">
+        <input type="text" id="AddressCompanyNew" class="input-full" name="address[company]" value="{{form.company}}" autocapitalize="words">
 
         <label for="AddressAddress1New">{{ 'customer.addresses.address1' | t }}</label>
-        <input type="text" id="AddressAddress1New" class="address_form" name="address[address1]" value="{{form.address1}}" autocapitalize="words">
+        <input type="text" id="AddressAddress1New" class="input-full" name="address[address1]" value="{{form.address1}}" autocapitalize="words">
 
         <label for="AddressAddress2New">{{ 'customer.addresses.address2' | t }}</label>
-        <input type="text" id="AddressAddress2New" class="address_form" name="address[address2]" value="{{form.address2}}" autocapitalize="words">
+        <input type="text" id="AddressAddress2New" class="input-full" name="address[address2]" value="{{form.address2}}" autocapitalize="words">
 
         <div class="grid">
           <div class="grid__item large--one-half">
             <label for="AddressCityNew">{{ 'customer.addresses.city' | t }}</label>
-            <input type="text" id="AddressCityNew" class="address_form" name="address[city]" value="{{form.city}}" autocapitalize="words">
+            <input type="text" id="AddressCityNew" class="input-full" name="address[city]" value="{{form.city}}" autocapitalize="words">
           </div>
 
           <div class="grid__item large--one-half">
             <label for="AddressCountryNew">{{ 'customer.addresses.country' | t }}</label>
-            <select id="AddressCountryNew" name="address[country]" data-default="{{form.country}}">{{ country_option_tags }}</select>
+            <select id="AddressCountryNew" class="input-full" name="address[country]" data-default="{{form.country}}">{{ country_option_tags }}</select>
           </div>
 
           <div class="grid__item" id="AddressProvinceContainerNew" style="display:none">
             <label for="AddressProvinceNew">{{ 'customer.addresses.province' | t }}</label>
-            <select id="AddressProvinceNew" class="address_form" name="address[province]" data-default="{{form.province}}"></select>
+            <select id="AddressProvinceNew" class="input-full" name="address[province]" data-default="{{form.province}}"></select>
           </div>
 
           <div class="grid__item large--one-half">
             <label for="AddressZipNew">{{ 'customer.addresses.zip' | t }}</label>
-            <input type="text" id="AddressZipNew" class="address_form" name="address[zip]" value="{{form.zip}}" autocapitalize="characters">
+            <input type="text" id="AddressZipNew" class="input-full" name="address[zip]" value="{{form.zip}}" autocapitalize="characters">
           </div>
 
           <div class="grid__item large--one-half">
             <label for="AddressPhoneNew">{{ 'customer.addresses.phone' | t }}</label>
-            <input type="tel" id="AddressPhoneNew" class="address_form" name="address[phone]" value="{{form.phone}}">
+            <input type="tel" id="AddressPhoneNew" class="input-full" name="address[phone]" value="{{form.phone}}">
           </div>
         </div>
 
@@ -126,7 +126,7 @@
           {{ 'customer.addresses.delete' | t | delete_customer_address_link: address.id }}
         </p>
 
-        <div id="EditAddress_{{address.id}}" style="display:none;">
+        <div id="EditAddress_{{address.id}}" class="form-vertical" style="display:none;">
           {% form 'customer_address', address %}
 
             <h4>{{ 'customer.addresses.edit_address' | t }}</h4>
@@ -134,44 +134,44 @@
             <div class="grid">
               <div class="grid__item one-half small--one-whole">
                 <label for="AddressFirstName_{{form.id}}">{{ 'customer.addresses.first_name' | t }}</label>
-                <input type="text" id="AddressFirstName_{{form.id}}" class="address_form" name="address[first_name]" value="{{form.first_name}}" autocapitalize="words">
+                <input type="text" id="AddressFirstName_{{form.id}}" class="input-full" name="address[first_name]" value="{{form.first_name}}" autocapitalize="words">
               </div>
 
               <div class="grid__item one-half small--one-whole">
                 <label for="AddressLastName_{{form.id}}">{{ 'customer.addresses.last_name' | t }}</label>
-                <input type="text" id="AddressLastName_{{form.id}}" class="address_form" name="address[last_name]" value="{{form.last_name}}" autocapitalize="words">
+                <input type="text" id="AddressLastName_{{form.id}}" class="input-full" name="address[last_name]" value="{{form.last_name}}" autocapitalize="words">
               </div>
             </div>
 
             <label for="AddressCompany_{{form.id}}">{{ 'customer.addresses.company' | t }}</label>
-            <input type="text" id="AddressCompany_{{form.id}}" class="address_form" name="address[company]" value="{{form.company}}" autocapitalize="words">
+            <input type="text" id="AddressCompany_{{form.id}}" class="input-full" name="address[company]" value="{{form.company}}" autocapitalize="words">
 
             <label for="AddressAddress1_{{form.id}}">{{ 'customer.addresses.address1' | t }}</label>
-            <input type="text" id="AddressAddress1_{{form.id}}" class="address_form" name="address[address1]" value="{{form.address1}}" autocapitalize="words">
+            <input type="text" id="AddressAddress1_{{form.id}}" class="input-full" name="address[address1]" value="{{form.address1}}" autocapitalize="words">
 
             <label for="AddressAddress2_{{form.id}}">{{ 'customer.addresses.address2' | t }}</label>
-            <input type="text" id="AddressAddress2_{{form.id}}" class="address_form" name="address[address2]" value="{{form.address2}}" autocapitalize="words">
+            <input type="text" id="AddressAddress2_{{form.id}}" class="input-full" name="address[address2]" value="{{form.address2}}" autocapitalize="words">
 
             <label for="AddressCity_{{form.id}}">{{ 'customer.addresses.city' | t }}</label>
-            <input type="text" id="AddressCity_{{form.id}}" class="address_form" name="address[city]" value="{{form.city}}" autocapitalize="words">
+            <input type="text" id="AddressCity_{{form.id}}" class="input-full" name="address[city]" value="{{form.city}}" autocapitalize="words">
 
             <label for="AddressCountry_{{form.id}}">{{ 'customer.addresses.country' | t }}</label>
-            <select id="AddressCountry_{{form.id}}" name="address[country]" data-default="{{form.country}}">{{ country_option_tags }}</select>
+            <select id="AddressCountry_{{form.id}}" class="input-full" name="address[country]" data-default="{{form.country}}">{{ country_option_tags }}</select>
 
             <div id="AddressProvinceContainer_{{form.id}}" style="display:none">
               <label for="AddressProvince_{{form.id}}">{{ 'customer.addresses.province' | t }}</label>
-              <select id="AddressProvince_{{form.id}}" class="address_form" name="address[province]" data-default="{{form.province}}"></select>
+              <select id="AddressProvince_{{form.id}}" class="input-full" name="address[province]" data-default="{{form.province}}"></select>
             </div>
 
             <div class="grid">
               <div class="grid__item one-half small--one-whole">
                 <label for="AddressZip_{{form.id}}">{{ 'customer.addresses.zip' | t }}</label>
-                <input type="text" id="AddressZip_{{form.id}}" class="address_form" name="address[zip]" value="{{form.zip}}" autocapitalize="characters">
+                <input type="text" id="AddressZip_{{form.id}}" class="input-full" name="address[zip]" value="{{form.zip}}" autocapitalize="characters">
               </div>
 
               <div class="grid__item one-half small--one-whole">
                 <label for="AddressPhone_{{form.id}}">{{ 'customer.addresses.phone' | t }}</label>
-                <input type="tel" id="AddressPhone_{{form.id}}" class="address_form" name="address[phone]" value="{{form.phone}}">
+                <input type="tel" id="AddressPhone_{{form.id}}" class="input-full" name="address[phone]" value="{{form.phone}}">
               </div>
             </div>
 
diff --git a/templates/customers/login.liquid b/templates/customers/login.liquid
index 100face11..99cf303f2 100755
--- a/templates/customers/login.liquid
+++ b/templates/customers/login.liquid
@@ -14,7 +14,7 @@
       {{ 'customer.recover_password.success' | t }}
     </div>
 
-    <div id="CustomerLoginForm">
+    <div id="CustomerLoginForm" class="form-vertical">
       {% form 'customer_login' %}
 
         <h1>{{ 'customer.login.title' | t }}</h1>
@@ -22,12 +22,12 @@
         {{ form.errors | default_errors }}
 
         <label for="CustomerEmail" class="label--hidden">{{ 'customer.login.email' | t }}</label>
-        <input type="email" name="customer[email]" id="CustomerEmail" placeholder="{{ 'customer.login.email' | t }}"{% if form.errors contains "email" %} class="error"{% endif %} autocorrect="off" autocapitalize="off" autofocus>
+        <input type="email" name="customer[email]" id="CustomerEmail" class="input-full{% if form.errors contains 'email' %} error{% endif %}" placeholder="{{ 'customer.login.email' | t }}" autocorrect="off" autocapitalize="off" autofocus>
 
         {% if form.password_needed %}
 
           <label for="CustomerPassword" class="label--hidden">{{ 'customer.login.password' | t }}</label>
-          <input type="password" value="" name="customer[password]" id="CustomerPassword" placeholder="{{ 'customer.login.password' | t }}" {% if form.errors contains "password" %} class="error"{% endif %}>
+          <input type="password" value="" name="customer[password]" id="CustomerPassword" class="input-full{% if form.errors contains 'password' %} error{% endif %}" placeholder="{{ 'customer.login.password' | t }}">
 
           <p>
             <a href="#recover" id="RecoverPassword">{{ 'customer.login.forgot_password' | t }}</a>
@@ -36,7 +36,7 @@
         {% endif %}
 
         <p>
-          <input type="submit" class="btn" value="{{ 'customer.login.sign_in' | t }}">
+          <input type="submit" class="btn btn--full" value="{{ 'customer.login.sign_in' | t }}">
         </p>
         <a href="{{ shop.url }}">{{ 'customer.login.cancel' | t }}</a>
 
diff --git a/templates/customers/register.liquid b/templates/customers/register.liquid
index 761dea72b..deb800018 100755
--- a/templates/customers/register.liquid
+++ b/templates/customers/register.liquid
@@ -7,28 +7,30 @@
 
     <h1>{{ 'customer.register.title' | t }}</h1>
 
-    {% form 'create_customer' %}
+    <div class="form-vertical">
+      {% form 'create_customer' %}
 
-      {{ form.errors | default_errors }}
+        {{ form.errors | default_errors }}
 
-      <label for="FirstName" class="label--hidden">{{ 'customer.register.first_name' | t }}</label>
-      <input type="text" name="customer[first_name]" id="FirstName" placeholder="{{ 'customer.register.first_name' | t }}" {% if form.first_name %}value="{{ form.first_name }}"{% endif %} autocapitalize="words" autofocus>
+        <label for="FirstName" class="label--hidden">{{ 'customer.register.first_name' | t }}</label>
+        <input type="text" name="customer[first_name]" id="FirstName" class="input-full" placeholder="{{ 'customer.register.first_name' | t }}" {% if form.first_name %}value="{{ form.first_name }}"{% endif %} autocapitalize="words" autofocus>
 
-      <label for="LastName" class="label--hidden">{{ 'customer.register.last_name' | t }}</label>
-      <input type="text" name="customer[last_name]" id="LastName" placeholder="{{ 'customer.register.last_name' | t }}" {% if form.last_name %}value="{{ form.last_name }}"{% endif %} autocapitalize="words">
+        <label for="LastName" class="label--hidden">{{ 'customer.register.last_name' | t }}</label>
+        <input type="text" name="customer[last_name]" id="LastName" class="input-full" placeholder="{{ 'customer.register.last_name' | t }}" {% if form.last_name %}value="{{ form.last_name }}"{% endif %} autocapitalize="words">
 
-      <label for="Email" class="label--hidden">{{ 'customer.register.email' | t }}</label>
-      <input type="email" name="customer[email]" id="Email" placeholder="{{ 'customer.register.email' | t }}" {% if form.errors contains "email" %} class="error"{% elsif form.email %} value="{{ form.email }}"{% endif %} autocorrect="off" autocapitalize="off">
+        <label for="Email" class="label--hidden">{{ 'customer.register.email' | t }}</label>
+        <input type="email" name="customer[email]" id="Email" class="input-full{% if form.errors contains 'email' %} error{% endif %}" placeholder="{{ 'customer.register.email' | t }}" {% if form.email %} value="{{ form.email }}"{% endif %} autocorrect="off" autocapitalize="off">
 
-      <label for="CreatePassword" class="label--hidden">{{ 'customer.register.password' | t }}</label>
-      <input type="password" name="customer[password]" id="CreatePassword" placeholder="{{ 'customer.register.password' | t }}" {% if form.errors contains "password" %} class="error"{% endif %}>
+        <label for="CreatePassword" class="label--hidden">{{ 'customer.register.password' | t }}</label>
+        <input type="password" name="customer[password]" id="CreatePassword" class="input-full{% if form.errors contains 'password' %} error{% endif %}" placeholder="{{ 'customer.register.password' | t }}">
 
-      <p>
-        <input type="submit" value="{{ 'customer.register.submit' | t }}" class="btn">
-      </p>
-      <a href="{{ shop.url }}">{{ 'customer.register.cancel' | t }}</a>
+        <p>
+          <input type="submit" value="{{ 'customer.register.submit' | t }}" class="btn btn--full">
+        </p>
+        <a href="{{ shop.url }}">{{ 'customer.register.cancel' | t }}</a>
 
-    {% endform %}
+      {% endform %}
+    </div>
 
   </div>
 
diff --git a/templates/customers/reset_password.liquid b/templates/customers/reset_password.liquid
index 67e2f2ce2..d7bbb3a22 100755
--- a/templates/customers/reset_password.liquid
+++ b/templates/customers/reset_password.liquid
@@ -4,25 +4,27 @@
 <div class="grid">
   <div class="grid__item large--one-third push--large--one-third">
 
-    {% form 'reset_customer_password' %}
+    <div class="form-vertical">
+      {% form 'reset_customer_password' %}
 
-      <h1>{{ 'customer.reset_password.title' | t }}</h1>
+        <h1>{{ 'customer.reset_password.title' | t }}</h1>
 
-      <p>{{ 'customer.reset_password.subtext' | t: email: email }}</p>
+        <p>{{ 'customer.reset_password.subtext' | t: email: email }}</p>
 
-      {{ form.errors | default_errors }}
+        {{ form.errors | default_errors }}
 
-      <label for="ResetPassword" class="label--hidden">{{ 'customer.reset_password.password' | t }}</label>
-      <input type="password" value="" name="customer[password]" id="ResetPassword" placeholder="{{ 'customer.reset_password.password' | t }}" {% if form.errors contains "password" %} class="error"{% endif %}>
+        <label for="ResetPassword" class="label--hidden">{{ 'customer.reset_password.password' | t }}</label>
+        <input type="password" value="" name="customer[password]" id="ResetPassword" class="input-full{% if form.errors contains 'password' %} error{% endif %}" placeholder="{{ 'customer.reset_password.password' | t }}">
 
-      <label for="PasswordConfirmation" class="label--hidden">{{ 'customer.reset_password.password_confirm' | t }}</label>
-      <input type="password" value="" name="customer[password_confirmation]" id="PasswordConfirmation" placeholder="{{ 'customer.reset_password.password_confirm' | t }}" {% if form.errors contains "password_confirmation" %} class="error"{% endif %}>
+        <label for="PasswordConfirmation" class="label--hidden">{{ 'customer.reset_password.password_confirm' | t }}</label>
+        <input type="password" value="" name="customer[password_confirmation]" id="PasswordConfirmation" class="input-full{% if form.errors contains 'password_confirmation' %} error{% endif %}" placeholder="{{ 'customer.reset_password.password_confirm' | t }}">
 
-      <div class="text-center">
-        <input type="submit" class="btn" value="{{ 'customer.reset_password.submit' | t }}">
-      </div>
+        <div class="text-center">
+          <input type="submit" class="btn btn--full" value="{{ 'customer.reset_password.submit' | t }}">
+        </div>
 
-    {% endform %}
+      {% endform %}
+    </div>
 
   </div>
 </div>
diff --git a/templates/page.contact.liquid b/templates/page.contact.liquid
index beb69e8f1..2e85cd236 100755
--- a/templates/page.contact.liquid
+++ b/templates/page.contact.liquid
@@ -25,7 +25,7 @@
     {% comment %}
       Contact form starts here
     {% endcomment %}
-    <div>
+    <div class="form-vertical">
       {% form 'contact' %}
 
         {% comment %}
@@ -41,17 +41,17 @@
 
         {% assign name_attr = 'contact.form.name' | t | handle %}
         <label for="ContactFormName" class="label--hidden">{{ 'contact.form.name' | t }}</label>
-        <input type="text" id="ContactFormName" name="contact[{{ name_attr }}]" placeholder="{{ 'contact.form.name' | t }}" autocapitalize="words" value="{% if form[name_attr] %}{{ form[name_attr] }}{% elsif customer %}{{ customer.name }}{% endif %}">
+        <input type="text" id="ContactFormName" class="input-full" name="contact[{{ name_attr }}]" placeholder="{{ 'contact.form.name' | t }}" autocapitalize="words" value="{% if form[name_attr] %}{{ form[name_attr] }}{% elsif customer %}{{ customer.name }}{% endif %}">
 
         <label for="ContactFormEmail" class="label--hidden">{{ 'contact.form.email' | t }}</label>
-        <input type="email" id="ContactFormEmail" name="contact[email]" placeholder="{{ 'contact.form.email' | t }}" autocorrect="off" autocapitalize="off" value="{% if form.email %}{{ form.email }}{% elsif customer %}{{ customer.email }}{% endif %}">
+        <input type="email" id="ContactFormEmail" class="input-full" name="contact[email]" placeholder="{{ 'contact.form.email' | t }}" autocorrect="off" autocapitalize="off" value="{% if form.email %}{{ form.email }}{% elsif customer %}{{ customer.email }}{% endif %}">
 
         {% assign name_attr = 'contact.form.phone' | t | handle %}
         <label for="ContactFormPhone" class="label--hidden">{{ 'contact.form.phone' | t }}</label>
-        <input type="tel" id="ContactFormPhone" name="contact[{{ name_attr }}]" placeholder="{{ 'contact.form.phone' | t }}" pattern="[0-9\-]*" value="{% if form[name_attr] %}{{ form[name_attr] }}{% elsif customer %}{{ customer.phone }}{% endif %}">
+        <input type="tel" id="ContactFormPhone" class="input-full" name="contact[{{ name_attr }}]" placeholder="{{ 'contact.form.phone' | t }}" pattern="[0-9\-]*" value="{% if form[name_attr] %}{{ form[name_attr] }}{% elsif customer %}{{ customer.phone }}{% endif %}">
 
         <label for="ContactFormMessage" class="label--hidden">{{ 'contact.form.message' | t }}</label>
-        <textarea rows="10" id="ContactFormMessage" name="contact[body]" placeholder="{{ 'contact.form.message' | t }}">{% if form.body %}{{ form.body }}{% endif %}</textarea>
+        <textarea rows="10" id="ContactFormMessage" class="input-full" name="contact[body]" placeholder="{{ 'contact.form.message' | t }}">{% if form.body %}{{ form.body }}{% endif %}</textarea>
 
         <input type="submit" class="btn right" value="{{ 'contact.form.send' | t }}">
 
diff --git a/templates/product.liquid b/templates/product.liquid
index 9caca5838..045bf2fa0 100755
--- a/templates/product.liquid
+++ b/templates/product.liquid
@@ -59,7 +59,7 @@
         {% comment %}
           ID addToCartForm is a selector for the ajaxify cart plugin
         {% endcomment %}
-        <form action="/cart/add" method="post" enctype="multipart/form-data" id="AddToCartForm">
+        <form action="/cart/add" method="post" enctype="multipart/form-data" id="AddToCartForm" class="form-vertical">
 
           {% comment %}
             Add product variants as a dropdown.