diff --git a/.gitignore b/.gitignore
index 3ed2646..78bb375 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 !index.d.ts
 !src/typings/*d.ts
 !scripts/*.js
+!webpack.config.js
 demo/app/*.js
 !demo/karma.conf.js
 !demo/app/tests/*.js
diff --git a/demo-ng/App_Resources/Android/app.gradle b/demo-ng/App_Resources/Android/app.gradle
new file mode 100644
index 0000000..d71702c
--- /dev/null
+++ b/demo-ng/App_Resources/Android/app.gradle
@@ -0,0 +1,19 @@
+// Add your native dependencies here:
+
+// Uncomment to add recyclerview-v7 dependency
+//dependencies {
+//	implementation 'com.android.support:recyclerview-v7:+'
+//}
+
+// If you want to add something to be applied before applying plugins' include.gradle files 
+// e.g. project.ext.googlePlayServicesVersion = "15.0.1"
+// create a file named before-plugins.gradle in the current directory and place it there
+ 
+android {  
+  defaultConfig {  
+    generatedDensities = []
+  }  
+  aaptOptions {  
+    additionalParameters "--no-version-vectors"  
+  }  
+} 
diff --git a/demo-ng/app/App_Resources/Android/src/main/AndroidManifest.xml b/demo-ng/App_Resources/Android/src/main/AndroidManifest.xml
similarity index 91%
rename from demo-ng/app/App_Resources/Android/src/main/AndroidManifest.xml
rename to demo-ng/App_Resources/Android/src/main/AndroidManifest.xml
index 9db8321..e0109f5 100644
--- a/demo-ng/app/App_Resources/Android/src/main/AndroidManifest.xml
+++ b/demo-ng/App_Resources/Android/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
 		<activity
 			android:name="com.tns.NativeScriptActivity"
 			android:label="@string/title_activity_kimera"
-			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
 			android:theme="@style/LaunchScreenTheme">
 
 			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png b/demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/background.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/background.png
diff --git a/demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/icon.png b/demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..9cde84c
Binary files /dev/null and b/demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/icon.png differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png b/demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/background.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/background.png
diff --git a/demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/icon.png b/demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000..4d6a674
Binary files /dev/null and b/demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/icon.png differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png b/demo-ng/App_Resources/Android/src/main/res/drawable-mdpi/background.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-mdpi/background.png
diff --git a/demo-ng/App_Resources/Android/src/main/res/drawable-mdpi/icon.png b/demo-ng/App_Resources/Android/src/main/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000..92ccc85
Binary files /dev/null and b/demo-ng/App_Resources/Android/src/main/res/drawable-mdpi/icon.png differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/demo-ng/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml b/demo-ng/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
rename to demo-ng/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xhdpi/background.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-xhdpi/background.png
diff --git a/demo-ng/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png
new file mode 100644
index 0000000..8bcde62
Binary files /dev/null and b/demo-ng/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png
diff --git a/demo-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png
new file mode 100644
index 0000000..9d81c85
Binary files /dev/null and b/demo-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png
diff --git a/demo-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 0000000..9a34d0d
Binary files /dev/null and b/demo-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/demo-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
rename to demo-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/values-v21/colors.xml b/demo-ng/App_Resources/Android/src/main/res/values-v21/colors.xml
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/values-v21/colors.xml
rename to demo-ng/App_Resources/Android/src/main/res/values-v21/colors.xml
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/values-v21/styles.xml b/demo-ng/App_Resources/Android/src/main/res/values-v21/styles.xml
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/values-v21/styles.xml
rename to demo-ng/App_Resources/Android/src/main/res/values-v21/styles.xml
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/values/colors.xml b/demo-ng/App_Resources/Android/src/main/res/values/colors.xml
similarity index 100%
rename from demo-ng/app/App_Resources/Android/src/main/res/values/colors.xml
rename to demo-ng/App_Resources/Android/src/main/res/values/colors.xml
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/values/styles.xml b/demo-ng/App_Resources/Android/src/main/res/values/styles.xml
similarity index 97%
rename from demo-ng/app/App_Resources/Android/src/main/res/values/styles.xml
rename to demo-ng/App_Resources/Android/src/main/res/values/styles.xml
index 1e8c7f2..c793e6d 100644
--- a/demo-ng/app/App_Resources/Android/src/main/res/values/styles.xml
+++ b/demo-ng/App_Resources/Android/src/main/res/values/styles.xml
@@ -32,7 +32,7 @@
     <style name="AppTheme" parent="AppThemeBase">
     </style>
 
-    <!-- theme for actioon-bar -->
+    <!-- theme for action-bar -->
     <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
         <item name="android:background">@color/ns_primary</item>
         <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 81%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index 5f53593..1a8b0e6 100644
--- a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,17 @@
 {
   "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "icon-20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "icon-20@3x.png",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -30,18 +42,6 @@
       "filename" : "icon-40@3x.png",
       "scale" : "3x"
     },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "icon-57.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "icon-57@2x.png",
-      "scale" : "2x"
-    },
     {
       "size" : "60x60",
       "idiom" : "iphone",
@@ -55,51 +55,39 @@
       "scale" : "3x"
     },
     {
-      "size" : "29x29",
+      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-29.png",
+      "filename" : "icon-20.png",
       "scale" : "1x"
     },
     {
-      "size" : "29x29",
+      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-29@2x.png",
+      "filename" : "icon-20@2x.png",
       "scale" : "2x"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "50x50",
+      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-50.png",
+      "filename" : "icon-29.png",
       "scale" : "1x"
     },
     {
-      "size" : "50x50",
+      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-50@2x.png",
+      "filename" : "icon-29@2x.png",
       "scale" : "2x"
     },
     {
-      "size" : "72x72",
+      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "icon-72.png",
+      "filename" : "icon-40.png",
       "scale" : "1x"
     },
     {
-      "size" : "72x72",
+      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "icon-72@2x.png",
+      "filename" : "icon-40@2x.png",
       "scale" : "2x"
     },
     {
@@ -119,6 +107,12 @@
       "idiom" : "ipad",
       "filename" : "icon-83.5@2x.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "icon-1024.png",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png
new file mode 100644
index 0000000..a1d7eb4
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png
new file mode 100644
index 0000000..5797bde
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
new file mode 100644
index 0000000..a0bc569
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
new file mode 100644
index 0000000..851ac65
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png
new file mode 100644
index 0000000..bb9b9e8
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
new file mode 100644
index 0000000..ec609dc
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
new file mode 100644
index 0000000..a971808
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png
new file mode 100644
index 0000000..214800e
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
new file mode 100644
index 0000000..8554b88
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
new file mode 100644
index 0000000..a22626b
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
new file mode 100644
index 0000000..a22626b
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
new file mode 100644
index 0000000..492c9c8
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png
new file mode 100644
index 0000000..9208113
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
new file mode 100644
index 0000000..24415e5
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
new file mode 100644
index 0000000..b3ef1bf
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/Contents.json b/demo-ng/App_Resources/iOS/Assets.xcassets/Contents.json
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/Contents.json
rename to demo-ng/App_Resources/iOS/Assets.xcassets/Contents.json
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
similarity index 72%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
index 4414bad..bb3b4a5 100644
--- a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,5 +1,59 @@
 {
   "images" : [
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2688h",
+      "filename" : "Default-Portrait-XS-Max.png",
+      "minimum-system-version" : "12.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2688h",
+      "filename" : "Default-Landscape-XS-Max.png",
+      "minimum-system-version" : "12.0",
+      "orientation" : "landscape",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "1792h",
+      "filename" : "Default-Portrait-XR.png",
+      "minimum-system-version" : "12.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "1792h",
+      "filename" : "Default-Landscape-XR.png",
+      "minimum-system-version" : "12.0",
+      "orientation" : "landscape",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2436h",
+      "filename" : "Default-1125h.png",
+      "minimum-system-version" : "11.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2436h",
+      "filename" : "Default-Landscape-X.png",
+      "minimum-system-version" : "11.0",
+      "orientation" : "landscape",
+      "scale" : "3x"
+    },
     {
       "extent" : "full-screen",
       "idiom" : "iphone",
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-1125h.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-1125h.png
new file mode 100644
index 0000000..2913f85
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-1125h.png differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-X.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-X.png
new file mode 100644
index 0000000..cd94a3a
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-X.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XR.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XR.png
new file mode 100644
index 0000000..686fda1
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XR.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XS-Max.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XS-Max.png
new file mode 100644
index 0000000..415e9c8
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-XS-Max.png differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XR.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XR.png
new file mode 100644
index 0000000..b66a4f2
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XR.png differ
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XS-Max.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XS-Max.png
new file mode 100644
index 0000000..e34463d
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait-XS-Max.png differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
similarity index 87%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
index 4f4e9c5..a0cc571 100644
--- a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
+++ b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
@@ -12,6 +12,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "LaunchScreen.AspectFill@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen.AspectFill@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen.AspectFill@3x.png
new file mode 100644
index 0000000..a954cc8
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen.AspectFill@3x.png differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
similarity index 88%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
index 23c0ffd..6e26b7b 100644
--- a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
+++ b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
@@ -12,6 +12,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "LaunchScreen.Center@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png
rename to demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png
diff --git a/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen.Center@3x.png b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen.Center@3x.png
new file mode 100644
index 0000000..b2973b0
Binary files /dev/null and b/demo-ng/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen.Center@3x.png differ
diff --git a/demo-ng/app/App_Resources/iOS/Info.plist b/demo-ng/App_Resources/iOS/Info.plist
similarity index 100%
rename from demo-ng/app/App_Resources/iOS/Info.plist
rename to demo-ng/App_Resources/iOS/Info.plist
diff --git a/demo-ng/app/App_Resources/iOS/LaunchScreen.storyboard b/demo-ng/App_Resources/iOS/LaunchScreen.storyboard
similarity index 66%
rename from demo-ng/app/App_Resources/iOS/LaunchScreen.storyboard
rename to demo-ng/App_Resources/iOS/LaunchScreen.storyboard
index 2ad9471..c4e5a3f 100644
--- a/demo-ng/app/App_Resources/iOS/LaunchScreen.storyboard
+++ b/demo-ng/App_Resources/iOS/LaunchScreen.storyboard
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina5_9" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,36 +18,36 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.AspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="wtH-rr-YfP">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.Center" translatesAutoresizingMaskIntoConstraints="NO" id="s1z-aa-wYv">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <rect key="frame" x="0.0" y="150" width="375" height="512"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="wtH-rr-YfP" secondAttribute="bottom" id="5FO-pR-qKb"/>
+                            <constraint firstAttribute="trailing" secondItem="s1z-aa-wYv" secondAttribute="trailing" id="4Rf-kf-vql"/>
+                            <constraint firstAttribute="bottom" secondItem="wtH-rr-YfP" secondAttribute="bottom" id="5CS-At-4ka"/>
                             <constraint firstItem="wtH-rr-YfP" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="Awn-b8-xf1"/>
-                            <constraint firstItem="s1z-aa-wYv" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="CiP-yX-1sg"/>
+                            <constraint firstItem="s1z-aa-wYv" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="BpJ-vb-eKA"/>
+                            <constraint firstItem="s1z-aa-wYv" firstAttribute="trailing" secondItem="wtH-rr-YfP" secondAttribute="trailing" id="QIM-7J-OZz"/>
                             <constraint firstAttribute="trailing" secondItem="wtH-rr-YfP" secondAttribute="trailing" id="RXg-rW-UK8"/>
-                            <constraint firstItem="s1z-aa-wYv" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="agC-wa-3bd"/>
+                            <constraint firstItem="s1z-aa-wYv" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="Rcp-LG-48z"/>
                             <constraint firstItem="wtH-rr-YfP" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="cch-8E-tYu"/>
-                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="s1z-aa-wYv" secondAttribute="bottom" id="fNc-Ro-KaG"/>
-                            <constraint firstAttribute="trailing" secondItem="s1z-aa-wYv" secondAttribute="trailing" id="qoI-OC-Zk7"/>
                         </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="510" y="238"/>
+            <point key="canvasLocation" x="509.60000000000002" y="237.93103448275863"/>
         </scene>
     </scenes>
     <resources>
         <image name="LaunchScreen.AspectFill" width="768" height="1024"/>
-        <image name="LaunchScreen.Center" width="40" height="40"/>
+        <image name="LaunchScreen.Center" width="384" height="512"/>
     </resources>
 </document>
diff --git a/demo-ng/app/App_Resources/iOS/build.xcconfig b/demo-ng/App_Resources/iOS/build.xcconfig
similarity index 87%
rename from demo-ng/app/App_Resources/iOS/build.xcconfig
rename to demo-ng/App_Resources/iOS/build.xcconfig
index 9d73843..4b01184 100644
--- a/demo-ng/app/App_Resources/iOS/build.xcconfig
+++ b/demo-ng/App_Resources/iOS/build.xcconfig
@@ -1,7 +1,7 @@
 // You can add custom settings here
 // for example you can uncomment the following line to force distribution code signing
 // CODE_SIGN_IDENTITY = iPhone Distribution 
-// To build for device with XCode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
+// To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
 // DEVELOPMENT_TEAM = YOUR_TEAM_ID;
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
diff --git a/demo-ng/angular.json b/demo-ng/angular.json
new file mode 100644
index 0000000..1fbd446
--- /dev/null
+++ b/demo-ng/angular.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "cli": {
+    "defaultCollection": "@nativescript/schematics"
+  },
+  "projects": {
+    "hello-world": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "ns"
+    }
+  },
+  "defaultProject": "hello-world"
+}
diff --git a/demo-ng/app/App_Resources/Android/app.gradle b/demo-ng/app/App_Resources/Android/app.gradle
deleted file mode 100644
index f56d913..0000000
--- a/demo-ng/app/App_Resources/Android/app.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-// Add your native dependencies here:
-
-// Uncomment to add recyclerview-v7 dependency
-//dependencies {
-//	compile 'com.android.support:recyclerview-v7:+'
-//}
-
-android {  
-  defaultConfig {  
-    generatedDensities = []
-    applicationId = "org.nativescript.demong"  
-  }  
-  aaptOptions {  
-    additionalParameters "--no-version-vectors"  
-  }  
-} 
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png
deleted file mode 100755
index 1034356..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/nativescript.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/nativescript.png
deleted file mode 100755
index 5d04256..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/nativescript.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png
deleted file mode 100755
index ddfc17a..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/nativescript.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/nativescript.png
deleted file mode 100755
index 1631845..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/nativescript.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png
deleted file mode 100755
index 486e410..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/nativescript.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/nativescript.png
deleted file mode 100755
index 96c488e..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/nativescript.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png
deleted file mode 100644
index f291882..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/nativescript.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/nativescript.png
deleted file mode 100755
index 697fff9..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/nativescript.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index 4f69cb2..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/nativescript.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/nativescript.png
deleted file mode 100755
index 8fb0cb6..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/nativescript.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index 50887a8..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/nativescript.png b/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/nativescript.png
deleted file mode 100755
index 0a6dd97..0000000
Binary files a/demo-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/nativescript.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png
deleted file mode 100644
index 9e15af0..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
deleted file mode 100644
index 7b9e555..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
deleted file mode 100644
index 76f61ec..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png
deleted file mode 100644
index 15b06db..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
deleted file mode 100644
index 585065f..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
deleted file mode 100644
index a450c42..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png
deleted file mode 100755
index 4a62478..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png
deleted file mode 100755
index 01ff7c1..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png
deleted file mode 100755
index beea819..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png
deleted file mode 100755
index c3dc7b0..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
deleted file mode 100644
index 457b6d9..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
deleted file mode 100644
index fa5a6ac..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png
deleted file mode 100755
index 556bdd6..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png
deleted file mode 100755
index 4f69cb2..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png
deleted file mode 100644
index 94abcf7..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
deleted file mode 100644
index 2e71dd3..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
deleted file mode 100644
index 4abc9ec..0000000
Binary files a/demo-ng/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/nativescript.png b/demo-ng/app/App_Resources/iOS/nativescript.png
deleted file mode 100755
index 5772a7d..0000000
Binary files a/demo-ng/app/App_Resources/iOS/nativescript.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/nativescript@2x.png b/demo-ng/app/App_Resources/iOS/nativescript@2x.png
deleted file mode 100755
index 0faea87..0000000
Binary files a/demo-ng/app/App_Resources/iOS/nativescript@2x.png and /dev/null differ
diff --git a/demo-ng/app/App_Resources/iOS/nativescript@3x.png b/demo-ng/app/App_Resources/iOS/nativescript@3x.png
deleted file mode 100755
index 0a6dd97..0000000
Binary files a/demo-ng/app/App_Resources/iOS/nativescript@3x.png and /dev/null differ
diff --git a/demo-ng/app/README.md b/demo-ng/app/README.md
deleted file mode 100644
index 1a8fef6..0000000
--- a/demo-ng/app/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# NativeScript Angular 2 Template
-
-This template creates a "Hello, world" NativeScript app using TypeScript and Angular 2.
-
-You can create a new app that uses this template with either the `--template` option.
-
-```
-tns create my-app-name --template tns-template-hello-world-ng
-```
-
-Or the `--ng` shorthand.
-
-```
-tns create my-app-name --ng
-```
-
-> Note: Both commands will create a new NativeScript app that uses the latest version of this template published to [npm] (https://www.npmjs.com/package/tns-template-hello-world-ts).
-
-If you want to create a new app that uses the source of the template from the `master` branch, you can execute the following:
-
-```
-tns create my-app-name --template https://github.com/NativeScript/template-hello-world-ng.git#master
-```
-
-**NB:** Please, have in mind that the master branch may refer to dependencies that are not on NPM yet!
diff --git a/demo-ng/nsconfig.json b/demo-ng/nsconfig.json
new file mode 100644
index 0000000..a64c9fa
--- /dev/null
+++ b/demo-ng/nsconfig.json
@@ -0,0 +1,4 @@
+{
+  "appResourcesPath": "App_Resources",
+  "appPath": "src"
+}
diff --git a/demo-ng/package.json b/demo-ng/package.json
index 5850f2e..055a84c 100644
--- a/demo-ng/package.json
+++ b/demo-ng/package.json
@@ -1,42 +1,41 @@
 {
-  "description": "NativeScript Application",
-  "license": "SEE LICENSE IN <your-license-filename>",
-  "readme": "NativeScript Application",
-  "repository": "<fill-your-repository-here>",
   "nativescript": {
     "id": "org.nativescript.demong",
-    "tns-ios": {
-      "version": "6.0.1"
-    },
     "tns-android": {
-      "version": "6.0.0"
+      "version": "6.3.1"
     }
   },
   "dependencies": {
-    "@angular/animations": "8.0.0",
-    "@angular/common": "8.0.0",
-    "@angular/compiler": "8.0.0",
-    "@angular/core": "8.0.0",
-    "@angular/forms": "8.0.0",
-    "@angular/platform-browser": "8.0.0",
-    "@angular/platform-browser-dynamic": "8.0.0",
-    "@angular/router": "8.0.0",
-    "@nstudio/nativescript-camera-plus": "file:../src",
-    "nativescript-angular": "8.0.2",
+    "@nativescript/angular": "~8.20.4",
+    "@nativescript/core": "^6.3.2",
+    "@nstudio/nativescript-camera-plus": "file:../src/nstudio-nativescript-camera-plus-3.0.5.tgz",
+    "@angular/animations": "8.2.14",
+    "@angular/common": "^8.2.14",
+    "@angular/compiler": "^8.2.14",
+    "@angular/core": "^8.2.14",
+    "@angular/forms": "^8.2.14",
+    "@angular/http": "8.0.0-beta.10",
+    "@angular/platform-browser": "^8.2.14",
+    "@angular/platform-browser-dynamic": "^8.2.14",
+    "@angular/router": "^8.2.14",
     "nativescript-theme-core": "~1.0.2",
-    "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.4.0",
-    "tns-core-modules": "6.0.1",
-    "zone.js": "0.9.1"
+    "reflect-metadata": "~0.1.13",
+    "rxjs": "^6.5.4",
+    "zone.js": "0.10.2"
   },
   "devDependencies": {
-    "babel-traverse": "6.24.1",
-    "babel-types": "6.24.1",
-    "babylon": "6.17.0",
-    "lazy": "1.0.11",
-    "typescript": "3.4.5",
-    "nativescript-dev-webpack": "1.0.1",
-    "@angular/compiler-cli": "8.0.0",
-    "@ngtools/webpack": "8.0.0"
+    "jasmine-core": "3.3.0",
+    "karma": "4.0.1",
+    "karma-jasmine": "1.1.2",
+    "karma-nativescript-launcher": "0.4.0",
+    "@angular/compiler-cli": "~8.2.14",
+    "@nativescript/schematics": "~0.5.0",
+    "@ngtools/webpack": "~8.3.21",
+    "nativescript-dev-webpack": "~1.4.1",
+    "typescript": "3.7.4"
+  },
+  "scripts": {
+    "build.plugin": "cd ../src && npm run build",
+    "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/platforms/**'"
   }
 }
diff --git a/demo-ng/app/app.css b/demo-ng/src/app.css
similarity index 100%
rename from demo-ng/app/app.css
rename to demo-ng/src/app.css
diff --git a/demo-ng/app/app.component.html b/demo-ng/src/app/app.component.html
similarity index 100%
rename from demo-ng/app/app.component.html
rename to demo-ng/src/app/app.component.html
diff --git a/demo-ng/app/app.component.ts b/demo-ng/src/app/app.component.ts
similarity index 78%
rename from demo-ng/app/app.component.ts
rename to demo-ng/src/app/app.component.ts
index 09569e4..6bba8b5 100644
--- a/demo-ng/app/app.component.ts
+++ b/demo-ng/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
+import { registerElement } from '@nativescript/angular/element-registry';
 import { CameraPlus } from '@nstudio/nativescript-camera-plus';
-import { registerElement } from 'nativescript-angular/element-registry';
 registerElement('CameraPlus', () => <any>CameraPlus);
 
 @Component({
diff --git a/demo-ng/app/app.module.ts b/demo-ng/src/app/app.module.ts
similarity index 84%
rename from demo-ng/app/app.module.ts
rename to demo-ng/src/app/app.module.ts
index 4ae3384..d96b74c 100644
--- a/demo-ng/app/app.module.ts
+++ b/demo-ng/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NativeScriptModule } from 'nativescript-angular/nativescript.module';
+import { NativeScriptModule } from '@nativescript/angular/nativescript.module';
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app.routing';
 import { CaptureComponent } from './capture/capture.component';
diff --git a/demo-ng/app/app.routing.ts b/demo-ng/src/app/app.routing.ts
similarity index 85%
rename from demo-ng/app/app.routing.ts
rename to demo-ng/src/app/app.routing.ts
index 887a1e5..2fb4fc7 100644
--- a/demo-ng/app/app.routing.ts
+++ b/demo-ng/src/app/app.routing.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes } from '@angular/router';
-import { NativeScriptRouterModule } from 'nativescript-angular/router';
+import { NativeScriptRouterModule } from '@nativescript/angular/router';
 import { CaptureComponent } from './capture/capture.component';
 
 const routes: Routes = [
diff --git a/demo-ng/app/capture/capture.component.css b/demo-ng/src/app/capture/capture.component.css
similarity index 100%
rename from demo-ng/app/capture/capture.component.css
rename to demo-ng/src/app/capture/capture.component.css
diff --git a/demo-ng/app/capture/capture.component.html b/demo-ng/src/app/capture/capture.component.html
similarity index 100%
rename from demo-ng/app/capture/capture.component.html
rename to demo-ng/src/app/capture/capture.component.html
diff --git a/demo-ng/app/capture/capture.component.ts b/demo-ng/src/app/capture/capture.component.ts
similarity index 96%
rename from demo-ng/app/capture/capture.component.ts
rename to demo-ng/src/app/capture/capture.component.ts
index 815ae05..f405dde 100644
--- a/demo-ng/app/capture/capture.component.ts
+++ b/demo-ng/src/app/capture/capture.component.ts
@@ -1,7 +1,7 @@
 import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
+import { ImageAsset } from '@nativescript/core/image-asset';
+import { ImageSource } from '@nativescript/core/image-source';
 import { CameraPlus } from '@nstudio/nativescript-camera-plus';
-import { ImageAsset } from 'tns-core-modules/image-asset';
-import { ImageSource } from 'tns-core-modules/image-source';
 
 @Component({
   selector: 'ns-capture',
diff --git a/demo-ng/app/main.ts b/demo-ng/src/main.ts
similarity index 57%
rename from demo-ng/app/main.ts
rename to demo-ng/src/main.ts
index e4e5abf..632afab 100644
--- a/demo-ng/app/main.ts
+++ b/demo-ng/src/main.ts
@@ -1,5 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from 'nativescript-angular/platform';
-import { AppModule } from './app.module';
+import { platformNativeScriptDynamic } from '@nativescript/angular/platform';
+import { AppModule } from './app/app.module';
 
 platformNativeScriptDynamic().bootstrapModule(AppModule);
diff --git a/demo-ng/app/package.json b/demo-ng/src/package.json
similarity index 58%
rename from demo-ng/app/package.json
rename to demo-ng/src/package.json
index 4a13b86..6c921f9 100644
--- a/demo-ng/app/package.json
+++ b/demo-ng/src/package.json
@@ -1,7 +1,8 @@
 {
   "android": {
-    "v8Flags": "--expose_gc"
+    "v8Flags": "--expose_gc",
+    "markingMode": "none"
   },
   "main": "main.js",
   "name": "tns-template-hello-world-ng"
-}
\ No newline at end of file
+}
diff --git a/demo-ng/tsconfig.json b/demo-ng/tsconfig.json
index 95c7b18..d50a205 100644
--- a/demo-ng/tsconfig.json
+++ b/demo-ng/tsconfig.json
@@ -1,32 +1,20 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es2015",
-        "declaration": false,
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true,
-        "noEmitHelpers": false,
-        "noEmitOnError": false,
-        "skipLibCheck": true,
-        "lib": [
-            "es2017",
-            "dom",
-            "es6",
-            "es2015.iterable"
-        ],
-        "baseUrl": ".",
-        "paths": {
-            "*": [
-                "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
-            ],
-            "~/*": [
-                "app/*"
-            ]
-        }
-    },
-    "exclude": [
-        "node_modules",
-        "platforms"
-    ]
-}
\ No newline at end of file
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "skipLibCheck": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "noEmitHelpers": true,
+    "noEmitOnError": false,
+    "lib": ["es6", "dom", "es2015.iterable"],
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["src/*"]
+    }
+  },
+  "exclude": ["node_modules", "platforms"],
+  "angularCompilerOptions": {
+    "disableTypeScriptVersionCheck": true // disabling for now to use TS 3.7.3 which should be fine with Angular and available in Q1 with NG9 release
+  }
+}
diff --git a/demo-ng/tsconfig.tns.json b/demo-ng/tsconfig.tns.json
index 95f2ece..9ce50ed 100644
--- a/demo-ng/tsconfig.tns.json
+++ b/demo-ng/tsconfig.tns.json
@@ -1,7 +1,7 @@
 {
     "extends": "./tsconfig",
     "compilerOptions": {
-        "module": "es2015",
+        "module": "esNext",
         "moduleResolution": "node"
     }
 }
diff --git a/demo-ng/webpack.config.js b/demo-ng/webpack.config.js
new file mode 100644
index 0000000..532fb64
--- /dev/null
+++ b/demo-ng/webpack.config.js
@@ -0,0 +1,354 @@
+const { join, relative, resolve, sep, dirname } = require("path");
+
+const webpack = require("webpack");
+const nsWebpack = require("nativescript-dev-webpack");
+const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target");
+const { nsReplaceBootstrap } = require("nativescript-dev-webpack/transformers/ns-replace-bootstrap");
+const { nsReplaceLazyLoader } = require("nativescript-dev-webpack/transformers/ns-replace-lazy-loader");
+const { nsSupportHmrNg } = require("nativescript-dev-webpack/transformers/ns-support-hmr-ng");
+const { getMainModulePath } = require("nativescript-dev-webpack/utils/ast-utils");
+const { getNoEmitOnErrorFromTSConfig, getCompilerOptionsFromTSConfig } = require("nativescript-dev-webpack/utils/tsconfig-utils");
+const CleanWebpackPlugin = require("clean-webpack-plugin");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
+const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
+const TerserPlugin = require("terser-webpack-plugin");
+const { getAngularCompilerPlugin } = require("nativescript-dev-webpack/plugins/NativeScriptAngularCompilerPlugin");
+const hashSalt = Date.now().toString();
+
+module.exports = env => {
+    // Add your custom Activities, Services and other Android app components here.
+    const appComponents = [
+        "tns-core-modules/ui/frame",
+        "tns-core-modules/ui/frame/activity",
+    ];
+
+    const platform = env && (env.android && "android" || env.ios && "ios");
+    if (!platform) {
+        throw new Error("You need to provide a target platform!");
+    }
+
+    const AngularCompilerPlugin = getAngularCompilerPlugin(platform);
+    const projectRoot = __dirname;
+
+    // Default destination inside platforms/<platform>/...
+    const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
+
+    const {
+        // The 'appPath' and 'appResourcesPath' values are fetched from
+        // the nsconfig.json configuration file.
+        appPath = "src",
+        appResourcesPath = "App_Resources",
+
+        // You can provide the following flags when running 'tns run android|ios'
+        aot, // --env.aot
+        snapshot, // --env.snapshot,
+        production, // --env.production
+        uglify, // --env.uglify
+        report, // --env.report
+        sourceMap, // --env.sourceMap
+        hiddenSourceMap, // --env.hiddenSourceMap
+        hmr, // --env.hmr,
+        unitTesting, // --env.unitTesting
+        verbose, // --env.verbose
+        snapshotInDocker, // --env.snapshotInDocker
+        skipSnapshotTools, // --env.skipSnapshotTools
+        compileSnapshot // --env.compileSnapshot
+    } = env;
+
+    const useLibs = compileSnapshot;
+    const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
+    const externals = nsWebpack.getConvertedExternals(env.externals);
+    const appFullPath = resolve(projectRoot, appPath);
+    const tsConfigName = "tsconfig.tns.json";
+    const tsConfigPath = join(__dirname, tsConfigName);
+    const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
+    const hasRootLevelScopedAngular = nsWebpack.hasRootLevelScopedAngular({ projectDir: projectRoot });
+    let coreModulesPackageName = "tns-core-modules";
+    const alias = {
+        '~': appFullPath
+    };
+
+    const compilerOptions = getCompilerOptionsFromTSConfig(tsConfigPath);
+    if (hasRootLevelScopedModules) {
+        coreModulesPackageName = "@nativescript/core";
+        alias["tns-core-modules"] = coreModulesPackageName;
+        nsWebpack.processTsPathsForScopedModules({ compilerOptions });
+    }
+
+    if (hasRootLevelScopedAngular) {
+        alias["nativescript-angular"] = "@nativescript/angular";
+        nsWebpack.processTsPathsForScopedAngular({ compilerOptions });
+    }
+
+    const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
+    const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`;
+    const entryPath = `.${sep}${entryModule}`;
+    const entries = { bundle: entryPath };
+    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1);
+    if (platform === "ios" && !areCoreModulesExternal) {
+        entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules";
+    };
+
+    const ngCompilerTransformers = [];
+    const additionalLazyModuleResources = [];
+    if (aot) {
+        ngCompilerTransformers.push(nsReplaceBootstrap);
+    }
+
+    if (hmr) {
+        ngCompilerTransformers.push(nsSupportHmrNg);
+    }
+
+    // when "@angular/core" is external, it's not included in the bundles. In this way, it will be used
+    // directly from node_modules and the Angular modules loader won't be able to resolve the lazy routes
+    // fixes https://github.com/NativeScript/nativescript-cli/issues/4024
+    if (env.externals && env.externals.indexOf("@angular/core") > -1) {
+        const appModuleRelativePath = getMainModulePath(resolve(appFullPath, entryModule), tsConfigName);
+        if (appModuleRelativePath) {
+            const appModuleFolderPath = dirname(resolve(appFullPath, appModuleRelativePath));
+            // include the lazy loader inside app module
+            ngCompilerTransformers.push(nsReplaceLazyLoader);
+            // include the new lazy loader path in the allowed ones
+            additionalLazyModuleResources.push(appModuleFolderPath);
+        }
+    }
+
+    const ngCompilerPlugin = new AngularCompilerPlugin({
+        hostReplacementPaths: nsWebpack.getResolver([platform, "tns"]),
+        platformTransformers: ngCompilerTransformers.map(t => t(() => ngCompilerPlugin, resolve(appFullPath, entryModule), projectRoot)),
+        mainPath: join(appFullPath, entryModule),
+        tsConfigPath,
+        skipCodeGeneration: !aot,
+        sourceMap: !!isAnySourceMapEnabled,
+        additionalLazyModuleResources: additionalLazyModuleResources,
+        compilerOptions: { paths: compilerOptions.paths }
+    });
+
+    let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
+
+    const itemsToClean = [`${dist}/**/*`];
+    if (platform === "android") {
+        itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "src", "main", "assets", "snapshots")}`);
+        itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
+    }
+
+    const noEmitOnErrorFromTSConfig = getNoEmitOnErrorFromTSConfig(join(projectRoot, tsConfigName));
+
+    nsWebpack.processAppComponents(appComponents, platform);
+    const config = {
+        mode: production ? "production" : "development",
+        context: appFullPath,
+        externals,
+        watchOptions: {
+            ignored: [
+                appResourcesFullPath,
+                // Don't watch hidden files
+                "**/.*",
+            ]
+        },
+        target: nativescriptTarget,
+        entry: entries,
+        output: {
+            pathinfo: false,
+            path: dist,
+            sourceMapFilename,
+            libraryTarget: "commonjs2",
+            filename: "[name].js",
+            globalObject: "global",
+            hashSalt
+        },
+        resolve: {
+            extensions: [".ts", ".js", ".scss", ".css"],
+            // Resolve {N} system modules from tns-core-modules
+            modules: [
+                resolve(__dirname, `node_modules/${coreModulesPackageName}`),
+                resolve(__dirname, "node_modules"),
+                `node_modules/${coreModulesPackageName}`,
+                "node_modules",
+            ],
+            alias,
+            symlinks: true
+        },
+        resolveLoader: {
+            symlinks: false
+        },
+        node: {
+            // Disable node shims that conflict with NativeScript
+            "http": false,
+            "timers": false,
+            "setImmediate": false,
+            "fs": "empty",
+            "__dirname": false,
+        },
+        devtool: hiddenSourceMap ? "hidden-source-map" : (sourceMap ? "inline-source-map" : "none"),
+        optimization: {
+            runtimeChunk: "single",
+            noEmitOnErrors: noEmitOnErrorFromTSConfig,
+            splitChunks: {
+                cacheGroups: {
+                    vendor: {
+                        name: "vendor",
+                        chunks: "all",
+                        test: (module, chunks) => {
+                            const moduleName = module.nameForCondition ? module.nameForCondition() : '';
+                            return /[\\/]node_modules[\\/]/.test(moduleName) ||
+                                appComponents.some(comp => comp === moduleName);
+                        },
+                        enforce: true,
+                    },
+                }
+            },
+            minimize: !!uglify,
+            minimizer: [
+                new TerserPlugin({
+                    parallel: true,
+                    cache: true,
+                    sourceMap: isAnySourceMapEnabled,
+                    terserOptions: {
+                        output: {
+                            comments: false,
+                            semicolons: !isAnySourceMapEnabled
+                        },
+                        compress: {
+                            // The Android SBG has problems parsing the output
+                            // when these options are enabled
+                            'collapse_vars': platform !== "android",
+                            sequences: platform !== "android",
+                        }
+                    }
+                })
+            ],
+        },
+        module: {
+            rules: [
+                {
+                    include: join(appFullPath, entryPath),
+                    use: [
+                        // Require all Android app components
+                        platform === "android" && {
+                            loader: "nativescript-dev-webpack/android-app-components-loader",
+                            options: { modules: appComponents }
+                        },
+
+                        {
+                            loader: "nativescript-dev-webpack/bundle-config-loader",
+                            options: {
+                                angular: true,
+                                loadCss: !snapshot, // load the application css if in debug mode
+                                unitTesting,
+                                appFullPath,
+                                projectRoot,
+                                ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
+                            }
+                        },
+                    ].filter(loader => !!loader)
+                },
+
+                { test: /\.html$|\.xml$/, use: "raw-loader" },
+
+                {
+                    test: /[\/|\\]app\.css$/,
+                    use: [
+                        "nativescript-dev-webpack/style-hot-loader",
+                        {
+                            loader: "nativescript-dev-webpack/css2json-loader",
+                            options: { useForImports: true }
+                        }
+                    ]
+                },
+                {
+                    test: /[\/|\\]app\.scss$/,
+                    use: [
+                        "nativescript-dev-webpack/style-hot-loader",
+                        {
+                            loader: "nativescript-dev-webpack/css2json-loader",
+                            options: { useForImports: true }
+                        },
+                        "sass-loader"
+                    ]
+                },
+
+                // Angular components reference css files and their imports using raw-loader
+                { test: /\.css$/, exclude: /[\/|\\]app\.css$/, use: "raw-loader" },
+                { test: /\.scss$/, exclude: /[\/|\\]app\.scss$/, use: ["raw-loader", "resolve-url-loader", "sass-loader"] },
+
+                {
+                    test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
+                    use: [
+                        "nativescript-dev-webpack/moduleid-compat-loader",
+                        "nativescript-dev-webpack/lazy-ngmodule-hot-loader",
+                        "@ngtools/webpack",
+                    ]
+                },
+
+                // Mark files inside `@angular/core` as using SystemJS style dynamic imports.
+                // Removing this will cause deprecation warnings to appear.
+                {
+                    test: /[\/\\]@angular[\/\\]core[\/\\].+\.js$/,
+                    parser: { system: true },
+                },
+            ],
+        },
+        plugins: [
+            // Define useful constants like TNS_WEBPACK
+            new webpack.DefinePlugin({
+                "global.TNS_WEBPACK": "true",
+                "process": "global.process",
+            }),
+            // Remove all files from the out dir.
+            new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),
+            // Copy assets to out dir. Add your own globs as needed.
+            new CopyWebpackPlugin([
+                { from: { glob: "fonts/**" } },
+                { from: { glob: "**/*.jpg" } },
+                { from: { glob: "**/*.png" } },
+            ], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
+            new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"),
+            // For instructions on how to set up workers with webpack
+            // check out https://github.com/nativescript/worker-loader
+            new NativeScriptWorkerPlugin(),
+            ngCompilerPlugin,
+            // Does IPC communication with the {N} CLI to notify events when running in watch mode.
+            new nsWebpack.WatchStateLoggerPlugin(),
+        ],
+    };
+
+    if (report) {
+        // Generate report files for bundles content
+        config.plugins.push(new BundleAnalyzerPlugin({
+            analyzerMode: "static",
+            openAnalyzer: false,
+            generateStatsFile: true,
+            reportFilename: resolve(projectRoot, "report", `report.html`),
+            statsFilename: resolve(projectRoot, "report", `stats.json`),
+        }));
+    }
+
+    if (snapshot) {
+        config.plugins.push(new nsWebpack.NativeScriptSnapshotPlugin({
+            chunk: "vendor",
+            angular: true,
+            requireModules: [
+                "reflect-metadata",
+                "@angular/platform-browser",
+                "@angular/core",
+                "@angular/common",
+                "@angular/router",
+                "nativescript-angular/platform-static",
+                "nativescript-angular/router",
+            ],
+            projectRoot,
+            webpackConfig: config,
+            snapshotInDocker,
+            skipSnapshotTools,
+            useLibs
+        }));
+    }
+
+    if (hmr) {
+        config.plugins.push(new webpack.HotModuleReplacementPlugin());
+    }
+
+    return config;
+};
diff --git a/demo/app/app.ts b/demo/app/app.ts
index 93fcc71..bfe715b 100644
--- a/demo/app/app.ts
+++ b/demo/app/app.ts
@@ -1,2 +1,2 @@
-import * as application from 'tns-core-modules/application';
+import * as application from '@nativescript/core/application';
 application.run({ moduleName: 'main-page' });
diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
index 74d3cd0..c263dc6 100644
--- a/demo/app/main-page.ts
+++ b/demo/app/main-page.ts
@@ -1,5 +1,5 @@
-import * as observable from 'tns-core-modules/data/observable';
-import * as pages from 'tns-core-modules/ui/page';
+import * as observable from '@nativescript/core/data/observable';
+import * as pages from '@nativescript/core/ui/page';
 import { HelloWorldModel } from './main-view-model';
 
 // Event handler for Page 'loaded' event attached in main-page.xml
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index fb5f36b..f6f7384 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -1,4 +1,4 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" class="page"
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" class="page" 
   xmlns:Cam="@nstudio/nativescript-camera-plus">
   <Page.actionBar>
     <ActionBar title="Camera Plus Demo" icon=""></ActionBar>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index 44992fa..9e6da41 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -1,11 +1,11 @@
+import { Observable } from '@nativescript/core/data/observable';
+import { ImageAsset } from '@nativescript/core/image-asset';
+import { ImageSource } from '@nativescript/core/image-source';
+import { screen } from '@nativescript/core/platform';
+import { Frame } from '@nativescript/core/ui/frame';
+import { Image } from '@nativescript/core/ui/image';
+import { Page } from '@nativescript/core/ui/page';
 import { CameraPlus } from '@nstudio/nativescript-camera-plus';
