diff --git a/.gitignore b/.gitignore
index 6779cdab5f..ed648b0dc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ scripts/build/e2e-generated-tsconfig.json
 demos/node_modules
 demos/src/**/*.js
 demos/src/**/*.ngfactory.ts
+demos/src/**/*.d.ts
+demos/src/**/*.metadata.json
diff --git a/demos/package.json b/demos/package.json
new file mode 100644
index 0000000000..352f631362
--- /dev/null
+++ b/demos/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "ionic-demos",
+  "private": true,
+  "version": "1.0.0",
+  "description": "ionic demos",
+  "author": "Ionic Team <hi@ionic.io> (http://ionic.io)",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/common": "2.0.0-rc.7",
+    "@angular/compiler": "2.0.0-rc.7",
+    "@angular/core": "2.0.0-rc.7",
+    "@angular/forms": "2.0.0-rc.7",
+    "@angular/http": "2.0.0-rc.7",
+    "@angular/platform-browser": "2.0.0-rc.7",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.7",
+    "@angular/platform-server": "2.0.0-rc.7",
+    "ionic-angular": "nightly",
+    "ionic-native": "1.3.20",
+    "ionicons": "3.0.0",
+    "rxjs-es": "5.0.0-beta.12",
+    "zone.js": "^0.6.23"
+  },
+  "devDependencies": {
+    "@angular/compiler-cli": "0.6.2",
+    "@ionic/app-scripts": "latest",
+    "typescript": "2.0.2"
+  }
+}
diff --git a/demos/src/button/app.component.ts b/demos/src/button/app.component.ts
index de2b471432..6dc1507a19 100644
--- a/demos/src/button/app.component.ts
+++ b/demos/src/button/app.component.ts
@@ -1,6 +1,5 @@
 import { Component } from '@angular/core';
 
-
 @Component({
   templateUrl: 'page.html'
 })
diff --git a/demos/src/checkbox/app.component.ts b/demos/src/checkbox/app.component.ts
index ca91f83d72..8e85bcae09 100644
--- a/demos/src/checkbox/app.component.ts
+++ b/demos/src/checkbox/app.component.ts
@@ -17,7 +17,8 @@ export class ApiDemoPage {
     stannis: true,
     petyr: false,
     hodor: true,
-    catelyn: true
+    catelyn: true,
+    bronn: false
   };
 
 }
diff --git a/demos/src/config/app.module.ts b/demos/src/config/app.module.ts
index a291ef08d7..a10d8f4df2 100644
--- a/demos/src/config/app.module.ts
+++ b/demos/src/config/app.module.ts
@@ -1,18 +1,22 @@
 import { NgModule } from '@angular/core';
 import { IonicApp, IonicModule } from 'ionic-angular';
-import { ApiDemoApp, ApiDemoPage } from './app.component';
+import { ApiDemoApp, ApiDemoPage, PushPage, TabPage } from './app.component';
 
 @NgModule({
   declarations: [
     ApiDemoApp,
-    ApiDemoPage
+    ApiDemoPage,
+    PushPage,
+    TabPage
   ],
   imports: [
     IonicModule.forRoot(ApiDemoApp)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    ApiDemoPage
+    ApiDemoPage,
+    PushPage,
+    TabPage
   ]
 })
 export class AppModule {}
diff --git a/demos/src/config/page.html b/demos/src/config/page.html
index 6c8cd00c3b..dbc11dc034 100644
--- a/demos/src/config/page.html
+++ b/demos/src/config/page.html
@@ -50,11 +50,11 @@
 
   <!-- this has to be formatted weird for pre -->
   <pre margin>
-ionicBootstrap(MyApp, [], {
+<!--ionicBootstrap(MyApp, [], {
   backButtonIcon: "{{initialConfig.backButtonIcon}}"
   iconMode: "{{initialConfig.iconMode}}"
   tabsPlacement: "{{initialConfig.tabsPlacement}}"
-});</pre>
+});--></pre>
 
   <div padding>
     <button ion-button block color="secondary" (click)="push()">
