diff --git a/ionic/components/action-menu/test/basic/main.html b/ionic/components/action-menu/test/basic/main.html
index 84efa01796..ad6b69032a 100644
--- a/ionic/components/action-menu/test/basic/main.html
+++ b/ionic/components/action-menu/test/basic/main.html
@@ -1,3 +1,3 @@
 <ion-content class="padding">
-  <button primary (click)="openMenu()">Open Action Menu</button>
+  <button (click)="openMenu()">Open Action Menu</button>
 </ion-content>
diff --git a/ionic/components/app/test/animations/main.html b/ionic/components/app/test/animations/main.html
index 32c69cd7f7..03a7fbeb14 100644
--- a/ionic/components/app/test/animations/main.html
+++ b/ionic/components/app/test/animations/main.html
@@ -45,8 +45,8 @@
   </p>
 
   <p>
-    <button primary (click)="play($event)">Play</button>
-    <button primary (click)="pause($event)">Pause</button>
+    <button (click)="play($event)">Play</button>
+    <button (click)="pause($event)">Pause</button>
   </p>
 
 </body>
diff --git a/ionic/components/app/test/barkpark/pages/login.html b/ionic/components/app/test/barkpark/pages/login.html
index 39395ce66a..a761c219f2 100644
--- a/ionic/components/app/test/barkpark/pages/login.html
+++ b/ionic/components/app/test/barkpark/pages/login.html
@@ -1,5 +1,5 @@
 <ion-toolbar *header>
-  
+
   <ion-title>
     Login
   </ion-title>
@@ -14,9 +14,9 @@
     <ion-input>
       <input control="password" type="password" placeholder="Your password">
     </ion-input>
-    <button ion-button stable block type="submit">Log in</button>
+    <button dark block type="submit">Log in</button>
     <div>
-      <button ion-button primary block (click)="doSignup()">Create an account</button>
+      <button block (click)="doSignup()">Create an account</button>
     </div>
   </form>
 </ion-content>
diff --git a/ionic/components/app/test/barkpark/pages/signup.html b/ionic/components/app/test/barkpark/pages/signup.html
index 7a00f296ad..8bf79ce69b 100644
--- a/ionic/components/app/test/barkpark/pages/signup.html
+++ b/ionic/components/app/test/barkpark/pages/signup.html
@@ -9,9 +9,9 @@
     <ion-input>
       <input control="password" type="password" placeholder="Your password">
     </ion-input>
-    <button ion-button stable block type="submit">Create account</button>
+    <button dark block type="submit">Create account</button>
     <div>
-      <button ion-button primary block (click)="doLogin()">Log in</button>
+      <button block (click)="doLogin()">Log in</button>
     </div>
   </form>
 </ion-view>
diff --git a/ionic/components/app/test/barkpark/pages/splash.html b/ionic/components/app/test/barkpark/pages/splash.html
index bdeab6e013..ec6d8d3b7f 100644
--- a/ionic/components/app/test/barkpark/pages/splash.html
+++ b/ionic/components/app/test/barkpark/pages/splash.html
@@ -1,4 +1,4 @@
 <div>
   <h1>BARK PARK</h1>
-  <button (^click)="doLogin()" ion-button primary>Log in</button>
+  <button (^click)="doLogin()">Log in</button>
 </div>
diff --git a/ionic/components/app/test/material/index.ts b/ionic/components/app/test/material/index.ts
index b0265612d7..9d74b1edcd 100644
--- a/ionic/components/app/test/material/index.ts
+++ b/ionic/components/app/test/material/index.ts
@@ -15,7 +15,7 @@ import {App, ActionMenu, IonicApp, IonicView, Register} from 'ionic/ionic';
   '</ion-navbar>' +
   '<ion-content>' +
     `
-    <button primary md-ripple>Cleeek</button>
+    <button md-ripple>Cleeek</button>
     <ion-list>
       <ion-item>
         <h3>All Genres</h3>
diff --git a/ionic/components/app/test/net/main.html b/ionic/components/app/test/net/main.html
index 8d4fa09085..ccd1d42609 100644
--- a/ionic/components/app/test/net/main.html
+++ b/ionic/components/app/test/net/main.html
@@ -4,13 +4,13 @@
     </div>
   </div>
   <ion-content [parallax]="profile"><!-- [counter]="counter">-->
-    <button primary (click)="doGet()">GET</button>
-    <button primary (click)="doGet404()">GET (404)</button>
-    <button primary (click)="doPost()">POST</button>
-    <button primary (click)="doPut()">PUT</button>
-    <button primary (click)="doDelete()">DELETE</button>
-    <button primary (click)="doPatch()">PATCH</button>
-    
+    <button (click)="doGet()">GET</button>
+    <button (click)="doGet404()">GET (404)</button>
+    <button (click)="doPost()">POST</button>
+    <button (click)="doPut()">PUT</button>
+    <button (click)="doDelete()">DELETE</button>
+    <button (click)="doPatch()">PATCH</button>
+
     <div [ng-form-model]="form">
       <textarea ng-control="requestData" placeholder="JSON to send (optional)" style="border: 1px solid #ccc; width: 100%; height: 140px"></textarea>
     </div>
diff --git a/ionic/components/app/test/sink/pages/action-menu.ts b/ionic/components/app/test/sink/pages/action-menu.ts
index 0f8eb89850..301f3626bf 100644
--- a/ionic/components/app/test/sink/pages/action-menu.ts
+++ b/ionic/components/app/test/sink/pages/action-menu.ts
@@ -17,7 +17,7 @@ import {SinkPage} from '../sink-page';
       Action Menu's are great for prompting for dangerous actions (like deleting a photo album),
       or showing a "context menu" with multiple actions the user can perform on something.
     </p>
-    <button primary (click)="openMenu()">Open Menu</button>
+    <button (click)="openMenu()">Open Menu</button>
   </ion-content>
   `
 })
