diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index 7ddd6afbbc..60d877fb7b 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -8,7 +8,7 @@ import * as util from 'ionic/util';
 
 
 /**
- * @name ionPopup
+ * @name Popup
  * @description
  * The Ionic Popup service allows programmatically creating and showing popup windows that require the user to respond in order to continue.
  *
@@ -77,6 +77,7 @@ export class Popup extends Overlay {
    * @returns {TODO} TODO
    */
   alert(context={}, opts={}) {
+    console.log(context, opts);
     if (typeof context === 'string') {
       context = {
         title: context
@@ -84,6 +85,7 @@ export class Popup extends Overlay {
     }
     let button = {
       text: context.okText || 'OK',
+      type: context.okType || 'primary',
       onTap: (event, popupRef) => {
         // Allow it to close
         //resolve();
@@ -115,12 +117,14 @@ export class Popup extends Overlay {
     }
     let okButton = {
       text: context.okText || 'OK',
+      type: context.okType || 'primary',
       onTap: (event, popupRef) => {
         // Allow it to close
       }
     }
     let cancelButton = {
       text: context.cancelText || 'Cancel',
+      type: context.cancelType || 'primary',
       isCancel: true,
       onTap: (event, popupRef) => {
         // Allow it to close
@@ -150,7 +154,7 @@ export class Popup extends Overlay {
     }
     let okButton = {
       text: context.okText || 'OK',
-      type: context.okType,
+      type: context.okType || 'primary',
       onTap: (event, popupRef) => {
         // Allow it to close
       }
@@ -158,7 +162,7 @@ export class Popup extends Overlay {
 
     let cancelButton = {
       text: context.cancelText || 'Cancel',
-      type: context.cancelType,
+      type: context.cancelType || 'primary',
       isCancel: true,
       onTap: (event, popupRef) => {
         // Allow it to close
@@ -202,7 +206,7 @@ const OVERLAY_TYPE = 'popup';
 @View({
   template:
   '<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' +
-  '<popup-wrapper>' +
+  '<popup-wrapper [ng-class]="cssClass">' +
     '<div class="popup-head">' +
       '<h2 class="popup-title" [inner-html]="title" *ng-if="title"></h2>' +
       '<h3 class="popup-sub-title" [inner-html]="subTitle" *ng-if="subTitle"></h3>' +
diff --git a/ionic/components/popup/test/basic/index.ts b/ionic/components/popup/test/basic/index.ts
index 3d2484f43e..4a5e9a2e76 100644
--- a/ionic/components/popup/test/basic/index.ts
+++ b/ionic/components/popup/test/basic/index.ts
@@ -19,7 +19,8 @@ class E2EApp {
     this.alertOpen = true;
     this.popup.alert({
       title: "New Friend!",
-      template: "Your friend, Obi wan Kenobi, just accepted your friend request!"
+      template: "Your friend, Obi wan Kenobi, just accepted your friend request!",
+      cssClass: 'my-alert'
     }).then(() => {
       this.alertOpen = false;
     });