diff --git a/ionic/components/app/test/weather/style.css b/ionic/components/app/test/weather/style.css
index 5f8780d572..edfa81374f 100644
--- a/ionic/components/app/test/weather/style.css
+++ b/ionic/components/app/test/weather/style.css
@@ -234,7 +234,7 @@ current-weather .current-temp {
   border: none;
   color: #fff;
 }
-#settings-modal .input-label {
+#settings-modal ion-label {
   color: #fff;
 }
 
diff --git a/ionic/components/form/form.scss b/ionic/components/form/form.scss
index b5e9f4799e..5b1eaeb388 100644
--- a/ionic/components/form/form.scss
+++ b/ionic/components/form/form.scss
@@ -4,7 +4,7 @@
 
 
 form {
-  margin: 0 0 2.4rem;
+  margin: 0;
 }
 
 label,
@@ -15,11 +15,20 @@ textarea {
   font-family: inherit;
 }
 
+textarea {
+  margin: 0;
+  padding: 0;
+  height: auto;
+  overflow: auto;
+  color: inherit;
+  font: inherit;
+}
 
-// Form Controls
-// -------------------------------
+.platform-mobile textarea {
+  resize: none;
+}
 
-.item-input {
+ion-input {
 
   // text inputs
   textarea,
@@ -45,19 +54,6 @@ textarea {
 
 }
 
-textarea {
-  margin: 0;
-  padding: 0;
-  height: auto;
-  overflow: auto;
-  color: inherit;
-  font: inherit;
-}
-
-.platform-mobile textarea {
-  resize: none;
-}
-
 
 // Placeholder
 // -------------------------------
diff --git a/ionic/components/form/label.scss b/ionic/components/form/label.scss
index a616614d23..cd19b766b7 100644
--- a/ionic/components/form/label.scss
+++ b/ionic/components/form/label.scss
@@ -5,7 +5,7 @@
 $input-label-color:         #888 !default;
 
 
-.input-label {
+ion-label {
   display: block;
   max-width: 200px;
   color: $input-label-color;
@@ -13,7 +13,7 @@ $input-label-color:         #888 !default;
   white-space: nowrap;
 }
 
-[fixed-label] .input-label {
+[fixed-label] ion-label {
   display: block;
   max-width: 200px;
   width: 30%;
@@ -23,11 +23,11 @@ $input-label-color:         #888 !default;
   white-space: nowrap;
 }
 
-.item-input[stacked-label] {
+ion-input[stacked-label] {
   flex-direction: column;
   align-items: flex-start;
 
-  .input-label {
+  ion-label {
     align-self: stretch;
     margin-bottom: 0;
     max-width: 100%;
diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss
index 796b5d18eb..77784abc96 100644
--- a/ionic/components/item/item.scss
+++ b/ionic/components/item/item.scss
@@ -55,11 +55,11 @@ ion-item-content {
   text-align: center;
 }
 
-.list .item > icon[small]:first-child {
+ion-list .item > icon[small]:first-child {
   min-width: 18px;
 }
 
-.list .item {
+ion-list .item {
   border-radius: 0;
 
   transition: background 300ms ease-out;
@@ -121,17 +121,17 @@ ion-item-content {
     margin-bottom: 0;
   }
 
+  a {
+    text-decoration: none;
+  }
+
 }
 
 .vertical-align-top,
-.item.item-input {
+ion-input.item {
   align-items: flex-start;
 }
 
-.item a {
-  text-decoration: none;
-}
-
 .item.item.item.no-border-bottom:after,
 .item.item.item.no-border-bottom + .item:before {
   border: none;
diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss
index 4b84dfa59a..4093a919f1 100644
--- a/ionic/components/item/modes/ios.scss
+++ b/ionic/components/item/modes/ios.scss
@@ -23,7 +23,7 @@ $item-ios-note-color:             darken($item-ios-border-color, 10%) !default;
 $item-ios-forward-icon-color:     $item-ios-border-color !default;
 
 
-.list[mode=ios] {
+ion-list[mode=ios] {
 
   .item {
     margin-top: -1px;
@@ -141,7 +141,7 @@ $item-ios-forward-icon-color:     $item-ios-border-color !default;
 }
 
 
-.hairlines .list[mode=ios] .item {
+.hairlines ion-list[mode=ios] .item {
   margin-top: -0.5px;
 
   &:last-child {
diff --git a/ionic/components/item/modes/material.scss b/ionic/components/item/modes/material.scss
index a652673c72..b83b6a551f 100644
--- a/ionic/components/item/modes/material.scss
+++ b/ionic/components/item/modes/material.scss
@@ -26,7 +26,7 @@ $item-md-note-color:             darken($item-md-border-color, 10%) !default;
 $item-md-forward-icon-color:     $item-md-border-color !default;
 
 
-.list[mode=md] {
+ion-list[mode=md] {
 
   .item {
     margin-top: -1px;
diff --git a/ionic/components/list/list.scss b/ionic/components/list/list.scss
index 29f68250db..7f24a28d3e 100644
--- a/ionic/components/list/list.scss
+++ b/ionic/components/list/list.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 
-.list {
+ion-list {
   display: block;
   margin: 0;
   padding: 0;
@@ -17,7 +17,7 @@
   }
 }
 
-.list[inset] {
+ion-list[inset] {
   overflow: hidden;
 
   ion-header {
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index 5fdaa954e1..dcbc053f2f 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -20,7 +20,7 @@ $list-ios-header-letter-spacing:      0.1rem !default;
 $list-ios-header-color:               #333 !default;
 
 
-.list[mode=ios] {
+ion-list[mode=ios] {
   margin: 0 $list-ios-margin-right $list-ios-margin-bottom $list-ios-margin-left;
 
   ion-header {
@@ -34,16 +34,16 @@ $list-ios-header-color:               #333 !default;
 
 }
 
-.list[mode=ios] + .list {
+ion-list[mode=ios] + ion-list {
   margin-top: $list-ios-margin-top + $list-ios-margin-bottom;
 }
 
-.list[mode=ios] + .list ion-header {
+ion-list[mode=ios] + ion-list ion-header {
   margin-top: -$list-ios-margin-top;
   padding-top: 0;
 }
 
-.list[mode=ios][inset] {
+ion-list[mode=ios][inset] {
   margin: $list-inset-ios-margin-top $list-inset-ios-margin-right $list-inset-ios-margin-bottom $list-inset-ios-margin-left;
   border-radius: $list-inset-ios-border-radius;
 
@@ -68,6 +68,6 @@ $list-ios-header-color:               #333 !default;
   }
 }
 
-.list[mode=ios][inset] + .list[inset] {
+ion-list[mode=ios][inset] + ion-list[inset] {
   margin-top: 0;
 }
diff --git a/ionic/components/list/modes/material.scss b/ionic/components/list/modes/material.scss
index c79553f0a9..20bd08e8d2 100644
--- a/ionic/components/list/modes/material.scss
+++ b/ionic/components/list/modes/material.scss
@@ -18,7 +18,7 @@ $list-md-header-font-size:       1.4rem !default;
 $list-md-header-color:           #858585 !default;
 
 
-.list[mode=md] {
+ion-list[mode=md] {
   margin: 0 $list-md-margin-right $list-md-margin-bottom $list-md-margin-left;
 
   ion-header {
@@ -29,16 +29,16 @@ $list-md-header-color:           #858585 !default;
 
 }
 
-.list[mode=md] + .list {
+ion-list[mode=md] + ion-list {
   margin-top: $list-md-margin-top + $list-md-margin-bottom;
 }
 
-.list[mode=md] + .list ion-header {
+ion-list[mode=md] + ion-list ion-header {
   margin-top: -$list-md-margin-top;
   padding-top: 0;
 }
 
-.list[mode=md][inset] {
+ion-list[mode=md][inset] {
   margin: $list-inset-md-margin-top $list-inset-md-margin-right $list-inset-md-margin-bottom $list-inset-md-margin-left;
   border-radius: $list-inset-md-border-radius;
 
@@ -63,6 +63,6 @@ $list-md-header-color:           #858585 !default;
   }
 }
 
-.list[mode=md][inset] + .list[inset] {
+ion-list[mode=md][inset] + ion-list[inset] {
   margin-top: 0;
 }
diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss
index 7f26858584..97676a0e63 100644
--- a/ionic/components/text-input/modes/ios.scss
+++ b/ionic/components/text-input/modes/ios.scss
@@ -11,7 +11,7 @@ ion-card[mode=ios] {
     padding: 0;
   }
 
-  .item-input[inset] .text-input {
+  ion-input[inset] .text-input {
     margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) $item-ios-padding-left;
     padding: ($item-ios-padding-top / 2) ($item-ios-padding-right / 2) ($item-ios-padding-bottom / 2) ($item-ios-padding-left / 2);
   }
diff --git a/ionic/components/text-input/modes/material.scss b/ionic/components/text-input/modes/material.scss
index 88b9fbb759..a7987b884d 100644
--- a/ionic/components/text-input/modes/material.scss
+++ b/ionic/components/text-input/modes/material.scss
@@ -11,7 +11,7 @@ ion-card[mode=md] {
     padding: 0;
   }
 
-  .item-input[inset] .text-input {
+  ion-input[inset] .text-input {
     margin: ($item-md-padding-top / 2) $item-md-padding-right ($item-md-padding-bottom / 2) $item-md-padding-left;
     padding: ($item-md-padding-top / 2) ($item-md-padding-right / 2) ($item-md-padding-bottom / 2) ($item-md-padding-left / 2);
   }
@@ -20,4 +20,12 @@ ion-card[mode=md] {
     margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom ($item-md-padding-left / 2);
   }
 
+  ion-input.has-focus:after {
+    border-top: 2px solid blue;
+  }
+
+  ion-input.has-focus + ion-input:before {
+    border-top-color: blue;
+  }
+
 }
diff --git a/ionic/components/text-input/text-input.scss b/ionic/components/text-input/text-input.scss
index 4ce20f51d1..ce9bc78420 100644
--- a/ionic/components/text-input/text-input.scss
+++ b/ionic/components/text-input/text-input.scss
@@ -45,7 +45,7 @@ ion-input.has-focus .text-input {
   padding-top: 9px;
 }
 
-.item-input[inset] {
+ion-input[inset] {
   background-color: $inset-item-input-bg-color;
 
   .text-input {