diff --git a/ionic/components/app/test/sink/pages/animation.ts b/ionic/components/app/test/sink/pages/animation.ts
index e9a2afcfe7..80213365a6 100644
--- a/ionic/components/app/test/sink/pages/animation.ts
+++ b/ionic/components/app/test/sink/pages/animation.ts
@@ -38,8 +38,8 @@ let scale = 0.6;
       realistic physics effects to your app. The Animation API is a major improvement over CSS animations.
     </p>
     <p>
-      <button primary (click)="play($event)">Play</button>
-      <button primary (click)="pause($event)">Pause</button>
+      <button (click)="play($event)">Play</button>
+      <button (click)="pause($event)">Pause</button>
     </p>
     <div class="ball-container">
       <div class="ball"></div>
diff --git a/ionic/components/app/test/sink/pages/aside.ts b/ionic/components/app/test/sink/pages/aside.ts
index 2ac0830db8..3768f6a698 100644
--- a/ionic/components/app/test/sink/pages/aside.ts
+++ b/ionic/components/app/test/sink/pages/aside.ts
@@ -21,7 +21,7 @@ import {SinkPage} from '../sink-page';
       <div class="height: 50px; background-color: E05780; width: 5px; margin-left: -15px"></div>
     </p>
     <p>
-      <button primary (click)="toggleMenu()">Toggle</button>
+      <button (click)="toggleMenu()">Toggle</button>
     </p>
   </ion-content>
   `
diff --git a/ionic/components/app/test/sink/pages/button.ts b/ionic/components/app/test/sink/pages/button.ts
index 4e62c5455a..1a0be77109 100644
--- a/ionic/components/app/test/sink/pages/button.ts
+++ b/ionic/components/app/test/sink/pages/button.ts
@@ -18,12 +18,11 @@ import {SinkPage} from '../sink-page';
     </p>
     <p>
       <div (^click)="onButtonClick($event)">
-        <button primary>Primary</button>
+        <button>Primary</button>
         <button secondary>Secondary</button>
-        <button stable>Stable</button>
+        <button danger>Danger</button>
         <button light>Light</button>
         <button dark>Dark</button>
-        <button danger>Danger</button>
       </div>
     </p>
     <p>
@@ -31,7 +30,7 @@ import {SinkPage} from '../sink-page';
     </p>
     <p>
       <div (^click)="onButtonClick($event)">
-        <button primary small>small</button>
+        <button small>small</button>
         <button dark>Medium</button>
         <button secondary large>LARGE</button>
       </div>
@@ -41,7 +40,7 @@ import {SinkPage} from '../sink-page';
     </p>
     <p>
       <div (^click)="onButtonClick($event)">
-        <button primary outline>Outline</button>
+        <button outline>Outline</button>
         <button dark clear>Clear</button>
         <button danger block>Block</button>
       </div>
diff --git a/ionic/components/app/test/sink/pages/form.ts b/ionic/components/app/test/sink/pages/form.ts
index dcf624cfc3..f4c194944f 100644
--- a/ionic/components/app/test/sink/pages/form.ts
+++ b/ionic/components/app/test/sink/pages/form.ts
@@ -26,7 +26,7 @@ import {SinkPage} from '../sink-page';
       <ion-input>
         <input control="password" type="password" placeholder="Your password">
       </ion-input>
-      <button ion-button primary block type="submit">Submit</button>
+      <button block type="submit">Submit</button>
     </form>
   </ion-content>
   `
diff --git a/ionic/components/app/test/sink/pages/modal.ts b/ionic/components/app/test/sink/pages/modal.ts
index cfb1951e17..46d6d0e414 100644
--- a/ionic/components/app/test/sink/pages/modal.ts
+++ b/ionic/components/app/test/sink/pages/modal.ts
@@ -17,7 +17,7 @@ import {SinkPage} from '../sink-page';
       out of the current context. For example, clicking the "compose" button
       on a mail app might slide up a Compose modal.
     </p>
