diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 72845e2f3..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 2018,
-    "sourceType": "module",
-    "project": "./tsconfig.json"
-  },
-  "ignorePatterns": ["**/*"],
-  "plugins": ["@typescript-eslint", "@nrwl/nx"],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier",
-    "prettier/@typescript-eslint"
-  ],
-  "rules": {
-    "@typescript-eslint/explicit-member-accessibility": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-parameter-properties": "off",
-    "@nrwl/nx/enforce-module-boundaries": [
-      "error",
-      {
-        "enforceBuildableLibDependency": true,
-        "allow": [],
-        "depConstraints": [
-          { "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] }
-        ]
-      }
-    ]
-  },
-  "overrides": [
-    {
-      "files": ["*.tsx"],
-      "rules": {
-        "@typescript-eslint/no-unused-vars": "off",
-				"@typescript-eslint/no-any": "off"
-      }
-    }
-  ]
-}
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000000000..74d9d35a6
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,40 @@
+{
+	"root": true,
+	"parser": "@typescript-eslint/parser",
+	"parserOptions": {
+		"ecmaVersion": 2018,
+		"sourceType": "module",
+		"project": "./tsconfig.json"
+	},
+	"ignorePatterns": ["**/*"],
+	"plugins": ["@typescript-eslint", "@nrwl/nx"],
+	"extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended", "prettier", "prettier/@typescript-eslint"],
+	"rules": {
+		"@typescript-eslint/explicit-member-accessibility": "off",
+		"@typescript-eslint/explicit-function-return-type": "off",
+		"@typescript-eslint/no-parameter-properties": "off",
+		"@nrwl/nx/enforce-module-boundaries": [
+			"error",
+			{
+				"enforceBuildableLibDependency": true,
+				"allow": [],
+				"depConstraints": [
+					{
+						"sourceTag": "*",
+						"onlyDependOnLibsWithTags": ["*"]
+					}
+				]
+			}
+		],
+		"@typescript-eslint/explicit-module-boundary-types": "off"
+	},
+	"overrides": [
+		{
+			"files": ["*.tsx"],
+			"rules": {
+				"@typescript-eslint/no-unused-vars": "off",
+				"@typescript-eslint/no-any": "off"
+			}
+		}
+	]
+}
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5ef9b1bb0..810b02be0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,6 +12,7 @@ Provide version numbers for the following components (information can be retriev
  - Cross-platform modules:
  - Android Runtime:
  - iOS Runtime:
+ - XCode Version:
  - Plugin(s):
 
 **Describe the bug**
diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml
index 76e43ca4d..e21f08f52 100644
--- a/.github/workflows/npm_release.yml
+++ b/.github/workflows/npm_release.yml
@@ -23,7 +23,7 @@ jobs:
         run: npm version $NPM_VERSION
 
       - name: Build @nativescript/core
-        run: npx nx run core:build.npm
+        run: npx nx run core:build
 
       - name: Publish @nativescript/core
         working-directory: dist/packages
diff --git a/.travis.yml b/.travis.yml
index c0037f3ef..e4e7b12db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "node"
+  - 14
 script:
 - npm run setup
 - npm start @nativescript.core.test
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..98c163683
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "nrwl.angular-console",
+    "ms-vscode.vscode-typescript-tslint-plugin",
+    "esbenp.prettier-vscode",
+    "firsttris.vscode-jest-runner"
+  ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 493fe2aea..ed19603c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+## [7.0.12](https://github.com/NativeScript/NativeScript/compare/7.0.11-core...7.0.12) (2020-10-21)
+
+
+### Bug Fixes
+
+* **android:** BottomNavigation error on back press (application exit) ([#8970](https://github.com/NativeScript/NativeScript/issues/8970)) ([99bb067](https://github.com/NativeScript/NativeScript/commit/99bb067420871078c40454eec842fad6cbede0f7))
+* **core:** ObservableArray tests and a typo ([#8968](https://github.com/NativeScript/NativeScript/issues/8968)) ([5c1b7f6](https://github.com/NativeScript/NativeScript/commit/5c1b7f6d76c19877da1f47a0696dfbbd89b5fd00))
+
+
+### Features
+
+* **core:** TypeScript 4 + cleanup ([#8967](https://github.com/NativeScript/NativeScript/issues/8967)) ([2243660](https://github.com/NativeScript/NativeScript/commit/2243660080ce6877d68a3f32fd64625f86023f77))
+* **webpack:** add svelte support ([#8963](https://github.com/NativeScript/NativeScript/issues/8963)) ([0afea86](https://github.com/NativeScript/NativeScript/commit/0afea8681c62071823804f392ab8d595e61190ff))
+
+
+
+## [7.0.10](https://github.com/NativeScript/NativeScript/compare/7.0.10-core...7.0.10) (2020-10-10)
+
+
+### Bug Fixes
+
+* **ios:** iOS 10 support with adjustment to UILayoutGuide ([#8954](https://github.com/NativeScript/NativeScript/issues/8954)) ([ad25759](https://github.com/NativeScript/NativeScript/commit/ad2575991aa53c1a1806dfd5dc5e368e1674d73c))
+
+
+### Features
+
+* **webpack:** angular configuration schema validation compliance ([ee05b44](https://github.com/NativeScript/NativeScript/commit/ee05b4466336858bd7e2dcb651deb15ba74fc8c2))
+* **webpack:** angular configuration support for environment handling ([#8938](https://github.com/NativeScript/NativeScript/issues/8938)) ([3f7bf67](https://github.com/NativeScript/NativeScript/commit/3f7bf676ff4321d7c490099e3c72687ad68d46a2))
+
+
+
 ## [7.0.10](https://github.com/NativeScript/NativeScript/compare/7.0.9-core...7.0.10) (2020-10-03)
 
 
diff --git a/LICENSE b/LICENSE
index 061c44028..451412229 100755
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2019 Progress Software Corporation
+   Copyright (c) 2020, nStudio, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+   limitations under the License.
diff --git a/apps/automated/package.json b/apps/automated/package.json
index dac032e77..4ac3b0d15 100644
--- a/apps/automated/package.json
+++ b/apps/automated/package.json
@@ -2,10 +2,10 @@
   "main": "main.js",
   "description": "NativeScript Application",
   "license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/NativeScript/NativeScript.git"
-	},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/NativeScript.git"
+  },
   "scripts": {
     "clean": "npx rimraf hooks node_modules platforms package-lock.json && npm i"
   },
diff --git a/apps/automated/src/data/observable-array-tests.ts b/apps/automated/src/data/observable-array-tests.ts
index 3c4d0e8b9..1d41cb036 100644
--- a/apps/automated/src/data/observable-array-tests.ts
+++ b/apps/automated/src/data/observable-array-tests.ts
@@ -360,6 +360,85 @@ export const test_ObservableArray_spliceShouldRemoveSpecifiedNumberOfElementsSta
 export const test_ObservableArray_spliceShouldRemoveSpecifiedNumberOfElementsStartingFromSpecifiedIndexAndRaiseChangeEventWithCorrectArgs = function () {
 	let result: ChangedData<number>;
 
+	// >> observable-array-splice-change
+	const array = new ObservableArray([1, 2, 3, 4]);
+
+	array.on(ObservableArray.changeEvent, (args: ChangedData<number>) => {
+		// Argument (args) is ChangedData<T>.
+		// args.eventName is "change".
+		// args.action is "splice".
+		// args.index is the start index.
+		// args.removed.length is equal to the number of deleted items.
+		// args.addedCount is 0.
+
+		// >> (hide)
+		result = args;
+		// << (hide)
+	});
+
+	array.splice(1, 2);
+	// << observable-array-splice-change
+
+	TKUnit.assert(result.eventName === ObservableArray.changeEvent && result.action === ChangeType.Splice && result.removed.length === 2 && result.index === 1 && result.addedCount === 0, "ObservableArray splice() should raise 'change' event with correct args!");
+};
+
+export const test_ObservableArray_spliceShouldAddSpecifiedNumberOfElementsStartingFromSpecifiedIndexAndRaiseChangeEventWithCorrectArgs = function () {
+	let result: ChangedData<number>;
+
+	// >> observable-array-splice-change
+	const array = new ObservableArray([0]);
+
+	array.on(ObservableArray.changeEvent, (args: ChangedData<number>) => {
+		// Argument (args) is ChangedData<T>.
+		// args.eventName is "change".
+		// args.action is "splice".
+		// args.index is the start index.
+		// args.removed.length is equal to the number of deleted items.
+		// args.addedCount is 0.
+
+		// >> (hide)
+		result = args;
+		// << (hide)
+	});
+
+	// Because their is only one item in the above array the item index should be
+	// normalized to Index 1.
+	array.splice(2, 0, 1);
+	// << observable-array-splice-change
+
+	TKUnit.assert(result.eventName === ObservableArray.changeEvent && result.action === ChangeType.Splice && result.removed.length === 0 && result.index === 1 && result.addedCount === 1, "ObservableArray splice() should raise 'change' event with correct args!");
+};
+
+export const test_ObservableArray_spliceShouldAddDeleteSpecifiedNumberOfElementsStartingFromSpecifiedIndexAndRaiseChangeEventWithCorrectArgs = function () {
+	let result: ChangedData<number>;
+
+	// >> observable-array-splice-change
+	const array = new ObservableArray([0]);
+
+	array.on(ObservableArray.changeEvent, (args: ChangedData<number>) => {
+		// Argument (args) is ChangedData<T>.
+		// args.eventName is "change".
+		// args.action is "splice".
+		// args.index is the start index.
+		// args.removed.length is equal to the number of deleted items.
+		// args.addedCount is 1.
+
+		// >> (hide)
+		result = args;
+		// << (hide)
+	});
+
+	// Because we are starting at index 2, their is NOTHING to delete
+	// So the Starting index should actually be normalized to Index 1
+	array.splice(2, 2, 1);
+	// << observable-array-splice-change
+
+	TKUnit.assert(result.eventName === ObservableArray.changeEvent && result.action === ChangeType.Splice && result.removed.length === 0 && result.index === 1 && result.addedCount === 1, "ObservableArray splice() should raise 'change' event with correct args!");
+};
+
+export const test_ObservableArray_spliceShouldRemoveSpecifiedNumberOfElementsStartingFromSpecifiedIndexAndRaiseChangeEventWithCorrectedArgs = function () {
+	let result: ChangedData<number>;
+
 	// >> observable-array-splice-change
 	const array = new ObservableArray([1, 2, 3]);
 
@@ -526,6 +605,28 @@ export const test_ObservableArray_settingLengthToSomethingPerformsSplice = funct
 	TKUnit.assertTrue(changeRaised);
 };
 
+export const test_ObservableArray_settingLengthToSomethingPerformsSpliceAdded = function () {
+	const array = new ObservableArray([1, 2, 3]);
+	let changeRaised = false;
+
+	array.on('change', (args: ChangedData<number>) => {
+		changeRaised = true;
+		TKUnit.assertEqual(args.object, array);
+		TKUnit.assertEqual(args.eventName, 'change');
+		TKUnit.assertEqual(args.action, ChangeType.Splice);
+
+		// Because the array only has 3 elements, the index it starts the change at is #2
+		TKUnit.assertEqual(args.index, 3);
+		TKUnit.assertEqual(args.addedCount, 2);
+		TKUnit.arrayAssert(args.removed, []);
+	});
+
+	array.length = 5;
+
+	TKUnit.assertEqual(array.length, 5);
+	TKUnit.assertTrue(changeRaised);
+};
+
 const array = new ObservableArray();
 
 // We do not have indexer!
diff --git a/apps/automated/src/ui/repeater/repeater-tests.ts b/apps/automated/src/ui/repeater/repeater-tests.ts
index ae6a8a1da..33b47c00e 100644
--- a/apps/automated/src/ui/repeater/repeater-tests.ts
+++ b/apps/automated/src/ui/repeater/repeater-tests.ts
@@ -1,6 +1,6 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
-import { Application, Label, Page, StackLayout, WrapLayout, LayoutBase, View, GestureTypes, Repeater, ObservableArray } from '@nativescript/core';
+import { Application, Label, Page, StackLayout, WrapLayout, LayoutBase, View, KeyedTemplate, GestureTypes, Repeater, ObservableArray } from '@nativescript/core';
 
 var FEW_ITEMS = [0, 1, 2];
 var MANY_ITEMS = [];
@@ -8,6 +8,18 @@ for (var i = 0; i < 100; i++) {
 	MANY_ITEMS[i] = i;
 }
 
+const ITEM_TEMPLATES_STRING = `
+				<template key="red">
+				    <Label text='red' style.backgroundColor='red' minHeight='100' maxHeight='100'/>
+				</template>
+				<template key='green'>
+				    <Label text='green' style.backgroundColor='green' minHeight='100' maxHeight='100'/>
+				</template>
+				<template key='blue'>
+				    <Label text='blue' style.backgroundColor='blue' minHeight='100' maxHeight='100'/>
+				</template>
+				`;
+
 export function test_recycling() {
 	const setters = new Map<string, StackLayout>();
 	setters.set('itemsLayout', new StackLayout());
@@ -309,6 +321,117 @@ export function test_ItemTemplateFactoryFunction() {
 	helper.buildUIAndRunTest(repeater, testAction);
 }
 
+// Multiple item templates tests
+export function test_ItemTemplateSelector_WhenWrongTemplateKeyIsSpecified_TheDefaultTemplateIsUsed() {
+	var repeater = new Repeater();
+
+	function testAction(views: Array<View>) {
+		repeater.itemTemplate = "<Label text='default' minHeight='100' maxHeight='100'/>";
+		repeater.itemTemplates = ITEM_TEMPLATES_STRING;
+		repeater.itemTemplateSelector = "age == 20 ? 'wrong' : 'green'";
+		repeater.items = [{ age: 20 }, { age: 25 }];
+
+		TKUnit.waitUntilReady(() => repeater.isLayoutValid);
+
+		const firstElement = getChildAt(repeater, 0);
+		TKUnit.assertEqual((<Label>firstElement).text, 'default', 'first element text');
+	}
+
+	helper.buildUIAndRunTest(repeater, testAction);
+}
+
+export function test_ItemTemplateSelector_IsCorrectlyParsedFromString() {
+	var repeater = new Repeater();
+
+	function testAction(views: Array<View>) {
+		repeater.itemTemplates = ITEM_TEMPLATES_STRING;
+		repeater.itemTemplateSelector = "age < 25 ? 'red' : 'green'";
+		repeater.items = [{ age: 20 }, { age: 25 }];
+		let itemTemplateSelectorFunction = <any>repeater.itemTemplateSelector;
+
+		TKUnit.waitUntilReady(() => repeater.isLayoutValid);
+
+		let templateKey0 = itemTemplateSelectorFunction(repeater.items[0], 0, repeater.items);
+		TKUnit.assertEqual(templateKey0, 'red', 'itemTemplateSelector result for first item');
+
+		let templateKey1 = itemTemplateSelectorFunction(repeater.items[1], 1, repeater.items);
+		TKUnit.assertEqual(templateKey1, 'green', 'itemTemplateSelector result for second item');
+	}
+
+	helper.buildUIAndRunTest(repeater, testAction);
+}
+
+export function test_ItemTemplateSelector_IsCorrectlyUsedAsAFunction() {
+	var repeater = new Repeater();
+
+	function testAction(views: Array<View>) {
+		repeater.itemTemplates = ITEM_TEMPLATES_STRING;
+		repeater.itemTemplateSelector = function (item, index: number, items) {
+			return item.age < 25 ? 'red' : 'green';
+		};
+		repeater.items = [{ age: 20 }, { age: 25 }];
+		let itemTemplateSelectorFunction = <any>repeater.itemTemplateSelector;
+
+		TKUnit.waitUntilReady(() => repeater.isLayoutValid);
+
+		let templateKey0 = itemTemplateSelectorFunction(repeater.items[0], 0, repeater.items);
+		TKUnit.assertEqual(templateKey0, 'red', 'itemTemplateSelector result for first item');
+
+		let templateKey1 = itemTemplateSelectorFunction(repeater.items[1], 1, repeater.items);
+		TKUnit.assertEqual(templateKey1, 'green', 'itemTemplateSelector result for second item');
+	}
+
+	helper.buildUIAndRunTest(repeater, testAction);
+}
+
+export function test_ItemTemplateSelector_ItemTemplatesAreCorrectlyParsedFromString() {
+	var repeater = new Repeater();
+
+	function testAction(views: Array<View>) {
+		repeater.itemTemplates = ITEM_TEMPLATES_STRING;
+
+		TKUnit.waitUntilReady(() => repeater.isLayoutValid);
+
+		let itemTemplatesArray = <any>repeater.itemTemplates;
+
+		TKUnit.assertEqual(itemTemplatesArray.length, 3, 'itemTemplates array length');
+
+		let template0 = <KeyedTemplate>itemTemplatesArray[0];
+		TKUnit.assertEqual(template0.key, 'red', 'template0.key');
+		TKUnit.assertEqual((<Label>template0.createView()).text, 'red', 'template0 created view text');
+
+		let template1 = <KeyedTemplate>itemTemplatesArray[1];
+		TKUnit.assertEqual(template1.key, 'green', 'template1.key');
+		TKUnit.assertEqual((<Label>template1.createView()).text, 'green', 'template1 created view text');
+
+		let template2 = <KeyedTemplate>itemTemplatesArray[2];
+		TKUnit.assertEqual(template2.key, 'blue', 'template2.key');
+		TKUnit.assertEqual((<Label>template2.createView()).text, 'blue', 'template2 created view text');
+	}
+
+	helper.buildUIAndRunTest(repeater, testAction);
+}
+
+export function test_ItemTemplateSelector_CorrectTemplateIsUsed() {
+	var repeater = new Repeater();
+
+	function testAction(views: Array<View>) {
+		repeater.itemTemplates = ITEM_TEMPLATES_STRING;
+		repeater.itemTemplateSelector = "age == 25 ? 'green' : 'red'";
+		repeater.items = [{ age: 20 }, { age: 25 }];
+
+		TKUnit.waitUntilReady(() => repeater.isLayoutValid);
+
+		const firstElement = getChildAt(repeater, 0);
+		const secondElement = getChildAt(repeater, 1);
+
+		TKUnit.assertEqual((<Label>firstElement).text, 'red', 'first element text');
+		TKUnit.assertEqual((<Label>secondElement).text, 'green', 'second element text');
+	}
+
+	helper.buildUIAndRunTest(repeater, testAction);
+}
+
 export function test_BindingRepeaterToASimpleArrayWithExpression() {
 	var repeater = new Repeater();
 
diff --git a/apps/automated/src/ui/repeater/repeater.md b/apps/automated/src/ui/repeater/repeater.md
index 7458f740f..859c83f68 100644
--- a/apps/automated/src/ui/repeater/repeater.md
+++ b/apps/automated/src/ui/repeater/repeater.md
@@ -16,6 +16,16 @@ Other modules which will be used in the code samples in this article:
   {%raw%}<Repeater items="{{ myItems }}" />{%endraw%}
 </Page>
 ```
+### Define the Repeater itemsLayout property. Default is StackLayout with orientation="vertical".
+``` XML
+<Page>
+ {%raw%}<Repeater items="{{ myItems }}">
+    <Repeater.itemsLayout>
+       <StackLayout orientation="horizontal" />
+    </Repeater.itemsLayout>
+ </Repeater>{%endraw%}
+</Page>
+```
 ### Define the Repeater itemTemplate property.
 ``` XML
 <Page>
@@ -26,13 +36,52 @@ Other modules which will be used in the code samples in this article:
  </Repeater>{%endraw%}
 </Page>
 ```
-### Define the Repeater itemsLayout property. Default is StackLayout with orientation="vertical".
+### Define multiple item templates and an item template selector in XML.
+The itemTemplateSelector can be an expression specified directly in XML. The context of the expression is the data item for each row.
 ``` XML
 <Page>
- {%raw%}<Repeater items="{{ myItems }}">
-    <Repeater.itemsLayout>
-       <StackLayout orientation="horizontal" />
-    </Repeater.itemsLayout>
+ {%raw%}<Repeater items="{{ myItems }}" itemTemplateSelector="age > 18 ? 'green' : 'red'">
+    <Repeater.itemTemplates>
+      <template key="green">
+        <Label text="{{ age }}" style.backgroundColor="green" />
+      </template>
+      <template key="red">
+        <Label text="{{ age }}" style.backgroundColor="red" />
+      </template>
+    </Repeater.itemTemplates>
+ </Repeater>{%endraw%}
+</Page>
+```
+### Specifying the item template selector as a function in the code-behind file
+In case your item template selector involves complicated logic which cannot be expressed with an expression, you can create an item template selector function in the code behind of the page in which the RepeaterRepeater resides. The function receives the respective data item, the row index and the entire Repeater items collection as parameters. It has to return the the key of the template to be used based on the supplied information.
+``` XML
+<Page>
+ {%raw%}<Repeater items="{{ myItems }}" itemTemplateSelector="selectItemTemplate">
+    <Repeater.itemTemplates>
+      <template key="green">
+        <Label text="{{ age }}" style.backgroundColor="green" />
+      </template>
+      <template key="red">
+        <Label text="{{ age }}" style.backgroundColor="red" />
+      </template>
+    </Repeater.itemTemplates>
+ </Repeater>{%endraw%}
+</Page>
+```
+{%snippet article-item-template-selector-function%}
+### Alternating row colors
+You can use the special value '$index' in the item template selector expression which represents the row index.
+``` XML
+<Page>
+ {%raw%}<Repeater items="{{ myItems }}" itemTemplateSelector="$index % 2 === 0 ? 'even' : 'odd'">
+    <Repeater.itemTemplates>
+      <template key="even">
+        <Label text="{{ age }}" style.backgroundColor="white" />
+      </template>
+      <template key="odd">
+        <Label text="{{ age }}" style.backgroundColor="gray" />
+      </template>
+    </Repeater.itemTemplates>
  </Repeater>{%endraw%}
 </Page>
 ```
diff --git a/apps/toolbox/package.json b/apps/toolbox/package.json
index 16167ec77..61a742272 100644
--- a/apps/toolbox/package.json
+++ b/apps/toolbox/package.json
@@ -2,10 +2,10 @@
   "main": "main.js",
   "description": "NativeScript Application",
   "license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/NativeScript/NativeScript.git"
-	},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/NativeScript.git"
+  },
   "dependencies": {
     "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core",
     "@nativescript/core": "file:../../packages/core"
diff --git a/apps/ui/package.json b/apps/ui/package.json
index 100413761..c1b026215 100644
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -1,11 +1,11 @@
 {
   "main": "main.js",
   "description": "NativeScript Application",
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/NativeScript/NativeScript.git"
-	},
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/NativeScript.git"
+  },
   "dependencies": {
     "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core",
     "@nativescript/core": "file:../../packages/core"
diff --git a/apps/ui/src/main-page.ts b/apps/ui/src/main-page.ts
index ce4b0a356..e60491ae1 100644
--- a/apps/ui/src/main-page.ts
+++ b/apps/ui/src/main-page.ts
@@ -36,6 +36,7 @@ export function pageLoaded(args: EventData) {
 	examples.set('text-view', 'text-view/main-page');
 	examples.set('webview', 'web-view/main-page');
 	examples.set('progress-bar', 'progress-bar/main-page');
+	examples.set('repeater', 'repeater/main-page');
 	examples.set('date-picker', 'date-picker/date-picker-page');
 	examples.set('nested-frames', 'nested-frames/main-page');
 	examples.set('screen-qualifiers', 'screen-qualifiers/main-page');
diff --git a/apps/ui/src/repeater/main-page.ts b/apps/ui/src/repeater/main-page.ts
new file mode 100644
index 000000000..e6f21b982
--- /dev/null
+++ b/apps/ui/src/repeater/main-page.ts
@@ -0,0 +1,17 @@
+import { EventData } from '@nativescript/core/data/observable';
+import { SubMainPageViewModel } from '../sub-main-page-view-model';
+import { WrapLayout } from '@nativescript/core/ui/layouts/wrap-layout';
+import { Page } from '@nativescript/core/ui/page';
+
+export function pageLoaded(args: EventData) {
+	const page = <Page>args.object;
+	const wrapLayout = <WrapLayout>page.getViewById('wrapLayoutWithExamples');
+	page.bindingContext = new SubMainPageViewModel(wrapLayout, loadExamples());
+}
+
+export function loadExamples() {
+	const examples = new Map<string, string>();
+	examples.set('multi-templates', 'repeater/multi-templates-page');
+
+	return examples;
+}
diff --git a/apps/ui/src/repeater/main-page.xml b/apps/ui/src/repeater/main-page.xml
new file mode 100644
index 000000000..79cc23991
--- /dev/null
+++ b/apps/ui/src/repeater/main-page.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page loaded="pageLoaded">
+    <ScrollView orientation="vertical" row="1">
+        <WrapLayout id="wrapLayoutWithExamples"/>
+    </ScrollView>
+</Page>
diff --git a/apps/ui/src/repeater/multi-templates-page.ts b/apps/ui/src/repeater/multi-templates-page.ts
new file mode 100644
index 000000000..8e523869d
--- /dev/null
+++ b/apps/ui/src/repeater/multi-templates-page.ts
@@ -0,0 +1,13 @@
+import { EventData } from '@nativescript/core/data/observable';
+import { ObservableArray } from '@nativescript/core/data/observable-array';
+import { Page } from '@nativescript/core/ui/page';
+import { MultiTemplatesViewModel } from './multi-templates-view-model';
+
+export function pageLoaded(args: EventData) {
+	const page = <Page>args.object;
+	page.bindingContext = new MultiTemplatesViewModel();
+}
+
+export function getOddEvenTemplate(item: number, index: number, items: ObservableArray<number>): string {
+	return index % 2 === 0 ? 'even' : '';
+}
diff --git a/apps/ui/src/repeater/multi-templates-page.xml b/apps/ui/src/repeater/multi-templates-page.xml
new file mode 100644
index 000000000..b93b2314a
--- /dev/null
+++ b/apps/ui/src/repeater/multi-templates-page.xml
@@ -0,0 +1,18 @@
+<Page loaded="pageLoaded">
+    <ScrollView>
+        <Repeater items="{{ items }}" itemTemplateSelector="getOddEvenTemplate">
+            <Repeater.itemTemplate>
+                <StackLayout backgroundColor="blue" height="40">
+                    <Label text="{{ $value }}" class="p-r-10" color="#fff" fontSize="16" />
+                </StackLayout>
+            </Repeater.itemTemplate>
+            <Repeater.itemTemplates>
+                <template key="even">
+                    <StackLayout backgroundColor="green" height="40">
+                        <Label text="{{ $value }}" class="p-r-10" color="#fff" fontSize="16" />
+                    </StackLayout>
+                </template>
+            </Repeater.itemTemplates>
+        </Repeater>
+    </ScrollView>
+</Page>
diff --git a/apps/ui/src/repeater/multi-templates-view-model.ts b/apps/ui/src/repeater/multi-templates-view-model.ts
new file mode 100644
index 000000000..ca4bb9574
--- /dev/null
+++ b/apps/ui/src/repeater/multi-templates-view-model.ts
@@ -0,0 +1,15 @@
+import { Observable } from '@nativescript/core/data/observable';
+import { ObservableArray } from '@nativescript/core/data/observable-array';
+
+export class MultiTemplatesViewModel extends Observable {
+	private _items: ObservableArray<number>;
+
+	get items(): ObservableArray<number> {
+		this._items = new ObservableArray<number>();
+		for (let i = 0; i < 20; i++) {
+			this._items.push(i);
+		}
+
+		return this._items;
+	}
+}
diff --git a/jest.config.js b/jest.config.js
index 30b91f3cb..8c858feaf 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,9 +1,3 @@
 module.exports = {
-  testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
-  transform: {
-    '^.+\\.(ts|js|html)$': 'ts-jest'
-  },
-  resolver: '@nrwl/jest/plugins/resolver',
-  moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageReporters: ['html']
+	projects: ['<rootDir>/packages/core'],
 };
diff --git a/jest.preset.js b/jest.preset.js
new file mode 100644
index 000000000..0ab15bec5
--- /dev/null
+++ b/jest.preset.js
@@ -0,0 +1,11 @@
+const nxPreset = require('@nrwl/jest/preset');
+module.exports = {
+	...nxPreset,
+	testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
+	transform: {
+		'^.+\\.(ts|js|html)$': 'ts-jest',
+	},
+	resolver: '@nrwl/jest/plugins/resolver',
+	moduleFileExtensions: ['ts', 'js', 'html'],
+	coverageReporters: ['html'],
+};
diff --git a/migrations.json b/migrations.json
index 99cdca8b8..f1929b173 100644
--- a/migrations.json
+++ b/migrations.json
@@ -1,32 +1,109 @@
 {
   "migrations": [
     {
-      "version": "10.0.0-beta.0",
-      "description": "Add default branch to nx.json",
-      "factory": "./src/migrations/update-10-0-0/update-10-0-0",
+      "version": "10.1.0-beta.0",
+      "description": "Migrate .eslintrc files to use tsconfig with a wildcard",
+      "factory": "./src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard",
       "package": "@nrwl/workspace",
-      "name": "add-default-branch-to-nx-json"
+      "name": "migrate-eslintrc-tsconfig-wildcard"
     },
     {
-      "version": "10.0.0-beta.0",
-      "description": "Migrate tsconfigs to solution style tsconfigs",
-      "factory": "./src/migrations/update-10-0-0/solution-tsconfigs",
+      "version": "10.3.0-beta.0",
+      "description": "Add @nrwl/cli as dependency",
+      "factory": "./src/migrations/update-10-3-0/add-cli-dependency",
       "package": "@nrwl/workspace",
-      "name": "solution-tsconfigs"
+      "name": "add-cli-dependency"
     },
     {
-      "version": "10.0.1-beta.0",
-      "description": "Migrate .eslintrc files to reference new tsconfig",
-      "factory": "./src/migrations/update-10-0-1/migrate-eslintrc",
+      "version": "10.3.0-beta.0",
+      "description": "Update typescript to v4",
+      "factory": "./src/migrations/update-10-3-0/update-typescript",
       "package": "@nrwl/workspace",
-      "name": "migrate-eslintrc-tsconfig"
+      "name": "update-10-3-0"
     },
     {
-      "version": "10.0.0-beta.2",
-      "description": "update jest configs to include setup env files",
-      "factory": "./src/migrations/update-10-0-0/update-jest-configs",
+      "version": "10.3.0-beta.1",
+      "description": "Adds .vscode/extensions.json to a workspace",
+      "factory": "./src/migrations/update-10-3-0/add-vscode-extensions",
+      "package": "@nrwl/workspace",
+      "name": "add-vscode-extensions"
+    },
+    {
+      "version": "10.3.0-beta.0",
+      "description": "Adds `buildableProjectDepsInPackageJsonType` for web and angular package builders",
+      "factory": "./src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type",
+      "package": "@nrwl/workspace",
+      "name": "add-buildable-project-deps-in-package-json-type"
+    },
+    {
+      "version": "10.1.0-beta.4",
+      "description": "Update jest to v26",
+      "factory": "./src/migrations/update-10-1-0/update-10-1-0",
       "package": "@nrwl/jest",
-      "name": "update-10.0.0"
+      "name": "update-10.1.0"
+    },
+    {
+      "version": "10.2.0",
+      "description": "Remove deprecated jest builder options",
+      "factory": "./src/migrations/update-10-2-0/update-10-2-0",
+      "package": "@nrwl/jest",
+      "name": "update-10.2.0"
+    },
+    {
+      "version": "10.3.0-beta.1",
+      "description": "Adds all jest projects into the root jest config",
+      "factory": "./src/migrations/update-10-3-0/update-projects-property",
+      "package": "@nrwl/jest",
+      "name": "update-projects-property"
+    },
+    {
+      "version": "10.3.0-beta.1",
+      "description": "Update ts-jest to v26.4",
+      "factory": "./src/migrations/update-10-3-0/update-ts-jest",
+      "package": "@nrwl/jest",
+      "name": "update-ts-jest"
+    },
+    {
+      "version": "10.3.0-beta.1",
+      "description": "Adds a jest extension to the recommended extensions for vscode",
+      "factory": "./src/migrations/update-10-3-0/add-jest-extension",
+      "package": "@nrwl/jest",
+      "name": "add-jest-extension"
+    },
+    {
+      "version": "10.3.0-beta.1",
+      "description": "Update @typescript-eslint to v4.3",
+      "factory": "./src/migrations/update-10-3-0/update-10-3-0",
+      "package": "@nrwl/linter",
+      "name": "update-10.3.0"
+    },
+    {
+      "version": "10.3.0-beta.0",
+      "description": "Migrate to the new ESLint builder and ESLint config style",
+      "factory": "./src/migrations/update-10-3-0/update-eslint-builder-and-config",
+      "package": "@nrwl/linter",
+      "name": "update-eslint-builder-and-config"
+    },
+    {
+      "version": "10.3.0-beta.2",
+      "description": "Add explicit .json file extension to .eslintrc files, not using an extension is deprecated",
+      "factory": "./src/migrations/update-10-3-0/add-json-ext-to-eslintrc",
+      "package": "@nrwl/linter",
+      "name": "add-json-ext-to-eslintrc"
+    },
+    {
+      "version": "10.3.0-beta.3",
+      "description": "Update implicitDependencies within nx.json to include root .eslintrc.json",
+      "factory": "./src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps",
+      "package": "@nrwl/linter",
+      "name": "add-root-eslintrc-json-to-workspace-implicit-deps"
+    },
+    {
+      "version": "10.1.0-beta.1",
+      "description": "Removes rootDir from node libs' tsconfig",
+      "factory": "./src/migrations/update-10-1-0/remove-root-dir",
+      "package": "@nrwl/node",
+      "name": "remove-root-dir"
     }
   ]
 }
\ No newline at end of file
diff --git a/nx.json b/nx.json
index 5d47c3b81..e3adc53f7 100644
--- a/nx.json
+++ b/nx.json
@@ -1,49 +1,47 @@
 {
-  "npmScope": "nativescript",
-  "workspaceLayout": {
-    "appsDir": "apps",
-    "libsDir": "packages"
-  },
-  "implicitDependencies": {
-    "workspace.json": "*",
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    "tsconfig.json": "*",
-    "tslint.json": "*",
-    "nx.json": "*"
-  },
-  "projects": {
-    "apps-automated": {
-      "tags": []
-    },
-    "apps-toolbox": {
-      "tags": []
-    },
-    "apps-ui": {
-      "tags": []
-    },
-    "core": {
-      "tags": []
-    },
-    "core-compat": {
-      "tags": []
-    },
-    "types": {
-      "tags": []
-    },
-    "types-ios": {
-      "tags": []
-    },
-    "types-android": {
-      "tags": []
-    },
-    "ui-mobile-base": {
-      "tags": []
-    },
-    "webpack": {
-      "tags": []
-    }
-  }
+	"npmScope": "nativescript",
+	"workspaceLayout": {
+		"appsDir": "apps",
+		"libsDir": "packages"
+	},
+	"implicitDependencies": {
+		"workspace.json": "*",
+		"package.json": {
+			"dependencies": "*",
+			"devDependencies": "*"
+		},
+		"tsconfig.json": "*",
+		"tslint.json": "*",
+		"nx.json": "*",
+		".eslintrc.json": "*"
+	},
+	"projects": {
+		"apps-automated": {
+			"tags": []
+		},
+		"apps-toolbox": {
+			"tags": []
+		},
+		"apps-ui": {
+			"tags": []
+		},
+		"core": {
+			"tags": []
+		},
+		"types": {
+			"tags": []
+		},
+		"types-ios": {
+			"tags": []
+		},
+		"types-android": {
+			"tags": []
+		},
+		"ui-mobile-base": {
+			"tags": []
+		},
+		"webpack": {
+			"tags": []
+		}
+	}
 }
diff --git a/package.json b/package.json
index 635b5d72f..93eee4138 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
-  "name": "nativescript",
-  "version": "7.0.10",
-  "license": "MIT",
+	"name": "nativescript",
+	"version": "7.0.12",
+	"license": "MIT",
   "config": {
     "npm_alias": "npm"
   },
-  "scripts": {
+	"scripts": {
     "setup": "npx rimraf hooks node_modules package-lock.json && $npm_package_config_npm_alias i && ts-patch install && npm run core:setup",
-    "start": "nps",
+		"start": "nps",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "clean": "rimraf -- hooks node_modules platforms package-lock.json webpack.config.js",
     "apps-automated:ios": "cd apps/automated && tns debug ios --no-hmr --emulator --env.testing",
@@ -35,72 +35,73 @@
     "webpack:lint": "cd packages/webpack && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/webpack/**",
     "webpack:test": "cd packages/webpack && npm run tsc && npm run jasmine",
     "webpack:build": "cd packages/webpack npm run setup && mkdir -p ../../dist/packages && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"
-  },
-  "private": true,
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/NativeScript/NativeScript.git"
-  },
-  "dependencies": {
-    "nativescript-theme-core": "^1.0.4"
-  },
-  "devDependencies": {
-    "@nativescript/hook": "^2.0.0",
-    "@nrwl/eslint-plugin-nx": "~10.0.7",
-    "@nrwl/jest": "~10.0.7",
-    "@nrwl/node": "~10.0.7",
-    "@nrwl/workspace": "~10.0.7",
-    "@nstudio/focus": "~10.0.0",
-    "@nstudio/nps-i": "~1.1.0",
-    "@types/chai": "^4.2.11",
-    "@types/jest": "~26.0.4",
-    "@types/mocha": "^7.0.2",
-    "@types/node": "~14.0.22",
-    "@typescript-eslint/eslint-plugin": "~3.6.0",
-    "@typescript-eslint/parser": "~3.6.0",
-    "chai": "^4.2.0",
-    "conventional-changelog-cli": "^2.0.34",
-    "copyfiles": "^2.3.0",
-    "cpy-cli": "^3.1.1",
-    "css": "^3.0.0",
-    "css-tree": "^1.0.0-alpha.39",
-    "dotenv": "~8.2.0",
-    "eslint": "~7.4.0",
-    "eslint-config-prettier": "~6.11.0",
-    "gonzales": "^1.0.7",
-    "husky": "^4.2.5",
-    "jest": "~26.1.0",
-    "lint-staged": "^10.2.11",
-    "mocha": "^8.0.1",
-    "mocha-typescript": "^1.1.17",
-    "module-alias": "^2.2.2",
-    "nativescript": "~7.0.6",
-    "node-sass": "~4.14.1",
-    "nps": "5.10.0",
-    "parse-css": "git+https://github.com/tabatkins/parse-css.git",
-    "parserlib": "^1.1.1",
-    "prettier": "~2.0.5",
-    "reduce-css-calc": "~2.1.7",
-    "rimraf": "3.0.2",
-    "shady-css-parser": "^0.1.0",
-    "terser-webpack-plugin": "~3.0.6",
-    "ts-jest": "~26.1.1",
-    "ts-node": "~8.10.2",
-    "ts-patch": "^1.2.5",
-    "tslib": "~2.0.1",
-    "tslint": "~6.1.3",
-    "typescript": "~3.9.7",
-    "webpack": "~4.44.1",
-    "webpack-cli": "~3.3.12"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npx lint-staged"
-    }
-  },
-  "lint-staged": {
-    "**/*": [
-      "nx format:write --files"
-    ]
-  }
+	},
+	"private": true,
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/NativeScript/NativeScript.git"
+	},
+	"dependencies": {
+		"nativescript-theme-core": "^1.0.4"
+	},
+	"devDependencies": {
+		"@nativescript/hook": "^2.0.0",
+		"@nrwl/cli": "~10.3.1",
+		"@nrwl/eslint-plugin-nx": "~10.3.0",
+		"@nrwl/jest": "~10.3.0",
+		"@nrwl/node": "~10.3.0",
+		"@nrwl/workspace": "~10.3.0",
+		"@nstudio/focus": "~10.3.0",
+		"@nstudio/nps-i": "~1.1.0",
+		"@types/chai": "^4.2.11",
+		"@types/jest": "~26.0.8",
+		"@types/mocha": "^7.0.2",
+		"@types/node": "~14.0.22",
+		"@typescript-eslint/eslint-plugin": "~4.3.0",
+		"@typescript-eslint/parser": "~4.3.0",
+		"chai": "^4.2.0",
+		"conventional-changelog-cli": "^2.0.34",
+        "copyfiles": "^2.4.0",
+        "cpy-cli": "^3.1.1",
+		"css": "^3.0.0",
+		"css-tree": "^1.0.0-alpha.39",
+		"dotenv": "~8.2.0",
+		"eslint": "~7.10.0",
+		"eslint-config-prettier": "~6.11.0",
+		"gonzales": "^1.0.7",
+		"husky": "^4.2.5",
+		"jest": "~26.2.2",
+		"lint-staged": "^10.2.11",
+		"mocha": "^8.0.1",
+		"mocha-typescript": "^1.1.17",
+		"module-alias": "^2.2.2",
+		"nativescript": "~7.0.6",
+		"node-sass": "~4.14.1",
+        "nps": "5.10.0",
+		"parse-css": "git+https://github.com/tabatkins/parse-css.git",
+		"parserlib": "^1.1.1",
+		"prettier": "~2.0.5",
+		"reduce-css-calc": "~2.1.7",
+        "rimraf": "3.0.2",
+		"shady-css-parser": "^0.1.0",
+		"terser-webpack-plugin": "~3.0.6",
+		"ts-jest": "26.4.0",
+		"ts-node": "~8.10.2",
+		"ts-patch": "^1.2.5",
+        "tslib": "~2.0.1",
+        "tslint": "~6.1.3",
+        "typescript": "~4.0.3",
+		"webpack": "~4.44.1",
+		"webpack-cli": "~3.3.12"
+	},
+	"husky": {
+		"hooks": {
+			"pre-commit": "npx lint-staged"
+		}
+	},
+	"lint-staged": {
+		"**/*": [
+			"nx format:write --files"
+		]
+	}
 }
diff --git a/packages/core-compat/.npmignore b/packages/core-compat/.npmignore
deleted file mode 100644
index c32fafcdf..000000000
--- a/packages/core-compat/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tgz
-**/*.ts
-!**/*.d.ts
-npm-debug.log
\ No newline at end of file
diff --git a/packages/core-compat/README.md b/packages/core-compat/README.md
deleted file mode 100644
index 71596b20e..000000000
--- a/packages/core-compat/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-**NOTE**: Do not use this package directly.
-
-The `tns-core-modules` package exists only for compatibility with older versions of NativeScript. It's recommended to use `@nativescript/core` now. 
\ No newline at end of file
diff --git a/packages/core-compat/application-settings/application-settings.d.ts b/packages/core-compat/application-settings/application-settings.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application-settings/application-settings.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/application-settings/application-settings.js b/packages/core-compat/application-settings/application-settings.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/application-settings/application-settings.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/application-settings/application-settings.ts b/packages/core-compat/application-settings/application-settings.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application-settings/application-settings.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/application-settings/index.d.ts b/packages/core-compat/application-settings/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application-settings/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/application-settings/index.js b/packages/core-compat/application-settings/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/application-settings/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/application-settings/index.ts b/packages/core-compat/application-settings/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application-settings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/application/application.d.ts b/packages/core-compat/application/application.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application/application.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/application/application.js b/packages/core-compat/application/application.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/application/application.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/application/application.ts b/packages/core-compat/application/application.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application/application.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/application/index.d.ts b/packages/core-compat/application/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/application/index.js b/packages/core-compat/application/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/application/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/application/index.ts b/packages/core-compat/application/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/application/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/bundle-entry-points.d.ts b/packages/core-compat/bundle-entry-points.d.ts
deleted file mode 100644
index e51f287b0..000000000
--- a/packages/core-compat/bundle-entry-points.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-import '@nativescript/core/bundle-entry-points';
diff --git a/packages/core-compat/bundle-entry-points.js b/packages/core-compat/bundle-entry-points.js
deleted file mode 100644
index 2c24e8de4..000000000
--- a/packages/core-compat/bundle-entry-points.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-require("@nativescript/core/bundle-entry-points");
diff --git a/packages/core-compat/bundle-entry-points.ts b/packages/core-compat/bundle-entry-points.ts
deleted file mode 100644
index 849ee1ceb..000000000
--- a/packages/core-compat/bundle-entry-points.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Execute the bundle-entry-points from core. Nothing is exported.
-import '@nativescript/core/bundle-entry-points';
diff --git a/packages/core-compat/color/color.d.ts b/packages/core-compat/color/color.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/color/color.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/color/color.js b/packages/core-compat/color/color.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/color/color.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/color/color.ts b/packages/core-compat/color/color.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/color/color.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/color/index.d.ts b/packages/core-compat/color/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/color/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/color/index.js b/packages/core-compat/color/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/color/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/color/index.ts b/packages/core-compat/color/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/color/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/data/observable/index.d.ts b/packages/core-compat/data/observable/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/data/observable/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/data/observable/index.js b/packages/core-compat/data/observable/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/data/observable/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/data/observable/index.ts b/packages/core-compat/data/observable/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/data/observable/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/data/observable/observable.d.ts b/packages/core-compat/data/observable/observable.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/data/observable/observable.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/data/observable/observable.js b/packages/core-compat/data/observable/observable.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/data/observable/observable.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/data/observable/observable.ts b/packages/core-compat/data/observable/observable.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/data/observable/observable.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/file-system/file-system.d.ts b/packages/core-compat/file-system/file-system.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/file-system/file-system.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/file-system/file-system.js b/packages/core-compat/file-system/file-system.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/file-system/file-system.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/file-system/file-system.ts b/packages/core-compat/file-system/file-system.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/file-system/file-system.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/file-system/index.d.ts b/packages/core-compat/file-system/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/file-system/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/file-system/index.js b/packages/core-compat/file-system/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/file-system/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/file-system/index.ts b/packages/core-compat/file-system/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/file-system/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/http/http.d.ts b/packages/core-compat/http/http.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/http/http.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/http/http.js b/packages/core-compat/http/http.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/http/http.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/http/http.ts b/packages/core-compat/http/http.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/http/http.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/http/index.d.ts b/packages/core-compat/http/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/http/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/http/index.js b/packages/core-compat/http/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/http/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/http/index.ts b/packages/core-compat/http/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/http/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-asset/image-asset.d.ts b/packages/core-compat/image-asset/image-asset.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-asset/image-asset.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-asset/image-asset.js b/packages/core-compat/image-asset/image-asset.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/image-asset/image-asset.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/image-asset/image-asset.ts b/packages/core-compat/image-asset/image-asset.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-asset/image-asset.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-asset/index.d.ts b/packages/core-compat/image-asset/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-asset/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-asset/index.js b/packages/core-compat/image-asset/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/image-asset/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/image-asset/index.ts b/packages/core-compat/image-asset/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-asset/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-source/image-source.d.ts b/packages/core-compat/image-source/image-source.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-source/image-source.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-source/image-source.js b/packages/core-compat/image-source/image-source.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/image-source/image-source.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/image-source/image-source.ts b/packages/core-compat/image-source/image-source.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-source/image-source.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-source/index.d.ts b/packages/core-compat/image-source/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-source/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/image-source/index.js b/packages/core-compat/image-source/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/image-source/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/image-source/index.ts b/packages/core-compat/image-source/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/image-source/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/inspector_modules.js b/packages/core-compat/inspector_modules.js
deleted file mode 100644
index 1c334b4de..000000000
--- a/packages/core-compat/inspector_modules.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// The "inspector_modules" module is not public, but is refered in legacy versons of webpack.config
-// So add the re-export manually
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("@nativescript/core/inspector_modules"));
diff --git a/packages/core-compat/package.json b/packages/core-compat/package.json
deleted file mode 100644
index 1062ef0e6..000000000
--- a/packages/core-compat/package.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "tns-core-modules",
-    "main": "index",
-    "types": "index.d.ts",
-    "description": "Compatibility with old style tns-core-modules imports for NativeScript.",
-    "version": "7.0.0-rc.33",
-    "homepage": "https://nativescript.org",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/NativeScript/NativeScript"
-    },
-    "license": "Apache-2.0",
-    "scripts": {
-        "setup": "npm i"
-    },
-    "devDependencies": {
-        "@nativescript/core": "rc"
-    },
-    "nativescript": {
-        "platforms": {
-            "ios": "5.0.0",
-            "android": "5.0.0"
-        }
-    }
-}
diff --git a/packages/core-compat/platform/index.d.ts b/packages/core-compat/platform/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/platform/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/platform/index.js b/packages/core-compat/platform/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/platform/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/platform/index.ts b/packages/core-compat/platform/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/platform/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/platform/platform.d.ts b/packages/core-compat/platform/platform.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/platform/platform.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/platform/platform.js b/packages/core-compat/platform/platform.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/platform/platform.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/platform/platform.ts b/packages/core-compat/platform/platform.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/platform/platform.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/profiling/index.d.ts b/packages/core-compat/profiling/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/profiling/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/profiling/index.js b/packages/core-compat/profiling/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/profiling/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/profiling/index.ts b/packages/core-compat/profiling/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/profiling/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/profiling/profiling.d.ts b/packages/core-compat/profiling/profiling.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/profiling/profiling.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/profiling/profiling.js b/packages/core-compat/profiling/profiling.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/profiling/profiling.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/profiling/profiling.ts b/packages/core-compat/profiling/profiling.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/profiling/profiling.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/tns-core-modules.d.ts b/packages/core-compat/tns-core-modules.d.ts
deleted file mode 100644
index e2eb1206c..000000000
--- a/packages/core-compat/tns-core-modules.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-// Not needed. Only added for back-compatibility as some apps refer to this file.
diff --git a/packages/core-compat/trace/index.d.ts b/packages/core-compat/trace/index.d.ts
deleted file mode 100644
index de705c20a..000000000
--- a/packages/core-compat/trace/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './trace';
diff --git a/packages/core-compat/trace/index.js b/packages/core-compat/trace/index.js
deleted file mode 100644
index 716cccb41..000000000
--- a/packages/core-compat/trace/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./trace"), exports);
diff --git a/packages/core-compat/trace/index.ts b/packages/core-compat/trace/index.ts
deleted file mode 100644
index de705c20a..000000000
--- a/packages/core-compat/trace/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './trace';
diff --git a/packages/core-compat/trace/trace.d.ts b/packages/core-compat/trace/trace.d.ts
deleted file mode 100644
index 69fed71f4..000000000
--- a/packages/core-compat/trace/trace.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Trace } from '@nativescript/core';
-export declare const enable: typeof Trace.enable;
-export declare const error: typeof Trace.error;
-export declare const getErrorHandler: typeof Trace.getErrorHandler;
-export declare const isCategorySet: typeof Trace.isCategorySet;
-export declare const isEnabled: typeof Trace.isEnabled;
-export declare const notifyEvent: typeof Trace.notifyEvent;
-export declare const setCategories: typeof Trace.setCategories;
-export declare const setErrorHandler: typeof Trace.setErrorHandler;
-export declare const write: typeof Trace.write;
-export declare const removeWriter: typeof Trace.removeWriter;
-export declare const messageType: typeof Trace.messageType;
-export declare const removeEventListener: typeof Trace.removeEventListener;
-export declare const addCategories: typeof Trace.addCategories;
-export declare const addEventListener: typeof Trace.addEventListener;
-export declare const DefaultErrorHandler: typeof Trace.DefaultErrorHandler;
-export declare const ConsoleWriter: typeof Trace.ConsoleWriter;
-export declare const addWriter: typeof Trace.addWriter;
-export declare const categories: typeof Trace.categories;
-export declare const clearWriters: typeof Trace.clearWriters;
-export declare const disable: typeof Trace.disable;
diff --git a/packages/core-compat/trace/trace.js b/packages/core-compat/trace/trace.js
deleted file mode 100644
index cbd32e03d..000000000
--- a/packages/core-compat/trace/trace.js
+++ /dev/null
@@ -1,23 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.disable = exports.clearWriters = exports.categories = exports.addWriter = exports.ConsoleWriter = exports.DefaultErrorHandler = exports.addEventListener = exports.addCategories = exports.removeEventListener = exports.messageType = exports.removeWriter = exports.write = exports.setErrorHandler = exports.setCategories = exports.notifyEvent = exports.isEnabled = exports.isCategorySet = exports.getErrorHandler = exports.error = exports.enable = void 0;
-var core_1 = require("@nativescript/core");
-exports.enable = core_1.Trace.enable;
-exports.error = core_1.Trace.error;
-exports.getErrorHandler = core_1.Trace.getErrorHandler;
-exports.isCategorySet = core_1.Trace.isCategorySet;
-exports.isEnabled = core_1.Trace.isEnabled;
-exports.notifyEvent = core_1.Trace.notifyEvent;
-exports.setCategories = core_1.Trace.setCategories;
-exports.setErrorHandler = core_1.Trace.setErrorHandler;
-exports.write = core_1.Trace.write;
-exports.removeWriter = core_1.Trace.removeWriter;
-exports.messageType = core_1.Trace.messageType;
-exports.removeEventListener = core_1.Trace.removeEventListener;
-exports.addCategories = core_1.Trace.addCategories;
-exports.addEventListener = core_1.Trace.addEventListener;
-exports.DefaultErrorHandler = core_1.Trace.DefaultErrorHandler;
-exports.ConsoleWriter = core_1.Trace.ConsoleWriter;
-exports.addWriter = core_1.Trace.addWriter;
-exports.categories = core_1.Trace.categories;
-exports.clearWriters = core_1.Trace.clearWriters;
-exports.disable = core_1.Trace.disable;
diff --git a/packages/core-compat/trace/trace.ts b/packages/core-compat/trace/trace.ts
deleted file mode 100644
index 52afde9ad..000000000
--- a/packages/core-compat/trace/trace.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Trace } from '@nativescript/core';
-
-export const enable = Trace.enable;
-export const error = Trace.error;
-export const getErrorHandler = Trace.getErrorHandler;
-export const isCategorySet = Trace.isCategorySet;
-export const isEnabled = Trace.isEnabled;
-export const notifyEvent = Trace.notifyEvent;
-export const setCategories = Trace.setCategories;
-export const setErrorHandler = Trace.setErrorHandler;
-export const write = Trace.write;
-export const removeWriter = Trace.removeWriter;
-export const messageType = Trace.messageType;
-export const removeEventListener = Trace.removeEventListener;
-export const addCategories = Trace.addCategories;
-export const addEventListener = Trace.addEventListener;
-export const DefaultErrorHandler = Trace.DefaultErrorHandler;
-export const ConsoleWriter = Trace.ConsoleWriter;
-export const addWriter = Trace.addWriter;
-export const categories = Trace.categories;
-export const clearWriters = Trace.clearWriters;
-export const disable = Trace.disable;
diff --git a/packages/core-compat/tsconfig.json b/packages/core-compat/tsconfig.json
deleted file mode 100644
index 9aa096cc8..000000000
--- a/packages/core-compat/tsconfig.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "compilerOptions": {
-        "noEmitOnError": true,
-        "noEmitHelpers": true,
-        "target": "es5",
-        "module": "commonjs",
-        "declaration": true,
-        "noImplicitAny": false,
-        "noImplicitUseStrict": true,
-        "removeComments": true,
-        "experimentalDecorators": true,
-        "diagnostics": true,
-        "sourceMap": false,
-        "types" : [
-          "node"
-        ],
-        "lib": [
-            "es6", "dom"
-        ],
-        "baseUrl": "."
-    },
-    "include": [
-        "**/*.ts"
-    ],
-    "exclude": [
-        "node_modules",
-        "dist", 
-        "__tests__"
-    ]
-}
diff --git a/packages/core-compat/ui/core/index.d.ts b/packages/core-compat/ui/core/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/core/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/core/index.js b/packages/core-compat/ui/core/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/core/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/core/index.ts b/packages/core-compat/ui/core/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/core/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/core/view/index.d.ts b/packages/core-compat/ui/core/view/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/core/view/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/core/view/index.js b/packages/core-compat/ui/core/view/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/core/view/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/core/view/index.ts b/packages/core-compat/ui/core/view/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/core/view/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/core/view/view.d.ts b/packages/core-compat/ui/core/view/view.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/core/view/view.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/core/view/view.js b/packages/core-compat/ui/core/view/view.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/core/view/view.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/core/view/view.ts b/packages/core-compat/ui/core/view/view.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/core/view/view.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/frame/activity.android.js b/packages/core-compat/ui/frame/activity.android.js
deleted file mode 100644
index 3fc99d0f8..000000000
--- a/packages/core-compat/ui/frame/activity.android.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// The "ui/frame/activity" module is not public, but is refered in legacy versons of webpack.config
-// So add the re-export manually
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("@nativescript/core/ui/frame/activity"));
diff --git a/packages/core-compat/ui/frame/frame.d.ts b/packages/core-compat/ui/frame/frame.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/frame/frame.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/frame/frame.js b/packages/core-compat/ui/frame/frame.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/frame/frame.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/frame/frame.ts b/packages/core-compat/ui/frame/frame.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/frame/frame.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/frame/index.d.ts b/packages/core-compat/ui/frame/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/frame/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/frame/index.js b/packages/core-compat/ui/frame/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/frame/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/frame/index.ts b/packages/core-compat/ui/frame/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/frame/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.d.ts b/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.js b/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.ts b/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/absolute-layout/absolute-layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/absolute-layout/index.d.ts b/packages/core-compat/ui/layouts/absolute-layout/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/absolute-layout/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/absolute-layout/index.js b/packages/core-compat/ui/layouts/absolute-layout/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/absolute-layout/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/absolute-layout/index.ts b/packages/core-compat/ui/layouts/absolute-layout/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/absolute-layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/dock-layout/dock-layout.d.ts b/packages/core-compat/ui/layouts/dock-layout/dock-layout.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/dock-layout/dock-layout.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/dock-layout/dock-layout.js b/packages/core-compat/ui/layouts/dock-layout/dock-layout.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/dock-layout/dock-layout.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/dock-layout/dock-layout.ts b/packages/core-compat/ui/layouts/dock-layout/dock-layout.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/dock-layout/dock-layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/dock-layout/index.d.ts b/packages/core-compat/ui/layouts/dock-layout/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/dock-layout/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/dock-layout/index.js b/packages/core-compat/ui/layouts/dock-layout/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/dock-layout/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/dock-layout/index.ts b/packages/core-compat/ui/layouts/dock-layout/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/dock-layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.d.ts b/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.js b/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.ts b/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/flexbox-layout/flexbox-layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/flexbox-layout/index.d.ts b/packages/core-compat/ui/layouts/flexbox-layout/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/flexbox-layout/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/flexbox-layout/index.js b/packages/core-compat/ui/layouts/flexbox-layout/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/flexbox-layout/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/flexbox-layout/index.ts b/packages/core-compat/ui/layouts/flexbox-layout/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/flexbox-layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/grid-layout/grid-layout.d.ts b/packages/core-compat/ui/layouts/grid-layout/grid-layout.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/grid-layout/grid-layout.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/grid-layout/grid-layout.js b/packages/core-compat/ui/layouts/grid-layout/grid-layout.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/grid-layout/grid-layout.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/grid-layout/grid-layout.ts b/packages/core-compat/ui/layouts/grid-layout/grid-layout.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/grid-layout/grid-layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/grid-layout/index.d.ts b/packages/core-compat/ui/layouts/grid-layout/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/grid-layout/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/grid-layout/index.js b/packages/core-compat/ui/layouts/grid-layout/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/grid-layout/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/grid-layout/index.ts b/packages/core-compat/ui/layouts/grid-layout/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/grid-layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/index.d.ts b/packages/core-compat/ui/layouts/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/index.js b/packages/core-compat/ui/layouts/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/index.ts b/packages/core-compat/ui/layouts/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/stack-layout/index.d.ts b/packages/core-compat/ui/layouts/stack-layout/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/stack-layout/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/stack-layout/index.js b/packages/core-compat/ui/layouts/stack-layout/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/stack-layout/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/stack-layout/index.ts b/packages/core-compat/ui/layouts/stack-layout/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/stack-layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/stack-layout/stack-layout.d.ts b/packages/core-compat/ui/layouts/stack-layout/stack-layout.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/stack-layout/stack-layout.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/stack-layout/stack-layout.js b/packages/core-compat/ui/layouts/stack-layout/stack-layout.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/stack-layout/stack-layout.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/stack-layout/stack-layout.ts b/packages/core-compat/ui/layouts/stack-layout/stack-layout.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/stack-layout/stack-layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/wrap-layout/index.d.ts b/packages/core-compat/ui/layouts/wrap-layout/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/wrap-layout/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/wrap-layout/index.js b/packages/core-compat/ui/layouts/wrap-layout/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/wrap-layout/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/wrap-layout/index.ts b/packages/core-compat/ui/layouts/wrap-layout/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/wrap-layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.d.ts b/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.js b/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.ts b/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/layouts/wrap-layout/wrap-layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/page/index.d.ts b/packages/core-compat/ui/page/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/page/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/ui/page/index.js b/packages/core-compat/ui/page/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/ui/page/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/ui/page/index.ts b/packages/core-compat/ui/page/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/ui/page/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/utils/index.d.ts b/packages/core-compat/utils/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/utils/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/utils/index.js b/packages/core-compat/utils/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/utils/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/utils/index.ts b/packages/core-compat/utils/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/utils/types.d.ts b/packages/core-compat/utils/types.d.ts
deleted file mode 100644
index 373f25969..000000000
--- a/packages/core-compat/utils/types.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export declare const ClassInfo: typeof import('@nativescript/core/utils/types').ClassInfo;
-export declare const getClass: typeof import('@nativescript/core/utils/types').getClass;
-export declare const getBaseClasses: typeof import('@nativescript/core/utils/types').getBaseClasses;
-export declare const getClassInfo: typeof import('@nativescript/core/utils/types').getClassInfo;
-export declare const isBoolean: typeof import('@nativescript/core/utils/types').isBoolean;
-export declare const isDefined: typeof import('@nativescript/core/utils/types').isDefined;
-export declare const isFunction: typeof import('@nativescript/core/utils/types').isFunction;
-export declare const isNullOrUndefined: typeof import('@nativescript/core/utils/types').isNullOrUndefined;
-export declare const isNumber: typeof import('@nativescript/core/utils/types').isNumber;
-export declare const isObject: typeof import('@nativescript/core/utils/types').isObject;
-export declare const isString: typeof import('@nativescript/core/utils/types').isString;
-export declare const isUndefined: typeof import('@nativescript/core/utils/types').isUndefined;
-export declare const toUIString: typeof import('@nativescript/core/utils/types').toUIString;
-export declare const verifyCallback: typeof import('@nativescript/core/utils/types').verifyCallback;
diff --git a/packages/core-compat/utils/types.js b/packages/core-compat/utils/types.js
deleted file mode 100644
index ca93d7ed6..000000000
--- a/packages/core-compat/utils/types.js
+++ /dev/null
@@ -1,17 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyCallback = exports.toUIString = exports.isUndefined = exports.isString = exports.isObject = exports.isNumber = exports.isNullOrUndefined = exports.isFunction = exports.isDefined = exports.isBoolean = exports.getClassInfo = exports.getBaseClasses = exports.getClass = exports.ClassInfo = void 0;
-var core_1 = require("@nativescript/core");
-exports.ClassInfo = core_1.Utils.ClassInfo;
-exports.getClass = core_1.Utils.getClass;
-exports.getBaseClasses = core_1.Utils.getBaseClasses;
-exports.getClassInfo = core_1.Utils.getClassInfo;
-exports.isBoolean = core_1.Utils.isBoolean;
-exports.isDefined = core_1.Utils.isDefined;
-exports.isFunction = core_1.Utils.isFunction;
-exports.isNullOrUndefined = core_1.Utils.isNullOrUndefined;
-exports.isNumber = core_1.Utils.isNumber;
-exports.isObject = core_1.Utils.isObject;
-exports.isString = core_1.Utils.isString;
-exports.isUndefined = core_1.Utils.isUndefined;
-exports.toUIString = core_1.Utils.toUIString;
-exports.verifyCallback = core_1.Utils.verifyCallback;
diff --git a/packages/core-compat/utils/types.ts b/packages/core-compat/utils/types.ts
deleted file mode 100644
index 41e298460..000000000
--- a/packages/core-compat/utils/types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Utils } from '@nativescript/core';
-
-export const ClassInfo = Utils.ClassInfo;
-export const getClass = Utils.getClass;
-export const getBaseClasses = Utils.getBaseClasses;
-export const getClassInfo = Utils.getClassInfo;
-export const isBoolean = Utils.isBoolean;
-export const isDefined = Utils.isDefined;
-export const isFunction = Utils.isFunction;
-export const isNullOrUndefined = Utils.isNullOrUndefined;
-export const isNumber = Utils.isNumber;
-export const isObject = Utils.isObject;
-export const isString = Utils.isString;
-export const isUndefined = Utils.isUndefined;
-export const toUIString = Utils.toUIString;
-export const verifyCallback = Utils.verifyCallback;
diff --git a/packages/core-compat/utils/utils.d.ts b/packages/core-compat/utils/utils.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/utils/utils.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/utils/utils.js b/packages/core-compat/utils/utils.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/utils/utils.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/utils/utils.ts b/packages/core-compat/utils/utils.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/utils/utils.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/xml/index.d.ts b/packages/core-compat/xml/index.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/xml/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/xml/index.js b/packages/core-compat/xml/index.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/xml/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/xml/index.ts b/packages/core-compat/xml/index.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/xml/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/xml/xml.d.ts b/packages/core-compat/xml/xml.d.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/xml/xml.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core-compat/xml/xml.js b/packages/core-compat/xml/xml.js
deleted file mode 100644
index 4ae4e4d5b..000000000
--- a/packages/core-compat/xml/xml.js
+++ /dev/null
@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@nativescript/core"), exports);
diff --git a/packages/core-compat/xml/xml.ts b/packages/core-compat/xml/xml.ts
deleted file mode 100644
index 5dff1da93..000000000
--- a/packages/core-compat/xml/xml.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@nativescript/core';
diff --git a/packages/core/.eslintrc b/packages/core/.eslintrc.json
similarity index 100%
rename from packages/core/.eslintrc
rename to packages/core/.eslintrc.json
diff --git a/packages/core/.gitignore b/packages/core/.gitignore
index 1ea5a026a..7fe498c27 100644
--- a/packages/core/.gitignore
+++ b/packages/core/.gitignore
@@ -1,5 +1,6 @@
 dist
 *.js
+!jest.config.js
 *.map
 !xml/xml.js
 !js-libs/**/*.*
diff --git a/packages/core/.npmignore b/packages/core/.npmignore
index 2856450cd..a80034276 100644
--- a/packages/core/.npmignore
+++ b/packages/core/.npmignore
@@ -3,4 +3,5 @@ dist
 *.tgz
 **/*.ts
 !**/*.d.ts
+jest.config.js
 npm-debug.log
\ No newline at end of file
diff --git a/packages/core/application/index.android.ts b/packages/core/application/index.android.ts
index 7587f17af..aadc3ff5d 100644
--- a/packages/core/application/index.android.ts
+++ b/packages/core/application/index.android.ts
@@ -504,3 +504,8 @@ declare namespace com {
 		}
 	}
 }
+
+// core exports this symbol so apps may import them in general
+// technically they are only available for use when running that platform
+// helps avoid a webpack nonexistent warning
+export const iOSApplication = undefined;
diff --git a/packages/core/application/index.ios.ts b/packages/core/application/index.ios.ts
index ba05b941a..2ad1bb4b4 100644
--- a/packages/core/application/index.ios.ts
+++ b/packages/core/application/index.ios.ts
@@ -528,3 +528,8 @@ global.__onLiveSync = function __onLiveSync(context?: ModuleContext) {
 	const rootView = getRootView();
 	livesync(rootView, context);
 };
+
+// core exports this symbol so apps may import them in general
+// technically they are only available for use when running that platform
+// helps avoid a webpack nonexistent warning
+export const AndroidApplication = undefined;
diff --git a/packages/core/data/observable-array/index.ts b/packages/core/data/observable-array/index.ts
index 6f1123e19..1ad212a9c 100644
--- a/packages/core/data/observable-array/index.ts
+++ b/packages/core/data/observable-array/index.ts
@@ -32,6 +32,7 @@ export interface ChangedData<T> extends EventData {
 	 * Number of added items.
 	 */
 	addedCount: number;
+
 }
 
 const CHANGE = 'change';
@@ -113,7 +114,11 @@ export class ObservableArray<T> extends Observable {
 
 	set length(value: number) {
 		if (types.isNumber(value) && this._array && this._array.length !== value) {
-			this.splice(value, this._array.length - value);
+			let added=[];
+			for (let i=this._array.length;i < value;++i) {
+				added.push(undefined);
+			}
+			this.splice(value, this._array.length - value, ...added);
 		}
 	}
 
@@ -246,7 +251,15 @@ export class ObservableArray<T> extends Observable {
 			eventName: CHANGE,
 			object: this,
 			action: ChangeType.Splice,
-			index: Math.max(Math.min(start, this._array.length-1), 0),
+
+			// The logic here is a bit weird; so lets explain why it is written this way
+			// First of all, if you ADD any items to the array, we want the index to point to
+			//   the first value of the index, so this fixes it when you put a value to high in
+			// If you remove items from the array, then the index needs to point to the INDEX
+			//   where you removed the item.
+			// If you add and remove items, the index will point to the remove location as that
+			//   is the index you passed in.
+			index: Math.max(Math.min(start, length - (result.length > 0 ? 1 : 0)), 0),
 			removed: result,
 			addedCount: this._array.length + result.length - length,
 		});
diff --git a/packages/core/image-asset/index.android.ts b/packages/core/image-asset/index.android.ts
index de4e9ebe5..35e9e66d2 100644
--- a/packages/core/image-asset/index.android.ts
+++ b/packages/core/image-asset/index.android.ts
@@ -15,6 +15,7 @@ export class ImageAsset extends ImageAssetBase {
 		this.android = fileName;
 	}
 
+	// @ts-ignore
 	get android(): string {
 		return this._android;
 	}
diff --git a/packages/core/image-asset/index.ios.ts b/packages/core/image-asset/index.ios.ts
index 4a6531f67..32ec30583 100644
--- a/packages/core/image-asset/index.ios.ts
+++ b/packages/core/image-asset/index.ios.ts
@@ -21,6 +21,7 @@ export class ImageAsset extends ImageAssetBase {
 		}
 	}
 
+	// @ts-ignore
 	get ios(): PHAsset {
 		return this._ios;
 	}
diff --git a/packages/core/jest.config.js b/packages/core/jest.config.js
new file mode 100644
index 000000000..a831fe51b
--- /dev/null
+++ b/packages/core/jest.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+	preset: '../../jest.preset.js',
+	displayName: 'core',
+};
diff --git a/packages/core/package.json b/packages/core/package.json
index 8d86e852c..00967cb43 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -3,7 +3,7 @@
   "main": "index",
   "types": "index.d.ts",
   "description": "NativeScript Core Modules",
-  "version": "7.0.10",
+  "version": "7.0.12",
   "homepage": "https://nativescript.org",
   "repository": {
       "type": "git",
@@ -31,7 +31,7 @@
     "css-tree": "^1.0.0-alpha.39",
     "@nativescript/hook": "~2.0.0",
     "reduce-css-calc": "^2.1.7",
-    "tslib": "2.0.0"
+    "tslib": "~2.0.0"
   },
   "nativescript": {
       "platforms": {
diff --git a/packages/core/tsconfig.lib.json b/packages/core/tsconfig.lib.json
index e1631fd2d..0871411be 100644
--- a/packages/core/tsconfig.lib.json
+++ b/packages/core/tsconfig.lib.json
@@ -1,25 +1,27 @@
 {
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "noEmitOnError": true,
-    "noEmitHelpers": true,
-    "declaration": true,
-    "noImplicitAny": false,
-    "noImplicitUseStrict": true,
-    "removeComments": false,
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"noEmitOnError": true,
+		"noEmitHelpers": true,
+		"declaration": true,
+		"noImplicitAny": false,
+		"noImplicitUseStrict": true,
+		"removeComments": false,
     "emitDecoratorMetadata": false,
-    "experimentalDecorators": true,
-    "diagnostics": true,
-    "sourceMap": true,
-    "inlineSourceMap": false,
-    "baseUrl": ".",
-    "outDir": "../../dist/out-tsc",
-    "rootDir": "./",
-    "types": ["node"],
-    "plugins": [
-      { "transform": "../webpack/transformers/ns-transform-native-classes.ts", "type": "raw" }
-    ]
-  },
-  "exclude": ["**/*.spec.ts", "dist", "__tests__"],
-  "include": ["**/*.ts", "./references.d.ts"]
+		"experimentalDecorators": true,
+		"diagnostics": true,
+		"sourceMap": true,
+		"inlineSourceMap": false,
+		"baseUrl": ".",
+		"outDir": "../../dist",
+		"types": ["node"],
+		"plugins": [
+			{
+				"transform": "../webpack/transformers/ns-transform-native-classes.ts",
+				"type": "raw"
+			}
+		]
+	},
+	"exclude": ["**/*.spec.ts", "dist", "__tests__"],
+	"include": ["**/*.ts", "./references.d.ts"]
 }
diff --git a/packages/core/ui/action-bar/action-bar-common.ts b/packages/core/ui/action-bar/action-bar-common.ts
index 2ce8d7c0b..8d0c84a68 100644
--- a/packages/core/ui/action-bar/action-bar-common.ts
+++ b/packages/core/ui/action-bar/action-bar-common.ts
@@ -102,10 +102,12 @@ export class ActionBarBase extends View implements ActionBarDefinition {
 		this.style.androidContentInsetRight = value;
 	}
 
+	// @ts-ignore
 	get ios(): any {
 		return undefined;
 	}
 
+	// @ts-ignore
 	get android(): AndroidActionBarSettings {
 		return undefined;
 	}
@@ -262,7 +264,9 @@ export class ActionItemBase extends ViewBase implements ActionItemDefinition {
 	private _actionBar: ActionBarDefinition;
 	private _actionView: View;
 
+	// @ts-ignore
 	public ios: IOSActionItemSettings;
+	// @ts-ignore
 	public android: AndroidActionItemSettings;
 
 	public text: string;
diff --git a/packages/core/ui/action-bar/index.android.ts b/packages/core/ui/action-bar/index.android.ts
index 531c68ee3..a5e57ccb5 100644
--- a/packages/core/ui/action-bar/index.android.ts
+++ b/packages/core/ui/action-bar/index.android.ts
@@ -96,6 +96,7 @@ export class ActionItem extends ActionItemBase {
 		this._itemId = generateItemId();
 	}
 
+	// @ts-ignore
 	public get android(): AndroidActionItemSettings {
 		return this._androidPosition;
 	}
diff --git a/packages/core/ui/action-bar/index.ios.ts b/packages/core/ui/action-bar/index.ios.ts
index bc557be49..66da39270 100644
--- a/packages/core/ui/action-bar/index.ios.ts
+++ b/packages/core/ui/action-bar/index.ios.ts
@@ -64,6 +64,7 @@ export class ActionItem extends ActionItemBase {
 		systemIcon: undefined,
 	};
 
+	// @ts-ignore
 	public get ios(): IOSActionItemSettings {
 		return this._ios;
 	}
diff --git a/packages/core/ui/activity-indicator/index.ios.ts b/packages/core/ui/activity-indicator/index.ios.ts
index 6eb82c21e..cc93d4eef 100644
--- a/packages/core/ui/activity-indicator/index.ios.ts
+++ b/packages/core/ui/activity-indicator/index.ios.ts
@@ -20,6 +20,7 @@ export class ActivityIndicator extends ActivityIndicatorBase {
 		return view;
 	}
 
+	// @ts-ignore
 	get ios(): UIActivityIndicatorView {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/bottom-navigation/index.ios.ts b/packages/core/ui/bottom-navigation/index.ios.ts
index 78c80464d..43ddc14bc 100644
--- a/packages/core/ui/bottom-navigation/index.ios.ts
+++ b/packages/core/ui/bottom-navigation/index.ios.ts
@@ -316,6 +316,7 @@ export class BottomNavigation extends TabNavigationBase {
 		super.onUnloaded();
 	}
 
+	// @ts-ignore
 	get ios(): UITabBarController {
 		return this._ios;
 	}
diff --git a/packages/core/ui/button/index.ios.ts b/packages/core/ui/button/index.ios.ts
index e48e0b86b..f57842155 100644
--- a/packages/core/ui/button/index.ios.ts
+++ b/packages/core/ui/button/index.ios.ts
@@ -33,6 +33,7 @@ export class Button extends ButtonBase {
 		super.disposeNativeView();
 	}
 
+	// @ts-ignore
 	get ios() {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/core/view/view-helper/index.ios.ts b/packages/core/ui/core/view/view-helper/index.ios.ts
index 6801ee879..a53ec6f5d 100644
--- a/packages/core/ui/core/view/view-helper/index.ios.ts
+++ b/packages/core/ui/core/view/view-helper/index.ios.ts
@@ -201,7 +201,7 @@ export class IOSHelper {
 
 	static initLayoutGuide(controller: UIViewController) {
 		const rootView = controller.view;
-		const layoutGuide = UILayoutGuide.alloc().init();
+		const layoutGuide = UILayoutGuide.new();
 		rootView.addLayoutGuide(layoutGuide);
 		NSLayoutConstraint.activateConstraints(<any>[layoutGuide.topAnchor.constraintEqualToAnchor(controller.topLayoutGuide.bottomAnchor), layoutGuide.bottomAnchor.constraintEqualToAnchor(controller.bottomLayoutGuide.topAnchor), layoutGuide.leadingAnchor.constraintEqualToAnchor(rootView.leadingAnchor), layoutGuide.trailingAnchor.constraintEqualToAnchor(rootView.trailingAnchor)]);
 
diff --git a/packages/core/ui/date-picker/index.ios.ts b/packages/core/ui/date-picker/index.ios.ts
index 118124bd0..69267ccd9 100644
--- a/packages/core/ui/date-picker/index.ios.ts
+++ b/packages/core/ui/date-picker/index.ios.ts
@@ -33,6 +33,7 @@ export class DatePicker extends DatePickerBase {
 		super.disposeNativeView();
 	}
 
+	// @ts-ignore
 	get ios(): UIDatePicker {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
index 2ebac7852..937d1685f 100644
--- a/packages/core/ui/frame/index.android.ts
+++ b/packages/core/ui/frame/index.android.ts
@@ -131,6 +131,7 @@ export class Frame extends FrameBase {
 		return this._containerViewId;
 	}
 
+	// @ts-ignore
 	get android(): AndroidFrame {
 		return this._android;
 	}
@@ -435,7 +436,7 @@ export class Frame extends FrameBase {
 		}
 
 		if (clearHistory || isReplace) {
-			transaction.replace(this.containerViewId, newFragment, newFragmentTag);
+		transaction.replace(this.containerViewId, newFragment, newFragmentTag);
 		} else  {
 			transaction.add(this.containerViewId, newFragment, newFragmentTag);
 		}
@@ -482,7 +483,7 @@ export class Frame extends FrameBase {
 		for (let index = goBackToIndex + 1; index < currentIndex; index++) {
 			transaction.remove(this.backStack[index].fragment);
 		}
-		
+
 		transaction.commitAllowingStateLoss();
 	}
 
@@ -975,11 +976,11 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks {
 
 	@profile
 	public onDestroyView(fragment: org.nativescript.widgets.FragmentBase, superFunc: Function): void {
-		if (Trace.isEnabled()) {
-			Trace.write(`${fragment}.onDestroyView()`, Trace.categories.NativeLifecycle);
+			if (Trace.isEnabled()) {
+				Trace.write(`${fragment}.onDestroyView()`, Trace.categories.NativeLifecycle);
+			}
+			superFunc.call(fragment);
 		}
-		superFunc.call(fragment);
-	}
 
 	@profile
 	public onDestroy(fragment: androidx.fragment.app.Fragment, superFunc: Function): void {
@@ -1012,7 +1013,7 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks {
 
 	@profile
 	public onPause(fragment: org.nativescript.widgets.FragmentBase, superFunc: Function): void {
-		superFunc.call(fragment);
+			superFunc.call(fragment);
 	}
 
 	@profile
diff --git a/packages/core/ui/frame/index.ios.ts b/packages/core/ui/frame/index.ios.ts
index ec78a7b0c..1ccb99603 100644
--- a/packages/core/ui/frame/index.ios.ts
+++ b/packages/core/ui/frame/index.ios.ts
@@ -46,6 +46,7 @@ export class Frame extends FrameBase {
 		super.disposeNativeView();
 	}
 
+	// @ts-ignore
 	public get ios(): iOSFrame {
 		return this._ios;
 	}
diff --git a/packages/core/ui/html-view/index.ios.ts b/packages/core/ui/html-view/index.ios.ts
index 7c6d9462f..60be5b9ba 100644
--- a/packages/core/ui/html-view/index.ios.ts
+++ b/packages/core/ui/html-view/index.ios.ts
@@ -32,6 +32,7 @@ export class HtmlView extends HtmlViewBase {
 		this.nativeViewProtected.textContainerInset = (UIEdgeInsets as any).zero;
 	}
 
+	// @ts-ignore
 	get ios(): UITextView {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/index.ts b/packages/core/ui/index.ts
index 8a0795a2e..6a4eee166 100644
--- a/packages/core/ui/index.ts
+++ b/packages/core/ui/index.ts
@@ -1,6 +1,7 @@
 export { ActionBar, ActionItem, ActionItems, NavigationButton } from './action-bar';
 export { ActivityIndicator } from './activity-indicator';
-export { Animation, AnimationDefinition, KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './animation';
+export { Animation, KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './animation';
+export type { AnimationDefinition } from './animation';
 export { BottomNavigation } from './bottom-navigation';
 export type { SelectedIndexChangedEventData } from './bottom-navigation';
 export { Builder } from './builder';
@@ -45,7 +46,8 @@ export { ListView } from './list-view';
 export type { ItemEventData, TemplatedItemsView, ItemsSource } from './list-view';
 export { Page, PageBase } from './page';
 export type { NavigatedData } from './page';
-export { Placeholder, CreateViewEventData } from './placeholder';
+export { Placeholder } from './placeholder';
+export type { CreateViewEventData } from './placeholder';
 export { Progress } from './progress';
 export { ProxyViewContainer } from './proxy-view-container';
 export { Repeater } from './repeater';
diff --git a/packages/core/ui/label/index.ios.ts b/packages/core/ui/label/index.ios.ts
index 8fe2dc68d..6b8b91283 100644
--- a/packages/core/ui/label/index.ios.ts
+++ b/packages/core/ui/label/index.ios.ts
@@ -27,6 +27,7 @@ export class Label extends TextBase implements LabelDefinition {
 		return view;
 	}
 
+	// @ts-ignore
 	get ios(): TNSLabel {
 		return this.nativeTextViewProtected;
 	}
diff --git a/packages/core/ui/list-picker/index.ios.ts b/packages/core/ui/list-picker/index.ios.ts
index cf255d0c2..2b5260508 100644
--- a/packages/core/ui/list-picker/index.ios.ts
+++ b/packages/core/ui/list-picker/index.ios.ts
@@ -28,6 +28,7 @@ export class ListPicker extends ListPickerBase {
 		super.disposeNativeView();
 	}
 
+	// @ts-ignore
 	get ios() {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/list-view/index.ios.ts b/packages/core/ui/list-view/index.ios.ts
index 5277f2fca..22d2e5a50 100644
--- a/packages/core/ui/list-view/index.ios.ts
+++ b/packages/core/ui/list-view/index.ios.ts
@@ -30,7 +30,7 @@ class ListViewCell extends UITableViewCell {
 	public static initWithEmptyBackground(): ListViewCell {
 		const cell = <ListViewCell>ListViewCell.new();
 		// Clear background by default - this will make cells transparent
-		cell.backgroundColor = null;
+		cell.backgroundColor = UIColor.clearColor;
 
 		return cell;
 	}
@@ -38,7 +38,7 @@ class ListViewCell extends UITableViewCell {
 	initWithStyleReuseIdentifier(style: UITableViewCellStyle, reuseIdentifier: string): this {
 		const cell = <this>super.initWithStyleReuseIdentifier(style, reuseIdentifier);
 		// Clear background by default - this will make cells transparent
-		cell.backgroundColor = null;
+		cell.backgroundColor = UIColor.clearColor;
 
 		return cell;
 	}
@@ -291,6 +291,7 @@ export class ListView extends ListViewBase {
 		super.onUnloaded();
 	}
 
+	// @ts-ignore
 	get ios(): UITableView {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/page/index.ios.ts b/packages/core/ui/page/index.ios.ts
index f7ea82a6a..c1ad6b607 100644
--- a/packages/core/ui/page/index.ios.ts
+++ b/packages/core/ui/page/index.ios.ts
@@ -309,6 +309,7 @@ class UIViewControllerImpl extends UIViewController {
 		}
 	}
 
+	// @ts-ignore
 	public get preferredStatusBarStyle(): UIStatusBarStyle {
 		const owner = this._owner.get();
 		if (owner) {
@@ -340,6 +341,7 @@ export class Page extends PageBase {
 		return this.viewController.view;
 	}
 
+	// @ts-ignore
 	get ios(): UIViewController {
 		return this._ios;
 	}
diff --git a/packages/core/ui/progress/index.ios.ts b/packages/core/ui/progress/index.ios.ts
index 32aa736ae..06c9bb8d9 100644
--- a/packages/core/ui/progress/index.ios.ts
+++ b/packages/core/ui/progress/index.ios.ts
@@ -11,6 +11,7 @@ export class Progress extends ProgressBase {
 		return UIProgressView.new();
 	}
 
+	// @ts-ignore
 	get ios() {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/proxy-view-container/index.ts b/packages/core/ui/proxy-view-container/index.ts
index bb2a715bb..aec10d7ce 100644
--- a/packages/core/ui/proxy-view-container/index.ts
+++ b/packages/core/ui/proxy-view-container/index.ts
@@ -1,4 +1,3 @@
-import { ProxyViewContainer as ProxyViewContainerDefinition } from '.';
 import { View, CSSType } from '../core/view';
 import { LayoutBase } from '../layouts/layout-base';
 import { Property } from '../core/properties';
@@ -14,7 +13,7 @@ import { Trace } from '../../trace';
 // * Child is removed from attached proxy. Handled in _removeViewFromNativeVisualTree.
 // * Proxy (with children) is removed form the DOM. In _removeViewFromNativeVisualTree recursively when the proxy is removed from its parent.
 @CSSType('ProxyViewContainer')
-export class ProxyViewContainer extends LayoutBase implements ProxyViewContainerDefinition {
+export class ProxyViewContainer extends LayoutBase {
 	private proxiedLayoutProperties = new Set<string>();
 
 	constructor() {
@@ -23,10 +22,12 @@ export class ProxyViewContainer extends LayoutBase implements ProxyViewContainer
 	}
 
 	// No native view for proxy container.
+	// @ts-ignore
 	get ios(): any {
 		return null;
 	}
 
+	// @ts-ignore
 	get android(): any {
 		return null;
 	}
diff --git a/packages/core/ui/repeater/index.ts b/packages/core/ui/repeater/index.ts
index 1a32334c1..7793e0edf 100644
--- a/packages/core/ui/repeater/index.ts
+++ b/packages/core/ui/repeater/index.ts
@@ -1,6 +1,6 @@
 import { Label } from '../label';
 import { LayoutBase } from '../layouts/layout-base';
-import { View, CSSType, CustomLayoutView, Template } from '../core/view';
+import { View, CSSType, CustomLayoutView, Template, KeyedTemplate } from '../core/view';
 import { Property } from '../core/properties';
 import { layout } from '../../utils';
 import { StackLayout } from '../layouts/stack-layout';
@@ -19,7 +19,12 @@ export interface ItemsSource {
  */
 @CSSType('Repeater')
 export class Repeater extends CustomLayoutView {
+	// TODO: get rid of such hacks.
+	public static knownFunctions = ['itemTemplateSelector']; // See component-builder.ts isKnownFunction
+
 	private _isDirty = false;
+	private _itemTemplateSelector: (item: any, index: number, items: any) => string;
+	private _itemTemplateSelectorBindable;
 	public ios;
 	public android;
 
@@ -29,6 +34,15 @@ export class Repeater extends CustomLayoutView {
 		this.itemsLayout = new StackLayout();
 	}
 
+	@profile
+	public onLoaded() {
+		if (this._isDirty) {
+			this.refresh();
+		}
+
+		super.onLoaded();
+	}
+
 	/**
 	 * Gets or set the items collection of the Repeater.
 	 * The items property can be set to an array or an object defining length and getItem(index) method.
@@ -38,18 +52,44 @@ export class Repeater extends CustomLayoutView {
 	 * Gets or set the item template of the Repeater.
 	 */
 	public itemTemplate: string | Template;
+	/**
+	 * Gets or set the item templates of the Repeater.
+	 */
+	public itemTemplates: string | Array<KeyedTemplate>;
 	/**
 	 * Gets or set the items layout of the Repeater. Default value is StackLayout with orientation="vertical".
 	 */
 	public itemsLayout: LayoutBase;
 
-	@profile
-	public onLoaded() {
-		if (this._isDirty) {
-			this.refresh();
-		}
+	get itemTemplateSelector(): string | ((item: any, index: number, items: any) => string) {
+		return this._itemTemplateSelector;
+	}
+	set itemTemplateSelector(value: string | ((item: any, index: number, items: any) => string)) {
+		if (typeof value === 'string') {
+			if (!this._itemTemplateSelectorBindable) {
+				this._itemTemplateSelectorBindable = new Label();
+			}
 
-		super.onLoaded();
+			this._itemTemplateSelectorBindable.bind({
+				sourceProperty: null,
+				targetProperty: 'templateKey',
+				expression: value,
+			});
+
+			this._itemTemplateSelector = (item: any, index: number, items: any) => {
+				item['$index'] = index;
+
+				if (this._itemTemplateSelectorBindable.bindingContext === item) {
+					this._itemTemplateSelectorBindable.bindingContext = null;
+				}
+
+				this._itemTemplateSelectorBindable.bindingContext = item;
+
+				return this._itemTemplateSelectorBindable.get('templateKey');
+			};
+		} else if (typeof value === 'function') {
+			this._itemTemplateSelector = value;
+		}
 	}
 
 	public _requestRefresh() {
@@ -73,8 +113,25 @@ export class Repeater extends CustomLayoutView {
 
 		const length = this.items.length;
 		for (let i = 0; i < length; i++) {
-			const viewToAdd = this.itemTemplate ? Builder.parse(this.itemTemplate, this) : this._getDefaultItemContent(i);
 			const dataItem = this._getDataItem(i);
+			let viewToAdd = null;
+
+			if (this._itemTemplateSelector && this.itemTemplates) {
+				const key = this._itemTemplateSelector(dataItem, i, this.items);
+				const length2 = this.itemTemplates.length;
+				for (let j = 0; j < length2; j++) {
+					const template = <KeyedTemplate>this.itemTemplates[j];
+					if (template.key === key) {
+						viewToAdd = template.createView();
+						break;
+					}
+				}
+			}
+
+			if (!viewToAdd) {
+				viewToAdd = this.itemTemplate ? Builder.parse(this.itemTemplate, this) : this._getDefaultItemContent(i);
+			}
+
 			viewToAdd.bindingContext = dataItem;
 			this.itemsLayout.addChild(viewToAdd);
 		}
@@ -147,7 +204,7 @@ export class Repeater extends CustomLayoutView {
 Repeater.prototype.recycleNativeView = 'auto';
 
 /**
- * Represents the item template property of each ListView instance.
+ * Represents the item template property of each Repeater instance.
  */
 export const itemTemplateProperty = new Property<Repeater, string | Template>({
 	name: 'itemTemplate',
@@ -159,7 +216,26 @@ export const itemTemplateProperty = new Property<Repeater, string | Template>({
 itemTemplateProperty.register(Repeater);
 
 /**
- * Represents the property backing the items property of each ListView instance.
+ * Represents the items template property of each Repeater instance.
+ */
+export const itemTemplatesProperty = new Property<Repeater, string | Array<KeyedTemplate>>({
+	name: 'itemTemplates',
+	affectsLayout: true,
+	valueConverter: (value) => {
+		if (typeof value === 'string') {
+			return Builder.parseMultipleTemplates(value, null);
+		}
+
+		return value;
+	},
+	valueChanged: (target) => {
+		target._requestRefresh();
+	},
+});
+itemTemplatesProperty.register(Repeater);
+
+/**
+ * Represents the property backing the items property of each Repeater instance.
  */
 export const itemsProperty = new Property<Repeater, any[] | ItemsSource>({
 	name: 'items',
diff --git a/packages/core/ui/search-bar/index.ios.ts b/packages/core/ui/search-bar/index.ios.ts
index 2ed62bb3e..9d689efac 100644
--- a/packages/core/ui/search-bar/index.ios.ts
+++ b/packages/core/ui/search-bar/index.ios.ts
@@ -103,6 +103,7 @@ export class SearchBar extends SearchBarBase {
 		(<UIResponder>this.ios).resignFirstResponder();
 	}
 
+	// @ts-ignore
 	get ios(): UISearchBar {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/segmented-bar/index.ios.ts b/packages/core/ui/segmented-bar/index.ios.ts
index dc1307d98..42a9252a0 100644
--- a/packages/core/ui/segmented-bar/index.ios.ts
+++ b/packages/core/ui/segmented-bar/index.ios.ts
@@ -36,6 +36,7 @@ export class SegmentedBar extends SegmentedBarBase {
 		super.disposeNativeView();
 	}
 
+	// @ts-ignore
 	get ios(): UISegmentedControl {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/slider/index.ios.ts b/packages/core/ui/slider/index.ios.ts
index 4bbd8efc9..a7a53de97 100644
--- a/packages/core/ui/slider/index.ios.ts
+++ b/packages/core/ui/slider/index.ios.ts
@@ -52,6 +52,7 @@ export class Slider extends SliderBase {
 		super.disposeNativeView();
 	}
 
+	// @ts-ignore
 	get ios(): UISlider {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/switch/index.ios.ts b/packages/core/ui/switch/index.ios.ts
index ec37e99bc..9835be79b 100644
--- a/packages/core/ui/switch/index.ios.ts
+++ b/packages/core/ui/switch/index.ios.ts
@@ -55,6 +55,7 @@ export class Switch extends SwitchBase {
 		super.disposeNativeView();
 	}
 
+	// @ts-ignore
 	get ios(): UISwitch {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/tab-view/index.ios.ts b/packages/core/ui/tab-view/index.ios.ts
index f17041008..c467aee3f 100644
--- a/packages/core/ui/tab-view/index.ios.ts
+++ b/packages/core/ui/tab-view/index.ios.ts
@@ -330,6 +330,7 @@ export class TabView extends TabViewBase {
 		super.onUnloaded();
 	}
 
+	// @ts-ignore
 	get ios(): UITabBarController {
 		return this._ios;
 	}
diff --git a/packages/core/ui/text-base/formatted-string.ts b/packages/core/ui/text-base/formatted-string.ts
index 96f5401f3..1251df8dc 100644
--- a/packages/core/ui/text-base/formatted-string.ts
+++ b/packages/core/ui/text-base/formatted-string.ts
@@ -103,7 +103,7 @@ export class FormattedString extends ViewBase implements FormattedStringDefiniti
 				// First add to logical tree so that inherited properties are set.
 				this._addView(<any>span);
 
-				// Then attach handlers - we skip the first nofitication because
+				// Then attach handlers - we skip the first notification because
 				// we raise change for the whole instance.
 				this.addPropertyChangeHandler(span);
 			}
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
index d9fbdacec..3177ef2cf 100644
--- a/packages/core/ui/text-base/index.android.ts
+++ b/packages/core/ui/text-base/index.android.ts
@@ -164,6 +164,7 @@ function initializeBaselineAdjustedSpan(): void {
 
 export class TextBase extends TextBaseCommon {
 	nativeViewProtected: android.widget.TextView;
+	// @ts-ignore
 	nativeTextViewProtected: android.widget.TextView;
 	private _defaultTransformationMethod: android.text.method.TransformationMethod;
 	private _paintFlags: number;
diff --git a/packages/core/ui/text-base/index.ios.ts b/packages/core/ui/text-base/index.ios.ts
index d5d0c424f..01f06054d 100644
--- a/packages/core/ui/text-base/index.ios.ts
+++ b/packages/core/ui/text-base/index.ios.ts
@@ -79,6 +79,7 @@ class UILabelClickHandlerImpl extends NSObject {
 
 export class TextBase extends TextBaseCommon {
 	public nativeViewProtected: UITextField | UITextView | UILabel | UIButton;
+	// @ts-ignore
 	public nativeTextViewProtected: UITextField | UITextView | UILabel | UIButton;
 	private _tappable: boolean = false;
 	private _tapGestureRecognizer: UITapGestureRecognizer;
diff --git a/packages/core/ui/text-field/index.ios.ts b/packages/core/ui/text-field/index.ios.ts
index f72fdc568..f402ccbcd 100644
--- a/packages/core/ui/text-field/index.ios.ts
+++ b/packages/core/ui/text-field/index.ios.ts
@@ -145,6 +145,7 @@ export class TextField extends TextFieldBase {
 		super.onUnloaded();
 	}
 
+	// @ts-ignore
 	get ios(): UITextField {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/text-view/index.ios.ts b/packages/core/ui/text-view/index.ios.ts
index 3de66521a..d43d9d666 100644
--- a/packages/core/ui/text-view/index.ios.ts
+++ b/packages/core/ui/text-view/index.ios.ts
@@ -123,6 +123,7 @@ export class TextView extends TextViewBaseCommon {
 		super.onUnloaded();
 	}
 
+	// @ts-ignore
 	get ios(): UITextView {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/time-picker/index.ios.ts b/packages/core/ui/time-picker/index.ios.ts
index 12c7ddd7f..ab80f2a16 100644
--- a/packages/core/ui/time-picker/index.ios.ts
+++ b/packages/core/ui/time-picker/index.ios.ts
@@ -51,6 +51,7 @@ export class TimePicker extends TimePickerBase {
 		super.initNativeView();
 	}
 
+	// @ts-ignore
 	get ios(): UIDatePicker {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/core/ui/web-view/index.ios.ts b/packages/core/ui/web-view/index.ios.ts
index 97f0baeda..8dd35dedf 100644
--- a/packages/core/ui/web-view/index.ios.ts
+++ b/packages/core/ui/web-view/index.ios.ts
@@ -130,6 +130,7 @@ export class WebView extends WebViewBase {
 		super.onUnloaded();
 	}
 
+	// @ts-ignore
 	get ios(): WKWebView {
 		return this.nativeViewProtected;
 	}
diff --git a/packages/webpack/helpers/angular-config-parser.js b/packages/webpack/helpers/angular-config-parser.js
new file mode 100644
index 000000000..b96be3a2a
--- /dev/null
+++ b/packages/webpack/helpers/angular-config-parser.js
@@ -0,0 +1,107 @@
+const { resolve } = require('path');
+const fs = require('fs');
+
+const parseWorkspaceConfig = function(platform, envConfigs, projectName, debug) {
+  if (debug) {
+    console.log('-- config DEBUG ---');
+    console.log('platform:', platform);
+    console.log('configuration:', envConfigs);
+  }
+  // configuration file replacements
+  const fileReplacements = {};
+  // anything other than .ts files should be added as part of copy plugin
+  const copyReplacements = [];
+  if (hasConfigurations(envConfigs)) {
+    envConfigs = envConfigs.split(',').map(e => e.trim());
+
+    const configData = findConfig(__dirname);
+    const rootPath = configData.rootPath;
+    const workspaceConfig = configData.workspaceConfig;
+
+    if (workspaceConfig && projectName) {
+      const projectSettings = workspaceConfig.projects[projectName];
+      if (projectSettings) {
+
+        // default project configurations
+        for (const envConfig of envConfigs) {
+          if (projectSettings.architect.default && projectSettings.architect.default.configurations) {
+            const defaultConfigurations = projectSettings.architect.default.configurations;
+            if (defaultConfigurations && defaultConfigurations[envConfig]) {
+              if (defaultConfigurations[envConfig].fileReplacements) {
+                for (const fileReplace of defaultConfigurations[envConfig].fileReplacements) {
+                  if (debug) {
+                    console.log('project fileReplacement:', fileReplace);
+                  }
+                  if (fileReplace.replace.indexOf('.ts') > -1) {
+                    fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`);
+                  } else {
+                    copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true });
+                  }
+                }
+              }
+            }
+          }
+        }
+        // platform specific configurations (always override top level project configurations)
+        for (const envConfig of envConfigs) {
+          if (projectSettings.architect && projectSettings.architect[platform]) {
+            const platformConfig = projectSettings.architect[platform].configurations;
+            if (platformConfig && platformConfig[envConfig] && platformConfig[envConfig].fileReplacements) {
+              for (const fileReplace of platformConfig[envConfig].fileReplacements) {
+                if (debug) {
+                  console.log(`"${platform}" specific fileReplacement:`, fileReplace);
+                }
+                if (fileReplace.replace.indexOf('.ts') > -1) {
+                  fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`);
+                } else {
+                  copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true });
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (debug && copyReplacements.length) {
+    console.log('Adding to CopyWebpackPlugin:', copyReplacements);
+  }
+
+  return {
+    fileReplacements,
+    copyReplacements
+  };
+}
+
+const findConfig = function(projectDir, rootPath = '') {
+  // support workspace.json and angular.json configurations
+  const angularConfigName = 'angular.json';
+  const angularConfig = resolve(projectDir, angularConfigName);
+  const workspaceConfigName = 'workspace.json';
+  const workspaceConfig = resolve(projectDir, workspaceConfigName);
+  if (fs.existsSync(workspaceConfig)) {
+    return {
+      rootPath,
+      workspaceConfig: require(workspaceConfig)
+    };
+  } else if (fs.existsSync(angularConfig)) {
+    return {
+      rootPath,
+      workspaceConfig: require(angularConfig)
+    };
+  } else {
+    rootPath += '../';
+    return findConfig(resolve(projectDir, '..'), rootPath);
+  }
+}
+
+const hasConfigurations = function(envConfigs) {
+  return envConfigs && envConfigs !== 'undefined';
+}
+
+module.exports = {
+  parseWorkspaceConfig,
+  findConfig,
+  hasConfigurations
+};
\ No newline at end of file
diff --git a/packages/webpack/helpers/projectFilesManager.js b/packages/webpack/helpers/projectFilesManager.js
index 28fbcbf6b..856c80b1e 100644
--- a/packages/webpack/helpers/projectFilesManager.js
+++ b/packages/webpack/helpers/projectFilesManager.js
@@ -1,7 +1,7 @@
 const path = require("path");
 const fs = require("fs");
 
-const { isTypeScript, isAngular, isVue, isReact, isShared, isPlugin } = require("./projectHelpers");
+const { isTypeScript, isAngular, isVue, isReact, isSvelte, isShared, isPlugin } = require("./projectHelpers");
 
 function addProjectFiles(projectDir) {
     const projectTemplates = getProjectTemplates(projectDir);
@@ -73,6 +73,8 @@ function getProjectTemplates(projectDir) {
         templates = getVueTemplates(WEBPACK_CONFIG_NAME);
     } else if (isReact({ projectDir })) {
       templates = getReactTemplates(WEBPACK_CONFIG_NAME);
+    } else if (isSvelte({ projectDir })) {
+      templates = getSvelteTemplates(WEBPACK_CONFIG_NAME);
     } else if (isTypeScript({ projectDir })) {
         templates = getTypeScriptTemplates(WEBPACK_CONFIG_NAME);
     } else {
@@ -113,6 +115,12 @@ function getReactTemplates(webpackConfigName) {
   };
 }
 
+function getSvelteTemplates(webpackConfigName) {
+  return {
+      "webpack.svelte.js": webpackConfigName
+  };
+}
+
 function getJavaScriptTemplates(webpackConfigName) {
     return {
         "webpack.javascript.js": webpackConfigName,
@@ -141,4 +149,4 @@ module.exports = {
     removeProjectFiles,
     forceUpdateProjectFiles,
     compareProjectFiles,
-};
\ No newline at end of file
+};
diff --git a/packages/webpack/helpers/projectHelpers.js b/packages/webpack/helpers/projectHelpers.js
index 57b6105cd..77bd60804 100644
--- a/packages/webpack/helpers/projectHelpers.js
+++ b/packages/webpack/helpers/projectHelpers.js
@@ -51,6 +51,13 @@ const isReact = ({ projectDir, packageJson } = {}) => {
       .some(dependency => dependency === "react-nativescript");
 };
 
+const isSvelte = ({ projectDir, packageJson } = {}) => {
+  packageJson = packageJson || getPackageJson(projectDir);
+
+  return packageJson.dependencies && Object.keys(packageJson.dependencies)
+      .some(dependency => dependency === "svelte-native");
+};
+
 const getPackageJson = projectDir => {
     const packageJsonPath = getPackageJsonPath(projectDir);
     const result = readJsonFile(packageJsonPath);
@@ -102,7 +109,7 @@ const getPackageJsonPath = projectDir => {
   } else {
     return getPackageJsonPath(resolve(projectDir, '..'));
   }
-  
+
 }
 const getNsConfigPath = projectDir => resolve(projectDir, "nsconfig.json");
 
@@ -145,6 +152,7 @@ module.exports = {
     getAngularVersion,
     isVue,
     isReact,
+    isSvelte,
     isTypeScript,
     writePackageJson,
     convertSlashesInPath,
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 8b7784600..5b1c6f649 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/webpack",
-  "version": "3.0.5",
+  "version": "3.0.8",
   "main": "index",
   "description": "Webpack plugin for NativeScript",
   "homepage": "https://nativescript.org",
@@ -102,6 +102,6 @@
     "nyc": "^15.1.0",
     "proxyquire": "~2.1.0",
     "source-map-support": "^0.5.13",
-    "typescript": "~3.9.0"
+    "typescript": "~4.0.0"
   }
 }
diff --git a/packages/webpack/templates/webpack.angular.js b/packages/webpack/templates/webpack.angular.js
index be7cba6ba..33088382a 100644
--- a/packages/webpack/templates/webpack.angular.js
+++ b/packages/webpack/templates/webpack.angular.js
@@ -8,6 +8,9 @@ const {
   nsSupportHmrNg
 } = require('@nativescript/webpack/transformers/ns-support-hmr-ng');
 const { nsTransformNativeClassesNg } = require("@nativescript/webpack/transformers/ns-transform-native-classes-ng");
+const {
+  parseWorkspaceConfig, hasConfigurations
+} = require('@nativescript/webpack/helpers/angular-config-parser');
 const {
   getMainModulePath
 } = require('@nativescript/webpack/utils/ast-utils');
@@ -54,6 +57,8 @@ module.exports = env => {
     // You can provide the following flags when running 'tns run android|ios'
     snapshot, // --env.snapshot,
     production, // --env.production
+    configuration, // --env.configuration (consistent with angular cli usage)
+    projectName, // --env.projectName (drive configuration through angular projects)
     uglify, // --env.uglify
     report, // --env.report
     sourceMap, // --env.sourceMap
@@ -68,20 +73,29 @@ module.exports = env => {
     compileSnapshot // --env.compileSnapshot
   } = env;
 
+  const { fileReplacements, copyReplacements } = parseWorkspaceConfig(platform, configuration, projectName);
+
   const useLibs = compileSnapshot;
   const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
   const externals = nsWebpack.getConvertedExternals(env.externals);
   const appFullPath = resolve(projectRoot, appPath);
   const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
   let tsConfigName = 'tsconfig.json';
-  let tsConfigTnsName = 'tsconfig.tns.json';
   let tsConfigPath = resolve(projectRoot, tsConfigName);
+  const tsConfigTnsName = 'tsconfig.tns.json';
   const tsConfigTnsPath = resolve(projectRoot, tsConfigTnsName);
   if (fs.existsSync(tsConfigTnsPath)) {
-    // still support shared angular app configurations 
+    // support shared angular app configurations 
     tsConfigName = tsConfigTnsName;
     tsConfigPath = tsConfigTnsPath;
   }
+  const tsConfigEnvName = 'tsconfig.env.json';
+  const tsConfigEnvPath = resolve(projectRoot, tsConfigEnvName);
+  if (hasConfigurations(configuration) && fs.existsSync(tsConfigEnvPath)) {
+    // when configurations are used, switch to environments supported config
+    tsConfigName = tsConfigEnvName;
+    tsConfigPath = tsConfigEnvPath;
+  }
   const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`;
   const entryPath = `.${sep}${entryModule}`;
   const entries = { bundle: entryPath };
@@ -104,6 +118,7 @@ module.exports = env => {
   const copyTargets = [
     { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
     { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
+    ...copyReplacements
   ];
 
   if (!production) {
@@ -217,7 +232,8 @@ module.exports = env => {
         '~/package.json': resolve(projectRoot, 'package.json'),
         '~': appFullPath,
         "tns-core-modules": "@nativescript/core",
-        "nativescript-angular": "@nativescript/angular"
+        "nativescript-angular": "@nativescript/angular",
+        ...fileReplacements
       },
       symlinks: true
     },
diff --git a/packages/webpack/templates/webpack.config.spec.ts b/packages/webpack/templates/webpack.config.spec.ts
index 595957968..84de508a4 100644
--- a/packages/webpack/templates/webpack.config.spec.ts
+++ b/packages/webpack/templates/webpack.config.spec.ts
@@ -57,6 +57,17 @@ const webpackConfigAngular = proxyquire('./webpack.angular', {
 			return FakeNativeClassTransformerFlag;
 		},
 	},
+	'@nativescript/webpack/helpers/angular-config-parser': {
+		parseWorkspaceConfig: (platform, envConfigs, rootPath = '') => {
+			return {
+				fileReplacements: {},
+				copyReplacements: [],
+			};
+		},
+		hasConfigurations: (envConfigs) => {
+			return false;
+		},
+	},
 	'@nativescript/webpack/utils/ast-utils': {
 		getMainModulePath: () => {
 			return 'fakePath';
diff --git a/packages/webpack/templates/webpack.svelte.js b/packages/webpack/templates/webpack.svelte.js
new file mode 100644
index 000000000..7013c4522
--- /dev/null
+++ b/packages/webpack/templates/webpack.svelte.js
@@ -0,0 +1,364 @@
+const { join, relative, resolve, sep } = require("path");
+const fs = require('fs');
+
+const webpack = require("webpack");
+const nsWebpack = require("@nativescript/webpack");
+const nativescriptTarget = require("@nativescript/webpack/nativescript-target");
+const { getNoEmitOnErrorFromTSConfig } = require("@nativescript/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();
+const preprocessConfig =  require("./svelte.config.js");
+const svelteNativePreprocessor = require("svelte-native-preprocessor");
+
+module.exports = env => {
+	// Add your custom Activities, Services and other Android app components here.
+	const appComponents = env.appComponents || [];
+	appComponents.push(...[
+		"@nativescript/core/ui/frame",
+		"@nativescript/core/ui/frame/activity",
+	]);
+
+	const platform = env && (env.android && "android" || env.ios && "ios" || env.platform);
+	if (!platform) {
+		throw new Error("You need to provide a target platform!");
+	}
+
+	const platforms = ["ios", "android"];
+	const projectRoot = __dirname;
+
+	if (env.platform) {
+		platforms.push(env.platform);
+	}
+
+	// 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'
+		snapshot, // --env.snapshot
+		production, // --env.production
+		uglify, // --env.uglify
+		report, // --env.report
+		sourceMap, // --env.sourceMap
+		hiddenSourceMap, // --env.hiddenSourceMap
+		hmr, // --env.hmr,
+		unitTesting, // --env.unitTesting,
+		testing, // --env.testing
+		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);
+
+	let appFullPath = resolve(projectRoot, appPath);
+	if (!fs.existsSync(appFullPath)) {
+		// some apps use 'app' directory
+		appFullPath = resolve(projectRoot, 'app');
+	}
+	const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
+	let coreModulesPackageName = "tns-core-modules";
+	const alias = env.alias || {};
+	alias['~/package.json'] = resolve(projectRoot, 'package.json');
+	alias['~'] = appFullPath;
+
+	if (hasRootLevelScopedModules) {
+		coreModulesPackageName = "@nativescript/core";
+		alias["tns-core-modules"] = coreModulesPackageName;
+	}
+	const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
+
+	const copyIgnore = { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] };
+
+	const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
+	const entryPath = `.${sep}${entryModule}.ts`;
+	const entries = env.entries || {};
+	entries.bundle = entryPath;
+
+	const tsConfigPath = resolve(projectRoot, "tsconfig.json");
+
+	const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("@nativescript") > -1);
+	if (platform === "ios" && !areCoreModulesExternal && !testing) {
+		entries["tns_modules/@nativescript/core/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", ".mjs", ".js", ".svelte", ".scss", ".css"],
+			// Resolve {N} system modules from @nativescript/core
+			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/webpack/helpers/android-app-components-loader",
+							options: { modules: appComponents }
+						},
+
+						{
+							loader: "@nativescript/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/webpack/hmr/hot-loader"
+				},
+
+				{ test: /\.(html|xml)$/, use: "@nativescript/webpack/helpers/xml-namespace-loader" },
+
+				{
+					test: /\.css$/,
+					use: "@nativescript/webpack/helpers/css2json-loader"
+				},
+
+				{
+					test: /\.scss$/,
+					use: [
+						"@nativescript/webpack/helpers/css2json-loader",
+						"sass-loader"
+					]
+				},
+
+				{
+					test: /\.mjs$/,
+					type: 'javascript/auto',
+				},
+				{
+					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
+							},
+							getCustomTransformers: (program) => ({
+								before: [
+									require("@nativescript/webpack/transformers/ns-transform-native-classes").default
+								]
+							})
+						},
+					}
+				},
+				{
+					test: /\.svelte$/,
+					exclude: /node_modules/,
+					use: [
+						{
+							loader: 'svelte-loader-hot',
+							options: {
+								dev: env.production ? false : true,
+								preprocess: [preprocessConfig.preprocess, svelteNativePreprocessor()],
+								hotReload: env.production ? false : true,
+								hotOptions: {
+									injectCss: false,
+									native: true
+								}
+							}
+						}
+					]
+				}
+			]
+		},
+		plugins: [
+			// Define useful constants like TNS_WEBPACK
+			new webpack.DefinePlugin({
+				"global.TNS_WEBPACK": "true",
+				"global.isAndroid": platform === 'android',
+				"global.isIOS": platform === 'ios',
+				"process": "global.process",
+			}),
+			// Remove all files from the out dir.
+			new CleanWebpackPlugin({
+				cleanOnceBeforeBuildPatterns: itemsToClean,
+				verbose: !!verbose
+			}),
+			// Copy assets
+			new CopyWebpackPlugin({
+				patterns: [
+					{ from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
+					{ from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
+					{ from: '**/*.jpg', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
+					{ from: '**/*.png', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
+				],
+			}),
+			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({
+				async: false,
+				typescript: {
+					configFile: tsConfigPath,
+					memoryLimit: 4096,
+					diagnosticOptions: {
+						syntactic: true,
+						semantic: true
+					}
+				}
+			})
+		],
+	};
+
+	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: [
+				"@nativescript/core/bundle-entry-points",
+			],
+			projectRoot,
+			webpackConfig: config,
+			snapshotInDocker,
+			skipSnapshotTools,
+			useLibs
+		}));
+	}
+
+	if (hmr) {
+		config.plugins.push(new webpack.HotModuleReplacementPlugin());
+	}
+
+	return config;
+};
diff --git a/tools/assets/App_Resources/Android/app.gradle b/tools/assets/App_Resources/Android/app.gradle
index 87c95d8b3..b6218c322 100644
--- a/tools/assets/App_Resources/Android/app.gradle
+++ b/tools/assets/App_Resources/Android/app.gradle
@@ -8,7 +8,7 @@
 android {  
   compileSdkVersion 29
   defaultConfig {  
-    minSdkVersion 21
+    minSdkVersion 17
     targetSdkVersion 29
     generatedDensities = []
   }  
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/add_to_fav.png b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/add_to_fav.png
new file mode 100644
index 000000000..d79e38998
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/add_to_fav.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_18.png b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_18.png
new file mode 100755
index 000000000..0e08b122f
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_18.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_24.png b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_24.png
new file mode 100755
index 000000000..2a9bc9caa
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_24.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_36.png b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_36.png
new file mode 100755
index 000000000..582032b56
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_36.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_48.png b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_48.png
new file mode 100755
index 000000000..0522d79e7
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_48.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/add_to_fav.png b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/add_to_fav.png
new file mode 100644
index 000000000..fafe86a90
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/add_to_fav.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_18.png b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_18.png
new file mode 100755
index 000000000..53de3f359
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_18.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_24.png b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_24.png
new file mode 100755
index 000000000..8063fa64f
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_24.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_36.png b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_36.png
new file mode 100755
index 000000000..2a9bc9caa
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_36.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_48.png b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_48.png
new file mode 100755
index 000000000..f3434107c
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_48.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i18x32.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i18x32.png
new file mode 100644
index 000000000..a23217419
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i18x32.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i32x18.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i32x18.png
new file mode 100644
index 000000000..f0ba2f305
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i32x18.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i32x32.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i32x32.png
new file mode 100644
index 000000000..0f778f86e
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/i32x32.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/icon.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/icon.png
new file mode 100644
index 000000000..1034356e2
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/icon.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/testlogo.jpg b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/testlogo.jpg
new file mode 100644
index 000000000..102a9b134
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/testlogo.jpg differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/tile.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/tile.png
new file mode 100644
index 000000000..7ebde26a0
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/tile.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/up.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/up.png
new file mode 100644
index 000000000..04dca794a
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/up.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upccw.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upccw.png
new file mode 100644
index 000000000..6ad441c51
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upccw.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upcw.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upcw.png
new file mode 100644
index 000000000..583e71897
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upcw.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upflip.png b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upflip.png
new file mode 100644
index 000000000..af39cee60
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-nodpi/upflip.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/add_to_fav.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/add_to_fav.png
new file mode 100644
index 000000000..ef05e3ea1
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/add_to_fav.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_18.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_18.png
new file mode 100755
index 000000000..2a9bc9caa
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_18.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_24.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_24.png
new file mode 100755
index 000000000..f3434107c
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_24.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_36.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_36.png
new file mode 100755
index 000000000..0522d79e7
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_36.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_48.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_48.png
new file mode 100755
index 000000000..a3451d3c2
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_48.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/add_to_fav.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/add_to_fav.png
new file mode 100644
index 000000000..67ccc7dc3
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/add_to_fav.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_18.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_18.png
new file mode 100755
index 000000000..582032b56
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_18.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_24.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_24.png
new file mode 100755
index 000000000..0522d79e7
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_24.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_36.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_36.png
new file mode 100755
index 000000000..1bc61bfd1
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_36.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_48.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_48.png
new file mode 100755
index 000000000..d0c6b11b5
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_48.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/add_to_fav.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/add_to_fav.png
new file mode 100644
index 000000000..a58cf3c38
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/add_to_fav.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_18.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_18.png
new file mode 100755
index 000000000..0522d79e7
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_18.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_24.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_24.png
new file mode 100755
index 000000000..a3451d3c2
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_24.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_36.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_36.png
new file mode 100755
index 000000000..d0c6b11b5
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_36.png differ
diff --git a/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_48.png b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_48.png
new file mode 100755
index 000000000..83e4ee845
Binary files /dev/null and b/tools/assets/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_48.png differ
diff --git a/tools/assets/App_Resources/iOS/add_to_fav.png b/tools/assets/App_Resources/iOS/add_to_fav.png
new file mode 100644
index 000000000..fafe86a90
Binary files /dev/null and b/tools/assets/App_Resources/iOS/add_to_fav.png differ
diff --git a/tools/assets/App_Resources/iOS/add_to_fav@2x.png b/tools/assets/App_Resources/iOS/add_to_fav@2x.png
new file mode 100644
index 000000000..ef05e3ea1
Binary files /dev/null and b/tools/assets/App_Resources/iOS/add_to_fav@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/add_to_fav@3x.png b/tools/assets/App_Resources/iOS/add_to_fav@3x.png
new file mode 100644
index 000000000..67ccc7dc3
Binary files /dev/null and b/tools/assets/App_Resources/iOS/add_to_fav@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@1x.png b/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@1x.png
new file mode 100755
index 000000000..8063fa64f
Binary files /dev/null and b/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@1x.png differ
diff --git a/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@2x.png b/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@2x.png
new file mode 100755
index 000000000..f3434107c
Binary files /dev/null and b/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@3x.png b/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@3x.png
new file mode 100755
index 000000000..0522d79e7
Binary files /dev/null and b/tools/assets/App_Resources/iOS/baseline_motorcycle_black_24@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/i18x32.png b/tools/assets/App_Resources/iOS/i18x32.png
new file mode 100644
index 000000000..a23217419
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i18x32.png differ
diff --git a/tools/assets/App_Resources/iOS/i18x32@2x.png b/tools/assets/App_Resources/iOS/i18x32@2x.png
new file mode 100644
index 000000000..a23217419
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i18x32@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/i18x32@3x.png b/tools/assets/App_Resources/iOS/i18x32@3x.png
new file mode 100644
index 000000000..a23217419
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i18x32@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/i32x18.png b/tools/assets/App_Resources/iOS/i32x18.png
new file mode 100644
index 000000000..f0ba2f305
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i32x18.png differ
diff --git a/tools/assets/App_Resources/iOS/i32x18@2x.png b/tools/assets/App_Resources/iOS/i32x18@2x.png
new file mode 100644
index 000000000..f0ba2f305
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i32x18@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/i32x18@3x.png b/tools/assets/App_Resources/iOS/i32x18@3x.png
new file mode 100644
index 000000000..f0ba2f305
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i32x18@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/i32x32.png b/tools/assets/App_Resources/iOS/i32x32.png
new file mode 100644
index 000000000..0f778f86e
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i32x32.png differ
diff --git a/tools/assets/App_Resources/iOS/i32x32@2x.png b/tools/assets/App_Resources/iOS/i32x32@2x.png
new file mode 100644
index 000000000..0f778f86e
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i32x32@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/i32x32@3x.png b/tools/assets/App_Resources/iOS/i32x32@3x.png
new file mode 100644
index 000000000..0f778f86e
Binary files /dev/null and b/tools/assets/App_Resources/iOS/i32x32@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/testlogo.jpg b/tools/assets/App_Resources/iOS/testlogo.jpg
new file mode 100644
index 000000000..102a9b134
Binary files /dev/null and b/tools/assets/App_Resources/iOS/testlogo.jpg differ
diff --git a/tools/assets/App_Resources/iOS/tile.png b/tools/assets/App_Resources/iOS/tile.png
new file mode 100644
index 000000000..7ebde26a0
Binary files /dev/null and b/tools/assets/App_Resources/iOS/tile.png differ
diff --git a/tools/assets/App_Resources/iOS/tile@2x.png b/tools/assets/App_Resources/iOS/tile@2x.png
new file mode 100644
index 000000000..7ebde26a0
Binary files /dev/null and b/tools/assets/App_Resources/iOS/tile@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/tile@3x.png b/tools/assets/App_Resources/iOS/tile@3x.png
new file mode 100644
index 000000000..7ebde26a0
Binary files /dev/null and b/tools/assets/App_Resources/iOS/tile@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/up.png b/tools/assets/App_Resources/iOS/up.png
new file mode 100644
index 000000000..04dca794a
Binary files /dev/null and b/tools/assets/App_Resources/iOS/up.png differ
diff --git a/tools/assets/App_Resources/iOS/up@2x.png b/tools/assets/App_Resources/iOS/up@2x.png
new file mode 100644
index 000000000..04dca794a
Binary files /dev/null and b/tools/assets/App_Resources/iOS/up@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/up@3x.png b/tools/assets/App_Resources/iOS/up@3x.png
new file mode 100644
index 000000000..04dca794a
Binary files /dev/null and b/tools/assets/App_Resources/iOS/up@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/upccw.png b/tools/assets/App_Resources/iOS/upccw.png
new file mode 100644
index 000000000..6ad441c51
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upccw.png differ
diff --git a/tools/assets/App_Resources/iOS/upccw@2x.png b/tools/assets/App_Resources/iOS/upccw@2x.png
new file mode 100644
index 000000000..6ad441c51
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upccw@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/upccw@3x.png b/tools/assets/App_Resources/iOS/upccw@3x.png
new file mode 100644
index 000000000..6ad441c51
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upccw@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/upcw.png b/tools/assets/App_Resources/iOS/upcw.png
new file mode 100644
index 000000000..583e71897
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upcw.png differ
diff --git a/tools/assets/App_Resources/iOS/upcw@2x.png b/tools/assets/App_Resources/iOS/upcw@2x.png
new file mode 100644
index 000000000..583e71897
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upcw@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/upcw@3x.png b/tools/assets/App_Resources/iOS/upcw@3x.png
new file mode 100644
index 000000000..583e71897
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upcw@3x.png differ
diff --git a/tools/assets/App_Resources/iOS/upflip.png b/tools/assets/App_Resources/iOS/upflip.png
new file mode 100644
index 000000000..af39cee60
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upflip.png differ
diff --git a/tools/assets/App_Resources/iOS/upflip@2x.png b/tools/assets/App_Resources/iOS/upflip@2x.png
new file mode 100644
index 000000000..af39cee60
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upflip@2x.png differ
diff --git a/tools/assets/App_Resources/iOS/upflip@3x.png b/tools/assets/App_Resources/iOS/upflip@3x.png
new file mode 100644
index 000000000..af39cee60
Binary files /dev/null and b/tools/assets/App_Resources/iOS/upflip@3x.png differ
diff --git a/tools/scripts/api-reports/NativeScript.api.md b/tools/scripts/api-reports/NativeScript.api.md
index 0a82f4aef..4dde08a08 100644
--- a/tools/scripts/api-reports/NativeScript.api.md
+++ b/tools/scripts/api-reports/NativeScript.api.md
@@ -1772,6 +1772,10 @@ export class Repeater extends CustomLayoutView {
 
     itemTemplate: string | Template;
 
+    itemTemplates: string | Array<KeyedTemplate>;
+
+    itemTemplateSelector: string | ((item: any, index: number, items: any) => string);
+
     refresh();
 }
 
diff --git a/tools/workspace-scripts.js b/tools/workspace-scripts.js
index 84cb23ee0..53fb315a2 100644
--- a/tools/workspace-scripts.js
+++ b/tools/workspace-scripts.js
@@ -87,8 +87,8 @@ module.exports = {
 			// @nativescript/core
 			core: {
 				build: {
-          script: 'nx run core:build.npm',
-          description: '@nativescript/core: Build for npm'
+          script: 'nx run core:build',
+          description: '@nativescript/core: Build'
         },
 				test: {
           script: 'nx run core:unit',
@@ -99,13 +99,6 @@ module.exports = {
 					},
 				},
 			},
-			// tns-core-modules (old historic compatibility)
-			'core-compat': {
-				build: {
-          script: 'nx run core-compat:build',
-          description: 'tns-core-modules: (Compatibility package) Build for npm'
-        },
-			},
 			// @nativescript/ui-mobile-base
 			'ui-mobile-base': {
 				build: {
diff --git a/workspace.json b/workspace.json
index d08978ac0..f31778a13 100644
--- a/workspace.json
+++ b/workspace.json
@@ -1,418 +1,317 @@
 {
-  "version": 1,
-  "projects": {
-    "apps-automated": {
-      "root": "apps/automated/",
-      "sourceRoot": "apps/automated/app",
-      "projectType": "application",
-      "prefix": "nativescript",
-      "architect": {
-        "ios": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
+	"version": 1,
+	"projects": {
+		"apps-automated": {
+			"root": "apps/automated/",
+			"sourceRoot": "apps/automated/app",
+			"projectType": "application",
+			"prefix": "nativescript",
+			"architect": {
+				"ios": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["ns debug ios --no-hmr --emulator --env.testing"],
+						"cwd": "apps/automated",
+						"parallel": false
+					}
+				},
+				"android": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["ns debug android --no-hmr --emulator --env.testing"],
+						"cwd": "apps/automated",
+						"parallel": false
+					}
+				},
+				"clean": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i", "npx rimraf -- package-lock.json"],
+						"cwd": "apps/automated",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"apps-toolbox": {
+			"root": "apps/toolbox/",
+			"sourceRoot": "apps/toolbox/src",
+			"projectType": "application",
+			"prefix": "nativescript",
+			"architect": {
+				"ios": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["ns debug ios --no-hmr --emulator --env.testing"],
+						"cwd": "apps/toolbox",
+						"parallel": false
+					}
+				},
+				"android": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["ns debug android --no-hmr --emulator --env.testing"],
+						"cwd": "apps/toolbox",
+						"parallel": false
+					}
+				},
+				"clean": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i", "npx rimraf -- package-lock.json"],
+						"cwd": "apps/toolbox",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"apps-ui": {
+			"root": "apps/ui/",
+			"sourceRoot": "apps/ui/src",
+			"projectType": "application",
+			"prefix": "nativescript",
+			"architect": {
+				"ios": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["ns debug ios --no-hmr --emulator --env.testing"],
+						"cwd": "apps/ui",
+						"parallel": false
+					}
+				},
+				"android": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["ns debug android --no-hmr --emulator --env.testing"],
+						"cwd": "apps/ui",
+						"parallel": false
+					}
+				},
+				"clean": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js", "npm i", "npx rimraf -- package-lock.json"],
+						"cwd": "apps/ui",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"core": {
+			"root": "packages/core",
+			"sourceRoot": "packages/core",
+			"projectType": "library",
+			"schematics": {},
+			"architect": {
+				"lint": {
+					"builder": "@nrwl/linter:eslint",
+					"options": {
+						"lintFilePatterns": ["packages/core/**/*.ts", "packages/core/references.d.ts", "packages/core/**/*.spec.ts", "packages/core/**/*.spec.tsx", "packages/core/**/*.spec.js", "packages/core/**/*.spec.jsx", "packages/core/**/*.d.ts"]
+					}
+				},
+				"test": {
+					"builder": "@nrwl/jest:jest",
+					"options": {
+						"jestConfig": "packages/core/jest.config.js",
+						"passWithNoTests": true
+					}
+				},
+				"setup": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["nx run webpack:build"]
+					}
+				},
+				"build": {
+					"builder": "@nrwl/workspace:run-commands",
+					"outputs": ["dist/packages"],
+					"options": {
             "commands": [
-              "ns debug ios --no-hmr --emulator --env.testing"
-            ],
-            "cwd": "apps/automated",
-            "parallel": false
-          }
-        },
-        "android": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "ns debug android --no-hmr --emulator --env.testing"
-            ],
-            "cwd": "apps/automated",
-            "parallel": false
-          }
-        },
-        "clean": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js",
-              "npm i",
-              "npx rimraf -- package-lock.json"
-            ],
-            "cwd": "apps/automated",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "apps-toolbox": {
-      "root": "apps/toolbox/",
-      "sourceRoot": "apps/toolbox/src",
-      "projectType": "application",
-      "prefix": "nativescript",
-      "architect": {
-        "ios": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "ns debug ios --no-hmr --emulator --env.testing"
-            ],
-            "cwd": "apps/toolbox",
-            "parallel": false
-          }
-        },
-        "android": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "ns debug android --no-hmr --emulator --env.testing"
-            ],
-            "cwd": "apps/toolbox",
-            "parallel": false
-          }
-        },
-        "clean": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js",
-              "npm i",
-              "npx rimraf -- package-lock.json"
-            ],
-            "cwd": "apps/toolbox",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "apps-ui": {
-      "root": "apps/ui/",
-      "sourceRoot": "apps/ui/src",
-      "projectType": "application",
-      "prefix": "nativescript",
-      "architect": {
-        "ios": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "ns debug ios --no-hmr --emulator --env.testing"
-            ],
-            "cwd": "apps/ui",
-            "parallel": false
-          }
-        },
-        "android": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "ns debug android --no-hmr --emulator --env.testing"
-            ],
-            "cwd": "apps/ui",
-            "parallel": false
-          }
-        },
-        "clean": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "npx rimraf -- hooks node_modules platforms package-lock.json webpack.config.js",
-              "npm i",
-              "npx rimraf -- package-lock.json"
-            ],
-            "cwd": "apps/ui",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "core": {
-      "root": "packages/core",
-      "sourceRoot": "packages/core",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "lint": {
-          "builder": "@nrwl/linter:lint",
-          "options": {
-            "linter": "eslint",
-            "config": "packages/core/.eslintrc",
-            "tsConfig": [
-              "packages/core/tsconfig.lib.json",
-              "packages/core/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**",
-              "!packages/core/**"
-            ]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "options": {
-            "jestConfig": "packages/core/jest.config.js",
-            "tsConfig": "packages/core/tsconfig.spec.json",
-            "passWithNoTests": true
-          }
-        },
-        "setup": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "nx run webpack:build"
-            ]
-          }
-        },
-        "build": {
-          "builder": "@nrwl/node:package",
-          "outputs": ["dist/packages"],
-          "options": {
-            "outputPath": "dist/packages/core",
-            "tsConfig": "packages/core/tsconfig.lib.json",
-            "packageJson": "packages/core/package.json",
-            "main": "packages/core/index.ts",
-            "assets": [
-              "packages/core/*.md"
-            ]
-          }
-        },
-        "build.npm": {
-          "builder": "@nrwl/workspace:run-commands",
-          "outputs": ["dist/packages"],
-          "options": {
-            "commands": [
-              "nx run core:build && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/**/*.d.ts\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/js-libs/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/cli-hooks/**/*.js\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/platforms/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/fetch/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css-value/**/*\" dist",
+              "npx rimraf dist/packages/core",
+              "./node_modules/.bin/tsc -p packages/core/tsconfig.lib.json",
+              "./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/**/*.d.ts\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/js-libs/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/cli-hooks/**/*.js\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/platforms/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/fetch/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css/**/*\" dist && ./node_modules/.bin/copyfiles -e \"packages/core/__tests__/**/*\" \"packages/core/css-value/**/*\" dist",
+              "cp packages/core/package.json dist/packages/core",
               "cp LICENSE dist/packages/core",
-              "cd dist/packages/core && npm pack && mv *.tgz .."
+							"cd dist/packages/core && npm pack && mv *.tgz .."
             ],
             "cwd": ".",
-            "parallel": false
-          }
-        },
-        "unit": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --config=.mocharc.yml"
-            ],
-            "cwd": "packages/core/__tests__",
-            "parallel": false
-          }
-        },
-        "unit.watch": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --watch --config=.mocharc.yml"
-            ],
-            "cwd": "packages/core/__tests__",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "core-compat": {
-      "root": "packages/core-compat",
-      "sourceRoot": "packages/core-compat",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "build": {
-          "builder": "@nrwl/workspace:run-commands",
-          "outputs": ["dist/packages"],
-          "options": {
-            "commands": [
-              "npx rimraf -- node_modules package-lock.json",
-              "npm i",
-              "../../node_modules/.bin/tsc -p tsconfig.json",
-              "mv \"$(npm pack | tail -n 1)\" ../../dist/packages/tns-core-modules.tgz"
-            ],
-            "cwd": "packages/core-compat",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "types": {
-      "root": "packages/types",
-      "sourceRoot": "packages/types",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "build": {
-          "builder": "@nrwl/workspace:run-commands",
-          "outputs": ["dist/packages"],
-          "options": {
-            "commands": [
-              "mkdir -p ../../dist/packages/types",
-              "cp -R * ../../dist/packages/types"
-            ],
-            "cwd": "packages/types",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "types-ios": {
-      "root": "packages/types-ios",
-      "sourceRoot": "packages/types-ios/src",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "build": {
-          "builder": "@nrwl/workspace:run-commands",
-          "outputs": ["dist/packages"],
-          "options": {
-            "commands": [
-              "mkdir -p ../../dist/packages/types-ios",
-              "cp -R src/* ../../dist/packages/types-ios",
-              "cp package.json *.md ../../dist/packages/types-ios"
-            ],
-            "cwd": "packages/types-ios",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "types-android": {
-      "root": "packages/types-android",
-      "sourceRoot": "packages/types-android/src",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "build": {
-          "builder": "@nrwl/workspace:run-commands",
-          "outputs": ["dist/packages"],
-          "options": {
-            "commands": [
-              "mkdir -p ../../dist/packages/types-android",
-              "cp -R src/* ../../dist/packages/types-android",
-              "cp package.json *.md ../../dist/packages/types-android"
-            ],
-            "cwd": "packages/types-android",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "ui-mobile-base": {
-      "root": "packages/ui-mobile-base",
-      "sourceRoot": "packages/ui-mobile-base",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "build": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "./build.sh",
-              "cp -R dist/package/platforms/* ../../packages/core/platforms"
-            ],
-            "cwd": "packages/ui-mobile-base",
-            "parallel": false
-          }
-        }
-      }
-    },
-    "webpack": {
-      "root": "packages/webpack",
-      "sourceRoot": "packages/webpack",
-      "projectType": "library",
-      "schematics": {},
-      "architect": {
-        "lint": {
-          "builder": "@nrwl/linter:lint",
-          "options": {
-            "linter": "eslint",
-            "config": "packages/webpack/.eslintrc",
-            "tsConfig": [
-              "packages/webpack/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**",
-              "!packages/webpack/**"
-            ]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "npm run tsc",
-              "npm run jasmine"
-            ],
-            "cwd": "packages/webpack",
-            "parallel": false
-          }
-        },
-        "build": {
-          "builder": "@nrwl/workspace:run-commands",
-          "outputs": ["dist/packages"],
-          "options": {
-            "commands": [
-              "npm run setup",
-              "mkdir -p ../../dist/packages",
-              "mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"
-            ],
-            "cwd": "packages/webpack",
-            "parallel": false
-          }
-        }
-      }
-    }
-  },
-  "cli": {
-    "defaultCollection": "@nrwl/workspace"
-  },
-  "schematics": {
-    "@nrwl/workspace": {
-      "library": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/cypress": {
-      "cypress-project": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/react": {
-      "application": {
-        "linter": "eslint"
-      },
-      "library": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/next": {
-      "application": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/web": {
-      "application": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/node": {
-      "application": {
-        "linter": "eslint"
-      },
-      "library": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/nx-plugin": {
-      "plugin": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/nest": {
-      "application": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/express": {
-      "application": {
-        "linter": "eslint"
-      },
-      "library": {
-        "linter": "eslint"
-      }
-    }
-  }
-}
\ No newline at end of file
+						"parallel": false
+					}
+				},
+				"unit": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --config=.mocharc.yml"],
+						"cwd": "packages/core/__tests__",
+						"parallel": false
+					}
+				},
+				"unit.watch": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["../../../node_modules/.bin/tsc -p tsconfig.json && ../../../node_modules/.bin/mocha --watch --config=.mocharc.yml"],
+						"cwd": "packages/core/__tests__",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"types": {
+			"root": "packages/types",
+			"sourceRoot": "packages/types",
+			"projectType": "library",
+			"schematics": {},
+			"architect": {
+				"build": {
+					"builder": "@nrwl/workspace:run-commands",
+					"outputs": ["dist/packages"],
+					"options": {
+						"commands": ["mkdir -p ../../dist/packages/types", "cp -R * ../../dist/packages/types"],
+						"cwd": "packages/types",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"types-ios": {
+			"root": "packages/types-ios",
+			"sourceRoot": "packages/types-ios/src",
+			"projectType": "library",
+			"schematics": {},
+			"architect": {
+				"build": {
+					"builder": "@nrwl/workspace:run-commands",
+					"outputs": ["dist/packages"],
+					"options": {
+						"commands": ["mkdir -p ../../dist/packages/types-ios", "cp -R src/* ../../dist/packages/types-ios", "cp package.json *.md ../../dist/packages/types-ios"],
+						"cwd": "packages/types-ios",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"types-android": {
+			"root": "packages/types-android",
+			"sourceRoot": "packages/types-android/src",
+			"projectType": "library",
+			"schematics": {},
+			"architect": {
+				"build": {
+					"builder": "@nrwl/workspace:run-commands",
+					"outputs": ["dist/packages"],
+					"options": {
+						"commands": ["mkdir -p ../../dist/packages/types-android", "cp -R src/* ../../dist/packages/types-android", "cp package.json *.md ../../dist/packages/types-android"],
+						"cwd": "packages/types-android",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"ui-mobile-base": {
+			"root": "packages/ui-mobile-base",
+			"sourceRoot": "packages/ui-mobile-base",
+			"projectType": "library",
+			"schematics": {},
+			"architect": {
+				"build": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["./build.sh", "cp -R dist/package/platforms/* ../../packages/core/platforms"],
+						"cwd": "packages/ui-mobile-base",
+						"parallel": false
+					}
+				}
+			}
+		},
+		"webpack": {
+			"root": "packages/webpack",
+			"sourceRoot": "packages/webpack",
+			"projectType": "library",
+			"schematics": {},
+			"architect": {
+				"lint": {
+					"builder": "@nrwl/linter:eslint",
+					"options": {
+						"lintFilePatterns": []
+					}
+				},
+				"test": {
+					"builder": "@nrwl/workspace:run-commands",
+					"options": {
+						"commands": ["npm run tsc", "npm run jasmine"],
+						"cwd": "packages/webpack",
+						"parallel": false
+					}
+				},
+				"build": {
+					"builder": "@nrwl/workspace:run-commands",
+					"outputs": ["dist/packages"],
+					"options": {
+						"commands": ["npm run setup", "mkdir -p ../../dist/packages", "mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"],
+						"cwd": "packages/webpack",
+						"parallel": false
+					}
+				}
+			}
+		}
+	},
+	"cli": {
+		"defaultCollection": "@nrwl/workspace"
+	},
+	"schematics": {
+		"@nrwl/workspace": {
+			"library": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/cypress": {
+			"cypress-project": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/react": {
+			"application": {
+				"linter": "eslint"
+			},
+			"library": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/next": {
+			"application": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/web": {
+			"application": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/node": {
+			"application": {
+				"linter": "eslint"
+			},
+			"library": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/nx-plugin": {
+			"plugin": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/nest": {
+			"application": {
+				"linter": "eslint"
+			}
+		},
+		"@nrwl/express": {
+			"application": {
+				"linter": "eslint"
+			},
+			"library": {
+				"linter": "eslint"
+			}
+		}
+	}
+}