diff --git a/HISTORY.md b/HISTORY.md
index 5e18369..3da55b1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -38,6 +38,10 @@ NEXT
 
 * `<textarea>`s now have the same styling as `<input>`s. (Issue #49) (rcbdev)
 
+* `.pure-form input` rules are now more specific, targetting only "texty" inputs.
+  This prevents input styles from affecting "buttony" inputs. (Issue #54)
+
+
 ### Grids
 
 * Adding a classname before the responsive grid's unit classname now works.
diff --git a/src/buttons/tests/manual/button.html b/src/buttons/tests/manual/button.html
index 45e64d3..323820e 100644
--- a/src/buttons/tests/manual/button.html
+++ b/src/buttons/tests/manual/button.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>Button Manual Tests</title>
-    <link rel="stylesheet" type="text/css" href="../../../../build/buttons-min.css">
+    <link rel="stylesheet" type="text/css" href="../../../../build/pure-min.css">
     <link href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome-ie7.css" rel="stylesheet">
 
@@ -115,5 +115,17 @@
         cillum dolore eu fugiat <a href="#">nulla pariatur</a>. Excepteur sint occaecat cupidatat non
         proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     </p>
+
+    <div class= "pure-g-r">
+      <div class= "pure-u-1">
+        <form class="pure-form">
+          <a class="pure-button pure-button-primary">Anchor</a>
+          <button class="pure-button pure-button-primary">Button</button>
+          <input type="submit" class="pure-button pure-button-primary" value="Submit" />
+          <input type="button" class="pure-button pure-button-primary" value="Input Button" />
+          <input type="reset" class="pure-button pure-button-primary" value="Reset" />
+        </form>
+      </div>
+    </div>
 </body>
 </html>
diff --git a/src/forms/css/forms-r.css b/src/forms/css/forms-r.css
index 2e5cbe2..c76a50c 100644
--- a/src/forms/css/forms-r.css
+++ b/src/forms/css/forms-r.css
@@ -1,34 +1,61 @@
 @media only screen and (max-width : 480px) {
-	.pure-form button[type='submit'] {
-		margin: 0.7em 0 0;
-	}
+    .pure-form button[type="submit"] {
+        margin: 0.7em 0 0;
+    }
 
-	.pure-form input[type='text'], .pure-form button, .pure-form label {
-		margin-bottom: 0.3em;
-		display: block;
-	}
+    .pure-form input[type="text"],
+    .pure-form input[type="password"],
+    .pure-form input[type="email"],
+    .pure-form input[type="url"],
+    .pure-form input[type="date"],
+    .pure-form input[type="month"],
+    .pure-form input[type="time"],
+    .pure-form input[type="datetime"],
+    .pure-form input[type="datetime-local"],
+    .pure-form input[type="week"],
+    .pure-form input[type="number"],
+    .pure-form input[type="search"],
+    .pure-form input[type="tel"],
+    .pure-form input[type="color"],
+    .pure-form label {
+        margin-bottom: 0.3em;
+        display: block;
+    }
 
-	.pure-group input[type='text'] {
-		margin-bottom: 0;
-	}
+    .pure-group input[type="text"],
+    .pure-form input[type="password"],
+    .pure-form input[type="email"],
+    .pure-form input[type="url"],
+    .pure-form input[type="date"],
+    .pure-form input[type="month"],
+    .pure-form input[type="time"],
+    .pure-form input[type="datetime"],
+    .pure-form input[type="datetime-local"],
+    .pure-form input[type="week"],
+    .pure-form input[type="number"],
+    .pure-form input[type="search"],
+    .pure-form input[type="tel"],
+    .pure-form input[type="color"] {
+        margin-bottom: 0;
+    }
 
-	.pure-form-aligned .pure-control-group label {
-		margin-bottom: 0.3em;
-		text-align: left;
-		display: block;
-		width: 100%;
-	}
+    .pure-form-aligned .pure-control-group label {
+        margin-bottom: 0.3em;
+        text-align: left;
+        display: block;
+        width: 100%;
+    }
 
-	.pure-form-aligned .pure-controls {
-		margin: 1.5em 0 0 0;
-	}
+    .pure-form-aligned .pure-controls {
+        margin: 1.5em 0 0 0;
+    }
 
-	/* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
-	.pure-form .pure-help-inline,
-	.pure-form-message-inline,
-	.pure-form-message {
-		display: block;
-		font-size: 80%;
-		padding: 0.2em 0 0.8em; /* increased bottom padding to make it group with its related input element */
-	}
+    /* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
+    .pure-form .pure-help-inline,
+    .pure-form-message-inline,
+    .pure-form-message {
+        display: block;
+        font-size: 80%;
+        padding: 0.2em 0 0.8em; /* increased bottom padding to make it group with its related input element */
+    }
 }
