diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index e2fb7da87bf215e97bd86d766e1f1e165f26a869..df0b506ed06c12b5628f40b928772009320b75ff 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sat Aug 20 20:18:13 PDT 2011
+ * Date: Sun Aug 21 00:20:25 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -682,6 +682,8 @@ form input[type=checkbox], form input[type=radio] {
 }
 form input[type=text],
 form input[type=password],
+form input[type=email],
+form input[type=url],
 form textarea,
 form select,
 form .uneditable-input {
@@ -721,6 +723,8 @@ form ::-webkit-input-placeholder {
 }
 form input[type=text],
 form input[type=password],
+form input[type=email],
+form input[type=url],
 form select,
 form textarea {
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -730,7 +734,11 @@ form textarea {
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
 }
-form input[type=text]:focus, form input[type=password]:focus, form textarea:focus {
+form input[type=text]:focus,
+form input[type=password]:focus,
+form input[type=email]:focus,
+form input[type=url]:focus,
+form textarea:focus {
   outline: none;
   border-color: rgba(82, 168, 236, 0.8);
   -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -748,13 +756,21 @@ form div.error {
 form div.error > label, form div.error span.help-inline, form div.error span.help-block {
   color: #9d261d;
 }
-form div.error input[type=text], form div.error input[type=password], form div.error textarea {
+form div.error input[type=text],
+form div.error input[type=password],
+form div.error input[type=email],
+form div.error input[type=url],
+form div.error textarea {
   border-color: #c87872;
   -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
   -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
   box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
 }
-form div.error input[type=text]:focus, form div.error input[type=password]:focus, form div.error textarea:focus {
+form div.error input[type=text]:focus,
+form div.error input[type=password]:focus,
+form div.error input[type=email]:focus,
+form div.error input[type=url]:focus,
+form div.error textarea:focus {
   border-color: #b9554d;
   -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
   -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
@@ -845,7 +861,10 @@ div.actions div.secondary-action a:hover {
 div.inline-inputs {
   color: #808080;
 }
-div.inline-inputs span, div.inline-inputs input[type=text] {
+div.inline-inputs span,
+div.inline-inputs input[type=text],
+div.inline-inputs input[type=email],
+div.inline-inputs input[type=url] {
   display: inline-block;
 }
 div.inline-inputs input.mini {
@@ -857,7 +876,12 @@ div.inline-inputs input.small {
 div.inline-inputs span {
   padding: 0 2px 0 1px;
 }
-div.input-prepend input[type=text], div.input-append input[type=text] {
+div.input-prepend input[type=text],
+div.input-append input[type=text],
+div.input-prepend input[type=email],
+div.input-append input[type=email],
+div.input-prepend input[type=url],
+div.input-append input[type=url] {
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
@@ -885,7 +909,7 @@ div.input-prepend .active, div.input-append .active {
   background: #a9dba9;
   border-color: #46a546;
 }
-div.input-append input[type=text] {
+div.input-append input[type=text], div.input-append input[type=email], div.input-append input[type=url] {
   float: left;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
index 6b0b2183106a8c9df7fe8d599392645b28531a34..46c5bbe7de3b6df59ed93eb61c1fa3af57ae8d51 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -88,16 +88,16 @@ form label,form input,form select,form textarea{font-family:"Helvetica Neue",Hel
 form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
 form div.input{margin-left:150px;}
 form input[type=checkbox],form input[type=radio]{cursor:pointer;}
-form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+form input[type=text],form input[type=password],form input[type=email],form input[type=url],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 form select,form input[type=file]{height:27px;line-height:27px;}
 form textarea{height:auto;}
 form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
 form :-moz-placeholder{color:#bfbfbf;}
 form ::-webkit-input-placeholder{color:#bfbfbf;}
-form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
-form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
+form input[type=text],form input[type=password],form input[type=email],form input[type=url],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
+form input[type=text]:focus,form input[type=password]:focus,form input[type=email]:focus,form input[type=url]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
 form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;}
-form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);}
+form div.error input[type=text],form div.error input[type=password],form div.error input[type=email],form div.error input[type=url],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error input[type=email]:focus,form div.error input[type=url]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);}
 form div.error div.input-prepend span.add-on,form div.error div.input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
 form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;}
 form .input-small,form input.small,form textarea.small,form select.small{width:90px;}
@@ -111,14 +111,14 @@ div.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 2
 .help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;}
 .help-inline{padding-left:5px;}
 .help-block{display:block;max-width:600px;}
-div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text]{display:inline-block;}
+div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text],div.inline-inputs input[type=email],div.inline-inputs input[type=url]{display:inline-block;}
 div.inline-inputs input.mini{width:60px;}
 div.inline-inputs input.small{width:90px;}
 div.inline-inputs span{padding:0 2px 0 1px;}
-div.input-prepend input[type=text],div.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+div.input-prepend input[type=text],div.input-append input[type=text],div.input-prepend input[type=email],div.input-append input[type=email],div.input-prepend input[type=url],div.input-append input[type=url]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
 div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;}
-div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+div.input-append input[type=text],div.input-append input[type=email],div.input-append input[type=url]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 div.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
 ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;}
 ul.inputs-list li label small{font-size:12px;font-weight:normal;}
diff --git a/lib/forms.less b/lib/forms.less
index f958693fc4bcca436d27f58ffe787f4e97b0e331..54f2325ea0d650abc3d976ddeb1baf1615321c28 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -57,6 +57,8 @@ form {
   // Inputs, Textareas, Selects
   input[type=text],
   input[type=password],
+  input[type=email],
+  input[type=url],
   textarea,
   select,
   .uneditable-input {
@@ -97,6 +99,8 @@ form {
   // Focus states
   input[type=text],
   input[type=password],
+  input[type=email],
+  input[type=url],
   select, textarea {
     @transition: border linear .2s, box-shadow linear .2s;
     .transition(@transition);
@@ -104,6 +108,8 @@ form {
   }
   input[type=text]:focus,
   input[type=password]:focus,
+  input[type=email]:focus,
+  input[type=url]:focus,
   textarea:focus {
     outline: none;
     border-color: rgba(82,168,236,.8);
@@ -125,6 +131,8 @@ form {
     }
     input[type=text],
     input[type=password],
+    input[type=email],
+    input[type=url],
     textarea {
       border-color: @error-text;
       .box-shadow(0 0 3px rgba(171,41,32,.25));
@@ -215,7 +223,10 @@ div.actions {
 // Inline Fields (input fields that appear as inline objects
 div.inline-inputs {
   color: @gray;
-  span, input[type=text] {
+  span,
+  input[type=text],
+  input[type=email],
+  input[type=url] {
     display: inline-block;
   }
   input.mini {
@@ -232,7 +243,9 @@ div.inline-inputs {
 // Allow us to put symbols and text within the input field for a cleaner look
 div.input-prepend,
 div.input-append {
-  input[type=text] {
+  input[type=text],
+  input[type=email],
+  input[type=url] {
     .border-radius(0 3px 3px 0);
   }
   .add-on {
@@ -258,7 +271,9 @@ div.input-append {
   }
 }
 div.input-append {
-  input[type=text] {
+  input[type=text],
+  input[type=email],
+  input[type=url] {
     float: left;
     .border-radius(3px 0 0 3px);
   }