-    <button primary (click)="openModal()">Open Modal</button>
+    <button (click)="openModal()">Open Modal</button>
   </ion-content>
   `
 })
diff --git a/ionic/components/app/test/sink/pages/nav.ts b/ionic/components/app/test/sink/pages/nav.ts
index ed17ca098b..ec065d79ca 100644
--- a/ionic/components/app/test/sink/pages/nav.ts
+++ b/ionic/components/app/test/sink/pages/nav.ts
@@ -15,7 +15,7 @@ import {IonicView, NavController} from 'ionic/ionic';
       go back in history (including swipe-to-go-back), and control the stack
       of pages the user can navigate between.
     </p>
-    <button primary (click)="push()">Push</button>
+    <button (click)="push()">Push</button>
   </ion-content>
   `
 })
@@ -33,7 +33,7 @@ export class NavPage {
   template: `
     <ion-navbar *navbar><ion-title>Second Page</ion-title></ion-navbar>
     <ion-content class="padding">
-      <button primary (click)="nav.pop()">Pop</button>
+      <button (click)="nav.pop()">Pop</button>
     </ion-content>
   `
 })
diff --git a/ionic/components/app/test/sink/pages/segment.ts b/ionic/components/app/test/sink/pages/segment.ts
index 00ffa6f287..8e40630542 100644
--- a/ionic/components/app/test/sink/pages/segment.ts
+++ b/ionic/components/app/test/sink/pages/segment.ts
@@ -33,7 +33,7 @@ import {IonicView} from 'ionic/ionic';
           </ion-segment-button>
         </ion-segment>
       </div>
-      <button type="submit" button primary>Submit</button>
+      <button type="submit">Submit</button>
     </form>
 
     Map mode: <b>{{form.controls.mapStyle.value}}</b>
diff --git a/ionic/components/app/test/snapcat/index.ts b/ionic/components/app/test/snapcat/index.ts
index d1c527da3f..1c2d31dd24 100644
--- a/ionic/components/app/test/snapcat/index.ts
+++ b/ionic/components/app/test/snapcat/index.ts
@@ -90,7 +90,7 @@ class IonicApp {
 }
 
 @IonicView({
-  template: '<ion-view id="settings-modal"><ion-content padding><button primary (click)="close()">Close</button></ion-content></ion-view>'
+  template: '<ion-view id="settings-modal"><ion-content padding><button (click)="close()">Close</button></ion-content></ion-view>'
 })
 export class SettingsModal {}
 
diff --git a/ionic/components/app/test/tap/main.html b/ionic/components/app/test/tap/main.html
index 70e63501a7..af748eb855 100644
--- a/ionic/components/app/test/tap/main.html
+++ b/ionic/components/app/test/tap/main.html
@@ -1,5 +1,5 @@
 
-<button primary>
+<button>
   <div><div><p>TAP ME</p></div></div>
 </button>
 
diff --git a/ionic/components/aside/test/basic/main.html b/ionic/components/aside/test/basic/main.html
index 7035a53956..bdff01a8e0 100644
--- a/ionic/components/aside/test/basic/main.html
+++ b/ionic/components/aside/test/basic/main.html
@@ -22,7 +22,7 @@
     <h2>Content</h2>
 
     <p>
-      <button id="e2eToggleAside" primary (click)="toggleAside()">Toggle Aside</button>
+      <button id="e2eToggleAside" (click)="toggleAside()">Toggle Aside</button>
     </p>
 
   </ion-content>
diff --git a/ionic/components/button/extensions/material.scss b/ionic/components/button/extensions/material.scss
index 66655e3a9e..07114e5b8a 100644
--- a/ionic/components/button/extensions/material.scss
+++ b/ionic/components/button/extensions/material.scss
@@ -35,6 +35,7 @@ $button-md-border-radius:            3px !default;
     border-radius: 0;
   }
 
