diff --git a/dist/ionic.css b/dist/ionic.css
index 129875b00f..1e24dc14ef 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -705,6 +705,13 @@ textarea {
   -moz-border-radius: 4px;
   border-radius: 4px; }
 
+.input-wrapper.row {
+  margin-left: 0;
+  margin-right: 0; }
+  .input-wrapper.row [class*='col-'] {
+    padding-left: 0;
+    padding-right: 0; }
+
 select,
 textarea,
 input[type="text"],
diff --git a/example/input-text.html b/example/input-text.html
index 7584816f98..c3c47c0789 100644
--- a/example/input-text.html
+++ b/example/input-text.html
@@ -84,25 +84,25 @@
 
         <h3>Inline Label On Top Of Text Input, Not Inset, No Content Padding</h3>
         <div class="form-group">
-          <label class="input-wrapper row-fluid">
-            <span class="input-label span4">Username</span>
-            <input class="span8" type="text" placeholder="@drifty">
+          <label class="input-wrapper row">
+            <span class="input-label col-xs-4">Username</span>
+            <input class="col-xs-8" type="text" placeholder="@drifty">
           </label>
-          <label class="input-wrapper row-fluid">
-            <span class="input-label span4">Email</span>
-            <input class="span8" type="email" placeholder="your@email.com">
+          <label class="input-wrapper row">
+            <span class="input-label col-xs-4">Email</span>
+            <input class="col-xs-8" type="email" placeholder="your@email.com">
           </label>
-          <label class="input-wrapper row-fluid">
-            <span class="input-label span4">First Name</span>
-            <input class="span8" type="text" placeholder="Sir Derp">
+          <label class="input-wrapper row">
+            <span class="input-label col-xs-4">First Name</span>
+            <input class="col-xs-8" type="text" placeholder="Sir Derp">
           </label>
         </div>
 
         <h3>Inline Label On Top Of Text Input, Is Inset, No Content Padding</h3>
         <div class="form-group inset">
-          <label class="input-wrapper row-fluid">
-            <span class="input-label span3">Email</span>
-            <input class="span9" type="text" placeholder="your@email.com">
+          <label class="input-wrapper row">
+            <span class="input-label col-xs-4">Email</span>
+            <input class="col-xs-8" type="text" placeholder="your@email.com">
           </label>
         </div>
 
@@ -110,27 +110,27 @@
 
           <h3>Inline Label On Top Of Text Input, Not Inset, With Content Padding</h3>
           <div class="form-group">
-            <label class="input-wrapper row-fluid">
-              <span class="input-label span3">First Name</span>
-              <input class="span9" type="text" placeholder="John">
+            <label class="input-wrapper row">
+              <span class="input-label col-xs-4">First Name</span>
+              <input class="col-xs-8" type="text" placeholder="John">
             </label>
-            <label class="input-wrapper row-fluid">
-              <span class="input-label span3">Last Name</span>
-              <input class="span9" type="text" placeholder="Suhr">
+            <label class="input-wrapper row">
+              <span class="input-label col-xs-4">Last Name</span>
+              <input class="col-xs-8" type="text" placeholder="Suhr">
             </label>
           </div>
 
           <h3>Inline Label On Top Of Text Input, Is Inset, With Content Padding</h3>
           <div class="form-group inset">
-            <label class="input-wrapper row-fluid">
-              <span class="input-label span3">Email</span>
-              <input class="span9" type="text" placeholder="your@email.com">
+            <label class="input-wrapper row">
+              <span class="input-label col-xs-4">Email</span>
+              <input class="col-xs-8" type="text" placeholder="your@email.com">
             </label>
           </div>
           <div class="form-group inset">
-            <label class="input-wrapper row-fluid">
-              <span class="input-label span3">Filter By Name</span>
-              <input class="span9" type="text" placeholder="Enter keywords">
+            <label class="input-wrapper row">
+              <span class="input-label col-xs-4">Filter By Name</span>
+              <input class="col-xs-8" type="text" placeholder="Enter keywords">
             </label>
           </div>
 
diff --git a/example/login/index.html b/example/login/index.html
index 6828761cbf..9c4d6d8efc 100644
--- a/example/login/index.html
+++ b/example/login/index.html
@@ -36,16 +36,16 @@
       <main class="content content-padded has-header">
         <form class="form-horizontal">
           <label class="input-wrapper row-fluid">
-            <span class="input-label span3">Full name</span>
-            <input class="span9" type="text" placeholder="">
+            <span class="input-label col-xs-4">Full name</span>
+            <input class="col-xs-8" type="text" placeholder="">
           </label>
           <label class="input-wrapper row-fluid">
-            <span class="input-label span3">Email</span>
-            <input class="span9" type="email" placeholder="">
+            <span class="input-label col-xs-4">Email</span>
+            <input class="col-xs-8" type="email" placeholder="">
           </label>
           <label class="input-wrapper row-fluid">
-            <span class="input-label span3">Password</span>
-            <input class="span9" type="password" placeholder="">
+            <span class="input-label col-xs-4">Password</span>
+            <input class="col-xs-8" type="password" placeholder="">
           </label>
           <button class="button button-info button-block">Sign up</button>
         </form>
diff --git a/scss/ionic-theme.scss b/scss/ionic-theme.scss
index b052d375c5..22636ec22b 100755
--- a/scss/ionic-theme.scss
+++ b/scss/ionic-theme.scss
@@ -14,7 +14,6 @@
   "ionic/theme/button",
   "ionic/theme/card",
   "ionic/theme/icon",
-  "ionic/theme/form",
   "ionic/theme/listview",
   "ionic/theme/menu",
   "ionic/theme/pull-to-refresh",
diff --git a/scss/ionic/structure/_form.scss b/scss/ionic/structure/_form.scss
index f08748d8af..505a3ae54e 100644
--- a/scss/ionic/structure/_form.scss
+++ b/scss/ionic/structure/_form.scss
@@ -1,4 +1,4 @@
-//
+
 // Forms
 // -------------------------------
 
@@ -99,6 +99,15 @@ textarea {
   overflow: hidden;
   @include border-radius($input-border-radius);
 }
+.input-wrapper.row {
+  margin-left: 0;
+  margin-right: 0;
+
+  [class*='col-'] {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
 
 
 // Form Controls
diff --git a/scss/ionic/theme/_form.scss b/scss/ionic/theme/_form.scss
deleted file mode 100644
index e69de29bb2..0000000000