diff --git a/packages/demos/angular/package-lock.json b/packages/demos/angular/package-lock.json
index ea501a8802..a394ee9504 100644
--- a/packages/demos/angular/package-lock.json
+++ b/packages/demos/angular/package-lock.json
@@ -489,6 +489,14 @@
         "tslib": "1.9.0"
       }
     },
+    "@angular/router": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.2.tgz",
+      "integrity": "sha512-Yn71rFMMyIjwairBWGcUFbdiAVuTp7y5yEin8vJK3DAWgTyk0FYfhKHY3r9NofNH9M7Id53WafC02+3SseFBlA==",
+      "requires": {
+        "tslib": "1.9.0"
+      }
+    },
     "@danbucholtz/ng-router": {
       "version": "6.0.0-beta.1-20a6848be",
       "resolved": "https://registry.npmjs.org/@danbucholtz/ng-router/-/ng-router-6.0.0-beta.1-20a6848be.tgz",
diff --git a/packages/demos/angular/package.json b/packages/demos/angular/package.json
index a2c885ab3a..c8d59cb7bd 100644
--- a/packages/demos/angular/package.json
+++ b/packages/demos/angular/package.json
@@ -20,7 +20,8 @@
     "@angular/http": "latest",
     "@angular/platform-browser": "latest",
     "@angular/platform-browser-dynamic": "latest",
-    "@danbucholtz/ng-router": "latest",
+    "@angular/router": "latest",
+    "@danbucholtz/ng-router": "6.0.0-beta.1-20a6848be",
     "@ionic/angular": "next",
     "@ionic/core": "next",
     "core-js": "^2.4.1",
diff --git a/packages/demos/angular/src/app/action-sheet/action-sheet-routing.module.ts b/packages/demos/angular/src/app/action-sheet/action-sheet-routing.module.ts
index 593968a16d..2b92ca243a 100644
--- a/packages/demos/angular/src/app/action-sheet/action-sheet-routing.module.ts
+++ b/packages/demos/angular/src/app/action-sheet/action-sheet-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { ActionSheetPageComponent } from './action-sheet-page.component';
 
diff --git a/packages/demos/angular/src/app/alert/alert-routing.module.ts b/packages/demos/angular/src/app/alert/alert-routing.module.ts
index e808bde4d5..eaba04acee 100644
--- a/packages/demos/angular/src/app/alert/alert-routing.module.ts
+++ b/packages/demos/angular/src/app/alert/alert-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { AlertPageComponent } from './alert-page.component';
 
diff --git a/packages/demos/angular/src/app/app-routing.module.ts b/packages/demos/angular/src/app/app-routing.module.ts
index 635dfde898..764c580b00 100644
--- a/packages/demos/angular/src/app/app-routing.module.ts
+++ b/packages/demos/angular/src/app/app-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
   { path: '', redirectTo: '/home', pathMatch: 'full' },
diff --git a/packages/demos/angular/src/app/badge/badge-routing.module.ts b/packages/demos/angular/src/app/badge/badge-routing.module.ts
index 2003e89fe2..5e0bb35170 100644
--- a/packages/demos/angular/src/app/badge/badge-routing.module.ts
+++ b/packages/demos/angular/src/app/badge/badge-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { BadgePageComponent } from './badge-page.component';
 
diff --git a/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts
index 355698b0c8..33881ae20f 100644
--- a/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts
+++ b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { BasicInputsPageComponent } from './basic-inputs-page.component';
 
diff --git a/packages/demos/angular/src/app/card/card-routing.module.ts b/packages/demos/angular/src/app/card/card-routing.module.ts
index 42066510fb..516c66eddf 100644
--- a/packages/demos/angular/src/app/card/card-routing.module.ts
+++ b/packages/demos/angular/src/app/card/card-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { CardPageComponent } from './card-page.component';
 
diff --git a/packages/demos/angular/src/app/content/content-routing.module.ts b/packages/demos/angular/src/app/content/content-routing.module.ts
index 5e9b19a96b..50a9fd73ae 100644
--- a/packages/demos/angular/src/app/content/content-routing.module.ts
+++ b/packages/demos/angular/src/app/content/content-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { ContentPageComponent } from './content-page.component';
 
diff --git a/packages/demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts
index 7e5e4c3aed..5f3fe1a791 100644
--- a/packages/demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts
+++ b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { GroupInputsPageComponent } from './group-inputs-page.component';
 
diff --git a/packages/demos/angular/src/app/home-page/home-page-routing.module.ts b/packages/demos/angular/src/app/home-page/home-page-routing.module.ts
index a3861ecb19..86b31c4307 100644
--- a/packages/demos/angular/src/app/home-page/home-page-routing.module.ts
+++ b/packages/demos/angular/src/app/home-page/home-page-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { HomePageComponent } from './home-page.component';
 
diff --git a/packages/demos/angular/src/app/loading/loading-routing.module.ts b/packages/demos/angular/src/app/loading/loading-routing.module.ts
index 1722b18af3..56cc542646 100644
--- a/packages/demos/angular/src/app/loading/loading-routing.module.ts
+++ b/packages/demos/angular/src/app/loading/loading-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { LoadingPageComponent } from './loading-page.component';
 
diff --git a/packages/demos/angular/src/app/modal/modal-routing.module.ts b/packages/demos/angular/src/app/modal/modal-routing.module.ts
index a0ef110ff3..187a383887 100644
--- a/packages/demos/angular/src/app/modal/modal-routing.module.ts
+++ b/packages/demos/angular/src/app/modal/modal-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { ModalPageComponent } from './modal-page.component';
 
diff --git a/packages/demos/angular/src/app/nav/nav-routing.module.ts b/packages/demos/angular/src/app/nav/nav-routing.module.ts
index e5fa618a31..0a320b2423 100644
--- a/packages/demos/angular/src/app/nav/nav-routing.module.ts
+++ b/packages/demos/angular/src/app/nav/nav-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { NavPageComponent } from './nav.component';
 
diff --git a/packages/demos/angular/src/app/popover/popover-routing.module.ts b/packages/demos/angular/src/app/popover/popover-routing.module.ts
index 05c6346617..bad72d4bfa 100644
--- a/packages/demos/angular/src/app/popover/popover-routing.module.ts
+++ b/packages/demos/angular/src/app/popover/popover-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { PopoverPageComponent } from './popover-page.component';
 
diff --git a/packages/demos/angular/src/app/toast/toast-routing.module.ts b/packages/demos/angular/src/app/toast/toast-routing.module.ts
index 5ccf13684c..77de07b9ae 100644
--- a/packages/demos/angular/src/app/toast/toast-routing.module.ts
+++ b/packages/demos/angular/src/app/toast/toast-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@danbucholtz/ng-router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { ToastPageComponent } from './toast-page.component';
 
diff --git a/packages/demos/angular/testing/router-stubs.ts b/packages/demos/angular/testing/router-stubs.ts
index 5e3e5d3908..1fb588ef64 100644
--- a/packages/demos/angular/testing/router-stubs.ts
+++ b/packages/demos/angular/testing/router-stubs.ts
@@ -3,10 +3,10 @@
 /* tslint:disable:use-host-property-decorator */
 /* tslint:disable:no-input-rename */
 // export for convenience.
-export { ActivatedRoute, Router, RouterLink, RouterOutlet} from '@danbucholtz/ng-router';
+export { ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router';
 
 import { Component, Directive, Injectable, Input } from '@angular/core';
-import { NavigationExtras } from '@danbucholtz/ng-router';
+import { NavigationExtras } from '@angular/router';
 
 @Directive({
   selector: '[routerLink]',