diff --git a/src/forms/css/forms.css b/src/forms/css/forms.css
index 9db2013..0eedb6e 100644
--- a/src/forms/css/forms.css
+++ b/src/forms/css/forms.css
@@ -1,4 +1,17 @@
-.pure-form input,
+.pure-form input[type="text"],
+.pure-form input[type="password"],
+.pure-form input[type="email"],
+.pure-form input[type="url"],
+.pure-form input[type="date"],
+.pure-form input[type="month"],
+.pure-form input[type="time"],
+.pure-form input[type="datetime"],
+.pure-form input[type="datetime-local"],
+.pure-form input[type="week"],
+.pure-form input[type="number"],
+.pure-form input[type="search"],
+.pure-form input[type="tel"],
+.pure-form input[type="color"],
 .pure-form select,
 .pure-form textarea {
   padding: 0.5em 0.6em;
@@ -18,13 +31,27 @@
   -webkit-font-smoothing: antialiased;
 }
 
-.pure-form input:focus,
+.pure-form input[type="text"]:focus,
+.pure-form input[type="password"]:focus,
+.pure-form input[type="email"]:focus,
+.pure-form input[type="url"]:focus,
+.pure-form input[type="date"]:focus,
+.pure-form input[type="month"]:focus,
+.pure-form input[type="time"]:focus,
+.pure-form input[type="datetime"]:focus,
+.pure-form input[type="datetime-local"]:focus,
+.pure-form input[type="week"]:focus,
+.pure-form input[type="number"]:focus,
+.pure-form input[type="search"]:focus,
+.pure-form input[type="tel"]:focus,
+.pure-form input[type="color"]:focus,
 .pure-form select:focus,
 .pure-form textarea:focus {
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
   border-color: #129FEA;
 }
+
 .pure-form input[type="file"]:focus,
 .pure-form input[type="radio"]:focus,
 .pure-form input[type="checkbox"]:focus {
@@ -36,7 +63,20 @@
   margin: 0.5em 0;
   display: block;
 }
-.pure-form input[disabled],
+.pure-form input[type="text"][disabled],
+.pure-form input[type="password"][disabled],
+.pure-form input[type="email"][disabled],
+.pure-form input[type="url"][disabled],
+.pure-form input[type="date"][disabled],
+.pure-form input[type="month"][disabled],
+.pure-form input[type="time"][disabled],
+.pure-form input[type="datetime"][disabled],
+.pure-form input[type="datetime-local"][disabled],
+.pure-form input[type="week"][disabled],
+.pure-form input[type="number"][disabled],
+.pure-form input[type="search"][disabled],
+.pure-form input[type="tel"][disabled],
+.pure-form input[type="color"][disabled],
 .pure-form select[disabled],
 .pure-form textarea[disabled],
 .pure-form input[readonly],
@@ -90,7 +130,20 @@
   border-bottom: 1px solid #e5e5e5;
 }
 