+  &[clear],
   &[outline] {
     box-shadow: none;
 
diff --git a/ionic/components/button/test/block/main.html b/ionic/components/button/test/block/main.html
index 695604a084..a1b8aad87f 100644
--- a/ionic/components/button/test/block/main.html
+++ b/ionic/components/button/test/block/main.html
@@ -10,19 +10,24 @@
     <button block>button[block]</button>
   </p>
 
-  <p>
-    <a button block primary href="#">a[button][block][primary]</a>
-    <button block primary>button[block][primary]</button>
-  </p>
-
   <p>
     <a button block outline secondary href="#">a[button][block][outline][secondary]</a>
-    <button block outline secondary>button[block][outline</button>
+    <button block outline secondary>button[block][outline][secondary]</button>
   </p>
 
   <p>
-    <a button block clear stable href="#">a[button][block][clear]</a>
-    <button block clear stable>button[block]</button>
+    <a button block clear dark href="#">a[button][block][clear][dark]</a>
+    <button block clear dark>button[clear][block][dark]</button>
+  </p>
+
+  <p>
+    <a button block round href="#">a[button][block][round]</a>
+    <button block round>button[block][round]</button>
+  </p>
+
+  <p>
+    <a button block round outline href="#">a[button][block][round][outline]</a>
+    <button block round outline>button[block][round][outline]</button>
   </p>
 
 </ion-content>
diff --git a/ionic/components/card/test/basic/main.html b/ionic/components/card/test/basic/main.html
index aed805e993..e1e169ba66 100644
--- a/ionic/components/card/test/basic/main.html
+++ b/ionic/components/card/test/basic/main.html
@@ -24,7 +24,7 @@
     <div class="item-content">
       All Out Card
     </div>
-    <button primary outline>View</button>
+    <button outline>View</button>
   </div>
 
   <div class="item item-text-wrap">
diff --git a/ionic/components/checkbox/test/basic/main.html b/ionic/components/checkbox/test/basic/main.html
index d344e8d2e8..08df1a25b0 100644
--- a/ionic/components/checkbox/test/basic/main.html
+++ b/ionic/components/checkbox/test/basic/main.html
@@ -33,9 +33,9 @@
   </form>
 
   <p aria-hidden="true" class="align-center">
-    <button (click)="toggleGrapeChecked()" outline primary small id="e2eGrapeChecked">Grape Checked</button>
-    <button (click)="toggleGrapeDisabled()" outline primary small id="e2eGrapeDisabled">Grape Disabled</button>
-    <button (click)="doSubmit($event)" outline primary small id="e2eSubmit">Submit</button>
+    <button (click)="toggleGrapeChecked()" outline small id="e2eGrapeChecked">Grape Checked</button>
+    <button (click)="toggleGrapeDisabled()" outline small id="e2eGrapeDisabled">Grape Disabled</button>
+    <button (click)="doSubmit($event)" outline small id="e2eSubmit">Submit</button>
   </p>
 
   <p aria-hidden="true" class="padding">
diff --git a/ionic/components/item/test/buttons/main.html b/ionic/components/item/test/buttons/main.html
index f8abd79bf9..fc8a3c0fd6 100644
--- a/ionic/components/item/test/buttons/main.html
+++ b/ionic/components/item/test/buttons/main.html
@@ -31,9 +31,9 @@
   </button>
 
   <div class="item">
-    <button primary>Edit</button>
+    <button>Edit</button>
     <div class="item-content">
-      div.item left button[primary]
+      div.item left button
     </div>
   </div>
 
@@ -57,14 +57,14 @@
     <div class="item-content">
       div.item right icon/text button
     </div>
-    <button primary>
+    <button>
       <icon name="ion-refresh"></icon>
       Refresh
     </button>
   </div>
 
   <div class="item">
-    <button primary clear>
+    <button clear>
       <icon name="ion-wrench"></icon>
       Fix
     </button>
@@ -87,7 +87,7 @@
       This is multiline text that has a
       long description of about how the text is really long.
     </div>
-    <button primary outline>View</button>
+    <button outline>View</button>
   </div>
 
 </ion-list>
diff --git a/ionic/components/item/test/media/main.html b/ionic/components/item/test/media/main.html
index 851d19d0f4..6a57146354 100644
--- a/ionic/components/item/test/media/main.html
+++ b/ionic/components/item/test/media/main.html
@@ -33,7 +33,7 @@
     <div class="item-content">
       Media/Avatar, right button
     </div>
-    <button primary outline>View</button>
+    <button outline>View</button>
   </div>
 
   <a class="item" href="#">
@@ -63,7 +63,7 @@
       <h2>H2 Title Text</h2>
       <p>Button on right</p>
     </div>
-    <button primary outline>View</button>
+    <button outline>View</button>
   </div>
 
   <button class="item">
diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts
index 05bad12454..5195fd9a7c 100644
--- a/ionic/components/modal/test/basic/index.ts
+++ b/ionic/components/modal/test/basic/index.ts
@@ -78,13 +78,13 @@ export class ContactModal {
     <ion-navbar *navbar><ion-title>First Page Header</ion-title><ion-nav-items primary><button id="e2eCloseMenu" (click)="closeModal()">Close</button></ion-nav-items></ion-navbar>
     <ion-content class="padding">
       <p>
-        <button primary (click)="push()">Push (Go to 2nd)</button>
+        <button (click)="push()">Push (Go to 2nd)</button>
       </p>
       <p>
-        <button primary (click)="openActionMenu()">Open Action Menu</button>
+        <button (click)="openActionMenu()">Open Action Menu</button>
       </p>
       <p>
-        <button primary (click)="closeByHandeModal()">Close By Handle</button>
+        <button (click)="closeByHandeModal()">Close By Handle</button>
       </p>
       <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
       <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
@@ -148,7 +148,7 @@ export class ModalFirstPage {
     <ion-navbar *navbar><ion-title>Second Page Header</ion-title></ion-navbar>
     <ion-content class="padding">
       <p>
-        <button primary (click)="nav.pop()">Pop (Go back to 1st)</button>
+        <button (click)="nav.pop()">Pop (Go back to 1st)</button>
       </p>
       <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
       <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
diff --git a/ionic/components/modal/test/basic/main.html b/ionic/components/modal/test/basic/main.html
index 59e406d02c..60fc6135cf 100644
--- a/ionic/components/modal/test/basic/main.html
+++ b/ionic/components/modal/test/basic/main.html
@@ -1,3 +1,3 @@
 <ion-content class="padding">
-  <button id="e2eOpenModal" primary (click)="openModal()">Open Modal</button>
+  <button id="e2eOpenModal" (click)="openModal()">Open Modal</button>
 </ion-content>
diff --git a/ionic/components/nav/test/basic/pages/first-page.ts b/ionic/components/nav/test/basic/pages/first-page.ts
index ec057024fb..0925afcf13 100644
--- a/ionic/components/nav/test/basic/pages/first-page.ts
+++ b/ionic/components/nav/test/basic/pages/first-page.ts
@@ -16,8 +16,8 @@ import {ThirdPage} from './third-page';
     '<ion-content class="padding">' +
       '<p>{{title}}</p>' +
       '<p><button id="from1To2" primary (click)="push()">Push (Go to 2nd)</button></p>' +
-      '<p><button primary [push-data]="pushData" [nav-push]="pushPage">Push w/ nav-push (Go to 2nd)</button></p>' +
-      '<p><button primary (click)="setItems()">setItems() (Go to 3rd, no history)</button></p>' +
+      '<p><button [push-data]="pushData" [nav-push]="pushPage">Push w/ nav-push (Go to 2nd)</button></p>' +
+      '<p><button (click)="setItems()">setItems() (Go to 3rd, no history)</button></p>' +
       '<icon class="ion-ios-arrow-back"></icon>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
diff --git a/ionic/components/nav/test/basic/pages/second-page.ts b/ionic/components/nav/test/basic/pages/second-page.ts
index dd34d485fe..b005a3e7c7 100644
--- a/ionic/components/nav/test/basic/pages/second-page.ts
+++ b/ionic/components/nav/test/basic/pages/second-page.ts
@@ -7,10 +7,10 @@ import {FirstPage} from './first-page';
   template: `
     <ion-navbar *navbar primary><ion-title>Second Page Header</ion-title></ion-navbar>
     <ion-content class="padding">
-      <p><button primary (click)="pop()">Pop (Go back to 1st)</button></p>
-      <p><button id="from2To1" primary nav-pop>Pop with NavPop (Go back to 1st)</button></p>
-      <p><button id="from2To3" primary (click)="push()">Push (Go to 3rd)</button></p>
-      <p><button primary (click)="setItems()">setItems() (Go to 3rd, FirstPage 1st in history)</button></p>
+      <p><button (click)="pop()">Pop (Go back to 1st)</button></p>
+      <p><button id="from2To1" nav-pop>Pop with NavPop (Go back to 1st)</button></p>
+      <p><button id="from2To3" (click)="push()">Push (Go to 3rd)</button></p>
+      <p><button (click)="setItems()">setItems() (Go to 3rd, FirstPage 1st in history)</button></p>
       <div class="green"><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f></div>
     </ion-content>
   `
diff --git a/ionic/components/nav/test/basic/pages/third-page.ts b/ionic/components/nav/test/basic/pages/third-page.ts
index af2ea67381..5bbe0ee0fd 100644
--- a/ionic/components/nav/test/basic/pages/third-page.ts
+++ b/ionic/components/nav/test/basic/pages/third-page.ts
@@ -6,7 +6,7 @@ import {IonicView, NavController} from 'ionic/ionic';
     <ion-navbar *navbar><ion-title>Third Page Header</ion-title></ion-navbar>
     <ion-content class="padding">
       <p>
-        <button id="from3To2" primary (click)="pop()">Pop (Go back to 2nd)</button>
+        <button id="from3To2" (click)="pop()">Pop (Go back to 2nd)</button>
       </p>
       <div class="yellow"><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f></div>
     </ion-content>
diff --git a/ionic/components/nav/test/user-app/index.ts b/ionic/components/nav/test/user-app/index.ts
index 83a5c14469..0da997060a 100644
--- a/ionic/components/nav/test/user-app/index.ts
+++ b/ionic/components/nav/test/user-app/index.ts
@@ -86,7 +86,7 @@ class UserModal {
 @View({
   template: `
     <h1>user root component</h1>
-    <button primary (click)="openModal()">Open Modal</button>
+    <button (click)="openModal()">Open Modal</button>
     <ng-content></ng-content>
   `,
   directives: IonicDirectives.concat([UserButton])
diff --git a/ionic/components/popup/test/basic/main.html b/ionic/components/popup/test/basic/main.html
index a53c92e8d3..c760098135 100644
--- a/ionic/components/popup/test/basic/main.html
+++ b/ionic/components/popup/test/basic/main.html
@@ -1,9 +1,9 @@
 
 <ion-content class="padding">
 
-  <button id="e2eOpenAlert" primary (click)="doAlert()">Alert</button>
-  <button id="e2eOpenPrompt" primary (click)="doPrompt()">Prompt</button>
-  <button id="e2eOpenConfirm" primary (click)="doConfirm()">Confirm</button>
+  <button id="e2eOpenAlert" (click)="doAlert()">Alert</button>
+  <button id="e2eOpenPrompt" (click)="doPrompt()">Prompt</button>
+  <button id="e2eOpenConfirm" (click)="doConfirm()">Confirm</button>
 
   <pre>
     Alert Opened: {{alertOpen}}
diff --git a/ionic/components/radio/test/basic/main.html b/ionic/components/radio/test/basic/main.html
index 91ff5830fc..adf0ee71bc 100644
--- a/ionic/components/radio/test/basic/main.html
+++ b/ionic/components/radio/test/basic/main.html
@@ -37,8 +37,8 @@
 
   </form>
 
-  <button (click)="setApple()" outline primary small>Select Apple</button>
-  <button (click)="setBanana()" outline primary small>Select Banana</button>
-  <button id="e2eCherry" (click)="setCherry()" outline primary small>Select Cherry</button>
+  <button (click)="setApple()" outline small>Select Apple</button>
+  <button (click)="setBanana()" outline small>Select Banana</button>
+  <button id="e2eCherry" (click)="setCherry()" outline small>Select Cherry</button>
 
 </ion-content>
diff --git a/ionic/components/slides/test/basic/main.html b/ionic/components/slides/test/basic/main.html
index d6a0677152..4337a48e31 100644
--- a/ionic/components/slides/test/basic/main.html
+++ b/ionic/components/slides/test/basic/main.html
@@ -10,6 +10,6 @@
 </ion-slides>
 
 <div style="position: absolute; bottom: 10px; left: 0; width: 100%; text-align: center">
-  <button (click)="slides.prev()" primary>Prev</button>
-  <button (click)="slides.next()" primary>Next</button>
+  <button (click)="slides.prev()">Prev</button>
+  <button (click)="slides.next()">Next</button>
 </div>
diff --git a/ionic/components/slides/test/continuous/index.ts b/ionic/components/slides/test/continuous/index.ts
index bac4986d78..31e0ada1d5 100644
--- a/ionic/components/slides/test/continuous/index.ts
+++ b/ionic/components/slides/test/continuous/index.ts
@@ -18,8 +18,8 @@ import {App} from 'ionic/ionic';
     </ion-slides>
 
     <div style="position: absolute; bottom: 10px; left: 0; width: 100%; text-align: center">
-      <button (click)="slides.prev()" primary>Prev</button>
-      <button (click)="slides.next()" primary>Next</button>
+      <button (click)="slides.prev()">Prev</button>
+      <button (click)="slides.next()">Next</button>
     </div>
   `
 })
diff --git a/ionic/components/switch/test/basic/main.html b/ionic/components/switch/test/basic/main.html
index 44d5e34076..3c77346cc6 100644
--- a/ionic/components/switch/test/basic/main.html
+++ b/ionic/components/switch/test/basic/main.html
@@ -33,9 +33,9 @@
   </form>
 
   <p aria-hidden="true" class="align-center">
-    <button (click)="toggleGrapeChecked()" outline primary small id="e2eGrapeChecked">Grape Checked</button>
-    <button (click)="toggleGrapeDisabled()" outline primary small id="e2eGrapeDisabled">Grape Disabled</button>
-    <button (click)="doSubmit($event)" outline primary small id="e2eSubmit">Submit</button>
+    <button (click)="toggleGrapeChecked()" outline small id="e2eGrapeChecked">Grape Checked</button>
+    <button (click)="toggleGrapeDisabled()" outline small id="e2eGrapeDisabled">Grape Disabled</button>
+    <button (click)="doSubmit($event)" outline small id="e2eSubmit">Submit</button>
   </p>
 
   <p aria-hidden="true" class="padding">
diff --git a/ionic/components/tabs/test/advanced/index.ts b/ionic/components/tabs/test/advanced/index.ts
index 836e18de3b..2ed5f66dc2 100644
--- a/ionic/components/tabs/test/advanced/index.ts
+++ b/ionic/components/tabs/test/advanced/index.ts
@@ -9,7 +9,7 @@ import {App, IonicView, NavController} from 'ionic/ionic';
       '<ion-title>Sign In</ion-title>' +
     '</ion-navbar>' +
     '<ion-content class="padding">' +
-      '<p><button id="signIn" primary (click)="push()">Go to tabs</button></p>' +
+      '<p><button id="signIn" (click)="push()">Go to tabs</button></p>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
     '</ion-content>'
@@ -46,7 +46,7 @@ class TabsPage {
       '<ion-title>Tabs 1 Page 1</ion-title>' +
     '</ion-navbar>' +
     '<ion-content class="padding">' +
-      '<p><button id="goToTab1Page2" primary (click)="push()">Go to Tab 1, Page 2</button></p>' +
+      '<p><button id="goToTab1Page2" (click)="push()">Go to Tab 1, Page 2</button></p>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
     '</ion-content>'
@@ -68,8 +68,8 @@ class Tab1Page1 {
       '<ion-title>Tabs 1 Page 2</ion-title>' +
     '</ion-navbar>' +
     '<ion-content class="padding">' +
-      '<p><button primary (click)="push()">Go to Tab 1, Page 3</button></p>' +
-      '<p><button id="backToTab1Page1" primary (click)="nav.pop()">Back to Tab 1, Page 1</button></p>' +
+      '<p><button (click)="push()">Go to Tab 1, Page 3</button></p>' +
+      '<p><button id="backToTab1Page1" (click)="nav.pop()">Back to Tab 1, Page 1</button></p>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
     '</ion-content>'
@@ -91,7 +91,7 @@ class Tab1Page2 {
       '<ion-title>Tabs 1 Page 3</ion-title>' +
     '</ion-navbar>' +
     '<ion-content class="padding">' +
-      '<p><button primary (click)="nav.pop()">Back to Tab 1, Page 2</button></p>' +
+      '<p><button (click)="nav.pop()">Back to Tab 1, Page 2</button></p>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
     '</ion-content>'
@@ -113,7 +113,7 @@ class Tab1Page3 {
       '<ion-title>Tabs 2 Page 1</ion-title>' +
     '</ion-navbar>' +
     '<ion-content class="padding">' +
-      '<p><button primary (click)="push()">Go to Tab 2, Page 2</button></p>' +
+      '<p><button (click)="push()">Go to Tab 2, Page 2</button></p>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
     '</ion-content>'
@@ -135,8 +135,8 @@ class Tab2Page1 {
       '<ion-title>Tabs 2 Page 2</ion-title>' +
     '</ion-navbar>' +
     '<ion-content class="padding">' +
-      '<p><button primary (click)="push()">Go to Tab 2, Page 3</button></p>' +
-      '<p><button primary (click)="nav.pop()">Back to Tab 2, Page 1</button></p>' +
+      '<p><button (click)="push()">Go to Tab 2, Page 3</button></p>' +
+      '<p><button (click)="nav.pop()">Back to Tab 2, Page 1</button></p>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
     '</ion-content>'
@@ -158,7 +158,7 @@ class Tab2Page2 {
       '<ion-title>Tabs 2 Page 3</ion-title>' +
     '</ion-navbar>' +
     '<ion-content class="padding">' +
-      '<p><button primary (click)="nav.pop()">Back to Tab 2, Page 2</button></p>' +
+      '<p><button (click)="nav.pop()">Back to Tab 2, Page 2</button></p>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
       '<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>' +
     '</ion-content>'
diff --git a/ionic/components/text-input/test/fixed-inline-labels/main.html b/ionic/components/text-input/test/fixed-inline-labels/main.html
index 68362ba1a8..09a20505df 100644
--- a/ionic/components/text-input/test/fixed-inline-labels/main.html
+++ b/ionic/components/text-input/test/fixed-inline-labels/main.html
@@ -19,7 +19,7 @@
     <ion-input fixed-label>
       <ion-label>From</ion-label>
       <input value="Text 3" type="text">
-      <button primary clear>
+      <button clear>
         <icon name="ion-power"></icon>
       </button>
     </ion-input>
@@ -55,7 +55,7 @@
     <ion-input fixed-label>
       <ion-label>Score</ion-label>
       <input value="10" type="number">
-      <button primary outline>Update</button>
+      <button outline>Update</button>
     </ion-input>
 
     <ion-input fixed-label>
diff --git a/ionic/components/text-input/test/inline-labels/main.html b/ionic/components/text-input/test/inline-labels/main.html
index 6dce4fcf3f..0d99b075fa 100644
--- a/ionic/components/text-input/test/inline-labels/main.html
+++ b/ionic/components/text-input/test/inline-labels/main.html
@@ -19,7 +19,7 @@
     <ion-input>
       <ion-label>From:</ion-label>
       <input value="Text 3" type="text">
-      <button primary clear>
+      <button clear>
         <icon name="ion-power"></icon>
       </button>
     </ion-input>
@@ -56,7 +56,7 @@
     <ion-input>
       <ion-label>Score:</ion-label>
       <input value="10" type="number">
-      <button primary outline>Update</button>
+      <button outline>Update</button>
     </ion-input>
 
     <ion-input>
diff --git a/ionic/components/toolbar/test/scenarios/main.html b/ionic/components/toolbar/test/scenarios/main.html
index d574ad3f59..6674c195ec 100644
--- a/ionic/components/toolbar/test/scenarios/main.html
+++ b/ionic/components/toolbar/test/scenarios/main.html
@@ -1,8 +1,25 @@
 
-<ion-toolbar><ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title></ion-toolbar>
+<ion-toolbar>
+  <ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title>
+</ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon></button><button><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button><icon name="ion-more"></icon></button></ion-nav-items><ion-title>Defaults</ion-title></ion-toolbar>
+<ion-toolbar>
+  <ion-nav-items primary>
+    <button>
+      <icon name="ion-navicon"></icon>
+    </button>
+    <button>
+      <icon name="ion-heart"></icon>
+    </button>
+  </ion-nav-items>
+  <ion-nav-items secondary>
+    <button>
+      <icon name="ion-more"></icon>
+    </button>
+  </ion-nav-items>
+  <ion-title>Defaults</ion-title>
+</ion-toolbar>
 
 
 <ion-toolbar><ion-nav-items primary><button class="hover"><icon name="ion-navicon"></icon></button><button class="hover"><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button class="hover"><icon name="ion-more"></icon></button></ion-nav-items><ion-title>Defaults.hover</ion-title></ion-toolbar>
@@ -11,34 +28,34 @@
 <ion-toolbar><ion-nav-items primary><button class="activated"><icon name="ion-navicon"></icon></button><button class="activated"><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button class="activated"><icon name="ion-more"></icon></button></ion-nav-items><ion-title>Defaults.activated</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button clear primary><icon name="ion-flag"></icon></button><button clear primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Clear</ion-title><ion-nav-items secondary><button clear secondary>Help<icon name="ion-help-circled"></icon></button></ion-nav-items></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button clear><icon name="ion-flag"></icon></button><button clear><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Clear</ion-title><ion-nav-items secondary><button clear secondary>Help<icon name="ion-help-circled"></icon></button></ion-nav-items></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button clear primary class="hover"><icon name="ion-flag"></icon></button><button clear primary class="hover"><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Clear</ion-title><ion-nav-items secondary><button clear secondary class="hover">Help<icon name="ion-help-circled"></icon></button></ion-nav-items></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button clear class="hover"><icon name="ion-flag"></icon></button><button clear class="hover"><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Clear</ion-title><ion-nav-items secondary><button clear secondary class="hover">Help<icon name="ion-help-circled"></icon></button></ion-nav-items></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button clear primary class="activated"><icon name="ion-flag"></icon></button><button clear primary class="activated"><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Clear</ion-title><ion-nav-items secondary><button clear secondary class="activated">Help<icon name="ion-help-circled"></icon></button></ion-nav-items></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button clear class="activated"><icon name="ion-flag"></icon></button><button clear class="activated"><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Clear</ion-title><ion-nav-items secondary><button clear secondary class="activated">Help<icon name="ion-help-circled"></icon></button></ion-nav-items></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary outline><icon name="ion-navicon"></icon></button primary><button primary outline><icon name="ion-star"></icon>Star</button></ion-nav-items><ion-nav-items secondary><button secondary outline><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Outline</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button outline><icon name="ion-navicon"></icon></button primary><button outline><icon name="ion-star"></icon>Star</button></ion-nav-items><ion-nav-items secondary><button secondary outline><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Outline</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary outline class="hover"><icon name="ion-navicon"></icon></button primary><button primary outline class="hover"><icon name="ion-star"></icon>Star</button></ion-nav-items><ion-nav-items secondary><button secondary outline class="hover"><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Outline.hover</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button outline class="hover"><icon name="ion-navicon"></icon></button primary><button outline class="hover"><icon name="ion-star"></icon>Star</button></ion-nav-items><ion-nav-items secondary><button secondary outline class="hover"><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Outline.hover</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary outline class="activated"><icon name="ion-navicon"></icon></button primary><button primary outline class="activated"><icon name="ion-star"></icon>Star</button></ion-nav-items><ion-nav-items secondary><button secondary outline class="activated"><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Outline.activated</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button outline class="activated"><icon name="ion-navicon"></icon></button primary><button outline class="activated"><icon name="ion-star"></icon>Star</button></ion-nav-items><ion-nav-items secondary><button secondary outline class="activated"><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Outline.activated</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary>Btn</button></ion-nav-items><ion-nav-items secondary><button secondary>Btn</button></ion-nav-items><ion-title>ColorAttr</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button>Btn</button></ion-nav-items><ion-nav-items secondary><button secondary>Btn</button></ion-nav-items><ion-title>ColorAttr</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary class="hover">Btn</button></ion-nav-items><ion-nav-items secondary><button secondary class="hover">Btn</button></ion-nav-items><ion-title>ColorAttr.hover</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button class="hover">Btn</button></ion-nav-items><ion-nav-items secondary><button secondary class="hover">Btn</button></ion-nav-items><ion-title>ColorAttr.hover</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary class="activated">Btn</button></ion-nav-items><ion-nav-items secondary><button secondary class="activated">Btn</button></ion-nav-items><ion-title>ColorAttr.activated</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button class="activated">Btn</button></ion-nav-items><ion-nav-items secondary><button secondary class="activated">Btn</button></ion-nav-items><ion-title>ColorAttr.activated</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-nav-items secondary><button primary>Edit<icon name="ion-edit"></icon></button></ion-nav-items><ion-title>Icon/Color Attr</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-nav-items secondary><button>Edit<icon name="ion-edit"></icon></button></ion-nav-items><ion-title>Icon/Color Attr</ion-title></ion-toolbar>