diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9c349cd8..7cb707e3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,20 +62,21 @@ You are good to go! You're strongly encouraged to follow the official NativeScri
 
 NOTE: There are three test apps in the repository, located in the `/demo` directory. The steps below describe how to run the tests for the `AngularApp`, but the same approach can be used to run any other `e2e` tests.
 
-1. Navigate to `demo/AngularApp`
+1. Navigate to `demo/AngularApp`.
     ``` bash
     cd demo/AngularApp
     ```
 
-2. Install dependencies. This also installs your local copy of the nativescript-angular plugin.
-    ``` bash
-    npm install
+2. Install your local copy of the `nativescript-dev-webpack` plugin.
+    ```bash
+    npm run setup
     ```
+
 3. Make sure to have an emulator set up or connect a physical Android/iOS device.
 
-4. Build the app for Android or iOS
+4. Build the app for Android or iOS.
     ``` bash
-    tns run android/ios
+    tns run android/ios --bundle
     ```
 
 5. Install [appium](http://appium.io/) globally.
diff --git a/demo/AngularApp/package.json b/demo/AngularApp/package.json
index 1a6756ea..9c8ac61b 100644
--- a/demo/AngularApp/package.json
+++ b/demo/AngularApp/package.json
@@ -13,24 +13,24 @@
     }
   },
   "dependencies": {
-    "@angular/common": "~6.0.0",
-    "@angular/compiler": "~6.0.0",
-    "@angular/core": "~6.0.0",
-    "@angular/forms": "~6.0.0",
-    "@angular/http": "~6.0.0",
-    "@angular/platform-browser": "~6.0.0",
-    "@angular/platform-browser-dynamic": "~6.0.0",
-    "@angular/router": "~6.0.0",
-    "nativescript-angular": "~6.0.0",
+    "@angular/common": "~6.1.0-beta.3",
+    "@angular/compiler": "~6.1.0-beta.3",
+    "@angular/core": "~6.1.0-beta.3",
+    "@angular/forms": "~6.1.0-beta.3",
+    "@angular/http": "~6.1.0-beta.3",
+    "@angular/platform-browser": "~6.1.0-beta.3",
+    "@angular/platform-browser-dynamic": "~6.1.0-beta.3",
+    "@angular/router": "~6.1.0-beta.3",
+    "nativescript-angular": "next",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-beta.1",
+    "rxjs": "~6.0.0 || >=6.1.0",
     "tns-core-modules": "next",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
+    "@angular/compiler-cli": "~6.1.0-beta.3",
     "@ngtools/webpack": "6.1.0-rc.0",
-    "@angular/compiler-cli": "~6.1.0-beta.1",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
@@ -44,12 +44,13 @@
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi": "^0.11.0",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-sass": "^1.3.5",
+    "nativescript-dev-sass": "next",
     "nativescript-dev-typescript": "next",
-    "nativescript-dev-webpack": "file:../..",
+    "nativescript-dev-webpack": "next",
     "typescript": "~2.7.2"
   },
   "scripts": {
+    "setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
     "compile-tests": "tsc -p e2e --watch"
   }
diff --git a/demo/JavaScriptApp/package.json b/demo/JavaScriptApp/package.json
index 32543aa0..c9ccd161 100644
--- a/demo/JavaScriptApp/package.json
+++ b/demo/JavaScriptApp/package.json
@@ -28,11 +28,12 @@
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi": "^0.11.0",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-sass": "^1.3.5",
-    "nativescript-dev-webpack": "file:../..",
+    "nativescript-dev-sass": "next",
+    "nativescript-dev-webpack": "next",
     "node-sass": "^4.7.1"
   },
   "scripts": {
+    "setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
     "e2e": "mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json"
   }
 }
diff --git a/demo/TypeScriptApp/.gitignore b/demo/TypeScriptApp/.gitignore
index 0d71390f..5cd54bcf 100644
--- a/demo/TypeScriptApp/.gitignore
+++ b/demo/TypeScriptApp/.gitignore
@@ -1,5 +1,7 @@
 app/**/*.js
 e2e/**/*.js
 
+app/app.android.css
+app/app.ios.css
 app/main-page.android.css
 app/main-page.ios.css
\ No newline at end of file
diff --git a/demo/TypeScriptApp/app/app.android.css b/demo/TypeScriptApp/app/app.android.css
deleted file mode 100644
index c55b85fe..00000000
--- a/demo/TypeScriptApp/app/app.android.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/Users/vchimev/Work/git/nativescript-dev-webpack/demo/TypeScriptApp/node_modules/nativescript-theme-core/css/core.light.css);ActionBar{background-color:#7F9}.app-class{background-color:#7F9}
diff --git a/demo/TypeScriptApp/app/app.ios.css b/demo/TypeScriptApp/app/app.ios.css
deleted file mode 100644
index 2a1f4e39..00000000
--- a/demo/TypeScriptApp/app/app.ios.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/Users/vchimev/Work/git/nativescript-dev-webpack/demo/TypeScriptApp/node_modules/nativescript-theme-core/css/core.light.css);ActionBar{background-color:#999}.app-class{background-color:#999}
diff --git a/demo/TypeScriptApp/package.json b/demo/TypeScriptApp/package.json
index c4ecf688..d3729f51 100644
--- a/demo/TypeScriptApp/package.json
+++ b/demo/TypeScriptApp/package.json
@@ -28,12 +28,13 @@
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi": "^0.11.0",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-sass": "^1.3.5",
+    "nativescript-dev-sass": "next",
     "nativescript-dev-typescript": "next",
-    "nativescript-dev-webpack": "file:../..",
+    "nativescript-dev-webpack": "next",
     "typescript": "~2.7.2"
   },
   "scripts": {
+    "setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
     "compile-tests": "tsc -p e2e --watch"
   }