diff --git a/src/components/app/_colors.scss b/src/components/app/_colors.scss
index 1b144cc938..0d102a17fb 100644
--- a/src/components/app/_colors.scss
+++ b/src/components/app/_colors.scss
@@ -6,6 +6,20 @@
 
 $colors: (
 
+  primary: (
+    base: #387ef5,
+    inverse: #fff,
+    light: #145fd7,
+    dark: #145fd7
+  ),
+
+  secondary: (
+    base: #387ef5,
+    inverse: #fff,
+    light: #145fd7,
+    dark: #145fd7
+  ),
+
   light: (
     base: #fff,
     inverse: #444,
@@ -20,13 +34,6 @@ $colors: (
     dark: #b2b2b2
   ),
 
-  positive: (
-    base: #387ef5,
-    inverse: #fff,
-    light: #145fd7,
-    dark: #145fd7
-  ),
-
   assertive: (
     base: #ef473a,
     inverse: #fff,
diff --git a/src/components/button/test/basic/main.html b/src/components/button/test/basic/main.html
index b66ef1500c..2d408e0aae 100644
--- a/src/components/button/test/basic/main.html
+++ b/src/components/button/test/basic/main.html
@@ -14,10 +14,10 @@
 </p>
 
 <p>
-  <a class="button button-positive" href="#">a.positive</a>
-  <button class="button button-positive">button.positive</button>
-  <button class="button button-positive hover">hover</button>
-  <button class="button button-positive activated">activated</button>
+  <a class="button button-primary" href="#">a.primary</a>
+  <button class="button button-primary">button.primary</button>
+  <button class="button button-primary hover">hover</button>
+  <button class="button button-primary activated">activated</button>
 </p>
 
 <p>
diff --git a/src/components/button/test/block/main.html b/src/components/button/test/block/main.html
index dd8f61b8fb..a24c63cc2e 100644
--- a/src/components/button/test/block/main.html
+++ b/src/components/button/test/block/main.html
@@ -1,15 +1,15 @@
 
 <p>
-  <a class="button button-block button-positive" href="#">a.button-block</a>
-  <button class="button button-block button-positive">button.button-block</button>
+  <a class="button button-block button-primary" href="#">a.button-block</a>
+  <button class="button button-block button-primary">button.button-block</button>
 </p>
 
 <p>
-  <a class="button button-block button-outline button-positive" href="#">a.button-block</a>
-  <button class="button button-block button-outline button-positive">button.button-block</button>
+  <a class="button button-block button-outline button-primary" href="#">a.button-block</a>
+  <button class="button button-block button-outline button-primary">button.button-block</button>
 </p>
 
 <p>
-  <a class="button button-block button-clear button-positive" href="#">a.button-block</a>
-  <button class="button button-block button-clear button-positive">button.button-block</button>
+  <a class="button button-block button-clear button-primary" href="#">a.button-block</a>
+  <button class="button button-block button-clear button-primary">button.button-block</button>
 </p>
diff --git a/src/components/button/test/clear/main.html b/src/components/button/test/clear/main.html
index e570e69dc5..e1174b009b 100644
--- a/src/components/button/test/clear/main.html
+++ b/src/components/button/test/clear/main.html
@@ -14,10 +14,10 @@
 </p>
 
 <p>
-  <a class="button button-clear button-positive" href="#">a.positive</a>
-  <button class="button button-clear button-positive">button.positive</button>
-  <button class="button button-clear button-positive hover">hover</button>
-  <button class="button button-clear button-positive activated">activated</button>
+  <a class="button button-clear button-primary" href="#">a.primary</a>
+  <button class="button button-clear button-primary">button.primary</button>
+  <button class="button button-clear button-primary hover">hover</button>
+  <button class="button button-clear button-primary activated">activated</button>
 </p>
 
 <p>
diff --git a/src/components/button/test/full/main.html b/src/components/button/test/full/main.html
index 4f53aae9d9..33908219a7 100644
--- a/src/components/button/test/full/main.html
+++ b/src/components/button/test/full/main.html
@@ -1,15 +1,15 @@
 
 <p>
-  <a class="button button-full button-positive" href="#">a.button-full</a>
-  <button class="button button-full button-positive">button.button-full</button>
+  <a class="button button-full button-primary" href="#">a.button-full</a>
+  <button class="button button-full button-primary">button.button-full</button>
 </p>
 
 <p>
-  <a class="button button-full button-outline button-positive" href="#">a.button-full</a>
-  <button class="button button-full button-outline button-positive">button.button-full</button>
+  <a class="button button-full button-outline button-primary" href="#">a.button-full</a>
+  <button class="button button-full button-outline button-primary">button.button-full</button>
 </p>
 
 <p>
-  <a class="button button-full button-clear button-positive" href="#">a.button-full</a>
-  <button class="button button-full button-clear button-positive">button.button-full</button>
+  <a class="button button-full button-clear button-primary" href="#">a.button-full</a>
+  <button class="button button-full button-clear button-primary">button.button-full</button>
 </p>
diff --git a/src/components/button/test/icons/main.html b/src/components/button/test/icons/main.html
index c1d4ebae35..fd971d5e72 100644
--- a/src/components/button/test/icons/main.html
+++ b/src/components/button/test/icons/main.html
@@ -2,77 +2,77 @@
 <div class="padding">
 
   <p>
-    <button class="button button-positive ion-home icon-left">
+    <button class="button button-primary ion-home icon-left">
       Left Icon
     </button>
-    <a class="button button-positive ion-home icon-left">
+    <a class="button button-primary ion-home icon-left">
       Left Icon
     </a>
   </p>
 
   <p>
-    <button class="button button-positive ion-star icon-right">
+    <button class="button button-primary ion-star icon-right">
       Right Icon
     </button>
-    <a class="button button-positive ion-star icon-right">
+    <a class="button button-primary ion-star icon-right">
       Right Icon
     </a>
   </p>
 
   <p>
-    <button class="button button-positive ion-ionic button-icon">
+    <button class="button button-primary ion-ionic button-icon">
     </button>
-    <a class="button button-positive ion-ionic button-icon">
+    <a class="button button-primary ion-ionic button-icon">
     </a>
   </p>
 
   <p>
-    <button class="button button-positive button-large ion-home icon-left">
+    <button class="button button-primary button-large ion-home icon-left">
       Left, Large
     </button>
-    <a class="button button-positive button-large ion-home icon-left">
+    <a class="button button-primary button-large ion-home icon-left">
       Left, Large
     </a>
   </p>
 
   <p>
-    <button class="button button-positive button-large ion-star icon-right">
+    <button class="button button-primary button-large ion-star icon-right">
       Right, Large
     </button>
-    <a class="button button-positive button-large ion-star icon-right">
+    <a class="button button-primary button-large ion-star icon-right">
       Right, Large
     </a>
   </p>
 
   <p>
-    <button class="button button-positive ion-ionic button-icon button-large">
+    <button class="button button-primary ion-ionic button-icon button-large">
     </button>
-    <a class="button button-positive ion-ionic button-icon button-large">
+    <a class="button button-primary ion-ionic button-icon button-large">
     </a>
   </p>
 
   <p>
-    <button class="button button-positive button-small ion-home icon-left">
+    <button class="button button-primary button-small ion-home icon-left">
       Left Icon, Small
     </button>
-    <a class="button button-positive button-small ion-home icon-left">
+    <a class="button button-primary button-small ion-home icon-left">
       Left Icon, Small
     </a>
   </p>
 
   <p>
-    <button class="button button-positive button-small ion-star icon-right">
+    <button class="button button-primary button-small ion-star icon-right">
       Right Icon, Small
     </button>
-    <a class="button button-positive button-small ion-star icon-right">
+    <a class="button button-primary button-small ion-star icon-right">
       Right Icon, Small
     </a>
   </p>
 
   <p>
-    <button class="button button-positive ion-ionic button-icon button-small">
+    <button class="button button-primary ion-ionic button-icon button-small">
     </button>
-    <a class="button button-positive ion-ionic button-icon button-small">
+    <a class="button button-primary ion-ionic button-icon button-small">
     </a>
   </p>
 
diff --git a/src/components/button/test/outline/main.html b/src/components/button/test/outline/main.html
index 4182418c09..737fe54a40 100644
--- a/src/components/button/test/outline/main.html
+++ b/src/components/button/test/outline/main.html
@@ -14,10 +14,10 @@
 </p>
 
 <p>
-  <a class="button button-outline button-positive" href="#">a.positive</a>
-  <button class="button button-outline button-positive">button.positive</button>
-  <button class="button button-outline button-positive hover">hover</button>
-  <button class="button button-outline button-positive activated">activated</button>
+  <a class="button button-outline button-primary" href="#">a.primary</a>
+  <button class="button button-outline button-primary">button.primary</button>
+  <button class="button button-outline button-primary hover">hover</button>
+  <button class="button button-outline button-primary activated">activated</button>
 </p>
 
 <p>
diff --git a/src/components/button/test/sizes/main.html b/src/components/button/test/sizes/main.html
index cadf7423b2..a2209d3eed 100644
--- a/src/components/button/test/sizes/main.html
+++ b/src/components/button/test/sizes/main.html
@@ -1,27 +1,27 @@
 
 <p>
-  <a class="button button-small button-positive" href="#">a.small</a>
-  <button class="button button-small button-positive">button.small</button>
+  <a class="button button-small button-primary" href="#">a.small</a>
+  <button class="button button-small button-primary">button.small</button>
 
-  <a class="button button-outline button-small button-positive" href="#">a.outline.small</a>
-  <button class="button button-outline button-small button-positive">button.outline.small</button>
+  <a class="button button-outline button-small button-primary" href="#">a.outline.small</a>
+  <button class="button button-outline button-small button-primary">button.outline.small</button>
 
-  <a class="button button-clear button-small button-positive" href="#">a.clear.small</a>
-  <button class="button button-clear button-small button-positive">button.clear.small</button>
+  <a class="button button-clear button-small button-primary" href="#">a.clear.small</a>
+  <button class="button button-clear button-small button-primary">button.clear.small</button>
 </p>
 
 <p>
-  <a class="button button-large button-positive" href="#">
+  <a class="button button-large button-primary" href="#">
     <span style="font-size:48px">H</span>
     <span style="font-size:38px">E</span>
     <span style="font-size:32px">L</span>
     <span style="font-size:24px">L</span>
     O</a>
-  <button class="button button-large button-positive">button</button>
+  <button class="button button-large button-primary">button</button>
 
-  <a class="button button-outline button-large button-positive" href="#">a</a>
-  <button class="button button-outline button-large button-positive">button</button>
+  <a class="button button-outline button-large button-primary" href="#">a</a>
+  <button class="button button-outline button-large button-primary">button</button>
 
-  <a class="button button-clear button-large button-positive" href="#">a</a>
-  <button class="button button-clear button-large button-positive">button</button>
+  <a class="button button-clear button-large button-primary" href="#">a</a>
+  <button class="button button-clear button-large button-primary">button</button>
 </p>
diff --git a/src/components/card/card.scss b/src/components/card/card.scss
index 8d391a7cf4..9a1671f8fc 100644
--- a/src/components/card/card.scss
+++ b/src/components/card/card.scss
@@ -7,6 +7,6 @@
   margin: 10px;
 }
 
-.card .item-title {
+.card .item-label {
   white-space: normal;
 }
diff --git a/src/components/card/test/basic/main.html b/src/components/card/test/basic/main.html
index 87f0bcc8cd..bf3c3b25d3 100644
--- a/src/components/card/test/basic/main.html
+++ b/src/components/card/test/basic/main.html
@@ -11,7 +11,7 @@
 
       <div class="item card-header">
         <div class="item-content">
-          <div class="item-title">
+          <div class="item-label">
             Card Header
           </div>
         </div>
@@ -19,7 +19,7 @@
 
       <div class="item">
         <div class="item-content">
-          <div class="item-title">
+          <div class="item-label">
             I met her in a club down in old Soho,
             where you drink champagne and it tastes just like Cola cola,
             C-O-L-A cola.
@@ -29,7 +29,7 @@
 
       <div class="item">
         <div class="item-content">
-          <div class="item-title">
+          <div class="item-label">
             She walked up to me and she asked me to dance.
             I asked her name and in a dark brown voice she said, "Lola",
             L-O-L-A Lola, lo lo lo lo Lola
@@ -39,7 +39,7 @@
 
       <div class="item card-footer">
         <div class="item-content">
-          <div class="item-title">
+          <div class="item-label">
             Card Footer
           </div>
         </div>
diff --git a/src/components/checkbox/checkbox.js b/src/components/checkbox/checkbox.js
index 771fcebdaf..74f555c94f 100644
--- a/src/components/checkbox/checkbox.js
+++ b/src/components/checkbox/checkbox.js
@@ -22,7 +22,7 @@ export let CheckboxConfig = new ComponentConfig('checkbox')
 
   <div class="item-content">
 
-    <div class="item-title">
+    <div class="item-label">
       <content></content>
     </div>
 
diff --git a/src/components/item/item.js b/src/components/item/item.js
index 16d7664086..54ae2e4355 100644
--- a/src/components/item/item.js
+++ b/src/components/item/item.js
@@ -20,7 +20,7 @@ import {
       <div class="item-accessory">
         <content select="ion-item-accessory"></content>
       </div>
-      <div class="item-title">
+      <div class="item-label">
         <content></content>
       </div>
     </div>
@@ -28,8 +28,8 @@ import {
     <content select="ion-secondary-swipe-buttons"></content>
   `,
   directives: [
-    ItemPrimarySwipeButtons, 
-    // ItemSecondarySwipeButtons, 
+    ItemPrimarySwipeButtons,
+    // ItemSecondarySwipeButtons,
     // ItemPrimaryOptions,
     // ItemSecondaryOptions
   ]
diff --git a/src/components/item/item.scss b/src/components/item/item.scss
index 505d9c4367..ec301105a4 100644
--- a/src/components/item/item.scss
+++ b/src/components/item/item.scss
@@ -56,18 +56,7 @@ ion-primary-swipe-buttons {
   padding: 0;
 }
 
-.item-media {
-  @include flex-display();
-  @include flex-shrink(0);
-  @include flex-wrap(nowrap);
-  @include flex-align-items(center);
-
-  min-height: $item-min-height;
-
-  padding: 0;
-}
-
-.item-title {
+.item-label {
   position: relative;
 
   @include flex(1);
@@ -80,6 +69,25 @@ ion-primary-swipe-buttons {
   text-overflow: ellipsis;
 }
 
+
+// Item Media (Icons, checkboxes, images, etc.)
+// --------------------------------------------------
+
+.item-media {
+  @include flex-display();
+  @include flex-shrink(0);
+  @include flex-wrap(nowrap);
+  @include flex-align-items(center);
+
+  min-height: $item-min-height;
+
+  padding: 0;
+}
+
+
+// Item Accessory
+// --------------------------------------------------
+
 .item-accessory {
   @include flex-display();
   @include flex-shrink(0);
diff --git a/src/components/tabs/test/advanced/pages/sign-in.html b/src/components/tabs/test/advanced/pages/sign-in.html
index 1eff7b0db9..a8a75ed39c 100644
--- a/src/components/tabs/test/advanced/pages/sign-in.html
+++ b/src/components/tabs/test/advanced/pages/sign-in.html
@@ -1,5 +1,5 @@
 <ion-view nav-title="Sign In">
-  <button class="button-positive" (click)="signIn()">
+  <button class="button-primary" (click)="signIn()">
     Sign In
   </button>
 </ion-view>