diff --git a/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 110/support.png b/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 110/support.png
index 37ed5d73d..1a8839513 100644
Binary files a/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 110/support.png and b/e2e/routable-animations/e2e/resources/images/nsroanimations/iPhone 7 110/support.png differ
diff --git a/nativescript-angular/bin/update-app-ng-deps b/nativescript-angular/bin/update-app-ng-deps
index f52904c52..1b4c46aca 100755
--- a/nativescript-angular/bin/update-app-ng-deps
+++ b/nativescript-angular/bin/update-app-ng-deps
@@ -3,7 +3,6 @@
 const path = require("path");
 const fs = require("fs");
 
-const browserDynamicDependency = "@angular/platform-browser-dynamic";
 const binPath = __dirname;
 const pluginPath = path.dirname(binPath);
 const pluginPackageJsonPath = path.join(pluginPath, "package.json");
@@ -28,17 +27,31 @@ function updateDeps(deps, devDeps, newDeps) {
                 deps[dependencyName] = version;
             }
 
-            console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
+            logUpdatedDependency(dependencyName, version);
         });
 
     const ngDep = Object.keys(newDeps).find(dep => dep.startsWith("@angular"));
     const version = newDeps[ngDep];
-    if (deps["@angular/animations"]) {
-        deps["@angular/animations"] = version;
+    const animationsDependency = "@angular/animations";
+    if (deps[animationsDependency]) {
+        deps[animationsDependency] = version;
+        logUpdatedDependency(animationsDependency, version);
     }
 
-    if (deps["@angular/compiler-cli"]) {
-        deps["@angular/compiler-cli"] = version;
+    const compilerCliDependency = "@angular/compiler-cli";
+    if (devDeps[compilerCliDependency]) {
+        devDeps[compilerCliDependency] = version;
+        logUpdatedDependency(compilerCliDependency, version);
+    }
+
+    const ngToolsWebpackDependency = "@ngtools/webpack";
+    if (devDeps[ngToolsWebpackDependency]) {
+        devDeps[ngToolsWebpackDependency] = version;
+        logUpdatedDependency(ngToolsWebpackDependency, version);
+    }
+
+    function logUpdatedDependency(dependencyName, version) {
+        console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
     }
 }
 
diff --git a/nativescript-angular/element-registry.ts b/nativescript-angular/element-registry.ts
index e917c0fa0..aa13353d3 100644
--- a/nativescript-angular/element-registry.ts
+++ b/nativescript-angular/element-registry.ts
@@ -175,6 +175,7 @@ const frameMeta: ViewClassMeta = {
 registerElement("AbsoluteLayout", () => require("tns-core-modules/ui/layouts/absolute-layout").AbsoluteLayout);
 registerElement("ActivityIndicator", () => require("tns-core-modules/ui/activity-indicator").ActivityIndicator);
 registerElement("Border", () => require("tns-core-modules/ui/border").Border);
+registerElement("BottomNavigation", () => require("tns-core-modules/ui/bottom-navigation").BottomNavigation);
 registerElement("Button", () => require("tns-core-modules/ui/button").Button);
 registerElement("ContentView", () => require("tns-core-modules/ui/content-view").ContentView);
 registerElement("DatePicker", () => require("tns-core-modules/ui/date-picker").DatePicker);
@@ -202,7 +203,11 @@ registerElement("StackLayout", () => require("tns-core-modules/ui/layouts/stack-
 registerElement("FlexboxLayout", () => require("tns-core-modules/ui/layouts/flexbox-layout").FlexboxLayout);
 registerElement("Switch", () => require("tns-core-modules/ui/switch").Switch);
 registerElement("TabView", () => require("tns-core-modules/ui/tab-view").TabView);
-
+registerElement("TabStrip", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip").TabStrip);
+registerElement("TabStripItem", () => require("tns-core-modules/ui/tab-navigation-base/tab-strip-item").TabStripItem);
+registerElement("TabContentItem",
+    () => require("tns-core-modules/ui/tab-navigation-base/tab-content-item").TabContentItem);
+registerElement("Tabs", () => require("tns-core-modules/ui/tabs").Tabs);
 registerElement("TextField", () => require("tns-core-modules/ui/text-field").TextField);
 registerElement("TextView", () => require("tns-core-modules/ui/text-view").TextView);
 registerElement("TimePicker", () => require("tns-core-modules/ui/time-picker").TimePicker);
@@ -215,16 +220,3 @@ registerElement("DetachedContainer", () => require("tns-core-modules/ui/proxy-vi
     { skipAddToDom: true });
 
 registerElement("page-router-outlet", () => require("tns-core-modules/ui/frame").Frame);
-
-try {
-    let BottomNavigation = require("tns-core-modules/ui/bottom-navigation").BottomNavigation;
-    registerElement("BottomNavigation", function () { return BottomNavigation; });
-    let TabStrip = require("tns-core-modules/ui/tab-navigation-base/tab-strip").TabStrip;
-    registerElement("TabStrip", function () { return TabStrip; });
-    let TabStripItem = require("tns-core-modules/ui/tab-navigation-base/tab-strip-item").TabStripItem;
-    registerElement("TabStripItem", function () { return TabStripItem; });
-    let TabContentItem = require("tns-core-modules/ui/tab-navigation-base/tab-content-item").TabContentItem;
-    registerElement("TabContentItem", function () { return TabContentItem; });
-    let Tabs = require("tns-core-modules/ui/tabs").Tabs;
-    registerElement("Tabs", function () { return Tabs; });
-} catch (e) { }
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index 77f07f936..f1d55a1e1 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -14,8 +14,8 @@
   ],
   "nativescript": {
     "platforms": {
-      "android": "5.0.0",
-      "ios": "5.0.0"
+      "android": "6.0.0",
+      "ios": "6.0.0"
     }
   },
   "keywords": [
@@ -54,7 +54,7 @@
     "@angular/platform-browser": "~8.1.0",
     "@angular/router": "~8.1.0",
     "rxjs": "^6.3.3",
-    "tns-core-modules": "^5.1.0 || >5.1.0- || >5.2.0- || ^6.0.0 || >6.1.0-",
+    "tns-core-modules": "^6.0.0 || >6.1.0-",
     "typescript": "~3.4.5",
     "zone.js": "^0.9.1"
   },