-.pure-form-stacked input[type='text'],
+.pure-form-stacked input[type="text"],
+.pure-form-stacked input[type="password"],
+.pure-form-stacked input[type="email"],
+.pure-form-stacked input[type="url"],
+.pure-form-stacked input[type="date"],
+.pure-form-stacked input[type="month"],
+.pure-form-stacked input[type="time"],
+.pure-form-stacked input[type="datetime"],
+.pure-form-stacked input[type="datetime-local"],
+.pure-form-stacked input[type="week"],
+.pure-form-stacked input[type="number"],
+.pure-form-stacked input[type="search"],
+.pure-form-stacked input[type="tel"],
+.pure-form-stacked input[type="color"],
 .pure-form-stacked select,
 .pure-form-stacked label {
   display: block;
@@ -99,7 +152,8 @@
 .pure-form-aligned input,
 .pure-form-aligned textarea,
 .pure-form-aligned select,
-.pure-form-aligned .pure-help-inline, /* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
+/* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
+.pure-form-aligned .pure-help-inline,
 .pure-form-message-inline {
   display: inline-block;
   *display: inline; /* IE7 inline-block hack */
diff --git a/src/forms/tests/manual/forms.html b/src/forms/tests/manual/forms.html
index 82aed1b..247a348 100644
--- a/src/forms/tests/manual/forms.html
+++ b/src/forms/tests/manual/forms.html
@@ -4,6 +4,7 @@
     <meta charset='utf-8'>
     <meta name="viewport" content="width = device-width">
     <title>Forms CSS Manual Test</title>
+    <link rel="stylesheet" type="text/css" href="../../../../build/base-min.css">
     <link rel="stylesheet" type="text/css" href="../../../../build/grids-min.css">
     <link rel="stylesheet" type="text/css" href="../../../../build/forms-min.css">
     <link rel="stylesheet" type="text/css" href="../../../../build/buttons-min.css">
@@ -50,8 +51,8 @@
         <input type="text">
        </div>
        <div class='pure-u-1-3'>
-        <label>Last Name</label>
-        <input type="text">
+        <label>Password</label>
+        <input type="password">
        </div>
        <div class='pure-u-1-3'>
         <label>E-Mail</label>
@@ -78,6 +79,7 @@
        <input type="checkbox"> I've read the terms and conditions
       </label>
       <button type="submit" class='pure-button'>Submit</button>
+      <button type="reset" class='pure-button'>Reset</button>
       </fieldset>
      </form>
 
@@ -92,13 +94,15 @@
      <legend>Legend</legend>
      <label>First Name</label>
      <input type="text">
-     <label>Last Name</label>
-     <input type="text">
+     <label>Password</label>
+     <input type="password">
      <label>E-Mail</label>
      <input type="email" required>
      <aside class='pure-help-inline'>This is a required field.</aside>
      <label>City</label>
      <input type="text">
+     <aside class='pure-form-message'>This is another required field.</aside>
+
      <label>State</label>
      <select class='pure-input-medium'>
       <option>AL</option>
@@ -111,6 +115,8 @@
       <input type="checkbox"> I've read the terms and conditions
      </label>
      <button type="submit" class='pure-button notice'>Submit</button>
+     <button type="reset" class='pure-button'>Reset</button>
+
      </fieldset>
     </form>
 
@@ -136,6 +142,10 @@
        <label>Email Address</label>
        <input type="text" placeholder="Email Address">
       </div>
+      <div class="pure-control-group">
+       <label>Here's a button</label>
+       <input type="button" value="Button" class="pure-button">
+      </div>
 
       <div class="pure-control-group">
        <label>Supercalifragilistic Label</label>
@@ -298,5 +308,17 @@
       </fieldset>
      </form>
     </div>
+
+    <div class= "pure-g-r">
+      <div class= "pure-u-1">
+        <form class="pure-form">
+          <a class="pure-button pure-button-primary">Anchor</a>
+          <button class="pure-button pure-button-primary">Button</button>
+          <input type="submit" class="pure-button pure-button-primary" value="Submit" />
+          <input type="button" class="pure-button pure-button-primary" value="Input Button" />
+          <input type="reset" class="pure-button pure-button-primary" value="Reset" />
+        </form>
+      </div>
+    </div>
 </body>
 </html>
