diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss
index de7576da..8e07df9c 100644
--- a/scss/elements/_inputs.scss
+++ b/scss/elements/_inputs.scss
@@ -45,7 +45,13 @@
   fieldset {
     input[type='radio'] {
       + label::before {
-        box-shadow: 0 0 0 1px #ffffff, 0 0 0 3px $color-red;
+        box-shadow: 0 0 0 1px $color-white, 0 0 0 3px $color-red;
+      }
+    }
+
+    input[type='checkbox'] {
+      + label::before {
+        box-shadow: 0 0 0 2px $color-red;
       }
     }
   }
@@ -103,6 +109,10 @@
       margin: 0;
     }
 
+    .usa-input__message {
+      display: block;
+    }
+
     &.usa-input__choices--inline {
       label {
         display: inline-block;
diff --git a/templates/styleguide.html.to b/templates/styleguide.html.to
index 5b8623d9..a68818c1 100644
--- a/templates/styleguide.html.to
+++ b/templates/styleguide.html.to
@@ -212,7 +212,7 @@
           </div>
 
           <div class='form-col'>
-            <div class='usa-input'>
+            <div class='usa-input usa-input--error'>
               <fieldset class='usa-input__choices usa-input__choices--inline'>
                 <legend>Inline Checkboxes</legend>
                 <input type='checkbox' id='checkbox-4' checked/>
@@ -223,6 +223,8 @@
 
                 <input type='checkbox' id='checkbox-6' disabled />
                 <label for='checkbox-6'>Checkbox Six</label>
+
+                <span class='usa-input__message'>This is an error</span>
               </fieldset>
             </div>
           </div>