-import { Observable } from 'tns-core-modules/data/observable';
-import { ImageAsset } from 'tns-core-modules/image-asset';
-import { ImageSource } from 'tns-core-modules/image-source';
-import { screen } from 'tns-core-modules/platform';
-import { Frame } from 'tns-core-modules/ui/frame';
-import { Image } from 'tns-core-modules/ui/image';
-import { Page } from 'tns-core-modules/ui/page';
 import { ObservableProperty } from './observable-property';
 
 export class HelloWorldModel extends Observable {
diff --git a/demo/app/observable-property.ts b/demo/app/observable-property.ts
index fc59eaf..ddfbf7b 100644
--- a/demo/app/observable-property.ts
+++ b/demo/app/observable-property.ts
@@ -1,29 +1,29 @@
-import { Observable } from 'data/observable'
+import { Observable } from '@nativescript/core';
 export function ObservableProperty() {
-    return (target: Observable, propertyKey: string) => {
-        Object.defineProperty(target, propertyKey, {
-            // tslint:disable-next-line:only-arrow-functions
-            get: function () {
-                // tslint:disable-next-line:object-literal-shorthand
-                return this['_' + propertyKey];
-            },
-            // tslint:disable-next-line:only-arrow-functions
-            set: function (value) {
-                // tslint:disable-next-line:object-literal-shorthand
-                if (this['_' + propertyKey] === value) {
-                    return;
-                }
+  return (target: Observable, propertyKey: string) => {
+    Object.defineProperty(target, propertyKey, {
+      // tslint:disable-next-line:only-arrow-functions
+      get: function() {
+        // tslint:disable-next-line:object-literal-shorthand
+        return this['_' + propertyKey];
+      },
+      // tslint:disable-next-line:only-arrow-functions
+      set: function(value) {
+        // tslint:disable-next-line:object-literal-shorthand
+        if (this['_' + propertyKey] === value) {
+          return;
+        }
 
-                this['_' + propertyKey] = value;
-                this.notify({
-                    eventName: Observable.propertyChangeEvent,
-                    propertyName: propertyKey,
-                    object: this,
-                    value,
-                });
-            },
-            enumerable: true,
-            configurable: true
+        this['_' + propertyKey] = value;
+        this.notify({
+          eventName: Observable.propertyChangeEvent,
+          propertyName: propertyKey,
+          object: this,
+          value
         });
-    };
+      },
+      enumerable: true,
+      configurable: true
+    });
+  };
 }
diff --git a/demo/app/tests/tests.js b/demo/app/tests/tests.js
index f61d294..3d74526 100644
--- a/demo/app/tests/tests.js
+++ b/demo/app/tests/tests.js
@@ -1,13 +1,13 @@
-var CameraPlus = require("@nstudio/nativescript-camera-plus").CameraPlus;
+var CameraPlus = require('@nstudio/nativescript-camera-plus').CameraPlus;
 var cameraPlus = new CameraPlus();
 
 // TODO replace 'functionname' with an acual function name of your plugin class and run with 'npm test <platform>'
-describe("functionname", function() {
-  it("exists", function() {
+describe('functionname', function() {
+  it('exists', function() {
     expect(cameraPlus.functionname).toBeDefined();
   });
 
-  it("returns a promise", function() {
+  it('returns a promise', function() {
     expect(cameraPlus.functionname()).toEqual(jasmine.any(Promise));
   });
 });
diff --git a/demo/karma.conf.js b/demo/karma.conf.js
index 7974602..2c653f0 100644
--- a/demo/karma.conf.js
+++ b/demo/karma.conf.js
@@ -1,53 +1,40 @@
-module.exports = function (config) {
+module.exports = function(config) {
   const options = {
-
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '',
 
-
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ['jasmine'],
 
-
     // list of files / patterns to load in the browser
     files: ['app/tests/**/*.*'],
 
-
     // list of files to exclude
-    exclude: [
-    ],
-
+    exclude: [],
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {
-    },
-
+    preprocessors: {},
 
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
     reporters: ['progress'],
 
-
     // web server port
     port: 9876,
 
-
     // enable / disable colors in the output (reporters and logs)
     colors: true,
 
-
     // level of logging
     // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
 
-
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
 
-
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: [],
@@ -77,7 +64,7 @@ module.exports = function (config) {
   setWebpack(config, options);
 
   config.set(options);
-}
+};
 
 function setWebpackPreprocessor(config, options) {
   if (config && config.bundle) {
@@ -102,7 +89,9 @@ function setWebpack(config, options) {
     options.webpack = require('./webpack.config')(env);
     delete options.webpack.entry;
     delete options.webpack.output.libraryTarget;
-    const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
-    options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
+    const invalidPluginsForUnitTesting = ['GenerateBundleStarterPlugin', 'GenerateNativeScriptEntryPointsPlugin'];
+    options.webpack.plugins = options.webpack.plugins.filter(
+      p => !invalidPluginsForUnitTesting.includes(p.constructor.name)
+    );
   }
 }
diff --git a/demo/package.json b/demo/package.json
index f52bdb6..9de572e 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -2,31 +2,29 @@
   "nativescript": {
     "id": "org.nativescript.demo",
     "tns-android": {
-      "version": "6.2.0"
-    },
-    "tns-ios": {
-      "version": "6.2.0"
+      "version": "6.3.1"
     }
   },
   "dependencies": {
     "@nstudio/nativescript-camera-plus": "file:../src",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "0.7.0",
-    "tns-core-modules": "~6.2.0"
+    "@nativescript/core": "^6.3.2"
   },
   "devDependencies": {
-    "babel-traverse": "6.12.0",
-    "babel-types": "6.11.1",
-    "babylon": "6.8.4",
-    "filewalker": "0.1.2",
     "jasmine-core": "^2.5.2",
     "karma": "4.1.0",
     "karma-jasmine": "2.0.1",
     "karma-nativescript-launcher": "^0.4.0",
-    "lazy": "1.0.11",
-    "tns-platform-declarations": "6.0.1",
-    "typescript": "3.4.5",
-    "nativescript-dev-webpack": "~1.3.0",
+    "nativescript-css-loader": "~0.26.1",
+    "nativescript-dev-webpack": "1.4.1",
+    "tns-platform-declarations": "^6.3.2",
+    "tslint": "~5.20.1",
+    "typescript": "^3.7.4",
     "karma-webpack": "3.0.5"
+  },
+  "scripts": {
+    "build.plugin": "cd ../src && npm run build",
+    "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/platforms/**'"
   }
 }
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
index 8fc0062..90b9e53 100644
--- a/demo/tsconfig.json
+++ b/demo/tsconfig.json
@@ -1,31 +1,18 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es2015",
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true,
-        "noEmitHelpers": true,
-        "noEmitOnError": false,
-        "skipLibCheck": true,
-        "lib": [
-            "es2017",
-            "dom",
-            "es6"
-        ],
-        "baseUrl": ".",
-        "paths": {
-            "*": [
-                "./node_modules/tns-core-modules/*",
-                "./node_modules/*"
-            ],
-            "~/*": [
-                "app/*"
-            ]
-        }
-    },
-    "exclude": [
-        "node_modules",
-        "platforms",
-        "**/*.aot.ts"
-    ]
-}
\ No newline at end of file
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2015",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "noEmitHelpers": true,
+    "noEmitOnError": false,
+    "skipLibCheck": true,
+    "lib": ["es2017", "dom", "es6"],
+    "baseUrl": ".",
+    "paths": {
+      "*": ["./node_modules/tns-core-modules/*", "./node_modules/*"],
+      "~/*": ["app/*"]
+    }
+  },
+  "exclude": ["node_modules", "platforms", "**/*.aot.ts"]
+}
diff --git a/demo/tsconfig.tns.json b/demo/tsconfig.tns.json
index 95f2ece..ce748fd 100644
--- a/demo/tsconfig.tns.json
+++ b/demo/tsconfig.tns.json
@@ -1,7 +1,7 @@
 {
-    "extends": "./tsconfig",
-    "compilerOptions": {
-        "module": "es2015",
-        "moduleResolution": "node"
-    }
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "module": "es2015",
+    "moduleResolution": "node"
+  }
 }
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
new file mode 100644
index 0000000..e939df7
--- /dev/null
+++ b/demo/webpack.config.js
@@ -0,0 +1,310 @@
+const { join, relative, resolve, sep } = require('path');
+
+const webpack = require('webpack');
+const nsWebpack = require('nativescript-dev-webpack');
+const nativescriptTarget = require('nativescript-dev-webpack/nativescript-target');
+const { getNoEmitOnErrorFromTSConfig } = require('nativescript-dev-webpack/utils/tsconfig-utils');
+const CleanWebpackPlugin = require('clean-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+const { NativeScriptWorkerPlugin } = require('nativescript-worker-loader/NativeScriptWorkerPlugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const hashSalt = Date.now().toString();
+
+module.exports = env => {
+  // Add your custom Activities, Services and other Android app components here.
+  const appComponents = ['tns-core-modules/ui/frame', 'tns-core-modules/ui/frame/activity'];
+
+  const platform = env && ((env.android && 'android') || (env.ios && 'ios'));
+  if (!platform) {
+    throw new Error('You need to provide a target platform!');
+  }
+
+  const platforms = ['ios', 'android'];
+  const projectRoot = __dirname;
+
+  // Default destination inside platforms/<platform>/...
+  const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
+
+  const {
+    // The 'appPath' and 'appResourcesPath' values are fetched from
+    // the nsconfig.json configuration file.
+    appPath = 'app',
+    appResourcesPath = 'app/App_Resources',
+
+    // You can provide the following flags when running 'tns run android|ios'
+    snapshot, // --env.snapshot
+    production, // --env.production
+    uglify, // --env.uglify
+    report, // --env.report
+    sourceMap, // --env.sourceMap
+    hiddenSourceMap, // --env.hiddenSourceMap
+    hmr, // --env.hmr,
+    unitTesting, // --env.unitTesting,
+    verbose, // --env.verbose
+    snapshotInDocker, // --env.snapshotInDocker
+    skipSnapshotTools, // --env.skipSnapshotTools
+    compileSnapshot // --env.compileSnapshot
+  } = env;
+
+  const useLibs = compileSnapshot;
+  const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
+  const externals = nsWebpack.getConvertedExternals(env.externals);
+
+  const appFullPath = resolve(projectRoot, appPath);
+  const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({
+    projectDir: projectRoot
+  });
+  let coreModulesPackageName = 'tns-core-modules';
+  const alias = {
+    '~': appFullPath
+  };
+
+  if (hasRootLevelScopedModules) {
+    coreModulesPackageName = '@nativescript/core';
+    alias['tns-core-modules'] = coreModulesPackageName;
+  }
+  const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
+
+  const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
+  const entryPath = `.${sep}${entryModule}.ts`;
+  const entries = { bundle: entryPath };
+
+  const tsConfigPath = resolve(projectRoot, 'tsconfig.tns.json');
+
+  const areCoreModulesExternal =
+    Array.isArray(env.externals) && env.externals.some(e => e.indexOf('tns-core-modules') > -1);
+  if (platform === 'ios' && !areCoreModulesExternal) {
+    entries['tns_modules/tns-core-modules/inspector_modules'] = 'inspector_modules';
+  }
+
+  let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
+
+  const itemsToClean = [`${dist}/**/*`];
+  if (platform === 'android') {
+    itemsToClean.push(`${join(projectRoot, 'platforms', 'android', 'app', 'src', 'main', 'assets', 'snapshots')}`);
+    itemsToClean.push(
+      `${join(projectRoot, 'platforms', 'android', 'app', 'build', 'configurations', 'nativescript-android-snapshot')}`
+    );
+  }
+
+  const noEmitOnErrorFromTSConfig = getNoEmitOnErrorFromTSConfig(tsConfigPath);
+
+  nsWebpack.processAppComponents(appComponents, platform);
+  const config = {
+    mode: production ? 'production' : 'development',
+    context: appFullPath,
+    externals,
+    watchOptions: {
+      ignored: [
+        appResourcesFullPath,
+        // Don't watch hidden files
+        '**/.*'
+      ]
+    },
+    target: nativescriptTarget,
+    entry: entries,
+    output: {
+      pathinfo: false,
+      path: dist,
+      sourceMapFilename,
+      libraryTarget: 'commonjs2',
+      filename: '[name].js',
+      globalObject: 'global',
+      hashSalt
+    },
+    resolve: {
+      extensions: ['.ts', '.js', '.scss', '.css'],
+      // Resolve {N} system modules from tns-core-modules
+      modules: [
+        resolve(__dirname, `node_modules/${coreModulesPackageName}`),
+        resolve(__dirname, 'node_modules'),
+        `node_modules/${coreModulesPackageName}`,
+        'node_modules'
+      ],
+      alias,
+      // resolve symlinks to symlinked modules
+      symlinks: true
+    },
+    resolveLoader: {
+      // don't resolve symlinks to symlinked loaders
+      symlinks: false
+    },
+    node: {
+      // Disable node shims that conflict with NativeScript
+      http: false,
+      timers: false,
+      setImmediate: false,
+      fs: 'empty',
+      __dirname: false
+    },
+    devtool: hiddenSourceMap ? 'hidden-source-map' : sourceMap ? 'inline-source-map' : 'none',
+    optimization: {
+      runtimeChunk: 'single',
+      noEmitOnErrors: noEmitOnErrorFromTSConfig,
+      splitChunks: {
+        cacheGroups: {
+          vendor: {
+            name: 'vendor',
+            chunks: 'all',
+            test: (module, chunks) => {
+              const moduleName = module.nameForCondition ? module.nameForCondition() : '';
+              return /[\\/]node_modules[\\/]/.test(moduleName) || appComponents.some(comp => comp === moduleName);
+            },
+            enforce: true
+          }
+        }
+      },
+      minimize: !!uglify,
+      minimizer: [
+        new TerserPlugin({
+          parallel: true,
+          cache: true,
+          sourceMap: isAnySourceMapEnabled,
+          terserOptions: {
+            output: {
+              comments: false,
+              semicolons: !isAnySourceMapEnabled
+            },
+            compress: {
+              // The Android SBG has problems parsing the output
+              // when these options are enabled
+              collapse_vars: platform !== 'android',
+              sequences: platform !== 'android'
+            }
+          }
+        })
+      ]
+    },
+    module: {
+      rules: [
+        {
+          include: join(appFullPath, entryPath),
+          use: [
+            // Require all Android app components
+            platform === 'android' && {
+              loader: 'nativescript-dev-webpack/android-app-components-loader',
+              options: { modules: appComponents }
+            },
+
+            {
+              loader: 'nativescript-dev-webpack/bundle-config-loader',
+              options: {
+                loadCss: !snapshot, // load the application css if in debug mode
+                unitTesting,
+                appFullPath,
+                projectRoot,
+                ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
+              }
+            }
+          ].filter(loader => !!loader)
+        },
+
+        {
+          test: /\.(ts|css|scss|html|xml)$/,
+          use: 'nativescript-dev-webpack/hmr/hot-loader'
+        },
+
+        {
+          test: /\.(html|xml)$/,
+          use: 'nativescript-dev-webpack/xml-namespace-loader'
+        },
+
+        {
+          test: /\.css$/,
+          use: 'nativescript-dev-webpack/css2json-loader'
+        },
+
+        {
+          test: /\.scss$/,
+          use: ['nativescript-dev-webpack/css2json-loader', 'sass-loader']
+        },
+
+        {
+          test: /\.ts$/,
+          use: {
+            loader: 'ts-loader',
+            options: {
+              configFile: tsConfigPath,
+              // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#faster-builds
+              // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#hot-module-replacement
+              transpileOnly: true,
+              allowTsInNodeModules: true,
+              compilerOptions: {
+                sourceMap: isAnySourceMapEnabled,
+                declaration: false
+              }
+            }
+          }
+        }
+      ]
+    },
+    plugins: [
+      // Define useful constants like TNS_WEBPACK
+      new webpack.DefinePlugin({
+        'global.TNS_WEBPACK': 'true',
+        process: 'global.process'
+      }),
+      // Remove all files from the out dir.
+      new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),
+      // Copy assets to out dir. Add your own globs as needed.
+      new CopyWebpackPlugin(
+        [{ from: { glob: 'fonts/**' } }, { from: { glob: '**/*.jpg' } }, { from: { glob: '**/*.png' } }],
+        { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }
+      ),
+      new nsWebpack.GenerateNativeScriptEntryPointsPlugin('bundle'),
+      // For instructions on how to set up workers with webpack
+      // check out https://github.com/nativescript/worker-loader
+      new NativeScriptWorkerPlugin(),
+      new nsWebpack.PlatformFSPlugin({
+        platform,
+        platforms
+      }),
+      // Does IPC communication with the {N} CLI to notify events when running in watch mode.
+      new nsWebpack.WatchStateLoggerPlugin(),
+      // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#faster-builds
+      // https://github.com/TypeStrong/ts-loader/blob/ea2fcf925ec158d0a536d1e766adfec6567f5fb4/README.md#hot-module-replacement
+      new ForkTsCheckerWebpackPlugin({
+        tsconfig: tsConfigPath,
+        async: false,
+        useTypescriptIncrementalApi: true,
+        checkSyntacticErrors: true,
+        memoryLimit: 4096
+      })
+    ]
+  };
+
+  if (report) {
+    // Generate report files for bundles content
+    config.plugins.push(
+      new BundleAnalyzerPlugin({
+        analyzerMode: 'static',
+        openAnalyzer: false,
+        generateStatsFile: true,
+        reportFilename: resolve(projectRoot, 'report', `report.html`),
+        statsFilename: resolve(projectRoot, 'report', `stats.json`)
+      })
+    );
+  }
+
+  if (snapshot) {
+    config.plugins.push(
+      new nsWebpack.NativeScriptSnapshotPlugin({
+        chunk: 'vendor',
+        requireModules: ['tns-core-modules/bundle-entry-points'],
+        projectRoot,
+        webpackConfig: config,
+        snapshotInDocker,
+        skipSnapshotTools,
+        useLibs
+      })
+    );
+  }
+
+  if (hmr) {
+    config.plugins.push(new webpack.HotModuleReplacementPlugin());
+  }
+
+  return config;
+};
diff --git a/src/README.md b/src/README.md
deleted file mode 100644
index 812d074..0000000
--- a/src/README.md
+++ /dev/null
@@ -1,198 +0,0 @@
-<a align="center" href="https://www.npmjs.com/package/@nstudio/nativescript-camera-plus">
-    <h3 align="center">NativeScript Camera Plus</h3>
-</a>
-<h4 align="center">A NativeScript camera with all the bells and whistles which can be embedded inside a view. This plugin was sponsored by LiveShopper</h4>
-
-<p align="center">
-<a href="https://liveshopper.com">
-    <img align="center" src="./images/liveshopper.png" alt="LiveShopper Logo"/>
-    <a>
-</p>
-
-<p align="center">
-    <a href="https://www.npmjs.com/package/@nstudio/nativescript-camera-plus">
-        <img src="https://img.shields.io/npm/v/@nstudio/nativescript-camera-plus.svg" alt="npm">
-    </a>
-    <a href="https://www.npmjs.com/package/@nstudio/nativescript-camera-plus">
-        <img src="https://img.shields.io/npm/dt/@nstudio/nativescript-camera-plus.svg?label=npm%20downloads" alt="npm">
-    </a>
-    <a href="https://github.com/nstudio/nativescript-camera-plus/stargazers">
-        <img src="https://img.shields.io/github/stars/nstudio/nativescript-camera-plus.svg" alt="stars">
-    </a>
-     <a href="https://github.com/nstudio/nativescript-camera-plus/network">
-        <img src="https://img.shields.io/github/forks/nstudio/nativescript-camera-plus.svg" alt="forks">
-    </a>
-    <a href="https://github.com/nstudio/nativescript-camera-plus/blob/master/LICENSE.md">
-        <img src="https://img.shields.io/github/license/nstudio/nativescript-camera-plus.svg" alt="license">
-    </a>
-</p>
-
-<p align="center">
-    <a align="center" href="http://nstudio.io">
-      <img src="./images/nstudio-banner.png" alt="nStudio banner">
-    </a>
-    <h5 align="center">Do you need assistance on your project or plugin? Contact the nStudio team anytime at <a href="mailto:team@nstudio.io">team@nstudio.io</a> to get up to speed with the best practices in mobile and web app development.
-    </h5>
-</p>
-
----
-
-## Installation
-
-```bash
-tns plugin add @nstudio/nativescript-camera-plus
-```
-
-## Sample
-
-_Yes the camera is rotated because it's a webcam to an emulator and it's just the way life works_
-
-![Camera Plus](images/camplus1.gif)
-
-## Demo
-
-The demo apps work best when run on a real device.
-You can launch them from the simulator/emulator however the camera does not work on iOS simulators. Android emulators will work with cameras if you enable your webcam.
-
-### Android Emulator Note
-
-The camera in your webcam being used on emulators will likely be rotated sideways (incorrectly). The actual camera output will be correctly oriented, it's only the preview on emulators that present the preview incorrectly. This issue shouldn't be present on real devices due to the camera being oriented correctly on the device vs. a webcam in a computer.
-
-NOTE: You may want to run: `npm run nuke` first to clear and reset directories.
-
-### Run Vanilla Demo
-
-Plug device in, then:
-
-```bash
-npm run demo.ios.device
-// or...
-npm run demo.android.device
-```
-
-### Run Angular Demo
-
-Plug device in, then:
-
-```bash
-npm run demo.ng.ios.device
-// or...
-npm run demo.ng.android.device
-```
-
-## Properties
-
-| Name                  | Type    | Description                                                                                                                            |
-| --------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------- |
-| **debug**             | boolean | If true logs will be output in the console to help debug the Camera Plus events.                                                       |
-| **confirmPhotos**     | boolean | If true the default take picture event will present a confirmation dialog before saving. Default is true.                              |
-| **confirmRetakeText** | string | When confirming capture this text will be presented to the user to retake the photo. Default is 'Retake'                                |
-| **confirmSaveText**   | string | When confirming capture this text will be presented to the user to save the photo. Default is 'Save'                                    |
-| **saveToGallery**     | boolean | If true the default take picture event will save to device gallery. Default is true.                                                   |
-| **galleryPickerMode** | string  | The gallery/library selection mode. 'single' allows one image to be selected. 'multiple' allows multiple images. Default is 'multiple' |
-| **showFlashIcon**     | boolean | If true the default flash toggle icon/button will show on the Camera Plus layout. Default is true.                                     |
-| **showToggleIcon**    | boolean | If true the default camera toggle (front/back) icon button will show on the Camera Plus layout. Default is true.                       |
-| **showCaptureIcon**   | boolean | If true the default capture (take picture) icon/button will show on the Camera Plus layout. Default is true.                           |
-| **showGalleryIcon**   | boolean | If true the choose from gallery/library icon/button will show on the Camera Plus layout. Default is true.                              |
-| **enableVideo**       | boolean | If true the CameraPlus instance can record video and videos are shown in the gallery.|
-
-## Static Properties
-_Note: These properties need set before the initialization of the camera. Users should set these in a component constructor before their view creates the component if the wish to change the default values. In case of enableVideo, this will be true if either the static property or the component property is true._
-
-| Name               | Type        | Description                                                                                                                                      |
-| ------------------ | ----------  | ------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **enableVideo**    | boolean     | Video Support (off by default). Can reset it before using in different views if they want to go back/forth between photo/camera and video/camera |
-| **defaultCamera**  | CameraTypes | Defaults the camera correctly on launch. Default `'rear'`. `'front'` or `'rear'`                                                                 |
-
-## Android Only Properties
-
-| Name                 | Type    | Description                                                                                 |
-| -------------------- | ------- | ------------------------------------------------------------------------------------------- |
-| **flashOnIcon**      | string  | Name of app_resource drawable for the native image button when flash is on (enabled).       |
-| **flashOffIcon**     | string  | Name of app_resource drawable for the native image button when flash is off (disabled).     |
-| **toggleCameraIcon** | string  | Name of app_resource drawable for the toggle camera button.                                 |
-| **takePicIcon**      | string  | Name of app_resource drawable for the take picture (capture) button.                        |
-| **galleryIcon**      | string  | Name of app_resource drawable for the open gallery (image library) button.                  |
-| **autoFocus**        | boolean | If true the camera will use continuous focus when the camera detects changes of the target. |
-
-## iOS Only Properties
-
-| Name                      | Type    | Description                                                   |
-| ------------------------- | ------- | ------------------------------------------------------------- |
-| **doubleTapCameraSwitch** | boolean | Enable/disable double tap gesture to switch camera. (enabled) |
-
-## Cross Platform Public Methods
-
-| Method                                       | Description                                                                                                                                                 |
-| -------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **isCameraAvailable()**                      | Returns true if the device has at least one camera.                                                                                                         |
-| **toggleFlash()**                            | Toggles the flash mode on the active camera.                                                                                                                |
-| **toggleCamera()**                           | Toggles the active camera on the device.                                                                                                                    |
-| **chooseFromLibrary(opts?: IChooseOptions)** | Opens the device gallery (image library) for selecting images.                                                                                              |
-| **takePicture(opts?: ICaptureOptions)**      | Takes a picture of the current preview in the CameraPlus.                                                                                                   |
-| **getFlashMode(): string**                   | Android: various strings possible: https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFlashMode() iOS: either `'on'` or `'off'` |
-| **record(opts?: IVideoOptions)**             | Starts recording a video.                                                                                                                                   |
-| **stop()**                                   | Stops the video recording, when stopped the `videoRecordingReadyEvent` event will be emitted.                                                               |
-
-## Android Only Public Methods
-
-| Method                                                  | Description                                                                                                                                       |
-| ------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **requestCameraPermissions(explanationText?: string)**  | Prompts the user to grant runtime permission to use the device camera. Returns a Promise<boolean>.                                                  |
-| **hasCameraPermission()**                               | Returns true if the application has been granted access to the device camera.                                                                       |
-| **requestStoragePermissions(explanationText?: string)** | Prompts the user to grant runtime permission to use external storage for saving and opening images from device gallery. Returns a Promise<boolean>. |
-| **hasStoragePermissions()**                             | Returns true if the application has been granted access to the device storage.                                                                      |
-| **getNumberOfCameras()**                                | Returns the number of cameras on the device.                                                                                                        |
-| **hasFlash()**                                          | Returns true if the active camera has a flash mode.                                                                                                 |
-
-## Events
-
-| Name                    | Description                                                        |
-| ----------------------- | ------------------------------------------------------------------ |
-| **errorEvent**          | Executes when an error is emitted from CameraPlus                   |
-| **photoCapturedEvent**  | Executes when a photo is taken.                                    |
-| **toggleCameraEvent**   | Executes when the device camera is toggled.                        |
-| **imagesSelectedEvent** | Executes when images are selected from the device library/gallery. |
-| **videoRecordingStartedEvent** | Executes when video starts recording. |
-| **videoRecordingFinishedEvent** | Executes when video stops recording but has not process yet. |
-| **videoRecordingReadyEvent** | Executes when video has completed processing and is ready to be used. |
-| **confirmScreenShownEvent** | Executes when  the picture confirm dialog is shown.. |
-| **confirmScreenDismissedEvent** | Executes when the picture confirm dialog is dismissed either by Retake or Save button. |
-
-
-## Option Interfaces
-```TS
-export interface ICameraOptions {
-  confirm?: boolean;
-  saveToGallery?: boolean;
-  keepAspectRatio?: boolean;
-  height?: number;
-  width?: number;
-  autoSquareCrop?: boolean;
-  confirmRetakeText?: string;
-  confirmSaveText?: string;
-}
-```
-```TS
-export interface IChooseOptions {
-  width?: number;
-  height?: number;
-  keepAspectRatio?: boolean;
-  showImages?:  boolean;
-  showVideos?: boolean;
-}
-```
-
-```TS
-export interface IVideoOptions {
-  quality?: CameraVideoQuality;
-  confirm?: boolean;
-  saveToGallery?: boolean;
-  height?: number;
-  width?: number;
-  disableHEVC?: boolean;
-  androidMaxVideoBitRate?: number;
-  androidMaxFrameRate?: number;
-  androidMaxAudioBitRate?: number;
-}
-```
diff --git a/src/package.json b/src/package.json
index 61bafca..e063822 100644
--- a/src/package.json
+++ b/src/package.json
@@ -11,35 +11,48 @@
     }
   },
   "scripts": {
-    "precommit": "lint-staged",
-    "clean": "rm -rf node_modules package-lock.json",
     "tsc": "tsc -skipLibCheck",
     "build": "npm i && tsc",
-    "link": "npm i && cd ../demo && npm i && cd ../src && npm run plugin.link",
+    "build.native": "node scripts/build-native.js",
+    "ci.base.setup": "npm i && npm i -g typescript && tsc && echo no | npm i -g nativescript && tns usage-reporting disable && tns error-reporting disable",
+    "ci.pip.install": "sudo pip install --upgrade pip && sudo pip install six",
+    "ci.ios.setup": "npm run ci.pip.install",
+    "ci.vanilla.android.build": "cd ../demo && tns build android --env.uglify",
+    "ci.vanilla.ios.build": "cd ../demo && tns build ios --env.uglify",
+    "ci.ng.android.build": "npm pack && cd ../demo-angular && tns plugin remove @nstudio/nativescript-camera-plus && tns plugin add ../src/nstudio-nativescript-camera-plus-3.0.5.tgz && tns build android --env.aot --env.uglify",
+    "ci.ng.ios.build": "npm pack && cd ../demo-angular && tns plugin remove @nstudio/nativescript-camera-plus && tns plugin add ../src/nstudio-nativescript-camera-plus-3.0.5.tgz && tns build ios --env.aot --env.uglify",
+    "precommit": "lint-staged",
+    "clean": "rm -rf node_modules package-lock.json",
     "demo.reset": "cd ../demo && rimraf platforms",
-    "plugin.link": "npm link && cd ../demo && npm link @nstudio/nativescript-camera-plus && cd ../src",
     "plugin.tscwatch": "npm run tsc -- -w",
     "nuke": "rm -rf node_modules && cd ../demo && rm -rf hooks node_modules platforms && cd ../demo-ng && rm -rf hooks node_modules platforms",
     "demo.ios": " cd ../demo && tns run ios --emulator",
     "demo.ios.device": " cd ../demo && tns run ios",
-    "demo.ng.ios": "cd ../demo-ng && tns run ios --emulator",
-    "demo.ng.ios.device": "cd ../demo-ng && tns run ios",
-    "demo.android": " cd ../demo && tns run android",
-    "demo.android.device": " cd ../demo && tns run android",
-    "demo.ng.android": "cd ../demo-ng && tns run android --emulator",
-    "demo.ng.android.device": "cd ../demo-ng && tns run android",
+    "demo.android": "cd ../demo && tns run android",
+    "demo.android.device": "cd ../demo && tns run android",
     "test.ios": "cd ../demo && tns test ios --emulator",
     "test.ios.device": "cd ../demo && tns test ios",
     "test.android": "cd ../demo && tns test android",
+    "demo.ng.ios": "npm pack && cd ../demo-ng && tns run ios --emulator",
+    "demo.ng.ios.device": "npm pack && cd ../demo-ng && tns run ios",
+    "demo.ng.android": "npm pack && cd ../demo-ng && tns run android --emulator",
+    "demo.ng.android.device": "npm pack && cd ../demo-ng && tns run android",
     "setup": "npm i && cd ../demo && npm i && cd .. && cd ../demo && tns plugin add .. && cd ..",
-    "postclone": "npm i && node scripts/postclone.js"
+    "postclone": "npm i && node scripts/postclone.js",
+    "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude \"**/platforms/**\" --exclude \"**/typings/**\""
   },
   "lint-staged": {
-    "*.{ts, js, json, css, scss, md}": [
+    "**/*.{js, css, ts, json, scss, html, xml, md}": [
       "prettier --write",
       "git add"
     ]
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "npm run tslint"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/nstudio/nativescript-camera-plus.git"
@@ -85,18 +98,18 @@
   "homepage": "https://github.com/nstudio/nativescript-camera-plus",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "husky": "^1.1.2",
-    "lint-staged": "^7.3.0",
-    "prettier": "^1.14.3",
-    "tns-core-modules": "~5.1.2",
-    "tns-platform-declarations": "~5.1.2",
-    "typescript": "~3.4.5",
+    "husky": "^4.2.1",
+    "lint-staged": "^10.0.2",
+    "prettier": "^1.19.1",
+    "tns-core-modules": "^6.3.2",
+    "tns-platform-declarations": "^6.3.2",
+    "typescript": "~3.7.4",
     "prompt": "^1.0.0",
     "rimraf": "^2.5.0",
-    "tslint": "^5.11.0",
+    "tslint": "^6.0.0",
     "semver": "^5.5.0"
   },
   "dependencies": {
-    "nativescript-permissions": "^1.3.6"
+    "nativescript-permissions": "^1.3.8"
   }
 }
diff --git a/src/platforms/android/nativescript_camera_plus.aar b/src/platforms/android/nativescript_camera_plus.aar
new file mode 100644
index 0000000..9b07536
Binary files /dev/null and b/src/platforms/android/nativescript_camera_plus.aar differ
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 8045f48..46a39fb 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -1,32 +1,25 @@
 {
-    "compilerOptions": {
-        "target": "es5",
-        "module": "commonjs",
-        "declaration": true,
-        "removeComments": true,
-        "noLib": false,
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "lib": [
-            "es2017",
-            "es6",
-            "dom"
-        ],
-        "sourceMap": true,
-        "pretty": true,
-        "allowUnreachableCode": false,
-        "allowUnusedLabels": false,
-        "noEmitHelpers": true,
-        "noEmitOnError": false,
-        "noImplicitAny": false,
-        "noImplicitReturns": true,
-        "noImplicitUseStrict": false,
-        "noFallthroughCasesInSwitch": true,
-        "skipLibCheck": true
-    },
-    "exclude": [
-        "node_modules",
-        "./async-await"
-    ],
-    "compileOnSave": false
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": ["es2017", "es6", "dom"],
+    "sourceMap": true,
+    "pretty": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "noEmitHelpers": true,
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": true,
+    "noImplicitUseStrict": false,
+    "noFallthroughCasesInSwitch": true,
+    "skipLibCheck": true
+  },
+  "exclude": ["node_modules"],
+  "compileOnSave": false
 }