diff --git a/demos/src/input/app.component.ts b/demos/src/input/app.component.ts
index 9aa4cb3a13..248e96fa2a 100644
--- a/demos/src/input/app.component.ts
+++ b/demos/src/input/app.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 
 
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page.html'
 })
 export class ApiDemoPage {}
 
diff --git a/demos/src/local-storage/app.component.ts b/demos/src/local-storage/app.component.ts
index 6d4957855e..781b2385aa 100644
--- a/demos/src/local-storage/app.component.ts
+++ b/demos/src/local-storage/app.component.ts
@@ -25,7 +25,7 @@ export class CleanLocalDataPipe implements PipeTransform {
 
 
 @Component({
-  templateUrl: 'main.html'
+  templateUrl: 'page.html'
 })
 export class ApiDemoPage {
   local: Storage;
@@ -84,4 +84,3 @@ export class ApiDemoPage {
 export class ApiDemoApp {
   root = ApiDemoPage;
 }
-
diff --git a/demos/src/local-storage/app.module.ts b/demos/src/local-storage/app.module.ts
index a291ef08d7..8e7f05185d 100644
--- a/demos/src/local-storage/app.module.ts
+++ b/demos/src/local-storage/app.module.ts
@@ -1,11 +1,12 @@
 import { NgModule } from '@angular/core';
 import { IonicApp, IonicModule } from 'ionic-angular';
-import { ApiDemoApp, ApiDemoPage } from './app.component';
+import { ApiDemoApp, ApiDemoPage, CleanLocalDataPipe } from './app.component';
 
 @NgModule({
   declarations: [
     ApiDemoApp,
-    ApiDemoPage
+    ApiDemoPage,
+    CleanLocalDataPipe
   ],
   imports: [
     IonicModule.forRoot(ApiDemoApp)
diff --git a/demos/src/nav-params/app.module.ts b/demos/src/nav-params/app.module.ts
index a291ef08d7..adf33b9ea2 100644
--- a/demos/src/nav-params/app.module.ts
+++ b/demos/src/nav-params/app.module.ts
@@ -1,11 +1,12 @@
 import { NgModule } from '@angular/core';
 import { IonicApp, IonicModule } from 'ionic-angular';
-import { ApiDemoApp, ApiDemoPage } from './app.component';
+import { ApiDemoApp, ApiDemoPage, PushPage } from './app.component';
 
 @NgModule({
   declarations: [
     ApiDemoApp,
-    ApiDemoPage
+    ApiDemoPage,
+    PushPage
   ],
   imports: [
     IonicModule.forRoot(ApiDemoApp)
diff --git a/demos/src/nav-params/main.html b/demos/src/nav-params/page.html
similarity index 100%
rename from demos/src/nav-params/main.html
rename to demos/src/nav-params/page.html
diff --git a/demos/src/navigation/app.component.ts b/demos/src/navigation/app.component.ts
index 8db7cb8736..c5fde1fc9f 100644
--- a/demos/src/navigation/app.component.ts
+++ b/demos/src/navigation/app.component.ts
@@ -15,7 +15,7 @@ export class ApiDemoPage {
 }
 
 @Component({
-  templateUrl: 'page-page.html'
+  templateUrl: 'push-page.html'
 })
 export class PushPage {
   pageNum = pageNum;
diff --git a/demos/src/navigation/app.module.ts b/demos/src/navigation/app.module.ts
index a291ef08d7..adf33b9ea2 100644
--- a/demos/src/navigation/app.module.ts
+++ b/demos/src/navigation/app.module.ts
@@ -1,11 +1,12 @@
 import { NgModule } from '@angular/core';
 import { IonicApp, IonicModule } from 'ionic-angular';
-import { ApiDemoApp, ApiDemoPage } from './app.component';
+import { ApiDemoApp, ApiDemoPage, PushPage } from './app.component';
 
 @NgModule({
   declarations: [
     ApiDemoApp,
-    ApiDemoPage
+    ApiDemoPage,
+    PushPage
   ],
   imports: [
     IonicModule.forRoot(ApiDemoApp)
diff --git a/demos/src/popover/app.component.ts b/demos/src/popover/app.component.ts
index a002ae9999..744d845f61 100644
--- a/demos/src/popover/app.component.ts
+++ b/demos/src/popover/app.component.ts
@@ -1,7 +1,6 @@
 import { Component, ElementRef, ViewChild, ViewEncapsulation } from '@angular/core';
 import { NavParams, PopoverController } from 'ionic-angular';
 
-
 @Component({
   template: `
     <ion-list radio-group [(ngModel)]="fontFamily" (ionChange)="changeFontFamily()">
diff --git a/demos/src/popover/app.module.ts b/demos/src/popover/app.module.ts
index a291ef08d7..7052911fde 100644
--- a/demos/src/popover/app.module.ts
+++ b/demos/src/popover/app.module.ts
@@ -1,11 +1,12 @@
 import { NgModule } from '@angular/core';
 import { IonicApp, IonicModule } from 'ionic-angular';
-import { ApiDemoApp, ApiDemoPage } from './app.component';
+import { ApiDemoApp, ApiDemoPage, PopoverRadioPage } from './app.component';
 
 @NgModule({
   declarations: [
     ApiDemoApp,
-    ApiDemoPage
+    ApiDemoPage,
+    PopoverRadioPage
   ],
   imports: [
     IonicModule.forRoot(ApiDemoApp)
diff --git a/demos/src/select/page.html b/demos/src/select/page.html
index 5ba4d9376b..e48f644bae 100644
--- a/demos/src/select/page.html
+++ b/demos/src/select/page.html
@@ -86,7 +86,7 @@
 
     <ion-item>
       <ion-label>Pets</ion-label>
-      <ion-select [(ngModel)]="pets" multiple="true" [alertOptions]="petAlertOpts">
+      <ion-select [(ngModel)]="pets" multiple="true" [selectOptions]="petAlertOpts">
         <ion-option *ngFor="let o of petData" [value]="o.value">{{o.text}}</ion-option>
       </ion-select>
     </ion-item>
diff --git a/demos/src/tabs/app.component.ts b/demos/src/tabs/app.component.ts
index fa2f9d4df8..bdcd628f65 100644
--- a/demos/src/tabs/app.component.ts
+++ b/demos/src/tabs/app.component.ts
@@ -2,7 +2,7 @@ import { Component, NgModule, ViewEncapsulation } from '@angular/core';
 import { IonicApp, IonicModule } from 'ionic-angular';
 
 @Component({
-  template: 'tab',
+  template: '<div>johnny utah</div>',
 })
 export class TabPage {}
 
@@ -23,4 +23,3 @@ export class ApiDemoPage {
 export class ApiDemoApp {
   root = ApiDemoPage;
 }
-
diff --git a/demos/src/tabs/app.module.ts b/demos/src/tabs/app.module.ts
index 0d00ef6563..43bbbb6550 100644
--- a/demos/src/tabs/app.module.ts
+++ b/demos/src/tabs/app.module.ts
@@ -13,7 +13,8 @@ import { ApiDemoApp, ApiDemoPage, TabPage } from './app.component';
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    ApiDemoPage
+    ApiDemoPage,
+    TabPage
   ]
 })
-export class AppModule {}
\ No newline at end of file
+export class AppModule {}
diff --git a/demos/tsconfig.json b/demos/tsconfig.json
index 9bf05ec5ca..b9b8f2b854 100644
--- a/demos/tsconfig.json
+++ b/demos/tsconfig.json
@@ -13,12 +13,12 @@
     "types": ["jasmine", "protractor"]
   },
   "include": [
-    "./src/**/app.module.ts",
-    "./src/**/main.ts"
+    "./src/toolbar/app.module.ts",
+    "./src/toolbar/main.ts"
   ],
   "compileOnSave": false,
   "buildOnSave": false,
   "atom": {
     "rewriteTsconfig": false
   }
-}
\ No newline at end of file
+}