diff --git a/.gitignore b/.gitignore
index 05192106d7..0187ca29af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,8 @@
 
 # dependencies
 **/node_modules
-**/yarn.lock
-**/pnpm-lock.yaml
 .npmrc
+.yarn
 
 # IDEs and editors
 .idea
diff --git a/apps/automated/src/pages/page11.ts b/apps/automated/src/pages/page11.ts
index 624b57a266..63eeb754e8 100644
--- a/apps/automated/src/pages/page11.ts
+++ b/apps/automated/src/pages/page11.ts
@@ -51,7 +51,7 @@ export function createPage() {
 	//page.content = GridLayout;
 	page.content = StackLayout;
 	var x = 1;
-	btn1.on(button.Button.tapEvent, function () {
+	btn1.on(button.tapEvent, function () {
 		x++;
 		var gravity;
 		//btn1.android.setLayoutParams(new android.view.ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.FILL_PARENT));
diff --git a/apps/automated/src/pages/page7.ts b/apps/automated/src/pages/page7.ts
index be65104d63..93d464ec15 100644
--- a/apps/automated/src/pages/page7.ts
+++ b/apps/automated/src/pages/page7.ts
@@ -13,7 +13,7 @@ export function createPage() {
 	var vAligns: CoreTypes.VerticalAlignmentType[] = ['stretch', 'top', 'middle', 'bottom'];
 	//var hAligns = ["stretch", "left", "center", "right"];
 	var count = 0;
-	btn.on(buttons.Button.tapEvent, function () {
+	btn.on(buttons.tapEvent, function () {
 		//page.css = "button { vertical-align:" + vAligns[(count++) % 4] + " }";
 		btn.verticalAlignment = vAligns[count++ % 4];
 	});
diff --git a/apps/automated/src/pages/page8.ts b/apps/automated/src/pages/page8.ts
index 8d8687d82c..94cce4df33 100644
--- a/apps/automated/src/pages/page8.ts
+++ b/apps/automated/src/pages/page8.ts
@@ -41,7 +41,7 @@ export function createPage() {
 	var counter = 0;
 	var btn = new btns.Button();
 	btn.text = 'tap';
-	btn.on(btns.Button.tapEvent, function () {
+	btn.on(btns.tapEvent, function () {
 		btn.text = 'hi: ' + counter++;
 	});
 	btn.isEnabled = false;
@@ -52,7 +52,7 @@ export function createPage() {
 	var info = new btns.Button();
 	info.text = 'info';
 	info.className = 'info';
-	info.on(btns.Button.tapEvent, function () {
+	info.on(btns.tapEvent, function () {
 		info.text = 'hi: ' + counter++;
 		btn.isEnabled = true;
 	});
diff --git a/apps/automated/src/pages/property-bindings.ts b/apps/automated/src/pages/property-bindings.ts
index cb7c3f8bca..29cbe6b466 100644
--- a/apps/automated/src/pages/property-bindings.ts
+++ b/apps/automated/src/pages/property-bindings.ts
@@ -41,7 +41,7 @@ export function createPage() {
 	var count = 0;
 	var control = new btns.Button();
 	control.text = 'test control';
-	control.on(btns.Button.tapEvent, (data) => {
+	control.on(btns.tapEvent, (data) => {
 		control.text = 'count: ' + count++;
 	});
 	grid.addChild(control);
diff --git a/apps/automated/src/tk-unit.ts b/apps/automated/src/tk-unit.ts
index 3c79c6dffc..e89aa2d4a7 100644
--- a/apps/automated/src/tk-unit.ts
+++ b/apps/automated/src/tk-unit.ts
@@ -378,7 +378,7 @@ export function waitUntilReady(isReady: () => boolean, timeoutSec: number = 5, s
 
 // Setup for the Android modal loop implementation
 // TODO: If these platform-specific implementations continue to grow, think of per-platform separation (TKUnit.android)
-let nextMethod;
+let nextMethod: java.lang.reflect.Method;
 let targetField;
 let prepared;
 
diff --git a/apps/automated/src/ui/button/button-tests.ts b/apps/automated/src/ui/button/button-tests.ts
index 07f9a1b112..a0bfb84149 100644
--- a/apps/automated/src/ui/button/button-tests.ts
+++ b/apps/automated/src/ui/button/button-tests.ts
@@ -2,6 +2,7 @@ import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
 import { View, EventData, Button, Observable, Color, Page, FormattedString, BindingOptions, Span } from '@nativescript/core';
 import * as buttonTestsNative from './button-tests-native';
+import * as button from '@nativescript/core/ui/button';
 
 export function test_recycling() {
 	helper.nativeView_recycling_test(() => new Button());
@@ -95,7 +96,7 @@ var _testOnClick = function (views: Array<View>) {
 
 	var actualValue = false;
 	// >> button-tap
-	button.on(Button.tapEvent, function (args: EventData) {
+	button.on(button.tapEvent, function (args: EventData) {
 		// Do something
 		// >> (hide)
 		actualValue = true;
diff --git a/apps/automated/src/ui/root-view/mymodule/MyControl.ts b/apps/automated/src/ui/root-view/mymodule/MyControl.ts
index dd0382909c..36df8b0695 100644
--- a/apps/automated/src/ui/root-view/mymodule/MyControl.ts
+++ b/apps/automated/src/ui/root-view/mymodule/MyControl.ts
@@ -13,7 +13,7 @@ export class MyControl extends stackLayoutModule.StackLayout {
 		lbl.id = 'my-test-label';
 		var btn = new button.Button();
 		btn.text = 'Tap me!';
-		btn.on(button.Button.tapEvent, (args: EventData) => {
+		btn.on(button.tapEvent, (args: EventData) => {
 			lbl.text = 'Tap ' + counter++;
 		});
 
diff --git a/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts b/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
index 9d61f035d7..ba76a4eea2 100644
--- a/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
+++ b/apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts
@@ -1,6 +1,7 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
 import { isIOS, isAndroid, Label, StackLayout, Frame, Page, ListView, ItemEventData, TabView, TabViewItem, Button } from '@nativescript/core';
+import * as button from '@nativescript/core/ui/button';
 
 var ASYNC = 2;
 
@@ -37,7 +38,7 @@ function _createListView(): ListView {
 		var button = <Button>args.view;
 		if (!button) {
 			button = new Button();
-			button.on(Button.tapEvent, _clickHandlerFactory(args.index));
+			button.on(button.tapEvent, _clickHandlerFactory(args.index));
 			args.view = button;
 		}
 
diff --git a/apps/automated/src/xml-declaration/mymodule/MyControl.ts b/apps/automated/src/xml-declaration/mymodule/MyControl.ts
index d74126e041..3d5e19d3e4 100644
--- a/apps/automated/src/xml-declaration/mymodule/MyControl.ts
+++ b/apps/automated/src/xml-declaration/mymodule/MyControl.ts
@@ -1,4 +1,5 @@
 import { StackLayout, Label, Button, EventData } from '@nativescript/core';
+import * as button from '@nativescript/core/ui/button';
 
 export class MyControl extends StackLayout {
 	constructor() {
@@ -9,7 +10,7 @@ export class MyControl extends StackLayout {
 		var lbl = new Label();
 		var btn = new Button();
 		btn.text = 'Tap me!';
-		btn.on(Button.tapEvent, (args: EventData) => {
+		btn.on(button.tapEvent, (args: EventData) => {
 			lbl.text = 'Tap ' + counter++;
 		});
 
diff --git a/apps/toolbox/src/pages/animation-curves-page.ts b/apps/toolbox/src/pages/animation-curves-page.ts
new file mode 100644
index 0000000000..f7656d77a2
--- /dev/null
+++ b/apps/toolbox/src/pages/animation-curves-page.ts
@@ -0,0 +1,68 @@
+import { getViewById, View, Page, Button, SegmentedBar, SegmentedBarItem, Label, Animation, AnimationDefinition } from '@nativescript/core';
+
+export function easeAnimate(args) {
+	const clicked = args.object as Button;
+	const page: Page = clicked.page;
+	const target = getViewById(page, 'target') as Label;
+	const select = getViewById(page, 'select') as SegmentedBar;
+	const item: SegmentedBarItem = select.items[select.selectedIndex];
+	const easeType: string = clicked.text;
+	const extent = 128;
+	let duration = easeType === 'spring' ? 800 : 500;
+	let delay = easeType === 'spring' ? 0 : 200;
+	let animateKey: string = null;
+	let animateValueTo: any = null;
+	let animateValueFrom: any = null;
+
+	switch (item.title) {
+		case 'height':
+			animateKey = 'height';
+			target.originX = target.originY = 0;
+			animateValueTo = 0;
+			animateValueFrom = extent;
+			break;
+		case 'width':
+			animateKey = 'width';
+			target.originX = target.originY = 0;
+			animateValueTo = 0;
+			animateValueFrom = extent;
+			break;
+		case 'opacity':
+			animateKey = 'opacity';
+			animateValueTo = 0;
+			animateValueFrom = 1;
+			break;
+		case 'color':
+			animateKey = 'backgroundColor';
+			animateValueTo = 'blue';
+			animateValueFrom = 'purple';
+			break;
+		case 'rotate':
+			animateKey = 'rotate';
+			target.originX = target.originY = 0.5;
+			animateValueTo = 180;
+			animateValueFrom = 0;
+			break;
+		case 'scale':
+			animateKey = 'scale';
+			target.originX = target.originY = 0.5;
+			animateValueTo = { x: 1.5, y: 1.5 };
+			animateValueFrom = { x: 1, y: 1 };
+			break;
+	}
+	target
+		.animate({
+			[animateKey]: animateValueTo,
+			duration,
+			curve: easeType,
+		})
+		.then(() => {
+			return target.animate({
+				[animateKey]: animateValueFrom,
+				delay,
+				duration,
+				curve: easeType,
+			});
+		})
+		.catch((e) => console.log(e));
+}
diff --git a/apps/toolbox/src/pages/animation-curves-page.xml b/apps/toolbox/src/pages/animation-curves-page.xml
new file mode 100644
index 0000000000..58f58d6862
--- /dev/null
+++ b/apps/toolbox/src/pages/animation-curves-page.xml
@@ -0,0 +1,31 @@
+<Page>
+    <AbsoluteLayout>
+        <GridLayout top="0" left="0" width="100%" rows="48, 48, 48, 48, 48, 48" columns="*,*,*">
+
+            <Label row="0" colSpan="3" text="Animate"/>
+            <SegmentedBar row="1" colSpan="3" id="select">
+                <SegmentedBar.items>
+                    <SegmentedBarItem title="height"/>
+                    <SegmentedBarItem title="width"/>
+                    <SegmentedBarItem title="opacity"/>
+                    <SegmentedBarItem title="color"/>
+                    <SegmentedBarItem title="rotate"/>
+                    <SegmentedBarItem title="scale"/>
+                </SegmentedBar.items>
+            </SegmentedBar>
+
+            <Label row="2" colSpan="3" text="Easing"/>
+            <Button row="3" col="0" text="easeIn" tap="easeAnimate"/>
+            <Button row="3" col="1" text="easeOut" tap="easeAnimate"/>
+            <Button row="3" col="2" text="easeInOut" tap="easeAnimate"/>
+            <Button row="4" col="0" text="spring" tap="easeAnimate"/>
+            <Button row="4" col="1" text="linear" tap="easeAnimate"/>
+            <Button row="4" col="2" text="ease" tap="easeAnimate"/>
+        </GridLayout>
+
+        <Label top="300" left="96" height="128" width="128"
+               borderColor="purple" borderWidth="1"/>
+        <Label top="300" left="96" height="128" width="128"
+               id="target" backgroundColor="purple"/>
+    </AbsoluteLayout>
+</Page>
diff --git a/apps/toolbox/src/pages/box-shadow.ts b/apps/toolbox/src/pages/box-shadow.ts
index f611b19f47..1ed343fbcd 100644
--- a/apps/toolbox/src/pages/box-shadow.ts
+++ b/apps/toolbox/src/pages/box-shadow.ts
@@ -1,4 +1,4 @@
-import { Observable, EventData, Page } from '@nativescript/core';
+import { Observable, EventData, Page, CoreTypes } from '@nativescript/core';
 
 export function navigatingTo(args: EventData) {
 	const page = <Page>args.object;
@@ -123,17 +123,20 @@ export class BoxShadowModel extends Observable {
 	toggleAnimation(args) {
 		const view = args.object;
 		const animationDuration = 500;
+		let curve;
 		if (this._selectedAnimation === 'width') {
 			const originalWidth = args.object.getActualSize().width;
 			view
 				.animate({
 					width: originalWidth / 2,
 					duration: animationDuration,
+					curve,
 				})
 				.then(() =>
 					view.animate({
 						width: originalWidth,
 						duration: animationDuration,
+						curve,
 					}),
 				)
 				.catch((err) => {
@@ -145,11 +148,13 @@ export class BoxShadowModel extends Observable {
 				.animate({
 					height: originalHeight / 2,
 					duration: animationDuration,
+					curve,
 				})
 				.then(() =>
 					view.animate({
 						height: originalHeight,
 						duration: animationDuration,
+						curve,
 					}),
 				)
 				.catch((err) => {
@@ -162,7 +167,8 @@ export class BoxShadowModel extends Observable {
 					scale: this._selectedAnimation === 'scale' ? { x: 0.5, y: 0.6 } : { x: 1, y: 1 },
 					rotate: this._selectedAnimation === 'rotate' ? 180 : 0,
 					translate: this._selectedAnimation === 'translate' ? { x: 100, y: 100 } : { x: 0, y: 0 },
-					duration: 500,
+					duration: animationDuration,
+					curve,
 				})
 				.then(() =>
 					view.animate({
@@ -170,7 +176,8 @@ export class BoxShadowModel extends Observable {
 						scale: { x: 1, y: 1 },
 						rotate: 0,
 						translate: { x: 0, y: 0 },
-						duration: 500,
+						duration: animationDuration,
+						curve,
 					}),
 				)
 				.catch((err) => {
diff --git a/apps/toolbox/src/pages/css-animations.css b/apps/toolbox/src/pages/css-animations.css
new file mode 100644
index 0000000000..94781d929a
--- /dev/null
+++ b/apps/toolbox/src/pages/css-animations.css
@@ -0,0 +1,79 @@
+.fade-blink {
+    animation-name: fadeAndBack;
+    animation-duration: 800ms;
+    animation-iteration-count: infinite;
+    animation-fill-mode: forwards;
+}
+.scale-blink {
+    animation-name: scaleAndBack;
+    animation-duration: 800ms;
+    animation-iteration-count: infinite;
+    animation-fill-mode: forwards;
+}
+.slide-blink {
+    animation-name: slideAndBack;
+    animation-duration: 800ms;
+    animation-iteration-count: infinite;
+    animation-fill-mode: forwards;
+}
+.color-blink {
+    animation-name: colorAndBack;
+    animation-duration: 800ms;
+    animation-iteration-count: infinite;
+    animation-fill-mode: forwards;
+}
+
+@keyframes fadeAndBack {
+    0% {
+        opacity: 1;
+    }
+
+    50% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+@keyframes colorAndBack {
+    0% {
+        background-color: blue;
+    }
+
+    50% {
+        background-color: yellow;
+    }
+
+    100% {
+        background-color: blue;
+    }
+}
+
+@keyframes slideAndBack {
+    0% {
+        transform: translateY(0);
+    }
+
+    50% {
+        transform: translateY(100%);
+    }
+
+    100% {
+        transform: translateY(0);
+    }
+}
+
+@keyframes scaleAndBack {
+    0% {
+        transform: scale(1, 1);
+    }
+
+    50% {
+        transform: scale(0, 0);
+    }
+
+    100% {
+        transform: scale(1, 1);
+    }
+}
diff --git a/apps/toolbox/src/pages/css-animations.ts b/apps/toolbox/src/pages/css-animations.ts
new file mode 100644
index 0000000000..36c6120301
--- /dev/null
+++ b/apps/toolbox/src/pages/css-animations.ts
@@ -0,0 +1,7 @@
+import { EventData } from '@nativescript/core/data/observable';
+import { Page } from '@nativescript/core/ui/page';
+
+export function onLoaded(args: EventData) {
+	var page = <Page>args.object;
+
+}
diff --git a/apps/toolbox/src/pages/css-animations.xml b/apps/toolbox/src/pages/css-animations.xml
new file mode 100644
index 0000000000..12d582dbda
--- /dev/null
+++ b/apps/toolbox/src/pages/css-animations.xml
@@ -0,0 +1,7 @@
+<Page loaded="onLoaded">
+    <GridLayout rows="*,*,*,*,*,*" columns="*,*,*">
+        <Button class="s0 fade-blink" row="0" col="0" text="Button"/>
+        <Label color="black" class="s0 color-blink" row="1" col="0" text="This is a test" backgroundColor="red"/>
+        <Button class="s0 slide-blink" row="2" col="0" text="Button"/>
+    </GridLayout>
+</Page>
diff --git a/apps/toolbox/src/pages/layout-stack-height-page.ts b/apps/toolbox/src/pages/layout-stack-height-page.ts
new file mode 100644
index 0000000000..7a91bb92d0
--- /dev/null
+++ b/apps/toolbox/src/pages/layout-stack-height-page.ts
@@ -0,0 +1,14 @@
+import { View } from '@nativescript/core';
+
+export function tapLabel(args) {
+	const clicked: View = args.object;
+	const graffiti = clicked as any;
+	clicked.animate({
+		height: graffiti.toggle ? 'auto' : 128,
+		color: graffiti.toggle ? 'red': 'yellow',
+		borderRadius: graffiti.toggle ? 0: 40,
+		duration: 700,
+		curve: 'ease',
+	});
+	graffiti.toggle = !graffiti.toggle;
+}
diff --git a/apps/toolbox/src/pages/layout-stack-height-page.xml b/apps/toolbox/src/pages/layout-stack-height-page.xml
new file mode 100644
index 0000000000..8c4ecbf232
--- /dev/null
+++ b/apps/toolbox/src/pages/layout-stack-height-page.xml
@@ -0,0 +1,17 @@
+<Page backgroundColor="skyblue">
+    <GridLayout rows="auto,auto,auto" verticalAlignment="top" backgroundColor="gold">
+        <Label backgroundColor="darkblue" originY="0"
+               tap="tapLabel"
+               height="64" fontSize="32" color="skyblue" textAlignment="center"
+               text="Click here"/>
+        <Label row="1" backgroundColor="darkgreen" originY="0"
+               tap="tapLabel"
+               textWrap="true"
+               fontSize="32" color="lime" textAlignment="center"
+               text="Or here&#xa; i am multi line!"/>
+        <Label row="2" backgroundColor="darkred" originY="0"
+               tap="tapLabel"
+               height="64" fontSize="32" color="pink" textAlignment="center"
+               text="But NOT here"/>
+    </GridLayout>
+</Page>
diff --git a/apps/ui/src/bindings/basics-page.ts b/apps/ui/src/bindings/basics-page.ts
index dff4e44975..ac19c6e89f 100644
--- a/apps/ui/src/bindings/basics-page.ts
+++ b/apps/ui/src/bindings/basics-page.ts
@@ -28,7 +28,7 @@ export function createPage() {
 	//buttonTwoWay.automationText = "buttonTwoWay";
 
 	buttonSetText.text = 'SetText';
-	buttonSetText.on(buttonModule.Button.tapEvent, function () {
+	buttonSetText.on(buttonModule.tapEvent, function () {
 		targetOneWay.text = 'Test';
 		targetTwoWay.text = 'Test';
 	});
@@ -47,7 +47,7 @@ export function createPage() {
 	buttonOneWay.on(buttonModule.Button.loadedEvent, function () {
 		buttonOneWay.text = sourceOneWay.get('textSource');
 	});
-	buttonOneWay.on(buttonModule.Button.tapEvent, function () {
+	buttonOneWay.on(buttonModule.tapEvent, function () {
 		buttonOneWay.text = sourceOneWay.get('textSource');
 	});
 
@@ -67,7 +67,7 @@ export function createPage() {
 	buttonTwoWay.on(buttonModule.Button.loadedEvent, function () {
 		buttonTwoWay.text = sourceTwoWay.get('textSource');
 	});
-	buttonTwoWay.on(buttonModule.Button.tapEvent, function () {
+	buttonTwoWay.on(buttonModule.tapEvent, function () {
 		buttonTwoWay.text = sourceTwoWay.get('textSource');
 	});
 
diff --git a/apps/ui/src/bindings/xmlbasics-page.ts b/apps/ui/src/bindings/xmlbasics-page.ts
index c6952afba2..00199b90d2 100644
--- a/apps/ui/src/bindings/xmlbasics-page.ts
+++ b/apps/ui/src/bindings/xmlbasics-page.ts
@@ -16,7 +16,7 @@ export function stack0Loaded(args: observable.EventData) {
 	target.bind(bindingOptions, source);
 	source.set('textSource', 'Text');
 
-	button.on(buttonModule.Button.tapEvent, function () {
+	button.on(buttonModule.tapEvent, function () {
 		button.text = source.get('textSource');
 	});
 }
diff --git a/apps/ui/src/events/i73-page.ts b/apps/ui/src/events/i73-page.ts
index f9f31560a0..d19c865abf 100644
--- a/apps/ui/src/events/i73-page.ts
+++ b/apps/ui/src/events/i73-page.ts
@@ -7,7 +7,7 @@ export function createPage() {
 
 	var btn = new button.Button();
 	btn.text = 'Alert';
-	btn.on(button.Button.tapEvent, function () {
+	btn.on(button.tapEvent, function () {
 		alert('Alert is global');
 	});
 
diff --git a/apps/ui/src/test-page-main-view-model.ts b/apps/ui/src/test-page-main-view-model.ts
index 7339af9ce1..5c299c3ca5 100644
--- a/apps/ui/src/test-page-main-view-model.ts
+++ b/apps/ui/src/test-page-main-view-model.ts
@@ -4,6 +4,7 @@ import { Color } from '@nativescript/core/color';
 import { WrapLayout } from '@nativescript/core/ui/layouts/wrap-layout';
 import { alert } from '@nativescript/core/ui/dialogs';
 import * as platform from '@nativescript/core/platform';
+import * as button from '@nativescript/core/ui/button';
 
 export class TestPageMainViewModel extends Observable {
 	private _colors = ['#0000cc', '#33cc33', '#0000cc'];
@@ -64,7 +65,7 @@ export class TestPageMainViewModel extends Observable {
 			btn.style.backgroundColor = new Color(this._colors[count++ % 3]);
 			btn.style.borderRadius = 5;
 			btn.on(
-				Button.tapEvent,
+				button.tapEvent,
 				function (eventData) {
 					let text = btn.text;
 					this.loadExample(text);
diff --git a/packages/core/.npmignore b/packages/core/.npmignore
index a800342764..77cfaeba01 100644
--- a/packages/core/.npmignore
+++ b/packages/core/.npmignore
@@ -4,4 +4,5 @@ dist
 **/*.ts
 !**/*.d.ts
 jest.config.js
-npm-debug.log
\ No newline at end of file
+npm-debug.log
+platforms/android/*.aar
\ No newline at end of file
diff --git a/packages/core/accessibility/accessibility-common.ts b/packages/core/accessibility/accessibility-common.ts
index 5eaea0569b..f40f06f8c6 100644
--- a/packages/core/accessibility/accessibility-common.ts
+++ b/packages/core/accessibility/accessibility-common.ts
@@ -1,5 +1,4 @@
-import type { EventData, EventDataValue } from '../data/observable';
-import { Observable } from '../data/observable';
+import { EventData, EventDataValue } from '../data/observable';
 import type { View } from '../ui/core/view';
 import type { Page } from '../ui/page';
 
@@ -74,40 +73,6 @@ export function getLastFocusedViewOnPage(page: Page): View | null {
 	return null;
 }
 
-export class SharedA11YObservable extends Observable {
-	accessibilityServiceEnabled?: boolean;
-}
-
-export const AccessibilityServiceEnabledPropName = 'accessibilityServiceEnabled';
-
-export class CommonA11YServiceEnabledObservable extends SharedA11YObservable {
-	constructor(sharedA11YObservable: SharedA11YObservable) {
-		super();
-
-		const ref = new WeakRef(this);
-		let lastValue: boolean;
-
-		function callback() {
-			const self = ref?.get();
-			if (!self) {
-				sharedA11YObservable.off(Observable.propertyChangeEvent, callback);
-
-				return;
-			}
-
-			const newValue = !!sharedA11YObservable.accessibilityServiceEnabled;
-			if (newValue !== lastValue) {
-				self.set(AccessibilityServiceEnabledPropName, newValue);
-				lastValue = newValue;
-			}
-		}
-
-		sharedA11YObservable.on(Observable.propertyChangeEvent, callback);
-
-		this.set(AccessibilityServiceEnabledPropName, !!sharedA11YObservable.accessibilityServiceEnabled);
-	}
-}
-
 let a11yServiceEnabled: boolean;
 export function isA11yEnabled(): boolean {
 	if (typeof a11yServiceEnabled === 'boolean') {
@@ -130,386 +95,3 @@ export function enforceArray(val: string | string[]): string[] {
 
 	return [];
 }
-
-export const VALID_FONT_SCALES = __APPLE__ // Apple supports a wider number of font scales than Android does.
-	? [0.5, 0.7, 0.85, 1, 1.15, 1.3, 1.5, 2, 2.5, 3, 3.5, 4]
-	: [0.85, 1, 1.15, 1.3];
-
-export function getClosestValidFontScale(fontScale: number): number {
-	fontScale = Number(fontScale) || 1;
-
-	return VALID_FONT_SCALES.sort((a, b) => Math.abs(fontScale - a) - Math.abs(fontScale - b))[0];
-}
-
-export enum FontScaleCategory {
-	ExtraSmall = 'extra-small',
-	Medium = 'medium',
-	ExtraLarge = 'extra-large',
-}
-
-export const fontScaleExtraSmallCategoryClass = `a11y-fontscale-xs`;
-export const fontScaleMediumCategoryClass = `a11y-fontscale-m`;
-export const fontScaleExtraLargeCategoryClass = `a11y-fontscale-xl`;
-
-export const fontScaleCategoryClasses = [fontScaleExtraSmallCategoryClass, fontScaleMediumCategoryClass, fontScaleExtraLargeCategoryClass];
-
-export const a11yServiceEnabledClass = `a11y-service-enabled`;
-export const a11yServiceDisabledClass = `a11y-service-disabled`;
-export const a11yServiceClasses = [a11yServiceEnabledClass, a11yServiceDisabledClass];
-
-let currentFontScale: number = null;
-export function setFontScale(scale: number) {
-	currentFontScale = scale;
-}
-
-export function getFontScale() {
-	return currentFontScale;
-}
-
-export function getFontScaleCategory(): FontScaleCategory {
-	if (__ANDROID__) {
-		return FontScaleCategory.Medium;
-	}
-
-	if (getFontScale() < 0.85) {
-		return FontScaleCategory.ExtraSmall;
-	}
-
-	if (getFontScale() > 1.5) {
-		return FontScaleCategory.ExtraLarge;
-	}
-
-	return FontScaleCategory.Medium;
-}
-
-let initAccessibilityCssHelperCallback: () => void;
-export function setInitAccessibilityCssHelper(callback: () => void) {
-	initAccessibilityCssHelperCallback = callback;
-}
-
-export function readyInitAccessibilityCssHelper() {
-	if (initAccessibilityCssHelperCallback) {
-		initAccessibilityCssHelperCallback();
-		initAccessibilityCssHelperCallback = null;
-	}
-}
-
-let initFontScaleCallback: () => void;
-export function setInitFontScale(callback: () => void) {
-	initFontScaleCallback = callback;
-}
-
-export function readyInitFontScale() {
-	if (initFontScaleCallback) {
-		initFontScaleCallback();
-		initFontScaleCallback = null;
-	}
-}
-
-let fontScaleCssClasses: Map<number, string>;
-export function setFontScaleCssClasses(value: Map<number, string>) {
-	fontScaleCssClasses = value;
-}
-
-export function getFontScaleCssClasses() {
-	return fontScaleCssClasses;
-}
-
-let currentFontScaleClass = '';
-export function setCurrentFontScaleClass(value: string) {
-	currentFontScaleClass = value;
-}
-
-export function getCurrentFontScaleClass() {
-	return currentFontScaleClass;
-}
-let currentFontScaleCategory = '';
-export function setCurrentFontScaleCategory(value: string) {
-	currentFontScaleCategory = value;
-}
-
-export function getCurrentFontScaleCategory() {
-	return currentFontScaleCategory;
-}
-let currentA11YServiceClass = '';
-export function setCurrentA11YServiceClass(value: string) {
-	currentA11YServiceClass = value;
-}
-
-export function getCurrentA11YServiceClass() {
-	return currentA11YServiceClass;
-}
-
-export enum AccessibilityTrait {
-	/**
-	 * The element allows direct touch interaction for VoiceOver users.
-	 */
-	AllowsDirectInteraction = 'allowsDirectInteraction',
-
-	/**
-	 * The element should cause an automatic page turn when VoiceOver finishes reading the text within it.
-	 * Note: Requires custom view with accessibilityScroll(...)
-	 */
-	CausesPageTurn = 'pageTurn',
-
-	/**
-	 * The element is not enabled and does not respond to user interaction.
-	 */
-	NotEnabled = 'disabled',
-
-	/**
-	 * The element is currently selected.
-	 */
-	Selected = 'selected',
-
-	/**
-	 * The element frequently updates its label or value.
-	 */
-	UpdatesFrequently = 'frequentUpdates',
-}
-
-export enum AccessibilityRole {
-	/**
-	 * The element allows continuous adjustment through a range of values.
-	 */
-	Adjustable = 'adjustable',
-
-	/**
-	 * The element should be treated as a button.
-	 */
-	Button = 'button',
-
-	/**
-	 * The element behaves like a Checkbox
-	 */
-	Checkbox = 'checkbox',
-
-	/**
-	 * The element is a header that divides content into sections, such as the title of a navigation bar.
-	 */
-	Header = 'header',
-
-	/**
-	 * The element should be treated as an image.
-	 */
-	Image = 'image',
-
-	/**
-	 * The element should be treated as a image button.
-	 */
-	ImageButton = 'imageButton',
-
-	/**
-	 * The element behaves as a keyboard key.
-	 */
-	KeyboardKey = 'keyboardKey',
-
-	/**
-	 * The element should be treated as a link.
-	 */
-	Link = 'link',
-
-	/**
-	 * The element has no traits.
-	 */
-	None = 'none',
-
-	/**
-	 * The element plays its own sound when activated.
-	 */
-	PlaysSound = 'plays',
-
-	/**
-	 * The element behaves like a ProgressBar
-	 */
-	ProgressBar = 'progressBar',
-
-	/**
-	 * The element behaves like a RadioButton
-	 */
-	RadioButton = 'radioButton',
-
-	/**
-	 * The element should be treated as a search field.
-	 */
-	Search = 'search',
-
-	/**
-	 * The element behaves like a SpinButton
-	 */
-	SpinButton = 'spinButton',
-
-	/**
-	 * The element starts a media session when it is activated.
-	 */
-	StartsMediaSession = 'startsMedia',
-
-	/**
-	 * The element should be treated as static text that cannot change.
-	 */
-	StaticText = 'text',
-
-	/**
-	 * The element provides summary information when the application starts.
-	 */
-	Summary = 'summary',
-
-	/**
-	 * The element behaves like a switch
-	 */
-	Switch = 'switch',
-}
-
-export enum AccessibilityState {
-	Selected = 'selected',
-	Checked = 'checked',
-	Unchecked = 'unchecked',
-	Disabled = 'disabled',
-}
-
-export enum AccessibilityLiveRegion {
-	None = 'none',
-	Polite = 'polite',
-	Assertive = 'assertive',
-}
-
-export enum IOSPostAccessibilityNotificationType {
-	Announcement = 'announcement',
-	Screen = 'screen',
-	Layout = 'layout',
-}
-
-export enum AndroidAccessibilityEvent {
-	/**
-	 * Invalid selection/focus position.
-	 */
-	INVALID_POSITION = 'invalid_position',
-
-	/**
-	 * Maximum length of the text fields.
-	 */
-	MAX_TEXT_LENGTH = 'max_text_length',
-
-	/**
-	 * Represents the event of clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-	 */
-	VIEW_CLICKED = 'view_clicked',
-
-	/**
-	 * Represents the event of long clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-	 */
-	VIEW_LONG_CLICKED = 'view_long_clicked',
-
-	/**
-	 * Represents the event of selecting an item usually in the context of an android.widget.AdapterView.
-	 */
-	VIEW_SELECTED = 'view_selected',
-
-	/**
-	 * Represents the event of setting input focus of a android.view.View.
-	 */
-	VIEW_FOCUSED = 'view_focused',
-
-	/**
-	 * Represents the event of changing the text of an android.widget.EditText.
-	 */
-	VIEW_TEXT_CHANGED = 'view_text_changed',
-
-	/**
-	 * Represents the event of opening a android.widget.PopupWindow, android.view.Menu, android.app.Dialog, etc.
-	 */
-	WINDOW_STATE_CHANGED = 'window_state_changed',
-
-	/**
-	 * Represents the event showing a android.app.Notification.
-	 */
-	NOTIFICATION_STATE_CHANGED = 'notification_state_changed',
-
-	/**
-	 * Represents the event of a hover enter over a android.view.View.
-	 */
-	VIEW_HOVER_ENTER = 'view_hover_enter',
-
-	/**
-	 * Represents the event of a hover exit over a android.view.View.
-	 */
-	VIEW_HOVER_EXIT = 'view_hover_exit',
-	/**
-	 * Represents the event of starting a touch exploration gesture.
-	 */
-	TOUCH_EXPLORATION_GESTURE_START = 'touch_exploration_gesture_start',
-	/**
-	 * Represents the event of ending a touch exploration gesture.
-	 */
-	TOUCH_EXPLORATION_GESTURE_END = 'touch_exploration_gesture_end',
-
-	/**
-	 * Represents the event of changing the content of a window and more specifically the sub-tree rooted at the event's source.
-	 */
-	WINDOW_CONTENT_CHANGED = 'window_content_changed',
-
-	/**
-	 * Represents the event of scrolling a view.
-	 */
-	VIEW_SCROLLED = 'view_scrolled',
-
-	/**
-	 * Represents the event of changing the selection in an android.widget.EditText.
-	 */
-	VIEW_TEXT_SELECTION_CHANGED = 'view_text_selection_changed',
-
-	/**
-	 * Represents the event of an application making an announcement.
-	 */
-	ANNOUNCEMENT = 'announcement',
-
-	/**
-	 * Represents the event of gaining accessibility focus.
-	 */
-	VIEW_ACCESSIBILITY_FOCUSED = 'view_accessibility_focused',
-
-	/**
-	 * Represents the event of clearing accessibility focus.
-	 */
-	VIEW_ACCESSIBILITY_FOCUS_CLEARED = 'view_accessibility_focus_cleared',
-
-	/**
-	 * Represents the event of traversing the text of a view at a given movement granularity.
-	 */
-	VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY = 'view_text_traversed_at_movement_granularity',
-
-	/**
-	 * Represents the event of beginning gesture detection.
-	 */
-	GESTURE_DETECTION_START = 'gesture_detection_start',
-
-	/**
-	 * Represents the event of ending gesture detection.
-	 */
-	GESTURE_DETECTION_END = 'gesture_detection_end',
-
-	/**
-	 * Represents the event of the user starting to touch the screen.
-	 */
-	TOUCH_INTERACTION_START = 'touch_interaction_start',
-
-	/**
-	 * Represents the event of the user ending to touch the screen.
-	 */
-	TOUCH_INTERACTION_END = 'touch_interaction_end',
-
-	/**
-	 * Mask for AccessibilityEvent all types.
-	 */
-	ALL_MASK = 'all',
-}
-
-export interface AccessibilityEventPerformEscape extends EventData {
-	cancel?: boolean;
-}
-
-export interface AccessibilityEventOptions {
-	androidAccessibilityEvent?: AndroidAccessibilityEvent;
-	iosNotificationType?: IOSPostAccessibilityNotificationType;
-	message?: string;
-}
diff --git a/packages/core/accessibility/accessibility-css-helper.ts b/packages/core/accessibility/accessibility-css-helper.ts
new file mode 100644
index 0000000000..5ef423355b
--- /dev/null
+++ b/packages/core/accessibility/accessibility-css-helper.ts
@@ -0,0 +1,131 @@
+import { Application } from '../application';
+import type { View } from '../ui/core/view';
+import { AccessibilityServiceEnabledObservable } from './accessibility-service';
+import { FontScaleCategory, getCurrentFontScale, getFontScaleCategory, VALID_FONT_SCALES } from './font-scale';
+import { SDK_VERSION } from '../utils/constants';
+
+// CSS-classes
+const fontScaleExtraSmallCategoryClass = `a11y-fontscale-xs`;
+const fontScaleMediumCategoryClass = `a11y-fontscale-m`;
+const fontScaleExtraLargeCategoryClass = `a11y-fontscale-xl`;
+
+const fontScaleCategoryClasses = [fontScaleExtraSmallCategoryClass, fontScaleMediumCategoryClass, fontScaleExtraLargeCategoryClass];
+
+const a11yServiceEnabledClass = `a11y-service-enabled`;
+const a11yServiceDisabledClass = `a11y-service-disabled`;
+const a11yServiceClasses = [a11yServiceEnabledClass, a11yServiceDisabledClass];
+
+// SDK Version CSS classes
+let sdkVersionClasses: string[] = [];
+
+let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
+let fontScaleCssClasses: Map<number, string>;
+
+let currentFontScaleClass = '';
+let currentFontScaleCategory = '';
+let currentA11YServiceClass = '';
+
+function ensureClasses() {
+	if (accessibilityServiceObservable) {
+		return;
+	}
+
+	fontScaleCssClasses = new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`]));
+
+	accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();
+}
+
+function applyRootCssClass(cssClasses: string[], newCssClass: string): void {
+	const rootView = Application.getRootView();
+	if (!rootView) {
+		return;
+	}
+
+	Application.applyCssClass(rootView, cssClasses, newCssClass);
+
+	const rootModalViews = <Array<View>>rootView._getRootModalViews();
+	rootModalViews.forEach((rootModalView) => Application.applyCssClass(rootModalView, cssClasses, newCssClass));
+
+	// Note: SDK version classes are applied separately to avoid redundant work
+}
+
+function applyFontScaleToRootViews(): void {
+	const rootView = Application.getRootView();
+	if (!rootView) {
+		return;
+	}
+
+	const fontScale = getCurrentFontScale();
+
+	rootView.style.fontScaleInternal = fontScale;
+
+	const rootModalViews = <Array<View>>rootView._getRootModalViews();
+	rootModalViews.forEach((rootModalView) => (rootModalView.style.fontScaleInternal = fontScale));
+}
+
+export function initAccessibilityCssHelper(): void {
+	ensureClasses();
+
+	Application.on(Application.fontScaleChangedEvent, () => {
+		updateCurrentHelperClasses();
+
+		applyFontScaleToRootViews();
+	});
+
+	accessibilityServiceObservable.on(AccessibilityServiceEnabledObservable.propertyChangeEvent, updateCurrentHelperClasses);
+}
+
+/**
+ * Update the helper CSS-classes.
+ * Return true is any changes.
+ */
+function updateCurrentHelperClasses(): void {
+	const fontScale = getCurrentFontScale();
+	const fontScaleCategory = getFontScaleCategory();
+
+	const oldFontScaleClass = currentFontScaleClass;
+	if (fontScaleCssClasses.has(fontScale)) {
+		currentFontScaleClass = fontScaleCssClasses.get(fontScale);
+	} else {
+		currentFontScaleClass = fontScaleCssClasses.get(1);
+	}
+
+	if (oldFontScaleClass !== currentFontScaleClass) {
+		applyRootCssClass([...fontScaleCssClasses.values()], currentFontScaleClass);
+	}
+
+	const oldActiveFontScaleCategory = currentFontScaleCategory;
+	switch (fontScaleCategory) {
+		case FontScaleCategory.ExtraSmall: {
+			currentFontScaleCategory = fontScaleExtraSmallCategoryClass;
+			break;
+		}
+		case FontScaleCategory.Medium: {
+			currentFontScaleCategory = fontScaleMediumCategoryClass;
+			break;
+		}
+		case FontScaleCategory.ExtraLarge: {
+			currentFontScaleCategory = fontScaleExtraLargeCategoryClass;
+			break;
+		}
+		default: {
+			currentFontScaleCategory = fontScaleMediumCategoryClass;
+			break;
+		}
+	}
+
+	if (oldActiveFontScaleCategory !== currentFontScaleCategory) {
+		applyRootCssClass(fontScaleCategoryClasses, currentFontScaleCategory);
+	}
+
+	const oldA11YStatusClass = currentA11YServiceClass;
+	if (accessibilityServiceObservable.accessibilityServiceEnabled) {
+		currentA11YServiceClass = a11yServiceEnabledClass;
+	} else {
+		currentA11YServiceClass = a11yServiceDisabledClass;
+	}
+
+	if (oldA11YStatusClass !== currentA11YServiceClass) {
+		applyRootCssClass(a11yServiceClasses, currentA11YServiceClass);
+	}
+}
diff --git a/packages/core/accessibility/accessibility-properties.ts b/packages/core/accessibility/accessibility-properties.ts
index 0ff7bbece8..0dc5aff453 100644
--- a/packages/core/accessibility/accessibility-properties.ts
+++ b/packages/core/accessibility/accessibility-properties.ts
@@ -1,8 +1,8 @@
 import { CssProperty, InheritedCssProperty, Property } from '../ui/core/properties';
-import type { View } from '../ui/core/view';
-import { booleanConverter } from '../ui/core/view-base/utils';
+import { ContainerView, type View } from '../ui/core/view';
+import { booleanConverter } from '../ui/core/view-base';
 import { Style } from '../ui/styling/style';
-import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, AccessibilityTrait } from './accessibility-common';
+import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, AccessibilityTrait } from './accessibility-types';
 
 function makePropertyEnumConverter<T>(enumValues) {
 	return (value: string): T | null => {
@@ -26,6 +26,9 @@ function makePropertyEnumConverter<T>(enumValues) {
 
 export const accessibilityEnabledProperty = new CssProperty<Style, boolean>({
 	name: 'accessible',
+	defaultValue(property, view) {
+		return typeof __ACCESSIBILITY_DEFAULT_ENABLED__ === 'undefined' ? !(view instanceof ContainerView) : __ACCESSIBILITY_DEFAULT_ENABLED__;
+	},
 	cssName: 'a11y-enabled',
 	valueConverter: booleanConverter,
 });
diff --git a/packages/core/accessibility/accessibility-service-common.ts b/packages/core/accessibility/accessibility-service-common.ts
new file mode 100644
index 0000000000..8ea7503be7
--- /dev/null
+++ b/packages/core/accessibility/accessibility-service-common.ts
@@ -0,0 +1,35 @@
+import { Observable } from '../data/observable';
+
+export class SharedA11YObservable extends Observable {
+	accessibilityServiceEnabled?: boolean;
+}
+
+export const AccessibilityServiceEnabledPropName = 'accessibilityServiceEnabled';
+
+export class CommonA11YServiceEnabledObservable extends SharedA11YObservable {
+	constructor(sharedA11YObservable: SharedA11YObservable) {
+		super();
+
+		const ref = new WeakRef(this);
+		let lastValue: boolean;
+
+		function callback() {
+			const self = ref?.get();
+			if (!self) {
+				sharedA11YObservable.off(Observable.propertyChangeEvent, callback);
+
+				return;
+			}
+
+			const newValue = !!sharedA11YObservable.accessibilityServiceEnabled;
+			if (newValue !== lastValue) {
+				self.set(AccessibilityServiceEnabledPropName, newValue);
+				lastValue = newValue;
+			}
+		}
+
+		sharedA11YObservable.on(Observable.propertyChangeEvent, callback);
+
+		this.set(AccessibilityServiceEnabledPropName, !!sharedA11YObservable.accessibilityServiceEnabled);
+	}
+}
diff --git a/packages/core/accessibility/accessibility-service.android.ts b/packages/core/accessibility/accessibility-service.android.ts
new file mode 100644
index 0000000000..e0ac1a11fe
--- /dev/null
+++ b/packages/core/accessibility/accessibility-service.android.ts
@@ -0,0 +1,136 @@
+import { Application, ApplicationEventData } from '../application';
+import { Observable } from '../data/observable';
+import { Trace } from '../trace';
+import * as Utils from '../utils';
+import { SDK_VERSION } from '../utils/constants';
+import { CommonA11YServiceEnabledObservable, SharedA11YObservable } from './accessibility-service-common';
+
+let accessibilityManager: android.view.accessibility.AccessibilityManager;
+export function getAndroidAccessibilityManager(): android.view.accessibility.AccessibilityManager | null {
+	if (!accessibilityManager) {
+		const context = Utils.android.getApplicationContext() as android.content.Context;
+		if (!context) {
+			return null;
+		}
+
+		accessibilityManager = context.getSystemService(android.content.Context.ACCESSIBILITY_SERVICE) as android.view.accessibility.AccessibilityManager;
+	}
+	return accessibilityManager;
+}
+
+const accessibilityStateEnabledPropName = 'accessibilityStateEnabled';
+const touchExplorationStateEnabledPropName = 'touchExplorationStateEnabled';
+
+class AndroidSharedA11YObservable extends SharedA11YObservable {
+	[accessibilityStateEnabledPropName]: boolean;
+	[touchExplorationStateEnabledPropName]: boolean;
+
+	// @ts-ignore todo: fix
+	get accessibilityServiceEnabled(): boolean {
+		return !!this[accessibilityStateEnabledPropName] && !!this[touchExplorationStateEnabledPropName];
+	}
+
+	set accessibilityServiceEnabled(v) {
+		return;
+	}
+}
+
+let accessibilityStateChangeListener: android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
+let touchExplorationStateChangeListener: android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
+let sharedA11YObservable: AndroidSharedA11YObservable;
+
+function updateAccessibilityState(): void {
+	const accessibilityManager = getAndroidAccessibilityManager();
+	if (!accessibilityManager) {
+		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
+		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
+
+		return;
+	}
+
+	sharedA11YObservable.set(accessibilityStateEnabledPropName, !!accessibilityManager.isEnabled());
+	sharedA11YObservable.set(touchExplorationStateEnabledPropName, !!accessibilityManager.isTouchExplorationEnabled());
+}
+
+function ensureStateListener(): SharedA11YObservable {
+	if (sharedA11YObservable) {
+		return sharedA11YObservable;
+	}
+
+	const accessibilityManager = getAndroidAccessibilityManager();
+	sharedA11YObservable = new AndroidSharedA11YObservable();
+
+	if (!accessibilityManager) {
+		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
+		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
+
+		return sharedA11YObservable;
+	}
+
+	accessibilityStateChangeListener = new android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener({
+		onAccessibilityStateChanged(enabled) {
+			updateAccessibilityState();
+
+			if (Trace.isEnabled()) {
+				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+			}
+		},
+	});
+	accessibilityManager.addAccessibilityStateChangeListener(accessibilityStateChangeListener);
+
+	if (SDK_VERSION >= 19) {
+		touchExplorationStateChangeListener = new android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener({
+			onTouchExplorationStateChanged(enabled) {
+				updateAccessibilityState();
+
+				if (Trace.isEnabled()) {
+					Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+				}
+			},
+		});
+		accessibilityManager.addTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
+	}
+
+	updateAccessibilityState();
+
+	Application.on(Application.resumeEvent, updateAccessibilityState);
+	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
+		const activity = args.android as android.app.Activity;
+		if (activity && !activity.isFinishing()) {
+			return;
+		}
+
+		const accessibilityManager = getAndroidAccessibilityManager();
+		if (accessibilityManager) {
+			if (accessibilityStateChangeListener) {
+				accessibilityManager.removeAccessibilityStateChangeListener(accessibilityStateChangeListener);
+			}
+
+			if (touchExplorationStateChangeListener) {
+				accessibilityManager.removeTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
+			}
+		}
+
+		accessibilityStateChangeListener = null;
+		touchExplorationStateChangeListener = null;
+
+		if (sharedA11YObservable) {
+			sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
+			sharedA11YObservable = null;
+		}
+
+		Application.off(Application.resumeEvent, updateAccessibilityState);
+	});
+
+	return sharedA11YObservable;
+}
+
+export function isAccessibilityServiceEnabled(): boolean {
+	return ensureStateListener().accessibilityServiceEnabled;
+}
+
+export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
+	constructor() {
+		super(ensureStateListener());
+	}
+}
diff --git a/packages/core/accessibility/accessibility-service.d.ts b/packages/core/accessibility/accessibility-service.d.ts
new file mode 100644
index 0000000000..4a7fbd2dbb
--- /dev/null
+++ b/packages/core/accessibility/accessibility-service.d.ts
@@ -0,0 +1,10 @@
+import { Observable } from '../data/observable';
+
+export class AccessibilityServiceEnabledObservable extends Observable {
+	public readonly accessibilityServiceEnabled?: boolean;
+}
+
+/**
+ * Get the Android platform's AccessibilityManager.
+ */
+export function getAndroidAccessibilityManager(): /* android.view.accessibility.AccessibilityManager */ any | null;
diff --git a/packages/core/accessibility/accessibility-service.ios.ts b/packages/core/accessibility/accessibility-service.ios.ts
new file mode 100644
index 0000000000..116986a49b
--- /dev/null
+++ b/packages/core/accessibility/accessibility-service.ios.ts
@@ -0,0 +1,75 @@
+import { Application } from '../application';
+import { Observable } from '../data/observable';
+import { Trace } from '../trace';
+import { AccessibilityServiceEnabledPropName, CommonA11YServiceEnabledObservable, SharedA11YObservable } from './accessibility-service-common';
+
+export function isAccessibilityServiceEnabled(): boolean {
+	return getSharedA11YObservable().accessibilityServiceEnabled;
+}
+
+export function getAndroidAccessibilityManager(): null {
+	return null;
+}
+
+let sharedA11YObservable: SharedA11YObservable;
+let nativeObserver;
+
+function getSharedA11YObservable(): SharedA11YObservable {
+	if (sharedA11YObservable) {
+		return sharedA11YObservable;
+	}
+
+	sharedA11YObservable = new SharedA11YObservable();
+
+	let isVoiceOverRunning: () => boolean;
+	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
+		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
+	} else {
+		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
+			Trace.write(`UIAccessibilityIsVoiceOverRunning() - is not a function`, Trace.categories.Accessibility, Trace.messageType.error);
+
+			isVoiceOverRunning = () => false;
+		}
+	}
+
+	sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
+
+	let voiceOverStatusChangedNotificationName: string | null = null;
+	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
+		// iOS 11+
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
+	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
+		// iOS <11
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
+	}
+
+	if (voiceOverStatusChangedNotificationName) {
+		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
+			sharedA11YObservable?.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
+		});
+
+		Application.on(Application.exitEvent, () => {
+			if (nativeObserver) {
+				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
+			}
+
+			nativeObserver = null;
+
+			if (sharedA11YObservable) {
+				sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
+
+				sharedA11YObservable = null;
+			}
+		});
+	}
+
+	Application.on(Application.resumeEvent, () => sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning()));
+
+	return sharedA11YObservable;
+}
+
+export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
+	constructor() {
+		super(getSharedA11YObservable());
+	}
+}
diff --git a/packages/core/accessibility/accessibility-types.ts b/packages/core/accessibility/accessibility-types.ts
new file mode 100644
index 0000000000..6d30cbb9ca
--- /dev/null
+++ b/packages/core/accessibility/accessibility-types.ts
@@ -0,0 +1,253 @@
+import type { EventData } from '../data/observable';
+
+export enum AccessibilityTrait {
+	/**
+	 * The element allows direct touch interaction for VoiceOver users.
+	 */
+	AllowsDirectInteraction,
+
+	/**
+	 * The element should cause an automatic page turn when VoiceOver finishes reading the text within it.
+	 * Note: Requires custom view with accessibilityScroll(...)
+	 */
+	CausesPageTurn,
+
+	/**
+	 * The element is not enabled and does not respond to user interaction.
+	 */
+	NotEnabled,
+
+	/**
+	 * The element is currently selected.
+	 */
+	Selected,
+
+	/**
+	 * The element frequently updates its label or value.
+	 */
+	UpdatesFrequently,
+}
+
+export enum AccessibilityRole {
+	/**
+	 * The element allows continuous adjustment through a range of values.
+	 */
+	Adjustable,
+
+	/**
+	 * The element should be treated as a button.
+	 */
+	Button,
+
+	/**
+	 * The element behaves like a Checkbox
+	 */
+	Checkbox,
+
+	/**
+	 * The element is a header that divides content into sections, such as the title of a navigation bar.
+	 */
+	Header,
+
+	/**
+	 * The element should be treated as an image.
+	 */
+	Image,
+
+	/**
+	 * The element should be treated as a image button.
+	 */
+	ImageButton,
+
+	/**
+	 * The element behaves as a keyboard key.
+	 */
+	KeyboardKey,
+
+	/**
+	 * The element should be treated as a link.
+	 */
+	Link,
+
+	/**
+	 * The element has no traits.
+	 */
+	None,
+
+	/**
+	 * The element plays its own sound when activated.
+	 */
+	PlaysSound,
+
+	/**
+	 * The element behaves like a ProgressBar
+	 */
+	ProgressBar,
+
+	/**
+	 * The element behaves like a RadioButton
+	 */
+	RadioButton,
+
+	/**
+	 * The element should be treated as a search field.
+	 */
+	Search,
+
+	/**
+	 * The element behaves like a SpinButton
+	 */
+	SpinButton,
+
+	/**
+	 * The element starts a media session when it is activated.
+	 */
+	StartsMediaSession,
+
+	/**
+	 * The element should be treated as static text that cannot change.
+	 */
+	StaticText,
+
+	/**
+	 * The element provides summary information when the application starts.
+	 */
+	Summary,
+
+	/**
+	 * The element behaves like a switch
+	 */
+	Switch,
+}
+
+export enum AccessibilityState {
+	Selected,
+	Checked,
+	Unchecked,
+	Disabled,
+}
+
+export enum AccessibilityLiveRegion {
+	None,
+	Polite,
+	Assertive,
+}
+
+export enum IOSPostAccessibilityNotificationType {
+	Announcement,
+	Screen,
+	Layout,
+}
+
+export enum AndroidAccessibilityEvent {
+	/**
+	 * Invalid selection/focus position.
+	 */
+	INVALID_POSITION = -1 /* android.view.accessibility.AccessibilityEvent.INVALID_POSITION */,
+	/**
+	 * Maximum length of the text fields.
+	 */
+	MAX_TEXT_LENGTH = 500 /* android.view.accessibility.AccessibilityEvent.MAX_TEXT_LENGTH */,
+	/**
+	 * Represents the event of clicking on a android.view.View like android.widget.Button = android.widget.CompoundButton = etc.
+	 */
+	VIEW_CLICKED = 1 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED */,
+	/**
+	 * Represents the event of long clicking on a android.view.View like android.widget.Button = android.widget.CompoundButton = etc.
+	 */
+	VIEW_LONG_CLICKED = 2 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_LONG_CLICKED */,
+	/**
+	 * Represents the event of selecting an item usually in the context of an android.widget.AdapterView.
+	 */
+	VIEW_SELECTED = 4 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SELECTED */,
+	/**
+	 * Represents the event of setting input focus of a android.view.View.
+	 */
+	VIEW_FOCUSED = 8 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED */,
+	/**
+	 * Represents the event of changing the text of an android.widget.EditText.
+	 */
+	VIEW_TEXT_CHANGED = 16 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED */,
+	/**
+	 * Represents the event of opening a android.widget.PopupWindow = android.view.Menu = android.app.Dialog = etc.
+	 */
+	WINDOW_STATE_CHANGED = 32 /* android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED */,
+	/**
+	 * Represents the event showing a android.app.Notification.
+	 */
+	NOTIFICATION_STATE_CHANGED = 64 /* android.view.accessibility.AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED */,
+	/**
+	 * Represents the event of a hover enter over a android.view.View.
+	 */
+	VIEW_HOVER_ENTER = 128 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_ENTER */,
+	/**
+	 * Represents the event of a hover exit over a android.view.View.
+	 */
+	VIEW_HOVER_EXIT = 256 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_EXIT */,
+	/**
+	 * Represents the event of starting a touch exploration gesture.
+	 */
+	TOUCH_EXPLORATION_GESTURE_START = 512 /* android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START */,
+	/**
+	 * Represents the event of ending a touch exploration gesture.
+	 */
+	TOUCH_EXPLORATION_GESTURE_END = 1024 /* android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END */,
+	/**
+	 * Represents the event of changing the content of a window and more specifically the sub-tree rooted at the event's source.
+	 */
+	WINDOW_CONTENT_CHANGED = 2048 /* android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED */,
+	/**
+	 * Represents the event of scrolling a view.
+	 */
+	VIEW_SCROLLED = 4096 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SCROLLED */,
+	/**
+	 * Represents the event of changing the selection in an android.widget.EditText.
+	 */
+	VIEW_TEXT_SELECTION_CHANGED = 8192 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED */,
+	/**
+	 * Represents the event of an application making an announcement.
+	 */
+	ANNOUNCEMENT = 16384 /* android.view.accessibility.AccessibilityEvent.TYPE_ANNOUNCEMENT */,
+	/**
+	 * Represents the event of gaining accessibility focus.
+	 */
+	VIEW_ACCESSIBILITY_FOCUSED = 32768 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED */,
+	/**
+	 * Represents the event of clearing accessibility focus.
+	 */
+	VIEW_ACCESSIBILITY_FOCUS_CLEARED = 65536 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED */,
+	/**
+	 * Represents the event of traversing the text of a view at a given movement granularity.
+	 */
+	VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY = 131072 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY */,
+	/**
+	 * Represents the event of beginning gesture detection.
+	 */
+	GESTURE_DETECTION_START = 262144 /* android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_START */,
+	/**
+	 * Represents the event of ending gesture detection.
+	 */
+	GESTURE_DETECTION_END = 524288 /* android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_END */,
+	/**
+	 * Represents the event of the user starting to touch the screen.
+	 */
+	TOUCH_INTERACTION_START = 1048576 /* android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_START */,
+	/**
+	 * Represents the event of the user ending to touch the screen.
+	 */
+	TOUCH_INTERACTION_END = 2097152 /* android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_END */,
+	/**
+	 * Mask for AccessibilityEvent all types.
+	 */
+	ALL_MASK = -1 /* android.view.accessibility.AccessibilityEvent.TYPES_ALL_MASK */,
+}
+
+export interface AccessibilityEventPerformEscape extends EventData {
+	cancel?: boolean;
+}
+
+export interface AccessibilityEventOptions {
+	androidAccessibilityEvent?: AndroidAccessibilityEvent;
+	iosNotificationType?: IOSPostAccessibilityNotificationType;
+	message?: string;
+}
diff --git a/packages/core/accessibility/font-scale-common.ts b/packages/core/accessibility/font-scale-common.ts
new file mode 100644
index 0000000000..976793f434
--- /dev/null
+++ b/packages/core/accessibility/font-scale-common.ts
@@ -0,0 +1,15 @@
+export const VALID_FONT_SCALES = __APPLE__ // Apple supports a wider number of font scales than Android does.
+	? [0.5, 0.7, 0.85, 1, 1.15, 1.3, 1.5, 2, 2.5, 3, 3.5, 4]
+	: [0.85, 1, 1.15, 1.3];
+
+export function getClosestValidFontScale(fontScale: number): number {
+	fontScale = Number(fontScale) || 1;
+
+	return VALID_FONT_SCALES.sort((a, b) => Math.abs(fontScale - a) - Math.abs(fontScale - b))[0];
+}
+
+export enum FontScaleCategory {
+	ExtraSmall = 'extra-small',
+	Medium = 'medium',
+	ExtraLarge = 'extra-large',
+}
diff --git a/packages/core/accessibility/font-scale.android.ts b/packages/core/accessibility/font-scale.android.ts
new file mode 100644
index 0000000000..c5e8da1dd9
--- /dev/null
+++ b/packages/core/accessibility/font-scale.android.ts
@@ -0,0 +1,36 @@
+import * as Utils from '../utils';
+import { Application, ApplicationEventData } from '../application';
+import { FontScaleCategory, getClosestValidFontScale } from './font-scale-common';
+export * from './font-scale-common';
+
+let currentFontScale: number = null;
+export function fontScaleChanged(origFontScale: number) {
+	const oldValue = currentFontScale;
+	// currentFontScale = getClosestValidFontScale(origFontScale);
+	currentFontScale = origFontScale;
+
+	if (oldValue !== currentFontScale) {
+		console.log('fontScaleChanged', oldValue, origFontScale);
+		Application.notify({
+			eventName: Application.fontScaleChangedEvent,
+			object: Application,
+			newValue: currentFontScale,
+		} as ApplicationEventData);
+	}
+}
+
+export function getCurrentFontScale(): number {
+	return currentFontScale;
+}
+
+export function getFontScaleCategory(): FontScaleCategory {
+	return FontScaleCategory.Medium;
+}
+
+function useAndroidFontScale() {
+	fontScaleChanged(Number(Utils.android.getResources().getConfiguration().fontScale));
+}
+
+export function initAccessibilityFontScale(): void {
+	useAndroidFontScale();
+}
diff --git a/packages/core/accessibility/font-scale.d.ts b/packages/core/accessibility/font-scale.d.ts
new file mode 100644
index 0000000000..bfc8635f2d
--- /dev/null
+++ b/packages/core/accessibility/font-scale.d.ts
@@ -0,0 +1,9 @@
+export const VALID_FONT_SCALES: number[];
+export function getCurrentFontScale(): number;
+export enum FontScaleCategory {
+	ExtraSmall = 'extra-small',
+	Medium = 'medium',
+	ExtraLarge = 'extra-large',
+}
+export function getFontScaleCategory(): FontScaleCategory;
+export function initAccessibilityFontScale(): void;
diff --git a/packages/core/accessibility/font-scale.ios.ts b/packages/core/accessibility/font-scale.ios.ts
new file mode 100644
index 0000000000..054366b61d
--- /dev/null
+++ b/packages/core/accessibility/font-scale.ios.ts
@@ -0,0 +1,110 @@
+import { Application } from '../application';
+import { FontScaleCategory, getClosestValidFontScale } from './font-scale-common';
+export * from './font-scale-common';
+
+let currentFontScale: number = null;
+function fontScaleChanged(origFontScale: number) {
+	const oldValue = currentFontScale;
+	currentFontScale = getClosestValidFontScale(origFontScale);
+
+	if (oldValue !== currentFontScale) {
+		Application.notify({
+			eventName: Application.fontScaleChangedEvent,
+			object: Application,
+			newValue: currentFontScale,
+		});
+	}
+}
+
+export function getCurrentFontScale(): number {
+	setupConfigListener();
+
+	return currentFontScale;
+}
+
+export function getFontScaleCategory(): FontScaleCategory {
+	if (currentFontScale < 0.85) {
+		return FontScaleCategory.ExtraSmall;
+	}
+
+	if (currentFontScale > 1.5) {
+		return FontScaleCategory.ExtraLarge;
+	}
+
+	return FontScaleCategory.Medium;
+}
+
+const sizeMap = new Map<string, number>([
+	[UIContentSizeCategoryExtraSmall, 0.5],
+	[UIContentSizeCategorySmall, 0.7],
+	[UIContentSizeCategoryMedium, 0.85],
+	[UIContentSizeCategoryLarge, 1],
+	[UIContentSizeCategoryExtraLarge, 1.15],
+	[UIContentSizeCategoryExtraExtraLarge, 1.3],
+	[UIContentSizeCategoryExtraExtraExtraLarge, 1.5],
+	[UIContentSizeCategoryAccessibilityMedium, 2],
+	[UIContentSizeCategoryAccessibilityLarge, 2.5],
+	[UIContentSizeCategoryAccessibilityExtraLarge, 3],
+	[UIContentSizeCategoryAccessibilityExtraExtraLarge, 3.5],
+	[UIContentSizeCategoryAccessibilityExtraExtraExtraLarge, 4],
+]);
+
+function contentSizeUpdated(fontSize: string) {
+	if (sizeMap.has(fontSize)) {
+		fontScaleChanged(sizeMap.get(fontSize));
+
+		return;
+	}
+
+	fontScaleChanged(1);
+}
+
+function useIOSFontScale() {
+	if (Application.ios.nativeApp) {
+		contentSizeUpdated(Application.ios.nativeApp.preferredContentSizeCategory);
+	} else {
+		fontScaleChanged(1);
+	}
+}
+
+let fontSizeObserver;
+function setupConfigListener(attempt = 0) {
+	if (fontSizeObserver) {
+		return;
+	}
+
+	if (!Application.ios.nativeApp) {
+		if (attempt > 100) {
+			fontScaleChanged(1);
+
+			return;
+		}
+
+		// Couldn't get launchEvent to trigger.
+		setTimeout(() => setupConfigListener(attempt + 1), 1);
+
+		return;
+	}
+
+	fontSizeObserver = Application.ios.addNotificationObserver(UIContentSizeCategoryDidChangeNotification, (args) => {
+		const fontSize = args.userInfo.valueForKey(UIContentSizeCategoryNewValueKey);
+		contentSizeUpdated(fontSize);
+	});
+
+	Application.on(Application.exitEvent, () => {
+		if (fontSizeObserver) {
+			Application.ios.removeNotificationObserver(fontSizeObserver, UIContentSizeCategoryDidChangeNotification);
+			fontSizeObserver = null;
+		}
+
+		Application.off(Application.resumeEvent, useIOSFontScale);
+	});
+
+	Application.on(Application.resumeEvent, useIOSFontScale);
+
+	useIOSFontScale();
+}
+
+export function initAccessibilityFontScale(): void {
+	setupConfigListener();
+}
diff --git a/packages/core/accessibility/index.android.ts b/packages/core/accessibility/index.android.ts
new file mode 100644
index 0000000000..d4194e9fcc
--- /dev/null
+++ b/packages/core/accessibility/index.android.ts
@@ -0,0 +1,538 @@
+import { Application, ApplicationEventData } from '../application';
+import { Trace } from '../trace';
+import { SDK_VERSION } from '../utils/constants';
+import { resources } from '../utils/native-helper-for-android';
+import type { View } from '../ui/core/view';
+import { GestureTypes } from '../ui/gestures';
+import { notifyAccessibilityFocusState } from './accessibility-common';
+import { initAccessibilityCssHelper } from './accessibility-css-helper';
+import { getAndroidAccessibilityManager } from './accessibility-service';
+import { AccessibilityRole, AccessibilityState, AndroidAccessibilityEvent } from './accessibility-types';
+import { getCurrentFontScale, initAccessibilityFontScale } from './font-scale.android';
+import { setA11yUpdatePropertiesCallback } from '../application/helpers-common';
+
+export * from './accessibility-common';
+export * from './accessibility-types';
+export * from './font-scale';
+
+export function getFontScale(): number {
+	return getCurrentFontScale();
+}
+
+let clickableRolesMap = new Set<AccessibilityRole>();
+
+let lastFocusedView: WeakRef<View>;
+function accessibilityEventHelper(view: View, eventType: number) {
+	if (!isAccessibilityServiceEnabled()) {
+		if (Trace.isEnabled()) {
+			Trace.write(`accessibilityEventHelper: Service not active`, Trace.categories.Accessibility);
+		}
+		return;
+	}
+
+	const androidView = view?.nativeViewProtected as android.view.View;
+	if (!androidView) {
+		if (Trace.isEnabled()) {
+			Trace.write(`accessibilityEventHelper: no nativeView`, Trace.categories.Accessibility);
+		}
+		return;
+	}
+
+	switch (eventType) {
+		case 1 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED */: {
+			/**
+			 * Android API >= 26 handles accessibility tap-events by converting them to TYPE_VIEW_CLICKED
+			 * These aren't triggered for custom tap events in NativeScript.
+			 */
+			if (SDK_VERSION >= 26) {
+				// Find all tap gestures and trigger them.
+				for (const tapGesture of view.getGestureObservers(GestureTypes.tap) ?? []) {
+					tapGesture.callback({
+						android: view.android,
+						eventName: 'tap',
+						ios: null,
+						object: view,
+						type: GestureTypes.tap,
+						view: view,
+					});
+				}
+			}
+
+			return;
+		}
+		case 32768 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED */: {
+			const lastView = lastFocusedView?.get();
+			if (lastView && view !== lastView) {
+				const lastAndroidView = lastView.nativeViewProtected as android.view.View;
+				if (lastAndroidView) {
+					lastAndroidView.clearFocus();
+					lastFocusedView = null;
+
+					notifyAccessibilityFocusState(lastView, false, true);
+				}
+			}
+
+			lastFocusedView = new WeakRef(view);
+
+			notifyAccessibilityFocusState(view, true, false);
+
+			return;
+		}
+		case 65536 /* android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED */: {
+			const lastView = lastFocusedView?.get();
+			if (lastView && view === lastView) {
+				lastFocusedView = null;
+				androidView.clearFocus();
+			}
+
+			notifyAccessibilityFocusState(view, false, true);
+
+			return;
+		}
+	}
+}
+
+let TNSAccessibilityDelegate: android.view.View.androidviewViewAccessibilityDelegate;
+
+const androidViewToTNSView = new WeakMap<android.view.View, WeakRef<View>>();
+let accessibilityEventMap: Map<AndroidAccessibilityEvent, number>;
+let accessibilityEventTypeMap: Map<number, string>;
+
+function ensureNativeClasses() {
+	if (TNSAccessibilityDelegate) {
+		return;
+	}
+
+	// WORKAROUND: Typing refers to android.view.View.androidviewViewAccessibilityDelegate but it is called android.view.View.AccessibilityDelegate at runtime
+	const AccessibilityDelegate: typeof android.view.View.androidviewViewAccessibilityDelegate = android.view.View['AccessibilityDelegate'];
+
+	const RoleTypeMap = new Map<AccessibilityRole, () => string>([
+		[AccessibilityRole.Button, () => android.widget.Button.class.getName()],
+		[AccessibilityRole.Search, () => android.widget.EditText.class.getName()],
+		[AccessibilityRole.Image, () => android.widget.ImageView.class.getName()],
+		[AccessibilityRole.ImageButton, () => android.widget.ImageButton.class.getName()],
+		[AccessibilityRole.KeyboardKey, () => android.inputmethodservice.Keyboard.Key.class.getName()],
+		[AccessibilityRole.StaticText, () => android.widget.TextView.class.getName()],
+		[AccessibilityRole.Adjustable, () => android.widget.SeekBar.class.getName()],
+		[AccessibilityRole.Checkbox, () => android.widget.CheckBox.class.getName()],
+		[AccessibilityRole.RadioButton, () => android.widget.RadioButton.class.getName()],
+		[AccessibilityRole.SpinButton, () => android.widget.Spinner.class.getName()],
+		[AccessibilityRole.Switch, () => android.widget.Switch.class.getName()],
+		[AccessibilityRole.ProgressBar, () => android.widget.ProgressBar.class.getName()],
+	]);
+	const RoleTypeMapCached = new Map<AccessibilityRole, string>();
+
+	clickableRolesMap = new Set<AccessibilityRole>([AccessibilityRole.Button, AccessibilityRole.ImageButton]);
+
+	const ignoreRoleTypesForTrace = new Set([AccessibilityRole.Header, AccessibilityRole.Link, AccessibilityRole.None, AccessibilityRole.Summary]);
+
+	@NativeClass()
+	class TNSAccessibilityDelegateImpl extends AccessibilityDelegate {
+		constructor() {
+			super();
+
+			return global.__native(this);
+		}
+
+		private getTnsView(androidView: android.view.View) {
+			const view = androidViewToTNSView.get(androidView)?.get();
+			if (!view) {
+				androidViewToTNSView.delete(androidView);
+
+				return null;
+			}
+
+			return view;
+		}
+
+		public onInitializeAccessibilityNodeInfo(host: android.view.View, info: android.view.accessibility.AccessibilityNodeInfo) {
+			super.onInitializeAccessibilityNodeInfo(host, info);
+
+			const view = this.getTnsView(host);
+			if (!view) {
+				if (Trace.isEnabled()) {
+					Trace.write(`onInitializeAccessibilityNodeInfo ${host} ${info} no tns-view`, Trace.categories.Accessibility);
+				}
+
+				return;
+			}
+
+			// Set resource id that can be used with test frameworks without polluting the content description.
+			const id = host.getTag(resources.getId(`:id/nativescript_accessibility_id`));
+			if (id != null) {
+				info.setViewIdResourceName(id);
+			}
+
+			const accessibilityRole = view.accessibilityRole;
+			if (accessibilityRole) {
+				//we cache value while not loading all classes on start
+				let androidClassName = RoleTypeMapCached.get(accessibilityRole);
+				if (!androidClassName) {
+					androidClassName = RoleTypeMap.get(accessibilityRole)?.();
+					RoleTypeMapCached.set(accessibilityRole, androidClassName);
+				}
+				if (androidClassName) {
+					info.setClassName(androidClassName);
+
+					if (Trace.isEnabled()) {
+						const oldClassName = info.getClassName() || (SDK_VERSION >= 28 && host.getAccessibilityClassName()) || null;
+						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is mapped to "${androidClassName}" (was ${oldClassName}). ${info.getClassName()}`, Trace.categories.Accessibility);
+					}
+				} else if (!ignoreRoleTypesForTrace.has(accessibilityRole)) {
+					if (Trace.isEnabled()) {
+						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is unknown`, Trace.categories.Accessibility);
+					}
+				}
+
+				if (clickableRolesMap.has(accessibilityRole)) {
+					if (Trace.isEnabled()) {
+						Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set clickable role=${accessibilityRole}`, Trace.categories.Accessibility);
+					}
+
+					info.setClickable(true);
+				}
+
+				if (SDK_VERSION >= 28) {
+					if (accessibilityRole === AccessibilityRole.Header) {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading role=${accessibilityRole}`, Trace.categories.Accessibility);
+						}
+
+						info.setHeading(true);
+					} else if (host.isAccessibilityHeading()) {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading from host`, Trace.categories.Accessibility);
+						}
+
+						info.setHeading(true);
+					} else {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set not heading`, Trace.categories.Accessibility);
+						}
+
+						info.setHeading(false);
+					}
+				}
+
+				switch (accessibilityRole) {
+					case AccessibilityRole.Switch:
+					case AccessibilityRole.RadioButton:
+					case AccessibilityRole.Checkbox: {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set checkable and check=${view.accessibilityState === AccessibilityState.Checked}`, Trace.categories.Accessibility);
+						}
+
+						info.setCheckable(true);
+						info.setChecked(view.accessibilityState === AccessibilityState.Checked);
+						break;
+					}
+					default: {
+						if (Trace.isEnabled()) {
+							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set enabled=${view.accessibilityState !== AccessibilityState.Disabled} and selected=${view.accessibilityState === AccessibilityState.Selected}`, Trace.categories.Accessibility);
+						}
+
+						info.setEnabled(view.accessibilityState !== AccessibilityState.Disabled);
+						info.setSelected(view.accessibilityState === AccessibilityState.Selected);
+						break;
+					}
+				}
+			}
+
+			if (view.accessible) {
+				info.setFocusable(true);
+			}
+		}
+
+		public sendAccessibilityEvent(host: android.view.ViewGroup, eventType: number) {
+			super.sendAccessibilityEvent(host, eventType);
+			const view = this.getTnsView(host);
+			if (!view) {
+				console.log(`skip - ${host} - ${AndroidAccessibilityEvent[eventType]}`);
+
+				return;
+			}
+
+			try {
+				accessibilityEventHelper(view, eventType);
+			} catch (err) {
+				console.error(err);
+			}
+		}
+	}
+
+	TNSAccessibilityDelegate = new TNSAccessibilityDelegateImpl();
+}
+
+let accessibilityStateChangeListener: androidx.core.view.accessibility.AccessibilityManagerCompat.AccessibilityStateChangeListener;
+let touchExplorationStateChangeListener: androidx.core.view.accessibility.AccessibilityManagerCompat.TouchExplorationStateChangeListener;
+
+function updateAccessibilityServiceState() {
+	const accessibilityManager = getAndroidAccessibilityManager();
+	if (!accessibilityManager) {
+		return;
+	}
+
+	accessibilityServiceEnabled = !!accessibilityManager.isEnabled() && !!accessibilityManager.isTouchExplorationEnabled();
+}
+
+let accessibilityServiceEnabled: boolean;
+export function isAccessibilityServiceEnabled(): boolean {
+	if (accessibilityServiceEnabled !== undefined) {
+		return accessibilityServiceEnabled;
+	}
+
+	const accessibilityManager = getAndroidAccessibilityManager();
+	const AccessibilityManagerCompat = androidx.core.view.accessibility.AccessibilityManagerCompat;
+	accessibilityStateChangeListener = new AccessibilityManagerCompat.AccessibilityStateChangeListener({
+		onAccessibilityStateChanged(enabled) {
+			updateAccessibilityServiceState();
+
+			if (Trace.isEnabled()) {
+				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+			}
+		},
+	});
+
+	touchExplorationStateChangeListener = new AccessibilityManagerCompat.TouchExplorationStateChangeListener({
+		onTouchExplorationStateChanged(enabled) {
+			updateAccessibilityServiceState();
+
+			if (Trace.isEnabled()) {
+				Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+			}
+		},
+	});
+
+	AccessibilityManagerCompat.addAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
+	AccessibilityManagerCompat.addTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
+
+	updateAccessibilityServiceState();
+
+	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
+		const activity = args.android as android.app.Activity;
+		if (activity && !activity.isFinishing()) {
+			return;
+		}
+
+		const accessibilityManager = getAndroidAccessibilityManager();
+		if (accessibilityManager) {
+			if (accessibilityStateChangeListener) {
+				AccessibilityManagerCompat.removeAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
+			}
+
+			if (touchExplorationStateChangeListener) {
+				AccessibilityManagerCompat.removeTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
+			}
+		}
+
+		accessibilityStateChangeListener = null;
+		touchExplorationStateChangeListener = null;
+
+		Application.off(Application.resumeEvent, updateAccessibilityServiceState);
+	});
+
+	Application.on(Application.resumeEvent, updateAccessibilityServiceState);
+
+	return accessibilityServiceEnabled;
+}
+
+export function setupAccessibleView(view: View): void {
+	updateAccessibilityProperties(view);
+}
+
+let updateAccessibilityPropertiesMicroTask;
+let pendingViews = new Set<View>();
+export function updateAccessibilityProperties(view: View) {
+	if (!view.nativeViewProtected) {
+		return;
+	}
+
+	pendingViews.add(view);
+	if (updateAccessibilityPropertiesMicroTask) return;
+
+	updateAccessibilityPropertiesMicroTask = true;
+	Promise.resolve().then(() => {
+		updateAccessibilityPropertiesMicroTask = false;
+		let _pendingViews = Array.from(pendingViews);
+		pendingViews = new Set();
+		for (const view of _pendingViews) {
+			if (!view.nativeViewProtected) continue;
+			setAccessibilityDelegate(view);
+			if (!view._hasDefaultAccessibilityContentDescription || view._androidContentDescriptionNeedsUpdate === true) {
+				updateContentDescription(view);
+			}
+		}
+		_pendingViews = [];
+	});
+}
+setA11yUpdatePropertiesCallback(updateAccessibilityProperties);
+
+export function sendAccessibilityEvent(view: View, eventType: AndroidAccessibilityEvent, text?: string): void {
+	if (!isAccessibilityServiceEnabled()) {
+		return;
+	}
+
+	const androidView = view.nativeViewProtected as android.view.View;
+	if (!androidView) {
+		if (Trace.isEnabled()) {
+			Trace.write(`sendAccessibilityEvent(${view}, ${eventType}, ${text}): no nativeView`, Trace.categories.Accessibility);
+		}
+		return;
+	}
+
+	if (!eventType) {
+		if (Trace.isEnabled()) {
+			Trace.write(`endAccessibilityEvent(${view}, ${eventType}, ${text}): no eventName provided`, Trace.categories.Accessibility);
+		}
+
+		return;
+	}
+
+	if (!text) {
+		return androidView.sendAccessibilityEvent(eventType);
+	}
+
+	const accessibilityEvent = android.view.accessibility.AccessibilityEvent.obtain(eventType);
+	accessibilityEvent.setSource(androidView);
+
+	accessibilityEvent.getText().clear();
+
+	if (Trace.isEnabled()) {
+		Trace.write(`sendAccessibilityEvent(${view}: send event with text: '${JSON.stringify(text)}'`, Trace.categories.Accessibility);
+	}
+
+	accessibilityEvent.getText().add(text);
+
+	getAndroidAccessibilityManager().sendAccessibilityEvent(accessibilityEvent);
+}
+
+let started = false;
+function setAccessibilityDelegate(view: View): void {
+	if (!view.nativeViewProtected) {
+		return;
+	}
+	if (!started) {
+		started = true;
+		initAccessibilityCssHelper();
+		initAccessibilityFontScale();
+	}
+
+	ensureNativeClasses();
+
+	const androidView = view.nativeViewProtected as android.view.View;
+	if (!androidView?.setAccessibilityDelegate) {
+		return;
+	}
+
+	// TODO: is that really a good idea? is that a memory issue?
+	androidViewToTNSView.set(androidView, new WeakRef(view));
+
+	if (androidView.getAccessibilityDelegate?.() === TNSAccessibilityDelegate) {
+		return;
+	}
+
+	androidView.setAccessibilityDelegate(TNSAccessibilityDelegate);
+}
+
+export function updateContentDescription(view: any /* View */, forceUpdate?: boolean): string | null {
+	if (!view.nativeViewProtected) {
+		return;
+	}
+
+	return applyContentDescription(view, forceUpdate);
+}
+
+export function applyContentDescription(view: any /* View */, forceUpdate?: boolean) {
+	let androidView = view.nativeViewProtected as android.view.View;
+	if (!androidView || (androidView instanceof android.widget.TextView && !view._androidContentDescriptionUpdated)) {
+		return null;
+	}
+
+	if (androidView instanceof androidx.appcompat.widget.Toolbar) {
+		androidView = org.nativescript.widgets.ViewHelper.getChildAppCompatTextView(androidView) || androidView;
+	}
+
+	const cls = `applyContentDescription(${view})`;
+
+	const titleValue = view['title'] as string;
+	const textValue = view['text'] as string;
+
+	if (!forceUpdate && view._androidContentDescriptionUpdated === false && textValue === view['_lastText'] && titleValue === view['_lastTitle']) {
+		// prevent updating this too much
+		return androidView.getContentDescription();
+	}
+
+	const contentDescriptionBuilder = new Array<string>();
+
+	// Workaround: TalkBack won't read the checked state for fake Switch.
+	if (view.accessibilityRole === AccessibilityRole.Switch) {
+		const androidSwitch = new android.widget.Switch(view._context);
+		if (view.accessibilityState === AccessibilityState.Checked) {
+			contentDescriptionBuilder.push(androidSwitch.getTextOn());
+		} else {
+			contentDescriptionBuilder.push(androidSwitch.getTextOff());
+		}
+	}
+
+	if (view.accessibilityLabel) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - have accessibilityLabel`, Trace.categories.Accessibility);
+		}
+
+		contentDescriptionBuilder.push(`${view.accessibilityLabel}`);
+	}
+
+	if (view.accessibilityValue) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - have accessibilityValue`, Trace.categories.Accessibility);
+		}
+
+		contentDescriptionBuilder.push(`${view.accessibilityValue}`);
+	} else if (textValue) {
+		if (textValue !== view.accessibilityLabel) {
+			if (Trace.isEnabled()) {
+				Trace.write(`${cls} - don't have accessibilityValue - use 'text' value`, Trace.categories.Accessibility);
+			}
+
+			contentDescriptionBuilder.push(`${textValue}`);
+		}
+	} else if (titleValue) {
+		if (titleValue !== view.accessibilityLabel) {
+			if (Trace.isEnabled()) {
+				Trace.write(`${cls} - don't have accessibilityValue - use 'title' value`, Trace.categories.Accessibility);
+			}
+
+			contentDescriptionBuilder.push(`${titleValue}`);
+		}
+	}
+
+	if (view.accessibilityHint) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - have accessibilityHint`, Trace.categories.Accessibility);
+		}
+
+		contentDescriptionBuilder.push(`${view.accessibilityHint}`);
+	}
+
+	const contentDescription = contentDescriptionBuilder.join('. ').trim().replace(/^\.$/, '');
+
+	if (contentDescription) {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - set to "${contentDescription}"`, Trace.categories.Accessibility);
+		}
+
+		androidView.setContentDescription(contentDescription);
+	} else {
+		if (Trace.isEnabled()) {
+			Trace.write(`${cls} - remove value`, Trace.categories.Accessibility);
+		}
+
+		androidView.setContentDescription(null);
+	}
+
+	view['_lastTitle'] = titleValue;
+	view['_lastText'] = textValue;
+	view._androidContentDescriptionUpdated = false;
+
+	return contentDescription;
+}
\ No newline at end of file
diff --git a/packages/core/accessibility/index.d.ts b/packages/core/accessibility/index.d.ts
new file mode 100644
index 0000000000..27b7a8b7be
--- /dev/null
+++ b/packages/core/accessibility/index.d.ts
@@ -0,0 +1,41 @@
+import type { Page } from '../ui/page';
+import type { View } from '../ui/core/view';
+import type { AndroidAccessibilityEvent } from './accessibility-types';
+
+export * from './accessibility-common';
+export * from './accessibility-types';
+export * from './font-scale';
+
+export function getFontScale(): number;
+
+/**
+ * Initialize accessibility for View. This should be called on loaded-event.
+ */
+export function setupAccessibleView(view: View): void;
+
+/**
+ * Update accessibility properties on nativeView
+ */
+export function updateAccessibilityProperties(view: View): void;
+
+/**
+ * Android: helper function for triggering accessibility events
+ */
+export function sendAccessibilityEvent(View: View, eventName: AndroidAccessibilityEvent, text?: string): void;
+
+/**
+ * Android: Update the content description for views
+ */
+export function updateContentDescription(View: View, forceUpdate?: boolean);
+
+/**
+ * Is Android TalkBack or iOS VoiceOver enabled?
+ */
+export function isAccessibilityServiceEnabled(): boolean;
+
+/**
+ * Find the last view focused on a page.
+ */
+export function getLastFocusedViewOnPage(page: Page): View | null;
+
+export function getAndroidAccessibilityManager(): android.view.accessibility.AccessibilityManager | null;
diff --git a/packages/core/accessibility/index.ios.ts b/packages/core/accessibility/index.ios.ts
new file mode 100644
index 0000000000..7a1ba3d4fd
--- /dev/null
+++ b/packages/core/accessibility/index.ios.ts
@@ -0,0 +1,285 @@
+import { Application } from '../application';
+import type { View } from '../ui/core/view';
+import { notifyAccessibilityFocusState } from './accessibility-common';
+import { initAccessibilityCssHelper } from './accessibility-css-helper';
+import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, AccessibilityTrait } from './accessibility-types';
+import { getCurrentFontScale, initAccessibilityFontScale } from './font-scale.ios';
+import { setA11yUpdatePropertiesCallback } from '../application/helpers-common';
+
+export * from './accessibility-common';
+export * from './accessibility-types';
+export * from './font-scale';
+
+export function getFontScale(): number {
+	return getCurrentFontScale();
+}
+
+function enforceArray(val: string | string[]): string[] {
+	if (Array.isArray(val)) {
+		return val;
+	}
+
+	if (typeof val === 'string') {
+		return val.split(/[, ]/g).filter((v: string) => !!v);
+	}
+
+	return [];
+}
+
+/**
+ * Convert array of values into a bitmask.
+ *
+ * @param values string values
+ * @param map    map lower-case name to integer value.
+ */
+function inputArrayToBitMask(values: string | string[], map: Map<string, number>): number {
+	return (
+		enforceArray(values)
+			.filter((value) => !!value)
+			.map((value) => `${value}`.toLocaleLowerCase())
+			.filter((value) => map.has(value))
+			.reduce((res, value) => res | map.get(value), 0) || 0
+	);
+}
+
+let AccessibilityTraitsMap: Map<number, number>;
+let RoleTypeMap: Map<AccessibilityRole, number>;
+
+let nativeFocusedNotificationObserver;
+let lastFocusedView: WeakRef<View>;
+function ensureNativeClasses() {
+	if (AccessibilityTraitsMap && nativeFocusedNotificationObserver) {
+		return;
+	}
+
+	AccessibilityTraitsMap = new Map<AccessibilityTrait, number>([
+		[AccessibilityTrait.AllowsDirectInteraction, UIAccessibilityTraitAllowsDirectInteraction],
+		[AccessibilityTrait.CausesPageTurn, UIAccessibilityTraitCausesPageTurn],
+		[AccessibilityTrait.NotEnabled, UIAccessibilityTraitNotEnabled],
+		[AccessibilityTrait.Selected, UIAccessibilityTraitSelected],
+		[AccessibilityTrait.UpdatesFrequently, UIAccessibilityTraitUpdatesFrequently],
+	]);
+
+	RoleTypeMap = new Map<AccessibilityRole, number>([
+		[AccessibilityRole.Adjustable, UIAccessibilityTraitAdjustable],
+		[AccessibilityRole.Button, UIAccessibilityTraitButton],
+		[AccessibilityRole.Checkbox, UIAccessibilityTraitButton],
+		[AccessibilityRole.Header, UIAccessibilityTraitHeader],
+		[AccessibilityRole.KeyboardKey, UIAccessibilityTraitKeyboardKey],
+		[AccessibilityRole.Image, UIAccessibilityTraitImage],
+		[AccessibilityRole.ImageButton, UIAccessibilityTraitImage | UIAccessibilityTraitButton],
+		[AccessibilityRole.Link, UIAccessibilityTraitLink],
+		[AccessibilityRole.None, UIAccessibilityTraitNone],
+		[AccessibilityRole.PlaysSound, UIAccessibilityTraitPlaysSound],
+		[AccessibilityRole.RadioButton, UIAccessibilityTraitButton],
+		[AccessibilityRole.Search, UIAccessibilityTraitSearchField],
+		[AccessibilityRole.StaticText, UIAccessibilityTraitStaticText],
+		[AccessibilityRole.StartsMediaSession, UIAccessibilityTraitStartsMediaSession],
+		[AccessibilityRole.Summary, UIAccessibilityTraitSummaryElement],
+		[AccessibilityRole.Switch, UIAccessibilityTraitButton],
+	]);
+
+	nativeFocusedNotificationObserver = Application.ios.addNotificationObserver(UIAccessibilityElementFocusedNotification, (args: NSNotification) => {
+		const uiView = args.userInfo?.objectForKey(UIAccessibilityFocusedElementKey) as UIView;
+		if (!uiView?.tag) {
+			return;
+		}
+
+		const rootView = Application.getRootView();
+
+		// We use the UIView's tag to find the NativeScript View by its domId.
+		let view = rootView.getViewByDomId<View>(uiView?.tag);
+		if (!view) {
+			for (const modalView of <Array<View>>rootView._getRootModalViews()) {
+				view = modalView.getViewByDomId(uiView?.tag);
+				if (view) {
+					break;
+				}
+			}
+		}
+
+		if (!view) {
+			return;
+		}
+
+		const lastView = lastFocusedView?.deref();
+		if (lastView && view !== lastView) {
+			const lastFocusedUIView = lastView.nativeViewProtected as UIView;
+			if (lastFocusedUIView) {
+				lastFocusedView = null;
+
+				notifyAccessibilityFocusState(lastView, false, true);
+			}
+		}
+
+		lastFocusedView = new WeakRef(view);
+
+		notifyAccessibilityFocusState(view, true, false);
+	});
+
+	Application.on(Application.exitEvent, () => {
+		if (nativeFocusedNotificationObserver) {
+			Application.ios.removeNotificationObserver(nativeFocusedNotificationObserver, UIAccessibilityElementFocusedNotification);
+		}
+
+		nativeFocusedNotificationObserver = null;
+		lastFocusedView = null;
+	});
+}
+
+export function setupAccessibleView(view: View): void {
+	updateAccessibilityProperties(view);
+}
+
+let started = false;
+export function updateAccessibilityProperties(view: View): void {
+	const uiView = view.nativeViewProtected as UIView;
+	if (!uiView) {
+		return;
+	}
+
+	/**
+	 * We need to map back from the UIView to the NativeScript View.
+	 *
+	 * We do that by setting the uiView's tag to the View's domId.
+	 * This way we can do reverse lookup.
+	 */
+	uiView.tag = view._domId;
+	if (!started) {
+		started = true;
+		initAccessibilityCssHelper();
+		initAccessibilityFontScale();
+	}
+	ensureNativeClasses();
+
+	const accessibilityRole = view.accessibilityRole;
+	const accessibilityState = view.accessibilityState;
+
+	if (!view.accessible || view.accessibilityHidden) {
+		uiView.accessibilityTraits = UIAccessibilityTraitNone;
+
+		return;
+	}
+
+	// NOTE: left here for various core inspection passes while running the toolbox app
+	// console.log('--- Accessible element: ', view.constructor.name);
+	// console.log('accessibilityLabel: ', view.accessibilityLabel);
+	// console.log('accessibilityRole: ', accessibilityRole);
+	// console.log('accessibilityState: ', accessibilityState);
+	// console.log('accessibilityValue: ', view.accessibilityValue);
+
+	let a11yTraits = UIAccessibilityTraitNone;
+	if (RoleTypeMap.has(accessibilityRole)) {
+		a11yTraits |= RoleTypeMap.get(accessibilityRole);
+	}
+
+	switch (accessibilityRole) {
+		case AccessibilityRole.Checkbox:
+		case AccessibilityRole.RadioButton:
+		case AccessibilityRole.Switch: {
+			if (accessibilityState === AccessibilityState.Checked) {
+				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
+			}
+			break;
+		}
+		default: {
+			if (accessibilityState === AccessibilityState.Selected) {
+				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
+			}
+			if (accessibilityState === AccessibilityState.Disabled) {
+				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.NotEnabled);
+			}
+			break;
+		}
+	}
+
+	const UpdatesFrequentlyTrait = AccessibilityTraitsMap.get(AccessibilityTrait.UpdatesFrequently);
+
+	switch (view.accessibilityLiveRegion) {
+		case AccessibilityLiveRegion.Polite:
+		case AccessibilityLiveRegion.Assertive: {
+			a11yTraits |= UpdatesFrequentlyTrait;
+			break;
+		}
+		default: {
+			a11yTraits &= ~UpdatesFrequentlyTrait;
+			break;
+		}
+	}
+
+	// NOTE: left here for various core inspection passes while running the toolbox app
+	// if (view.accessibilityLiveRegion) {
+	// 	console.log('accessibilityLiveRegion:', view.accessibilityLiveRegion);
+	// }
+
+	if (view.accessibilityMediaSession) {
+		a11yTraits |= RoleTypeMap.get(AccessibilityRole.StartsMediaSession);
+	}
+
+	// NOTE: There were duplicated types in traits and roles previously which we conslidated
+	// not sure if this is still needed
+	// accessibilityTraits used to be stored on {N} view component but if the above
+	// is combining all traits fresh each time through, don't believe we need to keep track or previous traits
+	// if (view.accessibilityTraits) {
+	// 	a11yTraits |= inputArrayToBitMask(view.accessibilityTraits, AccessibilityTraitsMap);
+	// }
+
+	// NOTE: left here for various core inspection passes while running the toolbox app
+	// console.log('a11yTraits:', a11yTraits);
+	// console.log('    ');
+
+	uiView.accessibilityTraits = a11yTraits;
+}
+setA11yUpdatePropertiesCallback(updateAccessibilityProperties);
+
+export const sendAccessibilityEvent = (): void => {};
+export const updateContentDescription = (): void => null;
+
+let accessibilityServiceEnabled: boolean;
+let nativeObserver;
+export function isAccessibilityServiceEnabled(): boolean {
+	if (typeof accessibilityServiceEnabled === 'boolean') {
+		return accessibilityServiceEnabled;
+	}
+
+	let isVoiceOverRunning: () => boolean;
+	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
+		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
+	} else {
+		// iOS is too old to tell us if voice over is enabled
+		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
+			accessibilityServiceEnabled = false;
+			return accessibilityServiceEnabled;
+		}
+	}
+
+	accessibilityServiceEnabled = isVoiceOverRunning();
+
+	let voiceOverStatusChangedNotificationName: string | null = null;
+	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
+	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
+		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
+	}
+
+	if (voiceOverStatusChangedNotificationName) {
+		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
+			accessibilityServiceEnabled = isVoiceOverRunning();
+		});
+
+		Application.on(Application.exitEvent, () => {
+			if (nativeObserver) {
+				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
+			}
+
+			accessibilityServiceEnabled = undefined;
+			nativeObserver = null;
+		});
+	}
+
+	Application.on(Application.resumeEvent, () => {
+		accessibilityServiceEnabled = isVoiceOverRunning();
+	});
+
+	return accessibilityServiceEnabled;
+}
diff --git a/packages/core/accessibility/index.ts b/packages/core/accessibility/index.ts
deleted file mode 100644
index a6f49f8a7a..0000000000
--- a/packages/core/accessibility/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './accessibility-common';
diff --git a/packages/core/animation-frame/index.ts b/packages/core/animation-frame/index.ts
index 722f2e2f25..099bc5f980 100644
--- a/packages/core/animation-frame/index.ts
+++ b/packages/core/animation-frame/index.ts
@@ -2,6 +2,7 @@ import { queueMacrotask } from '../utils/macrotask-scheduler';
 import { FPSCallback } from '../fps-meter/fps-native';
 import { getTimeInFrameBase } from './animation-native';
 import { Trace } from '../trace';
+import { time } from '../profiling';
 
 export interface FrameRequestCallback {
 	(time: number): void;
@@ -56,8 +57,8 @@ function doCurrentFrame() {
 	callAnimationCallbacks(thisFrameCbs, lastFrameTime);
 }
 
-function doFrame(currentTimeMillis: number) {
-	lastFrameTime = currentTimeMillis;
+function doFrame(currentMonotonicTimeMs: number) {
+	lastFrameTime = currentMonotonicTimeMs;
 	shouldStop = true;
 	const thisFrameCbs = nextFrameAnimationCallbacks;
 	nextFrameAnimationCallbacks = {};
@@ -93,3 +94,15 @@ export function cancelAnimationFrame(id: number): void {
 	delete currentFrameAnimationCallbacks[id];
 	delete nextFrameAnimationCallbacks[id];
 }
+
+// ensure window exists and so does performances so that svelte and others work correctly
+if (!global.window) {
+	let window = global as any;
+	window.window = global;
+}
+
+if (!global.performance) {
+	global.performance = {
+		now: time,
+	} as any;
+}
diff --git a/packages/core/application-settings/index.android.ts b/packages/core/application-settings/index.android.ts
index f6b4576e1c..a60e39558e 100644
--- a/packages/core/application-settings/index.android.ts
+++ b/packages/core/application-settings/index.android.ts
@@ -1,10 +1,12 @@
 import * as common from './application-settings-common';
-import { getNativeApp } from '../application/helpers-common';
+import { Application, DiscardedErrorEventData } from '../application';
+import { wrapNativeException } from '../utils';
+import { getApplicationContext } from '../application/helpers.android';
 
 let sharedPreferences: android.content.SharedPreferences;
 function ensureSharedPreferences() {
 	if (!sharedPreferences) {
-		sharedPreferences = getNativeApp<android.app.Application>().getApplicationContext().getSharedPreferences('prefs.db', 0);
+		sharedPreferences = getApplicationContext().getSharedPreferences('prefs.db', 0);
 	}
 }
 
@@ -30,7 +32,16 @@ export function getBoolean(key: string, defaultValue?: boolean): boolean {
 		return;
 	}
 	if (hasKey(key)) {
-		return sharedPreferences.getBoolean(key, false);
+		try {
+			return sharedPreferences.getBoolean(key, false);
+		} catch (ex) {
+			Application.notify({
+				eventName: Application.uncaughtErrorEvent,
+				object: Application,
+				android: ex,
+				error: wrapNativeException(ex),
+			} as DiscardedErrorEventData);
+		}
 	}
 
 	return defaultValue;
@@ -41,7 +52,16 @@ export function getString(key: string, defaultValue?: string): string {
 		return;
 	}
 	if (hasKey(key)) {
-		return sharedPreferences.getString(key, '');
+		try {
+			return sharedPreferences.getString(key, '');
+		} catch (ex) {
+			Application.notify({
+				eventName: Application.uncaughtErrorEvent,
+				object: Application,
+				android: ex,
+				error: wrapNativeException(ex),
+			} as DiscardedErrorEventData);
+		}
 	}
 
 	return defaultValue;
@@ -58,11 +78,20 @@ export function getNumber(key: string, defaultValue?: number): number {
 		try {
 			val = sharedPreferences.getLong(key, long(0));
 		} catch (err) {
-			// If value is old, it might have been stored as a float so we store it anew as a long value to avoid errors
-			const oldVal = sharedPreferences.getFloat(key, float(0.0));
-			setNumber(key, oldVal);
-
-			val = sharedPreferences.getLong(key, long(0));
+			try {
+				// If value is old, it might have been stored as a float so we store it anew as a long value to avoid errors
+				const oldVal = sharedPreferences.getFloat(key, float(0.0));
+				setNumber(key, oldVal);
+
+				val = sharedPreferences.getLong(key, long(0));
+			} catch (ex) {
+				Application.notify({
+					eventName: Application.uncaughtErrorEvent,
+					object: Application,
+					android: ex,
+					error: wrapNativeException(ex),
+				} as DiscardedErrorEventData);
+			}
 		}
 		// SharedPreferences has no getter or setter for double so we retrieve value as a long and convert it to double
 		return java.lang.Double.longBitsToDouble(val);
@@ -130,8 +159,7 @@ export function flush(): boolean {
 }
 
 export function getAllKeys(): Array<string> {
-	ensureSharedPreferences();
-	const mappedPreferences = sharedPreferences.getAll();
+	const mappedPreferences = getNative().getAll();
 	const iterator = mappedPreferences.keySet().iterator();
 	const result = [];
 	while (iterator.hasNext()) {
@@ -141,3 +169,27 @@ export function getAllKeys(): Array<string> {
 
 	return result;
 }
+
+export function getAllJSON(ignoreRegexp?: string | RegExp) {
+	const mappedPreferences = getNative().getAll();
+	const iterator = mappedPreferences.keySet().iterator();
+
+	// we need to transform numbers which are stored as longBits
+	while (iterator.hasNext()) {
+		const key = iterator.next() as string;
+		if (ignoreRegexp && key.match(ignoreRegexp)) {
+			continue;
+		}
+		const value = mappedPreferences.get(key);
+		if (value instanceof java.lang.Long) {
+			mappedPreferences.put(key, java.lang.Double.valueOf(java.lang.Double.longBitsToDouble(value.longValue())));
+		}
+	}
+	const json = new org.json.JSONObject(mappedPreferences);
+	return json.toString();
+}
+
+export function getNative() {
+	ensureSharedPreferences();
+	return sharedPreferences;
+}
diff --git a/packages/core/application-settings/index.d.ts b/packages/core/application-settings/index.d.ts
index 083413926b..587dd3f5f6 100644
--- a/packages/core/application-settings/index.d.ts
+++ b/packages/core/application-settings/index.d.ts
@@ -68,3 +68,15 @@ export function flush(): boolean;
  * @return Array containing all stored keys
  */
 export function getAllKeys(): Array<string>;
+
+/**
+ * Get a JSON representation of all store dictionary
+ * @return JSON string representation
+ */
+export function getAllJSON(ignoreRegexp?: string | RegExp): string;
+
+/**
+ * Returns the native object handling shared preferences
+ * @return the native object android.content.SharedPreferences or NSUserDefaults
+ */
+export function getNative(): any;
diff --git a/packages/core/application-settings/index.ios.ts b/packages/core/application-settings/index.ios.ts
index e140ab5c04..7f76ef6721 100644
--- a/packages/core/application-settings/index.ios.ts
+++ b/packages/core/application-settings/index.ios.ts
@@ -95,3 +95,11 @@ export function flush(): boolean {
 export function getAllKeys(): Array<string> {
 	return utils.ios.collections.nsArrayToJSArray(userDefaults.dictionaryRepresentation().allKeys);
 }
+export function getAllJSON(ignoreRegexp?: string | RegExp): string {
+	//@ts-ignore
+	return NSApplicationSettings.userDefaultsToJSONStringWithIgnoreRegexp(typeof ignoreRegexp === 'string' ? ignoreRegexp : ignoreRegexp?.toString());
+}
+
+export function getNative() {
+	return userDefaults;
+}
diff --git a/packages/core/application/application-common.ts b/packages/core/application/application-common.ts
index 50b27b6f8d..1e75391646 100644
--- a/packages/core/application/application-common.ts
+++ b/packages/core/application/application-common.ts
@@ -12,7 +12,6 @@ import type { NavigationEntry } from '../ui/frame/frame-interfaces';
 import type { StyleScope } from '../ui/styling/style-scope';
 import type { AndroidApplication as AndroidApplicationType, iOSApplication as iOSApplicationType } from '.';
 import type { ApplicationEventData, CssChangedEventData, DiscardedErrorEventData, FontScaleChangedEventData, InitRootViewEventData, LaunchEventData, LoadAppCSSEventData, NativeScriptError, OrientationChangedEventData, SystemAppearanceChangedEventData, LayoutDirectionChangedEventData, UnhandledErrorEventData } from './application-interfaces';
-import { readyInitAccessibilityCssHelper, readyInitFontScale } from '../accessibility/accessibility-common';
 import { getAppMainEntry, isAppInBackground, setAppInBackground, setAppMainEntry } from './helpers-common';
 import { getNativeScriptGlobals } from '../globals/global-utils';
 import { SDK_VERSION } from '../utils/constants';
@@ -105,6 +104,7 @@ interface ApplicationEvents {
 	notify<T = ApplicationEventData>(eventData: T): void;
 	hasListeners(eventName: string): boolean;
 
+	once(eventNames: string, callback: (args: ApplicationEventData) => void, thisArg?: any): void;
 	on(eventNames: string, callback: (args: ApplicationEventData) => void, thisArg?: any): void;
 	/**
 	 * This event is raised when application css is changed.
@@ -223,8 +223,8 @@ export class ApplicationCommon {
 
 	// Application events go through the global events.
 	on: ApplicationEvents['on'] = globalEvents.on.bind(globalEvents);
-	once: ApplicationEvents['on'] = globalEvents.once.bind(globalEvents);
 	off: ApplicationEvents['off'] = globalEvents.off.bind(globalEvents);
+	once: ApplicationEvents['once'] = globalEvents.once.bind(globalEvents);
 	notify: ApplicationEvents['notify'] = globalEvents.notify.bind(globalEvents);
 	hasListeners: ApplicationEvents['hasListeners'] = globalEvents.hasListeners.bind(globalEvents);
 
@@ -336,7 +336,7 @@ export class ApplicationCommon {
 		rootView.cssClasses.delete(cssClass);
 	}
 
-	private increaseStyleScopeApplicationCssSelectorVersion(rootView: View) {
+	public increaseStyleScopeApplicationCssSelectorVersion(rootView: View) {
 		const styleScope: StyleScope = rootView._styleScope ?? (rootView as Frame)?.currentPage?._styleScope;
 
 		if (styleScope) {
@@ -375,6 +375,8 @@ export class ApplicationCommon {
 		const rootViewCssClasses = CSSUtils.getSystemCssClasses();
 		rootViewCssClasses.forEach((c) => rootView.cssClasses.add(c));
 
+		initializeSdkVersionClass(rootView);
+		
 		this.increaseStyleScopeApplicationCssSelectorVersion(rootView);
 		rootView._onCssStateChange();
 
@@ -461,8 +463,8 @@ export class ApplicationCommon {
 
 	initRootView(rootView: View) {
 		this.setRootViewCSSClasses(rootView);
-		readyInitAccessibilityCssHelper();
-		readyInitFontScale();
+		// ensure css is "loaded" on the rootview so that user rootview can access css variables right away
+		rootView._onCssStateChange(true);
 		this.notify(<InitRootViewEventData>{ eventName: this.initRootViewEvent, rootView });
 	}
 
@@ -544,7 +546,7 @@ export class ApplicationCommon {
 		throw new Error('getOrientation() not implemented');
 	}
 
-	protected setOrientation(value: 'portrait' | 'landscape' | 'unknown') {
+	protected setOrientation(value: 'portrait' | 'landscape' | 'unknown', degrees?: number) {
 		if (this._orientation === value) {
 			return;
 		}
@@ -561,6 +563,7 @@ export class ApplicationCommon {
 			android: this.android,
 			ios: this.ios,
 			newValue: value,
+			degrees,
 			object: this,
 		});
 	}
@@ -608,14 +611,18 @@ export class ApplicationCommon {
 			return;
 		}
 		this._systemAppearance = value;
-		this.systemAppearanceChanged(this.getRootView(), value);
-		this.notify(<SystemAppearanceChangedEventData>{
+		const args = <SystemAppearanceChangedEventData>{
 			eventName: this.systemAppearanceChangedEvent,
 			android: this.android,
 			ios: this.ios,
 			newValue: value,
+			cancel: false,
 			object: this,
-		});
+		};
+		this.notify(args);
+		if (args.cancel === false) {
+			this.systemAppearanceChanged(this.getRootView(), value);
+		}
 	}
 
 	systemAppearance(): 'dark' | 'light' | null {
diff --git a/packages/core/application/application-interfaces.ts b/packages/core/application/application-interfaces.ts
index f597a63bd5..5953bc36b5 100644
--- a/packages/core/application/application-interfaces.ts
+++ b/packages/core/application/application-interfaces.ts
@@ -1,5 +1,6 @@
 import type { EventData, Observable } from '../data/observable';
 import type { View } from '../ui/core/view';
+import type { ApplicationCommon } from './application-common';
 import type { CoreTypes } from '../core-types';
 
 /**
@@ -23,7 +24,7 @@ export interface NativeScriptError extends Error {
 /**
  * Event data containing information for the application events.
  */
-export interface ApplicationEventData {
+export interface ApplicationEventData extends EventData {
 	/**
 	 * The name of the event.
 	 */
@@ -42,13 +43,14 @@ export interface ApplicationEventData {
 	/**
 	 * The instance that has raised the event.
 	 */
-	object: any; // Application;
+	// TODO: find a way to do object: ApplicationCommon | Observable;
+	object?: any; // Application
 }
 
 /**
  * Event data containing information for launch event.
  */
-export interface LaunchEventData extends EventData {
+export interface LaunchEventData extends EventData<ApplicationCommon> {
 	/**
 	 * The root view for this Window on iOS or Activity for Android.
 	 * If not set a new Frame will be created as a root view in order to maintain backwards compatibility.
@@ -71,6 +73,11 @@ export interface OrientationChangedEventData extends ApplicationEventData {
 	 * New orientation value.
 	 */
 	newValue: 'portrait' | 'landscape' | 'unknown';
+
+	/**
+	 * current device rotation in degrees.
+	 */
+	degrees?: number;
 }
 
 /**
@@ -81,6 +88,7 @@ export interface SystemAppearanceChangedEventData extends ApplicationEventData {
 	 * New system appearance value.
 	 */
 	newValue: 'light' | 'dark';
+	cancel: boolean;
 }
 
 /**
@@ -137,21 +145,11 @@ export interface InitRootViewEventData extends ApplicationEventData {
 /**
  * Data for the Android activity events.
  */
-export interface AndroidActivityEventData {
+export interface AndroidActivityEventData extends ApplicationEventData {
 	/**
 	 * The activity.
 	 */
-	activity: androidx.appcompat.app.AppCompatActivity;
-
-	/**
-	 * The name of the event.
-	 */
-	eventName: string;
-
-	/**
-	 * The instance that has raised the event.
-	 */
-	object: any;
+	activity?: androidx.appcompat.app.AppCompatActivity;
 }
 
 /**
@@ -161,7 +159,7 @@ export interface AndroidActivityBundleEventData extends AndroidActivityEventData
 	/**
 	 * The bundle.
 	 */
-	bundle: android.os.Bundle;
+	bundle?: android.os.Bundle;
 }
 
 /**
@@ -171,17 +169,17 @@ export interface AndroidActivityRequestPermissionsEventData extends AndroidActiv
 	/**
 	 * The request code.
 	 */
-	requestCode: number;
+	requestCode?: number;
 
 	/**
 	 * The Permissions.
 	 */
-	permissions: Array<string>;
+	permissions?: Array<string>;
 
 	/**
 	 * The Granted.
 	 */
-	grantResults: Array<number>;
+	grantResults?: Array<number>;
 }
 
 /**
@@ -191,17 +189,17 @@ export interface AndroidActivityResultEventData extends AndroidActivityEventData
 	/**
 	 * The request code.
 	 */
-	requestCode: number;
+	requestCode?: number;
 
 	/**
 	 * The result code.
 	 */
-	resultCode: number;
+	resultCode?: number;
 
 	/**
 	 * The intent.
 	 */
-	intent: android.content.Intent;
+	intent?: android.content.Intent;
 }
 
 /**
@@ -211,7 +209,7 @@ export interface AndroidActivityNewIntentEventData extends AndroidActivityEventD
 	/**
 	 * The intent.
 	 */
-	intent: any /* android.content.Intent */;
+	intent?: any /* android.content.Intent */;
 }
 
 /**
@@ -221,13 +219,51 @@ export interface AndroidActivityBackPressedEventData extends AndroidActivityEven
 	/**
 	 * In the event handler, set this value to true if you want to cancel the back navigation and do something else instead.
 	 */
-	cancel: boolean;
+	cancel?: boolean;
 }
 
 export interface LoadAppCSSEventData extends ApplicationEventData {
 	cssFile: string;
 }
 
+/**
+ * Data for the Android dialog fragment onCreateView event.
+ */
+export interface AndroidDialogFragmentOnCreateViewEventData extends ApplicationEventData {
+	/**
+	 * The name of the event.
+	 */
+	eventName: string;
+
+	/**
+	 * Gets the window of the created dialog_min_width_major
+	 */
+	window?: any; // android.view.Window;
+	/**
+	 * Gets native dialog
+	 */
+	dialog?: any; // AndroidApplication;
+}
+
+/**
+ * Data for the Android onConfigurationChange event.
+ */
+export interface AndroidConfigurationChangeEventData extends ApplicationEventData {
+	/**
+	 * The name of the event.
+	 */
+	eventName: string;
+
+	/**
+	 * Gets the configuration from the event
+	 */
+	config?: any; // android.content.res.Configuration;
+	/**
+	 * Gets the diff from the previous configuration
+	 */
+	diff?: number;
+}
+
 /**
  * iOS Event data containing information for scene lifecycle events (iOS 13+).
  */
diff --git a/packages/core/application/application.android.ts b/packages/core/application/application.android.ts
index b3f6edc7cf..da5a70ec6c 100644
--- a/packages/core/application/application.android.ts
+++ b/packages/core/application/application.android.ts
@@ -1,48 +1,14 @@
+import * as ApplicationSettings from '../application-settings';
 import { CoreTypes } from '../core-types';
 import { profile } from '../profiling';
 import type { View } from '../ui/core/view';
 import { AndroidActivityCallbacks, NavigationEntry } from '../ui/frame/frame-common';
 import { SDK_VERSION } from '../utils/constants';
-import { android as androidUtils } from '../utils';
-import { ApplicationCommon, initializeSdkVersionClass } from './application-common';
-import type { AndroidActivityBundleEventData, AndroidActivityEventData, ApplicationEventData } from './application-interfaces';
-import { Observable } from '../data/observable';
-import { Trace } from '../trace';
-import {
-	CommonA11YServiceEnabledObservable,
-	SharedA11YObservable,
-	notifyAccessibilityFocusState,
-	a11yServiceClasses,
-	a11yServiceDisabledClass,
-	a11yServiceEnabledClass,
-	fontScaleCategoryClasses,
-	fontScaleExtraLargeCategoryClass,
-	fontScaleExtraSmallCategoryClass,
-	fontScaleMediumCategoryClass,
-	getCurrentA11YServiceClass,
-	getCurrentFontScaleCategory,
-	getCurrentFontScaleClass,
-	getFontScaleCssClasses,
-	setCurrentA11YServiceClass,
-	setCurrentFontScaleCategory,
-	setCurrentFontScaleClass,
-	setFontScaleCssClasses,
-	setFontScale,
-	getFontScale,
-	setInitFontScale,
-	getFontScaleCategory,
-	setInitAccessibilityCssHelper,
-	FontScaleCategory,
-	getClosestValidFontScale,
-	VALID_FONT_SCALES,
-	AccessibilityRole,
-	AccessibilityState,
-	AndroidAccessibilityEvent,
-	isA11yEnabled,
-	setA11yEnabled,
-} from '../accessibility/accessibility-common';
-import { androidGetForegroundActivity, androidGetStartActivity, androidSetForegroundActivity, androidSetStartActivity, applyContentDescription } from './helpers';
-import { getImageFetcher, getNativeApp, getRootView, initImageCache, setA11yUpdatePropertiesCallback, setApplicationPropertiesCallback, setAppMainEntry, setNativeApp, setRootView, setToggleApplicationEventListenersCallback } from './helpers-common';
+import { ApplicationCommon } from './application-common';
+import type { AndroidActivityBundleEventData, AndroidActivityEventData, AndroidConfigurationChangeEventData, ApplicationEventData } from './application-interfaces';
+import { fontScaleChanged } from '../accessibility/font-scale.android';
+import { androidGetForegroundActivity, androidGetStartActivity, androidSetForegroundActivity, androidSetStartActivity } from './helpers';
+import { getImageFetcher, getNativeApp, getRootView, initImageCache, setApplicationPropertiesCallback, setAppMainEntry, setNativeApp, setRootView, setToggleApplicationEventListenersCallback } from './helpers-common';
 import { getNativeScriptGlobals } from '../globals/global-utils';
 import type { AndroidApplication as IAndroidApplication } from './application';
 import lazy from '../utils/lazy';
@@ -58,7 +24,7 @@ function initNativeScriptLifecycleCallbacks() {
 	@NativeClass
 	@JavaProxy('org.nativescript.NativeScriptLifecycleCallbacks')
 	class NativeScriptLifecycleCallbacksImpl extends android.app.Application.ActivityLifecycleCallbacks {
-		private activitiesCount: number = 0;
+		private activitiesCount: number;
 		private nativescriptActivity: androidx.appcompat.app.AppCompatActivity;
 
 		@profile
@@ -69,6 +35,9 @@ function initNativeScriptLifecycleCallbacks() {
 			if (!Application.android.startActivity) {
 				Application.android.setStartActivity(activity);
 			}
+			if (!Application.android.foregroundActivity) {
+				Application.android.setForegroundActivity(activity);
+			}
 
 			if (!this.nativescriptActivity && 'isNativeScriptActivity' in activity) {
 				this.nativescriptActivity = activity;
@@ -160,7 +129,7 @@ function initNativeScriptLifecycleCallbacks() {
 		public onActivityStarted(activity: androidx.appcompat.app.AppCompatActivity): void {
 			// console.log('NativeScriptLifecycleCallbacks onActivityStarted');
 
-			this.activitiesCount++;
+			this.activitiesCount = (this.activitiesCount ?? 0) + 1;
 			if (this.activitiesCount === 1) {
 				Application.android.setInBackground(false, {
 					// todo: deprecate event.android in favor of event.activity
@@ -198,13 +167,16 @@ function initNativeScriptLifecycleCallbacks() {
 		@profile
 		setThemeOnLaunch(activity: androidx.appcompat.app.AppCompatActivity) {
 			// Set app theme after launch screen was used during startup
-			const activityInfo = activity.getPackageManager().getActivityInfo(activity.getComponentName(), android.content.pm.PackageManager.GET_META_DATA);
-			if (activityInfo.metaData) {
-				const setThemeOnLaunch = activityInfo.metaData.getInt('SET_THEME_ON_LAUNCH', -1);
-				if (setThemeOnLaunch !== -1) {
-					activity.setTheme(setThemeOnLaunch);
+			let setThemeOnLaunch = ApplicationSettings.getNumber('SET_THEME_ON_LAUNCH', -1);
+			if (setThemeOnLaunch === -1) {
+				const activityInfo = activity.getPackageManager().getActivityInfo(activity.getComponentName(), android.content.pm.PackageManager.GET_META_DATA);
+				if (activityInfo.metaData) {
+					setThemeOnLaunch = activityInfo.metaData.getInt('SET_THEME_ON_LAUNCH', -1);
 				}
 			}
+			if (setThemeOnLaunch !== -1) {
+				activity.setTheme(setThemeOnLaunch);
+			}
 		}
 
 		@profile
@@ -308,7 +280,9 @@ const BroadcastReceiver = lazy(() => {
 	return BroadcastReceiverImpl;
 });
 
-export class AndroidApplication extends ApplicationCommon implements IAndroidApplication {
+export class AndroidApplication extends ApplicationCommon {
+	static readonly fragmentCreateEvent = 'fragmentCreate';
+	static readonly activityCreateEvent = 'activityCreate';
 	static readonly activityCreatedEvent = 'activityCreated';
 	static readonly activityDestroyedEvent = 'activityDestroyed';
 	static readonly activityStartedEvent = 'activityStarted';
@@ -320,7 +294,11 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 	static readonly activityBackPressedEvent = 'activityBackPressed';
 	static readonly activityNewIntentEvent = 'activityNewIntent';
 	static readonly activityRequestPermissionsEvent = 'activityRequestPermissions';
+	static readonly dialogOnCreateViewEvent = 'dialogOnCreateView';
+	static readonly configurationChangeEvent = 'configurationChange';
 
+	readonly fragmentCreateEvent = AndroidApplication.fragmentCreateEvent;
+	readonly activityCreateEvent = AndroidApplication.activityCreateEvent;
 	readonly activityCreatedEvent = AndroidApplication.activityCreatedEvent;
 	readonly activityDestroyedEvent = AndroidApplication.activityDestroyedEvent;
 	readonly activityStartedEvent = AndroidApplication.activityStartedEvent;
@@ -332,6 +310,8 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 	readonly activityBackPressedEvent = AndroidApplication.activityBackPressedEvent;
 	readonly activityNewIntentEvent = AndroidApplication.activityNewIntentEvent;
 	readonly activityRequestPermissionsEvent = AndroidApplication.activityRequestPermissionsEvent;
+	readonly dialogOnCreateViewEvent = AndroidApplication.activityRequestPermissionsEvent;
+	readonly configurationChangeEvent = AndroidApplication.activityRequestPermissionsEvent;
 
 	private _nativeApp: android.app.Application;
 	private _context: android.content.Context;
@@ -342,7 +322,7 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 	private componentCallbacks: NativeScriptComponentCallbacks;
 
 	init(nativeApp: android.app.Application): void {
-		if (this.nativeApp === nativeApp) {
+		if (!nativeApp || this.nativeApp === nativeApp) {
 			return;
 		}
 
@@ -350,19 +330,24 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 			throw new Error('Application.android already initialized.');
 		}
 
-		this._nativeApp = nativeApp;
-		setNativeApp(nativeApp);
-		this._context = nativeApp.getApplicationContext();
-		this._packageName = nativeApp.getPackageName();
+		try {
+			this._nativeApp = nativeApp;
+			setNativeApp(nativeApp);
+			this._context = nativeApp.getApplicationContext();
+			this._prevConfiguration = new android.content.res.Configuration(this._context.getResources().getConfiguration());
+			this._packageName = nativeApp.getPackageName();
 
-		// we store those callbacks and add a function for clearing them later so that the objects will be eligable for GC
-		this.lifecycleCallbacks = new (initNativeScriptLifecycleCallbacks())();
-		this.nativeApp.registerActivityLifecycleCallbacks(this.lifecycleCallbacks);
+			// we store those callbacks and add a function for clearing them later so that the objects will be eligable for GC
+			this.lifecycleCallbacks = new (initNativeScriptLifecycleCallbacks())();
+			this.nativeApp.registerActivityLifecycleCallbacks(this.lifecycleCallbacks);
 
-		this.componentCallbacks = new (initNativeScriptComponentCallbacks())();
-		this.nativeApp.registerComponentCallbacks(this.componentCallbacks);
+			this.componentCallbacks = new (initNativeScriptComponentCallbacks())();
+			this.nativeApp.registerComponentCallbacks(this.componentCallbacks);
 
-		this._registerPendingReceivers();
+			this._registerPendingReceivers();
+		} catch (err) {
+			console.error('Error initializing AndroidApplication', err, err.stack);
+		}
 	}
 	private _registeredReceivers: Record<string, RegisteredReceiverInfo[]> = {};
 	private _registeredReceiversById: Record<number, RegisteredReceiverInfo> = {};
@@ -372,11 +357,42 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 		this._pendingReceiverRegistrations.forEach((info) => this._registerReceiver(this.context, info.intent, info.callback, info.flags, info.id));
 		this._pendingReceiverRegistrations.length = 0;
 	}
-
+	private _prevConfiguration: android.content.res.Configuration;
 	onConfigurationChanged(configuration: android.content.res.Configuration): void {
-		this.setOrientation(this.getOrientationValue(configuration));
-		this.setSystemAppearance(this.getSystemAppearanceValue(configuration));
-		this.setLayoutDirection(this.getLayoutDirectionValue(configuration));
+		const diff = configuration.diff(this._prevConfiguration);
+
+		if ((diff & 128) /* ActivityInfo.CONFIG_ORIENTATION */ !== 0) {
+			const nativeApp = Application.android.getNativeApplication();
+			const screenOrientation = (nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE) as android.view.WindowManager).getDefaultDisplay().getRotation();
+			let degrees = 0;
+			switch (screenOrientation) {
+				case 1 /* android.view.Surface.ROTATION_90 */:
+					degrees = 90;
+					break;
+				case 2 /* android.view.Surface.ROTATION_180 */:
+					degrees = 180;
+					break;
+				case 3 /* android.view.Surface.ROTATION_270 */:
+					degrees = 270;
+					break;
+				default:
+					break;
+			}
+			this.setOrientation(this.getOrientationValue(configuration), degrees);
+		}
+		if ((diff & 512) /* ActivityInfo.CONFIG_UI_MODE */ !== 0) {
+			this.setSystemAppearance(this.getSystemAppearanceValue(configuration));
+		}
+		if ((diff &  1073741824) /* ActivityInfo.CONFIG_FONT_SCALE */ !== 0) {
+			fontScaleChanged(Number(configuration.fontScale));
+			
+		}
+		if ((diff &   8192) /* ActivityInfo.CONFIG_LAYOUT_DIRECTION */ !== 0) {
+			this.setLayoutDirection(this.getLayoutDirectionValue(configuration));
+		}
+		this.notify(<AndroidConfigurationChangeEventData>{ eventName: this.configurationChangeEvent, configuration, diff });
+		this._prevConfiguration = new android.content.res.Configuration(configuration);
+
 	}
 
 	getNativeApplication() {
@@ -514,7 +530,7 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 		return [];
 	}
 	getRootView(): View {
-		const activity = this.foregroundActivity || this.startActivity;
+		const activity = this.startActivity;
 		if (!activity) {
 			return undefined;
 		}
@@ -527,7 +543,7 @@ export class AndroidApplication extends ApplicationCommon implements IAndroidApp
 	resetRootView(entry?: NavigationEntry | string): void {
 		super.resetRootView(entry);
 
-		const activity = this.foregroundActivity || this.startActivity;
+		const activity = this.startActivity;
 		if (!activity) {
 			throw new Error('Cannot find android activity.');
 		}
@@ -604,848 +620,6 @@ export * from './application-common';
 export const Application = new AndroidApplication();
 export const iOSApplication = undefined;
 
-function fontScaleChanged(origFontScale: number) {
-	const oldValue = getFontScale();
-	setFontScale(getClosestValidFontScale(origFontScale));
-	const currentFontScale = getFontScale();
-
-	if (oldValue !== currentFontScale) {
-		Application.notify({
-			eventName: Application.fontScaleChangedEvent,
-			object: Application,
-			newValue: currentFontScale,
-		} as ApplicationEventData);
-	}
-}
-
-export function getCurrentFontScale(): number {
-	setupConfigListener();
-
-	return getFontScale();
-}
-
-function useAndroidFontScale() {
-	fontScaleChanged(Number(Application.android.context.getResources().getConfiguration().fontScale));
-}
-
-let configChangedCallback: android.content.ComponentCallbacks2;
-function setupConfigListener() {
-	if (configChangedCallback) {
-		return;
-	}
-
-	Application.off(Application.launchEvent, setupConfigListener);
-	const context = Application.android?.context as android.content.Context;
-	if (!context) {
-		Application.on(Application.launchEvent, setupConfigListener);
-
-		return;
-	}
-
-	useAndroidFontScale();
-
-	configChangedCallback = new android.content.ComponentCallbacks2({
-		onLowMemory() {
-			// Dummy
-		},
-		onTrimMemory() {
-			// Dummy
-		},
-		onConfigurationChanged(newConfig: android.content.res.Configuration) {
-			fontScaleChanged(Number(newConfig.fontScale));
-		},
-	});
-
-	context.registerComponentCallbacks(configChangedCallback);
-	Application.on(Application.resumeEvent, useAndroidFontScale);
-}
-
-setInitFontScale(setupConfigListener);
-
-function applyRootCssClass(cssClasses: string[], newCssClass: string): void {
-	const rootView = Application.getRootView();
-	if (!rootView) {
-		return;
-	}
-
-	Application.applyCssClass(rootView, cssClasses, newCssClass);
-
-	const rootModalViews = <Array<View>>rootView._getRootModalViews();
-	rootModalViews.forEach((rootModalView) => Application.applyCssClass(rootModalView, cssClasses, newCssClass));
-}
-
-function applyFontScaleToRootViews(): void {
-	const rootView = Application.getRootView();
-	if (!rootView) {
-		return;
-	}
-
-	const fontScale = getCurrentFontScale();
-
-	rootView.style.fontScaleInternal = fontScale;
-
-	const rootModalViews = <Array<View>>rootView._getRootModalViews();
-	rootModalViews.forEach((rootModalView) => (rootModalView.style.fontScaleInternal = fontScale));
-}
-
-export function getAndroidAccessibilityManager(): android.view.accessibility.AccessibilityManager | null {
-	const context = getNativeApp<android.app.Application>().getApplicationContext() as android.content.Context;
-	if (!context) {
-		return null;
-	}
-
-	return context.getSystemService(android.content.Context.ACCESSIBILITY_SERVICE) as android.view.accessibility.AccessibilityManager;
-}
-
-const accessibilityStateEnabledPropName = 'accessibilityStateEnabled';
-const touchExplorationStateEnabledPropName = 'touchExplorationStateEnabled';
-
-class AndroidSharedA11YObservable extends SharedA11YObservable {
-	[accessibilityStateEnabledPropName]: boolean;
-	[touchExplorationStateEnabledPropName]: boolean;
-
-	// @ts-ignore todo: fix
-	get accessibilityServiceEnabled(): boolean {
-		return !!this[accessibilityStateEnabledPropName] && !!this[touchExplorationStateEnabledPropName];
-	}
-
-	set accessibilityServiceEnabled(v) {
-		return;
-	}
-}
-
-let accessibilityStateChangeListener: android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
-let touchExplorationStateChangeListener: android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
-let sharedA11YObservable: AndroidSharedA11YObservable;
-
-function updateAccessibilityState(): void {
-	const accessibilityManager = getAndroidAccessibilityManager();
-	if (!accessibilityManager) {
-		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
-		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
-
-		return;
-	}
-
-	sharedA11YObservable.set(accessibilityStateEnabledPropName, !!accessibilityManager.isEnabled());
-	sharedA11YObservable.set(touchExplorationStateEnabledPropName, !!accessibilityManager.isTouchExplorationEnabled());
-}
-
-function ensureStateListener(): SharedA11YObservable {
-	if (sharedA11YObservable) {
-		return sharedA11YObservable;
-	}
-
-	const accessibilityManager = getAndroidAccessibilityManager();
-	sharedA11YObservable = new AndroidSharedA11YObservable();
-
-	if (!accessibilityManager) {
-		sharedA11YObservable.set(accessibilityStateEnabledPropName, false);
-		sharedA11YObservable.set(touchExplorationStateEnabledPropName, false);
-
-		return sharedA11YObservable;
-	}
-
-	accessibilityStateChangeListener = new android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener({
-		onAccessibilityStateChanged(enabled) {
-			updateAccessibilityState();
-
-			if (Trace.isEnabled()) {
-				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-			}
-		},
-	});
-	accessibilityManager.addAccessibilityStateChangeListener(accessibilityStateChangeListener);
-
-	if (SDK_VERSION >= 19) {
-		touchExplorationStateChangeListener = new android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener({
-			onTouchExplorationStateChanged(enabled) {
-				updateAccessibilityState();
-
-				if (Trace.isEnabled()) {
-					Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-				}
-			},
-		});
-		accessibilityManager.addTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
-	}
-
-	updateAccessibilityState();
-
-	Application.on(Application.resumeEvent, updateAccessibilityState);
-	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
-		const activity = args.android as android.app.Activity;
-		if (activity && !activity.isFinishing()) {
-			return;
-		}
-
-		const accessibilityManager = getAndroidAccessibilityManager();
-		if (accessibilityManager) {
-			if (accessibilityStateChangeListener) {
-				accessibilityManager.removeAccessibilityStateChangeListener(accessibilityStateChangeListener);
-			}
-
-			if (touchExplorationStateChangeListener) {
-				accessibilityManager.removeTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
-			}
-		}
-
-		accessibilityStateChangeListener = null;
-		touchExplorationStateChangeListener = null;
-
-		if (sharedA11YObservable) {
-			sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
-			sharedA11YObservable = null;
-		}
-
-		Application.off(Application.resumeEvent, updateAccessibilityState);
-	});
-
-	return sharedA11YObservable;
-}
-
-export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
-	constructor() {
-		super(ensureStateListener());
-	}
-}
-
-let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
-export function ensureClasses() {
-	if (accessibilityServiceObservable) {
-		return;
-	}
-
-	setFontScaleCssClasses(new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`])));
-
-	accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();
-
-	// Initialize SDK version CSS class once
-	initializeSdkVersionClass(Application.getRootView());
-}
-
-export function updateCurrentHelperClasses(applyRootCssClass: (cssClasses: string[], newCssClass: string) => void): void {
-	const fontScale = getFontScale();
-	const fontScaleCategory = getFontScaleCategory();
-	const fontScaleCssClasses = getFontScaleCssClasses();
-	const oldFontScaleClass = getCurrentFontScaleClass();
-	if (fontScaleCssClasses.has(fontScale)) {
-		setCurrentFontScaleClass(fontScaleCssClasses.get(fontScale));
-	} else {
-		setCurrentFontScaleClass(fontScaleCssClasses.get(1));
-	}
-
-	if (oldFontScaleClass !== getCurrentFontScaleClass()) {
-		applyRootCssClass([...fontScaleCssClasses.values()], getCurrentFontScaleClass());
-	}
-
-	const oldActiveFontScaleCategory = getCurrentFontScaleCategory();
-	switch (fontScaleCategory) {
-		case FontScaleCategory.ExtraSmall: {
-			setCurrentFontScaleCategory(fontScaleExtraSmallCategoryClass);
-			break;
-		}
-		case FontScaleCategory.Medium: {
-			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
-			break;
-		}
-		case FontScaleCategory.ExtraLarge: {
-			setCurrentFontScaleCategory(fontScaleExtraLargeCategoryClass);
-			break;
-		}
-		default: {
-			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
-			break;
-		}
-	}
-
-	if (oldActiveFontScaleCategory !== getCurrentFontScaleCategory()) {
-		applyRootCssClass(fontScaleCategoryClasses, getCurrentFontScaleCategory());
-	}
-
-	const oldA11YStatusClass = getCurrentA11YServiceClass();
-	if (accessibilityServiceObservable.accessibilityServiceEnabled) {
-		setCurrentA11YServiceClass(a11yServiceEnabledClass);
-	} else {
-		setCurrentA11YServiceClass(a11yServiceDisabledClass);
-	}
-
-	if (oldA11YStatusClass !== getCurrentA11YServiceClass()) {
-		applyRootCssClass(a11yServiceClasses, getCurrentA11YServiceClass());
-	}
-}
-
-export function initAccessibilityCssHelper(): void {
-	ensureClasses();
-
-	Application.on(Application.fontScaleChangedEvent, () => {
-		updateCurrentHelperClasses(applyRootCssClass);
-		applyFontScaleToRootViews();
-	});
-
-	accessibilityServiceObservable.on(AccessibilityServiceEnabledObservable.propertyChangeEvent, () => updateCurrentHelperClasses(applyRootCssClass));
-}
-setInitAccessibilityCssHelper(initAccessibilityCssHelper);
-
-let clickableRolesMap = new Set<string>();
-
-let lastFocusedView: WeakRef<View>;
-function accessibilityEventHelper(view: View, eventType: number) {
-	const eventName = accessibilityEventTypeMap.get(eventType);
-	if (!isAccessibilityServiceEnabled()) {
-		if (Trace.isEnabled()) {
-			Trace.write(`accessibilityEventHelper: Service not active`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!eventName) {
-		Trace.write(`accessibilityEventHelper: unknown eventType: ${eventType}`, Trace.categories.Accessibility, Trace.messageType.error);
-
-		return;
-	}
-
-	if (!view) {
-		if (Trace.isEnabled()) {
-			Trace.write(`accessibilityEventHelper: no owner: ${eventName}`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	const androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView) {
-		if (Trace.isEnabled()) {
-			Trace.write(`accessibilityEventHelper: no nativeView`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	switch (eventType) {
-		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED: {
-			/**
-			 * Android API >= 26 handles accessibility tap-events by converting them to TYPE_VIEW_CLICKED
-			 * These aren't triggered for custom tap events in NativeScript.
-			 */
-			if (SDK_VERSION >= 26) {
-				// Find all tap gestures and trigger them.
-				for (const tapGesture of view.getGestureObservers(1) ?? []) {
-					tapGesture.callback({
-						android: view.android,
-						eventName: 'tap',
-						ios: null,
-						object: view,
-						type: 1,
-						view: view,
-					});
-				}
-			}
-
-			return;
-		}
-		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED: {
-			const lastView = lastFocusedView?.get();
-			if (lastView && view !== lastView) {
-				const lastAndroidView = lastView.nativeViewProtected as android.view.View;
-				if (lastAndroidView) {
-					lastAndroidView.clearFocus();
-					lastFocusedView = null;
-
-					notifyAccessibilityFocusState(lastView, false, true);
-				}
-			}
-
-			lastFocusedView = new WeakRef(view);
-
-			notifyAccessibilityFocusState(view, true, false);
-
-			return;
-		}
-		case android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED: {
-			const lastView = lastFocusedView?.get();
-			if (lastView && view === lastView) {
-				lastFocusedView = null;
-				androidView.clearFocus();
-			}
-
-			notifyAccessibilityFocusState(view, false, true);
-
-			return;
-		}
-	}
-}
-
-let TNSAccessibilityDelegate: android.view.View.androidviewViewAccessibilityDelegate;
-
-const androidViewToTNSView = new WeakMap<android.view.View, WeakRef<View>>();
-
-let accessibilityEventMap: Map<AndroidAccessibilityEvent, number>;
-let accessibilityEventTypeMap: Map<number, string>;
-
-function ensureNativeClasses() {
-	if (TNSAccessibilityDelegate) {
-		return;
-	}
-
-	// WORKAROUND: Typing refers to android.view.View.androidviewViewAccessibilityDelegate but it is called android.view.View.AccessibilityDelegate at runtime
-	const AccessibilityDelegate: typeof android.view.View.androidviewViewAccessibilityDelegate = android.view.View['AccessibilityDelegate'];
-
-	const RoleTypeMap = new Map<AccessibilityRole, string>([
-		[AccessibilityRole.Button, android.widget.Button.class.getName()],
-		[AccessibilityRole.Search, android.widget.EditText.class.getName()],
-		[AccessibilityRole.Image, android.widget.ImageView.class.getName()],
-		[AccessibilityRole.ImageButton, android.widget.ImageButton.class.getName()],
-		[AccessibilityRole.KeyboardKey, android.inputmethodservice.Keyboard.Key.class.getName()],
-		[AccessibilityRole.StaticText, android.widget.TextView.class.getName()],
-		[AccessibilityRole.Adjustable, android.widget.SeekBar.class.getName()],
-		[AccessibilityRole.Checkbox, android.widget.CheckBox.class.getName()],
-		[AccessibilityRole.RadioButton, android.widget.RadioButton.class.getName()],
-		[AccessibilityRole.SpinButton, android.widget.Spinner.class.getName()],
-		[AccessibilityRole.Switch, android.widget.Switch.class.getName()],
-		[AccessibilityRole.ProgressBar, android.widget.ProgressBar.class.getName()],
-	]);
-
-	clickableRolesMap = new Set<string>([AccessibilityRole.Button, AccessibilityRole.ImageButton]);
-
-	const ignoreRoleTypesForTrace = new Set([AccessibilityRole.Header, AccessibilityRole.Link, AccessibilityRole.None, AccessibilityRole.Summary]);
-
-	@NativeClass()
-	class TNSAccessibilityDelegateImpl extends AccessibilityDelegate {
-		constructor() {
-			super();
-
-			return global.__native(this);
-		}
-
-		private getTnsView(androidView: android.view.View) {
-			const view = androidViewToTNSView.get(androidView)?.get();
-			if (!view) {
-				androidViewToTNSView.delete(androidView);
-
-				return null;
-			}
-
-			return view;
-		}
-
-		public onInitializeAccessibilityNodeInfo(host: android.view.View, info: android.view.accessibility.AccessibilityNodeInfo) {
-			super.onInitializeAccessibilityNodeInfo(host, info);
-
-			const view = this.getTnsView(host);
-			if (!view) {
-				if (Trace.isEnabled()) {
-					Trace.write(`onInitializeAccessibilityNodeInfo ${host} ${info} no tns-view`, Trace.categories.Accessibility);
-				}
-
-				return;
-			}
-
-			// Set resource id that can be used with test frameworks without polluting the content description.
-			const id = host.getTag(androidUtils.resources.getId(`:id/nativescript_accessibility_id`));
-			if (id != null) {
-				info.setViewIdResourceName(id);
-			}
-
-			const accessibilityRole = view.accessibilityRole;
-			if (accessibilityRole) {
-				const androidClassName = RoleTypeMap.get(accessibilityRole);
-				if (androidClassName) {
-					const oldClassName = info.getClassName() || (SDK_VERSION >= 28 && host.getAccessibilityClassName()) || null;
-					info.setClassName(androidClassName);
-
-					if (Trace.isEnabled()) {
-						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is mapped to "${androidClassName}" (was ${oldClassName}). ${info.getClassName()}`, Trace.categories.Accessibility);
-					}
-				} else if (!ignoreRoleTypesForTrace.has(accessibilityRole)) {
-					if (Trace.isEnabled()) {
-						Trace.write(`${view}.accessibilityRole = "${accessibilityRole}" is unknown`, Trace.categories.Accessibility);
-					}
-				}
-
-				if (clickableRolesMap.has(accessibilityRole)) {
-					if (Trace.isEnabled()) {
-						Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set clickable role=${accessibilityRole}`, Trace.categories.Accessibility);
-					}
-
-					info.setClickable(true);
-				}
-
-				if (SDK_VERSION >= 28) {
-					if (accessibilityRole === AccessibilityRole.Header) {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading role=${accessibilityRole}`, Trace.categories.Accessibility);
-						}
-
-						info.setHeading(true);
-					} else if (host.isAccessibilityHeading()) {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set heading from host`, Trace.categories.Accessibility);
-						}
-
-						info.setHeading(true);
-					} else {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set not heading`, Trace.categories.Accessibility);
-						}
-
-						info.setHeading(false);
-					}
-				}
-
-				switch (accessibilityRole) {
-					case AccessibilityRole.Switch:
-					case AccessibilityRole.RadioButton:
-					case AccessibilityRole.Checkbox: {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set checkable and check=${view.accessibilityState === AccessibilityState.Checked}`, Trace.categories.Accessibility);
-						}
-
-						info.setCheckable(true);
-						info.setChecked(view.accessibilityState === AccessibilityState.Checked);
-						break;
-					}
-					default: {
-						if (Trace.isEnabled()) {
-							Trace.write(`onInitializeAccessibilityNodeInfo ${view} - set enabled=${view.accessibilityState !== AccessibilityState.Disabled} and selected=${view.accessibilityState === AccessibilityState.Selected}`, Trace.categories.Accessibility);
-						}
-
-						info.setEnabled(view.accessibilityState !== AccessibilityState.Disabled);
-						info.setSelected(view.accessibilityState === AccessibilityState.Selected);
-						break;
-					}
-				}
-			}
-
-			if (view.accessible) {
-				info.setFocusable(true);
-			}
-		}
-
-		public sendAccessibilityEvent(host: android.view.ViewGroup, eventType: number) {
-			super.sendAccessibilityEvent(host, eventType);
-			const view = this.getTnsView(host);
-			if (!view) {
-				console.log(`skip - ${host} - ${accessibilityEventTypeMap.get(eventType)}`);
-
-				return;
-			}
-
-			try {
-				accessibilityEventHelper(view, eventType);
-			} catch (err) {
-				console.error(err);
-			}
-		}
-	}
-
-	TNSAccessibilityDelegate = new TNSAccessibilityDelegateImpl();
-
-	accessibilityEventMap = new Map<AndroidAccessibilityEvent, number>([
-		/**
-		 * Invalid selection/focus position.
-		 */
-		[AndroidAccessibilityEvent.INVALID_POSITION, android.view.accessibility.AccessibilityEvent.INVALID_POSITION],
-		/**
-		 * Maximum length of the text fields.
-		 */
-		[AndroidAccessibilityEvent.MAX_TEXT_LENGTH, android.view.accessibility.AccessibilityEvent.MAX_TEXT_LENGTH],
-		/**
-		 * Represents the event of clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-		 */
-		[AndroidAccessibilityEvent.VIEW_CLICKED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED],
-		/**
-		 * Represents the event of long clicking on a android.view.View like android.widget.Button, android.widget.CompoundButton, etc.
-		 */
-		[AndroidAccessibilityEvent.VIEW_LONG_CLICKED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_LONG_CLICKED],
-		/**
-		 * Represents the event of selecting an item usually in the context of an android.widget.AdapterView.
-		 */
-		[AndroidAccessibilityEvent.VIEW_SELECTED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SELECTED],
-		/**
-		 * Represents the event of setting input focus of a android.view.View.
-		 */
-		[AndroidAccessibilityEvent.VIEW_FOCUSED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED],
-		/**
-		 * Represents the event of changing the text of an android.widget.EditText.
-		 */
-		[AndroidAccessibilityEvent.VIEW_TEXT_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED],
-		/**
-		 * Represents the event of opening a android.widget.PopupWindow, android.view.Menu, android.app.Dialog, etc.
-		 */
-		[AndroidAccessibilityEvent.WINDOW_STATE_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED],
-		/**
-		 * Represents the event showing a android.app.Notification.
-		 */
-		[AndroidAccessibilityEvent.NOTIFICATION_STATE_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED],
-		/**
-		 * Represents the event of a hover enter over a android.view.View.
-		 */
-		[AndroidAccessibilityEvent.VIEW_HOVER_ENTER, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_ENTER],
-		/**
-		 * Represents the event of a hover exit over a android.view.View.
-		 */
-		[AndroidAccessibilityEvent.VIEW_HOVER_EXIT, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_HOVER_EXIT],
-		/**
-		 * Represents the event of starting a touch exploration gesture.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_EXPLORATION_GESTURE_START, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START],
-		/**
-		 * Represents the event of ending a touch exploration gesture.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_EXPLORATION_GESTURE_END, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END],
-		/**
-		 * Represents the event of changing the content of a window and more specifically the sub-tree rooted at the event's source.
-		 */
-		[AndroidAccessibilityEvent.WINDOW_CONTENT_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED],
-		/**
-		 * Represents the event of scrolling a view.
-		 */
-		[AndroidAccessibilityEvent.VIEW_SCROLLED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_SCROLLED],
-		/**
-		 * Represents the event of changing the selection in an android.widget.EditText.
-		 */
-		[AndroidAccessibilityEvent.VIEW_TEXT_SELECTION_CHANGED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED],
-		/**
-		 * Represents the event of an application making an announcement.
-		 */
-		[AndroidAccessibilityEvent.ANNOUNCEMENT, android.view.accessibility.AccessibilityEvent.TYPE_ANNOUNCEMENT],
-		/**
-		 * Represents the event of gaining accessibility focus.
-		 */
-		[AndroidAccessibilityEvent.VIEW_ACCESSIBILITY_FOCUSED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED],
-		/**
-		 * Represents the event of clearing accessibility focus.
-		 */
-		[AndroidAccessibilityEvent.VIEW_ACCESSIBILITY_FOCUS_CLEARED, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED],
-		/**
-		 * Represents the event of traversing the text of a view at a given movement granularity.
-		 */
-		[AndroidAccessibilityEvent.VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY, android.view.accessibility.AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY],
-		/**
-		 * Represents the event of beginning gesture detection.
-		 */
-		[AndroidAccessibilityEvent.GESTURE_DETECTION_START, android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_START],
-		/**
-		 * Represents the event of ending gesture detection.
-		 */
-		[AndroidAccessibilityEvent.GESTURE_DETECTION_END, android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_END],
-		/**
-		 * Represents the event of the user starting to touch the screen.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_INTERACTION_START, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_START],
-		/**
-		 * Represents the event of the user ending to touch the screen.
-		 */
-		[AndroidAccessibilityEvent.TOUCH_INTERACTION_END, android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_END],
-		/**
-		 * Mask for AccessibilityEvent all types.
-		 */
-		[AndroidAccessibilityEvent.ALL_MASK, android.view.accessibility.AccessibilityEvent.TYPES_ALL_MASK],
-	]);
-
-	accessibilityEventTypeMap = new Map([...accessibilityEventMap].map(([k, v]) => [v, k]));
-}
-
-function updateAccessibilityServiceState() {
-	const accessibilityManager = getAndroidAccessibilityManager();
-	if (!accessibilityManager) {
-		return;
-	}
-
-	setA11yEnabled(!!accessibilityManager.isEnabled() && !!accessibilityManager.isTouchExplorationEnabled());
-}
-
-export function isAccessibilityServiceEnabled(): boolean {
-	const accessibilityServiceEnabled = isA11yEnabled();
-	if (typeof accessibilityServiceEnabled === 'boolean') {
-		return accessibilityServiceEnabled;
-	}
-
-	const accessibilityManager = getAndroidAccessibilityManager();
-	accessibilityStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.AccessibilityStateChangeListener({
-		onAccessibilityStateChanged(enabled) {
-			updateAccessibilityServiceState();
-
-			if (Trace.isEnabled()) {
-				Trace.write(`AccessibilityStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-			}
-		},
-	});
-
-	touchExplorationStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.TouchExplorationStateChangeListener({
-		onTouchExplorationStateChanged(enabled) {
-			updateAccessibilityServiceState();
-
-			if (Trace.isEnabled()) {
-				Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-			}
-		},
-	});
-
-	androidx.core.view.accessibility.AccessibilityManagerCompat.addAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
-	androidx.core.view.accessibility.AccessibilityManagerCompat.addTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
-
-	updateAccessibilityServiceState();
-
-	Application.on(Application.exitEvent, (args: ApplicationEventData) => {
-		const activity = args.android as android.app.Activity;
-		if (activity && !activity.isFinishing()) {
-			return;
-		}
-
-		const accessibilityManager = getAndroidAccessibilityManager();
-		if (accessibilityManager) {
-			if (accessibilityStateChangeListener) {
-				androidx.core.view.accessibility.AccessibilityManagerCompat.removeAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
-			}
-
-			if (touchExplorationStateChangeListener) {
-				androidx.core.view.accessibility.AccessibilityManagerCompat.removeTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
-			}
-		}
-
-		accessibilityStateChangeListener = null;
-		touchExplorationStateChangeListener = null;
-
-		Application.off(Application.resumeEvent, updateAccessibilityServiceState);
-	});
-
-	Application.on(Application.resumeEvent, updateAccessibilityServiceState);
-
-	return accessibilityServiceEnabled;
-}
-
-let updateAccessibilityPropertiesMicroTask;
-let pendingViews = new Set<View>();
-export function updateAccessibilityProperties(view: View) {
-	if (!view.nativeViewProtected) {
-		return;
-	}
-
-	pendingViews.add(view);
-	if (updateAccessibilityPropertiesMicroTask) return;
-
-	updateAccessibilityPropertiesMicroTask = true;
-	Promise.resolve().then(() => {
-		updateAccessibilityPropertiesMicroTask = false;
-		let _pendingViews = Array.from(pendingViews);
-		pendingViews = new Set();
-		for (const view of _pendingViews) {
-			if (!view.nativeViewProtected) continue;
-			setAccessibilityDelegate(view);
-			applyContentDescription(view);
-		}
-		_pendingViews = [];
-	});
-}
-setA11yUpdatePropertiesCallback(updateAccessibilityProperties);
-
-export function sendAccessibilityEvent(view: View, eventType: AndroidAccessibilityEvent, text?: string): void {
-	if (!isAccessibilityServiceEnabled()) {
-		return;
-	}
-
-	const cls = `sendAccessibilityEvent(${view}, ${eventType}, ${text})`;
-
-	const androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls}: no nativeView`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!eventType) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls}: no eventName provided`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!isAccessibilityServiceEnabled()) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - TalkBack not enabled`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	const accessibilityManager = getAndroidAccessibilityManager();
-	if (!accessibilityManager?.isEnabled()) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - accessibility service not enabled`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	if (!accessibilityEventMap.has(eventType)) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - unknown event`, Trace.categories.Accessibility);
-		}
-
-		return;
-	}
-
-	const eventInt = accessibilityEventMap.get(eventType);
-	if (!text) {
-		return androidView.sendAccessibilityEvent(eventInt);
-	}
-
-	const accessibilityEvent = android.view.accessibility.AccessibilityEvent.obtain(eventInt);
-	accessibilityEvent.setSource(androidView);
-
-	accessibilityEvent.getText().clear();
-
-	if (!text) {
-		applyContentDescription(view);
-
-		text = androidView.getContentDescription() || view['title'];
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - text not provided use androidView.getContentDescription() - ${text}`, Trace.categories.Accessibility);
-		}
-	}
-
-	if (Trace.isEnabled()) {
-		Trace.write(`${cls}: send event with text: '${JSON.stringify(text)}'`, Trace.categories.Accessibility);
-	}
-
-	if (text) {
-		accessibilityEvent.getText().add(text);
-	}
-
-	accessibilityManager.sendAccessibilityEvent(accessibilityEvent);
-}
-
-function setAccessibilityDelegate(view: View): void {
-	if (!view.nativeViewProtected) {
-		return;
-	}
-
-	ensureNativeClasses();
-
-	const androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView || !androidView.setAccessibilityDelegate) {
-		return;
-	}
-
-	androidViewToTNSView.set(androidView, new WeakRef(view));
-
-	let hasOldDelegate = false;
-	if (typeof androidView.getAccessibilityDelegate === 'function') {
-		hasOldDelegate = androidView.getAccessibilityDelegate() === TNSAccessibilityDelegate;
-	}
-
-	if (hasOldDelegate) {
-		return;
-	}
-
-	androidView.setAccessibilityDelegate(TNSAccessibilityDelegate);
-}
 
 const applicationEvents: string[] = [Application.orientationChangedEvent, Application.systemAppearanceChangedEvent];
 function toggleApplicationEventListeners(toAdd: boolean, callback: (args: ApplicationEventData) => void) {
diff --git a/packages/core/application/application.d.ts b/packages/core/application/application.d.ts
index e5c2eec0c7..80348eb95c 100644
--- a/packages/core/application/application.d.ts
+++ b/packages/core/application/application.d.ts
@@ -1,5 +1,5 @@
 import { ApplicationCommon } from './application-common';
-import { FontScaleCategory } from '../accessibility/font-scale-common';
+import type * as Interfaces from './application-interfaces';
 
 export * from './application-common';
 export * from './application-interfaces';
@@ -7,6 +7,14 @@ export * from './application-interfaces';
 export const Application: ApplicationCommon;
 
 export class AndroidApplication extends ApplicationCommon {
+	/**
+	 * @deprecated Use `Application.android.fragmentCreateEvent` instead.
+	 */
+	static readonly fragmentCreateEvent = 'fragmentCreate';
+	/**
+	 * @deprecated Use `Application.android.activityCreateEvent` instead.
+	 */
+	static readonly activityCreateEvent = 'activityCreate';
 	/**
 	 * @deprecated Use `Application.android.activityCreatedEvent` instead.
 	 */
@@ -52,6 +60,11 @@ export class AndroidApplication extends ApplicationCommon {
 	 */
 	static readonly activityRequestPermissionsEvent = 'activityRequestPermissions';
 
+	static readonly dialogOnCreateViewEvent = 'dialogOnCreateView';
+	static readonly configurationChangeEvent = 'configurationChange';
+
+	readonly fragmentCreateEvent = AndroidApplication.fragmentCreateEvent;
+	readonly activityCreateEvent = AndroidApplication.activityCreateEvent;
 	readonly activityCreatedEvent = AndroidApplication.activityCreatedEvent;
 	readonly activityDestroyedEvent = AndroidApplication.activityDestroyedEvent;
 	readonly activityStartedEvent = AndroidApplication.activityStartedEvent;
@@ -63,6 +76,8 @@ export class AndroidApplication extends ApplicationCommon {
 	readonly activityBackPressedEvent = AndroidApplication.activityBackPressedEvent;
 	readonly activityNewIntentEvent = AndroidApplication.activityNewIntentEvent;
 	readonly activityRequestPermissionsEvent = AndroidApplication.activityRequestPermissionsEvent;
+	readonly dialogOnCreateViewEvent = AndroidApplication.activityRequestPermissionsEvent;
+	readonly configurationChangeEvent = AndroidApplication.activityRequestPermissionsEvent;
 
 	getNativeApplication(): android.app.Application;
 
@@ -136,17 +151,20 @@ export class AndroidApplication extends ApplicationCommon {
 	 */
 	getRegisteredBroadcastReceivers(intentFilter: string): android.content.BroadcastReceiver[];
 
-	on(event: 'activityCreated', callback: (args: AndroidActivityBundleEventData) => void, thisArg?: any): void;
-	on(event: 'activityDestroyed', callback: (args: AndroidActivityEventData) => void, thisArg?: any): void;
-	on(event: 'activityStarted', callback: (args: AndroidActivityEventData) => void, thisArg?: any): void;
-	on(event: 'activityPaused', callback: (args: AndroidActivityEventData) => void, thisArg?: any): void;
-	on(event: 'activityResumed', callback: (args: AndroidActivityEventData) => void, thisArg?: any): void;
-	on(event: 'activityStopped', callback: (args: AndroidActivityEventData) => void, thisArg?: any): void;
-	on(event: 'saveActivityState', callback: (args: AndroidActivityBundleEventData) => void, thisArg?: any): void;
-	on(event: 'activityResult', callback: (args: AndroidActivityResultEventData) => void, thisArg?: any): void;
-	on(event: 'activityBackPressed', callback: (args: AndroidActivityBackPressedEventData) => void, thisArg?: any): void;
-	on(event: 'activityNewIntent', callback: (args: AndroidActivityNewIntentEventData) => void, thisArg?: any): void;
-	on(event: 'activityRequestPermissions', callback: (args: AndroidActivityRequestPermissionsEventData) => void, thisArg?: any): void;
+	on(event: 'activityCreate', callback: (args: Interfaces.AndroidActivityBundleEventData) => void, thisArg?: any): void;
+	on(event: 'activityCreated', callback: (args: Interfaces.AndroidActivityBundleEventData) => void, thisArg?: any): void;
+	on(event: 'activityDestroyed', callback: (args: Interfaces.AndroidActivityEventData) => void, thisArg?: any): void;
+	on(event: 'activityStarted', callback: (args: Interfaces.AndroidActivityEventData) => void, thisArg?: any): void;
+	on(event: 'activityPaused', callback: (args: Interfaces.AndroidActivityEventData) => void, thisArg?: any): void;
+	on(event: 'activityResumed', callback: (args: Interfaces.AndroidActivityEventData) => void, thisArg?: any): void;
+	on(event: 'activityStopped', callback: (args: Interfaces.AndroidActivityEventData) => void, thisArg?: any): void;
+	on(event: 'saveActivityState', callback: (args: Interfaces.AndroidActivityBundleEventData) => void, thisArg?: any): void;
+	on(event: 'activityResult', callback: (args: Interfaces.AndroidActivityResultEventData) => void, thisArg?: any): void;
+	on(event: 'activityBackPressed', callback: (args: Interfaces.AndroidActivityBackPressedEventData) => void, thisArg?: any): void;
+	on(event: 'activityNewIntent', callback: (args: Interfaces.AndroidActivityNewIntentEventData) => void, thisArg?: any): void;
+	on(event: 'activityRequestPermissions', callback: (args: Interfaces.AndroidActivityRequestPermissionsEventData) => void, thisArg?: any): void;
+	on(event: 'dialogOnCreateView', callback: (args: Interfaces.AndroidDialogFragmentOnCreateViewEventData) => void, thisArg?: any): void;
+	on(event: 'configurationChange', callback: (args: Interfaces.AndroidConfigurationChangeEventData) => void, thisArg?: any): void;
 }
 
 export class iOSApplication extends ApplicationCommon {
@@ -266,27 +284,3 @@ export class iOSApplication extends ApplicationCommon {
 	 */
 	sceneDelegate: UIWindowSceneDelegate;
 }
-
-export const VALID_FONT_SCALES: number[];
-export function getCurrentFontScale(): number;
-export function getAndroidAccessibilityManager(): android.view.accessibility.AccessibilityManager | null;
-
-/**
- * Update accessibility properties on nativeView
- */
-export function updateAccessibilityProperties(view: View): void;
-
-/**
- * Android: helper function for triggering accessibility events
- */
-export function sendAccessibilityEvent(View: View, eventName: AndroidAccessibilityEvent, text?: string): void;
-
-/**
- * Is Android TalkBack or iOS VoiceOver enabled?
- */
-export function isAccessibilityServiceEnabled(): boolean;
-
-/**
- * Find the last view focused on a page.
- */
-export function getLastFocusedViewOnPage(page: Page): View | null;
diff --git a/packages/core/application/application.ios.ts b/packages/core/application/application.ios.ts
index fca05bf8bf..635116a60b 100644
--- a/packages/core/application/application.ios.ts
+++ b/packages/core/application/application.ios.ts
@@ -1,4 +1,5 @@
 import { profile } from '../profiling';
+import { ContentView } from '../ui/content-view';
 import type { View } from '../ui/core/view';
 import { isEmbedded } from '../ui/embedding';
 import { IOSHelper } from '../ui/core/view/view-helper';
@@ -6,48 +7,13 @@ import type { NavigationEntry } from '../ui/frame/frame-interfaces';
 import { getWindow } from '../utils/native-helper';
 import { SDK_VERSION } from '../utils/constants';
 import { ios as iosUtils, dataSerialize } from '../utils/native-helper';
-import { ApplicationCommon, initializeSdkVersionClass, SceneEvents } from './application-common';
+import { ApplicationCommon, SceneEvents } from './application-common';
 import { ApplicationEventData, SceneEventData } from './application-interfaces';
 import { Observable } from '../data/observable';
 import { Trace } from '../trace';
-import {
-	AccessibilityServiceEnabledPropName,
-	CommonA11YServiceEnabledObservable,
-	SharedA11YObservable,
-	a11yServiceClasses,
-	a11yServiceDisabledClass,
-	a11yServiceEnabledClass,
-	fontScaleCategoryClasses,
-	fontScaleExtraLargeCategoryClass,
-	fontScaleExtraSmallCategoryClass,
-	fontScaleMediumCategoryClass,
-	getCurrentA11YServiceClass,
-	getCurrentFontScaleCategory,
-	getCurrentFontScaleClass,
-	getFontScaleCssClasses,
-	setCurrentA11YServiceClass,
-	setCurrentFontScaleCategory,
-	setCurrentFontScaleClass,
-	setFontScaleCssClasses,
-	FontScaleCategory,
-	getClosestValidFontScale,
-	VALID_FONT_SCALES,
-	setFontScale,
-	getFontScale,
-	setInitFontScale,
-	getFontScaleCategory,
-	setInitAccessibilityCssHelper,
-	notifyAccessibilityFocusState,
-	AccessibilityLiveRegion,
-	AccessibilityRole,
-	AccessibilityState,
-	AccessibilityTrait,
-	isA11yEnabled,
-	setA11yEnabled,
-	enforceArray,
-} from '../accessibility/accessibility-common';
+
 import { CoreTypes } from '../core-types';
-import { getiOSWindow, setA11yUpdatePropertiesCallback, setApplicationPropertiesCallback, setAppMainEntry, setiOSWindow, setRootView, setToggleApplicationEventListenersCallback } from './helpers-common';
+import { getiOSWindow, setApplicationPropertiesCallback, setAppMainEntry, setiOSWindow, setRootView, setToggleApplicationEventListenersCallback } from './helpers-common';
 
 @NativeClass
 class NotificationObserver extends NSObject {
@@ -258,6 +224,7 @@ export class iOSApplication extends ApplicationCommon {
 	private _delegate: UIApplicationDelegate;
 	private _delegateHandlers = new Map<string, Array<Function>>();
 	private _rootView: View;
+	private _subRootView: View;
 	private _sceneDelegate: UIWindowSceneDelegate;
 	private _windowSceneMap = new Map<UIScene, UIWindow>();
 	private _primaryScene: UIWindowScene | null = null;
@@ -293,7 +260,7 @@ export class iOSApplication extends ApplicationCommon {
 	}
 
 	getRootView(): View {
-		return this._rootView;
+		return this._subRootView || this._rootView;
 	}
 
 	resetRootView(view?: View) {
@@ -566,20 +533,31 @@ export class iOSApplication extends ApplicationCommon {
 		} else {
 			statusBarOrientation = UIApplication.sharedApplication.statusBarOrientation;
 		}
-		return this.getOrientationValue(statusBarOrientation);
+		return this.getOrientationValue(statusBarOrientation)[0];
 	}
 
-	private getOrientationValue(orientation: number): 'portrait' | 'landscape' | 'unknown' {
+	private getOrientationValue(orientation: number): ['portrait' | 'landscape' | 'unknown', number] {
+		let newOrientation: 'portrait' | 'landscape' | 'unknown' = 'unknown';
+		let degrees = 0;
 		switch (orientation) {
 			case UIInterfaceOrientation.LandscapeRight:
+				newOrientation = 'landscape';
+				degrees = 90;
+				break;
 			case UIInterfaceOrientation.LandscapeLeft:
-				return 'landscape';
+				newOrientation = 'landscape';
+				degrees = 270;
+				break;
 			case UIInterfaceOrientation.PortraitUpsideDown:
+				newOrientation =  'portrait';
+				degrees = 180;
+				break;
 			case UIInterfaceOrientation.Portrait:
-				return 'portrait';
-			case UIInterfaceOrientation.Unknown:
-				return 'unknown';
+				newOrientation =  'portrait';
+				degrees = 0;
+				break;
 		}
+		return [newOrientation, degrees];
 	}
 
 	private notifyAppStarted(notification?: NSNotification) {
@@ -621,7 +599,10 @@ export class iOSApplication extends ApplicationCommon {
 			// if we already have a root view, we reset it.
 			this._rootView._onRootViewReset();
 		}
-		const rootView = this.createRootView(view);
+
+		// TODO: using import crashes. it creates a circular dependency  which is tricky to fix right now
+
+		const rootView = new ContentView();
 		const controller = this.getViewController(rootView);
 
 		this._rootView = rootView;
@@ -642,7 +623,6 @@ export class iOSApplication extends ApplicationCommon {
 		}
 
 		this.initRootView(rootView);
-
 		rootView.on(IOSHelper.traitCollectionColorAppearanceChangedEvent, () => {
 			const userInterfaceStyle = controller.traitCollection.userInterfaceStyle;
 			const newSystemAppearance = this.getSystemAppearanceValue(userInterfaceStyle);
@@ -655,6 +635,18 @@ export class iOSApplication extends ApplicationCommon {
 			const newLayoutDirection = this.getLayoutDirectionValue(layoutDirection);
 			this.setLayoutDirection(newLayoutDirection);
 		});
+		let subRootView = this._subRootView;
+
+		subRootView = this.createRootView(view);
+		if (!subRootView) {
+			// no root view created
+			return;
+		}
+		this._subRootView = subRootView;
+		if (subRootView.parent) {
+			subRootView.parent._removeView(subRootView);
+		}
+		(rootView as ContentView).content = subRootView;
 	}
 
 	// Observers
@@ -747,8 +739,8 @@ export class iOSApplication extends ApplicationCommon {
 
 	private didChangeStatusBarOrientation(notification: NSNotification) {
 		const statusBarOrientation = UIApplication.sharedApplication.statusBarOrientation;
-		const newOrientation = this.getOrientationValue(statusBarOrientation);
-		this.setOrientation(newOrientation);
+		const [newOrientation, degrees] = this.getOrientationValue(statusBarOrientation);
+		this.setOrientation(newOrientation, degrees);
 	}
 
 	// Scene lifecycle notification handlers
@@ -1251,509 +1243,6 @@ export * from './application-common';
 export const Application = iosApp;
 export const AndroidApplication = undefined;
 
-function fontScaleChanged(origFontScale: number) {
-	const oldValue = getFontScale();
-	setFontScale(getClosestValidFontScale(origFontScale));
-	const currentFontScale = getFontScale();
-
-	if (oldValue !== currentFontScale) {
-		Application.notify({
-			eventName: Application.fontScaleChangedEvent,
-			object: Application,
-			newValue: currentFontScale,
-		});
-	}
-}
-
-export function getCurrentFontScale(): number {
-	setupConfigListener();
-
-	return getFontScale();
-}
-
-const sizeMap = new Map<string, number>([
-	[UIContentSizeCategoryExtraSmall, 0.5],
-	[UIContentSizeCategorySmall, 0.7],
-	[UIContentSizeCategoryMedium, 0.85],
-	[UIContentSizeCategoryLarge, 1],
-	[UIContentSizeCategoryExtraLarge, 1.15],
-	[UIContentSizeCategoryExtraExtraLarge, 1.3],
-	[UIContentSizeCategoryExtraExtraExtraLarge, 1.5],
-	[UIContentSizeCategoryAccessibilityMedium, 2],
-	[UIContentSizeCategoryAccessibilityLarge, 2.5],
-	[UIContentSizeCategoryAccessibilityExtraLarge, 3],
-	[UIContentSizeCategoryAccessibilityExtraExtraLarge, 3.5],
-	[UIContentSizeCategoryAccessibilityExtraExtraExtraLarge, 4],
-]);
-
-function contentSizeUpdated(fontSize: string) {
-	if (sizeMap.has(fontSize)) {
-		fontScaleChanged(sizeMap.get(fontSize));
-
-		return;
-	}
-
-	fontScaleChanged(1);
-}
-
-function useIOSFontScale() {
-	if (Application.ios.nativeApp) {
-		contentSizeUpdated(Application.ios.nativeApp.preferredContentSizeCategory);
-	} else {
-		fontScaleChanged(1);
-	}
-}
-
-let fontSizeObserver;
-function setupConfigListener(attempt = 0) {
-	if (fontSizeObserver) {
-		return;
-	}
-
-	if (!Application.ios.nativeApp) {
-		if (attempt > 100) {
-			fontScaleChanged(1);
-
-			return;
-		}
-
-		// Couldn't get launchEvent to trigger.
-		setTimeout(() => setupConfigListener(attempt + 1), 1);
-
-		return;
-	}
-
-	fontSizeObserver = Application.ios.addNotificationObserver(UIContentSizeCategoryDidChangeNotification, (args) => {
-		const fontSize = args.userInfo.valueForKey(UIContentSizeCategoryNewValueKey);
-		contentSizeUpdated(fontSize);
-	});
-
-	Application.on(Application.exitEvent, () => {
-		if (fontSizeObserver) {
-			Application.ios.removeNotificationObserver(fontSizeObserver, UIContentSizeCategoryDidChangeNotification);
-			fontSizeObserver = null;
-		}
-
-		Application.off(Application.resumeEvent, useIOSFontScale);
-	});
-
-	Application.on(Application.resumeEvent, useIOSFontScale);
-
-	useIOSFontScale();
-}
-setInitFontScale(setupConfigListener);
-
-/**
- * Convert array of values into a bitmask.
- *
- * @param values string values
- * @param map    map lower-case name to integer value.
- */
-function inputArrayToBitMask(values: string | string[], map: Map<string, number>): number {
-	return (
-		enforceArray(values)
-			.filter((value) => !!value)
-			.map((value) => `${value}`.toLocaleLowerCase())
-			.filter((value) => map.has(value))
-			.reduce((res, value) => res | map.get(value), 0) || 0
-	);
-}
-
-let AccessibilityTraitsMap: Map<string, number>;
-let RoleTypeMap: Map<AccessibilityRole, number>;
-
-let nativeFocusedNotificationObserver;
-let lastFocusedView: WeakRef<View>;
-function ensureNativeClasses() {
-	if (AccessibilityTraitsMap && nativeFocusedNotificationObserver) {
-		return;
-	}
-
-	AccessibilityTraitsMap = new Map<AccessibilityTrait, number>([
-		[AccessibilityTrait.AllowsDirectInteraction, UIAccessibilityTraitAllowsDirectInteraction],
-		[AccessibilityTrait.CausesPageTurn, UIAccessibilityTraitCausesPageTurn],
-		[AccessibilityTrait.NotEnabled, UIAccessibilityTraitNotEnabled],
-		[AccessibilityTrait.Selected, UIAccessibilityTraitSelected],
-		[AccessibilityTrait.UpdatesFrequently, UIAccessibilityTraitUpdatesFrequently],
-	]);
-
-	RoleTypeMap = new Map<AccessibilityRole, number>([
-		[AccessibilityRole.Adjustable, UIAccessibilityTraitAdjustable],
-		[AccessibilityRole.Button, UIAccessibilityTraitButton],
-		[AccessibilityRole.Checkbox, UIAccessibilityTraitButton],
-		[AccessibilityRole.Header, UIAccessibilityTraitHeader],
-		[AccessibilityRole.KeyboardKey, UIAccessibilityTraitKeyboardKey],
-		[AccessibilityRole.Image, UIAccessibilityTraitImage],
-		[AccessibilityRole.ImageButton, UIAccessibilityTraitImage | UIAccessibilityTraitButton],
-		[AccessibilityRole.Link, UIAccessibilityTraitLink],
-		[AccessibilityRole.None, UIAccessibilityTraitNone],
-		[AccessibilityRole.PlaysSound, UIAccessibilityTraitPlaysSound],
-		[AccessibilityRole.RadioButton, UIAccessibilityTraitButton],
-		[AccessibilityRole.Search, UIAccessibilityTraitSearchField],
-		[AccessibilityRole.StaticText, UIAccessibilityTraitStaticText],
-		[AccessibilityRole.StartsMediaSession, UIAccessibilityTraitStartsMediaSession],
-		[AccessibilityRole.Summary, UIAccessibilityTraitSummaryElement],
-		[AccessibilityRole.Switch, UIAccessibilityTraitButton],
-	]);
-
-	nativeFocusedNotificationObserver = Application.ios.addNotificationObserver(UIAccessibilityElementFocusedNotification, (args: NSNotification) => {
-		const uiView = args.userInfo?.objectForKey(UIAccessibilityFocusedElementKey) as UIView;
-		if (!uiView?.tag) {
-			return;
-		}
-
-		const rootView = Application.getRootView();
-
-		// We use the UIView's tag to find the NativeScript View by its domId.
-		let view = rootView.getViewByDomId<View>(uiView?.tag);
-		if (!view) {
-			for (const modalView of <Array<View>>rootView._getRootModalViews()) {
-				view = modalView.getViewByDomId(uiView?.tag);
-				if (view) {
-					break;
-				}
-			}
-		}
-
-		if (!view) {
-			return;
-		}
-
-		const lastView = lastFocusedView?.deref();
-		if (lastView && view !== lastView) {
-			const lastFocusedUIView = lastView.nativeViewProtected as UIView;
-			if (lastFocusedUIView) {
-				lastFocusedView = null;
-
-				notifyAccessibilityFocusState(lastView, false, true);
-			}
-		}
-
-		lastFocusedView = new WeakRef(view);
-
-		notifyAccessibilityFocusState(view, true, false);
-	});
-
-	Application.on(Application.exitEvent, () => {
-		if (nativeFocusedNotificationObserver) {
-			Application.ios.removeNotificationObserver(nativeFocusedNotificationObserver, UIAccessibilityElementFocusedNotification);
-		}
-
-		nativeFocusedNotificationObserver = null;
-		lastFocusedView = null;
-	});
-}
-
-export function updateAccessibilityProperties(view: View): void {
-	const uiView = view.nativeViewProtected as UIView;
-	if (!uiView) {
-		return;
-	}
-
-	ensureNativeClasses();
-
-	const accessibilityRole = view.accessibilityRole;
-	const accessibilityState = view.accessibilityState;
-
-	if (!view.accessible || view.accessibilityHidden) {
-		uiView.accessibilityTraits = UIAccessibilityTraitNone;
-
-		return;
-	}
-
-	// NOTE: left here for various core inspection passes while running the toolbox app
-	// console.log('--- Accessible element: ', view.constructor.name);
-	// console.log('accessibilityLabel: ', view.accessibilityLabel);
-	// console.log('accessibilityRole: ', accessibilityRole);
-	// console.log('accessibilityState: ', accessibilityState);
-	// console.log('accessibilityValue: ', view.accessibilityValue);
-
-	let a11yTraits = UIAccessibilityTraitNone;
-	if (RoleTypeMap.has(accessibilityRole)) {
-		a11yTraits |= RoleTypeMap.get(accessibilityRole);
-	}
-
-	switch (accessibilityRole) {
-		case AccessibilityRole.Checkbox:
-		case AccessibilityRole.RadioButton:
-		case AccessibilityRole.Switch: {
-			if (accessibilityState === AccessibilityState.Checked) {
-				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
-			}
-			break;
-		}
-		default: {
-			if (accessibilityState === AccessibilityState.Selected) {
-				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.Selected);
-			}
-			if (accessibilityState === AccessibilityState.Disabled) {
-				a11yTraits |= AccessibilityTraitsMap.get(AccessibilityTrait.NotEnabled);
-			}
-			break;
-		}
-	}
-
-	const UpdatesFrequentlyTrait = AccessibilityTraitsMap.get(AccessibilityTrait.UpdatesFrequently);
-
-	switch (view.accessibilityLiveRegion) {
-		case AccessibilityLiveRegion.Polite:
-		case AccessibilityLiveRegion.Assertive: {
-			a11yTraits |= UpdatesFrequentlyTrait;
-			break;
-		}
-		default: {
-			a11yTraits &= ~UpdatesFrequentlyTrait;
-			break;
-		}
-	}
-
-	// NOTE: left here for various core inspection passes while running the toolbox app
-	// if (view.accessibilityLiveRegion) {
-	// 	console.log('accessibilityLiveRegion:', view.accessibilityLiveRegion);
-	// }
-
-	if (view.accessibilityMediaSession) {
-		a11yTraits |= RoleTypeMap.get(AccessibilityRole.StartsMediaSession);
-	}
-
-	// NOTE: There were duplicated types in traits and roles previously which we conslidated
-	// not sure if this is still needed
-	// accessibilityTraits used to be stored on {N} view component but if the above
-	// is combining all traits fresh each time through, don't believe we need to keep track or previous traits
-	// if (view.accessibilityTraits) {
-	// 	a11yTraits |= inputArrayToBitMask(view.accessibilityTraits, AccessibilityTraitsMap);
-	// }
-
-	// NOTE: left here for various core inspection passes while running the toolbox app
-	// console.log('a11yTraits:', a11yTraits);
-	// console.log('    ');
-
-	uiView.accessibilityTraits = a11yTraits;
-}
-setA11yUpdatePropertiesCallback(updateAccessibilityProperties);
-
-export const sendAccessibilityEvent = (): void => {};
-
-export function isAccessibilityServiceEnabled(): boolean {
-	const accessibilityServiceEnabled = isA11yEnabled();
-	if (typeof accessibilityServiceEnabled === 'boolean') {
-		return accessibilityServiceEnabled;
-	}
-
-	let isVoiceOverRunning: () => boolean;
-	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
-		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
-	} else {
-		// iOS is too old to tell us if voice over is enabled
-		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
-			setA11yEnabled(false);
-			return isA11yEnabled();
-		}
-	}
-
-	setA11yEnabled(isVoiceOverRunning());
-
-	let voiceOverStatusChangedNotificationName: string | null = null;
-	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
-	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
-	}
-
-	if (voiceOverStatusChangedNotificationName) {
-		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
-			setA11yEnabled(isVoiceOverRunning());
-		});
-
-		Application.on(Application.exitEvent, () => {
-			if (nativeObserver) {
-				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
-			}
-
-			setA11yEnabled(undefined);
-			nativeObserver = null;
-		});
-	}
-
-	Application.on(Application.resumeEvent, () => {
-		setA11yEnabled(isVoiceOverRunning());
-	});
-
-	return isA11yEnabled();
-}
-
-export function getAndroidAccessibilityManager(): null {
-	return null;
-}
-
-let sharedA11YObservable: SharedA11YObservable;
-let nativeObserver;
-
-function getSharedA11YObservable(): SharedA11YObservable {
-	if (sharedA11YObservable) {
-		return sharedA11YObservable;
-	}
-
-	sharedA11YObservable = new SharedA11YObservable();
-
-	let isVoiceOverRunning: () => boolean;
-	if (typeof UIAccessibilityIsVoiceOverRunning === 'function') {
-		isVoiceOverRunning = UIAccessibilityIsVoiceOverRunning;
-	} else {
-		if (typeof UIAccessibilityIsVoiceOverRunning !== 'function') {
-			Trace.write(`UIAccessibilityIsVoiceOverRunning() - is not a function`, Trace.categories.Accessibility, Trace.messageType.error);
-
-			isVoiceOverRunning = () => false;
-		}
-	}
-
-	sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
-
-	let voiceOverStatusChangedNotificationName: string | null = null;
-	if (typeof UIAccessibilityVoiceOverStatusDidChangeNotification !== 'undefined') {
-		// iOS 11+
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
-	} else if (typeof UIAccessibilityVoiceOverStatusChanged !== 'undefined') {
-		// iOS <11
-		voiceOverStatusChangedNotificationName = UIAccessibilityVoiceOverStatusChanged;
-	}
-
-	if (voiceOverStatusChangedNotificationName) {
-		nativeObserver = Application.ios.addNotificationObserver(voiceOverStatusChangedNotificationName, () => {
-			sharedA11YObservable?.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning());
-		});
-
-		Application.on(Application.exitEvent, () => {
-			if (nativeObserver) {
-				Application.ios.removeNotificationObserver(nativeObserver, voiceOverStatusChangedNotificationName);
-			}
-
-			nativeObserver = null;
-
-			if (sharedA11YObservable) {
-				sharedA11YObservable.removeEventListener(Observable.propertyChangeEvent);
-
-				sharedA11YObservable = null;
-			}
-		});
-	}
-
-	Application.on(Application.resumeEvent, () => sharedA11YObservable.set(AccessibilityServiceEnabledPropName, isVoiceOverRunning()));
-
-	return sharedA11YObservable;
-}
-
-export class AccessibilityServiceEnabledObservable extends CommonA11YServiceEnabledObservable {
-	constructor() {
-		super(getSharedA11YObservable());
-	}
-}
-
-let accessibilityServiceObservable: AccessibilityServiceEnabledObservable;
-export function ensureClasses() {
-	if (accessibilityServiceObservable) {
-		return;
-	}
-
-	setFontScaleCssClasses(new Map(VALID_FONT_SCALES.map((fs) => [fs, `a11y-fontscale-${Number(fs * 100).toFixed(0)}`])));
-
-	accessibilityServiceObservable = new AccessibilityServiceEnabledObservable();
-
-	// Initialize SDK version CSS class once
-	initializeSdkVersionClass(Application.getRootView());
-}
-
-export function updateCurrentHelperClasses(applyRootCssClass: (cssClasses: string[], newCssClass: string) => void): void {
-	const fontScale = getFontScale();
-	const fontScaleCategory = getFontScaleCategory();
-	const fontScaleCssClasses = getFontScaleCssClasses();
-	const oldFontScaleClass = getCurrentFontScaleClass();
-	if (fontScaleCssClasses.has(fontScale)) {
-		setCurrentFontScaleClass(fontScaleCssClasses.get(fontScale));
-	} else {
-		setCurrentFontScaleClass(fontScaleCssClasses.get(1));
-	}
-
-	if (oldFontScaleClass !== getCurrentFontScaleClass()) {
-		applyRootCssClass([...fontScaleCssClasses.values()], getCurrentFontScaleClass());
-	}
-
-	const oldActiveFontScaleCategory = getCurrentFontScaleCategory();
-	switch (fontScaleCategory) {
-		case FontScaleCategory.ExtraSmall: {
-			setCurrentFontScaleCategory(fontScaleExtraSmallCategoryClass);
-			break;
-		}
-		case FontScaleCategory.Medium: {
-			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
-			break;
-		}
-		case FontScaleCategory.ExtraLarge: {
-			setCurrentFontScaleCategory(fontScaleExtraLargeCategoryClass);
-			break;
-		}
-		default: {
-			setCurrentFontScaleCategory(fontScaleMediumCategoryClass);
-			break;
-		}
-	}
-
-	if (oldActiveFontScaleCategory !== getCurrentFontScaleCategory()) {
-		applyRootCssClass(fontScaleCategoryClasses, getCurrentFontScaleCategory());
-	}
-
-	const oldA11YStatusClass = getCurrentA11YServiceClass();
-	if (accessibilityServiceObservable.accessibilityServiceEnabled) {
-		setCurrentA11YServiceClass(a11yServiceEnabledClass);
-	} else {
-		setCurrentA11YServiceClass(a11yServiceDisabledClass);
-	}
-
-	if (oldA11YStatusClass !== getCurrentA11YServiceClass()) {
-		applyRootCssClass(a11yServiceClasses, getCurrentA11YServiceClass());
-	}
-}
-
-function applyRootCssClass(cssClasses: string[], newCssClass: string): void {
-	const rootView = Application.getRootView();
-	if (!rootView) {
-		return;
-	}
-
-	Application.applyCssClass(rootView, cssClasses, newCssClass);
-
-	const rootModalViews = <Array<View>>rootView._getRootModalViews();
-	rootModalViews.forEach((rootModalView) => Application.applyCssClass(rootModalView, cssClasses, newCssClass));
-}
-
-function applyFontScaleToRootViews(): void {
-	const rootView = Application.getRootView();
-	if (!rootView) {
-		return;
-	}
-
-	const fontScale = getCurrentFontScale();
-
-	rootView.style.fontScaleInternal = fontScale;
-
-	const rootModalViews = <Array<View>>rootView._getRootModalViews();
-	rootModalViews.forEach((rootModalView) => (rootModalView.style.fontScaleInternal = fontScale));
-}
-
-export function initAccessibilityCssHelper(): void {
-	ensureClasses();
-	updateCurrentHelperClasses(applyRootCssClass);
-	applyFontScaleToRootViews();
-
-	Application.on(Application.fontScaleChangedEvent, () => {
-		updateCurrentHelperClasses(applyRootCssClass);
-		applyFontScaleToRootViews();
-	});
-
-	accessibilityServiceObservable.on(AccessibilityServiceEnabledObservable.propertyChangeEvent, () => updateCurrentHelperClasses(applyRootCssClass));
-}
-setInitAccessibilityCssHelper(initAccessibilityCssHelper);
-
 const applicationEvents: string[] = [Application.orientationChangedEvent, Application.systemAppearanceChangedEvent];
 function toggleApplicationEventListeners(toAdd: boolean, callback: (args: ApplicationEventData) => void) {
 	for (const eventName of applicationEvents) {
@@ -1771,4 +1260,4 @@ setApplicationPropertiesCallback(() => {
 		orientation: Application.orientation(),
 		systemAppearance: Application.systemAppearance(),
 	};
-});
+});
\ No newline at end of file
diff --git a/packages/core/application/helpers.android.ts b/packages/core/application/helpers.android.ts
index 04292707a2..6a65d2373a 100644
--- a/packages/core/application/helpers.android.ts
+++ b/packages/core/application/helpers.android.ts
@@ -1,7 +1,5 @@
 import { SDK_VERSION } from '../utils/constants';
-import { getNativeApp, updateA11yPropertiesCallback } from './helpers-common';
-import { AccessibilityRole, AccessibilityState } from '../accessibility/accessibility-common';
-import { Trace } from '../trace';
+import { getNativeApp } from './helpers-common';
 
 let _startActivity: androidx.appcompat.app.AppCompatActivity;
 let _foregroundActivity: androidx.appcompat.app.AppCompatActivity;
@@ -22,123 +20,10 @@ export function androidSetStartActivity(activity: androidx.appcompat.app.AppComp
 	_startActivity = activity;
 }
 
-function getApplicationContext(): android.content.Context {
-	return getNativeApp<android.app.Application>().getApplicationContext();
-}
-
-export function updateContentDescription(view: any /* View */, forceUpdate?: boolean): string | null {
-	if (!view.nativeViewProtected) {
-		return;
+let applicationContext: android.content.Context;
+export function getApplicationContext(): android.content.Context {
+	if (!applicationContext) {
+		applicationContext = getNativeApp<android.app.Application>().getApplicationContext();
 	}
-
-	return applyContentDescription(view, forceUpdate);
+	return applicationContext;
 }
-
-export function applyContentDescription(view: any /* View */, forceUpdate?: boolean) {
-	let androidView = view.nativeViewProtected as android.view.View;
-	if (!androidView || (androidView instanceof android.widget.TextView && !view._androidContentDescriptionUpdated)) {
-		return null;
-	}
-
-	if (androidView instanceof androidx.appcompat.widget.Toolbar) {
-		const numChildren = androidView.getChildCount();
-
-		for (let i = 0; i < numChildren; i += 1) {
-			const childAndroidView = androidView.getChildAt(i);
-			if (childAndroidView instanceof androidx.appcompat.widget.AppCompatTextView) {
-				androidView = childAndroidView;
-				break;
-			}
-		}
-	}
-
-	const cls = `applyContentDescription(${view})`;
-
-	const titleValue = view['title'] as string;
-	const textValue = view['text'] as string;
-
-	if (!forceUpdate && view._androidContentDescriptionUpdated === false && textValue === view['_lastText'] && titleValue === view['_lastTitle']) {
-		// prevent updating this too much
-		return androidView.getContentDescription();
-	}
-
-	const contentDescriptionBuilder = new Array<string>();
-
-	// Workaround: TalkBack won't read the checked state for fake Switch.
-	if (view.accessibilityRole === AccessibilityRole.Switch) {
-		const androidSwitch = new android.widget.Switch(getApplicationContext());
-		if (view.accessibilityState === AccessibilityState.Checked) {
-			contentDescriptionBuilder.push(androidSwitch.getTextOn());
-		} else {
-			contentDescriptionBuilder.push(androidSwitch.getTextOff());
-		}
-	}
-
-	if (view.accessibilityLabel) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - have accessibilityLabel`, Trace.categories.Accessibility);
-		}
-
-		contentDescriptionBuilder.push(`${view.accessibilityLabel}`);
-	}
-
-	if (view.accessibilityValue) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - have accessibilityValue`, Trace.categories.Accessibility);
-		}
-
-		contentDescriptionBuilder.push(`${view.accessibilityValue}`);
-	} else if (textValue) {
-		if (textValue !== view.accessibilityLabel) {
-			if (Trace.isEnabled()) {
-				Trace.write(`${cls} - don't have accessibilityValue - use 'text' value`, Trace.categories.Accessibility);
-			}
-
-			contentDescriptionBuilder.push(`${textValue}`);
-		}
-	} else if (titleValue) {
-		if (titleValue !== view.accessibilityLabel) {
-			if (Trace.isEnabled()) {
-				Trace.write(`${cls} - don't have accessibilityValue - use 'title' value`, Trace.categories.Accessibility);
-			}
-
-			contentDescriptionBuilder.push(`${titleValue}`);
-		}
-	}
-
-	if (view.accessibilityHint) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - have accessibilityHint`, Trace.categories.Accessibility);
-		}
-
-		contentDescriptionBuilder.push(`${view.accessibilityHint}`);
-	}
-
-	const contentDescription = contentDescriptionBuilder.join('. ').trim().replace(/^\.$/, '');
-
-	if (contentDescription) {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - set to "${contentDescription}"`, Trace.categories.Accessibility);
-		}
-
-		androidView.setContentDescription(contentDescription);
-	} else {
-		if (Trace.isEnabled()) {
-			Trace.write(`${cls} - remove value`, Trace.categories.Accessibility);
-		}
-
-		androidView.setContentDescription(null);
-	}
-
-	view['_lastTitle'] = titleValue;
-	view['_lastText'] = textValue;
-	view._androidContentDescriptionUpdated = false;
-
-	return contentDescription;
-}
-
-export function setupAccessibleView(view: any /* any */): void {
-	updateA11yPropertiesCallback(view);
-}
-
-// stubs
diff --git a/packages/core/application/helpers.d.ts b/packages/core/application/helpers.d.ts
index d99f4e633f..66772cc8d2 100644
--- a/packages/core/application/helpers.d.ts
+++ b/packages/core/application/helpers.d.ts
@@ -1,7 +1,3 @@
-/**
- * Initialize accessibility for View. This should be called on loaded-event.
- */
-export function setupAccessibleView(view: View): void;
 /**
  * Android: Update the content description for views
  */
diff --git a/packages/core/cli-hooks/before-checkForChanges.mjs b/packages/core/cli-hooks/before-checkForChanges.mjs
index 207a679b69..b73e42130e 100644
--- a/packages/core/cli-hooks/before-checkForChanges.mjs
+++ b/packages/core/cli-hooks/before-checkForChanges.mjs
@@ -20,6 +20,17 @@ export default function ($staticConfig, hookArgs) {
         if (webpackMinVer && !satisfiesRequriredVersion(webpackMinVer, 1, 3)) {
             throw new Error(`Building @nativescript/core for Angular requires ${webpackPackageName} with version at least 1.3.0. Please upgrade: npm i ${webpackPackageName} --save-dev.`);
         }
+
+        // Required webpack version for angular projects: 1.3.0
+        if (projectData.projectType === "Angular") {
+            const webpackMinVer = getMinWebpackVersion(projectData);
+
+            if (webpackMinVer && !satisfiesRequriredVersion(webpackMinVer, 1, 3)) {
+                throw new Error(`Building @nativescript/core for Angular requires ${webpackPackageName} with version at least 1.3.0. Please upgrade: npm i ${webpackPackageName} --save-dev.`);
+            }
+        }
+    } catch(err) {
+
     }
 };
 
@@ -50,6 +61,8 @@ function getMinWebpackVersion(projectData) {
 
     let webpackMinVer = null;
 
+    const semver = require("semver");
+
     if (semver.valid(webpackVer)) {
         webpackMinVer = semver.parse(webpackVer);
     } else if (semver.validRange(webpackVer)) {
diff --git a/packages/core/color/color-utils.ts b/packages/core/color/color-utils.ts
index 5e79b2a819..d976fcac6f 100644
--- a/packages/core/color/color-utils.ts
+++ b/packages/core/color/color-utils.ts
@@ -1,7 +1,4 @@
-import { color } from '@csstools/css-color-parser';
-import { parseComponentValue } from '@csstools/css-parser-algorithms';
-import { serializeRGB } from '@csstools/css-color-parser';
-import { tokenize } from '@csstools/css-tokenizer';
+import { Trace } from '../trace';
 
 export const HEX_REGEX = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)|(^#[0-9A-F]{8}$)|(^#[0-9A-F]{4}$)/i;
 
@@ -10,19 +7,29 @@ export function isCssColorMixExpression(value: string) {
 }
 
 export function argbFromColorMix(value: string): number {
-	const astComponentValue = parseComponentValue(tokenize({ css: value }));
-	const colorData = color(astComponentValue);
-
-	let argb: number;
+	if (__CSS_USE_CSS_TOOLS__) {
+		const parseComponentValue = require('@csstools/css-parser-algorithms').parseComponentValue;
+		const serializeRGB = require('@csstools/css-color-parser').serializeRGB;
+		const tokenize = require('@csstools/css-tokenizer').tokenize;
+		const color = require('@csstools/css-color-parser').color;
+		const astComponentValue = parseComponentValue(tokenize({ css: value }));
+		const colorData = color(astComponentValue);
+
+		let argb: number;
+
+		if (colorData) {
+			const serialized = serializeRGB(colorData);
+			argb = argbFromRgbOrRgba(serialized.toString());
+		} else {
+			argb = -1;
+		}
 
-	if (colorData) {
-		const serialized = serializeRGB(colorData);
-		argb = argbFromRgbOrRgba(serialized.toString());
+		return argb;
 	} else {
-		argb = -1;
+		Trace.write(`To use color-mix you must define __CSS_USE_CSS_TOOLS__ in webpack Define`, Trace.categories.Accessibility, Trace.messageType.error);
+		return -1;
 	}
-
-	return argb;
+	
 }
 
 export function fromArgbToRgba(argb: number): { a: number; r: number; g: number; b: number } {
diff --git a/packages/core/connectivity/index.android.ts b/packages/core/connectivity/index.android.ts
index a02981b111..d748fb7e2a 100644
--- a/packages/core/connectivity/index.android.ts
+++ b/packages/core/connectivity/index.android.ts
@@ -1,4 +1,4 @@
-import { getNativeApp } from '../application/helpers-common';
+import { getApplicationContext } from '../application/helpers.android';
 import { SDK_VERSION } from '../utils/constants';
 import { Application } from '../application';
 
@@ -19,7 +19,7 @@ const vpn = 'vpn';
 
 // Get Connection Type
 function getConnectivityManager(): android.net.ConnectivityManager {
-	return getNativeApp<android.app.Application>().getApplicationContext().getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
+	return getApplicationContext().getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
 }
 
 function getActiveNetworkInfo(): android.net.NetworkInfo {
diff --git a/packages/core/core-types/index.ts b/packages/core/core-types/index.ts
index c816cef2da..beff0b9dfa 100644
--- a/packages/core/core-types/index.ts
+++ b/packages/core/core-types/index.ts
@@ -124,10 +124,11 @@ export namespace CoreTypes {
 		export const unknown = 'unknown';
 	}
 
-	export type HorizontalAlignmentType = 'start' | 'left' | 'center' | 'right' | 'end' | 'stretch' | CSSWideKeywords;
+	export type HorizontalAlignmentType = 'start' | 'left' | 'middle'  | 'center' | 'right' | 'end' | 'stretch' | CSSWideKeywords;
 	export namespace HorizontalAlignment {
 		export const start = 'start';
 		export const left = 'left';
+		export const middle = 'middle';
 		export const center = 'center';
 		export const right = 'right';
 		export const end = 'end';
@@ -136,12 +137,15 @@ export namespace CoreTypes {
 		export const parse = makeParser<HorizontalAlignmentType>(isValid);
 	}
 
-	export type VerticalAlignmentType = 'top' | 'middle' | 'bottom' | 'stretch' | CSSWideKeywords;
+	export type VerticalAlignmentType = 'top' | 'middle' | 'center' | 'bottom' | 'stretch' | CSSWideKeywords;
 	export namespace VerticalAlignment {
 		export const top = 'top';
 		export const middle = 'middle';
+		export const center = 'center';
 		export const bottom = 'bottom';
 		export const stretch = 'stretch';
+		export const isValid = makeValidator<VerticalAlignmentType>(top, center, middle, bottom, stretch);
+		export const parse = makeParser<VerticalAlignmentType>(isValid);
 	}
 	export type VerticalAlignmentTextType = VerticalAlignmentType | 'text-top' | 'text-bottom' | 'sup' | 'sub' | 'baseline';
 	export namespace VerticalAlignmentText {
@@ -173,9 +177,9 @@ export namespace CoreTypes {
 		export const collapse: VisibilityType = 'collapse';
 		export const collapsed: VisibilityType = 'collapsed';
 		export const hidden: VisibilityType = 'hidden';
-		export const isValid = makeValidator<CoreTypes.VisibilityType>(visible, hidden, collapse);
-		export const parse = (value: string) => (value.toLowerCase() === 'collapsed' ? collapse : parseStrict(value));
+		export const isValid = makeValidator<CoreTypes.VisibilityType>(visible, hidden, collapse, collapsed);
 		const parseStrict = makeParser<CoreTypes.VisibilityType>(isValid);
+		export const parse = parseStrict;
 	}
 
 	export namespace FontAttributes {
diff --git a/packages/core/core-types/validators.ts b/packages/core/core-types/validators.ts
index ee4f4cd2b8..ae8517fac6 100644
--- a/packages/core/core-types/validators.ts
+++ b/packages/core/core-types/validators.ts
@@ -1,26 +1,19 @@
 // Utility functions for validation and parsing, shared between core-types and properties
-
 export function makeValidator<T>(...values: T[]): (value: any) => value is T {
-	return function (value: any): value is T {
-		return values.indexOf(value) !== -1;
-	};
+	return (value: any): value is T => values.includes(value);
 }
 
 export function makeParser<T>(isValid: (value: any) => boolean, allowNumbers = false): (value: any) => T {
 	return (value) => {
-		const lower = value && value.toLowerCase();
-		if (isValid(value)) {
-			return value;
-		} else if (isValid(lower)) {
+		const lower = value?.toLowerCase();
+		if (isValid(lower)) {
 			return lower;
-		} else {
-			if (allowNumbers) {
-				const convNumber = +value;
-				if (!isNaN(convNumber)) {
-					return value;
-				}
+		} else if (allowNumbers) {
+			const convNumber = +value;
+			if (!isNaN(convNumber)) {
+				return value;
 			}
-			throw new Error('Invalid value: ' + value);
 		}
+		throw new Error('Invalid value: ' + value);
 	};
 }
diff --git a/packages/core/css/parser.spec.ts b/packages/core/css/parser.spec.ts
index c5023bf8b9..41ffb790f7 100644
--- a/packages/core/css/parser.spec.ts
+++ b/packages/core/css/parser.spec.ts
@@ -350,7 +350,7 @@ describe('css', () => {
 
 			it('serialization', () => {
 				const outReworkFile = path.resolve(testingToolsDir, 'out/rework.css.json');
-				const reworkAst = reworkCss.parse(themeCoreLightIos, { source: 'nativescript-theme-core/css/core.light.css' });
+				const reworkAst = reworkCss.parse(themeCoreLightIos, { source: '@nativescript/theme/css/core.css' });
 				fs.writeFileSync(
 					outReworkFile,
 					JSON.stringify(reworkAst, (k, v) => (k === 'position' ? undefined : v), '  '),
@@ -418,7 +418,7 @@ describe('css', () => {
 					expect(char).toBe('\n');
 				});
 				const reworkDuration = trapDuration(() => {
-					const ast = reworkCss.parse(themeCoreLightIos, { source: 'nativescript-theme-core/css/core.light.css' });
+					const ast = reworkCss.parse(themeCoreLightIos, { source: '@nativescript/theme/css/core.css' });
 					// fs.writeFileSync("rework.css.json", JSON.stringify(ast, null, "\t"));
 				});
 				const shadyDuration = trapDuration(() => {
diff --git a/packages/core/data/observable-array/index.ts b/packages/core/data/observable-array/index.ts
index 3834a047ed..88593e7fa1 100644
--- a/packages/core/data/observable-array/index.ts
+++ b/packages/core/data/observable-array/index.ts
@@ -13,7 +13,7 @@ export class ChangeType {
 /**
  * Event args for "changed" event.
  */
-export interface ChangedData<T> extends EventData {
+export interface ChangedData<T, U = Observable> extends EventData<U> {
 	/**
 	 * Change type.
 	 */
diff --git a/packages/core/data/observable/index.ts b/packages/core/data/observable/index.ts
index 879a13f551..f7fedebc04 100644
--- a/packages/core/data/observable/index.ts
+++ b/packages/core/data/observable/index.ts
@@ -3,7 +3,7 @@ import { Optional } from '../../utils/typescript-utils';
 /**
  * Base event data.
  */
-export interface EventData {
+export interface EventData<T = Observable> {
 	/**
 	 * The name of the event.
 	 */
@@ -11,17 +11,17 @@ export interface EventData {
 	/**
 	 * The Observable instance that has raised the event.
 	 */
-	object: Observable;
+	object?: T;
 }
 
-export interface EventDataValue extends EventData {
+export interface EventDataValue<T = Observable> extends EventData<T> {
 	value?: boolean;
 }
 
 /**
  * Data for the "propertyChange" event.
  */
-export interface PropertyChangeData extends EventData {
+export interface PropertyChangeData<T = Observable> extends EventData<T> {
 	/**
 	 * The name of the property that has changed.
 	 */
@@ -36,10 +36,10 @@ export interface PropertyChangeData extends EventData {
 	oldValue?: any;
 }
 
-interface ListenerEntry {
-	callback: (data: EventData) => void;
-	thisArg?: any;
-	once?: true;
+interface ListenerEntry<T = Observable> {
+	callback: (data: EventData<T>) => void;
+	thisArg: any;
+	once?: boolean;
 }
 
 interface ListEntryMap {
@@ -203,8 +203,7 @@ export class Observable {
 	 * @param thisArg An optional parameter which when set will be used as "this" in callback method call.
 	 * @param once An optional parameter which when set will cause the event listener to fire once.
 	 */
-	public addEventListener(eventName: string, callback: (data: EventData) => void, thisArg?: any, once?: boolean): void {
-		once = once || undefined;
+	public addEventListener(eventName: string, callback: (data: EventData) => void, thisArg?: any, once: boolean = false): void {
 		thisArg = thisArg || undefined;
 
 		if (typeof eventName !== 'string') {
@@ -230,13 +229,11 @@ export class Observable {
 
 	/**
 	 * Removes listener(s) for the specified event name.
-	 * @param eventName Name of the event to attach to.
+	 * @param event name of the event the specified listener is associated with.
 	 * @param callback An optional parameter pointing to a specific listener. If not defined, all listeners for the event names will be removed.
 	 * @param thisArg An optional parameter which when set will be used to refine search of the correct callback which will be removed as event listener.
 	 */
 	public removeEventListener(eventName: string, callback?: (data: EventData) => void, thisArg?: any): void {
-		thisArg = thisArg || undefined;
-
 		if (typeof eventName !== 'string') {
 			throw new TypeError('Events name(s) must be string.');
 		}
@@ -258,29 +255,14 @@ export class Observable {
 		}
 	}
 
-	/**
-	 * Please avoid using the static event-handling APIs as they will be removed
-	 * in future.
-	 * @deprecated
-	 */
 	public static on(eventName: string, callback: (data: EventData) => void, thisArg?: any, once?: boolean): void {
 		this.addEventListener(eventName, callback, thisArg, once);
 	}
 
-	/**
-	 * Please avoid using the static event-handling APIs as they will be removed
-	 * in future.
-	 * @deprecated
-	 */
 	public static once(eventName: string, callback: (data: EventData) => void, thisArg?: any): void {
 		this.addEventListener(eventName, callback, thisArg, true);
 	}
 
-	/**
-	 * Please avoid using the static event-handling APIs as they will be removed
-	 * in future.
-	 * @deprecated
-	 */
 	public static off(eventName: string, callback?: (data: EventData) => void, thisArg?: any): void {
 		this.removeEventListener(eventName, callback, thisArg);
 	}
@@ -307,11 +289,6 @@ export class Observable {
 		}
 	}
 
-	/**
-	 * Please avoid using the static event-handling APIs as they will be removed
-	 * in future.
-	 * @deprecated
-	 */
 	public static removeEventListener(eventName: string, callback?: (data: EventData) => void, thisArg?: any): void {
 		thisArg = thisArg || undefined;
 
@@ -344,11 +321,6 @@ export class Observable {
 		}
 	}
 
-	/**
-	 * Please avoid using the static event-handling APIs as they will be removed
-	 * in future.
-	 * @deprecated
-	 */
 	public static addEventListener(eventName: string, callback: (data: EventData) => void, thisArg?: any, once?: boolean): void {
 		once = once || undefined;
 		thisArg = thisArg || undefined;
@@ -410,14 +382,14 @@ export class Observable {
 		data.object = data.object || this;
 		const dataWithObject = data as EventData;
 
-		const eventClass = this.constructor.name;
-		this._globalNotify(eventClass, 'First', dataWithObject);
+		// this._globalNotify(eventClass, 'First', dataWithObject);
 
 		const observers = this._observers[data.eventName];
 		if (observers) {
 			Observable._fireEvent(observers, dataWithObject);
 		}
 
+		const eventClass = this.constructor.name;
 		this._globalNotify(eventClass, '', dataWithObject);
 	}
 
diff --git a/packages/core/data/virtual-array/index.ts b/packages/core/data/virtual-array/index.ts
index 30d62c4877..6ada5b90ab 100644
--- a/packages/core/data/virtual-array/index.ts
+++ b/packages/core/data/virtual-array/index.ts
@@ -4,7 +4,7 @@ import { ChangedData, ChangeType } from '../observable-array';
 /**
  * Event args for "itemsLoading" event.
  */
-export interface ItemsLoading extends EventData {
+export interface ItemsLoading<T = Observable> extends EventData<T> {
 	/**
 	 * Start index.
 	 */
diff --git a/packages/core/debugger/InspectorBackendCommands.ts b/packages/core/debugger/InspectorBackendCommands.ts
index d0743886b8..6dad2f441f 100644
--- a/packages/core/debugger/InspectorBackendCommands.ts
+++ b/packages/core/debugger/InspectorBackendCommands.ts
@@ -55,7 +55,7 @@ export namespace HeapDomain {
 				JSON.stringify({
 					method: 'Heap.garbageCollected',
 					params: { collection: collection },
-				}),
+				})
 			);
 		}
 		// Tracking started.
@@ -67,7 +67,7 @@ export namespace HeapDomain {
 						timestamp: timestamp,
 						snapshotData: snapshotData,
 					},
-				}),
+				})
 			);
 		}
 		// Tracking stopped.
@@ -79,7 +79,7 @@ export namespace HeapDomain {
 						timestamp: timestamp,
 						snapshotData: snapshotData,
 					},
-				}),
+				})
 			);
 		}
 	}
@@ -328,7 +328,7 @@ export namespace DebuggerDomain {
 				JSON.stringify({
 					method: 'Debugger.globalObjectCleared',
 					params: {},
-				}),
+				})
 			);
 		}
 		// Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
@@ -347,7 +347,7 @@ export namespace DebuggerDomain {
 						sourceURL: sourceURL,
 						sourceMapURL: sourceMapURL,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when virtual machine fails to parse the script.
@@ -362,7 +362,7 @@ export namespace DebuggerDomain {
 						errorLine: errorLine,
 						errorMessage: errorMessage,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when breakpoint is resolved to an actual script and location.
@@ -371,7 +371,7 @@ export namespace DebuggerDomain {
 				JSON.stringify({
 					method: 'Debugger.breakpointResolved',
 					params: { breakpointId: breakpointId, location: location },
-				}),
+				})
 			);
 		}
 		// Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
@@ -384,7 +384,7 @@ export namespace DebuggerDomain {
 						reason: reason,
 						data: data,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when the virtual machine resumed execution.
@@ -397,7 +397,7 @@ export namespace DebuggerDomain {
 				JSON.stringify({
 					method: 'Debugger.didSampleProbe',
 					params: { sample: sample },
-				}),
+				})
 			);
 		}
 		// Fired when a "sound" breakpoint action is triggered on a breakpoint.
@@ -406,7 +406,7 @@ export namespace DebuggerDomain {
 				JSON.stringify({
 					method: 'Debugger.playBreakpointActionSound',
 					params: { breakpointActionId: breakpointActionId },
-				}),
+				})
 			);
 		}
 	}
@@ -755,7 +755,7 @@ export namespace RuntimeDomain {
 				JSON.stringify({
 					method: 'Runtime.executionContextCreated',
 					params: { context: context },
-				}),
+				})
 			);
 		}
 	}
@@ -829,7 +829,7 @@ export namespace ConsoleDomain {
 				JSON.stringify({
 					method: 'Console.messageAdded',
 					params: { message: message },
-				}),
+				})
 			);
 		}
 		// Issued when subsequent message(s) are equal to the previous one(s).
@@ -838,7 +838,7 @@ export namespace ConsoleDomain {
 				JSON.stringify({
 					method: 'Console.messageRepeatCountUpdated',
 					params: { count: count },
-				}),
+				})
 			);
 		}
 		// Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation.
@@ -847,7 +847,7 @@ export namespace ConsoleDomain {
 				JSON.stringify({
 					method: 'Console.messagesCleared',
 					params: {},
-				}),
+				})
 			);
 		}
 		// Issued from console.takeHeapSnapshot.
@@ -860,7 +860,7 @@ export namespace ConsoleDomain {
 						snapshotData: snapshotData,
 						title: title,
 					},
-				}),
+				})
 			);
 		}
 	}
@@ -1126,7 +1126,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.domContentEventFired',
 					params: { timestamp: timestamp },
-				}),
+				})
 			);
 		}
 		loadEventFired(timestamp: number): void {
@@ -1134,7 +1134,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.loadEventFired',
 					params: { timestamp: timestamp },
-				}),
+				})
 			);
 		}
 		// Fired once navigation of the frame has completed. Frame is now associated with the new loader.
@@ -1143,7 +1143,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.frameNavigated',
 					params: { frame: frame },
-				}),
+				})
 			);
 		}
 		// Fired when frame has been detached from its parent.
@@ -1152,7 +1152,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.frameDetached',
 					params: { frameId: frameId },
-				}),
+				})
 			);
 		}
 		// Fired when frame has started loading.
@@ -1161,7 +1161,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.frameStartedLoading',
 					params: { frameId: frameId },
-				}),
+				})
 			);
 		}
 		// Fired when frame has stopped loading.
@@ -1170,7 +1170,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.frameStoppedLoading',
 					params: { frameId: frameId },
-				}),
+				})
 			);
 		}
 		// Fired when frame schedules a potential navigation.
@@ -1179,7 +1179,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.frameScheduledNavigation',
 					params: { frameId: frameId, delay: delay },
-				}),
+				})
 			);
 		}
 		// Fired when frame no longer has a scheduled navigation.
@@ -1188,7 +1188,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.frameClearedScheduledNavigation',
 					params: { frameId: frameId },
-				}),
+				})
 			);
 		}
 		// Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) is about to open.
@@ -1197,7 +1197,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.javascriptDialogOpening',
 					params: { message: message },
-				}),
+				})
 			);
 		}
 		// Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) has been closed.
@@ -1206,7 +1206,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.javascriptDialogClosed',
 					params: {},
-				}),
+				})
 			);
 		}
 		// Fired when the JavaScript is enabled/disabled on the page
@@ -1215,7 +1215,7 @@ export namespace PageDomain {
 				JSON.stringify({
 					method: 'Page.scriptsEnabled',
 					params: { isEnabled: isEnabled },
-				}),
+				})
 			);
 		}
 	}
@@ -1384,7 +1384,7 @@ export namespace NetworkDomain {
 						redirectResponse: redirectResponse,
 						type: type,
 					},
-				}),
+				})
 			);
 		}
 		// Fired if request ended up loading from cache.
@@ -1393,7 +1393,7 @@ export namespace NetworkDomain {
 				JSON.stringify({
 					method: 'Network.requestServedFromCache',
 					params: { requestId: requestId },
-				}),
+				})
 			);
 		}
 		// Fired when HTTP response is available.
@@ -1409,7 +1409,7 @@ export namespace NetworkDomain {
 						type: type,
 						response: response,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when data chunk was received over the network.
@@ -1423,7 +1423,7 @@ export namespace NetworkDomain {
 						dataLength: dataLength,
 						encodedDataLength: encodedDataLength,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when HTTP request has finished loading.
@@ -1436,7 +1436,7 @@ export namespace NetworkDomain {
 						timestamp: timestamp,
 						sourceMapURL: sourceMapURL,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when HTTP request has failed to load.
@@ -1450,7 +1450,7 @@ export namespace NetworkDomain {
 						errorText: errorText,
 						canceled: canceled,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when HTTP request has been served from memory cache.
@@ -1467,7 +1467,7 @@ export namespace NetworkDomain {
 						initiator: initiator,
 						resource: resource,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when WebSocket is about to initiate handshake.
@@ -1480,7 +1480,7 @@ export namespace NetworkDomain {
 						timestamp: timestamp,
 						request: request,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when WebSocket handshake response becomes available.
@@ -1493,7 +1493,7 @@ export namespace NetworkDomain {
 						timestamp: timestamp,
 						response: response,
 					},
-				}),
+				})
 			);
 		}
 		// Fired upon WebSocket creation.
@@ -1502,7 +1502,7 @@ export namespace NetworkDomain {
 				JSON.stringify({
 					method: 'Network.webSocketCreated',
 					params: { requestId: requestId, url: url },
-				}),
+				})
 			);
 		}
 		// Fired when WebSocket is closed.
@@ -1511,7 +1511,7 @@ export namespace NetworkDomain {
 				JSON.stringify({
 					method: 'Network.webSocketClosed',
 					params: { requestId: requestId, timestamp: timestamp },
-				}),
+				})
 			);
 		}
 		// Fired when WebSocket frame is received.
@@ -1524,7 +1524,7 @@ export namespace NetworkDomain {
 						timestamp: timestamp,
 						response: response,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when WebSocket frame error occurs.
@@ -1537,7 +1537,7 @@ export namespace NetworkDomain {
 						timestamp: timestamp,
 						errorMessage: errorMessage,
 					},
-				}),
+				})
 			);
 		}
 		// Fired when WebSocket frame is sent.
@@ -1550,7 +1550,7 @@ export namespace NetworkDomain {
 						timestamp: timestamp,
 						response: response,
 					},
-				}),
+				})
 			);
 		}
 	}
@@ -1751,7 +1751,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.setChildNodes',
 					params: { parentId: parentId, nodes: nodes },
-				}),
+				})
 			);
 		}
 		// Fired when <code>Element</code>'s attribute is modified.
@@ -1760,7 +1760,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.attributeModified',
 					params: { nodeId: nodeId, name: name, value: value },
-				}),
+				})
 			);
 		}
 		// Fired when <code>Element</code>'s attribute is removed.
@@ -1769,7 +1769,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.attributeRemoved',
 					params: { nodeId: nodeId, name: name },
-				}),
+				})
 			);
 		}
 		// Fired when <code>Element</code>'s inline style is modified via a CSS property modification.
@@ -1778,7 +1778,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.inlineStyleInvalidated',
 					params: { nodeIds: nodeIds },
-				}),
+				})
 			);
 		}
 		// Mirrors <code>DOMCharacterDataModified</code> event.
@@ -1787,7 +1787,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.characterDataModified',
 					params: { nodeId: nodeId, characterData: characterData },
-				}),
+				})
 			);
 		}
 		// Fired when <code>Container</code>'s child node count has changed.
@@ -1796,7 +1796,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.childNodeCountUpdated',
 					params: { nodeId: nodeId, childNodeCount: childNodeCount },
-				}),
+				})
 			);
 		}
 		// Mirrors <code>DOMNodeInserted</code> event.
@@ -1809,7 +1809,7 @@ export namespace DOMDomain {
 						previousNodeId: previousNodeId,
 						node: node,
 					},
-				}),
+				})
 			);
 		}
 		// Mirrors <code>DOMNodeRemoved</code> event.
@@ -1818,7 +1818,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.childNodeRemoved',
 					params: { parentNodeId: parentNodeId, nodeId: nodeId },
-				}),
+				})
 			);
 		}
 		// Called when shadow root is pushed into the element.
@@ -1827,7 +1827,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.shadowRootPushed',
 					params: { hostId: hostId, root: root },
-				}),
+				})
 			);
 		}
 		// Called when shadow root is popped from the element.
@@ -1836,7 +1836,7 @@ export namespace DOMDomain {
 				JSON.stringify({
 					method: 'DOM.shadowRootPopped',
 					params: { hostId: hostId, rootId: rootId },
-				}),
+				})
 			);
 		}
 		// Called when a pseudo element is added to an element.
@@ -1848,7 +1848,7 @@ export namespace DOMDomain {
 						parentId: parentId,
 						pseudoElement: pseudoElement,
 					},
-				}),
+				})
 			);
 		}
 		// Called when a pseudo element is removed from an element.
@@ -1860,7 +1860,7 @@ export namespace DOMDomain {
 						parentId: parentId,
 						pseudoElementId: pseudoElementId,
 					},
-				}),
+				})
 			);
 		}
 	}
@@ -2128,7 +2128,7 @@ export namespace CSSDomain {
 				JSON.stringify({
 					method: 'CSS.mediaQueryResultChanged',
 					params: {},
-				}),
+				})
 			);
 		}
 		// Fires whenever a web font gets loaded.
@@ -2141,7 +2141,7 @@ export namespace CSSDomain {
 				JSON.stringify({
 					method: 'CSS.styleSheetChanged',
 					params: { styleSheetId: styleSheetId },
-				}),
+				})
 			);
 		}
 		// Fired whenever an active document stylesheet is added.
@@ -2150,7 +2150,7 @@ export namespace CSSDomain {
 				JSON.stringify({
 					method: 'CSS.styleSheetAdded',
 					params: { header: header },
-				}),
+				})
 			);
 		}
 		// Fired whenever an active document stylesheet is removed.
@@ -2159,7 +2159,7 @@ export namespace CSSDomain {
 				JSON.stringify({
 					method: 'CSS.styleSheetRemoved',
 					params: { styleSheetId: styleSheetId },
-				}),
+				})
 			);
 		}
 		layoutEditorChange(styleSheetId: StyleSheetId, changeRange: SourceRange): void {
@@ -2170,7 +2170,7 @@ export namespace CSSDomain {
 						styleSheetId: styleSheetId,
 						changeRange: changeRange,
 					},
-				}),
+				})
 			);
 		}
 	}
diff --git a/packages/core/debugger/webinspector-network.android.ts b/packages/core/debugger/webinspector-network.android.ts
index 793d9040a8..bebb422314 100644
--- a/packages/core/debugger/webinspector-network.android.ts
+++ b/packages/core/debugger/webinspector-network.android.ts
@@ -1,5 +1,5 @@
 import * as inspectorCommands from './InspectorBackendCommands';
-import { getNativeApp } from '../application/helpers-common';
+import { getApplicationContext } from '../application/helpers.android';
 
 import * as debuggerDomains from '.';
 
@@ -36,10 +36,7 @@ export class Request {
 	private _data: any;
 	private _mimeType: string;
 
-	constructor(
-		private _networkDomainDebugger: NetworkDomainDebugger,
-		private _requestID: string,
-	) {}
+	constructor(private _networkDomainDebugger: NetworkDomainDebugger, private _requestID: string) {}
 
 	get mimeType(): string {
 		return this._mimeType;
@@ -225,7 +222,7 @@ export class NetworkDomainDebugger implements inspectorCommands.NetworkDomain.Ne
 	 * Loads a resource in the context of a frame on the inspected page without cross origin checks.
 	 */
 	loadResource(params: inspectorCommands.NetworkDomain.LoadResourceMethodArguments): { content: string; mimeType: string; status: number } {
-		const appPath = getNativeApp<android.app.Application>().getApplicationContext().getFilesDir().getCanonicalPath() + '/app';
+		const appPath = getApplicationContext().getFilesDir().getCanonicalPath() + '/app';
 		const pathUrl = params.url.replace('file://', appPath);
 		const file = new java.io.File(pathUrl);
 		const is = file.exists() ? new java.io.FileInputStream(file) : undefined;
diff --git a/packages/core/debugger/webinspector-network.ios.ts b/packages/core/debugger/webinspector-network.ios.ts
index 5af7487bcd..3bd35c26c6 100644
--- a/packages/core/debugger/webinspector-network.ios.ts
+++ b/packages/core/debugger/webinspector-network.ios.ts
@@ -35,10 +35,7 @@ export class Request {
 	private _data: any;
 	private _mimeType: string;
 
-	constructor(
-		private _networkDomainDebugger: NetworkDomainDebugger,
-		private _requestID: string,
-	) {}
+	constructor(private _networkDomainDebugger: NetworkDomainDebugger, private _requestID: string) {}
 
 	get mimeType(): string {
 		return this._mimeType;
diff --git a/packages/core/file-system/file-system-access.android.ts b/packages/core/file-system/file-system-access.android.ts
index acbffadca6..7ae3b31108 100644
--- a/packages/core/file-system/file-system-access.android.ts
+++ b/packages/core/file-system/file-system-access.android.ts
@@ -1,12 +1,17 @@
 import * as textModule from '../text';
-import { getNativeApp } from '../application/helpers-common';
+import { Application } from '../application';
+import { wrapNativeException } from '../utils';
+import { getApplicationContext } from '../application/helpers.android';
 import { getFileExtension } from '../utils/utils-shared';
 import { SDK_VERSION } from '../utils/constants';
 
 import type { IFileSystemAccess } from './file-system-access';
 
 function getOrSetHelper(path: string): org.nativescript.widgets.FileHelper {
-	return org.nativescript.widgets.FileHelper.fromString(getNativeApp<android.app.Application>().getApplicationContext(), path);
+	return org.nativescript.widgets.FileHelper.fromString(getApplicationContext(), path);
+}
+function getOrSetFolderHelper(path: string): org.nativescript.widgets.FolderHelper {
+	return org.nativescript.widgets.FolderHelper.fromString(getApplicationContext(), path);
 }
 
 function isContentUri(path: string): boolean {
@@ -47,18 +52,32 @@ export class FileSystemAccess implements IFileSystemAccess {
 		}
 	}
 
-	public getFile(path: string, onError?: (error: any) => any): { path: string; name: string; extension: string } {
-		return this.ensureFile(new java.io.File(path), false, onError);
+	public getFile(path: string, onError?: (error: any) => any, create: boolean = true): { path: string; name: string; extension: string } {
+		if (create) {
+			return this.ensureFile(new java.io.File(path), false, onError);
+		} else {
+			return {
+				path: path,
+				name: path.split('/').pop(),
+				extension: path.split('.').pop(),
+			};
+		}
 	}
 
-	public getFolder(path: string, onError?: (error: any) => any): { path: string; name: string } {
+	public getFolder(path: string, onError?: (error: any) => any, create: boolean = true): { path: string; name: string } {
 		const javaFile = new java.io.File(path);
-		const dirInfo = this.ensureFile(javaFile, true, onError);
-		if (!dirInfo) {
-			return undefined;
-		}
+		if (create) {
+			const dirInfo = this.ensureFile(javaFile, true, onError);
+			if (!dirInfo) {
+				return undefined;
+			}
 
-		return { path: dirInfo.path, name: dirInfo.name };
+			return { path: dirInfo.path, name: dirInfo.name };
+		}
+		return {
+			path,
+			name: path.split('/').pop(),
+		};
 	}
 
 	public eachEntity(path: string, onEntity: (file: { path: string; name: string; extension: string }) => boolean, onError?: (error: any) => any) {
@@ -129,10 +148,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 					onError({ message: 'File deletion failed' });
 				}
 			}
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -157,10 +174,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 					onError({ message: 'Folder deletion failed.' });
 				}
 			}
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -168,21 +183,14 @@ export class FileSystemAccess implements IFileSystemAccess {
 		try {
 			const javaFile = new java.io.File(path);
 			if (!javaFile.getCanonicalFile().isDirectory()) {
-				if (onError) {
-					onError({
-						message: 'The specified parameter is not a Folder entity.',
-					});
-				}
-
+				onError?.(new Error('The specified parameter is not a Folder entity.'));
 				return;
 			}
 
 			// TODO: Asynchronous
 			this.deleteFolderContent(javaFile);
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -213,30 +221,30 @@ export class FileSystemAccess implements IFileSystemAccess {
 	}
 
 	public getDocumentsFolderPath(): string {
-		const dir = getNativeApp<android.app.Application>().getApplicationContext().getFilesDir();
+		const dir = getApplicationContext().getFilesDir();
 
 		return dir.getAbsolutePath();
 	}
 	public getExternalDocumentsFolderPath(): string {
-		const dirs = getNativeApp<android.app.Application>().getApplicationContext().getExternalFilesDirs(null);
+		const dirs = getApplicationContext().getExternalFilesDirs(null);
 		let dir;
 		if (dirs && dirs.length > 1) {
 			dir = dirs[dirs.length - 1];
 		}
 		if (!dir) {
-			dir = getNativeApp<android.app.Application>().getApplicationContext().getExternalFilesDir(null);
+			dir = getApplicationContext().getExternalFilesDir(null);
 		}
 		return dir.getAbsolutePath();
 	}
 
 	public getLogicalRootPath(): string {
-		const dir = getNativeApp<android.app.Application>().getApplicationContext().getFilesDir();
+		const dir = getApplicationContext().getFilesDir();
 
 		return dir.getCanonicalPath();
 	}
 
 	public getTempFolderPath(): string {
-		const dir = getNativeApp<android.app.Application>().getApplicationContext().getCacheDir();
+		const dir = getApplicationContext().getCacheDir();
 
 		return dir.getAbsolutePath();
 	}
@@ -249,11 +257,9 @@ export class FileSystemAccess implements IFileSystemAccess {
 
 	public copySync(src: string, dest: string, onError?: (error: any) => any) {
 		try {
-			return org.nativescript.widgets.Async.File.copySync(src, dest, getNativeApp<android.app.Application>().getApplicationContext());
+			return org.nativescript.widgets.Async.File.copySync(src, dest, getApplicationContext());
 		} catch (error) {
-			if (onError) {
-				onError(error);
-			}
+			onError?.(wrapNativeException(error));
 		}
 
 		return false;
@@ -261,6 +267,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 
 	public copyAsync(src: string, dest: string): Promise<boolean> {
 		return new Promise<boolean>((resolve, reject) => {
+			// TODO: clean this i dont think the try catch is needed.
+			// also that all file can be refactored
 			try {
 				org.nativescript.widgets.Async.File.copy(
 					src,
@@ -273,11 +281,13 @@ export class FileSystemAccess implements IFileSystemAccess {
 							reject(err);
 						},
 					}),
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 				);
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -301,6 +311,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -312,10 +324,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			const buffer = new ArrayBuffer(javaFile.length());
 			channel.read(buffer as any);
 			return buffer;
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -339,6 +349,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -351,10 +363,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			dataInputStream.readFully(bytes);
 
 			return bytes;
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -387,6 +397,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -397,10 +409,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			const channel = stream.getChannel();
 			channel.write(FileSystemAccess.getBuffer(buffer));
 			stream.close();
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -416,15 +426,15 @@ export class FileSystemAccess implements IFileSystemAccess {
 						onComplete: () => {
 							resolve();
 						},
-						onError: (err) => {
-							reject(err);
-						},
+						onError: reject,
 					}),
 					null,
 				);
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -434,10 +444,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			const stream = new java.io.FileOutputStream(javaFile, true);
 			stream.write(bytes, 0, bytes.length);
 			stream.close();
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -453,15 +461,15 @@ export class FileSystemAccess implements IFileSystemAccess {
 						onComplete: () => {
 							resolve();
 						},
-						onError: (err) => {
-							reject(err);
-						},
+						onError: reject,
 					}),
 					null,
 				);
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -472,10 +480,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			const channel = stream.getChannel();
 			channel.write(FileSystemAccess.getBuffer(buffer));
 			stream.close();
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -491,15 +497,15 @@ export class FileSystemAccess implements IFileSystemAccess {
 						onComplete: () => {
 							resolve();
 						},
-						onError: (err) => {
-							reject(err);
-						},
+						onError: reject,
 					}),
 					null,
 				);
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -509,10 +515,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			const stream = new java.io.FileOutputStream(javaFile);
 			stream.write(bytes, 0, bytes.length);
 			stream.close();
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -537,15 +541,15 @@ export class FileSystemAccess implements IFileSystemAccess {
 							}
 							resolve(result);
 						},
-						onError: (err) => {
-							reject(err);
-						},
+						onError: reject,
 					}),
 					null,
 				);
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -588,10 +592,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 			bufferedReader.close();
 
 			return result;
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -622,15 +624,15 @@ export class FileSystemAccess implements IFileSystemAccess {
 						onComplete: () => {
 							resolve();
 						},
-						onError: (err) => {
-							reject(err);
-						},
+						onError: reject,
 					}),
 					null,
 				);
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -647,10 +649,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 
 			writer.write(content);
 			writer.close();
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -672,15 +672,15 @@ export class FileSystemAccess implements IFileSystemAccess {
 						onComplete: () => {
 							resolve();
 						},
-						onError: (err) => {
-							reject(err);
-						},
+						onError: reject,
 					}),
 					null,
 				);
 			} catch (ex) {
 				reject(ex);
 			}
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -697,16 +697,14 @@ export class FileSystemAccess implements IFileSystemAccess {
 
 			writer.write(content);
 			writer.close();
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
 	private deleteFolderContent(file: java.io.File): boolean {
 		const filesList = file.listFiles();
-		if (filesList.length === 0) {
+		if (!filesList || filesList.length === 0) {
 			return true; // Nothing to delete, so success!
 		}
 
@@ -740,12 +738,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 				}
 
 				if (!created) {
-					// TODO: unified approach for error messages
-					if (onError) {
-						onError('Failed to create new java File for path ' + javaFile.getAbsolutePath());
-					}
-
-					return undefined;
+					onError?.(new Error('Failed to create new java File for path ' + javaFile.getAbsolutePath()));
+					return;
 				} else {
 					javaFile.setReadable(true);
 					javaFile.setWritable(true);
@@ -759,13 +753,9 @@ export class FileSystemAccess implements IFileSystemAccess {
 				name: javaFile.getName(),
 				extension: this.getFileExtension(path),
 			};
-		} catch (exception) {
-			// TODO: unified approach for error messages
-			if (onError) {
-				onError(exception);
-			}
-
-			return undefined;
+		} catch (error) {
+			onError?.(wrapNativeException(error));
+			return;
 		}
 	}
 
@@ -775,14 +765,11 @@ export class FileSystemAccess implements IFileSystemAccess {
 		return getFileExtension(path);
 	}
 
-	private enumEntities(path: string, callback: (entity: { path: string; name: string; extension: string }) => boolean, onError?: (error) => any) {
+	protected enumEntities(path: string, callback: (entity: { path: string; name: string; extension: string }) => boolean, onError?: (error) => any) {
 		try {
 			let javaFile = new java.io.File(path);
 			if (!javaFile.getCanonicalFile().isDirectory()) {
-				if (onError) {
-					onError('There is no folder existing at path ' + path);
-				}
-
+				onError?.(new Error('There is no folder existing at path ' + path));
 				return;
 			}
 
@@ -808,10 +795,8 @@ export class FileSystemAccess implements IFileSystemAccess {
 					break;
 				}
 			}
-		} catch (exception) {
-			if (onError) {
-				onError(exception);
-			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
 	}
 
@@ -874,11 +859,23 @@ export class FileSystemAccess29 extends FileSystemAccess {
 
 	getParent(path: string, onError?: (error: any) => any): { path: string; name: string } {
 		if (isContentUri(path)) {
+			try {
+				const parent = getOrSetFolderHelper(path).getParent();
+				if (parent) {
+					return {
+						path: parent.getUri().toString(),
+						name: parent.getName(),
+					};
+				}
+			} catch (e) {
+				onError?.(wrapNativeException(e));
+				return;
+			}
 			return null;
 		}
 		return super.getParent(path, onError);
 	}
-	getFile(path: string, onError?: (error: any) => any): { path: string; name: string; extension: string } {
+	getFile(path: string, onError?: (error: any) => any, create: boolean = true): { path: string; name: string; extension: string } {
 		if (isContentUri(path)) {
 			try {
 				const file = getOrSetHelper(path);
@@ -889,62 +886,137 @@ export class FileSystemAccess29 extends FileSystemAccess {
 					extension: file.getExtension(),
 				};
 			} catch (e) {
-				if (typeof onError === 'function') {
-					onError(e);
-				}
+				onError?.(wrapNativeException(e));
 				return;
 			}
 		}
 		return super.getFile(path, onError);
 	}
-	getFolder(path: string, onError?: (error: any) => any): { path: string; name: string } {
+	getFolder(path: string, onError?: (error: any) => any, create: boolean = true): { path: string; name: string } {
 		if (isContentUri(path)) {
+			const folder = getOrSetFolderHelper(path);
+			if (folder) {
+				return {
+					path,
+					name: folder.getName(),
+				};
+			}
 			return null;
 		}
-		return super.getFolder(path, onError);
+		return super.getFolder(path, onError, create);
 	}
-	getEntities(path: string, onError?: (error: any) => any): { path: string; name: string; extension: string }[] {
-		if (isContentUri(path)) {
-			return null;
+
+	protected enumEntities(path: string, callback: (entity: { path: string; name: string; extension: string }) => boolean, onError?: (error) => any) {
+		if (!isContentUri(path)) {
+			return super.enumEntities(path, callback);
 		}
-		return super.getEntities(path, onError);
-	}
-	eachEntity(path: string, onEntity: (entity: { path: string; name: string; extension: string }) => boolean, onError?: (error: any) => any) {
-		if (isContentUri(path)) {
-			return null;
+		try {
+			const folder = getOrSetFolderHelper(path);
+			if (!folder) {
+				onError?.(new Error('There is no folder existing at path ' + path));
+				return;
+			}
+			const documentFolder = folder.getDocumentFile() as androidx.documentfile.provider.DocumentFile;
+			const filesList = documentFolder.listFiles();
+			const length = filesList.length;
+			let info;
+			let retVal;
+			let documentFile: androidx.documentfile.provider.DocumentFile;
+
+			for (let i = 0; i < length; i++) {
+				documentFile = filesList[i];
+
+				info = {
+					path: documentFile.getUri().toString(),
+					name: documentFile.getName(),
+				};
+
+				if (documentFile.isFile()) {
+					info.extension = this.getFileExtension(info.path);
+				}
+
+				retVal = callback(info);
+				if (retVal === false) {
+					break;
+				}
+			}
+		} catch (error) {
+			onError?.(wrapNativeException(error));
 		}
-		super.eachEntity(path, onEntity);
 	}
 	fileExists(path: string): boolean {
 		if (isContentUri(path)) {
-			return org.nativescript.widgets.FileHelper.exists(getNativeApp<android.app.Application>().getApplicationContext(), path);
+			return org.nativescript.widgets.FileHelper.exists(getApplicationContext(), path);
 		}
 		return super.fileExists(path);
 	}
 	folderExists(path: string): boolean {
 		if (isContentUri(path)) {
-			return null;
+			return org.nativescript.widgets.FolderHelper.exists(getApplicationContext(), path);
 		}
 		return super.folderExists(path);
 	}
 	deleteFile(path: string, onError?: (error: any) => any) {
 		if (isContentUri(path)) {
 			try {
-				getOrSetHelper(path).delete(getNativeApp<android.app.Application>().getApplicationContext());
+				getOrSetHelper(path).delete(getApplicationContext());
 			} catch (e) {
-				onError?.(e);
+				onError?.(wrapNativeException(e));
 			}
 		} else {
 			super.deleteFile(path, onError);
 		}
 	}
 	deleteFolder(path: string, onError?: (error: any) => any) {
-		if (!isContentUri(path)) {
+		if (isContentUri(path)) {
+			try {
+				getOrSetFolderHelper(path).delete(getApplicationContext());
+			} catch (e) {
+				onError?.(wrapNativeException(e));
+			}
+		} else {
 			super.deleteFolder(path, onError);
 		}
 	}
+	private deleteDocumentUriFolderContent(documentFile: androidx.documentfile.provider.DocumentFile): boolean {
+		if (!documentFile.isDirectory()) {
+			return false;
+		}
+		const filesList = documentFile.listFiles();
+		if (filesList.length === 0) {
+			return true; // Nothing to delete, so success!
+		}
+
+		let childFile: androidx.documentfile.provider.DocumentFile;
+		let success = false;
+
+		for (let i = 0; i < filesList.length; i++) {
+			childFile = filesList[i];
+			if (childFile.isDirectory()) {
+				success = this.deleteDocumentUriFolderContent(childFile);
+				if (!success) {
+					break;
+				}
+			}
+
+			success = childFile.delete();
+		}
+
+		return success;
+	}
 	emptyFolder(path: string, onError?: (error: any) => any): void {
-		if (!isContentUri(path)) {
+		if (isContentUri(path)) {
+			try {
+				const documentFile = getOrSetFolderHelper(path)?.getDocumentFile();
+				if (!documentFile?.isDirectory()) {
+					onError?.(new Error('The specified parameter is not a Folder entity.'));
+					return;
+				}
+				this.deleteDocumentUriFolderContent(documentFile);
+			} catch (error) {
+				onError?.(wrapNativeException(error));
+			}
+		} else {
 			super.emptyFolder(path, onError);
 		}
 	}
@@ -954,12 +1026,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			getOrSetHelper(path).renameSync(getNativeApp<android.app.Application>().getApplicationContext(), newPath, callback);
+			getOrSetHelper(path).renameSync(getApplicationContext(), newPath, callback);
 		} else {
 			super.rename(path, newPath, onError);
 		}
@@ -968,17 +1040,17 @@ export class FileSystemAccess29 extends FileSystemAccess {
 	public renameAsync(path: string, newPath: string): Promise<any> {
 		return new Promise<void>((resolve, reject) => {
 			getOrSetHelper(path).renameSync(
-				getNativeApp<android.app.Application>().getApplicationContext(),
+				getApplicationContext(),
 				newPath,
 				new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {
 						resolve();
 					},
-					onError(error) {
-						reject(error);
-					},
+					onError: reject,
 				}),
 			);
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
 		});
 	}
 
@@ -1001,17 +1073,17 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).appendBuffer(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					FileSystemAccess.getBuffer(content),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve();
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.appendAsync(path, content);
@@ -1023,12 +1095,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			getOrSetHelper(path).appendSync(getNativeApp<android.app.Application>().getApplicationContext(), FileSystemAccess.getBuffer(content), callback);
+			getOrSetHelper(path).appendSync(getApplicationContext(), FileSystemAccess.getBuffer(content), callback);
 		} else {
 			super.appendSync(path, content, onError);
 		}
@@ -1040,17 +1112,17 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).append(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					content,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve();
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.appendAsync(path, content);
@@ -1062,12 +1134,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			getOrSetHelper(path).appendSync(getNativeApp<android.app.Application>().getApplicationContext(), content, callback);
+			getOrSetHelper(path).appendSync(getApplicationContext(), content, callback);
 		} else {
 			super.appendSync(path, content, onError);
 		}
@@ -1079,18 +1151,18 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).appendText(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					content,
 					encoding ?? null,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve();
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.appendTextAsync(path, content, encoding);
@@ -1102,12 +1174,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			getOrSetHelper(path).appendTextSync(getNativeApp<android.app.Application>().getApplicationContext(), content, encoding ?? null, callback);
+			getOrSetHelper(path).appendTextSync(getApplicationContext(), content, encoding ?? null, callback);
 		} else {
 			super.appendTextSync(path, content, onError);
 		}
@@ -1117,19 +1189,19 @@ export class FileSystemAccess29 extends FileSystemAccess {
 
 	readTextAsync(path: string, encoding?: any): Promise<string> {
 		if (isContentUri(path)) {
-			return new Promise((resolve, reject) => {
+			return new Promise<string>((resolve, reject) => {
 				getOrSetHelper(path).readText(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					encoding ?? null,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve(result);
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.readTextAsync(path, encoding);
@@ -1140,12 +1212,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			return getOrSetHelper(path).readTextSync(getNativeApp<android.app.Application>().getApplicationContext(), encoding ?? null, callback);
+			return getOrSetHelper(path).readTextSync(getApplicationContext(), encoding ?? null, callback);
 		} else {
 			return super.readTextSync(path, onError, encoding);
 		}
@@ -1157,16 +1229,16 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise((resolve, reject) => {
 				getOrSetHelper(path).readBuffer(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve(result);
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.readBufferAsync(path);
@@ -1178,12 +1250,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			const ret = getOrSetHelper(path).readBufferSync(getNativeApp<android.app.Application>().getApplicationContext(), callback);
+			const ret = getOrSetHelper(path).readBufferSync(getApplicationContext(), callback);
 			if (ret) {
 				return null;
 			}
@@ -1198,16 +1270,16 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise((resolve, reject) => {
 				getOrSetHelper(path).read(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve(result);
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.readAsync(path);
@@ -1219,12 +1291,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			return getOrSetHelper(path).readSync(getNativeApp<android.app.Application>().getApplicationContext(), callback);
+			return getOrSetHelper(path).readSync(getApplicationContext(), callback);
 		}
 		return super.readSync(path, onError);
 	}
@@ -1235,18 +1307,18 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).writeText(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					content,
 					encoding ?? null,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve();
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.writeTextAsync(path, content, encoding);
@@ -1258,12 +1330,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			getOrSetHelper(path).writeTextSync(getNativeApp<android.app.Application>().getApplicationContext(), content, encoding ?? null, callback);
+			getOrSetHelper(path).writeTextSync(getApplicationContext(), content, encoding ?? null, callback);
 		} else {
 			super.writeTextSync(path, content, onError);
 		}
@@ -1275,17 +1347,17 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).writeBuffer(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					FileSystemAccess.getBuffer(content),
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve();
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.writeAsync(path, content);
@@ -1297,12 +1369,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			getOrSetHelper(path).writeSync(getNativeApp<android.app.Application>().getApplicationContext(), FileSystemAccess.getBuffer(content), callback);
+			getOrSetHelper(path).writeSync(getApplicationContext(), FileSystemAccess.getBuffer(content), callback);
 		} else {
 			super.writeSync(path, content, onError);
 		}
@@ -1314,17 +1386,17 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		if (isContentUri(path)) {
 			return new Promise<void>((resolve, reject) => {
 				getOrSetHelper(path).write(
-					getNativeApp<android.app.Application>().getApplicationContext(),
+					getApplicationContext(),
 					content,
 					new org.nativescript.widgets.FileHelper.Callback({
 						onSuccess(result) {
 							resolve();
 						},
-						onError(error) {
-							reject(error);
-						},
+						onError: reject,
 					}),
 				);
+			}).catch((ex) => {
+				throw wrapNativeException(ex);
 			});
 		}
 		return super.writeAsync(path, content);
@@ -1336,12 +1408,12 @@ export class FileSystemAccess29 extends FileSystemAccess {
 			if (typeof onError === 'function') {
 				callback = new org.nativescript.widgets.FileHelper.Callback({
 					onSuccess(result) {},
-					onError(error) {
-						onError(error);
+					onError(ex) {
+						onError(wrapNativeException(ex));
 					},
 				});
 			}
-			getOrSetHelper(path).writeSync(getNativeApp<android.app.Application>().getApplicationContext(), content, callback);
+			getOrSetHelper(path).writeSync(getApplicationContext(), content, callback);
 		} else {
 			super.writeSync(path, content, onError);
 		}
@@ -1357,12 +1429,103 @@ export class FileSystemAccess29 extends FileSystemAccess {
 		return super.getPathSeparator();
 	}
 	normalizePath(path: string): string {
+		if (isContentUri(path)) {
+			return android.net.Uri.parse(path).toString();
+		}
 		return super.normalizePath(path);
 	}
 	joinPath(left: string, right: string): string {
 		return super.joinPath(left, right);
 	}
 	joinPaths(paths: string[]): string {
+		const [firstPath, ...others] = paths;
+		if (isContentUri(firstPath)) {
+			// custom SAF uri generation
+			const split = firstPath.split('%3A');
+			if (split.length === 2) {
+				return [[firstPath, 'document', firstPath.split('/').pop()].join('/'), ...others].join('%2F');
+			} else {
+				return [firstPath, ...others].join('%2F');
+			}
+		}
 		return super.joinPaths(paths);
 	}
+	contains(path: string, fileName: string): boolean {
+		if (isContentUri(path)) {
+			return getOrSetFolderHelper(path).containsFileOrFolder(fileName);
+		} else {
+			const subPath = this.joinPath(path, fileName);
+
+			if (this.fileExists(subPath)) {
+				return true;
+			}
+
+			return this.folderExists(subPath);
+		}
+	}
+	getOrCreateFile?(
+		path: string,
+		fileName: string,
+		create?: boolean,
+	): {
+		path: string;
+		name: string;
+		extension: string;
+	} {
+		if (isContentUri(path)) {
+			const documentFile = getOrSetFolderHelper(path).getOrCreateFile(fileName, create);
+			const subPath = documentFile?.getUri()?.toString();
+			return documentFile
+				? {
+						path: subPath,
+						name: documentFile.getName(),
+						extension: getOrSetHelper(subPath).getExtension(),
+					}
+				: undefined;
+		} else {
+			const subPath = this.joinPath(path, fileName);
+
+			return super.getFile(
+				subPath,
+				(error) => {
+					throw error;
+				},
+				create,
+			);
+		}
+	}
+	/**
+	 *get a file inside a folder.
+	 * @param path folder path.
+	 * @param fileName filename to check
+	 * Returns boolean
+	 */
+	getOrCreateFolder?(
+		path: string,
+		fileName: string,
+		create?: boolean,
+	): {
+		path: string;
+		name: string;
+	} {
+		if (isContentUri(path)) {
+			const documentFile = getOrSetFolderHelper(path).getOrCreateFolder(fileName, create);
+			return documentFile
+				? {
+						path: documentFile.getUri().toString(),
+						name: documentFile.getName(),
+					}
+				: undefined;
+		} else {
+			const subPath = this.joinPath(path, fileName);
+
+			return super.getFolder(
+				subPath,
+				(error) => {
+					throw error;
+				},
+				create,
+			);
+		}
+	}
 }
diff --git a/packages/core/file-system/file-system-access.d.ts b/packages/core/file-system/file-system-access.d.ts
index cad617fcda..f3da4245a1 100644
--- a/packages/core/file-system/file-system-access.d.ts
+++ b/packages/core/file-system/file-system-access.d.ts
@@ -103,7 +103,7 @@ export interface IFileSystemAccess {
 	 * @param onError A callback function to use if any error occurs.
 	 * Returns path Absolute path of the file, name Name of the file, extension Extension of the file.
 	 */
-	getFile(path: string, onError?: (error: any) => any): { path: string; name: string; extension: string };
+	getFile(path: string, onError?: (error: any) => any, create?: boolean): { path: string; name: string; extension: string };
 
 	/**
 	 * Gets the folder of a file with a given path.
@@ -111,7 +111,7 @@ export interface IFileSystemAccess {
 	 * @param onError A callback function to use if any error occurs.
 	 * Returns path Absolute path of the folder, name Name of the folder.
 	 */
-	getFolder(path: string, onError?: (error: any) => any): { path: string; name: string };
+	getFolder(path: string, onError?: (error: any) => any, create?: boolean): { path: string; name: string };
 
 	/**
 	 * Gets all entities of a given path (folder)
@@ -328,6 +328,44 @@ export interface IFileSystemAccess {
 	 * Returns the joined path.
 	 */
 	joinPaths(paths: string[]): string;
+
+	/**
+	 * check if a folder contains a file.
+	 * @param path folder path.
+	 * @param fileName filename to check
+	 * Returns boolean
+	 */
+	contains?(path: string, fileName: string): boolean;
+
+	/**
+	 *get a file inside a folder.
+	 * @param path folder path.
+	 * @param fileName filename to check
+	 * Returns boolean
+	 */
+	getOrCreateFile?(
+		path: string,
+		fileName: string,
+		create?: boolean,
+	): {
+		path: string;
+		name: string;
+		extension: string;
+	};
+	/**
+	 *get a file inside a folder.
+	 * @param path folder path.
+	 * @param fileName filename to check
+	 * Returns boolean
+	 */
+	getOrCreateFolder?(
+		path: string,
+		fileName: string,
+		create?: boolean,
+	): {
+		path: string;
+		name: string;
+	};
 }
 
 export class FileSystemAccess implements IFileSystemAccess {
@@ -361,9 +399,9 @@ export class FileSystemAccess implements IFileSystemAccess {
 
 	getParent(path: string, onError?: (error: any) => any): { path: string; name: string };
 
-	getFile(path: string, onError?: (error: any) => any): { path: string; name: string; extension: string };
+	getFile(path: string, onError?: (error: any) => any, create?: boolean): { path: string; name: string; extension: string };
 
-	getFolder(path: string, onError?: (error: any) => any): { path: string; name: string };
+	getFolder(path: string, onError?: (error: any) => any, create?: boolean): { path: string; name: string };
 
 	getEntities(path: string, onError?: (error: any) => any): Array<{ path: string; name: string; extension: string }>;
 
diff --git a/packages/core/file-system/file-system-access.ios.ts b/packages/core/file-system/file-system-access.ios.ts
index e879bc8513..d5ac5cfdca 100644
--- a/packages/core/file-system/file-system-access.ios.ts
+++ b/packages/core/file-system/file-system-access.ios.ts
@@ -1,5 +1,5 @@
 import { encoding as textEncoding } from '../text';
-import { getFileExtension, iOSNativeHelper } from '../utils';
+import { getFileExtension, ios as IOSUtils } from '../utils';
 
 // TODO: Implement all the APIs receiving callback using async blocks
 // TODO: Check whether we need try/catch blocks for the iOS implementation
@@ -46,12 +46,12 @@ export class FileSystemAccess {
 		}
 	}
 
-	public getFile(path: string, onError?: (error: any) => any): { path: string; name: string; extension: string } {
+	public getFile(path: string, onError?: (error: any) => any, create: boolean = true): { path: string; name: string; extension: string } {
 		try {
 			const fileManager = NSFileManager.defaultManager;
 			const exists = fileManager.fileExistsAtPath(path);
 
-			if (!exists) {
+			if (create && !exists) {
 				const parentPath = this.getParent(path, onError).path;
 				if (!fileManager.createDirectoryAtPathWithIntermediateDirectoriesAttributesError(parentPath, true, null) || !fileManager.createFileAtPathContentsAttributes(path, null, null)) {
 					if (onError) {
@@ -62,7 +62,7 @@ export class FileSystemAccess {
 				}
 			}
 
-			const fileName = fileManager.displayNameAtPath(path);
+			const fileName = create ? fileManager.displayNameAtPath(path) : path.split('/').pop();
 
 			return {
 				path: path,
@@ -78,12 +78,12 @@ export class FileSystemAccess {
 		}
 	}
 
-	public getFolder(path: string, onError?: (error: any) => any): { path: string; name: string } {
+	public getFolder(path: string, onError?: (error: any) => any, create: boolean = true): { path: string; name: string } {
 		try {
 			const fileManager = NSFileManager.defaultManager;
 			const exists = this.folderExists(path);
 
-			if (!exists) {
+			if (create && !exists) {
 				try {
 					fileManager.createDirectoryAtPathWithIntermediateDirectoriesAttributesError(path, true, null);
 				} catch (ex) {
@@ -95,7 +95,7 @@ export class FileSystemAccess {
 				}
 			}
 
-			const dirName = fileManager.displayNameAtPath(path);
+			const dirName = create ? fileManager.displayNameAtPath(path) : path.split('/').pop();
 
 			return {
 				path: path,
@@ -257,7 +257,7 @@ export class FileSystemAccess {
 	}
 
 	public getCurrentAppPath(): string {
-		return iOSNativeHelper.getCurrentAppPath();
+		return IOSUtils.getCurrentAppPath();
 	}
 
 	public copy = this.copySync.bind(this);
@@ -293,6 +293,8 @@ export class FileSystemAccess {
 	}
 
 	public copyAsync(src: string, dest: string): Promise<boolean> {
+		// TODO: use  fileManager.copyItem in swift running on a background thread
+		// would be safer and prevent loading the whole thing in memory
 		return new Promise<boolean>((resolve, reject) => {
 			try {
 				NSData.dataWithContentsOfFileCompletion(src, (data) => {
@@ -684,7 +686,7 @@ export class FileSystemAccess {
 	}
 
 	public joinPaths(paths: string[]): string {
-		return iOSNativeHelper.joinPaths(...paths);
+		return IOSUtils.joinPaths(...paths);
 	}
 }
 
diff --git a/packages/core/file-system/index.d.ts b/packages/core/file-system/index.d.ts
index 7511bdf46c..cff4a3afaa 100644
--- a/packages/core/file-system/index.d.ts
+++ b/packages/core/file-system/index.d.ts
@@ -73,7 +73,7 @@ export class FileSystemEntity {
 /**
  * Contains Android-specific the file system helpers.
  */
-declare class Android {
+export class Android {
 	createFile(options: { relativePath?: string; name: string; mime: string; directory: AndroidDirectory }): File;
 }
 
@@ -81,7 +81,7 @@ declare class Android {
  * Contains iOS-specific the file system helpers.
  */
 
-declare class iOS {}
+export class iOS {}
 
 /**
  * Represents a File entity on the file system.
@@ -97,6 +97,11 @@ export class File extends FileSystemEntity {
 	 */
 	static exists(path: string): boolean;
 
+	/**
+	 * Can be used to determine if an entity is a Folder without testing for class (uglified).
+	 */
+	isFolder: false;
+
 	/**
 	 * Gets the extension of the file.
 	 */
@@ -160,7 +165,7 @@ export class File extends FileSystemEntity {
 	 * @param path The path to get/create the file at.
 	 * @param copy An optional value when set, copies the content-uri to a temp file enabling the legacy behaviour
 	 */
-	static fromPath(path: string, copy?: boolean): File;
+	static fromPath(path: string, copy?: boolean, create?: boolean): File;
 
 	/**
 	 * Reads the content of the file as a string using the specified encoding (defaults to UTF-8).
@@ -219,6 +224,11 @@ export class File extends FileSystemEntity {
  * Represents a Folder (directory) entity on the file system.
  */
 export class Folder extends FileSystemEntity {
+	/**
+	 * Can be used to determine if an entity is a Folder without testing for class (uglified).
+	 */
+	isFolder: true;
+
 	/**
 	 * Determines whether this instance is a KnownFolder (accessed through the KnownFolders object).
 	 */
@@ -228,7 +238,7 @@ export class Folder extends FileSystemEntity {
 	 * Gets or creates a Folder entity at the specified path.
 	 * @param path The path to get/create the folder at.
 	 */
-	static fromPath(path: string): Folder;
+	static fromPath(path: string, create?: boolean): Folder;
 
 	/**
 	 * Checks whether a Folder with the specified path already exists.
@@ -257,31 +267,33 @@ export class Folder extends FileSystemEntity {
 	/**
 	 * Gets or creates a File entity with the specified name within this Folder.
 	 * @param name The name of the file to get/create.
+	 * @param create create the file if not existing (default to true)
 	 */
-	getFile(name: string): File;
+	getFile(name: string, create?: boolean): File;
 
 	/**
 	 * Gets or creates a Folder entity with the specified name within this Folder.
 	 * @param name The name of the folder to get/create.
+	 * @param create create the file if not existing (default to true)
 	 */
-	getFolder(name: string): Folder;
+	getFolder(name: string, create?: boolean): Folder;
 
 	/**
 	 * Gets all the top-level entities residing within this folder.
 	 */
-	getEntities(): Promise<Array<FileSystemEntity>>;
+	getEntities(): Promise<Array<File | Folder>>;
 
 	/**
 	 * Gets all the top-level entities residing within this folder synchronously.
 	 * @param onError An optional function to be called if some error occurs.
 	 */
-	getEntitiesSync(onError?: (error: any) => any): Array<FileSystemEntity>;
+	getEntitiesSync(onError?: (error: any) => any): Array<File | Folder>;
 
 	/**
 	 * Enumerates all the top-level FileSystem entities residing within this folder.
 	 * @param onEntity A callback that receives the current entity. If the callback returns false this will mean for the iteration to stop.
 	 */
-	eachEntity(onEntity: (entity: FileSystemEntity) => boolean);
+	eachEntity(onEntity: (entity: File | Folder) => boolean);
 }
 
 /**
diff --git a/packages/core/file-system/index.ts b/packages/core/file-system/index.ts
index 57c686c951..7723e4c646 100644
--- a/packages/core/file-system/index.ts
+++ b/packages/core/file-system/index.ts
@@ -1,5 +1,7 @@
 import { IFileSystemAccess, FileSystemAccess, FileSystemAccess29 } from './file-system-access';
+import { FILE_PREFIX } from '../utils';
 import { SDK_VERSION } from '../utils/constants';
+import { getApplicationContext } from '../application/helpers.android';
 import { getNativeApp } from '../application/helpers-common';
 
 // The FileSystemAccess implementation, used through all the APIs.
@@ -11,7 +13,7 @@ let fileAccess: IFileSystemAccess;
  */
 export function getFileAccess(): IFileSystemAccess {
 	if (!fileAccess) {
-		if (__ANDROID__ && SDK_VERSION >= 29) {
+		if (__ANDROID__) {
 			fileAccess = new FileSystemAccess29();
 		} else {
 			fileAccess = new FileSystemAccess();
@@ -140,10 +142,12 @@ export class FileSystemEntity {
 		// call rename for FileSystemAccess29
 		if ((<any>fileAccess).__skip) {
 			fileAccess.rename(this.path, newName, localError);
-			const fileInfo = getFileAccess().getFile(this.path, null);
-			if (fileInfo) {
-				this._name = fileInfo.name;
-				this._extension = fileInfo.extension;
+			if (File.exists(this.path)) {
+				const fileInfo = getFileAccess().getFile(this.path, null);
+				if (fileInfo) {
+					this._name = fileInfo.name;
+					this._extension = fileInfo.extension;
+				}
 			}
 			return;
 		}
@@ -270,7 +274,7 @@ class Android {
 			throw new Error(`createFile is available on Android only!`);
 		}
 
-		const context = getNativeApp<android.app.Application>().getApplicationContext() as android.content.Context;
+		const context = getApplicationContext();
 
 		const meta = new android.content.ContentValues();
 		meta.put(android.provider.MediaStore.MediaColumns.DISPLAY_NAME, options.name);
@@ -304,6 +308,7 @@ class iOS {}
 const ios = new iOS();
 
 export class File extends FileSystemEntity {
+	isFolder = false;
 	public static get ios() {
 		return ios;
 	}
@@ -312,14 +317,17 @@ export class File extends FileSystemEntity {
 		return ad;
 	}
 
-	public static fromPath(path: string, copy: boolean = false) {
+	public static fromPath(path: string, copy: boolean = false, create: boolean = true) {
 		const onError = function (error) {
 			throw error;
 		};
-
+		if (__IOS__ && path.startsWith(FILE_PREFIX)) {
+			// if the path starts with file:// then fileAccess will see it as non existing even if it exists
+			path = path.substring(FILE_PREFIX.length);
+		}
 		if (__ANDROID__ && copy) {
 			if (path.startsWith('content:')) {
-				const fileInfo = getFileAccess().getFile(path, onError);
+				const fileInfo = getFileAccess().getFile(path, onError, create);
 				// falls back to creating a temp file without a known extension.
 				if (!fileInfo) {
 					const tempFile = `${knownFolders.temp().path}/${java.util.UUID.randomUUID().toString()}`;
@@ -335,7 +343,7 @@ export class File extends FileSystemEntity {
 			}
 		}
 
-		const fileInfo = getFileAccess().getFile(path, onError);
+		const fileInfo = getFileAccess().getFile(path, onError, create);
 		if (!fileInfo) {
 			return undefined;
 		}
@@ -386,22 +394,18 @@ export class File extends FileSystemEntity {
 				);
 		});
 	}
-
+	private _onCallback(callback) {
+		return (result) => {
+			this._locked = false;
+			callback?.(result);
+		};
+	}
 	public appendSync(content: any, onError?: (error: any) => any): void {
 		this._checkAccess();
 
 		try {
 			this._locked = true;
-
-			const that = this;
-			const localError = function (error) {
-				that._locked = false;
-				if (onError) {
-					onError(error);
-				}
-			};
-
-			getFileAccess().appendSync(this.path, content, localError);
+			getFileAccess().appendSync(this.path, content, this._onCallback(onError));
 		} finally {
 			this._locked = false;
 		}
@@ -439,16 +443,7 @@ export class File extends FileSystemEntity {
 
 		try {
 			this._locked = true;
-
-			const that = this;
-			const localError = function (error) {
-				that._locked = false;
-				if (onError) {
-					onError(error);
-				}
-			};
-
-			getFileAccess().appendTextSync(this.path, content, localError, encoding);
+			getFileAccess().appendTextSync(this.path, content, this._onCallback(onError), encoding);
 		} finally {
 			this._locked = false;
 		}
@@ -485,16 +480,7 @@ export class File extends FileSystemEntity {
 		this._checkAccess();
 
 		this._locked = true;
-
-		const that = this;
-		const localError = (error) => {
-			that._locked = false;
-			if (onError) {
-				onError(error);
-			}
-		};
-
-		const content = getFileAccess().copySync(this.path, dest, localError);
+		const content = getFileAccess().copySync(this.path, dest, this._onCallback(onError));
 
 		this._locked = false;
 
@@ -533,15 +519,7 @@ export class File extends FileSystemEntity {
 
 		this._locked = true;
 
-		const that = this;
-		const localError = (error) => {
-			that._locked = false;
-			if (onError) {
-				onError(error);
-			}
-		};
-
-		const content = getFileAccess().readSync(this.path, localError);
+		const content = getFileAccess().readSync(this.path, this._onCallback(onError));
 
 		this._locked = false;
 
@@ -581,15 +559,7 @@ export class File extends FileSystemEntity {
 		try {
 			this._locked = true;
 
-			const that = this;
-			const localError = function (error) {
-				that._locked = false;
-				if (onError) {
-					onError(error);
-				}
-			};
-
-			getFileAccess().writeSync(this.path, content, localError);
+			getFileAccess().writeSync(this.path, content, this._onCallback(onError));
 		} finally {
 			this._locked = false;
 		}
@@ -627,15 +597,7 @@ export class File extends FileSystemEntity {
 
 		this._locked = true;
 
-		const that = this;
-		const localError = (error) => {
-			that._locked = false;
-			if (onError) {
-				onError(error);
-			}
-		};
-
-		const content = getFileAccess().readTextSync(this.path, localError, encoding);
+		const content = getFileAccess().readTextSync(this.path, this._onCallback(onError), encoding);
 		this._locked = false;
 
 		return content;
@@ -673,16 +635,7 @@ export class File extends FileSystemEntity {
 
 		try {
 			this._locked = true;
-
-			const that = this;
-			const localError = function (error) {
-				that._locked = false;
-				if (onError) {
-					onError(error);
-				}
-			};
-
-			getFileAccess().writeTextSync(this.path, content, localError, encoding);
+			getFileAccess().writeTextSync(this.path, content, this._onCallback(onError), encoding);
 		} finally {
 			this._locked = false;
 		}
@@ -696,12 +649,19 @@ export class File extends FileSystemEntity {
 }
 
 export class Folder extends FileSystemEntity {
-	public static fromPath(path: string): Folder {
-		const onError = function (error) {
-			throw error;
-		};
-
-		const folderInfo = getFileAccess().getFolder(path, onError);
+	isFolder = true;
+	public static fromPath(path: string, create = true): Folder {
+		if (__IOS__ && path.startsWith(FILE_PREFIX)) {
+			// if the path starts with file:// then fileAccess will see it as non existing even if it exists
+			path = path.substring(FILE_PREFIX.length);
+		}
+		const folderInfo = getFileAccess().getFolder(
+			path,
+			(error) => {
+				throw error;
+			},
+			create,
+		);
 		if (!folderInfo) {
 			return undefined;
 		}
@@ -715,6 +675,9 @@ export class Folder extends FileSystemEntity {
 
 	public contains(name: string): boolean {
 		const fileAccess = getFileAccess();
+		if (fileAccess.contains) {
+			return fileAccess.contains(this.path, name);
+		}
 		const path = fileAccess.joinPath(this.path, name);
 
 		if (fileAccess.fileExists(path)) {
@@ -747,15 +710,21 @@ export class Folder extends FileSystemEntity {
 		return this._isKnown;
 	}
 
-	public getFile(name: string): File {
+	public getFile(name: string, create = true): File {
 		const fileAccess = getFileAccess();
+		if (fileAccess.getOrCreateFile) {
+			const fileInfo = fileAccess.getOrCreateFile(this.path, name, create);
+			return fileInfo ? createFile(fileInfo) : undefined;
+		}
 		const path = fileAccess.joinPath(this.path, name);
 
-		const onError = function (error) {
-			throw error;
-		};
-
-		const fileInfo = fileAccess.getFile(path, onError);
+		const fileInfo = fileAccess.getFile(
+			path,
+			(error) => {
+				throw error;
+			},
+			create,
+		);
 		if (!fileInfo) {
 			return undefined;
 		}
@@ -763,15 +732,21 @@ export class Folder extends FileSystemEntity {
 		return createFile(fileInfo);
 	}
 
-	public getFolder(name: string): Folder {
+	public getFolder(name: string, create = true): Folder {
 		const fileAccess = getFileAccess();
+		if (fileAccess.getOrCreateFolder) {
+			const folderInfo = fileAccess.getOrCreateFolder(this.path, name, create);
+			return folderInfo ? createFolder(folderInfo) : undefined;
+		}
 		const path = fileAccess.joinPath(this.path, name);
 
-		const onError = function (error) {
-			throw error;
-		};
-
-		const folderInfo = fileAccess.getFolder(path, onError);
+		const folderInfo = fileAccess.getFolder(
+			path,
+			(error) => {
+				throw error;
+			},
+			create,
+		);
 		if (!folderInfo) {
 			return undefined;
 		}
@@ -779,7 +754,7 @@ export class Folder extends FileSystemEntity {
 		return createFolder(folderInfo);
 	}
 
-	public getEntities(): Promise<Array<FileSystemEntity>> {
+	public getEntities(): Promise<Array<File | Folder>> {
 		return new Promise((resolve, reject) => {
 			let hasError = false;
 			const localError = function (error) {
@@ -794,13 +769,13 @@ export class Folder extends FileSystemEntity {
 		});
 	}
 
-	public getEntitiesSync(onError?: (error: any) => any): Array<FileSystemEntity> {
+	public getEntitiesSync(onError?: (error: any) => any): Array<File | Folder> {
 		const fileInfos = getFileAccess().getEntities(this.path, onError);
 		if (!fileInfos) {
 			return null;
 		}
 
-		const entities = new Array<FileSystemEntity>();
+		const entities = new Array<File | Folder>();
 		for (let i = 0; i < fileInfos.length; i++) {
 			if (fileInfos[i].extension) {
 				entities.push(createFile(fileInfos[i]));
@@ -812,7 +787,7 @@ export class Folder extends FileSystemEntity {
 		return entities;
 	}
 
-	public eachEntity(onEntity: (entity: FileSystemEntity) => boolean) {
+	public eachEntity(onEntity: (entity: File | Folder) => boolean) {
 		if (!onEntity) {
 			return;
 		}
@@ -1047,9 +1022,7 @@ export namespace path {
 	}
 
 	export function join(...paths: string[]): string {
-		const fileAccess = getFileAccess();
-
-		return fileAccess.joinPaths(paths);
+		return getFileAccess().joinPaths(paths);
 	}
 
 	export const separator = getFileAccess().getPathSeparator();
diff --git a/packages/core/global-types.d.ts b/packages/core/global-types.d.ts
index 78ca864489..2a051c32d5 100644
--- a/packages/core/global-types.d.ts
+++ b/packages/core/global-types.d.ts
@@ -134,7 +134,10 @@ declare const __COMMONJS__: boolean;
 declare const __ANDROID__: boolean;
 declare const __IOS__: boolean;
 declare const __VISIONOS__: boolean;
+declare const __ACCESSIBILITY_DEFAULT_ENABLED__: boolean;
+declare const __ONLY_ALLOW_ROOT_VARIABLES__: boolean;
 declare const __APPLE__: boolean;
+declare const __CSS_USE_CSS_TOOLS__: boolean;
 
 declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): number;
 declare function clearTimeout(timeoutId: number): void;
@@ -210,7 +213,7 @@ declare type HeaderInit = Headers | Array<string>;
 declare function fetch(url: string, init?: RequestInit): Promise<Response>;
 
 // declare var console: Console;
-declare var require: NodeRequire;
+declare let require: NodeRequire;
 
 // Extend NodeRequire with the webpack's require context extension.
 interface RequireContext {
@@ -235,9 +238,9 @@ interface WeakRef<T extends object> {
 declare var __dirname: string;
 declare var __filename: string;
 
-declare var module: NodeModule;
+declare let module: NodeModule;
 // Same as module.exports
-declare var exports: any;
+declare let exports: any;
 
 // Global functions
 declare function Deprecated(target: Object, key?: string | symbol, value?: any): void;
diff --git a/packages/core/globals/index.ts b/packages/core/globals/index.ts
index 70be070000..7bd76fb406 100644
--- a/packages/core/globals/index.ts
+++ b/packages/core/globals/index.ts
@@ -302,71 +302,73 @@ if (!global.NativeScriptHasPolyfilled) {
 
 	// DOM api polyfills
 	const glb = global as any;
-	if (__COMMONJS__) {
-		global.registerModule('timer', () => timer);
-		installPolyfills('timer', ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval']);
-
-		global.registerModule('animation', () => animationFrame);
-		installPolyfills('animation', ['requestAnimationFrame', 'cancelAnimationFrame']);
-
-		global.registerModule('media-query-list', () => mediaQueryList);
-		installPolyfills('media-query-list', ['matchMedia', 'MediaQueryList']);
-
-		global.registerModule('text', () => text);
-		installPolyfills('text', ['TextDecoder', 'TextEncoder']);
-
-		global.registerModule('xhr', () => xhrImpl);
-		installPolyfills('xhr', ['XMLHttpRequest', 'FormData', 'Blob', 'File', 'FileReader']);
-
-		global.registerModule('fetch', () => fetchPolyfill);
-		installPolyfills('fetch', ['fetch', 'Headers', 'Request', 'Response']);
-
-		global.registerModule('wgc', () => wgc);
-		installPolyfills('wgc', ['atob', 'btoa']);
-
-		global.registerModule('crypto', () => cryptoImpl);
-		installPolyfills('crypto', ['Crypto']);
-
-		global.registerModule('subtle', () => subtleCryptoImpl);
-		installPolyfills('subtle-crypto', ['Subtle']);
-	} else {
-		// timers
-		glb.setTimeout = timer.setTimeout;
-		glb.clearTimeout = timer.clearTimeout;
-		glb.setInterval = timer.setInterval;
-		glb.clearInterval = timer.clearInterval;
-
-		// animation frame
-		glb.requestAnimationFrame = animationFrame.requestAnimationFrame;
-		glb.cancelAnimationFrame = animationFrame.cancelAnimationFrame;
-
-		// media query list
-		glb.matchMedia = mediaQueryList.matchMedia;
-		glb.MediaQueryList = mediaQueryList.MediaQueryList;
-
-		// text
-		glb.TextDecoder = text.TextDecoder;
-		glb.TextEncoder = text.TextEncoder;
-
-		// xhr
-		glb.XMLHttpRequest = xhrImpl.XMLHttpRequest;
-		glb.FormData = xhrImpl.FormData;
-		glb.Blob = xhrImpl.Blob;
-		glb.File = xhrImpl.File;
-		glb.FileReader = xhrImpl.FileReader;
-
-		// fetch
-		glb.fetch = fetchPolyfill.fetch;
-		glb.Headers = fetchPolyfill.Headers;
-		glb.Request = fetchPolyfill.Request;
-		glb.Response = fetchPolyfill.Response;
-
-		// wgc
-		glb.atob = wgc.atob;
-		glb.btoa = wgc.btoa;
-
-		// wgc
-		glb.SubtleCrypto = subtleCryptoImpl.SubtleCrypto;
+	if (global.autoLoadPolyfills !== false) {
+		if (__COMMONJS__) {
+			global.registerModule('timer', () => timer);
+			installPolyfills('timer', ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval']);
+
+			global.registerModule('animation', () => animationFrame);
+			installPolyfills('animation', ['requestAnimationFrame', 'cancelAnimationFrame']);
+
+			global.registerModule('media-query-list', () => mediaQueryList);
+			installPolyfills('media-query-list', ['matchMedia', 'MediaQueryList']);
+
+			global.registerModule('text', () => text);
+			installPolyfills('text', ['TextDecoder', 'TextEncoder']);
+
+			global.registerModule('xhr', () => xhrImpl);
+			installPolyfills('xhr', ['XMLHttpRequest', 'FormData', 'Blob', 'File', 'FileReader']);
+
+			global.registerModule('fetch', () => fetchPolyfill);
+			installPolyfills('fetch', ['fetch', 'Headers', 'Request', 'Response']);
+
+			global.registerModule('wgc', () => wgc);
+			installPolyfills('wgc', ['atob', 'btoa']);
+
+			global.registerModule('crypto', () => cryptoImpl);
+			installPolyfills('crypto', ['Crypto']);
+
+			global.registerModule('subtle', () => subtleCryptoImpl);
+			installPolyfills('subtle-crypto', ['Subtle']);
+		} else {
+			// timers
+			glb.setTimeout = timer.setTimeout;
+			glb.clearTimeout = timer.clearTimeout;
+			glb.setInterval = timer.setInterval;
+			glb.clearInterval = timer.clearInterval;
+
+			// animation frame
+			glb.requestAnimationFrame = animationFrame.requestAnimationFrame;
+			glb.cancelAnimationFrame = animationFrame.cancelAnimationFrame;
+
+			// media query list
+			glb.matchMedia = mediaQueryList.matchMedia;
+			glb.MediaQueryList = mediaQueryList.MediaQueryList;
+
+			// text
+			glb.TextDecoder = text.TextDecoder;
+			glb.TextEncoder = text.TextEncoder;
+
+			// xhr
+			glb.XMLHttpRequest = xhrImpl.XMLHttpRequest;
+			glb.FormData = xhrImpl.FormData;
+			glb.Blob = xhrImpl.Blob;
+			glb.File = xhrImpl.File;
+			glb.FileReader = xhrImpl.FileReader;
+
+			// fetch
+			glb.fetch = fetchPolyfill.fetch;
+			glb.Headers = fetchPolyfill.Headers;
+			glb.Request = fetchPolyfill.Request;
+			glb.Response = fetchPolyfill.Response;
+
+			// wgc
+			glb.atob = wgc.atob;
+			glb.btoa = wgc.btoa;
+
+			// wgc
+			glb.SubtleCrypto = subtleCryptoImpl.SubtleCrypto;
+		}
 	}
 
 	glb.crypto = new cryptoImpl.Crypto();
diff --git a/packages/core/http/http-request/index.android.ts b/packages/core/http/http-request/index.android.ts
index 52aa3b2698..f574bac0b6 100644
--- a/packages/core/http/http-request/index.android.ts
+++ b/packages/core/http/http-request/index.android.ts
@@ -189,7 +189,7 @@ function buildJavaOptions(options: HttpRequestOptions) {
 	if (typeof options.method === 'string') {
 		javaOptions.method = options.method;
 	}
-	if (typeof options.content === 'string' || options.content instanceof FormData) {
+	if (typeof options.content === 'string' || (typeof FormData !== 'undefined' && options.content instanceof FormData)) {
 		const nativeString = new java.lang.String(options.content.toString());
 		const nativeBytes = nativeString.getBytes('UTF-8');
 		const nativeBuffer = java.nio.ByteBuffer.wrap(nativeBytes);
diff --git a/packages/core/http/http-request/index.ios.ts b/packages/core/http/http-request/index.ios.ts
index 96019a975d..b6b74f7d63 100644
--- a/packages/core/http/http-request/index.ios.ts
+++ b/packages/core/http/http-request/index.ios.ts
@@ -59,10 +59,12 @@ export function request(options: HttpRequestOptions): Promise<HttpResponse> {
 
 			return;
 		}
-
+		let debugRequest: domainDebugger.domains.network.NetworkRequest;
 		try {
-			const network = domainDebugger.getNetwork();
-			const debugRequest = network && network.create();
+			if (__DEV__) {
+				const network = domainDebugger.getNetwork();
+				debugRequest = network && network.create();
+			}
 
 			const urlRequest = NSMutableURLRequest.requestWithURL(NSURL.URLWithString(options.url));
 
@@ -76,7 +78,7 @@ export function request(options: HttpRequestOptions): Promise<HttpResponse> {
 				}
 			}
 
-			if (types.isString(options.content) || options.content instanceof FormData) {
+			if (types.isString(options.content) || (typeof FormData !== 'undefined' && options.content instanceof FormData)) {
 				urlRequest.HTTPBody = NSString.stringWithString(options.content.toString()).dataUsingEncoding(4);
 			} else if (options.content instanceof ArrayBuffer) {
 				const buffer = options.content as ArrayBuffer;
diff --git a/packages/core/image-asset/image-asset-common.ts b/packages/core/image-asset/image-asset-common.ts
index 029fc88073..bc4c411ed8 100644
--- a/packages/core/image-asset/image-asset-common.ts
+++ b/packages/core/image-asset/image-asset-common.ts
@@ -33,12 +33,12 @@ export class ImageAssetBase extends Observable implements ImageAssetDefinition {
 	public getImageAsync(callback: (image: any, error: Error) => void) {
 		//
 	}
+	getImage(): Promise<any> {
+		throw new Error('Method not implemented.');
+	}
 }
 
 function toPositiveInt(value: any): number {
-	if (value == null) {
-		return 0;
-	}
 	if (typeof value === 'number') {
 		return value > 0 ? Math.floor(value) : 0;
 	}
@@ -46,7 +46,7 @@ function toPositiveInt(value: any): number {
 		const parsed = parseInt(value, 10);
 		return isNaN(parsed) || parsed <= 0 ? 0 : parsed;
 	}
-	return 0;
+	return null;
 }
 
 function normalizeImageAssetOptions(options: ImageAssetOptions): ImageAssetOptions {
@@ -55,6 +55,8 @@ function normalizeImageAssetOptions(options: ImageAssetOptions): ImageAssetOptio
 	// to trigger default sizing downstream
 	(normalized as any).width = toPositiveInt((options as any)?.width);
 	(normalized as any).height = toPositiveInt((options as any)?.height);
+	(normalized as any).maxWidth = toPositiveInt((options as any)?.maxWidth);
+	(normalized as any).maxHeight = toPositiveInt((options as any)?.maxHeight);
 	if (typeof normalized.keepAspectRatio !== 'boolean') {
 		normalized.keepAspectRatio = true;
 	}
@@ -76,18 +78,22 @@ export function getAspectSafeDimensions(sourceWidth, sourceHeight, reqWidth, req
 }
 
 export function getRequestedImageSize(src: { width: number; height: number }, options: ImageAssetOptions): { width: number; height: number } {
-	const normalized = normalizeImageAssetOptions(options);
-	let reqWidth = normalized.width || Math.min(src.width, Screen.mainScreen.widthPixels);
-	let reqHeight = normalized.height || Math.min(src.height, Screen.mainScreen.heightPixels);
-
-	if (options && options.keepAspectRatio) {
-		const safeAspectSize = getAspectSafeDimensions(src.width, src.height, reqWidth, reqHeight);
-		reqWidth = safeAspectSize.width;
-		reqHeight = safeAspectSize.height;
+	options = normalizeImageAssetOptions(options);
+	if (options.width || options.height || options.maxWidth || options.maxHeight) {
+		let reqWidth = options.width || (options.maxWidth ? Math.min(options.maxWidth, src.width) : src.width);
+		let reqHeight = options.height || (options.maxHeight ? Math.min(options.maxHeight, src.height) : src.height);
+
+		if (options && options.keepAspectRatio) {
+			const safeAspectSize = getAspectSafeDimensions(src.width, src.height, reqWidth, reqHeight);
+			reqWidth = safeAspectSize.width;
+			reqHeight = safeAspectSize.height;
+		}
+
+		return {
+			width: reqWidth,
+			height: reqHeight,
+		};
 	}
 
-	return {
-		width: reqWidth,
-		height: reqHeight,
-	};
+	return src;
 }
diff --git a/packages/core/image-asset/index.android.ts b/packages/core/image-asset/index.android.ts
index 4bba7d1506..519afaf9d3 100644
--- a/packages/core/image-asset/index.android.ts
+++ b/packages/core/image-asset/index.android.ts
@@ -1,7 +1,8 @@
 import { ImageAssetBase, getRequestedImageSize } from './image-asset-common';
 import { path as fsPath, knownFolders } from '../file-system';
+import { getApplicationContext } from '../application/helpers.android';
+import { wrapNativeException } from '../utils';
 import { Screen } from '../platform/screen';
-import { getNativeApp } from '../application/helpers-common';
 export * from './image-asset-common';
 
 export class ImageAsset extends ImageAssetBase {
@@ -27,19 +28,32 @@ export class ImageAsset extends ImageAssetBase {
 
 	public getImageAsync(callback: (image, error) => void) {
 		org.nativescript.widgets.Utils.loadImageAsync(
-			getNativeApp<android.app.Application>().getApplicationContext(),
+			getApplicationContext(),
 			this.android,
 			JSON.stringify(this.options || {}),
-			Screen.mainScreen.widthPixels,
-			Screen.mainScreen.heightPixels,
 			new org.nativescript.widgets.Utils.AsyncImageCallback({
 				onSuccess(bitmap) {
 					callback(bitmap, null);
 				},
 				onError(ex) {
-					callback(null, ex);
+					callback(null, wrapNativeException(ex));
 				},
 			}),
 		);
 	}
+	public getImage() {
+		return new Promise((resolve, reject) => {
+			org.nativescript.widgets.Utils.loadImageAsync(
+				getApplicationContext(),
+				this.android,
+				JSON.stringify(this.options || {}),
+				new org.nativescript.widgets.Utils.AsyncImageCallback({
+					onSuccess: resolve,
+					onError: reject,
+				})
+			);
+		}).catch((ex) => {
+			throw wrapNativeException(ex);
+		});
+	}
 }
diff --git a/packages/core/image-asset/index.d.ts b/packages/core/image-asset/index.d.ts
index c6a7d247d4..21b05f47e1 100644
--- a/packages/core/image-asset/index.d.ts
+++ b/packages/core/image-asset/index.d.ts
@@ -3,6 +3,7 @@ import { Observable } from '../data/observable';
 export class ImageAsset extends Observable {
 	constructor(asset: any);
 	getImageAsync(callback: (image: any, error: any) => void); //UIImage for iOS and android.graphics.Bitmap for Android
+	getImage(): Promise<any>; //UIImage for iOS and android.graphics.Bitmap for Android
 	ios: any; //PHAsset
 	nativeImage: any; //UIImage for iOS and android.graphics.Bitmap for Android
 	android: any;
@@ -12,6 +13,8 @@ export class ImageAsset extends Observable {
 export interface ImageAssetOptions {
 	width?: number;
 	height?: number;
+	maxWidth?: number;
+	maxHeight?: number;
 	keepAspectRatio?: boolean;
-	autoScaleFactor?: boolean;
+	autoScaleFactor?: boolean; // iOS only
 }
diff --git a/packages/core/image-asset/index.ios.ts b/packages/core/image-asset/index.ios.ts
index 072be6fdb1..80ab069805 100644
--- a/packages/core/image-asset/index.ios.ts
+++ b/packages/core/image-asset/index.ios.ts
@@ -35,13 +35,12 @@ export class ImageAsset extends ImageAssetBase {
 		if (!this.ios && !this.nativeImage) {
 			callback(null, 'Asset cannot be found.');
 		}
-
 		const srcWidth = this.nativeImage ? this.nativeImage.size.width : this.ios.pixelWidth;
 		const srcHeight = this.nativeImage ? this.nativeImage.size.height : this.ios.pixelHeight;
 		const requestedSize = getRequestedImageSize({ width: srcWidth, height: srcHeight }, this.options);
 
 		if (this.nativeImage) {
-			callback(this.scaleImage(this.nativeImage, CGSizeMake(requestedSize.width, requestedSize.height)), null);
+			callback(requestedSize ? this.scaleImage(this.nativeImage, CGSizeMake(requestedSize.width, requestedSize.height)) : this.nativeImage, null);
 			queueGC();
 			return;
 		}
@@ -60,6 +59,36 @@ export class ImageAsset extends ImageAssetBase {
 		});
 	}
 
+	public getImage() {
+		return new Promise((resolve, reject) => {
+			if (!this.ios && !this.nativeImage) {
+				reject(new Error('Asset cannot be found.'));
+			}
+			const srcWidth = this.nativeImage ? this.nativeImage.size.width : this.ios.pixelWidth;
+			const srcHeight = this.nativeImage ? this.nativeImage.size.height : this.ios.pixelHeight;
+			const requestedSize = getRequestedImageSize({ width: srcWidth, height: srcHeight }, this.options);
+
+			if (this.nativeImage) {
+				resolve(requestedSize ? this.scaleImage(this.nativeImage, CGSizeMake(requestedSize.width, requestedSize.height)) : this.nativeImage);
+				queueGC();
+				return;
+			}
+
+			const imageRequestOptions = PHImageRequestOptions.alloc().init();
+			imageRequestOptions.deliveryMode = PHImageRequestOptionsDeliveryMode.HighQualityFormat;
+			imageRequestOptions.networkAccessAllowed = true;
+
+			PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(this.ios, requestedSize, PHImageContentMode.AspectFit, imageRequestOptions, (image, imageResultInfo) => {
+				if (image) {
+					resolve(this.scaleImage(image, requestedSize));
+				} else {
+					reject(new Error(imageResultInfo.valueForKey(PHImageErrorKey)));
+				}
+				queueGC();
+			});
+		});
+	}
+
 	private scaleImage(image: UIImage, requestedSize: { width: number; height: number }): UIImage {
 		return NativeScriptUtils.scaleImageWidthHeightScaleFactor(image, requestedSize.width, requestedSize.height, this.options?.autoScaleFactor === false ? 1.0 : 0.0);
 	}
diff --git a/packages/core/image-source/index.ios.ts b/packages/core/image-source/index.ios.ts
index 684cb3eb65..008afba82f 100644
--- a/packages/core/image-source/index.ios.ts
+++ b/packages/core/image-source/index.ios.ts
@@ -373,7 +373,7 @@ export class ImageSource implements ImageSourceDefinition {
 	public saveToFileAsync(path: string, format: 'png' | 'jpeg' | 'jpg', quality?: number): Promise<boolean> {
 		return new Promise<boolean>((resolve, reject) => {
 			if (!this.ios) {
-				reject(false);
+				reject(new Error('saveToFileAsync: no native image passed'));
 			}
 			let isSuccess = false;
 			try {
diff --git a/packages/core/platform/screen/index.android.ts b/packages/core/platform/screen/index.android.ts
index 664f06e407..68b5a595c9 100644
--- a/packages/core/platform/screen/index.android.ts
+++ b/packages/core/platform/screen/index.android.ts
@@ -5,7 +5,7 @@ class MainScreen {
 
 	private initMetrics(): void {
 		const nativeApp = getNativeApp() as android.app.Application;
-		nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
+		(nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE) as android.view.WindowManager).getDefaultDisplay().getRealMetrics(this._metrics);
 	}
 
 	private get metrics(): android.util.DisplayMetrics {
@@ -44,6 +44,3 @@ class MainScreen {
 export class Screen {
 	static mainScreen = new MainScreen();
 }
-
-// This retains compatibility with NS6
-export const screen = Screen;
diff --git a/packages/core/platforms/android/core.aar b/packages/core/platforms/android/core.aar
deleted file mode 100644
index 09b3af4f25..0000000000
Binary files a/packages/core/platforms/android/core.aar and /dev/null differ
diff --git a/packages/core/platforms/android/include.gradle b/packages/core/platforms/android/include.gradle
new file mode 100644
index 0000000000..d33a2bbda7
--- /dev/null
+++ b/packages/core/platforms/android/include.gradle
@@ -0,0 +1,51 @@
+
+dependencies {
+    def androidXViewPagerVersion = "1.0.0"
+    if (project.hasProperty("androidXViewPager")) {
+        androidXViewPagerVersion = androidXViewPager
+        println "\t + using android X library androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
+    }
+
+    def androidXFragmentVersion = "1.4.1"
+    if (project.hasProperty("androidXFragment")) {
+        androidXFragmentVersion = androidXFragment
+        println "\t +  using android X library androidx.fragment:fragment:$androidXFragmentVersion"
+    }
+
+    def androidXTransitionVersion = "1.4.1"
+    if (project.hasProperty("androidXTransition")) {
+        androidXTransitionVersion = androidXTransition
+        println "\t +  using android X library androidx.transition:transition:$androidXTransitionVersion"
+    }
+
+    def androidXExifInterfaceVersion = "1.3.3"
+    if (project.hasProperty("androidXExifInterface")) {
+        androidXExifInterfaceVersion = androidXExifInterface
+        println "\t +  using android X library androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
+    }
+
+
+    def androidXAppCompatVersion = "1.4.1"
+    if (project.hasProperty("androidXAppCompat")) {
+        androidXAppCompatVersion = androidXAppCompat
+        println "\t +  using android X library androidx.appcompat:appcompat:$androidXAppCompatVersion"
+    }
+
+		def androidXDocumentFileVersion = "1.0.1"
+		if (project.hasProperty("androidXDocumentFile")) {
+			androidXDocumentFileVersion = androidXDocumentFile
+		println "\t +  using android X library androidx.documentfile:documentfile:$androidXDocumentFileVersion"
+	}
+
+
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+
+    println 'Using android X'
+    // implementation 'androidx.viewpager:viewpager:' + androidxVersion
+    implementation "androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
+    implementation "androidx.fragment:fragment:$androidXFragmentVersion"
+    implementation "androidx.transition:transition:$androidXTransitionVersion"
+    implementation "androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
+    implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
+		implementation "androidx.documentfile:documentfile:$androidXDocumentFileVersion"
+}
\ No newline at end of file
diff --git a/packages/core/platforms/android/java b/packages/core/platforms/android/java
new file mode 120000
index 0000000000..ed47bd33dd
--- /dev/null
+++ b/packages/core/platforms/android/java
@@ -0,0 +1 @@
+../../../ui-mobile-base/android/widgets/src/main/java
\ No newline at end of file
diff --git a/packages/core/platforms/android/native-api-usage.json b/packages/core/platforms/android/native-api-usage.json
index cf2175dd6a..5a485e0ad7 100644
--- a/packages/core/platforms/android/native-api-usage.json
+++ b/packages/core/platforms/android/native-api-usage.json
@@ -1,32 +1,305 @@
 {
     "uses": [
-        "java.lang:*",
-        "java.lang.reflect:*",
-        "java.io:*",
-        "java.nio:*",
-        "java.util:*",
-        "com.tns*:*",
-        "org.nativescript*:*",
-        "android.content*:*",
-        "android.app*:*",
-        "android.os*:*",
-        "android.view*:*",
-        "android.net*:*",
-        "android.graphics*:*",
-        "android.util*:*",
-        "android.media*:*",
-        "android.widget*:*",
-        "android.animation*:*",
-        "android.provider*:*",
-        "android.text*:*",
-        "android.webkit*:*",
-        "androidx.appcompat*:*",
-        "androidx.core*:*",
-        "androidx.viewpager.widget*:*",
-        "androidx.fragment*:*",
-        "androidx.transition*:*",
-        "androidx.lifecycle*:*",
-        "android.inputmethodservice*:*",
-        "androidx.activity:ComponentActivity"
+        "android.animation:Animator",
+        "android.animation:Animator.AnimatorListener",
+        "android.animation:AnimatorSet",
+        "android.animation:AnimatorSet.Builder",
+        "android.animation:ArgbEvaluator",
+        "android.animation:ObjectAnimator",
+        "android.animation:StateListAnimator",
+        "android.animation:TimeInterpolator",
+        "android.animation:TypeEvaluator",
+        "android.animation:ValueAnimator",
+        "android.animation:ValueAnimator.AnimatorUpdateListener",
+        "android.app:ActionBar",
+        "android.app:Activity",
+        "android.app:AlertDialog",
+        "android.app:AlertDialog.Builder",
+        "android.app:Application",
+        "android.app:Application.ActivityLifecycleCallbacks",
+        "android.app:Dialog",
+        "android.content.pm:ActivityInfo",
+        "android.content.pm:ApplicationInfo",
+        "android.content.pm:ComponentInfo",
+        "android.content.pm:PackageItemInfo",
+        "android.content.pm:PackageManager",
+        "android.content.res:AssetManager",
+        "android.content.res:ColorStateList",
+        "android.content.res:Configuration",
+        "android.content.res:Resources",
+        "android.content.res:Resources.Theme",
+        "android.content:BroadcastReceiver",
+        "android.content:ClipData",
+        "android.content:ComponentCallbacks2",
+        "android.content:ComponentName",
+        "android.content:ContentResolver",
+        "android.content:Context",
+        "android.content:ContextWrapper",
+        "android.content:DialogInterface",
+        "android.content:DialogInterface.OnCancelListener",
+        "android.content:DialogInterface.OnClickListener",
+        "android.content:DialogInterface.OnDismissListener",
+        "android.content:Intent",
+        "android.content:IntentFilter",
+        "android.content:SharedPreferences",
+        "android.content:SharedPreferences.Editor",
+        "android.graphics.drawable:BitmapDrawable",
+        "android.graphics.drawable:ColorDrawable",
+        "android.graphics.drawable:Drawable",
+        "android.graphics.drawable:Drawable.Callback",
+        "android.graphics.drawable:Drawable.ConstantState",
+        "android.graphics.drawable:DrawableContainer",
+        "android.graphics.drawable:LayerDrawable",
+        "android.graphics.drawable:StateListDrawable",
+        "android.graphics:Bitmap",
+        "android.graphics:Bitmap.CompressFormat",
+        "android.graphics:Bitmap.Config",
+        "android.graphics:BitmapFactory",
+        "android.graphics:BitmapFactory.Options",
+        "android.graphics:Canvas",
+        "android.graphics:Color",
+        "android.graphics:Matrix",
+        "android.graphics:Paint",
+        "android.graphics:Paint.FontMetrics",
+        "android.graphics:PorterDuff",
+        "android.graphics:PorterDuff.Mode",
+        "android.graphics:Rect",
+        "android.graphics:Typeface",
+        "android.graphics:Typeface.Builder",
+        "android.inputmethodservice:Keyboard",
+        "android.inputmethodservice:Keyboard.Key",
+        "android.media:ExifInterface",
+        "android.net:ConnectivityManager",
+        "android.net:ConnectivityManager.NetworkCallback",
+        "android.net:Network",
+        "android.net:NetworkCapabilities",
+        "android.net:NetworkInfo",
+        "android.net:Uri",
+        "android.os:BaseBundle",
+        "android.os:Build",
+        "android.os:Build.VERSION",
+        "android.os:Bundle",
+        "android.os:Environment",
+        "android.os:Handler",
+        "android.os:IBinder",
+        "android.os:LocaleList",
+        "android.os:Looper",
+        "android.os:Parcelable",
+        "android.provider:Settings",
+        "android.provider:Settings.Secure",
+        "android.text.method:*Method",
+        "android.text.method:KeyListener",
+        "android.text.style:AbsoluteSizeSpan",
+        "android.text.style:BackgroundColorSpan",
+        "android.text.style:CharacterStyle",
+        "android.text.style:ClickableSpan",
+        "android.text.style:ForegroundColorSpan",
+        "android.text.style:MetricAffectingSpan",
+        "android.text.style:ScaleXSpan",
+        "android.text.style:StrikethroughSpan",
+        "android.text.style:StyleSpan",
+        "android.text.style:UnderlineSpan",
+        "android.text:Editable",
+        "android.text:Html",
+        "android.text:InputFilter",
+        "android.text:InputFilter.LengthFilter",
+        "android.text:InputType",
+        "android.text:Layout",
+        "android.text:SpannableStringBuilder",
+        "android.text:Spanned",
+        "android.text:TextPaint",
+        "android.text:TextUtils",
+        "android.text:TextUtils.TruncateAt",
+        "android.text:TextWatcher",
+        "android.util:AttributeSet",
+        "android.util:Base64",
+        "android.util:Base64OutputStream",
+        "android.util:DisplayMetrics",
+        "android.util:LruCache",
+        "android.util:SparseArray",
+        "android.util:TypedValue",
+        "android.view.accessibility:AccessibilityEvent",
+        "android.view.accessibility:AccessibilityManager",
+        "android.view.accessibility:AccessibilityManager.AccessibilityStateChangeListener",
+        "android.view.accessibility:AccessibilityManager.TouchExplorationStateChangeListener",
+        "android.view.accessibility:AccessibilityNodeInfo",
+        "android.view.animation:AccelerateDecelerateInterpolator",
+        "android.view.animation:AccelerateInterpolator",
+        "android.view.animation:Animation",
+        "android.view.animation:AnticipateOvershootInterpolator",
+        "android.view.animation:BounceInterpolator",
+        "android.view.animation:DecelerateInterpolator",
+        "android.view.animation:Interpolator",
+        "android.view.animation:LinearInterpolator",
+        "android.view.inputmethod:EditorInfo",
+        "android.view.inputmethod:InputMethodManager",
+        "android.view.inputmethod:InputMethodManager",
+        "android.view:Choreographer",
+        "android.view:Choreographer.FrameCallback",
+        "android.view:GestureDetector",
+        "android.view:GestureDetector.SimpleOnGestureListener",
+        "android.view:Gravity",
+        "android.view:KeyEvent",
+        "android.view:LayoutInflater",
+        "android.view:Menu",
+        "android.view:MenuItem",
+        "android.view:MotionEvent",
+        "android.view:ScaleGestureDetector",
+        "android.view:ScaleGestureDetector.SimpleOnScaleGestureListener",
+        "android.view:View",
+        "android.view:View.AccessibilityDelegate",
+        "android.view:View.OnAttachStateChangeListener",
+        "android.view:View.OnClickListener",
+        "android.view:View.OnFocusChangeListener",
+        "android.view:View.OnLayoutChangeListener",
+        "android.view:View.OnTouchListener",
+        "android.view:View.androidviewViewAccessibilityDelegate",
+        "android.view:ViewConfiguration",
+        "android.view:ViewGroup",
+        "android.view:ViewGroup.LayoutParams",
+        "android.view:ViewParent",
+        "android.view:ViewTreeObserver",
+        "android.view:ViewTreeObserver.OnGlobalLayoutListener",
+        "android.view:ViewTreeObserver.OnScrollChangedListener",
+        "android.view:Window",
+        "android.view:WindowInsetsController",
+        "android.view:WindowManager.LayoutParams",
+        "android.webkit:MimeTypeMap",
+        "android.webkit:URLUtil",
+        "android.webkit:WebResourceError",
+        "android.webkit:WebResourceRequest",
+        "android.webkit:WebSettings",
+        "android.webkit:WebView",
+        "android.webkit:WebViewClient",
+        "android.widget:AdapterView",
+        "android.widget:AdapterView.OnItemClickListener",
+        "android.widget:BaseAdapter",
+        "android.widget:Button",
+        "android.widget:CheckBox",
+        "android.widget:CompoundButton",
+        "android.widget:CompoundButton.OnCheckedChangeListener",
+        "android.widget:DatePicker",
+        "android.widget:DatePicker.OnDateChangedListener",
+        "android.widget:EditText",
+        "android.widget:FrameLayout",
+        "android.widget:HorizontalScrollView",
+        "android.widget:ImageButton",
+        "android.widget:ImageView",
+        "android.widget:ImageView.ScaleType",
+        "android.widget:LinearLayout",
+        "android.widget:ListView",
+        "android.widget:NumberPicker",
+        "android.widget:NumberPicker.Formatter",
+        "android.widget:NumberPicker.OnValueChangeListener",
+        "android.widget:ProgressBar",
+        "android.widget:RadioButton",
+        "android.widget:SeekBar",
+        "android.widget:SeekBar.OnSeekBarChangeListener",
+        "android.widget:Spinner",
+        "android.widget:Switch",
+        "android.widget:TabHost",
+        "android.widget:TabHost.OnTabChangeListener",
+        "android.widget:TabHost.TabContentFactory",
+        "android.widget:TabHost.TabSpec",
+        "android.widget:TabWidget",
+        "android.widget:TextView",
+        "android.widget:TextView.BufferType",
+        "android.widget:TextView.OnEditorActionListener",
+        "android.widget:TimePicker",
+        "android.widget:TimePicker.OnTimeChangedListener",
+        "androidx.appcompat.app:AppCompatActivity",
+        "androidx.appcompat.app:AppCompatDialog",
+        "androidx.appcompat.widget:AppCompatTextView",
+        "androidx.appcompat.widget:SearchView",
+        "androidx.appcompat.widget:SearchView.OnCloseListener",
+        "androidx.appcompat.widget:SearchView.OnQueryTextListener",
+        "androidx.appcompat.widget:Toolbar",
+        "androidx.appcompat.widget:Toolbar.OnMenuItemClickListener",
+        "androidx.core.content:FileProvider",
+        "androidx.core.content:FileProvider",
+        "androidx.core.graphics:BlendModeColorFilterCompat",
+        "androidx.core.graphics:BlendModeCompat",
+        "androidx.core.view.accessibility:AccessibilityManagerCompat",
+        "androidx.core.view.accessibility:AccessibilityManagerCompat.AccessibilityStateChangeListener",
+        "androidx.core.view.accessibility:AccessibilityManagerCompat.TouchExplorationStateChangeListener",
+        "androidx.core.view.animation:PathInterpolatorCompat",
+        "androidx.core.view:GestureDetectorCompat",
+        "androidx.core.view:NestedScrollView",
+        "androidx.core.view:NestedScrollView.OnScrollChangeListener",
+        "androidx.core.view:ViewCompat",
+        "androidx.core.widget:NestedScrollView",
+        "androidx.fragment.app:DialogFragment",
+        "androidx.fragment.app:Fragment",
+        "androidx.fragment.app:FragmentActivity",
+        "androidx.fragment.app:FragmentManager",
+        "androidx.fragment.app:FragmentTransaction",
+        "androidx.lifecycle:Lifecycle",
+        "androidx.lifecycle:Lifecycle.State",
+        "androidx.transition:Explode",
+        "androidx.transition:Fade",
+        "androidx.transition:Slide",
+        "androidx.transition:Transition",
+        "androidx.transition:Transition.TransitionListener",
+        "androidx.transition:TransitionSet",
+        "androidx.transition:ChangeBounds",
+        "androidx.transition:ChangeClipBounds",
+        "androidx.transition:ChangeTransform",
+        "androidx.transition:ChangeImageTransform",
+        "androidx.viewpager.widget:PagerAdapter",
+        "androidx.viewpager.widget:ViewPager",
+        "com.nativescript*:",
+        "com.tns:FragmentClass",
+        "com.tns:NativeScriptActivity",
+        "com.tns:NativeScriptApplication",
+        "com.tns:NativeScriptException",
+        "java.io:BufferedOutputStream",
+        "java.io:BufferedReader",
+        "java.io:ByteArrayOutputStream",
+        "java.io:DataInputStream",
+        "java.io:File",
+        "java.io:FileInputStream",
+        "java.io:FileNotFoundException",
+        "java.io:FileOutputStream",
+        "java.io:IOException",
+        "java.io:InputStream",
+        "java.io:InputStreamReader",
+        "java.io:OutputStream",
+        "java.io:OutputStreamWriter",
+        "java.lang.reflect:AccessibleObject",
+        "java.lang.reflect:Field",
+        "java.lang.reflect:Method",
+        "java.lang:CharSequence",
+        "java.lang:Class",
+        "java.lang:ClassLoader",
+        "java.lang:Double",
+        "java.lang:Exception",
+        "java.lang:Float",
+        "java.lang:Integer",
+        "java.lang:Long",
+        "java.lang:Number",
+        "java.lang:Object",
+        "java.lang:Runnable",
+        "java.lang:Runtime",
+        "java.lang:String",
+        "java.lang:System",
+        "java.lang:Throwable",
+        "java.net:URI",
+        "java.nio.file:Path",
+        "java.nio.file:Paths",
+        "java.nio:Buffer",
+        "java.nio:ByteBuffer",
+        "java.util:ArrayList",
+        "java.util:Arrays",
+        "java.util:Calendar",
+        "java.util:Date",
+        "java.util:HashMap",
+        "java.util:HashSet",
+        "java.util:Iterator",
+        "java.util:List",
+        "java.util:Locale",
+        "java.util:Map",
+        "java.util:Set",
+        "org.json:JSONObject",
+        "org.nativescript*:*"
     ]
 }
diff --git a/packages/core/platforms/android/widgets-release.aar b/packages/core/platforms/android/widgets-release.aar
deleted file mode 100644
index afb0d6db2a..0000000000
Binary files a/packages/core/platforms/android/widgets-release.aar and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist
deleted file mode 100644
index 394242f5c5..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>BinaryPath</key>
-			<string>TNSWidgets.framework/TNSWidgets</string>
-			<key>DebugSymbolsPath</key>
-			<string>dSYMs</string>
-			<key>LibraryIdentifier</key>
-			<string>xros-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>TNSWidgets.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>xros</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>TNSWidgets.framework/TNSWidgets</string>
-			<key>DebugSymbolsPath</key>
-			<string>dSYMs</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>TNSWidgets.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>TNSWidgets.framework/TNSWidgets</string>
-			<key>DebugSymbolsPath</key>
-			<string>dSYMs</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>TNSWidgets.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>TNSWidgets.framework/Versions/A/TNSWidgets</string>
-			<key>DebugSymbolsPath</key>
-			<string>dSYMs</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
-			<key>LibraryPath</key>
-			<string>TNSWidgets.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>TNSWidgets.framework/TNSWidgets</string>
-			<key>DebugSymbolsPath</key>
-			<string>dSYMs</string>
-			<key>LibraryIdentifier</key>
-			<string>xros-arm64</string>
-			<key>LibraryPath</key>
-			<string>TNSWidgets.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>xros</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSCCrypto.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSCCrypto.h
deleted file mode 100644
index c90f3a616f..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSCCrypto.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  NSCCrypto.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/07/2024.
-//  Copyright © 2024 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CommonCrypto/CommonCrypto.h>
-#import <Security/Security.h>
-#import <Security/SecItem.h>
-#ifndef NSCCrypto_h
-#define NSCCrypto_h
-
-typedef enum : NSUInteger {
-    kNSCCryptoRSASSA_PKCS1_v1_5,
-    kNSCCryptoRSA_PSS,
-    kNSCCryptoRSA_OAEP,
-} NSCCryptoRsaHashedKeyGenParamsName;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoHashSHA1,
-    kNSCCryptoHashSHA256,
-    kNSCCryptoHashSHA384,
-    kNSCCryptoHashSHA512
-} NSCCryptoHash;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoDecrypt,
-    kNSCCryptoEncrypt,
-    kNSCCryptoSign,
-    kNSCCryptoVerify,
-    kNSCCryptoDeriveKey,
-    kNSCCryptoDeriveBits,
-    kNSCCryptoWrapKey,
-    kNSCCryptoUnwrapKey,
-} NSCCryptoKeyUsages;
-
-
-
-@interface NSCCryptoKeyPair : NSObject
-@property (nonatomic, nonnull) SecKeyRef privateKey;
-@property (nonatomic, nonnull) SecKeyRef publicKey;
--(nonnull id)initWithPrivateKey:(nonnull SecKeyRef)privKey andPublicKey:(nonnull SecKeyRef)pubKey;
-@end
-
-@interface NSCCrypto:NSObject
-+ (nonnull NSString*)randomUUID;
-+ (nullable NSString*)getRandomValues:(nonnull void*)buffer length:(unsigned int)length;
-+ (nullable NSData*)digest:(nonnull void*)data length:(unsigned int)length mode:(int)mode;
-+ (nullable NSData *)generateKeyHmac:(int)hash length:(int)length;
-+ (nullable NSCCryptoKeyPair*)generateKeyRsa:(NSCCryptoRsaHashedKeyGenParamsName)name modulusLength:(unsigned int)modulusLength publicExponent:(nullable void*)exponent size:(unsigned int)size hash:(NSCCryptoHash)hash extractable:(BOOL)extractable keyUsages:(nonnull NSArray*) usages;
-+ (nullable NSData *)encryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-
-+ (nullable NSData *)decryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-@end
-#endif /* NSCCrypto_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSData+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSData+Async.h
deleted file mode 100644
index 3e0cc82072..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSData+Async.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  NSData+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 7.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSData (Async)
-
-+ (void)dataWithContentsOfFile:(nonnull NSString*)path
-                    completion:(void (^) (NSData*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-         completion:(void (^) (void))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSFileHandle+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSFileHandle+Async.h
deleted file mode 100644
index d5a2c888d8..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSFileHandle+Async.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  NSFileHandle+Async.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/05/2023.
-//  Copyright © 2023 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSFileHandle (Async)
-
-- (void)appendData:(nonnull NSData*) data
-         completion:(void (^) (NSError*))callback;
-
-+ (void)fileHandleWith:(NSString *)path data:(NSData *)data completion:(void (^)(NSFileHandle*,NSError*))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSString+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSString+Async.h
deleted file mode 100644
index 2f05922625..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSString+Async.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  NSString+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 5.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSString (Async)
-
-+ (void)stringWithContentsOfFile:(nonnull NSString*)path
-                        encoding:(NSStringEncoding)enc
-                      completion:(void (^) (NSString*, NSError*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-           encoding:(NSStringEncoding)enc
-         completion:(void (^) (NSError*))callback;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSLabel.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSLabel.h
deleted file mode 100644
index 1c170b9c9e..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSLabel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  TNSLabel.h
-//  TNSWidgets
-//
-//  Created by Hristo Hristov on 6/9/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface TNSLabel : UILabel
-
-@property(nonatomic) UIEdgeInsets padding;
-@property(nonatomic) UIEdgeInsets borderThickness;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSProcess.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSProcess.h
deleted file mode 100644
index d2f6570142..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSProcess.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  TNSProcess.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 15/05/2017.
-//  Copyright © 2017 Telerik A D. All rights reserved.
-//
-
-#ifndef TNSProcess_h
-#define TNSProcess_h
-
-#import <Foundation/Foundation.h>
-
-/**
- * Get the milliseconds since the process started.
- */
-double __tns_uptime(void);
-
-/**
- * Provides access to NSLog. The runtime implementation of console.log is filtered in release.
- * We rarely need to log in release but in cases such as when logging app startup times in release,
- * this will be convenient shortcut to NSLog, NSLog is not exposed.
- *
- * Please note the {N} CLI may be filtering app output, prefixing the message with "CONSOLE LOG"
- * will make the logs visible in "tns run ios --release" builds.
- */
-void __nslog(NSString* message);
-
-#endif /* TNSProcess_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSWidgets.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSWidgets.h
deleted file mode 100644
index d1448af880..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSWidgets.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  TNSWidgets.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 4/27/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TNSWidgets.
-FOUNDATION_EXPORT double TNSWidgetsVersionNumber;
-
-//! Project version string for TNSWidgets.
-FOUNDATION_EXPORT const unsigned char TNSWidgetsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TNSWidgets/PublicHeader.h>
-
-#import "UIImage+TNSBlocks.h"
-#import "UIView+PassThroughParent.h"
-#import "TNSLabel.h"
-#import "TNSProcess.h"
-#import "NSString+Async.h"
-#import "NSData+Async.h"
-#import "NSFileHandle+Async.h"
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
deleted file mode 100644
index 9e67228be6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  UIImage+UIImage_Async.h
-//  TKImageAsync
-//
-//  Created by Panayot Cankov on 4/18/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-@interface UIImage (TNSBlocks)
-
-/**
- * Similar to imageNamed: however it runs on a separate queue so the UI thread is not blocked.
- * It also draws the UIImage in a small thumb to force decoding potentially avoiding UI hicckups when displayed.
- */
-+ (void) tns_safeDecodeImageNamed: (NSString*) name completion: (void (^) (UIImage*))callback;
-
-/**
- * Same as imageNamed, however calls to this method are sinchronized to be thread safe in iOS8 along with calls to tns_safeImageNamed and tns_safeDecodeImageNamed:completion:
- * imageNamed is thread safe in iOS 9 and later so in later versions this methods simply fallbacks to imageNamed:
- */
-+ (UIImage*) tns_safeImageNamed: (NSString*) name;
-
-+ (void) tns_decodeImageWithData: (NSData*) data completion: (void (^) (UIImage*))callback;
-+ (void) tns_decodeImageWidthContentsOfFile: (NSString*) file completion: (void (^) (UIImage*))callback;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/UIView+PassThroughParent.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
deleted file mode 100644
index e5f68c5683..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  UIView+PassThroughParent.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PassThroughParent)
-
-- (BOOL) passThroughParent;
-- (void) setPassThroughParent:(BOOL) passThroughParent;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Info.plist
deleted file mode 100644
index 3e8856fb0f..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Info.plist and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Modules/module.modulemap b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Modules/module.modulemap
deleted file mode 100644
index b940cdff5c..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module TNSWidgets {
-  umbrella header "TNSWidgets.h"
-  export *
-
-  module * { export * }
-}
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
deleted file mode 100644
index d3d71a88f3..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  NSObject+Swizzling.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <objc/runtime.h>
-
-
-@interface NSObject (Swizzling)
-
-+ (void)swizzleInstanceMethodWithOriginalSelector:(SEL)originalSelector fromClass:(Class)classContainigOriginalSel withSwizzlingSelector:(SEL)swizzlingSelector;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
deleted file mode 100644
index 65ccdf02d6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  UIView+PropertyBag.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PropertyBag)
-
-- (id) propertyValueForKey:(NSString*) key;
-- (void) setPropertyValue:(id) value forKey:(NSString*) key;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets
deleted file mode 100755
index 1f778a403f..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
deleted file mode 100644
index ef076e3714..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.org.nativescript.TNSWidgets</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets
deleted file mode 100644
index ff074963a7..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
deleted file mode 100644
index f607baf884..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'arm64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-iphoneos/TNSWidgets.framework/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0x53B1F, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0xAEA0, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0x53B54, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0xAED0, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0x53B91, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x8000, symSize: 0x1E0 }
-  - { offsetInCU: 0xAB, offset: 0x53C15, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x8000, symSize: 0x1E0 }
-  - { offsetInCU: 0x182, offset: 0x53CEC, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x1E0, symBinAddr: 0x81E0, symSize: 0xA8 }
-  - { offsetInCU: 0x215, offset: 0x53D7F, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x288, symBinAddr: 0x8288, symSize: 0x18 }
-  - { offsetInCU: 0x24A, offset: 0x53DB4, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x2A0, symBinAddr: 0x82A0, symSize: 0x18 }
-  - { offsetInCU: 0x289, offset: 0x53DF3, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x2B8, symBinAddr: 0x82B8, symSize: 0x18 }
-  - { offsetInCU: 0x2BE, offset: 0x53E28, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x2D0, symBinAddr: 0x82D0, symSize: 0x18 }
-  - { offsetInCU: 0x27, offset: 0x53EB2, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x82E8, symSize: 0xF0 }
-  - { offsetInCU: 0x59, offset: 0x53EE4, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x82E8, symSize: 0xF0 }
-  - { offsetInCU: 0x186, offset: 0x54011, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0xF0, symBinAddr: 0x83D8, symSize: 0x28 }
-  - { offsetInCU: 0x27, offset: 0x54077, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x8400, symSize: 0xDC }
-  - { offsetInCU: 0x4A, offset: 0x5409A, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x8400, symSize: 0xDC }
-  - { offsetInCU: 0x129, offset: 0x54179, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xDC, symBinAddr: 0x84DC, symSize: 0x28C }
-  - { offsetInCU: 0x1DF, offset: 0x5422F, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x368, symBinAddr: 0x8768, symSize: 0x10 }
-  - { offsetInCU: 0x236, offset: 0x54286, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x378, symBinAddr: 0x8778, symSize: 0x34 }
-  - { offsetInCU: 0x25F, offset: 0x542AF, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x3AC, symBinAddr: 0x87AC, symSize: 0x28 }
-  - { offsetInCU: 0x27E, offset: 0x542CE, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x3D4, symBinAddr: 0x87D4, symSize: 0x3C }
-  - { offsetInCU: 0x2A7, offset: 0x542F7, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x410, symBinAddr: 0x8810, symSize: 0x30 }
-  - { offsetInCU: 0x2C6, offset: 0x54316, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x440, symBinAddr: 0x8840, symSize: 0x104 }
-  - { offsetInCU: 0x367, offset: 0x543B7, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x544, symBinAddr: 0x8944, symSize: 0x2D0 }
-  - { offsetInCU: 0x429, offset: 0x54479, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x814, symBinAddr: 0x8C14, symSize: 0x14 }
-  - { offsetInCU: 0x27, offset: 0x54819, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x8C28, symSize: 0x30 }
-  - { offsetInCU: 0x4F, offset: 0x54841, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x3D88, symBinAddr: 0xCD00, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0x5485A, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x8C28, symSize: 0x30 }
-  - { offsetInCU: 0xCE, offset: 0x548C0, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x30, symBinAddr: 0x8C58, symSize: 0x94 }
-  - { offsetInCU: 0x23B, offset: 0x54A2D, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xC4, symBinAddr: 0x8CEC, symSize: 0xB8 }
-  - { offsetInCU: 0x2C7, offset: 0x54AB9, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x17C, symBinAddr: 0x8DA4, symSize: 0xC8 }
-  - { offsetInCU: 0x347, offset: 0x54B39, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x244, symBinAddr: 0x8E6C, symSize: 0x10 }
-  - { offsetInCU: 0x39E, offset: 0x54B90, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x2B0, symBinAddr: 0x8E7C, symSize: 0x64 }
-  - { offsetInCU: 0x3F1, offset: 0x54BE3, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x314, symBinAddr: 0x8EE0, symSize: 0xB8 }
-  - { offsetInCU: 0x45D, offset: 0x54C4F, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x3CC, symBinAddr: 0x8F98, symSize: 0xC8 }
-  - { offsetInCU: 0x4DD, offset: 0x54CCF, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x494, symBinAddr: 0x9060, symSize: 0x10 }
-  - { offsetInCU: 0x534, offset: 0x54D26, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x4A4, symBinAddr: 0x9070, symSize: 0xB8 }
-  - { offsetInCU: 0x5A0, offset: 0x54D92, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x55C, symBinAddr: 0x9128, symSize: 0xC8 }
-  - { offsetInCU: 0x620, offset: 0x54E12, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x624, symBinAddr: 0x91F0, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x551ED, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x9200, symSize: 0x70 }
-  - { offsetInCU: 0x43, offset: 0x55209, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x9200, symSize: 0x70 }
-  - { offsetInCU: 0x139, offset: 0x552FF, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x70, symBinAddr: 0x9270, symSize: 0x120 }
-  - { offsetInCU: 0x27, offset: 0x555B4, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x9390, symSize: 0xDC }
-  - { offsetInCU: 0x4A, offset: 0x555D7, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x9390, symSize: 0xDC }
-  - { offsetInCU: 0x135, offset: 0x556C2, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xDC, symBinAddr: 0x946C, symSize: 0xEC }
-  - { offsetInCU: 0x1D5, offset: 0x55762, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x1C8, symBinAddr: 0x9558, symSize: 0x14 }
-  - { offsetInCU: 0x23C, offset: 0x557C9, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x2A4, symBinAddr: 0x956C, symSize: 0xF0 }
-  - { offsetInCU: 0x2ED, offset: 0x5587A, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x394, symBinAddr: 0x965C, symSize: 0xB8 }
-  - { offsetInCU: 0x3A1, offset: 0x5592E, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x44C, symBinAddr: 0x9714, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x55CCE, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x9724, symSize: 0xD4 }
-  - { offsetInCU: 0x4A, offset: 0x55CF1, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x9724, symSize: 0xD4 }
-  - { offsetInCU: 0x180, offset: 0x55E27, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xD4, symBinAddr: 0x97F8, symSize: 0xAC }
-  - { offsetInCU: 0x200, offset: 0x55EA7, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x180, symBinAddr: 0x98A4, symSize: 0x10 }
-  - { offsetInCU: 0x257, offset: 0x55EFE, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1EC, symBinAddr: 0x98B4, symSize: 0xEC }
-  - { offsetInCU: 0x2F8, offset: 0x55F9F, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x2D8, symBinAddr: 0x99A0, symSize: 0x84 }
-  - { offsetInCU: 0x37D, offset: 0x56024, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x35C, symBinAddr: 0x9A24, symSize: 0xC }
-  - { offsetInCU: 0x3C4, offset: 0x5606B, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x368, symBinAddr: 0x9A30, symSize: 0x10 }
-  - { offsetInCU: 0x3ED, offset: 0x56094, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x378, symBinAddr: 0x9A40, symSize: 0x8 }
-  - { offsetInCU: 0x27, offset: 0x5637A, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x9A48, symSize: 0x4 }
-  - { offsetInCU: 0x35, offset: 0x56388, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x4, symBinAddr: 0x9A4C, symSize: 0x84 }
-  - { offsetInCU: 0x5B, offset: 0x563AE, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x2880, symBinAddr: 0xCD08, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0x56412, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x2888, symBinAddr: 0xCD40, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0x56437, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x9A48, symSize: 0x4 }
-  - { offsetInCU: 0x163, offset: 0x564B6, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x9AD0, symSize: 0x4C }
-  - { offsetInCU: 0x1FA, offset: 0x5654D, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xD4, symBinAddr: 0x9B1C, symSize: 0x6C }
-  - { offsetInCU: 0x241, offset: 0x56594, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x140, symBinAddr: 0x9B88, symSize: 0x74 }
-  - { offsetInCU: 0x294, offset: 0x565E7, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x1B4, symBinAddr: 0x9BFC, symSize: 0xCC }
-  - { offsetInCU: 0x2DB, offset: 0x5662E, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x280, symBinAddr: 0x9CC8, symSize: 0xA8 }
-  - { offsetInCU: 0x31E, offset: 0x56671, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x328, symBinAddr: 0x9D70, symSize: 0x70 }
-  - { offsetInCU: 0x351, offset: 0x566A4, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x398, symBinAddr: 0x9DE0, symSize: 0x24 }
-  - { offsetInCU: 0x27, offset: 0x567CE, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x9E04, symSize: 0x4 }
-  - { offsetInCU: 0x41, offset: 0x567E8, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x1F8, symBinAddr: 0xC2E0, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0x567FC, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x4, symBinAddr: 0x9E08, symSize: 0x84 }
-  - { offsetInCU: 0x7B, offset: 0x56822, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x23F0, symBinAddr: 0xCD10, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0x5688F, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x9E04, symSize: 0x4 }
-  - { offsetInCU: 0x168, offset: 0x5690F, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x9E8C, symSize: 0x40 }
-  - { offsetInCU: 0x1A7, offset: 0x5694E, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xC8, symBinAddr: 0x9ECC, symSize: 0x54 }
-  - { offsetInCU: 0x1EE, offset: 0x56995, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x11C, symBinAddr: 0x9F20, symSize: 0x4C }
-  - { offsetInCU: 0x231, offset: 0x569D8, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x168, symBinAddr: 0x9F6C, symSize: 0x50 }
-...
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Headers b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Headers
deleted file mode 120000
index a177d2a6b9..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Headers
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Headers
\ No newline at end of file
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Modules b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Modules
deleted file mode 120000
index 5736f3186e..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Modules
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Modules
\ No newline at end of file
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/PrivateHeaders b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/PrivateHeaders
deleted file mode 120000
index d8e5645269..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/PrivateHeaders
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/PrivateHeaders
\ No newline at end of file
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Resources b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Resources
deleted file mode 120000
index 953ee36f3b..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Resources
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Resources
\ No newline at end of file
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/TNSWidgets
deleted file mode 120000
index e68c33d644..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/TNSWidgets
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/TNSWidgets
\ No newline at end of file
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSCCrypto.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSCCrypto.h
deleted file mode 100644
index c90f3a616f..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSCCrypto.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  NSCCrypto.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/07/2024.
-//  Copyright © 2024 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CommonCrypto/CommonCrypto.h>
-#import <Security/Security.h>
-#import <Security/SecItem.h>
-#ifndef NSCCrypto_h
-#define NSCCrypto_h
-
-typedef enum : NSUInteger {
-    kNSCCryptoRSASSA_PKCS1_v1_5,
-    kNSCCryptoRSA_PSS,
-    kNSCCryptoRSA_OAEP,
-} NSCCryptoRsaHashedKeyGenParamsName;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoHashSHA1,
-    kNSCCryptoHashSHA256,
-    kNSCCryptoHashSHA384,
-    kNSCCryptoHashSHA512
-} NSCCryptoHash;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoDecrypt,
-    kNSCCryptoEncrypt,
-    kNSCCryptoSign,
-    kNSCCryptoVerify,
-    kNSCCryptoDeriveKey,
-    kNSCCryptoDeriveBits,
-    kNSCCryptoWrapKey,
-    kNSCCryptoUnwrapKey,
-} NSCCryptoKeyUsages;
-
-
-
-@interface NSCCryptoKeyPair : NSObject
-@property (nonatomic, nonnull) SecKeyRef privateKey;
-@property (nonatomic, nonnull) SecKeyRef publicKey;
--(nonnull id)initWithPrivateKey:(nonnull SecKeyRef)privKey andPublicKey:(nonnull SecKeyRef)pubKey;
-@end
-
-@interface NSCCrypto:NSObject
-+ (nonnull NSString*)randomUUID;
-+ (nullable NSString*)getRandomValues:(nonnull void*)buffer length:(unsigned int)length;
-+ (nullable NSData*)digest:(nonnull void*)data length:(unsigned int)length mode:(int)mode;
-+ (nullable NSData *)generateKeyHmac:(int)hash length:(int)length;
-+ (nullable NSCCryptoKeyPair*)generateKeyRsa:(NSCCryptoRsaHashedKeyGenParamsName)name modulusLength:(unsigned int)modulusLength publicExponent:(nullable void*)exponent size:(unsigned int)size hash:(NSCCryptoHash)hash extractable:(BOOL)extractable keyUsages:(nonnull NSArray*) usages;
-+ (nullable NSData *)encryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-
-+ (nullable NSData *)decryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-@end
-#endif /* NSCCrypto_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSData+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSData+Async.h
deleted file mode 100644
index 3e0cc82072..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSData+Async.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  NSData+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 7.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSData (Async)
-
-+ (void)dataWithContentsOfFile:(nonnull NSString*)path
-                    completion:(void (^) (NSData*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-         completion:(void (^) (void))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSFileHandle+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSFileHandle+Async.h
deleted file mode 100644
index d5a2c888d8..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSFileHandle+Async.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  NSFileHandle+Async.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/05/2023.
-//  Copyright © 2023 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSFileHandle (Async)
-
-- (void)appendData:(nonnull NSData*) data
-         completion:(void (^) (NSError*))callback;
-
-+ (void)fileHandleWith:(NSString *)path data:(NSData *)data completion:(void (^)(NSFileHandle*,NSError*))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSString+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSString+Async.h
deleted file mode 100644
index 2f05922625..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/NSString+Async.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  NSString+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 5.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSString (Async)
-
-+ (void)stringWithContentsOfFile:(nonnull NSString*)path
-                        encoding:(NSStringEncoding)enc
-                      completion:(void (^) (NSString*, NSError*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-           encoding:(NSStringEncoding)enc
-         completion:(void (^) (NSError*))callback;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSLabel.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSLabel.h
deleted file mode 100644
index 1c170b9c9e..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSLabel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  TNSLabel.h
-//  TNSWidgets
-//
-//  Created by Hristo Hristov on 6/9/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface TNSLabel : UILabel
-
-@property(nonatomic) UIEdgeInsets padding;
-@property(nonatomic) UIEdgeInsets borderThickness;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSProcess.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSProcess.h
deleted file mode 100644
index d2f6570142..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSProcess.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  TNSProcess.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 15/05/2017.
-//  Copyright © 2017 Telerik A D. All rights reserved.
-//
-
-#ifndef TNSProcess_h
-#define TNSProcess_h
-
-#import <Foundation/Foundation.h>
-
-/**
- * Get the milliseconds since the process started.
- */
-double __tns_uptime(void);
-
-/**
- * Provides access to NSLog. The runtime implementation of console.log is filtered in release.
- * We rarely need to log in release but in cases such as when logging app startup times in release,
- * this will be convenient shortcut to NSLog, NSLog is not exposed.
- *
- * Please note the {N} CLI may be filtering app output, prefixing the message with "CONSOLE LOG"
- * will make the logs visible in "tns run ios --release" builds.
- */
-void __nslog(NSString* message);
-
-#endif /* TNSProcess_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSWidgets.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSWidgets.h
deleted file mode 100644
index d1448af880..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/TNSWidgets.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  TNSWidgets.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 4/27/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TNSWidgets.
-FOUNDATION_EXPORT double TNSWidgetsVersionNumber;
-
-//! Project version string for TNSWidgets.
-FOUNDATION_EXPORT const unsigned char TNSWidgetsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TNSWidgets/PublicHeader.h>
-
-#import "UIImage+TNSBlocks.h"
-#import "UIView+PassThroughParent.h"
-#import "TNSLabel.h"
-#import "TNSProcess.h"
-#import "NSString+Async.h"
-#import "NSData+Async.h"
-#import "NSFileHandle+Async.h"
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/UIImage+TNSBlocks.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/UIImage+TNSBlocks.h
deleted file mode 100644
index 9e67228be6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/UIImage+TNSBlocks.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  UIImage+UIImage_Async.h
-//  TKImageAsync
-//
-//  Created by Panayot Cankov on 4/18/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-@interface UIImage (TNSBlocks)
-
-/**
- * Similar to imageNamed: however it runs on a separate queue so the UI thread is not blocked.
- * It also draws the UIImage in a small thumb to force decoding potentially avoiding UI hicckups when displayed.
- */
-+ (void) tns_safeDecodeImageNamed: (NSString*) name completion: (void (^) (UIImage*))callback;
-
-/**
- * Same as imageNamed, however calls to this method are sinchronized to be thread safe in iOS8 along with calls to tns_safeImageNamed and tns_safeDecodeImageNamed:completion:
- * imageNamed is thread safe in iOS 9 and later so in later versions this methods simply fallbacks to imageNamed:
- */
-+ (UIImage*) tns_safeImageNamed: (NSString*) name;
-
-+ (void) tns_decodeImageWithData: (NSData*) data completion: (void (^) (UIImage*))callback;
-+ (void) tns_decodeImageWidthContentsOfFile: (NSString*) file completion: (void (^) (UIImage*))callback;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/UIView+PassThroughParent.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/UIView+PassThroughParent.h
deleted file mode 100644
index e5f68c5683..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Headers/UIView+PassThroughParent.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  UIView+PassThroughParent.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PassThroughParent)
-
-- (BOOL) passThroughParent;
-- (void) setPassThroughParent:(BOOL) passThroughParent;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Modules/module.modulemap b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Modules/module.modulemap
deleted file mode 100644
index b940cdff5c..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module TNSWidgets {
-  umbrella header "TNSWidgets.h"
-  export *
-
-  module * { export * }
-}
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/PrivateHeaders/NSObject+Swizzling.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/PrivateHeaders/NSObject+Swizzling.h
deleted file mode 100644
index d3d71a88f3..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/PrivateHeaders/NSObject+Swizzling.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  NSObject+Swizzling.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <objc/runtime.h>
-
-
-@interface NSObject (Swizzling)
-
-+ (void)swizzleInstanceMethodWithOriginalSelector:(SEL)originalSelector fromClass:(Class)classContainigOriginalSel withSwizzlingSelector:(SEL)swizzlingSelector;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/PrivateHeaders/UIView+PropertyBag.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/PrivateHeaders/UIView+PropertyBag.h
deleted file mode 100644
index 65ccdf02d6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/PrivateHeaders/UIView+PropertyBag.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  UIView+PropertyBag.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PropertyBag)
-
-- (id) propertyValueForKey:(NSString*) key;
-- (void) setPropertyValue:(id) value forKey:(NSString*) key;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Resources/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index cb0e41074b..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>23F79</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>TNSWidgets</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.nativescript.TNSWidgets</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>TNSWidgets</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string></string>
-	<key>DTPlatformName</key>
-	<string>macosx</string>
-	<key>DTPlatformVersion</key>
-	<string>14.5</string>
-	<key>DTSDKBuild</key>
-	<string>23F73</string>
-	<key>DTSDKName</key>
-	<string>macosx14.5</string>
-	<key>DTXcode</key>
-	<string>1540</string>
-	<key>DTXcodeBuild</key>
-	<string>15F31d</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>2</integer>
-	</array>
-</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/TNSWidgets
deleted file mode 100755
index 23aba5fa13..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/Current b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/Current
deleted file mode 120000
index 8c7e5a667f..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
deleted file mode 100644
index ef076e3714..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.org.nativescript.TNSWidgets</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets
deleted file mode 100644
index ee253f12c7..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
deleted file mode 100644
index e7aea3e3c5..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'arm64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-maccatalyst/TNSWidgets.framework/Versions/A/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0xD145E, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0x3640, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0xD1493, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0x3670, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0xD14D0, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1198, symSize: 0x1E0 }
-  - { offsetInCU: 0xAC, offset: 0xD1555, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1198, symSize: 0x1E0 }
-  - { offsetInCU: 0x183, offset: 0xD162C, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x1E0, symBinAddr: 0x1378, symSize: 0xA8 }
-  - { offsetInCU: 0x216, offset: 0xD16BF, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x288, symBinAddr: 0x1420, symSize: 0x18 }
-  - { offsetInCU: 0x24B, offset: 0xD16F4, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x2A0, symBinAddr: 0x1438, symSize: 0x18 }
-  - { offsetInCU: 0x28A, offset: 0xD1733, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x2B8, symBinAddr: 0x1450, symSize: 0x18 }
-  - { offsetInCU: 0x2BF, offset: 0xD1768, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x2D0, symBinAddr: 0x1468, symSize: 0x18 }
-  - { offsetInCU: 0x27, offset: 0xD17F2, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1480, symSize: 0xF0 }
-  - { offsetInCU: 0x59, offset: 0xD1824, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1480, symSize: 0xF0 }
-  - { offsetInCU: 0x186, offset: 0xD1951, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0xF0, symBinAddr: 0x1570, symSize: 0x28 }
-  - { offsetInCU: 0x27, offset: 0xD19B7, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1598, symSize: 0xDC }
-  - { offsetInCU: 0x4A, offset: 0xD19DA, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1598, symSize: 0xDC }
-  - { offsetInCU: 0x129, offset: 0xD1AB9, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xDC, symBinAddr: 0x1674, symSize: 0xE4 }
-  - { offsetInCU: 0x1BD, offset: 0xD1B4D, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x1C0, symBinAddr: 0x1758, symSize: 0x10 }
-  - { offsetInCU: 0x214, offset: 0xD1BA4, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x1D0, symBinAddr: 0x1768, symSize: 0x34 }
-  - { offsetInCU: 0x23D, offset: 0xD1BCD, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x204, symBinAddr: 0x179C, symSize: 0x28 }
-  - { offsetInCU: 0x25C, offset: 0xD1BEC, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x22C, symBinAddr: 0x17C4, symSize: 0x3C }
-  - { offsetInCU: 0x285, offset: 0xD1C15, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x268, symBinAddr: 0x1800, symSize: 0x30 }
-  - { offsetInCU: 0x2A4, offset: 0xD1C34, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x298, symBinAddr: 0x1830, symSize: 0x104 }
-  - { offsetInCU: 0x345, offset: 0xD1CD5, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x39C, symBinAddr: 0x1934, symSize: 0x11C }
-  - { offsetInCU: 0x3E5, offset: 0xD1D75, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x4B8, symBinAddr: 0x1A50, symSize: 0x14 }
-  - { offsetInCU: 0x27, offset: 0xD212B, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x1A64, symSize: 0x30 }
-  - { offsetInCU: 0x4F, offset: 0xD2153, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x3D68, symBinAddr: 0x8520, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0xD216C, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x1A64, symSize: 0x30 }
-  - { offsetInCU: 0xCE, offset: 0xD21D2, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x30, symBinAddr: 0x1A94, symSize: 0x94 }
-  - { offsetInCU: 0x23B, offset: 0xD233F, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xC4, symBinAddr: 0x1B28, symSize: 0xB8 }
-  - { offsetInCU: 0x2C7, offset: 0xD23CB, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x17C, symBinAddr: 0x1BE0, symSize: 0xC8 }
-  - { offsetInCU: 0x347, offset: 0xD244B, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x244, symBinAddr: 0x1CA8, symSize: 0x10 }
-  - { offsetInCU: 0x39E, offset: 0xD24A2, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x2B0, symBinAddr: 0x1CB8, symSize: 0x64 }
-  - { offsetInCU: 0x3F1, offset: 0xD24F5, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x314, symBinAddr: 0x1D1C, symSize: 0xB8 }
-  - { offsetInCU: 0x45D, offset: 0xD2561, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x3CC, symBinAddr: 0x1DD4, symSize: 0xC8 }
-  - { offsetInCU: 0x4DD, offset: 0xD25E1, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x494, symBinAddr: 0x1E9C, symSize: 0x10 }
-  - { offsetInCU: 0x534, offset: 0xD2638, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x4A4, symBinAddr: 0x1EAC, symSize: 0xB8 }
-  - { offsetInCU: 0x5A0, offset: 0xD26A4, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x55C, symBinAddr: 0x1F64, symSize: 0xC8 }
-  - { offsetInCU: 0x620, offset: 0xD2724, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x624, symBinAddr: 0x202C, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0xD2B2A, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x203C, symSize: 0x70 }
-  - { offsetInCU: 0x43, offset: 0xD2B46, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x203C, symSize: 0x70 }
-  - { offsetInCU: 0x139, offset: 0xD2C3C, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x70, symBinAddr: 0x20AC, symSize: 0x120 }
-  - { offsetInCU: 0x27, offset: 0xD2EF1, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x21CC, symSize: 0xDC }
-  - { offsetInCU: 0x4A, offset: 0xD2F14, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x21CC, symSize: 0xDC }
-  - { offsetInCU: 0x135, offset: 0xD2FFF, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xDC, symBinAddr: 0x22A8, symSize: 0xEC }
-  - { offsetInCU: 0x1D5, offset: 0xD309F, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x1C8, symBinAddr: 0x2394, symSize: 0x14 }
-  - { offsetInCU: 0x23C, offset: 0xD3106, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x2A4, symBinAddr: 0x23A8, symSize: 0xF0 }
-  - { offsetInCU: 0x2ED, offset: 0xD31B7, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x394, symBinAddr: 0x2498, symSize: 0xB8 }
-  - { offsetInCU: 0x3A1, offset: 0xD326B, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x44C, symBinAddr: 0x2550, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0xD362A, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2560, symSize: 0xD4 }
-  - { offsetInCU: 0x4A, offset: 0xD364D, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2560, symSize: 0xD4 }
-  - { offsetInCU: 0x180, offset: 0xD3783, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xD4, symBinAddr: 0x2634, symSize: 0xAC }
-  - { offsetInCU: 0x200, offset: 0xD3803, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x180, symBinAddr: 0x26E0, symSize: 0x10 }
-  - { offsetInCU: 0x257, offset: 0xD385A, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1EC, symBinAddr: 0x26F0, symSize: 0xEC }
-  - { offsetInCU: 0x2F8, offset: 0xD38FB, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x2D8, symBinAddr: 0x27DC, symSize: 0x84 }
-  - { offsetInCU: 0x37D, offset: 0xD3980, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x35C, symBinAddr: 0x2860, symSize: 0xC }
-  - { offsetInCU: 0x3C4, offset: 0xD39C7, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x368, symBinAddr: 0x286C, symSize: 0x10 }
-  - { offsetInCU: 0x3ED, offset: 0xD39F0, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x378, symBinAddr: 0x287C, symSize: 0x8 }
-  - { offsetInCU: 0x27, offset: 0xD3CF3, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x2884, symSize: 0x4 }
-  - { offsetInCU: 0x35, offset: 0xD3D01, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x4, symBinAddr: 0x2888, symSize: 0x84 }
-  - { offsetInCU: 0x5B, offset: 0xD3D27, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x2868, symBinAddr: 0x8528, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0xD3D8B, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x2870, symBinAddr: 0x8538, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0xD3DB0, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x2884, symSize: 0x4 }
-  - { offsetInCU: 0x163, offset: 0xD3E2F, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x290C, symSize: 0x4C }
-  - { offsetInCU: 0x1FA, offset: 0xD3EC6, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xD4, symBinAddr: 0x2958, symSize: 0x6C }
-  - { offsetInCU: 0x241, offset: 0xD3F0D, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x140, symBinAddr: 0x29C4, symSize: 0x74 }
-  - { offsetInCU: 0x294, offset: 0xD3F60, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x1B4, symBinAddr: 0x2A38, symSize: 0xCC }
-  - { offsetInCU: 0x2DB, offset: 0xD3FA7, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x280, symBinAddr: 0x2B04, symSize: 0xA8 }
-  - { offsetInCU: 0x31E, offset: 0xD3FEA, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x328, symBinAddr: 0x2BAC, symSize: 0x70 }
-  - { offsetInCU: 0x351, offset: 0xD401D, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x398, symBinAddr: 0x2C1C, symSize: 0x24 }
-  - { offsetInCU: 0x27, offset: 0xD414F, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x2C40, symSize: 0x4 }
-  - { offsetInCU: 0x41, offset: 0xD4169, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x1F8, symBinAddr: 0x4250, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0xD417D, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x4, symBinAddr: 0x2C44, symSize: 0x84 }
-  - { offsetInCU: 0x7B, offset: 0xD41A3, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x23D0, symBinAddr: 0x8530, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0xD4210, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x2C40, symSize: 0x4 }
-  - { offsetInCU: 0x168, offset: 0xD4290, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x2CC8, symSize: 0x40 }
-  - { offsetInCU: 0x1A7, offset: 0xD42CF, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xC8, symBinAddr: 0x2D08, symSize: 0x54 }
-  - { offsetInCU: 0x1EE, offset: 0xD4316, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x11C, symBinAddr: 0x2D5C, symSize: 0x4C }
-  - { offsetInCU: 0x231, offset: 0xD4359, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x168, symBinAddr: 0x2DA8, symSize: 0x50 }
-...
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml
deleted file mode 100644
index 51f53440ee..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'x86_64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-maccatalyst/TNSWidgets.framework/Versions/A/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0xD458C, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0x3590, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0xD45C1, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0x35C0, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0xD45FE, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1469, symSize: 0x388 }
-  - { offsetInCU: 0xAC, offset: 0xD4683, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1469, symSize: 0x388 }
-  - { offsetInCU: 0x180, offset: 0xD4757, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x388, symBinAddr: 0x17F1, symSize: 0xDD }
-  - { offsetInCU: 0x1EC, offset: 0xD47C3, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x465, symBinAddr: 0x18CE, symSize: 0x20 }
-  - { offsetInCU: 0x221, offset: 0xD47F8, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x485, symBinAddr: 0x18EE, symSize: 0x1E }
-  - { offsetInCU: 0x25F, offset: 0xD4836, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x4A3, symBinAddr: 0x190C, symSize: 0x20 }
-  - { offsetInCU: 0x294, offset: 0xD486B, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x4C3, symBinAddr: 0x192C, symSize: 0x1E }
-  - { offsetInCU: 0x27, offset: 0xD48F4, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x194A, symSize: 0xF8 }
-  - { offsetInCU: 0x59, offset: 0xD4926, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x194A, symSize: 0xF8 }
-  - { offsetInCU: 0x1B5, offset: 0xD4A82, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0xF8, symBinAddr: 0x1A42, symSize: 0x17 }
-  - { offsetInCU: 0x27, offset: 0xD4AE8, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1A59, symSize: 0xD4 }
-  - { offsetInCU: 0x4A, offset: 0xD4B0B, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1A59, symSize: 0xD4 }
-  - { offsetInCU: 0x1CE, offset: 0xD4C8F, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xD4, symBinAddr: 0x1B2D, symSize: 0xFD }
-  - { offsetInCU: 0x316, offset: 0xD4DD7, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x1D1, symBinAddr: 0x1C2A, symSize: 0x13 }
-  - { offsetInCU: 0x36D, offset: 0xD4E2E, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x1E4, symBinAddr: 0x1C3D, symSize: 0x30 }
-  - { offsetInCU: 0x3A2, offset: 0xD4E63, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x214, symBinAddr: 0x1C6D, symSize: 0x25 }
-  - { offsetInCU: 0x3D9, offset: 0xD4E9A, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x239, symBinAddr: 0x1C92, symSize: 0x44 }
-  - { offsetInCU: 0x41A, offset: 0xD4EDB, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x27D, symBinAddr: 0x1CD6, symSize: 0x2C }
-  - { offsetInCU: 0x45D, offset: 0xD4F1E, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x2A9, symBinAddr: 0x1D02, symSize: 0xF1 }
-  - { offsetInCU: 0x5ED, offset: 0xD50AE, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x39A, symBinAddr: 0x1DF3, symSize: 0x141 }
-  - { offsetInCU: 0x77D, offset: 0xD523E, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x4DB, symBinAddr: 0x1F34, symSize: 0x1A }
-  - { offsetInCU: 0x27, offset: 0xD55F3, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x1F4E, symSize: 0x27 }
-  - { offsetInCU: 0x4F, offset: 0xD561B, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x4480, symBinAddr: 0x5970, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0xD5634, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x1F4E, symSize: 0x27 }
-  - { offsetInCU: 0x131, offset: 0xD56FD, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x27, symBinAddr: 0x1F75, symSize: 0xB2 }
-  - { offsetInCU: 0x2E8, offset: 0xD58B4, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xD9, symBinAddr: 0x2027, symSize: 0xB3 }
-  - { offsetInCU: 0x3FD, offset: 0xD59C9, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x18C, symBinAddr: 0x20DA, symSize: 0xD9 }
-  - { offsetInCU: 0x4DD, offset: 0xD5AA9, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x265, symBinAddr: 0x21B3, symSize: 0x13 }
-  - { offsetInCU: 0x534, offset: 0xD5B00, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x2CD, symBinAddr: 0x21C6, symSize: 0x63 }
-  - { offsetInCU: 0x5BC, offset: 0xD5B88, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x330, symBinAddr: 0x2229, symSize: 0xB3 }
-  - { offsetInCU: 0x6B1, offset: 0xD5C7D, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x3E3, symBinAddr: 0x22DC, symSize: 0xD9 }
-  - { offsetInCU: 0x791, offset: 0xD5D5D, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x4BC, symBinAddr: 0x23B5, symSize: 0x13 }
-  - { offsetInCU: 0x7E8, offset: 0xD5DB4, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x4CF, symBinAddr: 0x23C8, symSize: 0xB3 }
-  - { offsetInCU: 0x8DD, offset: 0xD5EA9, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x582, symBinAddr: 0x247B, symSize: 0xD9 }
-  - { offsetInCU: 0x9BD, offset: 0xD5F89, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x65B, symBinAddr: 0x2554, symSize: 0x13 }
-  - { offsetInCU: 0x27, offset: 0xD638E, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x2567, symSize: 0x6A }
-  - { offsetInCU: 0x43, offset: 0xD63AA, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x2567, symSize: 0x6A }
-  - { offsetInCU: 0x169, offset: 0xD64D0, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x6A, symBinAddr: 0x25D1, symSize: 0x11A }
-  - { offsetInCU: 0x27, offset: 0xD67A2, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x26EB, symSize: 0xDD }
-  - { offsetInCU: 0x4A, offset: 0xD67C5, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x26EB, symSize: 0xDD }
-  - { offsetInCU: 0x1DA, offset: 0xD6955, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xDD, symBinAddr: 0x27C8, symSize: 0xF1 }
-  - { offsetInCU: 0x30E, offset: 0xD6A89, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x1CE, symBinAddr: 0x28B9, symSize: 0x1A }
-  - { offsetInCU: 0x375, offset: 0xD6AF0, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x2AD, symBinAddr: 0x28D3, symSize: 0xEB }
-  - { offsetInCU: 0x4CF, offset: 0xD6C4A, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x398, symBinAddr: 0x29BE, symSize: 0xC9 }
-  - { offsetInCU: 0x5EF, offset: 0xD6D6A, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x461, symBinAddr: 0x2A87, symSize: 0x13 }
-  - { offsetInCU: 0x27, offset: 0xD7128, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2A9A, symSize: 0xC6 }
-  - { offsetInCU: 0x4A, offset: 0xD714B, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2A9A, symSize: 0xC6 }
-  - { offsetInCU: 0x225, offset: 0xD7326, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xC6, symBinAddr: 0x2B60, symSize: 0xB4 }
-  - { offsetInCU: 0x2F9, offset: 0xD73FA, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x17A, symBinAddr: 0x2C14, symSize: 0x13 }
-  - { offsetInCU: 0x350, offset: 0xD7451, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1E2, symBinAddr: 0x2C27, symSize: 0xE6 }
-  - { offsetInCU: 0x49A, offset: 0xD759B, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x2C8, symBinAddr: 0x2D0D, symSize: 0x84 }
-  - { offsetInCU: 0x543, offset: 0xD7644, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x34C, symBinAddr: 0x2D91, symSize: 0xC }
-  - { offsetInCU: 0x58A, offset: 0xD768B, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x358, symBinAddr: 0x2D9D, symSize: 0x17 }
-  - { offsetInCU: 0x5B3, offset: 0xD76B4, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x36F, symBinAddr: 0x2DB4, symSize: 0xF }
-  - { offsetInCU: 0x27, offset: 0xD79C2, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x2DC3, symSize: 0x12 }
-  - { offsetInCU: 0x35, offset: 0xD79D0, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x12, symBinAddr: 0x2DD5, symSize: 0x70 }
-  - { offsetInCU: 0x5B, offset: 0xD79F6, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x2DF0, symBinAddr: 0x5978, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0xD7A5A, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x2DF8, symBinAddr: 0x5988, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0xD7A7F, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x2DC3, symSize: 0x12 }
-  - { offsetInCU: 0x178, offset: 0xD7B13, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x82, symBinAddr: 0x2E45, symSize: 0x46 }
-  - { offsetInCU: 0x22A, offset: 0xD7BC5, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xC8, symBinAddr: 0x2E8B, symSize: 0x7A }
-  - { offsetInCU: 0x2C6, offset: 0xD7C61, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x142, symBinAddr: 0x2F05, symSize: 0x8B }
-  - { offsetInCU: 0x3A5, offset: 0xD7D40, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x1CD, symBinAddr: 0x2F90, symSize: 0xEA }
-  - { offsetInCU: 0x460, offset: 0xD7DFB, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x2B7, symBinAddr: 0x307A, symSize: 0xC1 }
-  - { offsetInCU: 0x52F, offset: 0xD7ECA, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x378, symBinAddr: 0x313B, symSize: 0x76 }
-  - { offsetInCU: 0x59E, offset: 0xD7F39, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x3EE, symBinAddr: 0x31B1, symSize: 0x2E }
-  - { offsetInCU: 0x27, offset: 0xD8092, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x31DF, symSize: 0x12 }
-  - { offsetInCU: 0x41, offset: 0xD80AC, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x200, symBinAddr: 0x4178, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0xD80C0, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x12, symBinAddr: 0x31F1, symSize: 0x70 }
-  - { offsetInCU: 0x7B, offset: 0xD80E6, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x26A0, symBinAddr: 0x5980, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0xD8153, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x31DF, symSize: 0x12 }
-  - { offsetInCU: 0x17D, offset: 0xD81E8, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x82, symBinAddr: 0x3261, symSize: 0x3B }
-  - { offsetInCU: 0x1D7, offset: 0xD8242, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xBD, symBinAddr: 0x329C, symSize: 0x55 }
-  - { offsetInCU: 0x24E, offset: 0xD82B9, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x112, symBinAddr: 0x32F1, symSize: 0x5A }
-  - { offsetInCU: 0x2C5, offset: 0xD8330, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x16C, symBinAddr: 0x334B, symSize: 0x55 }
-...
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSCCrypto.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSCCrypto.h
deleted file mode 100644
index c90f3a616f..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSCCrypto.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  NSCCrypto.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/07/2024.
-//  Copyright © 2024 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CommonCrypto/CommonCrypto.h>
-#import <Security/Security.h>
-#import <Security/SecItem.h>
-#ifndef NSCCrypto_h
-#define NSCCrypto_h
-
-typedef enum : NSUInteger {
-    kNSCCryptoRSASSA_PKCS1_v1_5,
-    kNSCCryptoRSA_PSS,
-    kNSCCryptoRSA_OAEP,
-} NSCCryptoRsaHashedKeyGenParamsName;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoHashSHA1,
-    kNSCCryptoHashSHA256,
-    kNSCCryptoHashSHA384,
-    kNSCCryptoHashSHA512
-} NSCCryptoHash;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoDecrypt,
-    kNSCCryptoEncrypt,
-    kNSCCryptoSign,
-    kNSCCryptoVerify,
-    kNSCCryptoDeriveKey,
-    kNSCCryptoDeriveBits,
-    kNSCCryptoWrapKey,
-    kNSCCryptoUnwrapKey,
-} NSCCryptoKeyUsages;
-
-
-
-@interface NSCCryptoKeyPair : NSObject
-@property (nonatomic, nonnull) SecKeyRef privateKey;
-@property (nonatomic, nonnull) SecKeyRef publicKey;
--(nonnull id)initWithPrivateKey:(nonnull SecKeyRef)privKey andPublicKey:(nonnull SecKeyRef)pubKey;
-@end
-
-@interface NSCCrypto:NSObject
-+ (nonnull NSString*)randomUUID;
-+ (nullable NSString*)getRandomValues:(nonnull void*)buffer length:(unsigned int)length;
-+ (nullable NSData*)digest:(nonnull void*)data length:(unsigned int)length mode:(int)mode;
-+ (nullable NSData *)generateKeyHmac:(int)hash length:(int)length;
-+ (nullable NSCCryptoKeyPair*)generateKeyRsa:(NSCCryptoRsaHashedKeyGenParamsName)name modulusLength:(unsigned int)modulusLength publicExponent:(nullable void*)exponent size:(unsigned int)size hash:(NSCCryptoHash)hash extractable:(BOOL)extractable keyUsages:(nonnull NSArray*) usages;
-+ (nullable NSData *)encryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-
-+ (nullable NSData *)decryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-@end
-#endif /* NSCCrypto_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSData+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSData+Async.h
deleted file mode 100644
index 3e0cc82072..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSData+Async.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  NSData+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 7.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSData (Async)
-
-+ (void)dataWithContentsOfFile:(nonnull NSString*)path
-                    completion:(void (^) (NSData*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-         completion:(void (^) (void))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSFileHandle+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSFileHandle+Async.h
deleted file mode 100644
index d5a2c888d8..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSFileHandle+Async.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  NSFileHandle+Async.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/05/2023.
-//  Copyright © 2023 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSFileHandle (Async)
-
-- (void)appendData:(nonnull NSData*) data
-         completion:(void (^) (NSError*))callback;
-
-+ (void)fileHandleWith:(NSString *)path data:(NSData *)data completion:(void (^)(NSFileHandle*,NSError*))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSString+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSString+Async.h
deleted file mode 100644
index 2f05922625..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSString+Async.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  NSString+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 5.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSString (Async)
-
-+ (void)stringWithContentsOfFile:(nonnull NSString*)path
-                        encoding:(NSStringEncoding)enc
-                      completion:(void (^) (NSString*, NSError*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-           encoding:(NSStringEncoding)enc
-         completion:(void (^) (NSError*))callback;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSLabel.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSLabel.h
deleted file mode 100644
index 1c170b9c9e..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSLabel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  TNSLabel.h
-//  TNSWidgets
-//
-//  Created by Hristo Hristov on 6/9/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface TNSLabel : UILabel
-
-@property(nonatomic) UIEdgeInsets padding;
-@property(nonatomic) UIEdgeInsets borderThickness;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSProcess.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSProcess.h
deleted file mode 100644
index d2f6570142..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSProcess.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  TNSProcess.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 15/05/2017.
-//  Copyright © 2017 Telerik A D. All rights reserved.
-//
-
-#ifndef TNSProcess_h
-#define TNSProcess_h
-
-#import <Foundation/Foundation.h>
-
-/**
- * Get the milliseconds since the process started.
- */
-double __tns_uptime(void);
-
-/**
- * Provides access to NSLog. The runtime implementation of console.log is filtered in release.
- * We rarely need to log in release but in cases such as when logging app startup times in release,
- * this will be convenient shortcut to NSLog, NSLog is not exposed.
- *
- * Please note the {N} CLI may be filtering app output, prefixing the message with "CONSOLE LOG"
- * will make the logs visible in "tns run ios --release" builds.
- */
-void __nslog(NSString* message);
-
-#endif /* TNSProcess_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSWidgets.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSWidgets.h
deleted file mode 100644
index d1448af880..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSWidgets.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  TNSWidgets.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 4/27/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TNSWidgets.
-FOUNDATION_EXPORT double TNSWidgetsVersionNumber;
-
-//! Project version string for TNSWidgets.
-FOUNDATION_EXPORT const unsigned char TNSWidgetsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TNSWidgets/PublicHeader.h>
-
-#import "UIImage+TNSBlocks.h"
-#import "UIView+PassThroughParent.h"
-#import "TNSLabel.h"
-#import "TNSProcess.h"
-#import "NSString+Async.h"
-#import "NSData+Async.h"
-#import "NSFileHandle+Async.h"
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
deleted file mode 100644
index 9e67228be6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  UIImage+UIImage_Async.h
-//  TKImageAsync
-//
-//  Created by Panayot Cankov on 4/18/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-@interface UIImage (TNSBlocks)
-
-/**
- * Similar to imageNamed: however it runs on a separate queue so the UI thread is not blocked.
- * It also draws the UIImage in a small thumb to force decoding potentially avoiding UI hicckups when displayed.
- */
-+ (void) tns_safeDecodeImageNamed: (NSString*) name completion: (void (^) (UIImage*))callback;
-
-/**
- * Same as imageNamed, however calls to this method are sinchronized to be thread safe in iOS8 along with calls to tns_safeImageNamed and tns_safeDecodeImageNamed:completion:
- * imageNamed is thread safe in iOS 9 and later so in later versions this methods simply fallbacks to imageNamed:
- */
-+ (UIImage*) tns_safeImageNamed: (NSString*) name;
-
-+ (void) tns_decodeImageWithData: (NSData*) data completion: (void (^) (UIImage*))callback;
-+ (void) tns_decodeImageWidthContentsOfFile: (NSString*) file completion: (void (^) (UIImage*))callback;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIView+PassThroughParent.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
deleted file mode 100644
index e5f68c5683..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  UIView+PassThroughParent.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PassThroughParent)
-
-- (BOOL) passThroughParent;
-- (void) setPassThroughParent:(BOOL) passThroughParent;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist
deleted file mode 100644
index 8a0263e63b..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Modules/module.modulemap b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Modules/module.modulemap
deleted file mode 100644
index b940cdff5c..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module TNSWidgets {
-  umbrella header "TNSWidgets.h"
-  export *
-
-  module * { export * }
-}
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
deleted file mode 100644
index d3d71a88f3..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  NSObject+Swizzling.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <objc/runtime.h>
-
-
-@interface NSObject (Swizzling)
-
-+ (void)swizzleInstanceMethodWithOriginalSelector:(SEL)originalSelector fromClass:(Class)classContainigOriginalSel withSwizzlingSelector:(SEL)swizzlingSelector;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
deleted file mode 100644
index 65ccdf02d6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  UIView+PropertyBag.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PropertyBag)
-
-- (id) propertyValueForKey:(NSString*) key;
-- (void) setPropertyValue:(id) value forKey:(NSString*) key;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets
deleted file mode 100755
index b98915f344..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources
deleted file mode 100644
index 0ea2476ce1..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Headers/NSData+Async.h</key>
-		<data>
-		9BsuK8QsA57YnHHgpWIgaHygSEk=
-		</data>
-		<key>Headers/NSFileHandle+Async.h</key>
-		<data>
-		rRe3BF9E0tZ9uKb/qQaeizpf00k=
-		</data>
-		<key>Headers/NSString+Async.h</key>
-		<data>
-		o8366y9zYMOVyObC3vtKKy/8jxA=
-		</data>
-		<key>Headers/TNSLabel.h</key>
-		<data>
-		x8V4jT6oNNls+KE3y/DE6ij9eCk=
-		</data>
-		<key>Headers/TNSProcess.h</key>
-		<data>
-		dHuocpQ4b8KDApobwYNCqXcC6ZE=
-		</data>
-		<key>Headers/TNSWidgets.h</key>
-		<data>
-		ZFbCov7mFiXa4ZA/gAxqYHzRX7Q=
-		</data>
-		<key>Headers/UIImage+TNSBlocks.h</key>
-		<data>
-		OzGlvoGOJcFC6Z+YR5xThjLTUK4=
-		</data>
-		<key>Headers/UIView+PassThroughParent.h</key>
-		<data>
-		zdxBV/QJg7NPyx04RmZrXsxbHKU=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		Bs8o38T7YIg2Atjpfe4/QbN1vTM=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		/tkvRfxHVxmNhD1JzeHL7QIyPq0=
-		</data>
-		<key>PrivateHeaders/NSObject+Swizzling.h</key>
-		<data>
-		wRUUMHgrTVWHd/e8bDqN8sYZth4=
-		</data>
-		<key>PrivateHeaders/UIView+PropertyBag.h</key>
-		<data>
-		3USXIiZgky+5k7en+R6oyZ3pP18=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/NSData+Async.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			JdjuVUBed00Ged4cSDzYLXONUlESu+dae9KN0PYJ/nM=
-			</data>
-		</dict>
-		<key>Headers/NSFileHandle+Async.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			2T5kVM+Hg6kj426PPiCsCw+SsFz2+kqJkOSpwDcNPZ0=
-			</data>
-		</dict>
-		<key>Headers/NSString+Async.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			1Iuk4atAJ89zujXqrLBvGz7Ny52RXNdD5c1ZMK0SFgs=
-			</data>
-		</dict>
-		<key>Headers/TNSLabel.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			uaE78Ar4SA7jzBIQrT3lTvBQFOQj1sf1ippa8ldUDqQ=
-			</data>
-		</dict>
-		<key>Headers/TNSProcess.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			E+JvepkSwLMNO6gdhEdwuzkdVTUqmWp8P5LxHYCFim8=
-			</data>
-		</dict>
-		<key>Headers/TNSWidgets.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			6L3xStgKRHkPvDZAHAUF+EMI3Skf5jvnoA4ED/WbB1w=
-			</data>
-		</dict>
-		<key>Headers/UIImage+TNSBlocks.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			MgrX2woetySmXcrrDF290WGxNiW5W3E0B0fsjy8BgNI=
-			</data>
-		</dict>
-		<key>Headers/UIView+PassThroughParent.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			UfHyaUaTFlNcY5M7lUKwq6bPGuQeVIbjhCCInN1ZEYA=
-			</data>
-		</dict>
-		<key>Modules/module.modulemap</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			WpsCv2W1QB16vBBWGv6a8wyc4IjYUnJ+SSaY3j42OP4=
-			</data>
-		</dict>
-		<key>PrivateHeaders/NSObject+Swizzling.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			S+GqZzjPH/SqyxwzyysFybjZsbwS5lxcTwL04W79IGA=
-			</data>
-		</dict>
-		<key>PrivateHeaders/UIView+PropertyBag.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			/qFTteGRAX+GloVCipAdNRXPDPDWsNmQ+9USxt99lXE=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
deleted file mode 100644
index ef076e3714..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.org.nativescript.TNSWidgets</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets
deleted file mode 100644
index d7433c0cbe..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
deleted file mode 100644
index c5d8d06fb3..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'arm64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-iphonesimulator/TNSWidgets.framework/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0x5401B, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0x72D8, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0x54050, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0x7308, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0x5408D, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x4180, symSize: 0x1E0 }
-  - { offsetInCU: 0xAB, offset: 0x54111, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x4180, symSize: 0x1E0 }
-  - { offsetInCU: 0x182, offset: 0x541E8, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x1E0, symBinAddr: 0x4360, symSize: 0xA8 }
-  - { offsetInCU: 0x215, offset: 0x5427B, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x288, symBinAddr: 0x4408, symSize: 0x18 }
-  - { offsetInCU: 0x24A, offset: 0x542B0, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x2A0, symBinAddr: 0x4420, symSize: 0x18 }
-  - { offsetInCU: 0x289, offset: 0x542EF, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x2B8, symBinAddr: 0x4438, symSize: 0x18 }
-  - { offsetInCU: 0x2BE, offset: 0x54324, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x2D0, symBinAddr: 0x4450, symSize: 0x18 }
-  - { offsetInCU: 0x27, offset: 0x543AE, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x4468, symSize: 0xF0 }
-  - { offsetInCU: 0x59, offset: 0x543E0, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x4468, symSize: 0xF0 }
-  - { offsetInCU: 0x186, offset: 0x5450D, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0xF0, symBinAddr: 0x4558, symSize: 0x28 }
-  - { offsetInCU: 0x27, offset: 0x54573, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x4580, symSize: 0xDC }
-  - { offsetInCU: 0x4A, offset: 0x54596, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x4580, symSize: 0xDC }
-  - { offsetInCU: 0x129, offset: 0x54675, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xDC, symBinAddr: 0x465C, symSize: 0x28C }
-  - { offsetInCU: 0x1DF, offset: 0x5472B, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x368, symBinAddr: 0x48E8, symSize: 0x10 }
-  - { offsetInCU: 0x236, offset: 0x54782, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x378, symBinAddr: 0x48F8, symSize: 0x34 }
-  - { offsetInCU: 0x25F, offset: 0x547AB, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x3AC, symBinAddr: 0x492C, symSize: 0x28 }
-  - { offsetInCU: 0x27E, offset: 0x547CA, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x3D4, symBinAddr: 0x4954, symSize: 0x3C }
-  - { offsetInCU: 0x2A7, offset: 0x547F3, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x410, symBinAddr: 0x4990, symSize: 0x30 }
-  - { offsetInCU: 0x2C6, offset: 0x54812, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x440, symBinAddr: 0x49C0, symSize: 0x104 }
-  - { offsetInCU: 0x367, offset: 0x548B3, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x544, symBinAddr: 0x4AC4, symSize: 0x2D0 }
-  - { offsetInCU: 0x429, offset: 0x54975, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x814, symBinAddr: 0x4D94, symSize: 0x14 }
-  - { offsetInCU: 0x27, offset: 0x54D15, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x4DA8, symSize: 0x30 }
-  - { offsetInCU: 0x4F, offset: 0x54D3D, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x3E38, symBinAddr: 0xC6E8, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0x54D56, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x4DA8, symSize: 0x30 }
-  - { offsetInCU: 0xCE, offset: 0x54DBC, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x30, symBinAddr: 0x4DD8, symSize: 0x94 }
-  - { offsetInCU: 0x23B, offset: 0x54F29, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xC4, symBinAddr: 0x4E6C, symSize: 0xB8 }
-  - { offsetInCU: 0x2C7, offset: 0x54FB5, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x17C, symBinAddr: 0x4F24, symSize: 0xC8 }
-  - { offsetInCU: 0x347, offset: 0x55035, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x244, symBinAddr: 0x4FEC, symSize: 0x10 }
-  - { offsetInCU: 0x39E, offset: 0x5508C, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x2B0, symBinAddr: 0x4FFC, symSize: 0x64 }
-  - { offsetInCU: 0x3F1, offset: 0x550DF, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x314, symBinAddr: 0x5060, symSize: 0xB8 }
-  - { offsetInCU: 0x45D, offset: 0x5514B, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x3CC, symBinAddr: 0x5118, symSize: 0xC8 }
-  - { offsetInCU: 0x4DD, offset: 0x551CB, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x494, symBinAddr: 0x51E0, symSize: 0x10 }
-  - { offsetInCU: 0x534, offset: 0x55222, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x4A4, symBinAddr: 0x51F0, symSize: 0xB8 }
-  - { offsetInCU: 0x5A0, offset: 0x5528E, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x55C, symBinAddr: 0x52A8, symSize: 0xC8 }
-  - { offsetInCU: 0x620, offset: 0x5530E, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x624, symBinAddr: 0x5370, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x556E9, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x5380, symSize: 0x70 }
-  - { offsetInCU: 0x43, offset: 0x55705, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x5380, symSize: 0x70 }
-  - { offsetInCU: 0x139, offset: 0x557FB, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x70, symBinAddr: 0x53F0, symSize: 0x120 }
-  - { offsetInCU: 0x27, offset: 0x55AB0, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x5510, symSize: 0xDC }
-  - { offsetInCU: 0x4A, offset: 0x55AD3, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x5510, symSize: 0xDC }
-  - { offsetInCU: 0x135, offset: 0x55BBE, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xDC, symBinAddr: 0x55EC, symSize: 0xEC }
-  - { offsetInCU: 0x1D5, offset: 0x55C5E, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x1C8, symBinAddr: 0x56D8, symSize: 0x14 }
-  - { offsetInCU: 0x23C, offset: 0x55CC5, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x2A4, symBinAddr: 0x56EC, symSize: 0xF0 }
-  - { offsetInCU: 0x2ED, offset: 0x55D76, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x394, symBinAddr: 0x57DC, symSize: 0xB8 }
-  - { offsetInCU: 0x3A1, offset: 0x55E2A, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x44C, symBinAddr: 0x5894, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x561CA, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x58A4, symSize: 0xD4 }
-  - { offsetInCU: 0x4A, offset: 0x561ED, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x58A4, symSize: 0xD4 }
-  - { offsetInCU: 0x180, offset: 0x56323, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xD4, symBinAddr: 0x5978, symSize: 0xAC }
-  - { offsetInCU: 0x200, offset: 0x563A3, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x180, symBinAddr: 0x5A24, symSize: 0x10 }
-  - { offsetInCU: 0x257, offset: 0x563FA, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1EC, symBinAddr: 0x5A34, symSize: 0xEC }
-  - { offsetInCU: 0x2F8, offset: 0x5649B, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x2D8, symBinAddr: 0x5B20, symSize: 0x84 }
-  - { offsetInCU: 0x37D, offset: 0x56520, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x35C, symBinAddr: 0x5BA4, symSize: 0xC }
-  - { offsetInCU: 0x3C4, offset: 0x56567, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x368, symBinAddr: 0x5BB0, symSize: 0x10 }
-  - { offsetInCU: 0x3ED, offset: 0x56590, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x378, symBinAddr: 0x5BC0, symSize: 0x8 }
-  - { offsetInCU: 0x27, offset: 0x56876, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x5BC8, symSize: 0x4 }
-  - { offsetInCU: 0x35, offset: 0x56884, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x4, symBinAddr: 0x5BCC, symSize: 0x84 }
-  - { offsetInCU: 0x5B, offset: 0x568AA, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x2910, symBinAddr: 0xC6F0, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0x5690E, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x2918, symBinAddr: 0xC728, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0x56933, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x5BC8, symSize: 0x4 }
-  - { offsetInCU: 0x163, offset: 0x569B2, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x5C50, symSize: 0x4C }
-  - { offsetInCU: 0x1FA, offset: 0x56A49, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xD4, symBinAddr: 0x5C9C, symSize: 0x6C }
-  - { offsetInCU: 0x241, offset: 0x56A90, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x140, symBinAddr: 0x5D08, symSize: 0x74 }
-  - { offsetInCU: 0x294, offset: 0x56AE3, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x1B4, symBinAddr: 0x5D7C, symSize: 0xCC }
-  - { offsetInCU: 0x2DB, offset: 0x56B2A, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x280, symBinAddr: 0x5E48, symSize: 0xA8 }
-  - { offsetInCU: 0x31E, offset: 0x56B6D, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x328, symBinAddr: 0x5EF0, symSize: 0x70 }
-  - { offsetInCU: 0x351, offset: 0x56BA0, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x398, symBinAddr: 0x5F60, symSize: 0x24 }
-  - { offsetInCU: 0x27, offset: 0x56CCA, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x5F84, symSize: 0x4 }
-  - { offsetInCU: 0x41, offset: 0x56CE4, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x1F8, symBinAddr: 0x8180, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0x56CF8, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x4, symBinAddr: 0x5F88, symSize: 0x84 }
-  - { offsetInCU: 0x7B, offset: 0x56D1E, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x24A0, symBinAddr: 0xC6F8, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0x56D8B, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x5F84, symSize: 0x4 }
-  - { offsetInCU: 0x168, offset: 0x56E0B, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x600C, symSize: 0x40 }
-  - { offsetInCU: 0x1A7, offset: 0x56E4A, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xC8, symBinAddr: 0x604C, symSize: 0x54 }
-  - { offsetInCU: 0x1EE, offset: 0x56E91, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x11C, symBinAddr: 0x60A0, symSize: 0x4C }
-  - { offsetInCU: 0x231, offset: 0x56ED4, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x168, symBinAddr: 0x60EC, symSize: 0x50 }
-...
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml
deleted file mode 100644
index 169245fafc..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'x86_64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-iphonesimulator/TNSWidgets.framework/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0x55654, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0x4280, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0x55689, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0x42B0, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0x556C6, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1710, symSize: 0x388 }
-  - { offsetInCU: 0xAB, offset: 0x5574A, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1710, symSize: 0x388 }
-  - { offsetInCU: 0x17F, offset: 0x5581E, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x388, symBinAddr: 0x1A98, symSize: 0xDD }
-  - { offsetInCU: 0x1EB, offset: 0x5588A, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x465, symBinAddr: 0x1B75, symSize: 0x20 }
-  - { offsetInCU: 0x220, offset: 0x558BF, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x485, symBinAddr: 0x1B95, symSize: 0x1E }
-  - { offsetInCU: 0x25E, offset: 0x558FD, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x4A3, symBinAddr: 0x1BB3, symSize: 0x20 }
-  - { offsetInCU: 0x293, offset: 0x55932, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x4C3, symBinAddr: 0x1BD3, symSize: 0x1E }
-  - { offsetInCU: 0x27, offset: 0x559BB, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1BF1, symSize: 0xF8 }
-  - { offsetInCU: 0x59, offset: 0x559ED, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1BF1, symSize: 0xF8 }
-  - { offsetInCU: 0x1B5, offset: 0x55B49, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0xF8, symBinAddr: 0x1CE9, symSize: 0x17 }
-  - { offsetInCU: 0x27, offset: 0x55BAF, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1D00, symSize: 0xD4 }
-  - { offsetInCU: 0x4A, offset: 0x55BD2, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1D00, symSize: 0xD4 }
-  - { offsetInCU: 0x1CE, offset: 0x55D56, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xD4, symBinAddr: 0x1DD4, symSize: 0x304 }
-  - { offsetInCU: 0x4C1, offset: 0x56049, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x3D8, symBinAddr: 0x20D8, symSize: 0x13 }
-  - { offsetInCU: 0x518, offset: 0x560A0, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x3EB, symBinAddr: 0x20EB, symSize: 0x30 }
-  - { offsetInCU: 0x54D, offset: 0x560D5, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x41B, symBinAddr: 0x211B, symSize: 0x25 }
-  - { offsetInCU: 0x584, offset: 0x5610C, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x440, symBinAddr: 0x2140, symSize: 0x44 }
-  - { offsetInCU: 0x5C5, offset: 0x5614D, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x484, symBinAddr: 0x2184, symSize: 0x2C }
-  - { offsetInCU: 0x608, offset: 0x56190, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x4B0, symBinAddr: 0x21B0, symSize: 0xF1 }
-  - { offsetInCU: 0x798, offset: 0x56320, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x5A1, symBinAddr: 0x22A1, symSize: 0x348 }
-  - { offsetInCU: 0xAEA, offset: 0x56672, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x8E9, symBinAddr: 0x25E9, symSize: 0x27 }
-  - { offsetInCU: 0x27, offset: 0x56A12, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x2610, symSize: 0x27 }
-  - { offsetInCU: 0x4F, offset: 0x56A3A, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x4550, symBinAddr: 0x5D30, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0x56A53, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x2610, symSize: 0x27 }
-  - { offsetInCU: 0x131, offset: 0x56B1C, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x27, symBinAddr: 0x2637, symSize: 0xB2 }
-  - { offsetInCU: 0x2E8, offset: 0x56CD3, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xD9, symBinAddr: 0x26E9, symSize: 0xB3 }
-  - { offsetInCU: 0x3FD, offset: 0x56DE8, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x18C, symBinAddr: 0x279C, symSize: 0xD9 }
-  - { offsetInCU: 0x4DD, offset: 0x56EC8, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x265, symBinAddr: 0x2875, symSize: 0x13 }
-  - { offsetInCU: 0x534, offset: 0x56F1F, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x2CD, symBinAddr: 0x2888, symSize: 0x63 }
-  - { offsetInCU: 0x5BC, offset: 0x56FA7, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x330, symBinAddr: 0x28EB, symSize: 0xB3 }
-  - { offsetInCU: 0x6B1, offset: 0x5709C, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x3E3, symBinAddr: 0x299E, symSize: 0xD9 }
-  - { offsetInCU: 0x791, offset: 0x5717C, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x4BC, symBinAddr: 0x2A77, symSize: 0x13 }
-  - { offsetInCU: 0x7E8, offset: 0x571D3, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x4CF, symBinAddr: 0x2A8A, symSize: 0xB3 }
-  - { offsetInCU: 0x8DD, offset: 0x572C8, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x582, symBinAddr: 0x2B3D, symSize: 0xD9 }
-  - { offsetInCU: 0x9BD, offset: 0x573A8, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x65B, symBinAddr: 0x2C16, symSize: 0x13 }
-  - { offsetInCU: 0x27, offset: 0x57783, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x2C29, symSize: 0x78 }
-  - { offsetInCU: 0x43, offset: 0x5779F, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x2C29, symSize: 0x78 }
-  - { offsetInCU: 0x17F, offset: 0x578DB, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x78, symBinAddr: 0x2CA1, symSize: 0x122 }
-  - { offsetInCU: 0x27, offset: 0x57BBD, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x2DC3, symSize: 0xDD }
-  - { offsetInCU: 0x4A, offset: 0x57BE0, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x2DC3, symSize: 0xDD }
-  - { offsetInCU: 0x1DA, offset: 0x57D70, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xDD, symBinAddr: 0x2EA0, symSize: 0xF1 }
-  - { offsetInCU: 0x30E, offset: 0x57EA4, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x1CE, symBinAddr: 0x2F91, symSize: 0x1A }
-  - { offsetInCU: 0x375, offset: 0x57F0B, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x2AD, symBinAddr: 0x2FAB, symSize: 0xEB }
-  - { offsetInCU: 0x4CE, offset: 0x58064, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x398, symBinAddr: 0x3096, symSize: 0xC9 }
-  - { offsetInCU: 0x5EE, offset: 0x58184, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x461, symBinAddr: 0x315F, symSize: 0x13 }
-  - { offsetInCU: 0x27, offset: 0x58524, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x3172, symSize: 0xC6 }
-  - { offsetInCU: 0x4A, offset: 0x58547, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x3172, symSize: 0xC6 }
-  - { offsetInCU: 0x225, offset: 0x58722, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xC6, symBinAddr: 0x3238, symSize: 0xB4 }
-  - { offsetInCU: 0x2F9, offset: 0x587F6, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x17A, symBinAddr: 0x32EC, symSize: 0x13 }
-  - { offsetInCU: 0x350, offset: 0x5884D, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1E2, symBinAddr: 0x32FF, symSize: 0xE6 }
-  - { offsetInCU: 0x499, offset: 0x58996, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x2C8, symBinAddr: 0x33E5, symSize: 0x84 }
-  - { offsetInCU: 0x542, offset: 0x58A3F, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x34C, symBinAddr: 0x3469, symSize: 0xC }
-  - { offsetInCU: 0x589, offset: 0x58A86, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x358, symBinAddr: 0x3475, symSize: 0x17 }
-  - { offsetInCU: 0x5B2, offset: 0x58AAF, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x36F, symBinAddr: 0x348C, symSize: 0xF }
-  - { offsetInCU: 0x27, offset: 0x58DA1, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x349B, symSize: 0x12 }
-  - { offsetInCU: 0x35, offset: 0x58DAF, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x12, symBinAddr: 0x34AD, symSize: 0x70 }
-  - { offsetInCU: 0x5B, offset: 0x58DD5, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x2ED8, symBinAddr: 0x5D38, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0x58E39, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x2EE0, symBinAddr: 0x5D70, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0x58E5E, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x349B, symSize: 0x12 }
-  - { offsetInCU: 0x178, offset: 0x58EF2, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x82, symBinAddr: 0x351D, symSize: 0x5A }
-  - { offsetInCU: 0x23E, offset: 0x58FB8, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xDC, symBinAddr: 0x3577, symSize: 0x7A }
-  - { offsetInCU: 0x2DA, offset: 0x59054, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x156, symBinAddr: 0x35F1, symSize: 0x8B }
-  - { offsetInCU: 0x3B9, offset: 0x59133, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x1E1, symBinAddr: 0x367C, symSize: 0xEA }
-  - { offsetInCU: 0x474, offset: 0x591EE, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x2CB, symBinAddr: 0x3766, symSize: 0xC1 }
-  - { offsetInCU: 0x543, offset: 0x592BD, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x38C, symBinAddr: 0x3827, symSize: 0x76 }
-  - { offsetInCU: 0x5B2, offset: 0x5932C, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x402, symBinAddr: 0x389D, symSize: 0x2E }
-  - { offsetInCU: 0x27, offset: 0x5947F, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x38CB, symSize: 0x12 }
-  - { offsetInCU: 0x41, offset: 0x59499, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x210, symBinAddr: 0x5308, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0x594AD, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x12, symBinAddr: 0x38DD, symSize: 0x70 }
-  - { offsetInCU: 0x7B, offset: 0x594D3, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x2790, symBinAddr: 0x5D40, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0x59540, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x38CB, symSize: 0x12 }
-  - { offsetInCU: 0x17D, offset: 0x595D5, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x82, symBinAddr: 0x394D, symSize: 0x4F }
-  - { offsetInCU: 0x1EB, offset: 0x59643, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xD1, symBinAddr: 0x399C, symSize: 0x54 }
-  - { offsetInCU: 0x262, offset: 0x596BA, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x125, symBinAddr: 0x39F0, symSize: 0x5A }
-  - { offsetInCU: 0x2D9, offset: 0x59731, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x17F, symBinAddr: 0x3A4A, symSize: 0x55 }
-...
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSCCrypto.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSCCrypto.h
deleted file mode 100644
index c90f3a616f..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSCCrypto.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  NSCCrypto.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/07/2024.
-//  Copyright © 2024 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CommonCrypto/CommonCrypto.h>
-#import <Security/Security.h>
-#import <Security/SecItem.h>
-#ifndef NSCCrypto_h
-#define NSCCrypto_h
-
-typedef enum : NSUInteger {
-    kNSCCryptoRSASSA_PKCS1_v1_5,
-    kNSCCryptoRSA_PSS,
-    kNSCCryptoRSA_OAEP,
-} NSCCryptoRsaHashedKeyGenParamsName;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoHashSHA1,
-    kNSCCryptoHashSHA256,
-    kNSCCryptoHashSHA384,
-    kNSCCryptoHashSHA512
-} NSCCryptoHash;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoDecrypt,
-    kNSCCryptoEncrypt,
-    kNSCCryptoSign,
-    kNSCCryptoVerify,
-    kNSCCryptoDeriveKey,
-    kNSCCryptoDeriveBits,
-    kNSCCryptoWrapKey,
-    kNSCCryptoUnwrapKey,
-} NSCCryptoKeyUsages;
-
-
-
-@interface NSCCryptoKeyPair : NSObject
-@property (nonatomic, nonnull) SecKeyRef privateKey;
-@property (nonatomic, nonnull) SecKeyRef publicKey;
--(nonnull id)initWithPrivateKey:(nonnull SecKeyRef)privKey andPublicKey:(nonnull SecKeyRef)pubKey;
-@end
-
-@interface NSCCrypto:NSObject
-+ (nonnull NSString*)randomUUID;
-+ (nullable NSString*)getRandomValues:(nonnull void*)buffer length:(unsigned int)length;
-+ (nullable NSData*)digest:(nonnull void*)data length:(unsigned int)length mode:(int)mode;
-+ (nullable NSData *)generateKeyHmac:(int)hash length:(int)length;
-+ (nullable NSCCryptoKeyPair*)generateKeyRsa:(NSCCryptoRsaHashedKeyGenParamsName)name modulusLength:(unsigned int)modulusLength publicExponent:(nullable void*)exponent size:(unsigned int)size hash:(NSCCryptoHash)hash extractable:(BOOL)extractable keyUsages:(nonnull NSArray*) usages;
-+ (nullable NSData *)encryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-
-+ (nullable NSData *)decryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-@end
-#endif /* NSCCrypto_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSData+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSData+Async.h
deleted file mode 100644
index 3e0cc82072..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSData+Async.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  NSData+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 7.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSData (Async)
-
-+ (void)dataWithContentsOfFile:(nonnull NSString*)path
-                    completion:(void (^) (NSData*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-         completion:(void (^) (void))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSFileHandle+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSFileHandle+Async.h
deleted file mode 100644
index d5a2c888d8..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSFileHandle+Async.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  NSFileHandle+Async.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/05/2023.
-//  Copyright © 2023 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSFileHandle (Async)
-
-- (void)appendData:(nonnull NSData*) data
-         completion:(void (^) (NSError*))callback;
-
-+ (void)fileHandleWith:(NSString *)path data:(NSData *)data completion:(void (^)(NSFileHandle*,NSError*))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSString+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSString+Async.h
deleted file mode 100644
index 2f05922625..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/NSString+Async.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  NSString+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 5.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSString (Async)
-
-+ (void)stringWithContentsOfFile:(nonnull NSString*)path
-                        encoding:(NSStringEncoding)enc
-                      completion:(void (^) (NSString*, NSError*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-           encoding:(NSStringEncoding)enc
-         completion:(void (^) (NSError*))callback;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSLabel.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSLabel.h
deleted file mode 100644
index 1c170b9c9e..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSLabel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  TNSLabel.h
-//  TNSWidgets
-//
-//  Created by Hristo Hristov on 6/9/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface TNSLabel : UILabel
-
-@property(nonatomic) UIEdgeInsets padding;
-@property(nonatomic) UIEdgeInsets borderThickness;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSProcess.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSProcess.h
deleted file mode 100644
index d2f6570142..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSProcess.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  TNSProcess.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 15/05/2017.
-//  Copyright © 2017 Telerik A D. All rights reserved.
-//
-
-#ifndef TNSProcess_h
-#define TNSProcess_h
-
-#import <Foundation/Foundation.h>
-
-/**
- * Get the milliseconds since the process started.
- */
-double __tns_uptime(void);
-
-/**
- * Provides access to NSLog. The runtime implementation of console.log is filtered in release.
- * We rarely need to log in release but in cases such as when logging app startup times in release,
- * this will be convenient shortcut to NSLog, NSLog is not exposed.
- *
- * Please note the {N} CLI may be filtering app output, prefixing the message with "CONSOLE LOG"
- * will make the logs visible in "tns run ios --release" builds.
- */
-void __nslog(NSString* message);
-
-#endif /* TNSProcess_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSWidgets.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSWidgets.h
deleted file mode 100644
index d1448af880..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/TNSWidgets.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  TNSWidgets.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 4/27/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TNSWidgets.
-FOUNDATION_EXPORT double TNSWidgetsVersionNumber;
-
-//! Project version string for TNSWidgets.
-FOUNDATION_EXPORT const unsigned char TNSWidgetsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TNSWidgets/PublicHeader.h>
-
-#import "UIImage+TNSBlocks.h"
-#import "UIView+PassThroughParent.h"
-#import "TNSLabel.h"
-#import "TNSProcess.h"
-#import "NSString+Async.h"
-#import "NSData+Async.h"
-#import "NSFileHandle+Async.h"
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
deleted file mode 100644
index 9e67228be6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  UIImage+UIImage_Async.h
-//  TKImageAsync
-//
-//  Created by Panayot Cankov on 4/18/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-@interface UIImage (TNSBlocks)
-
-/**
- * Similar to imageNamed: however it runs on a separate queue so the UI thread is not blocked.
- * It also draws the UIImage in a small thumb to force decoding potentially avoiding UI hicckups when displayed.
- */
-+ (void) tns_safeDecodeImageNamed: (NSString*) name completion: (void (^) (UIImage*))callback;
-
-/**
- * Same as imageNamed, however calls to this method are sinchronized to be thread safe in iOS8 along with calls to tns_safeImageNamed and tns_safeDecodeImageNamed:completion:
- * imageNamed is thread safe in iOS 9 and later so in later versions this methods simply fallbacks to imageNamed:
- */
-+ (UIImage*) tns_safeImageNamed: (NSString*) name;
-
-+ (void) tns_decodeImageWithData: (NSData*) data completion: (void (^) (UIImage*))callback;
-+ (void) tns_decodeImageWidthContentsOfFile: (NSString*) file completion: (void (^) (UIImage*))callback;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/UIView+PassThroughParent.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
deleted file mode 100644
index e5f68c5683..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  UIView+PassThroughParent.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PassThroughParent)
-
-- (BOOL) passThroughParent;
-- (void) setPassThroughParent:(BOOL) passThroughParent;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Info.plist
deleted file mode 100644
index 783063bb66..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Info.plist and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Modules/module.modulemap b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Modules/module.modulemap
deleted file mode 100644
index b940cdff5c..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module TNSWidgets {
-  umbrella header "TNSWidgets.h"
-  export *
-
-  module * { export * }
-}
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
deleted file mode 100644
index d3d71a88f3..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  NSObject+Swizzling.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <objc/runtime.h>
-
-
-@interface NSObject (Swizzling)
-
-+ (void)swizzleInstanceMethodWithOriginalSelector:(SEL)originalSelector fromClass:(Class)classContainigOriginalSel withSwizzlingSelector:(SEL)swizzlingSelector;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
deleted file mode 100644
index 65ccdf02d6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  UIView+PropertyBag.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PropertyBag)
-
-- (id) propertyValueForKey:(NSString*) key;
-- (void) setPropertyValue:(id) value forKey:(NSString*) key;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/TNSWidgets
deleted file mode 100755
index 64242802ac..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/TNSWidgets.framework/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
deleted file mode 100644
index ef076e3714..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.org.nativescript.TNSWidgets</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets
deleted file mode 100644
index f6b5478022..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
deleted file mode 100644
index 673eb6884c..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'arm64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-xros/TNSWidgets.framework/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0x533CE, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0x63C0, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0x53403, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0x63F0, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0x53440, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x4000, symSize: 0x1D8 }
-  - { offsetInCU: 0xAB, offset: 0x534C4, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x4000, symSize: 0x1D8 }
-  - { offsetInCU: 0x182, offset: 0x5359B, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x1D8, symBinAddr: 0x41D8, symSize: 0xA8 }
-  - { offsetInCU: 0x215, offset: 0x5362E, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x280, symBinAddr: 0x4280, symSize: 0x18 }
-  - { offsetInCU: 0x24A, offset: 0x53663, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x298, symBinAddr: 0x4298, symSize: 0x18 }
-  - { offsetInCU: 0x289, offset: 0x536A2, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x2B0, symBinAddr: 0x42B0, symSize: 0x18 }
-  - { offsetInCU: 0x2BE, offset: 0x536D7, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x2C8, symBinAddr: 0x42C8, symSize: 0x18 }
-  - { offsetInCU: 0x27, offset: 0x53761, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x42E0, symSize: 0xF8 }
-  - { offsetInCU: 0x59, offset: 0x53793, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x42E0, symSize: 0xF8 }
-  - { offsetInCU: 0x186, offset: 0x538C0, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0xF8, symBinAddr: 0x43D8, symSize: 0x28 }
-  - { offsetInCU: 0x27, offset: 0x53926, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x4400, symSize: 0xC0 }
-  - { offsetInCU: 0x4A, offset: 0x53949, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x4400, symSize: 0xC0 }
-  - { offsetInCU: 0x129, offset: 0x53A28, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xC0, symBinAddr: 0x44C0, symSize: 0xD8 }
-  - { offsetInCU: 0x1BD, offset: 0x53ABC, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x198, symBinAddr: 0x4598, symSize: 0x10 }
-  - { offsetInCU: 0x214, offset: 0x53B13, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x1A8, symBinAddr: 0x45A8, symSize: 0x34 }
-  - { offsetInCU: 0x23D, offset: 0x53B3C, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x1DC, symBinAddr: 0x45DC, symSize: 0x28 }
-  - { offsetInCU: 0x25C, offset: 0x53B5B, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x204, symBinAddr: 0x4604, symSize: 0x3C }
-  - { offsetInCU: 0x285, offset: 0x53B84, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x240, symBinAddr: 0x4640, symSize: 0x30 }
-  - { offsetInCU: 0x2A4, offset: 0x53BA3, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x270, symBinAddr: 0x4670, symSize: 0xDC }
-  - { offsetInCU: 0x345, offset: 0x53C44, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x34C, symBinAddr: 0x474C, symSize: 0x104 }
-  - { offsetInCU: 0x3E5, offset: 0x53CE4, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x450, symBinAddr: 0x4850, symSize: 0x14 }
-  - { offsetInCU: 0x27, offset: 0x5407A, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x4864, symSize: 0x2C }
-  - { offsetInCU: 0x4F, offset: 0x540A2, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x3D18, symBinAddr: 0xC518, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0x540BB, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x4864, symSize: 0x2C }
-  - { offsetInCU: 0xCE, offset: 0x54121, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x2C, symBinAddr: 0x4890, symSize: 0x94 }
-  - { offsetInCU: 0x23B, offset: 0x5428E, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xC0, symBinAddr: 0x4924, symSize: 0xA4 }
-  - { offsetInCU: 0x2C7, offset: 0x5431A, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x164, symBinAddr: 0x49C8, symSize: 0xBC }
-  - { offsetInCU: 0x347, offset: 0x5439A, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x220, symBinAddr: 0x4A84, symSize: 0x10 }
-  - { offsetInCU: 0x39E, offset: 0x543F1, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x28C, symBinAddr: 0x4A94, symSize: 0x58 }
-  - { offsetInCU: 0x3F1, offset: 0x54444, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x2E4, symBinAddr: 0x4AEC, symSize: 0xA4 }
-  - { offsetInCU: 0x45D, offset: 0x544B0, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x388, symBinAddr: 0x4B90, symSize: 0xBC }
-  - { offsetInCU: 0x4DD, offset: 0x54530, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x444, symBinAddr: 0x4C4C, symSize: 0x10 }
-  - { offsetInCU: 0x534, offset: 0x54587, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x454, symBinAddr: 0x4C5C, symSize: 0xA4 }
-  - { offsetInCU: 0x5A0, offset: 0x545F3, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x4F8, symBinAddr: 0x4D00, symSize: 0xBC }
-  - { offsetInCU: 0x620, offset: 0x54673, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x5B4, symBinAddr: 0x4DBC, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x54A4E, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x4DCC, symSize: 0x70 }
-  - { offsetInCU: 0x43, offset: 0x54A6A, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x4DCC, symSize: 0x70 }
-  - { offsetInCU: 0x139, offset: 0x54B60, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x70, symBinAddr: 0x4E3C, symSize: 0x120 }
-  - { offsetInCU: 0x27, offset: 0x54E19, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x4F5C, symSize: 0xC0 }
-  - { offsetInCU: 0x4A, offset: 0x54E3C, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x4F5C, symSize: 0xC0 }
-  - { offsetInCU: 0x135, offset: 0x54F27, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xC0, symBinAddr: 0x501C, symSize: 0xD8 }
-  - { offsetInCU: 0x1D5, offset: 0x54FC7, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x198, symBinAddr: 0x50F4, symSize: 0x14 }
-  - { offsetInCU: 0x23C, offset: 0x5502E, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x274, symBinAddr: 0x5108, symSize: 0xD4 }
-  - { offsetInCU: 0x2ED, offset: 0x550DF, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x348, symBinAddr: 0x51DC, symSize: 0xB0 }
-  - { offsetInCU: 0x3A1, offset: 0x55193, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x3F8, symBinAddr: 0x528C, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x55533, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x529C, symSize: 0xB8 }
-  - { offsetInCU: 0x4A, offset: 0x55556, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x529C, symSize: 0xB8 }
-  - { offsetInCU: 0x180, offset: 0x5568C, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xB8, symBinAddr: 0x5354, symSize: 0xA0 }
-  - { offsetInCU: 0x200, offset: 0x5570C, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x158, symBinAddr: 0x53F4, symSize: 0x10 }
-  - { offsetInCU: 0x257, offset: 0x55763, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1C4, symBinAddr: 0x5404, symSize: 0xD0 }
-  - { offsetInCU: 0x2F8, offset: 0x55804, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x294, symBinAddr: 0x54D4, symSize: 0x84 }
-  - { offsetInCU: 0x37D, offset: 0x55889, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x318, symBinAddr: 0x5558, symSize: 0xC }
-  - { offsetInCU: 0x3C4, offset: 0x558D0, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x324, symBinAddr: 0x5564, symSize: 0x10 }
-  - { offsetInCU: 0x3ED, offset: 0x558F9, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x334, symBinAddr: 0x5574, symSize: 0x8 }
-  - { offsetInCU: 0x27, offset: 0x55BDF, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x557C, symSize: 0x4 }
-  - { offsetInCU: 0x35, offset: 0x55BED, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x4, symBinAddr: 0x5580, symSize: 0x84 }
-  - { offsetInCU: 0x5B, offset: 0x55C13, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x2820, symBinAddr: 0xC520, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0x55C77, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x2828, symBinAddr: 0xC530, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0x55C9C, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x557C, symSize: 0x4 }
-  - { offsetInCU: 0x163, offset: 0x55D1B, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x5604, symSize: 0x4C }
-  - { offsetInCU: 0x1FA, offset: 0x55DB2, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xD4, symBinAddr: 0x5650, symSize: 0x58 }
-  - { offsetInCU: 0x241, offset: 0x55DF9, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x12C, symBinAddr: 0x56A8, symSize: 0x68 }
-  - { offsetInCU: 0x294, offset: 0x55E4C, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x194, symBinAddr: 0x5710, symSize: 0xBC }
-  - { offsetInCU: 0x2DB, offset: 0x55E93, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x250, symBinAddr: 0x57CC, symSize: 0x9C }
-  - { offsetInCU: 0x31E, offset: 0x55ED6, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x2EC, symBinAddr: 0x5868, symSize: 0x70 }
-  - { offsetInCU: 0x351, offset: 0x55F09, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x35C, symBinAddr: 0x58D8, symSize: 0x24 }
-  - { offsetInCU: 0x27, offset: 0x56033, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x58FC, symSize: 0x4 }
-  - { offsetInCU: 0x41, offset: 0x5604D, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x1F0, symBinAddr: 0x82D8, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0x56061, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x4, symBinAddr: 0x5900, symSize: 0x84 }
-  - { offsetInCU: 0x7B, offset: 0x56087, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x23A0, symBinAddr: 0xC528, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0x560F4, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x58FC, symSize: 0x4 }
-  - { offsetInCU: 0x168, offset: 0x56174, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x5984, symSize: 0x40 }
-  - { offsetInCU: 0x1A7, offset: 0x561B3, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xC8, symBinAddr: 0x59C4, symSize: 0x4C }
-  - { offsetInCU: 0x1EE, offset: 0x561FA, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x114, symBinAddr: 0x5A10, symSize: 0x50 }
-  - { offsetInCU: 0x231, offset: 0x5623D, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x164, symBinAddr: 0x5A60, symSize: 0x48 }
-...
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSCCrypto.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSCCrypto.h
deleted file mode 100644
index c90f3a616f..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSCCrypto.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  NSCCrypto.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/07/2024.
-//  Copyright © 2024 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CommonCrypto/CommonCrypto.h>
-#import <Security/Security.h>
-#import <Security/SecItem.h>
-#ifndef NSCCrypto_h
-#define NSCCrypto_h
-
-typedef enum : NSUInteger {
-    kNSCCryptoRSASSA_PKCS1_v1_5,
-    kNSCCryptoRSA_PSS,
-    kNSCCryptoRSA_OAEP,
-} NSCCryptoRsaHashedKeyGenParamsName;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoHashSHA1,
-    kNSCCryptoHashSHA256,
-    kNSCCryptoHashSHA384,
-    kNSCCryptoHashSHA512
-} NSCCryptoHash;
-
-
-typedef enum : NSUInteger {
-    kNSCCryptoDecrypt,
-    kNSCCryptoEncrypt,
-    kNSCCryptoSign,
-    kNSCCryptoVerify,
-    kNSCCryptoDeriveKey,
-    kNSCCryptoDeriveBits,
-    kNSCCryptoWrapKey,
-    kNSCCryptoUnwrapKey,
-} NSCCryptoKeyUsages;
-
-
-
-@interface NSCCryptoKeyPair : NSObject
-@property (nonatomic, nonnull) SecKeyRef privateKey;
-@property (nonatomic, nonnull) SecKeyRef publicKey;
--(nonnull id)initWithPrivateKey:(nonnull SecKeyRef)privKey andPublicKey:(nonnull SecKeyRef)pubKey;
-@end
-
-@interface NSCCrypto:NSObject
-+ (nonnull NSString*)randomUUID;
-+ (nullable NSString*)getRandomValues:(nonnull void*)buffer length:(unsigned int)length;
-+ (nullable NSData*)digest:(nonnull void*)data length:(unsigned int)length mode:(int)mode;
-+ (nullable NSData *)generateKeyHmac:(int)hash length:(int)length;
-+ (nullable NSCCryptoKeyPair*)generateKeyRsa:(NSCCryptoRsaHashedKeyGenParamsName)name modulusLength:(unsigned int)modulusLength publicExponent:(nullable void*)exponent size:(unsigned int)size hash:(NSCCryptoHash)hash extractable:(BOOL)extractable keyUsages:(nonnull NSArray*) usages;
-+ (nullable NSData *)encryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-
-+ (nullable NSData *)decryptRsa:(BOOL)isPrivate key:(nonnull NSCCryptoKeyPair *)key hash:(NSCCryptoHash)hash data:(nonnull void*)data size:(unsigned int) size;
-@end
-#endif /* NSCCrypto_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSData+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSData+Async.h
deleted file mode 100644
index 3e0cc82072..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSData+Async.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  NSData+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 7.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSData (Async)
-
-+ (void)dataWithContentsOfFile:(nonnull NSString*)path
-                    completion:(void (^) (NSData*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-         completion:(void (^) (void))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSFileHandle+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSFileHandle+Async.h
deleted file mode 100644
index d5a2c888d8..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSFileHandle+Async.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  NSFileHandle+Async.h
-//  TNSWidgets
-//
-//  Created by Osei Fortune on 03/05/2023.
-//  Copyright © 2023 NativeScript. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSFileHandle (Async)
-
-- (void)appendData:(nonnull NSData*) data
-         completion:(void (^) (NSError*))callback;
-
-+ (void)fileHandleWith:(NSString *)path data:(NSData *)data completion:(void (^)(NSFileHandle*,NSError*))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSString+Async.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSString+Async.h
deleted file mode 100644
index 2f05922625..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/NSString+Async.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  NSString+Async.h
-//  TNSWidgets
-//
-//  Created by Peter Staev on 5.08.19.
-//  Copyright © 2019 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSString (Async)
-
-+ (void)stringWithContentsOfFile:(nonnull NSString*)path
-                        encoding:(NSStringEncoding)enc
-                      completion:(void (^) (NSString*, NSError*))callback;
-
-- (void)writeToFile:(nonnull NSString*) path
-         atomically:(BOOL)atomically
-           encoding:(NSStringEncoding)enc
-         completion:(void (^) (NSError*))callback;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSLabel.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSLabel.h
deleted file mode 100644
index 1c170b9c9e..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSLabel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  TNSLabel.h
-//  TNSWidgets
-//
-//  Created by Hristo Hristov on 6/9/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface TNSLabel : UILabel
-
-@property(nonatomic) UIEdgeInsets padding;
-@property(nonatomic) UIEdgeInsets borderThickness;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSProcess.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSProcess.h
deleted file mode 100644
index d2f6570142..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSProcess.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  TNSProcess.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 15/05/2017.
-//  Copyright © 2017 Telerik A D. All rights reserved.
-//
-
-#ifndef TNSProcess_h
-#define TNSProcess_h
-
-#import <Foundation/Foundation.h>
-
-/**
- * Get the milliseconds since the process started.
- */
-double __tns_uptime(void);
-
-/**
- * Provides access to NSLog. The runtime implementation of console.log is filtered in release.
- * We rarely need to log in release but in cases such as when logging app startup times in release,
- * this will be convenient shortcut to NSLog, NSLog is not exposed.
- *
- * Please note the {N} CLI may be filtering app output, prefixing the message with "CONSOLE LOG"
- * will make the logs visible in "tns run ios --release" builds.
- */
-void __nslog(NSString* message);
-
-#endif /* TNSProcess_h */
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSWidgets.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSWidgets.h
deleted file mode 100644
index d1448af880..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/TNSWidgets.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  TNSWidgets.h
-//  TNSWidgets
-//
-//  Created by Panayot Cankov on 4/27/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TNSWidgets.
-FOUNDATION_EXPORT double TNSWidgetsVersionNumber;
-
-//! Project version string for TNSWidgets.
-FOUNDATION_EXPORT const unsigned char TNSWidgetsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TNSWidgets/PublicHeader.h>
-
-#import "UIImage+TNSBlocks.h"
-#import "UIView+PassThroughParent.h"
-#import "TNSLabel.h"
-#import "TNSProcess.h"
-#import "NSString+Async.h"
-#import "NSData+Async.h"
-#import "NSFileHandle+Async.h"
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
deleted file mode 100644
index 9e67228be6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIImage+TNSBlocks.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  UIImage+UIImage_Async.h
-//  TKImageAsync
-//
-//  Created by Panayot Cankov on 4/18/16.
-//  Copyright © 2016 Telerik A D. All rights reserved.
-//
-
-@interface UIImage (TNSBlocks)
-
-/**
- * Similar to imageNamed: however it runs on a separate queue so the UI thread is not blocked.
- * It also draws the UIImage in a small thumb to force decoding potentially avoiding UI hicckups when displayed.
- */
-+ (void) tns_safeDecodeImageNamed: (NSString*) name completion: (void (^) (UIImage*))callback;
-
-/**
- * Same as imageNamed, however calls to this method are sinchronized to be thread safe in iOS8 along with calls to tns_safeImageNamed and tns_safeDecodeImageNamed:completion:
- * imageNamed is thread safe in iOS 9 and later so in later versions this methods simply fallbacks to imageNamed:
- */
-+ (UIImage*) tns_safeImageNamed: (NSString*) name;
-
-+ (void) tns_decodeImageWithData: (NSData*) data completion: (void (^) (UIImage*))callback;
-+ (void) tns_decodeImageWidthContentsOfFile: (NSString*) file completion: (void (^) (UIImage*))callback;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIView+PassThroughParent.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
deleted file mode 100644
index e5f68c5683..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Headers/UIView+PassThroughParent.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  UIView+PassThroughParent.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PassThroughParent)
-
-- (BOOL) passThroughParent;
-- (void) setPassThroughParent:(BOOL) passThroughParent;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist
deleted file mode 100644
index c3b903909d..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Info.plist and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Modules/module.modulemap b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Modules/module.modulemap
deleted file mode 100644
index b940cdff5c..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module TNSWidgets {
-  umbrella header "TNSWidgets.h"
-  export *
-
-  module * { export * }
-}
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
deleted file mode 100644
index d3d71a88f3..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/NSObject+Swizzling.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  NSObject+Swizzling.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <objc/runtime.h>
-
-
-@interface NSObject (Swizzling)
-
-+ (void)swizzleInstanceMethodWithOriginalSelector:(SEL)originalSelector fromClass:(Class)classContainigOriginalSel withSwizzlingSelector:(SEL)swizzlingSelector;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
deleted file mode 100644
index 65ccdf02d6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/PrivateHeaders/UIView+PropertyBag.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  UIView+PropertyBag.h
-//  TNSWidgets
-//
-//  Created by Manol Donev on 21.08.18.
-//  Copyright © 2018 Telerik A D. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-
-@interface UIView (PropertyBag)
-
-- (id) propertyValueForKey:(NSString*) key;
-- (void) setPropertyValue:(id) value forKey:(NSString*) key;
-
-@end
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets
deleted file mode 100755
index 087e7d44d2..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources
deleted file mode 100644
index 55a3fcadc6..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Headers/NSData+Async.h</key>
-		<data>
-		9BsuK8QsA57YnHHgpWIgaHygSEk=
-		</data>
-		<key>Headers/NSFileHandle+Async.h</key>
-		<data>
-		rRe3BF9E0tZ9uKb/qQaeizpf00k=
-		</data>
-		<key>Headers/NSString+Async.h</key>
-		<data>
-		o8366y9zYMOVyObC3vtKKy/8jxA=
-		</data>
-		<key>Headers/TNSLabel.h</key>
-		<data>
-		x8V4jT6oNNls+KE3y/DE6ij9eCk=
-		</data>
-		<key>Headers/TNSProcess.h</key>
-		<data>
-		dHuocpQ4b8KDApobwYNCqXcC6ZE=
-		</data>
-		<key>Headers/TNSWidgets.h</key>
-		<data>
-		ZFbCov7mFiXa4ZA/gAxqYHzRX7Q=
-		</data>
-		<key>Headers/UIImage+TNSBlocks.h</key>
-		<data>
-		OzGlvoGOJcFC6Z+YR5xThjLTUK4=
-		</data>
-		<key>Headers/UIView+PassThroughParent.h</key>
-		<data>
-		zdxBV/QJg7NPyx04RmZrXsxbHKU=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		NAVor3pUGyQBVyx3mPlAfSlexWE=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		/tkvRfxHVxmNhD1JzeHL7QIyPq0=
-		</data>
-		<key>PrivateHeaders/NSObject+Swizzling.h</key>
-		<data>
-		wRUUMHgrTVWHd/e8bDqN8sYZth4=
-		</data>
-		<key>PrivateHeaders/UIView+PropertyBag.h</key>
-		<data>
-		3USXIiZgky+5k7en+R6oyZ3pP18=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/NSData+Async.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			JdjuVUBed00Ged4cSDzYLXONUlESu+dae9KN0PYJ/nM=
-			</data>
-		</dict>
-		<key>Headers/NSFileHandle+Async.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			2T5kVM+Hg6kj426PPiCsCw+SsFz2+kqJkOSpwDcNPZ0=
-			</data>
-		</dict>
-		<key>Headers/NSString+Async.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			1Iuk4atAJ89zujXqrLBvGz7Ny52RXNdD5c1ZMK0SFgs=
-			</data>
-		</dict>
-		<key>Headers/TNSLabel.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			uaE78Ar4SA7jzBIQrT3lTvBQFOQj1sf1ippa8ldUDqQ=
-			</data>
-		</dict>
-		<key>Headers/TNSProcess.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			E+JvepkSwLMNO6gdhEdwuzkdVTUqmWp8P5LxHYCFim8=
-			</data>
-		</dict>
-		<key>Headers/TNSWidgets.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			6L3xStgKRHkPvDZAHAUF+EMI3Skf5jvnoA4ED/WbB1w=
-			</data>
-		</dict>
-		<key>Headers/UIImage+TNSBlocks.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			MgrX2woetySmXcrrDF290WGxNiW5W3E0B0fsjy8BgNI=
-			</data>
-		</dict>
-		<key>Headers/UIView+PassThroughParent.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			UfHyaUaTFlNcY5M7lUKwq6bPGuQeVIbjhCCInN1ZEYA=
-			</data>
-		</dict>
-		<key>Modules/module.modulemap</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			WpsCv2W1QB16vBBWGv6a8wyc4IjYUnJ+SSaY3j42OP4=
-			</data>
-		</dict>
-		<key>PrivateHeaders/NSObject+Swizzling.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			S+GqZzjPH/SqyxwzyysFybjZsbwS5lxcTwL04W79IGA=
-			</data>
-		</dict>
-		<key>PrivateHeaders/UIView+PropertyBag.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			/qFTteGRAX+GloVCipAdNRXPDPDWsNmQ+9USxt99lXE=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
deleted file mode 100644
index ef076e3714..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.org.nativescript.TNSWidgets</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets
deleted file mode 100644
index 766bbb03db..0000000000
Binary files a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets and /dev/null differ
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
deleted file mode 100644
index 9f1a2a082a..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/aarch64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'arm64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-xrsimulator/TNSWidgets.framework/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0x537CF, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0x3640, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0x53804, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0x3670, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0x53841, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1284, symSize: 0x1D8 }
-  - { offsetInCU: 0xAB, offset: 0x538C5, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1284, symSize: 0x1D8 }
-  - { offsetInCU: 0x182, offset: 0x5399C, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x1D8, symBinAddr: 0x145C, symSize: 0xA8 }
-  - { offsetInCU: 0x215, offset: 0x53A2F, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x280, symBinAddr: 0x1504, symSize: 0x18 }
-  - { offsetInCU: 0x24A, offset: 0x53A64, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x298, symBinAddr: 0x151C, symSize: 0x18 }
-  - { offsetInCU: 0x289, offset: 0x53AA3, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x2B0, symBinAddr: 0x1534, symSize: 0x18 }
-  - { offsetInCU: 0x2BE, offset: 0x53AD8, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x2C8, symBinAddr: 0x154C, symSize: 0x18 }
-  - { offsetInCU: 0x27, offset: 0x53B62, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1564, symSize: 0xF8 }
-  - { offsetInCU: 0x59, offset: 0x53B94, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1564, symSize: 0xF8 }
-  - { offsetInCU: 0x186, offset: 0x53CC1, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0xF8, symBinAddr: 0x165C, symSize: 0x28 }
-  - { offsetInCU: 0x27, offset: 0x53D27, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1684, symSize: 0xC0 }
-  - { offsetInCU: 0x4A, offset: 0x53D4A, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1684, symSize: 0xC0 }
-  - { offsetInCU: 0x129, offset: 0x53E29, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xC0, symBinAddr: 0x1744, symSize: 0xD8 }
-  - { offsetInCU: 0x1BD, offset: 0x53EBD, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x198, symBinAddr: 0x181C, symSize: 0x10 }
-  - { offsetInCU: 0x214, offset: 0x53F14, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x1A8, symBinAddr: 0x182C, symSize: 0x34 }
-  - { offsetInCU: 0x23D, offset: 0x53F3D, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x1DC, symBinAddr: 0x1860, symSize: 0x28 }
-  - { offsetInCU: 0x25C, offset: 0x53F5C, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x204, symBinAddr: 0x1888, symSize: 0x3C }
-  - { offsetInCU: 0x285, offset: 0x53F85, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x240, symBinAddr: 0x18C4, symSize: 0x30 }
-  - { offsetInCU: 0x2A4, offset: 0x53FA4, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x270, symBinAddr: 0x18F4, symSize: 0xDC }
-  - { offsetInCU: 0x345, offset: 0x54045, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x34C, symBinAddr: 0x19D0, symSize: 0x104 }
-  - { offsetInCU: 0x3E5, offset: 0x540E5, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x450, symBinAddr: 0x1AD4, symSize: 0x14 }
-  - { offsetInCU: 0x27, offset: 0x5447B, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x1AE8, symSize: 0x2C }
-  - { offsetInCU: 0x4F, offset: 0x544A3, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x3DC8, symBinAddr: 0x8518, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0x544BC, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x1AE8, symSize: 0x2C }
-  - { offsetInCU: 0xCE, offset: 0x54522, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x2C, symBinAddr: 0x1B14, symSize: 0x94 }
-  - { offsetInCU: 0x23B, offset: 0x5468F, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xC0, symBinAddr: 0x1BA8, symSize: 0xA4 }
-  - { offsetInCU: 0x2C7, offset: 0x5471B, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x164, symBinAddr: 0x1C4C, symSize: 0xBC }
-  - { offsetInCU: 0x347, offset: 0x5479B, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x220, symBinAddr: 0x1D08, symSize: 0x10 }
-  - { offsetInCU: 0x39E, offset: 0x547F2, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x28C, symBinAddr: 0x1D18, symSize: 0x58 }
-  - { offsetInCU: 0x3F1, offset: 0x54845, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x2E4, symBinAddr: 0x1D70, symSize: 0xA4 }
-  - { offsetInCU: 0x45D, offset: 0x548B1, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x388, symBinAddr: 0x1E14, symSize: 0xBC }
-  - { offsetInCU: 0x4DD, offset: 0x54931, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x444, symBinAddr: 0x1ED0, symSize: 0x10 }
-  - { offsetInCU: 0x534, offset: 0x54988, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x454, symBinAddr: 0x1EE0, symSize: 0xA4 }
-  - { offsetInCU: 0x5A0, offset: 0x549F4, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x4F8, symBinAddr: 0x1F84, symSize: 0xBC }
-  - { offsetInCU: 0x620, offset: 0x54A74, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x5B4, symBinAddr: 0x2040, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x54E4F, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x2050, symSize: 0x70 }
-  - { offsetInCU: 0x43, offset: 0x54E6B, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x2050, symSize: 0x70 }
-  - { offsetInCU: 0x139, offset: 0x54F61, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x70, symBinAddr: 0x20C0, symSize: 0x120 }
-  - { offsetInCU: 0x27, offset: 0x5521A, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x21E0, symSize: 0xC0 }
-  - { offsetInCU: 0x4A, offset: 0x5523D, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x21E0, symSize: 0xC0 }
-  - { offsetInCU: 0x135, offset: 0x55328, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xC0, symBinAddr: 0x22A0, symSize: 0xD8 }
-  - { offsetInCU: 0x1D5, offset: 0x553C8, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x198, symBinAddr: 0x2378, symSize: 0x14 }
-  - { offsetInCU: 0x23C, offset: 0x5542F, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x274, symBinAddr: 0x238C, symSize: 0xD4 }
-  - { offsetInCU: 0x2ED, offset: 0x554E0, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x348, symBinAddr: 0x2460, symSize: 0xB0 }
-  - { offsetInCU: 0x3A1, offset: 0x55594, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x3F8, symBinAddr: 0x2510, symSize: 0x10 }
-  - { offsetInCU: 0x27, offset: 0x55934, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2520, symSize: 0xB8 }
-  - { offsetInCU: 0x4A, offset: 0x55957, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2520, symSize: 0xB8 }
-  - { offsetInCU: 0x180, offset: 0x55A8D, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xB8, symBinAddr: 0x25D8, symSize: 0xA0 }
-  - { offsetInCU: 0x200, offset: 0x55B0D, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x158, symBinAddr: 0x2678, symSize: 0x10 }
-  - { offsetInCU: 0x257, offset: 0x55B64, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1C4, symBinAddr: 0x2688, symSize: 0xD0 }
-  - { offsetInCU: 0x2F8, offset: 0x55C05, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x294, symBinAddr: 0x2758, symSize: 0x84 }
-  - { offsetInCU: 0x37D, offset: 0x55C8A, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x318, symBinAddr: 0x27DC, symSize: 0xC }
-  - { offsetInCU: 0x3C4, offset: 0x55CD1, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x324, symBinAddr: 0x27E8, symSize: 0x10 }
-  - { offsetInCU: 0x3ED, offset: 0x55CFA, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x334, symBinAddr: 0x27F8, symSize: 0x8 }
-  - { offsetInCU: 0x27, offset: 0x55FE0, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x2800, symSize: 0x4 }
-  - { offsetInCU: 0x35, offset: 0x55FEE, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x4, symBinAddr: 0x2804, symSize: 0x84 }
-  - { offsetInCU: 0x5B, offset: 0x56014, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x28B8, symBinAddr: 0x8520, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0x56078, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x28C0, symBinAddr: 0x8530, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0x5609D, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x2800, symSize: 0x4 }
-  - { offsetInCU: 0x163, offset: 0x5611C, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x2888, symSize: 0x4C }
-  - { offsetInCU: 0x1FA, offset: 0x561B3, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xD4, symBinAddr: 0x28D4, symSize: 0x58 }
-  - { offsetInCU: 0x241, offset: 0x561FA, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x12C, symBinAddr: 0x292C, symSize: 0x68 }
-  - { offsetInCU: 0x294, offset: 0x5624D, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x194, symBinAddr: 0x2994, symSize: 0xBC }
-  - { offsetInCU: 0x2DB, offset: 0x56294, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x250, symBinAddr: 0x2A50, symSize: 0x9C }
-  - { offsetInCU: 0x31E, offset: 0x562D7, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x2EC, symBinAddr: 0x2AEC, symSize: 0x70 }
-  - { offsetInCU: 0x351, offset: 0x5630A, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x35C, symBinAddr: 0x2B5C, symSize: 0x24 }
-  - { offsetInCU: 0x27, offset: 0x56434, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x2B80, symSize: 0x4 }
-  - { offsetInCU: 0x41, offset: 0x5644E, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x1F0, symBinAddr: 0x42D8, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0x56462, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x4, symBinAddr: 0x2B84, symSize: 0x84 }
-  - { offsetInCU: 0x7B, offset: 0x56488, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x2450, symBinAddr: 0x8528, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0x564F5, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x2B80, symSize: 0x4 }
-  - { offsetInCU: 0x168, offset: 0x56575, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x88, symBinAddr: 0x2C08, symSize: 0x40 }
-  - { offsetInCU: 0x1A7, offset: 0x565B4, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xC8, symBinAddr: 0x2C48, symSize: 0x4C }
-  - { offsetInCU: 0x1EE, offset: 0x565FB, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x114, symBinAddr: 0x2C94, symSize: 0x50 }
-  - { offsetInCU: 0x231, offset: 0x5663E, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x164, symBinAddr: 0x2CE4, symSize: 0x48 }
-...
diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml b/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml
deleted file mode 100644
index 75cbdecc4a..0000000000
--- a/packages/core/platforms/ios/TNSWidgets.xcframework/xros-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/Relocations/x86_64/TNSWidgets.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-triple:          'x86_64-apple-darwin'
-binary-path:     '/Users/nstudio/Documents/github/NativeScript/NativeScript/packages/ui-mobile-base/ios/TNSWidgets/build/Release-xrsimulator/TNSWidgets.framework/TNSWidgets'
-relocations:
-  - { offsetInCU: 0x34, offset: 0x548A6, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionString, symObjAddr: 0x0, symBinAddr: 0x3950, symSize: 0x0 }
-  - { offsetInCU: 0x69, offset: 0x548DB, size: 0x8, addend: 0x0, symName: _TNSWidgetsVersionNumber, symObjAddr: 0x30, symBinAddr: 0x3980, symSize: 0x0 }
-  - { offsetInCU: 0x27, offset: 0x54918, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1713, symSize: 0x394 }
-  - { offsetInCU: 0xA9, offset: 0x5499A, size: 0x8, addend: 0x0, symName: '-[TNSLabel textRectForBounds:limitedToNumberOfLines:]', symObjAddr: 0x0, symBinAddr: 0x1713, symSize: 0x394 }
-  - { offsetInCU: 0x185, offset: 0x54A76, size: 0x8, addend: 0x0, symName: '-[TNSLabel drawTextInRect:]', symObjAddr: 0x394, symBinAddr: 0x1AA7, symSize: 0xDD }
-  - { offsetInCU: 0x1F1, offset: 0x54AE2, size: 0x8, addend: 0x0, symName: '-[TNSLabel padding]', symObjAddr: 0x471, symBinAddr: 0x1B84, symSize: 0x20 }
-  - { offsetInCU: 0x226, offset: 0x54B17, size: 0x8, addend: 0x0, symName: '-[TNSLabel setPadding:]', symObjAddr: 0x491, symBinAddr: 0x1BA4, symSize: 0x1E }
-  - { offsetInCU: 0x264, offset: 0x54B55, size: 0x8, addend: 0x0, symName: '-[TNSLabel borderThickness]', symObjAddr: 0x4AF, symBinAddr: 0x1BC2, symSize: 0x20 }
-  - { offsetInCU: 0x299, offset: 0x54B8A, size: 0x8, addend: 0x0, symName: '-[TNSLabel setBorderThickness:]', symObjAddr: 0x4CF, symBinAddr: 0x1BE2, symSize: 0x1E }
-  - { offsetInCU: 0x27, offset: 0x54C13, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1C00, symSize: 0x119 }
-  - { offsetInCU: 0x59, offset: 0x54C45, size: 0x8, addend: 0x0, symName: ___tns_uptime, symObjAddr: 0x0, symBinAddr: 0x1C00, symSize: 0x119 }
-  - { offsetInCU: 0x1B5, offset: 0x54DA1, size: 0x8, addend: 0x0, symName: ___nslog, symObjAddr: 0x119, symBinAddr: 0x1D19, symSize: 0x17 }
-  - { offsetInCU: 0x27, offset: 0x54E07, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1D30, symSize: 0xD4 }
-  - { offsetInCU: 0x4A, offset: 0x54E2A, size: 0x8, addend: 0x0, symName: '-[NSFileHandle(Async) appendData:completion:]', symObjAddr: 0x0, symBinAddr: 0x1D30, symSize: 0xD4 }
-  - { offsetInCU: 0x1CE, offset: 0x54FAE, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke', symObjAddr: 0xD4, symBinAddr: 0x1E04, symSize: 0xFD }
-  - { offsetInCU: 0x316, offset: 0x550F6, size: 0x8, addend: 0x0, symName: '___45-[NSFileHandle(Async) appendData:completion:]_block_invoke_2', symObjAddr: 0x1D1, symBinAddr: 0x1F01, symSize: 0x13 }
-  - { offsetInCU: 0x36D, offset: 0x5514D, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40b, symObjAddr: 0x1E4, symBinAddr: 0x1F14, symSize: 0x30 }
-  - { offsetInCU: 0x3A2, offset: 0x55182, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s, symObjAddr: 0x214, symBinAddr: 0x1F44, symSize: 0x25 }
-  - { offsetInCU: 0x3D9, offset: 0x551B9, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32s40s48b, symObjAddr: 0x239, symBinAddr: 0x1F69, symSize: 0x44 }
-  - { offsetInCU: 0x41A, offset: 0x551FA, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s40s48s, symObjAddr: 0x27D, symBinAddr: 0x1FAD, symSize: 0x2C }
-  - { offsetInCU: 0x45D, offset: 0x5523D, size: 0x8, addend: 0x0, symName: '+[NSFileHandle(Async) fileHandleWith:data:completion:]', symObjAddr: 0x2A9, symBinAddr: 0x1FD9, symSize: 0xF1 }
-  - { offsetInCU: 0x5ED, offset: 0x553CD, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke', symObjAddr: 0x39A, symBinAddr: 0x20CA, symSize: 0x141 }
-  - { offsetInCU: 0x781, offset: 0x55561, size: 0x8, addend: 0x0, symName: '___54+[NSFileHandle(Async) fileHandleWith:data:completion:]_block_invoke_2', symObjAddr: 0x4DB, symBinAddr: 0x220B, symSize: 0x1A }
-  - { offsetInCU: 0x27, offset: 0x558F7, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x2225, symSize: 0x27 }
-  - { offsetInCU: 0x4F, offset: 0x5591F, size: 0x8, addend: 0x0, symName: _image_queue, symObjAddr: 0x43B0, symBinAddr: 0x6560, symSize: 0x0 }
-  - { offsetInCU: 0x68, offset: 0x55938, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) initialize]', symObjAddr: 0x0, symBinAddr: 0x2225, symSize: 0x27 }
-  - { offsetInCU: 0x131, offset: 0x55A01, size: 0x8, addend: 0x0, symName: '-[UIImage(TNSBlocks) tns_forceDecode]', symObjAddr: 0x27, symBinAddr: 0x224C, symSize: 0xB2 }
-  - { offsetInCU: 0x2E8, offset: 0x55BB8, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]', symObjAddr: 0xD9, symBinAddr: 0x22FE, symSize: 0xB3 }
-  - { offsetInCU: 0x3FD, offset: 0x55CCD, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke', symObjAddr: 0x18C, symBinAddr: 0x23B1, symSize: 0xD9 }
-  - { offsetInCU: 0x4E1, offset: 0x55DB1, size: 0x8, addend: 0x0, symName: '___58+[UIImage(TNSBlocks) tns_safeDecodeImageNamed:completion:]_block_invoke_2', symObjAddr: 0x265, symBinAddr: 0x248A, symSize: 0x13 }
-  - { offsetInCU: 0x538, offset: 0x55E08, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_safeImageNamed:]', symObjAddr: 0x2CD, symBinAddr: 0x249D, symSize: 0x63 }
-  - { offsetInCU: 0x5C0, offset: 0x55E90, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]', symObjAddr: 0x330, symBinAddr: 0x2500, symSize: 0xB3 }
-  - { offsetInCU: 0x6B5, offset: 0x55F85, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke', symObjAddr: 0x3E3, symBinAddr: 0x25B3, symSize: 0xD9 }
-  - { offsetInCU: 0x799, offset: 0x56069, size: 0x8, addend: 0x0, symName: '___57+[UIImage(TNSBlocks) tns_decodeImageWithData:completion:]_block_invoke_2', symObjAddr: 0x4BC, symBinAddr: 0x268C, symSize: 0x13 }
-  - { offsetInCU: 0x7F0, offset: 0x560C0, size: 0x8, addend: 0x0, symName: '+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]', symObjAddr: 0x4CF, symBinAddr: 0x269F, symSize: 0xB3 }
-  - { offsetInCU: 0x8E5, offset: 0x561B5, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke', symObjAddr: 0x582, symBinAddr: 0x2752, symSize: 0xD9 }
-  - { offsetInCU: 0x9C9, offset: 0x56299, size: 0x8, addend: 0x0, symName: '___68+[UIImage(TNSBlocks) tns_decodeImageWidthContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x65B, symBinAddr: 0x282B, symSize: 0x13 }
-  - { offsetInCU: 0x27, offset: 0x56674, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x283E, symSize: 0x6A }
-  - { offsetInCU: 0x43, offset: 0x56690, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleInstanceMethodWithOriginalSelector:fromClass:withSwizzlingSelector:]', symObjAddr: 0x0, symBinAddr: 0x283E, symSize: 0x6A }
-  - { offsetInCU: 0x169, offset: 0x567B6, size: 0x8, addend: 0x0, symName: '+[NSObject(Swizzling) swizzleMethodWithOriginalSelector:originalMethod:fromClass:withSwizzlingSelector:swizzlingMethod:]', symObjAddr: 0x6A, symBinAddr: 0x28A8, symSize: 0x11A }
-  - { offsetInCU: 0x27, offset: 0x56A88, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x29C2, symSize: 0xDD }
-  - { offsetInCU: 0x4A, offset: 0x56AAB, size: 0x8, addend: 0x0, symName: '+[NSString(Async) stringWithContentsOfFile:encoding:completion:]', symObjAddr: 0x0, symBinAddr: 0x29C2, symSize: 0xDD }
-  - { offsetInCU: 0x1DA, offset: 0x56C3B, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke', symObjAddr: 0xDD, symBinAddr: 0x2A9F, symSize: 0xF1 }
-  - { offsetInCU: 0x312, offset: 0x56D73, size: 0x8, addend: 0x0, symName: '___64+[NSString(Async) stringWithContentsOfFile:encoding:completion:]_block_invoke_2', symObjAddr: 0x1CE, symBinAddr: 0x2B90, symSize: 0x1A }
-  - { offsetInCU: 0x379, offset: 0x56DDA, size: 0x8, addend: 0x0, symName: '-[NSString(Async) writeToFile:atomically:encoding:completion:]', symObjAddr: 0x2AD, symBinAddr: 0x2BAA, symSize: 0xEB }
-  - { offsetInCU: 0x4D2, offset: 0x56F33, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke', symObjAddr: 0x398, symBinAddr: 0x2C95, symSize: 0xC9 }
-  - { offsetInCU: 0x5F2, offset: 0x57053, size: 0x8, addend: 0x0, symName: '___62-[NSString(Async) writeToFile:atomically:encoding:completion:]_block_invoke_2', symObjAddr: 0x461, symBinAddr: 0x2D5E, symSize: 0x13 }
-  - { offsetInCU: 0x27, offset: 0x573F3, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2D71, symSize: 0xC6 }
-  - { offsetInCU: 0x4A, offset: 0x57416, size: 0x8, addend: 0x0, symName: '+[NSData(Async) dataWithContentsOfFile:completion:]', symObjAddr: 0x0, symBinAddr: 0x2D71, symSize: 0xC6 }
-  - { offsetInCU: 0x225, offset: 0x575F1, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke', symObjAddr: 0xC6, symBinAddr: 0x2E37, symSize: 0xB4 }
-  - { offsetInCU: 0x2FD, offset: 0x576C9, size: 0x8, addend: 0x0, symName: '___51+[NSData(Async) dataWithContentsOfFile:completion:]_block_invoke_2', symObjAddr: 0x17A, symBinAddr: 0x2EEB, symSize: 0x13 }
-  - { offsetInCU: 0x354, offset: 0x57720, size: 0x8, addend: 0x0, symName: '-[NSData(Async) writeToFile:atomically:completion:]', symObjAddr: 0x1E2, symBinAddr: 0x2EFE, symSize: 0xE6 }
-  - { offsetInCU: 0x49D, offset: 0x57869, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke', symObjAddr: 0x2C8, symBinAddr: 0x2FE4, symSize: 0x84 }
-  - { offsetInCU: 0x546, offset: 0x57912, size: 0x8, addend: 0x0, symName: '___51-[NSData(Async) writeToFile:atomically:completion:]_block_invoke_2', symObjAddr: 0x34C, symBinAddr: 0x3068, symSize: 0xC }
-  - { offsetInCU: 0x58D, offset: 0x57959, size: 0x8, addend: 0x0, symName: ___copy_helper_block_e8_32b, symObjAddr: 0x358, symBinAddr: 0x3074, symSize: 0x17 }
-  - { offsetInCU: 0x5B6, offset: 0x57982, size: 0x8, addend: 0x0, symName: ___destroy_helper_block_e8_32s, symObjAddr: 0x36F, symBinAddr: 0x308B, symSize: 0xF }
-  - { offsetInCU: 0x27, offset: 0x57C74, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x309A, symSize: 0x12 }
-  - { offsetInCU: 0x35, offset: 0x57C82, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) loadPropertyBag]', symObjAddr: 0x12, symBinAddr: 0x30AC, symSize: 0x70 }
-  - { offsetInCU: 0x5B, offset: 0x57CA8, size: 0x8, addend: 0x0, symName: _loadPropertyBag.onceToken, symObjAddr: 0x2D48, symBinAddr: 0x6568, symSize: 0x0 }
-  - { offsetInCU: 0xBF, offset: 0x57D0C, size: 0x8, addend: 0x0, symName: __propertyBagHolder, symObjAddr: 0x2D50, symBinAddr: 0x6578, symSize: 0x0 }
-  - { offsetInCU: 0xE4, offset: 0x57D31, size: 0x8, addend: 0x0, symName: '+[UIView(PropertyBag) load]', symObjAddr: 0x0, symBinAddr: 0x309A, symSize: 0x12 }
-  - { offsetInCU: 0x178, offset: 0x57DC5, size: 0x8, addend: 0x0, symName: '___38+[UIView(PropertyBag) loadPropertyBag]_block_invoke', symObjAddr: 0x82, symBinAddr: 0x311C, symSize: 0x46 }
-  - { offsetInCU: 0x22A, offset: 0x57E77, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyValueForKey:]', symObjAddr: 0xC8, symBinAddr: 0x3162, symSize: 0x7A }
-  - { offsetInCU: 0x2C6, offset: 0x57F13, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyValue:forKey:]', symObjAddr: 0x142, symBinAddr: 0x31DC, symSize: 0x8B }
-  - { offsetInCU: 0x3A5, offset: 0x57FF2, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag]', symObjAddr: 0x1CD, symBinAddr: 0x3267, symSize: 0xEA }
-  - { offsetInCU: 0x460, offset: 0x580AD, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) setPropertyBag:]', symObjAddr: 0x2B7, symBinAddr: 0x3351, symSize: 0xC1 }
-  - { offsetInCU: 0x52F, offset: 0x5817C, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) removePropertyBag]', symObjAddr: 0x378, symBinAddr: 0x3412, symSize: 0x76 }
-  - { offsetInCU: 0x59E, offset: 0x581EB, size: 0x8, addend: 0x0, symName: '-[UIView(PropertyBag) propertyBag_dealloc]', symObjAddr: 0x3EE, symBinAddr: 0x3488, symSize: 0x2E }
-  - { offsetInCU: 0x27, offset: 0x5833E, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x34B6, symSize: 0x12 }
-  - { offsetInCU: 0x41, offset: 0x58358, size: 0x8, addend: 0x0, symName: _TLKPassThroughParentKey, symObjAddr: 0x1F8, symBinAddr: 0x5268, symSize: 0x0 }
-  - { offsetInCU: 0x55, offset: 0x5836C, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) loadHitTest]', symObjAddr: 0x12, symBinAddr: 0x34C8, symSize: 0x70 }
-  - { offsetInCU: 0x7B, offset: 0x58392, size: 0x8, addend: 0x0, symName: _loadHitTest.onceToken, symObjAddr: 0x2658, symBinAddr: 0x6570, symSize: 0x0 }
-  - { offsetInCU: 0xE8, offset: 0x583FF, size: 0x8, addend: 0x0, symName: '+[UIView(PassThroughParent) load]', symObjAddr: 0x0, symBinAddr: 0x34B6, symSize: 0x12 }
-  - { offsetInCU: 0x17D, offset: 0x58494, size: 0x8, addend: 0x0, symName: '___40+[UIView(PassThroughParent) loadHitTest]_block_invoke', symObjAddr: 0x82, symBinAddr: 0x3538, symSize: 0x3B }
-  - { offsetInCU: 0x1D7, offset: 0x584EE, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThroughParent]', symObjAddr: 0xBD, symBinAddr: 0x3573, symSize: 0x54 }
-  - { offsetInCU: 0x252, offset: 0x58569, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) setPassThroughParent:]', symObjAddr: 0x111, symBinAddr: 0x35C7, symSize: 0x5A }
-  - { offsetInCU: 0x2C9, offset: 0x585E0, size: 0x8, addend: 0x0, symName: '-[UIView(PassThroughParent) passThrough_hitTest:withEvent:]', symObjAddr: 0x16B, symBinAddr: 0x3621, symSize: 0x55 }
-...
diff --git a/packages/core/platforms/ios/src/NSApplicationSettings.swift b/packages/core/platforms/ios/src/NSApplicationSettings.swift
new file mode 100644
index 0000000000..de57dfcc2b
--- /dev/null
+++ b/packages/core/platforms/ios/src/NSApplicationSettings.swift
@@ -0,0 +1,91 @@
+
+import Foundation
+import UIKit
+
+@objcMembers
+@objc(NSApplicationSettings)
+class NSApplicationSettings : NSObject {
+
+    static func userDefaultsToJSONString(ignoreRegexp: String?) -> String? {
+        let userDefaults = UserDefaults.standard
+        let nsDictionary = userDefaults.dictionaryRepresentation()
+        let jsonDictionary = NSMutableDictionary()
+
+        var regex: NSRegularExpression?
+        if let ignoreRegexp = ignoreRegexp {
+            do {
+                regex = try NSRegularExpression(pattern: ignoreRegexp)
+            } catch {
+                print("Invalid regular expression: \(error.localizedDescription)")
+                return nil
+            }
+        }
+        
+        nsDictionary.forEach { (key, value) in
+            guard let key = key as? String else { return }
+            
+            // Filter out keys that match the ignore criteria
+            if key.hasPrefix("AK") || key.hasPrefix("Apple") || key.hasPrefix("NS") || key.hasPrefix("PK") {
+                return
+            }
+            
+            // If regex is provided, filter keys that match the regex          
+             if let regex = regex {
+                let range = NSRange(location: 0, length: key.utf16.count)
+                if regex.firstMatch(in: key, options: [], range: range) != nil {
+                    return
+                }
+            }
+            
+            var valueClassString: String?
+            
+            // Obtain the class of the value
+            if let valueClass = object_getClass(value) {
+                valueClassString = NSStringFromClass(valueClass)
+            }
+            
+            if let valueClassString = valueClassString {
+                var formattedValueClassString = valueClassString
+                if valueClassString == "__NSCFData" {
+                    return
+                }
+                // Remove '__' prefix if present
+                if formattedValueClassString.hasPrefix("__") {
+                    formattedValueClassString.removeFirst(2)
+                }
+                
+                switch formattedValueClassString {
+                case "NSDate":
+                    if let dateValue = value as? Date {
+                        let dateFormatter = ISO8601DateFormatter()
+                        jsonDictionary.setObject(dateFormatter.string(from: dateValue), forKey: key as NSString)
+                    }
+                case "NSURL":
+                    if let urlValue = value as? URL {
+                        jsonDictionary.setObject(urlValue.absoluteString, forKey: key as NSString)
+                    }
+                default:
+                    if (JSONSerialization.isValidJSONObject(value)) {
+                        jsonDictionary.setObject(value, forKey: key as NSString)
+                    }
+                }
+            } else if (JSONSerialization.isValidJSONObject(value)) {
+                jsonDictionary.setObject(value, forKey: key as NSString)
+            }
+        }
+        
+        // Convert the dictionary to JSON data
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: jsonDictionary, options: .prettyPrinted)
+            
+            // Convert JSON data to string
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                return jsonString
+            }
+        } catch {
+            print("Failed to serialize dictionary to JSON: \(error.localizedDescription)")
+        }
+        
+        return nil
+    }
+}
\ No newline at end of file
diff --git a/packages/core/platforms/ios/src/TNSWidgets b/packages/core/platforms/ios/src/TNSWidgets
new file mode 120000
index 0000000000..8b507c844d
--- /dev/null
+++ b/packages/core/platforms/ios/src/TNSWidgets
@@ -0,0 +1 @@
+../../../../ui-mobile-base/ios/TNSWidgets/TNSWidgets
\ No newline at end of file
diff --git a/packages/core/platforms/ios/src/module.modulemap b/packages/core/platforms/ios/src/module.modulemap
index dd044dfcc3..52feeec467 100644
--- a/packages/core/platforms/ios/src/module.modulemap
+++ b/packages/core/platforms/ios/src/module.modulemap
@@ -11,4 +11,9 @@ module NativeScriptUtils {
 module UIViewNativeScript {
     header "UIView+NativeScript.h"
     export *
+}
+module TNSWidgets {
+    umbrella header "TNSWidgets/TNSWidgets.h"
+    module * { export * }
+    export *
 }
\ No newline at end of file
diff --git a/packages/core/references.d.ts b/packages/core/references.d.ts
index 4300b64aee..74296f7a32 100644
--- a/packages/core/references.d.ts
+++ b/packages/core/references.d.ts
@@ -4,7 +4,7 @@
 /// <reference path="../types-ios/src/lib/ios/objc-x86_64/objc!Darwin.d.ts" />
 /// <reference path="../types-ios/src/lib/ios/objc-x86_64/objc!DarwinFoundation.d.ts" />
 /// <reference path="../types-ios/src/lib/ios/objc-x86_64/objc!Symbols.d.ts" />
-/// <reference path="../types-android/src/lib/android-33.d.ts" />
+/// <reference path="../types-android/src/lib/android-34.d.ts" />
 /// <reference path="./platforms/ios/typings/objc!MaterialComponents.d.ts" />
 /// <reference path="./platforms/ios/typings/objc!NativeScriptUtils.d.ts" />
 /// <reference path="./global-types.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 6ffbd6f4a4..d80702663a 100644
--- a/packages/core/ui/action-bar/action-bar-common.ts
+++ b/packages/core/ui/action-bar/action-bar-common.ts
@@ -270,6 +270,8 @@ export class ActionItems implements ActionItemsDefinition {
 }
 
 export class ActionItemBase extends ViewBase implements ActionItemDefinition {
+	// defining this here means tap event wont be handled
+	// by the gesture observers
 	public static tapEvent = 'tap';
 
 	private _actionBar: ActionBarDefinition;
diff --git a/packages/core/ui/action-bar/index.android.ts b/packages/core/ui/action-bar/index.android.ts
index 126e443572..9da50d7986 100644
--- a/packages/core/ui/action-bar/index.android.ts
+++ b/packages/core/ui/action-bar/index.android.ts
@@ -1,14 +1,15 @@
 import { AndroidActionItemSettings, AndroidActionBarSettings as AndroidActionBarSettingsDefinition, ActionItem as ActionItemDefinition } from '.';
-import { isAccessibilityServiceEnabled } from '../../application';
-import { updateContentDescription } from '../../application/helpers';
 import { ActionItemBase, ActionBarBase, isVisible, flatProperty, traceMissingIcon, androidContentInsetLeftProperty, androidContentInsetRightProperty } from './action-bar-common';
-import { AndroidHelper, View } from '../core/view';
+import { View } from '../core/view';
+import { VIEW_GONE, VIEW_VISIBLE } from '../core/view/index.android';
 import { Color } from '../../color';
 import { layout, RESOURCE_PREFIX, isFontIconURI } from '../../utils';
 import { colorProperty } from '../styling/style-properties';
 import { ImageSource } from '../../image-source';
-import { getNativeApp } from '../../application/helpers-common';
+import { isAccessibilityServiceEnabled, updateContentDescription } from '../../accessibility';
+import { getApplicationContext } from '../../application/helpers.android';
 import { SDK_VERSION } from '../../utils/constants';
+import { getNativeApp } from '../../application/helpers-common';
 
 export * from './action-bar-common';
 
@@ -16,7 +17,6 @@ const R_ID_HOME = 0x0102002c;
 const ACTION_ITEM_ID_OFFSET = 10000;
 const DEFAULT_ELEVATION = 4;
 
-let AppCompatTextView;
 let actionItemIdGenerator = ACTION_ITEM_ID_OFFSET;
 function generateItemId(): number {
 	actionItemIdGenerator++;
@@ -61,8 +61,6 @@ function initializeMenuItemClickListener(): void {
 		return;
 	}
 
-	AppCompatTextView = androidx.appcompat.widget.AppCompatTextView;
-
 	@NativeClass
 	@Interfaces([androidx.appcompat.widget.Toolbar.OnMenuItemClickListener])
 	class MenuItemClickListenerImpl extends java.lang.Object implements androidx.appcompat.widget.Toolbar.OnMenuItemClickListener {
@@ -80,7 +78,7 @@ function initializeMenuItemClickListener(): void {
 	}
 
 	MenuItemClickListener = MenuItemClickListenerImpl;
-	appResources = getNativeApp<android.app.Application>().getApplicationContext().getResources();
+	appResources = getApplicationContext().getResources();
 }
 
 export class ActionItem extends ActionItemBase {
@@ -142,7 +140,7 @@ export class NavigationButton extends ActionItem {}
 
 export class ActionBar extends ActionBarBase {
 	private _android: AndroidActionBarSettings;
-	public nativeViewProtected: androidx.appcompat.widget.Toolbar;
+	public declare nativeViewProtected: androidx.appcompat.widget.Toolbar;
 
 	constructor() {
 		super();
@@ -199,13 +197,13 @@ export class ActionBar extends ActionBarBase {
 
 		const page = this.page;
 		if (!page.frame || !page.frame._getNavBarVisible(page)) {
-			this.nativeViewProtected.setVisibility(android.view.View.GONE);
+			this.nativeViewProtected.setVisibility(VIEW_GONE);
 
 			// If action bar is hidden - no need to fill it with items.
 			return;
 		}
 
-		this.nativeViewProtected.setVisibility(android.view.View.VISIBLE);
+		this.nativeViewProtected.setVisibility(VIEW_VISIBLE);
 
 		// Add menu items
 		this._addActionItems();
@@ -310,7 +308,7 @@ export class ActionBar extends ActionBarBase {
 			if (title !== undefined) {
 				this.nativeViewProtected.setTitle(title);
 			} else {
-				const appContext = getNativeApp<android.app.Application>().getApplicationContext();
+				const appContext = getApplicationContext();
 				const appInfo = appContext.getApplicationInfo();
 				const appLabel = appContext.getPackageManager().getApplicationLabel(appInfo);
 				if (appLabel) {
@@ -471,36 +469,7 @@ export class ActionBar extends ActionBarBase {
 		const originalIsAccessibilityHeading = SDK_VERSION >= 28 && nativeView.isAccessibilityHeading();
 
 		try {
-			nativeView.setFocusable(false);
-			nativeView.setImportantForAccessibility(android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO);
-
-			let announceView: android.view.View | null = null;
-
-			const numChildren = nativeView.getChildCount();
-			for (let i = 0; i < numChildren; i += 1) {
-				const childView = nativeView.getChildAt(i);
-				if (!childView) {
-					continue;
-				}
-
-				childView.setFocusable(true);
-				if (childView instanceof androidx.appcompat.widget.AppCompatTextView) {
-					announceView = childView;
-					if (SDK_VERSION >= 28) {
-						announceView.setAccessibilityHeading(true);
-					}
-				}
-			}
-
-			if (!announceView) {
-				announceView = nativeView;
-			}
-
-			announceView.setFocusable(true);
-			announceView.setImportantForAccessibility(android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES);
-
-			announceView.sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED);
-			announceView.sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+			org.nativescript.widgets.ViewHelper.toolbarAccessibilityScreenChanged(nativeView);
 		} catch {
 			// ignore
 		} finally {
@@ -512,7 +481,7 @@ export class ActionBar extends ActionBarBase {
 				}
 
 				if (SDK_VERSION >= 28) {
-					nativeView.setAccessibilityHeading(originalIsAccessibilityHeading);
+					localNativeView.setAccessibilityHeading(originalIsAccessibilityHeading);
 				}
 
 				if (SDK_VERSION >= 26) {
@@ -525,15 +494,8 @@ export class ActionBar extends ActionBarBase {
 	}
 }
 
-function getAppCompatTextView(toolbar: androidx.appcompat.widget.Toolbar): typeof AppCompatTextView {
-	for (let i = 0, count = toolbar.getChildCount(); i < count; i++) {
-		const child = toolbar.getChildAt(i);
-		if (child instanceof AppCompatTextView) {
-			return child;
-		}
-	}
-
-	return null;
+function getAppCompatTextView(toolbar: androidx.appcompat.widget.Toolbar) {
+	return org.nativescript.widgets.ViewHelper.getChildAppCompatTextView(toolbar);
 }
 
 ActionBar.prototype.recycleNativeView = 'auto';
@@ -547,7 +509,7 @@ function getDrawableOrResourceId(icon: string, resources: android.content.res.Re
 
 	let result = null;
 	if (icon.indexOf(RESOURCE_PREFIX) === 0) {
-		const resourceId: number = resources.getIdentifier(icon.substring(RESOURCE_PREFIX.length), 'drawable', getNativeApp<android.app.Application>().getApplicationContext().getPackageName());
+		const resourceId: number = resources.getIdentifier(icon.substring(RESOURCE_PREFIX.length), 'drawable', getApplicationContext().getPackageName());
 		if (resourceId > 0) {
 			result = resourceId;
 		}
diff --git a/packages/core/ui/activity-indicator/index.android.ts b/packages/core/ui/activity-indicator/index.android.ts
index ba3160cd9f..bf4b79c80f 100644
--- a/packages/core/ui/activity-indicator/index.android.ts
+++ b/packages/core/ui/activity-indicator/index.android.ts
@@ -2,16 +2,17 @@ import { ActivityIndicatorBase, busyProperty } from './activity-indicator-common
 import { CoreTypes } from '../../core-types';
 import { Color } from '../../color';
 import { colorProperty, visibilityProperty } from '../styling/style-properties';
+import { VIEW_GONE, VIEW_INVISIBLE, VIEW_VISIBLE } from '../core/view/index.android';
 import { AndroidHelper } from '../core/view';
 
 export * from './activity-indicator-common';
 
 export class ActivityIndicator extends ActivityIndicatorBase {
-	nativeViewProtected: android.widget.ProgressBar;
+	declare nativeViewProtected: android.widget.ProgressBar;
 
 	public createNativeView() {
 		const progressBar = new android.widget.ProgressBar(this._context);
-		progressBar.setVisibility(android.view.View.INVISIBLE);
+		progressBar.setVisibility(VIEW_INVISIBLE);
 		progressBar.setIndeterminate(true);
 
 		return progressBar;
@@ -22,7 +23,7 @@ export class ActivityIndicator extends ActivityIndicatorBase {
 	}
 	[busyProperty.setNative](value: boolean) {
 		if (this.visibility === CoreTypes.Visibility.visible) {
-			this.nativeViewProtected.setVisibility(value ? android.view.View.VISIBLE : android.view.View.INVISIBLE);
+			this.nativeViewProtected.setVisibility(value ? VIEW_VISIBLE : VIEW_INVISIBLE);
 		}
 	}
 
@@ -32,16 +33,17 @@ export class ActivityIndicator extends ActivityIndicatorBase {
 	[visibilityProperty.setNative](value: CoreTypes.VisibilityType) {
 		switch (value) {
 			case CoreTypes.Visibility.visible:
-				this.nativeViewProtected.setVisibility(this.busy ? android.view.View.VISIBLE : android.view.View.INVISIBLE);
+				this.nativeViewProtected.setVisibility(this.busy ? VIEW_VISIBLE : VIEW_INVISIBLE);
 				break;
 			case CoreTypes.Visibility.hidden:
-				this.nativeViewProtected.setVisibility(android.view.View.INVISIBLE);
+				this.nativeViewProtected.setVisibility(VIEW_INVISIBLE);
 				break;
 			case CoreTypes.Visibility.collapse:
-				this.nativeViewProtected.setVisibility(android.view.View.GONE);
+			case CoreTypes.Visibility.collapsed:
+				this.nativeViewProtected.setVisibility(VIEW_GONE);
 				break;
 			default:
-				throw new Error(`Invalid visibility value: ${value}. Valid values are: "${CoreTypes.Visibility.visible}", "${CoreTypes.Visibility.hidden}", "${CoreTypes.Visibility.collapse}".`);
+				throw new Error(`Invalid visibility value: ${value}. Valid values are: "${CoreTypes.Visibility.visible}", "${CoreTypes.Visibility.hidden}", "${CoreTypes.Visibility.collapse}", "${CoreTypes.Visibility.collapsed}".`);
 		}
 	}
 
diff --git a/packages/core/ui/activity-indicator/index.ios.ts b/packages/core/ui/activity-indicator/index.ios.ts
index 44dd9f6e69..d971d430c5 100644
--- a/packages/core/ui/activity-indicator/index.ios.ts
+++ b/packages/core/ui/activity-indicator/index.ios.ts
@@ -7,7 +7,7 @@ import { IOSIndicatorViewStyle } from '.';
 export * from './activity-indicator-common';
 
 export class ActivityIndicator extends ActivityIndicatorBase {
-	nativeViewProtected: UIActivityIndicatorView;
+	declare nativeViewProtected: UIActivityIndicatorView;
 
 	createNativeView() {
 		const viewStyle = this._getNativeIndicatorViewStyle(this.iosIndicatorViewStyle);
diff --git a/packages/core/ui/animation/animation-common.ts b/packages/core/ui/animation/animation-common.ts
index 12ab1a96d2..f72bc00f73 100644
--- a/packages/core/ui/animation/animation-common.ts
+++ b/packages/core/ui/animation/animation-common.ts
@@ -5,9 +5,16 @@ import { PropertyAnimation } from './animation-shared';
 import { Color } from '../../color';
 import { Trace } from '../../trace';
 import { PercentLength } from '../styling/length-shared';
+import { CssAnimationProperty, CssProperty, InheritedCssProperty, ShorthandProperty } from '../core/properties';
+import { Style } from '../styling/style';
+import type { View } from '../core/view';
 
 export * from './animation-shared';
 
+export function getPropertyFromKey(key: string, view: View) {
+	return CssAnimationProperty.properties[key] || ShorthandProperty.properties[key] || InheritedCssProperty.properties[key] || CssProperty.properties[key] || Style.prototype[key] || view.constructor['registeredProps']?.[key] || Object.getPrototypeOf(view)[key];
+}
+
 export namespace Properties {
 	export const opacity = 'opacity';
 	export const backgroundColor = 'backgroundColor';
@@ -17,6 +24,7 @@ export namespace Properties {
 	export const height = 'height';
 	export const width = 'width';
 }
+export const AnimationNonAnimatableProperties = ['duration', 'valueSource', 'delay', 'iterations', 'curve', 'target'];
 
 export abstract class AnimationBase {
 	public _propertyAnimations: Array<PropertyAnimation>;
@@ -36,12 +44,12 @@ export abstract class AnimationBase {
 		}
 
 		this._propertyAnimations = new Array<PropertyAnimation>();
-		for (let i = 0, length = animationDefinitions.length; i < length; i++) {
-			if (animationDefinitions[i].curve) {
-				animationDefinitions[i].curve = this._resolveAnimationCurve(animationDefinitions[i].curve);
+		animationDefinitions.forEach((animationDefinition) => {
+			if (animationDefinition.curve) {
+				animationDefinition.curve = this._resolveAnimationCurve(animationDefinition.curve);
 			}
-			this._propertyAnimations = this._propertyAnimations.concat(AnimationBase._createPropertyAnimations(animationDefinitions[i]));
-		}
+			this._propertyAnimations.push(...this._createPropertyAnimations(animationDefinition));
+		});
 
 		if (this._propertyAnimations.length === 0) {
 			if (Trace.isEnabled()) {
@@ -61,10 +69,7 @@ export abstract class AnimationBase {
 	protected _rejectAlreadyPlaying(): AnimationPromiseDefinition {
 		const reason = 'Animation is already playing.';
 		Trace.write(reason, Trace.categories.Animation, Trace.messageType.warn);
-
-		return <AnimationPromiseDefinition>new Promise<void>((resolve, reject) => {
-			reject(reason);
-		});
+		return <AnimationPromiseDefinition>Promise.reject(reason);
 	}
 
 	public play(): AnimationPromiseDefinition {
@@ -82,7 +87,7 @@ export abstract class AnimationBase {
 		return animationFinishedPromise;
 	}
 
-	private fixupAnimationPromise(promise: AnimationPromiseDefinition): void {
+	protected fixupAnimationPromise(promise: AnimationPromiseDefinition): void {
 		// Since we are using function() below because of arguments, TS won't automatically do a _this for those functions.
 		const _this = this;
 		promise.cancel = () => {
@@ -114,148 +119,76 @@ export abstract class AnimationBase {
 		return this._isPlaying;
 	}
 
-	public _resolveAnimationFinishedPromise() {
+	protected _resolveAnimationFinishedPromise() {
 		this._isPlaying = false;
 		this._resolve();
 	}
 
-	public _rejectAnimationFinishedPromise() {
+	protected _rejectAnimationFinishedPromise(error = new Error('Animation cancelled.')) {
 		this._isPlaying = false;
-		this._reject(new Error('Animation cancelled.'));
+		if (this._reject) {
+			this._reject(error);
+		} else {
+			throw error;
+		}
 	}
 
-	private static _createPropertyAnimations(animationDefinition: AnimationDefinition): Array<PropertyAnimation> {
+	protected _createPropertyAnimations(animationDefinition: AnimationDefinition): Array<PropertyAnimation> {
 		if (!animationDefinition.target) {
 			console.error('No animation target specified.');
 			return;
 		}
 
+		const propertyAnimations = new Array<PropertyAnimation>();
 		for (const item in animationDefinition) {
 			const value = animationDefinition[item];
 			if (value === undefined) {
 				continue;
 			}
-
-			if ((item === Properties.opacity || item === 'duration' || item === 'delay' || item === 'iterations') && typeof value !== 'number') {
-				console.error(`Property ${item} must be valid number. Value: ${value}`);
-				return;
-			} else if ((item === Properties.scale || item === Properties.translate) && (typeof (<Pair>value).x !== 'number' || typeof (<Pair>value).y !== 'number')) {
-				console.error(`Property ${item} must be valid Pair. Value: ${value}`);
-				return;
-			} else if (item === Properties.backgroundColor && !Color.isValid(animationDefinition.backgroundColor)) {
-				console.error(`Property ${item} must be valid color. Value: ${value}`);
-				return;
-			} else if (item === Properties.width || item === Properties.height) {
-				// Coerce input into a PercentLength object in case it's a string.
-				animationDefinition[item] = PercentLength.parse(<any>value);
-			} else if (item === Properties.rotate) {
-				const rotate: number | Point3D = value;
-				if (typeof rotate !== 'number' && !(typeof rotate.x === 'number' && typeof rotate.y === 'number' && typeof rotate.z === 'number')) {
-					console.error(`Property ${rotate} must be valid number or Point3D. Value: ${value}`);
-					return;
+			if (AnimationNonAnimatableProperties.indexOf(item) !== -1) {
+				if (item === 'duration' || item === 'delay' || item === 'iterations') {
+					if (typeof value !== 'number') {
+						console.error(`Property ${item} must be valid number. Value: ${value}`);
+					}
 				}
+				continue;
 			}
-		}
-
-		const propertyAnimations = new Array<PropertyAnimation>();
-
-		// opacity
-		if (animationDefinition.opacity !== undefined) {
-			propertyAnimations.push({
-				target: animationDefinition.target,
-				property: Properties.opacity,
-				value: animationDefinition.opacity,
-				duration: animationDefinition.duration,
-				delay: animationDefinition.delay,
-				iterations: animationDefinition.iterations,
-				curve: animationDefinition.curve,
-			});
-		}
-
-		// backgroundColor
-		if (animationDefinition.backgroundColor !== undefined) {
-			propertyAnimations.push({
-				target: animationDefinition.target,
-				property: Properties.backgroundColor,
-				value: typeof animationDefinition.backgroundColor === 'string' ? new Color(<any>animationDefinition.backgroundColor) : animationDefinition.backgroundColor,
-				duration: animationDefinition.duration,
-				delay: animationDefinition.delay,
-				iterations: animationDefinition.iterations,
-				curve: animationDefinition.curve,
-			});
-		}
-
-		// translate
-		if (animationDefinition.translate !== undefined) {
-			propertyAnimations.push({
-				target: animationDefinition.target,
-				property: Properties.translate,
-				value: animationDefinition.translate,
-				duration: animationDefinition.duration,
-				delay: animationDefinition.delay,
-				iterations: animationDefinition.iterations,
-				curve: animationDefinition.curve,
-			});
-		}
-
-		// scale
-		if (animationDefinition.scale !== undefined) {
-			propertyAnimations.push({
-				target: animationDefinition.target,
-				property: Properties.scale,
-				value: animationDefinition.scale,
-				duration: animationDefinition.duration,
-				delay: animationDefinition.delay,
-				iterations: animationDefinition.iterations,
-				curve: animationDefinition.curve,
-			});
-		}
-
-		// rotate
-		if (animationDefinition.rotate !== undefined) {
-			// Make sure the value of the rotation property is always Point3D
-			let rotationValue: Point3D;
-			if (typeof animationDefinition.rotate === 'number') {
-				rotationValue = { x: 0, y: 0, z: animationDefinition.rotate };
-			} else {
-				rotationValue = animationDefinition.rotate;
+			let property = getPropertyFromKey(item, animationDefinition.target);
+			if (item === Properties.scale || item === Properties.translate) {
+				property = CssAnimationProperty.properties[item + 'X'];
+			}
+			if (property) {
+				let newValue = value;
+				const valueConverter = property.valueConverter;
+				if ((item === Properties.scale || item === Properties.translate) && typeof value !== 'object') {
+					console.error(`Property ${item} must be valid Pair. Value: ${value}`);
+				}
+				if (valueConverter) {
+					if (item === Properties.translate || item === Properties.rotate || item === Properties.scale) {
+						newValue = {};
+						if (Properties.rotate && typeof value !== 'object') {
+							newValue = { x: 0, y: 0, z: typeof value === 'string' ? valueConverter(value) : value };
+						} else {
+							Object.keys(value).forEach((k2) => {
+								newValue[k2] = typeof value[k2] === 'string' ? valueConverter(value[k2]) : value[k2];
+							});
+						}
+					} else {
+						newValue = typeof value === 'string' ? valueConverter(value) : value;
+					}
+				}
+				propertyAnimations.push({
+					target: animationDefinition.target,
+					propertyName: item,
+					property,
+					value: newValue,
+					animationBlock: animationDefinition.animationBlock,
+					duration: animationDefinition.duration,
+					delay: animationDefinition.delay,
+					iterations: animationDefinition.iterations,
+					curve: animationDefinition.curve,
+				});
 			}
-
-			propertyAnimations.push({
-				target: animationDefinition.target,
-				property: Properties.rotate,
-				value: rotationValue,
-				duration: animationDefinition.duration,
-				delay: animationDefinition.delay,
-				iterations: animationDefinition.iterations,
-				curve: animationDefinition.curve,
-			});
-		}
-
-		// height
-		if (animationDefinition.height !== undefined) {
-			propertyAnimations.push({
-				target: animationDefinition.target,
-				property: Properties.height,
-				value: animationDefinition.height,
-				duration: animationDefinition.duration,
-				delay: animationDefinition.delay,
-				iterations: animationDefinition.iterations,
-				curve: animationDefinition.curve,
-			});
-		}
-
-		// width
-		if (animationDefinition.width !== undefined) {
-			propertyAnimations.push({
-				target: animationDefinition.target,
-				property: Properties.width,
-				value: animationDefinition.width,
-				duration: animationDefinition.duration,
-				delay: animationDefinition.delay,
-				iterations: animationDefinition.iterations,
-				curve: animationDefinition.curve,
-			});
 		}
 
 		if (propertyAnimations.length === 0) {
@@ -268,7 +201,7 @@ export abstract class AnimationBase {
 	public static _getAnimationInfo(animation: PropertyAnimation): string {
 		return JSON.stringify({
 			target: animation.target.id,
-			property: animation.property,
+			propertyName: animation.propertyName,
 			value: animation.value,
 			duration: animation.duration,
 			delay: animation.delay,
diff --git a/packages/core/ui/animation/animation-interfaces.ts b/packages/core/ui/animation/animation-interfaces.ts
new file mode 100644
index 0000000000..7925de6bfc
--- /dev/null
+++ b/packages/core/ui/animation/animation-interfaces.ts
@@ -0,0 +1 @@
+export { CubicBezierAnimationCurve }  from './../../core-types/animation-types'
\ No newline at end of file
diff --git a/packages/core/ui/animation/animation-shared.ts b/packages/core/ui/animation/animation-shared.ts
index db65d1c509..08efc49c5f 100644
--- a/packages/core/ui/animation/animation-shared.ts
+++ b/packages/core/ui/animation/animation-shared.ts
@@ -5,51 +5,129 @@ import type { View } from '../core/view';
 import type { CoreTypes } from '../../core-types';
 import type { Color } from '../../color';
 
+
+/**
+ * Defines a key-value pair for css transformation
+ */
 export type Transformation = {
 	property: TransformationType;
 	value: TransformationValue;
 };
 
+/**
+ * Defines possible css transformations
+ */
 export type TransformationType = 'rotate' | 'rotate3d' | 'rotateX' | 'rotateY' | 'translate' | 'translate3d' | 'translateX' | 'translateY' | 'scale' | 'scale3d' | 'scaleX' | 'scaleY';
 
+/**
+ * Defines possible css transformation values
+ */
 export type TransformationValue = Point3D | Pair | number;
 
+/**
+ * Defines a point in 3d space (x, y and z) for rotation in 3d animations.
+ */
 export interface Point3D {
 	x: number;
 	y: number;
 	z: number;
 }
 
+/**
+ * Defines a pair of values (horizontal and vertical) for translate and scale animations.
+ */
+export interface Pair {
+	x: number;
+	y: number;
+}
+
+/**
+ * Defines full information for css transformation
+ */
 export type TransformFunctionsInfo = {
 	translate: Pair;
 	rotate: Point3D;
 	scale: Pair;
 };
 
-export interface Pair {
-	x: number;
-	y: number;
-}
-
 export interface Cancelable {
 	cancel(): void;
 }
 
+/**
+ * A Promise that can cancel the animation.
+ */
 export type AnimationPromise = Promise<void> & Cancelable;
 
+
+/**
+ * Defines animation options for the View.animate method.
+ */
 export interface AnimationDefinition {
+	/**
+	 * The view whose property is to be animated.
+	 */
 	target?: View;
+
+	/**
+	 * Animates the opacity of the view. Value should be a number between 0.0 and 1.0
+	 */
 	opacity?: number;
-	backgroundColor?: Color | any;
-	translate?: Pair | { x: number; y: number };
-	scale?: Pair | { x: number; y: number };
-	height?: CoreTypes.PercentLengthType | string | any;
-	width?: CoreTypes.PercentLengthType | string | any;
-	rotate?: number | Point3D | { x: number; y: number; z: number };
+
+	/**
+	 * Animates the backgroundColor of the view.
+	 */
+	backgroundColor?: Color;
+
+	/**
+	 * Animates the translate affine transform of the view.
+	 */
+	translate?: Pair;
+
+	/**
+	 * Animates the scale affine transform of the view.
+	 */
+	scale?: Pair;
+
+	/**
+	 * Animates the height of a view.
+	 */
+	height?: CoreTypes.PercentLengthType | string;
+
+	/**
+	 * Animates the width of a view.
+	 */
+	width?: CoreTypes.PercentLengthType | string;
+
+	/**
+	 * Animates the rotate affine transform of the view. Value should be a number specifying the rotation amount in degrees.
+	 */
+	rotate?: number | Point3D;
+
+	/**
+	 * The length of the animation in milliseconds. The default duration is 300 milliseconds.
+	 */
 	duration?: number;
+
+	/**
+	 * The amount of time, in milliseconds, to delay starting the animation.
+	 */
 	delay?: number;
+
+	/**
+	 * Specifies how many times the animation should be played. Default is 1.
+	 * iOS animations support fractional iterations, i.e. 1.5.
+	 * To repeat an animation infinitely, use Number.POSITIVE_INFINITY
+	 */
 	iterations?: number;
+
+	/**
+	 * An optional animation curve. Possible values are contained in the [AnimationCurve enumeration](../modules/_ui_enums_.animationcurve.html).
+	 * Alternatively, you can pass an instance of type UIViewAnimationCurve for iOS or android.animation.TimeInterpolator for Android.
+	 */
 	curve?: any;
+
+	[k: string]: any;
 }
 
 export interface Point3D {
@@ -69,12 +147,14 @@ export interface Cancelable {
 
 export interface PropertyAnimation {
 	target: View;
-	property: string;
+	property: any;
+	propertyName: string;
 	value: any;
 	duration?: number;
 	delay?: number;
 	iterations?: number;
 	curve?: any;
+	animationBlock?: Function;
 }
 
 export interface PropertyAnimationInfo extends PropertyAnimation {
diff --git a/packages/core/ui/animation/index.android.ts b/packages/core/ui/animation/index.android.ts
index 14ef2ce9c5..fad0ad06b7 100644
--- a/packages/core/ui/animation/index.android.ts
+++ b/packages/core/ui/animation/index.android.ts
@@ -106,15 +106,15 @@ function createAnimationSet(animators: android.animation.ObjectAnimator[], itera
 }
 
 export class Animation extends AnimationBase {
-	private _animatorListener: android.animation.Animator.AnimatorListener;
-	private _nativeAnimatorsArray: any;
-	private _animatorSet: android.animation.AnimatorSet;
-	private _animators: Array<android.animation.Animator>;
-	private _propertyUpdateCallbacks: Array<Function>;
-	private _propertyResetCallbacks: Array<Function>;
-	private _valueSource: 'animation' | 'keyframe';
-	private _target: View;
-	private _resetOnFinish = true;
+	protected _animatorListener: android.animation.Animator.AnimatorListener;
+	protected _nativeAnimatorsArray: any;
+	protected _animatorSet: android.animation.AnimatorSet;
+	protected _animators: Array<android.animation.Animator>;
+	protected _propertyUpdateCallbacks: Array<Function>;
+	protected _propertyResetCallbacks: Array<Function>;
+	protected _valueSource: 'animation' | 'keyframe';
+	protected _target: View;
+	protected _resetOnFinish = true;
 
 	constructor(animationDefinitions: Array<AnimationDefinitionInternal>, playSequentially?: boolean) {
 		super(animationDefinitions, playSequentially);
@@ -212,6 +212,8 @@ export class Animation extends AnimationBase {
 		}
 
 		if (this._animators.length > 0) {
+			// TODO: fix sequentially which wont work because all animators values are computed before
+			// the first one starts...
 			if (this._playSequentially) {
 				this._animatorSet.playSequentially(this._nativeAnimatorsArray);
 			} else {
@@ -227,8 +229,7 @@ export class Animation extends AnimationBase {
 		this._animatorSet.start();
 	}
 
-	private _onAndroidAnimationEnd() {
-		// tslint:disable-line
+	protected _onAndroidAnimationEnd() {
 		if (!this.isPlaying) {
 			// It has been cancelled
 			return;
@@ -242,8 +243,7 @@ export class Animation extends AnimationBase {
 		}
 	}
 
-	private _onAndroidAnimationCancel() {
-		// tslint:disable-line
+	protected _onAndroidAnimationCancel() {
 		this._propertyResetCallbacks.forEach((v) => v());
 		this._resolveAnimationFinishedPromise();
 
@@ -252,7 +252,7 @@ export class Animation extends AnimationBase {
 		}
 	}
 
-	private _createAnimators(propertyAnimation: PropertyAnimation): void {
+	protected _createAnimators(propertyAnimation: PropertyAnimation): void {
 		if (!propertyAnimation.target.nativeViewProtected) {
 			return;
 		}
@@ -262,15 +262,15 @@ export class Animation extends AnimationBase {
 		}
 
 		if (propertyAnimation.target === null || propertyAnimation.target === undefined) {
-			throw new Error(`Animation target cannot be null or undefined; property: ${propertyAnimation.property}; value: ${propertyAnimation.value};`);
+			throw new Error(`Animation target cannot be null or undefined; property: ${propertyAnimation.propertyName}; value: ${propertyAnimation.value};`);
 		}
 
-		if (propertyAnimation.property === null || propertyAnimation.property === undefined) {
+		if (propertyAnimation.propertyName === null || propertyAnimation.propertyName === undefined) {
 			throw new Error(`Animation property cannot be null or undefined; target: ${propertyAnimation.target}; value: ${propertyAnimation.value};`);
 		}
 
 		if (propertyAnimation.value === null || propertyAnimation.value === undefined) {
-			throw new Error(`Animation value cannot be null or undefined; target: ${propertyAnimation.target}; property: ${propertyAnimation.property};`);
+			throw new Error(`Animation value cannot be null or undefined; target: ${propertyAnimation.target}; property: ${propertyAnimation.propertyName};`);
 		}
 
 		this._target = propertyAnimation.target;
@@ -286,8 +286,9 @@ export class Animation extends AnimationBase {
 
 		const setLocal = this._valueSource === 'animation';
 		const style = propertyAnimation.target.style;
-		switch (propertyAnimation.property) {
-			case Properties.opacity:
+		const propName = propertyAnimation.propertyName;
+		switch (propName) {
+			case 'opacity':
 				opacityProperty._initDefaultNativeValue(style);
 
 				originalValue1 = nativeView.getAlpha();
@@ -307,7 +308,7 @@ export class Animation extends AnimationBase {
 				animators.push(createObjectAnimator(nativeView, 'alpha', propertyAnimation.value));
 				break;
 
-			case Properties.backgroundColor: {
+			case 'backgroundColor': {
 				backgroundColorProperty._initDefaultNativeValue(style);
 
 				ensureArgbEvaluator();
@@ -342,7 +343,7 @@ export class Animation extends AnimationBase {
 				animators.push(animator);
 				break;
 			}
-			case Properties.translate:
+			case 'translate':
 				translateXProperty._initDefaultNativeValue(style);
 				translateYProperty._initDefaultNativeValue(style);
 
@@ -372,7 +373,7 @@ export class Animation extends AnimationBase {
 				animators.push(createAnimationSet([createObjectAnimator(nativeView, 'translationX', propertyAnimation.value.x * density), createObjectAnimator(nativeView, 'translationY', propertyAnimation.value.y * density)], propertyAnimation.iterations));
 				break;
 
-			case Properties.scale:
+			case 'scale':
 				scaleXProperty._initDefaultNativeValue(style);
 				scaleYProperty._initDefaultNativeValue(style);
 
@@ -402,7 +403,7 @@ export class Animation extends AnimationBase {
 				animators.push(createAnimationSet([createObjectAnimator(nativeView, 'scaleX', propertyAnimation.value.x), createObjectAnimator(nativeView, 'scaleY', propertyAnimation.value.y)], propertyAnimation.iterations));
 				break;
 
-			case Properties.rotate:
+			case 'rotate':
 				rotateProperty._initDefaultNativeValue(style);
 				rotateXProperty._initDefaultNativeValue(style);
 				rotateYProperty._initDefaultNativeValue(style);
@@ -437,9 +438,9 @@ export class Animation extends AnimationBase {
 				animators.push(createAnimationSet([createObjectAnimator(nativeView, 'rotationX', propertyAnimation.value.x), createObjectAnimator(nativeView, 'rotationY', propertyAnimation.value.y), createObjectAnimator(nativeView, 'rotation', propertyAnimation.value.z)], propertyAnimation.iterations));
 				break;
 
-			case Properties.width:
-			case Properties.height: {
-				const isVertical: boolean = propertyAnimation.property === 'height';
+			case 'width':
+			case 'height': {
+				const isVertical: boolean = propertyAnimation.propertyName === 'height';
 				const extentProperty = isVertical ? heightProperty : widthProperty;
 
 				extentProperty._initDefaultNativeValue(style);
@@ -447,21 +448,41 @@ export class Animation extends AnimationBase {
 				let toValue = propertyAnimation.value;
 				const parent = propertyAnimation.target.parent as View;
 				if (!parent) {
-					throw new Error(`cannot animate ${propertyAnimation.property} on root view`);
+					throw new Error(`cannot animate ${propertyAnimation.propertyName} on root view`);
 				}
 				const parentExtent: number = isVertical ? parent.getMeasuredHeight() : parent.getMeasuredWidth();
-				toValue = PercentLength.toDevicePixels(toValue, parentExtent, parentExtent) / Screen.mainScreen.scale;
+				const scale = Screen.mainScreen.scale;
+				if (toValue === 'auto') {
+					const target = propertyAnimation.target;
+					let widthSpec = target._currentWidthMeasureSpec;
+					let heightSpec = target._currentHeightMeasureSpec;
+					//we need to measure ourselves
+					if (propName === 'width') {
+						widthSpec = layout.makeMeasureSpec(0, layout.UNSPECIFIED);
+						target.measure(widthSpec, heightSpec);
+						toValue = target.getMeasuredWidth() / scale;
+					} else {
+						heightSpec = layout.makeMeasureSpec(0, layout.UNSPECIFIED);
+						target.measure(widthSpec, heightSpec);
+						toValue = target.getMeasuredHeight() / scale;
+					}
+				} else {
+					toValue = PercentLength.toDevicePixels(toValue, parentExtent, parentExtent) / scale;
+				}
 				const nativeHeight: number = isVertical ? nativeView.getHeight() : nativeView.getWidth();
 				const targetStyle: string = setLocal ? extentProperty.name : extentProperty.keyframe;
-				originalValue1 = nativeHeight / Screen.mainScreen.scale;
+				originalValue1 = nativeHeight / scale;
 				nativeArray[0] = originalValue1;
 				nativeArray[1] = toValue;
 				const extentAnimator = android.animation.ValueAnimator.ofFloat(nativeArray);
 				extentAnimator.addUpdateListener(
 					new android.animation.ValueAnimator.AnimatorUpdateListener({
 						onAnimationUpdate(animator: android.animation.ValueAnimator) {
-							const argb = (<java.lang.Float>animator.getAnimatedValue()).floatValue();
-							propertyAnimation.target.style[setLocal ? extentProperty.name : extentProperty.keyframe] = argb;
+							let result = animator.getAnimatedValue();
+							if (result instanceof java.lang.Number) {
+								result = result.floatValue();
+							}
+							propertyAnimation.target.style[setLocal ? extentProperty.name : extentProperty.keyframe] = result;
 						},
 					}),
 				);
@@ -472,14 +493,71 @@ export class Animation extends AnimationBase {
 					propertyAnimation.target.style[targetStyle] = originalValue1;
 					if (propertyAnimation.target.nativeViewProtected) {
 						const setter = propertyAnimation.target[extentProperty.setNative];
-						setter(propertyAnimation.target.style[propertyAnimation.property]);
+						setter.call(propertyAnimation.target, propertyAnimation.target.style[propertyAnimation.propertyName]);
 					}
 				});
 				animators.push(extentAnimator);
 				break;
 			}
 			default:
-				throw new Error(`Animating property '${propertyAnimation.property}' is unsupported`);
+				if (propertyAnimation.property) {
+					const property = propertyAnimation.property;
+					if (property._initDefaultNativeValue) {
+						property._initDefaultNativeValue(style);
+					}
+					originalValue1 = propertyAnimation.target[propertyAnimation.propertyName];
+					let nativeArray;
+					if (propertyAnimation.value instanceof Color) {
+						ensureArgbEvaluator();
+						nativeArray = Array.create(java.lang.Object, 2);
+						nativeArray[0] = java.lang.Integer.valueOf(originalValue1.android);
+						nativeArray[1] = java.lang.Integer.valueOf(propertyAnimation.value.android);
+						const animator = android.animation.ValueAnimator.ofObject(argbEvaluator, nativeArray);
+						animator.addUpdateListener(
+							new android.animation.ValueAnimator.AnimatorUpdateListener({
+								onAnimationUpdate(animator: android.animation.ValueAnimator) {
+									const argb = (<java.lang.Integer>animator.getAnimatedValue()).intValue();
+									propertyAnimation.target[setLocal ? property.name : property.keyframe] = new Color(argb);
+								},
+							})
+						);
+						animators.push(animator);
+					} else {
+						nativeArray = Array.create('float', 2);
+						nativeArray[0] = originalValue1;
+						nativeArray[1] = propertyAnimation.value;
+						const animator = android.animation.ValueAnimator.ofFloat(nativeArray);
+						animator.addUpdateListener(
+							new android.animation.ValueAnimator.AnimatorUpdateListener({
+								onAnimationUpdate(animator: android.animation.ValueAnimator) {
+									let result = animator.getAnimatedValue();
+									if (result instanceof java.lang.Number) {
+										result = result.floatValue();
+									}
+									propertyAnimation.target[setLocal ? property.name : property.keyframe] = result;
+								},
+							})
+						);
+						animators.push(animator);
+					}
+
+					propertyUpdateCallbacks.push(() => {
+						propertyAnimation.target[setLocal ? property.name : property.keyframe] = propertyAnimation.value;
+					});
+					propertyResetCallbacks.push(() => {
+						if (setLocal) {
+							propertyAnimation.target[property.name] = originalValue1;
+						} else {
+							propertyAnimation.target[property.keyframe] = originalValue1;
+						}
+
+						if (propertyAnimation.target.nativeViewProtected && propertyAnimation.target[property.setNative]) {
+							propertyAnimation.target[property.setNative](propertyAnimation.target.style[propertyAnimation.propertyName]);
+						}
+					});
+				} else {
+					throw new Error(`Animating property '${propertyAnimation.propertyName}' is unsupported`);
+				}
 		}
 
 		for (let i = 0, length = animators.length; i < length; i++) {
diff --git a/packages/core/ui/animation/index.d.ts b/packages/core/ui/animation/index.d.ts
index 24292e7aa3..15b1b974fc 100644
--- a/packages/core/ui/animation/index.d.ts
+++ b/packages/core/ui/animation/index.d.ts
@@ -1,4 +1,4 @@
-export type { Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo, Point3D, AnimationPromise, Cancelable } from './animation-types';
+export type { Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo, Point3D, AnimationDefinition, AnimationPromise, Cancelable } from './animation-types';
 export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
 import type { AnimationDefinition, AnimationPromise } from './animation-types';
 
diff --git a/packages/core/ui/animation/index.ios.ts b/packages/core/ui/animation/index.ios.ts
index c37aef571b..c6089bc9d4 100644
--- a/packages/core/ui/animation/index.ios.ts
+++ b/packages/core/ui/animation/index.ios.ts
@@ -4,6 +4,7 @@ import { View } from '../core/view';
 import { CubicBezierAnimationCurve } from '../../core-types/animation-types';
 import { Trace } from '../../trace';
 import { opacityProperty, backgroundColorProperty, rotateProperty, rotateXProperty, rotateYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, heightProperty, widthProperty } from '../styling/style-properties';
+import type { CssAnimationProperty, Property } from '../core/properties';
 import { PercentLength } from '../styling/length-shared';
 import { ios as iosBackground } from '../styling/background';
 import { ios as iosViewUtils, NativeScriptUIView } from '../utils';
@@ -11,22 +12,30 @@ import { ios as iosViewUtils, NativeScriptUIView } from '../utils';
 import { ios as iosHelper } from '../../utils/native-helper';
 
 import { Screen } from '../../platform';
+import { Color } from '../../color';
+import { Style } from '../styling/style';
 
 export * from './animation-common';
+export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
 
 const _transform = '_transform';
 const _skip = '_skip';
 
-const FLT_MAX = 340282346638528859811704183484516925440.0;
-
 class AnimationInfo {
 	public propertyNameToAnimate: string;
 	public subPropertiesToAnimate?: string[];
 	public fromValue: any;
 	public toValue: any;
 	public duration: number;
-	public repeatCount: number;
 	public delay: number;
+	public repeatCount: number;
+	public animationBlock?: Function;
+}
+
+export function applyAnimationProperty(styleOrView: View, property: Property<View, any>, value, setKeyFrame: boolean);
+export function applyAnimationProperty(styleOrView: Style, property: CssAnimationProperty<Style, any>, value, setKeyFrame: boolean);
+export function applyAnimationProperty(styleOrView: any, property: any, value, setKeyFrame: boolean) {
+	styleOrView[setKeyFrame && property['keyframe'] ? property['keyframe'] : property.name] = value;
 }
 
 @NativeClass
@@ -36,77 +45,75 @@ class AnimationDelegateImpl extends NSObject implements CAAnimationDelegate {
 	// The CAAnimationDelegate protocol has been introduced in the iOS 10 SDK
 	static ObjCProtocols = global.CAAnimationDelegate ? [global.CAAnimationDelegate] : [];
 
-	private _finishedCallback: Function;
+	private _animation: WeakRef<Animation>;
 	private _propertyAnimation: PropertyAnimationInfo;
-	private _valueSource: 'animation' | 'keyframe';
 
-	public static initWithFinishedCallback(finishedCallback: Function, propertyAnimation: PropertyAnimationInfo, valueSource: 'animation' | 'keyframe'): AnimationDelegateImpl {
+	public static initWithFinishedCallback(animation: WeakRef<Animation>, propertyAnimation: PropertyAnimationInfo): AnimationDelegateImpl {
 		const delegate = <AnimationDelegateImpl>AnimationDelegateImpl.new();
-		delegate._finishedCallback = finishedCallback;
+		delegate._animation = animation;
 		delegate._propertyAnimation = propertyAnimation;
-		delegate._valueSource = valueSource;
 
 		return delegate;
 	}
 
 	animationDidStart(anim: CAAnimation): void {
 		const value = this._propertyAnimation.value;
-		const setLocal = this._valueSource === 'animation';
+		const animation = this._animation?.get();
+		const setKeyFrame = animation?.valueSource === 'keyframe';
 		const targetStyle = this._propertyAnimation.target.style;
 
 		(<IOSView>this._propertyAnimation.target)._suspendPresentationLayerUpdates();
-
-		switch (this._propertyAnimation.property) {
-			case Properties.backgroundColor:
-				targetStyle[setLocal ? backgroundColorProperty.name : backgroundColorProperty.keyframe] = value;
-				break;
-			case Properties.opacity:
-				targetStyle[setLocal ? opacityProperty.name : opacityProperty.keyframe] = value;
-				break;
+		switch (this._propertyAnimation.propertyName) {
 			case Properties.rotate:
-				targetStyle[setLocal ? rotateXProperty.name : rotateXProperty.keyframe] = value.x;
-				targetStyle[setLocal ? rotateYProperty.name : rotateYProperty.keyframe] = value.y;
-				targetStyle[setLocal ? rotateProperty.name : rotateProperty.keyframe] = value.z;
+				applyAnimationProperty(targetStyle, rotateXProperty, value.x, setKeyFrame);
+				applyAnimationProperty(targetStyle, rotateYProperty, value.y, setKeyFrame);
+				applyAnimationProperty(targetStyle, rotateProperty, value.z, setKeyFrame);
 				break;
 			case Properties.translate:
-				targetStyle[setLocal ? translateXProperty.name : translateXProperty.keyframe] = value.x;
-				targetStyle[setLocal ? translateYProperty.name : translateYProperty.keyframe] = value.y;
-				break;
-			case Properties.height:
-				targetStyle[setLocal ? heightProperty.name : heightProperty.keyframe] = value;
-				break;
-			case Properties.width:
-				targetStyle[setLocal ? widthProperty.name : widthProperty.keyframe] = value;
+				applyAnimationProperty(targetStyle, translateXProperty, value.x, setKeyFrame);
+				applyAnimationProperty(targetStyle, translateYProperty, value.y, setKeyFrame);
 				break;
 			case Properties.scale:
-				targetStyle[setLocal ? scaleXProperty.name : scaleXProperty.keyframe] = value.x === 0 ? 0.001 : value.x;
-				targetStyle[setLocal ? scaleYProperty.name : scaleYProperty.keyframe] = value.y === 0 ? 0.001 : value.y;
+				applyAnimationProperty(targetStyle, scaleXProperty, value.x || 1e-6, setKeyFrame);
+				applyAnimationProperty(targetStyle, scaleYProperty, value.y || 1e-6, setKeyFrame);
 				break;
-			case _transform:
-				if (value[Properties.translate] !== undefined) {
-					targetStyle[setLocal ? translateXProperty.name : translateXProperty.keyframe] = value[Properties.translate].x;
-					targetStyle[setLocal ? translateYProperty.name : translateYProperty.keyframe] = value[Properties.translate].y;
+			case _transform: {
+				const translateValue = value[Properties.rotate];
+				if (translateValue !== undefined) {
+					applyAnimationProperty(targetStyle, translateXProperty, translateValue.x, setKeyFrame);
+					applyAnimationProperty(targetStyle, translateYProperty, translateValue.y, setKeyFrame);
+				}
+				const rotateValue = value[Properties.rotate];
+				if (rotateValue !== undefined) {
+					applyAnimationProperty(targetStyle, rotateXProperty, rotateValue.x, setKeyFrame);
+					applyAnimationProperty(targetStyle, rotateYProperty, rotateValue.y, setKeyFrame);
+					applyAnimationProperty(targetStyle, rotateProperty, rotateValue.z, setKeyFrame);
 				}
-				if (value[Properties.rotate] !== undefined) {
-					targetStyle[setLocal ? rotateXProperty.name : rotateXProperty.keyframe] = value[Properties.rotate].x;
-					targetStyle[setLocal ? rotateYProperty.name : rotateYProperty.keyframe] = value[Properties.rotate].y;
-					targetStyle[setLocal ? rotateProperty.name : rotateProperty.keyframe] = value[Properties.rotate].z;
+				const scaleValue = value[Properties.scale];
+				if (scaleValue !== undefined) {
+					const x = scaleValue.x;
+					const y = scaleValue.y;
+					applyAnimationProperty(targetStyle, scaleXProperty, scaleValue.x || 1e-6, setKeyFrame);
+					applyAnimationProperty(targetStyle, scaleYProperty, scaleValue.y || 1e-6, setKeyFrame);
 				}
-				if (value[Properties.scale] !== undefined) {
-					const x = value[Properties.scale].x;
-					const y = value[Properties.scale].y;
-					targetStyle[setLocal ? scaleXProperty.name : scaleXProperty.keyframe] = x === 0 ? 0.001 : x;
-					targetStyle[setLocal ? scaleYProperty.name : scaleYProperty.keyframe] = y === 0 ? 0.001 : y;
+				break;
+			}
+			default: {
+				const property = this._propertyAnimation.property;
+				if (property) {
+					applyAnimationProperty(targetStyle, property, value, setKeyFrame);
 				}
 				break;
+			}
 		}
 
 		(<IOSView>this._propertyAnimation.target)._resumePresentationLayerUpdates();
 	}
 
 	public animationDidStopFinished(anim: CAAnimation, finished: boolean): void {
-		if (this._finishedCallback) {
-			this._finishedCallback(!finished);
+		const animation = this._animation?.get();
+		if (animation) {
+			animation.animationFinishedCallback(!finished);
 		}
 		if (finished && this.nextAnimation) {
 			this.nextAnimation();
@@ -140,12 +147,16 @@ export function _resolveAnimationCurve(curve: string | CubicBezierAnimationCurve
 }
 
 export class Animation extends AnimationBase {
-	private _iOSAnimationFunction: Function;
-	private _finishedAnimations: number;
-	private _cancelledAnimations: number;
-	private _mergedPropertyAnimations: Array<PropertyAnimationInfo>;
-	private _valueSource: 'animation' | 'keyframe';
-
+	protected _iOSAnimationFunction: (cancelled?: boolean) => void;
+	protected _finishedAnimations: number;
+	protected _cancelledAnimations: number;
+	protected _mergedPropertyAnimations: Array<PropertyAnimationInfo>;
+	protected _valueSource: 'animation' | 'keyframe';
+
+	get valueSource() {
+		return this._valueSource;
+	}
+	protected _wasCancelled = false;
 	constructor(animationDefinitions: Array<AnimationDefinitionInternal>, playSequentially?: boolean) {
 		super(animationDefinitions, playSequentially);
 
@@ -153,7 +164,6 @@ export class Animation extends AnimationBase {
 		if (animationDefinitions.length > 0 && animationDefinitions[0].valueSource !== undefined) {
 			this._valueSource = animationDefinitions[0].valueSource;
 		}
-
 		if (!playSequentially) {
 			if (Trace.isEnabled()) {
 				Trace.write('Non-merged Property Animations: ' + this._propertyAnimations.length, Trace.categories.Animation);
@@ -166,42 +176,45 @@ export class Animation extends AnimationBase {
 			this._mergedPropertyAnimations = this._propertyAnimations;
 		}
 
-		const animationFinishedCallback = (cancelled: boolean) => {
-			if (this._playSequentially) {
-				// This function will be called by the last animation when done or by another animation if the user cancels them halfway through.
-				if (!cancelled) {
-					this._resolveAnimationFinishedPromise();
-				}
+		this._iOSAnimationFunction = this._createiOSAnimationFunction(this._mergedPropertyAnimations, 0, this._playSequentially);
+	}
+
+	animationFinishedCallback(cancelled: boolean) {
+		if (this._playSequentially) {
+			// This function will be called by the last animation when done or by another animation if the user cancels them halfway through.
+			if (cancelled) {
+				this._rejectAnimationFinishedPromise();
 			} else {
-				// This callback will be called by each INDIVIDUAL animation when it finishes or is cancelled.
-				if (cancelled) {
-					this._cancelledAnimations++;
-				} else {
-					this._finishedAnimations++;
-				}
+				this._resolveAnimationFinishedPromise();
+			}
+		} else {
+			// This callback will be called by each INDIVIDUAL animation when it finishes or is cancelled.
+			if (cancelled) {
+				this._cancelledAnimations++;
+			} else {
+				this._finishedAnimations++;
+			}
 
-				if (this._cancelledAnimations > 0 && this._cancelledAnimations + this._finishedAnimations === this._mergedPropertyAnimations.length) {
-					if (Trace.isEnabled()) {
-						Trace.write(this._cancelledAnimations + ' animations cancelled.', Trace.categories.Animation);
-					}
-				} else if (this._finishedAnimations === this._mergedPropertyAnimations.length) {
-					if (Trace.isEnabled()) {
-						Trace.write(this._finishedAnimations + ' animations finished.', Trace.categories.Animation);
-					}
-					this._resolveAnimationFinishedPromise();
+			if (this._cancelledAnimations > 0 && this._cancelledAnimations + this._finishedAnimations === this._mergedPropertyAnimations.length) {
+				if (Trace.isEnabled()) {
+					Trace.write(this._cancelledAnimations + ' animations cancelled.', Trace.categories.Animation);
+				}
+				this._rejectAnimationFinishedPromise();
+			} else if (this._finishedAnimations === this._mergedPropertyAnimations.length) {
+				if (Trace.isEnabled()) {
+					Trace.write(this._finishedAnimations + ' animations finished.', Trace.categories.Animation);
 				}
+				this._resolveAnimationFinishedPromise();
 			}
-		};
-
-		this._iOSAnimationFunction = Animation._createiOSAnimationFunction(this._mergedPropertyAnimations, 0, this._playSequentially, this._valueSource, animationFinishedCallback);
+		}
 	}
 
 	public play(): AnimationPromise {
 		if (this.isPlaying) {
 			return this._rejectAlreadyPlaying();
 		}
-
 		const animationFinishedPromise = super.play();
+		this._wasCancelled = false;
 		this._finishedAnimations = 0;
 		this._cancelledAnimations = 0;
 		this._iOSAnimationFunction();
@@ -215,6 +228,7 @@ export class Animation extends AnimationBase {
 			return;
 		}
 
+		this._wasCancelled = true;
 		if (this._mergedPropertyAnimations) {
 			for (let i = 0; i < this._mergedPropertyAnimations.length; i++) {
 				const propertyAnimation = this._mergedPropertyAnimations[i];
@@ -280,99 +294,47 @@ export class Animation extends AnimationBase {
 		return _resolveAnimationCurve(curve);
 	}
 
-	private static _createiOSAnimationFunction(propertyAnimations: Array<PropertyAnimation>, index: number, playSequentially: boolean, valueSource: 'animation' | 'keyframe', finishedCallback: (cancelled?: boolean) => void): Function {
+	protected _createiOSAnimationFunction(propertyAnimations: Array<PropertyAnimation>, index: number, playSequentially: boolean) {
 		return (cancelled?: boolean) => {
-			if (cancelled && finishedCallback) {
+			if (cancelled) {
 				if (Trace.isEnabled()) {
 					Trace.write('Animation ' + (index - 1).toString() + ' was cancelled. Will skip the rest of animations and call finishedCallback(true).', Trace.categories.Animation);
 				}
-				finishedCallback(cancelled);
+				this.animationFinishedCallback(cancelled);
 
 				return;
 			}
-
-			const animation = propertyAnimations[index];
-			const args = Animation._getNativeAnimationArguments(animation, valueSource);
-
-			if (animation.curve === 'spring') {
-				Animation._createNativeSpringAnimation(propertyAnimations, index, playSequentially, args, animation, valueSource, finishedCallback);
-			} else {
-				Animation._createNativeAnimation(propertyAnimations, index, playSequentially, args, animation, valueSource, finishedCallback);
-			}
+			this._createNativeUIViewAnimation(propertyAnimations, index, playSequentially);
 		};
 	}
 
-	private static _getNativeAnimationArguments(animation: PropertyAnimationInfo, valueSource: 'animation' | 'keyframe'): AnimationInfo {
+	protected _getNativeAnimationArguments(animation: PropertyAnimationInfo, duration, delay, repeatCount, useCABasicAnimation = false): AnimationInfo {
 		const view = animation.target;
 		const style = view.style;
 		const nativeView: NativeScriptUIView = view.nativeViewProtected;
 		const parent = view.parent as View;
 
-		let propertyNameToAnimate = animation.property;
-		let subPropertyNameToAnimate;
+		let propertyNameToAnimate = animation.propertyName;
 		let toValue = animation.value;
 		let fromValue;
+		const setKeyFrame = this._valueSource === 'keyframe';
 		if (nativeView) {
-			const setLocal = valueSource === 'animation';
-
-			switch (animation.property) {
-				case Properties.backgroundColor:
-					animation._originalValue = view.backgroundColor;
-					animation._propertyResetCallback = (value, valueSource) => {
-						style[setLocal ? backgroundColorProperty.name : backgroundColorProperty.keyframe] = value;
-					};
-					fromValue = nativeView.layer.backgroundColor;
-
-					if (nativeView instanceof UILabel) {
-						nativeView.setValueForKey(UIColor.clearColor, 'backgroundColor');
-					}
-					toValue = toValue?.ios?.CGColor;
-					break;
-				case Properties.opacity:
-					animation._originalValue = view.opacity;
-					animation._propertyResetCallback = (value, valueSource) => {
-						style[setLocal ? opacityProperty.name : opacityProperty.keyframe] = value;
-					};
-					fromValue = nativeView.layer.opacity;
-					break;
-				// In the case of rotation, avoid animating affine transform directly as it will animate to the closest result
-				// that is visually the same. For example, 0 -> 360 will leave view as is.
+			switch (animation.propertyName) {
 				case Properties.rotate:
 					animation._originalValue = {
 						x: view.rotateX,
 						y: view.rotateY,
 						z: view.rotate,
 					};
-					animation._propertyResetCallback = (value, valueSource) => {
-						style[setLocal ? rotateProperty.name : rotateProperty.keyframe] = value.z;
-						style[setLocal ? rotateXProperty.name : rotateXProperty.keyframe] = value.x;
-						style[setLocal ? rotateYProperty.name : rotateYProperty.keyframe] = value.y;
+					animation._propertyResetCallback = (value) => {
+						applyAnimationProperty(style, rotateXProperty, value.x, setKeyFrame);
+						applyAnimationProperty(style, rotateYProperty, value.y, setKeyFrame);
+						applyAnimationProperty(style, rotateProperty, value.z, setKeyFrame);
 					};
 
-					propertyNameToAnimate = 'transform.rotation';
-					subPropertyNameToAnimate = ['x', 'y', 'z'];
-					fromValue = {
-						x: nativeView.layer.valueForKeyPath('transform.rotation.x'),
-						y: nativeView.layer.valueForKeyPath('transform.rotation.y'),
-						z: nativeView.layer.valueForKeyPath('transform.rotation.z'),
-					};
-
-					if (animation.target.rotateX !== undefined && animation.target.rotateX !== 0 && Math.floor(toValue / 360) - toValue / 360 === 0) {
-						fromValue.x = (animation.target.rotateX * Math.PI) / 180;
-					}
-					if (animation.target.rotateY !== undefined && animation.target.rotateY !== 0 && Math.floor(toValue / 360) - toValue / 360 === 0) {
-						fromValue.y = (animation.target.rotateY * Math.PI) / 180;
-					}
-					if (animation.target.rotate !== undefined && animation.target.rotate !== 0 && Math.floor(toValue / 360) - toValue / 360 === 0) {
-						fromValue.z = (animation.target.rotate * Math.PI) / 180;
-					}
-
-					// Respect only value.z for back-compat until 3D rotations are implemented
-					toValue = {
-						x: (toValue.x * Math.PI) / 180,
-						y: (toValue.y * Math.PI) / 180,
-						z: (toValue.z * Math.PI) / 180,
-					};
+					propertyNameToAnimate = 'transform';
+					fromValue = NSValue.valueWithCATransform3D(nativeView.layer.transform);
+					toValue = NSValue.valueWithCATransform3D(iosHelper.applyRotateTransform(nativeView.layer.transform, toValue.x, toValue.y, toValue.z));
 					break;
 				case Properties.translate:
 					animation._originalValue = {
@@ -380,24 +342,21 @@ export class Animation extends AnimationBase {
 						y: view.translateY,
 					};
 					animation._propertyResetCallback = (value, valueSource) => {
-						style[setLocal ? translateXProperty.name : translateXProperty.keyframe] = value.x;
-						style[setLocal ? translateYProperty.name : translateYProperty.keyframe] = value.y;
+						applyAnimationProperty(style, translateXProperty, value.x, setKeyFrame);
+						applyAnimationProperty(style, translateYProperty, value.y, setKeyFrame);
 					};
 					propertyNameToAnimate = 'transform';
 					fromValue = NSValue.valueWithCATransform3D(nativeView.layer.transform);
 					toValue = NSValue.valueWithCATransform3D(CATransform3DTranslate(nativeView.layer.transform, toValue.x, toValue.y, 0));
 					break;
 				case Properties.scale:
-					if (toValue.x === 0) {
-						toValue.x = 0.001;
-					}
-					if (toValue.y === 0) {
-						toValue.y = 0.001;
-					}
+					toValue.x = toValue.x || 1e-6;
+					toValue.y = toValue.y || 1e-6;
+
 					animation._originalValue = { x: view.scaleX, y: view.scaleY };
 					animation._propertyResetCallback = (value, valueSource) => {
-						style[setLocal ? scaleXProperty.name : scaleXProperty.keyframe] = value.x;
-						style[setLocal ? scaleYProperty.name : scaleYProperty.keyframe] = value.y;
+						applyAnimationProperty(style, scaleXProperty, value.x, setKeyFrame);
+						applyAnimationProperty(style, scaleYProperty, value.y, setKeyFrame);
 					};
 					propertyNameToAnimate = 'transform';
 					fromValue = NSValue.valueWithCATransform3D(nativeView.layer.transform);
@@ -415,24 +374,23 @@ export class Animation extends AnimationBase {
 						rz: view.rotate,
 					};
 					animation._propertyResetCallback = (value, valueSource) => {
-						style[setLocal ? translateXProperty.name : translateXProperty.keyframe] = value.xt;
-						style[setLocal ? translateYProperty.name : translateYProperty.keyframe] = value.yt;
-						style[setLocal ? scaleXProperty.name : scaleXProperty.keyframe] = value.xs;
-						style[setLocal ? scaleYProperty.name : scaleYProperty.keyframe] = value.ys;
-						style[setLocal ? rotateXProperty.name : rotateXProperty.keyframe] = value.rx;
-						style[setLocal ? rotateYProperty.name : rotateYProperty.keyframe] = value.ry;
-						style[setLocal ? rotateProperty.name : rotateProperty.keyframe] = value.rz;
+						applyAnimationProperty(style, translateXProperty, value.xt, setKeyFrame);
+						applyAnimationProperty(style, translateYProperty, value.yt, setKeyFrame);
+						applyAnimationProperty(style, scaleXProperty, value.xs, setKeyFrame);
+						applyAnimationProperty(style, scaleYProperty, value.ys, setKeyFrame);
+						applyAnimationProperty(style, rotateXProperty, value.rx, setKeyFrame);
+						applyAnimationProperty(style, rotateYProperty, value.ry, setKeyFrame);
+						applyAnimationProperty(style, rotateProperty, value.rz, setKeyFrame);
 					};
 					propertyNameToAnimate = 'transform';
 					toValue = NSValue.valueWithCATransform3D(Animation._createNativeAffineTransform(animation));
 					break;
 				case Properties.width:
 				case Properties.height: {
-					const direction: string = animation.property;
+					const direction: string = animation.propertyName;
 					const isHeight: boolean = direction === 'height';
-					propertyNameToAnimate = 'bounds';
 					if (!parent) {
-						console.error(`cannot animate ${direction} on root view`);
+						throw new Error(`cannot animate ${direction} on root view`);
 					}
 					const parentExtent: number = isHeight ? parent.getMeasuredHeight() : parent.getMeasuredWidth();
 					const asNumber = PercentLength.toDevicePixels(PercentLength.parse(toValue), parentExtent, parentExtent) / Screen.mainScreen.scale;
@@ -441,140 +399,144 @@ export class Animation extends AnimationBase {
 					const extentY = isHeight ? asNumber : currentBounds.size.height;
 					fromValue = NSValue.valueWithCGRect(currentBounds);
 					toValue = NSValue.valueWithCGRect(CGRectMake(currentBounds.origin.x, currentBounds.origin.y, extentX, extentY));
-					animation._originalValue = view[isHeight ? 'height' : 'width'];
-					animation._propertyResetCallback = (value, valueSource) => {
-						const prop = isHeight ? heightProperty : widthProperty;
-						style[setLocal ? prop.name : prop.keyframe] = value;
-					};
-					break;
+					if (useCABasicAnimation) {
+						animation._originalValue = view.height;
+						animation._propertyResetCallback = (value) => {
+							const prop = isHeight ? heightProperty : widthProperty;
+							applyAnimationProperty(style, prop, value, setKeyFrame);
+						};
+						break;
+					}
 				}
+				// eslint-disable-next-line no-fallthrough
 				default:
-					console.error(`Animating property '${animation.property}' is unsupported`);
-			}
-		}
-
-		let duration = 0.3;
-		if (animation.duration !== undefined) {
-			duration = animation.duration / 1000.0;
-		}
-
-		let delay = undefined;
-		if (animation.delay) {
-			delay = animation.delay / 1000.0;
-		}
-
-		let repeatCount = undefined;
-		if (animation.iterations !== undefined) {
-			if (animation.iterations === Number.POSITIVE_INFINITY) {
-				repeatCount = FLT_MAX;
-			} else {
-				repeatCount = animation.iterations;
+					if (animation.property) {
+						// animation._originalValue = view.backgroundColor;
+						animation._originalValue = animation.target.style[animation.property.name];
+						animation._propertyResetCallback = (value) => {
+							applyAnimationProperty(style, animation.property, value, setKeyFrame);
+						};
+						fromValue = animation._originalValue;
+						if (animation._originalValue instanceof Color) {
+							// animation._originalValue = animation._originalValue;
+							fromValue = animation._originalValue.ios.CGColor;
+						}
+						if (toValue instanceof Color) {
+							if (nativeView instanceof UILabel) {
+								nativeView.setValueForKey(UIColor.clearColor, 'backgroundColor');
+							}
+							toValue = toValue.ios.CGColor;
+						}
+					} else {
+						console.error(`Animating property '${propertyNameToAnimate}' is unsupported`);
+					}
+					break;
 			}
 		}
 
 		return {
 			propertyNameToAnimate: propertyNameToAnimate,
 			fromValue: fromValue,
-			subPropertiesToAnimate: subPropertyNameToAnimate,
 			toValue: toValue,
-			duration: duration,
-			repeatCount: repeatCount,
-			delay: delay,
+			duration,
+			delay,
+			repeatCount,
+			animationBlock: animation.animationBlock,
 		};
 	}
 
-	private static _createNativeAnimation(propertyAnimations: Array<PropertyAnimation>, index: number, playSequentially: boolean, args: AnimationInfo, animation: PropertyAnimation, valueSource: 'animation' | 'keyframe', finishedCallback: (cancelled?: boolean) => void) {
-		const nativeView: NativeScriptUIView = animation.target.nativeViewProtected;
-
-		let nativeAnimation;
-
-		if (args.subPropertiesToAnimate) {
-			nativeAnimation = this._createGroupAnimation(args, animation);
-		} else {
-			nativeAnimation = this._createBasicAnimation(args, animation);
-		}
-
-		const animationDelegate = AnimationDelegateImpl.initWithFinishedCallback(finishedCallback, animation, valueSource);
-		nativeAnimation.setValueForKey(animationDelegate, 'delegate');
-		if (nativeView) {
-			nativeView.layer.addAnimationForKey(nativeAnimation, args.propertyNameToAnimate);
-			if (args.propertyNameToAnimate === 'bounds') {
-				this.animateNestedLayerSizeUsingBasicAnimation(nativeView, args.toValue.CGRectValue, animation, args, nativeAnimation);
-			}
-
-			// Shadow container layer belongs to the parent view layer, so animate all its properties (except for colors) separately
-			if (args.propertyNameToAnimate && !args.propertyNameToAnimate.endsWith('Color')) {
-				if (nativeView.outerShadowContainerLayer) {
-					nativeView.outerShadowContainerLayer.addAnimationForKey(nativeAnimation, args.propertyNameToAnimate);
-				}
-			}
-		}
-		let callback = undefined;
-		if (index + 1 < propertyAnimations.length) {
-			callback = Animation._createiOSAnimationFunction(propertyAnimations, index + 1, playSequentially, valueSource, finishedCallback);
-			if (!playSequentially) {
-				callback();
-			} else {
-				animationDelegate.nextAnimation = callback;
-			}
-		}
-	}
-
-	private static _createGroupAnimation(args: AnimationInfo, animation: PropertyAnimation) {
-		const groupAnimation = CAAnimationGroup.new();
-		const animations = NSMutableArray.alloc<CAAnimation>().initWithCapacity(args.subPropertiesToAnimate.length);
-
-		groupAnimation.duration = args.duration;
-		if (args.repeatCount !== undefined) {
-			groupAnimation.repeatCount = args.repeatCount;
-		}
-		if (args.delay !== undefined) {
-			groupAnimation.beginTime = CACurrentMediaTime() + args.delay;
-		}
-		if (animation.curve !== undefined) {
-			groupAnimation.timingFunction = animation.curve;
-		}
-
-		args.subPropertiesToAnimate.forEach((property) => {
-			const basicAnimationArgs = { ...args, duration: undefined, repeatCount: undefined, delay: undefined, curve: undefined };
-			basicAnimationArgs.propertyNameToAnimate = `${args.propertyNameToAnimate}.${property}`;
-			basicAnimationArgs.fromValue = args.fromValue[property];
-			basicAnimationArgs.toValue = args.toValue[property];
-
-			const basicAnimation = this._createBasicAnimation(basicAnimationArgs, animation);
-			animations.addObject(basicAnimation);
-		});
-
-		groupAnimation.animations = animations;
-
-		return groupAnimation;
-	}
-
-	private static _createBasicAnimation(args: AnimationInfo, animation: PropertyAnimation) {
-		const basicAnimation = CABasicAnimation.animationWithKeyPath(args.propertyNameToAnimate);
+	// protected _createNativeAnimation(propertyAnimations: Array<PropertyAnimation>, index: number, playSequentially: boolean) {
+	// 	const animationInfo = propertyAnimations[index];
+	// 	const args = this._getNativeAnimationArguments(animationInfo, true);
+	// 	const nativeView = <UIView>animationInfo.target.nativeViewProtected;
+	// 	let nativeAnimation;
+
+	// 	if (args.subPropertiesToAnimate) {
+	// 		nativeAnimation = this._createGroupAnimation(args, animationInfo);
+	// 	} else {
+	// 		nativeAnimation = this._createBasicAnimation(args, animationInfo);
+	// 	}
+
+	// 	const animationDelegate = AnimationDelegateImpl.initWithFinishedCallback(new WeakRef(this), animationInfo);
+	// 	nativeAnimation.setValueForKey(animationDelegate, 'delegate');
+
+	// 	if (nativeView?.layer) {
+	// 		nativeView.layer.addAnimationForKey(nativeAnimation, args.propertyNameToAnimate);
+	// 	}
+
+	// 	let callback = undefined;
+	// 	if (index + 1 < propertyAnimations.length) {
+	// 		callback = this._createiOSAnimationFunction(propertyAnimations, index + 1, playSequentially);
+	// 		if (!playSequentially) {
+	// 			callback();
+	// 		} else {
+	// 			animationDelegate.nextAnimation = callback;
+	// 		}
+	// 	}
+	// }
+
+	// protected _createGroupAnimation(args: AnimationInfo, animation: PropertyAnimation) {
+	// 	const groupAnimation = CAAnimationGroup.new();
+	// 	groupAnimation.duration = args.duration;
+	// 	if (args.repeatCount !== undefined) {
+	// 		groupAnimation.repeatCount = args.repeatCount;
+	// 	}
+	// 	if (args.delay !== undefined) {
+	// 		groupAnimation.beginTime = CACurrentMediaTime() + args.delay;
+	// 	}
+	// 	if (animation.curve !== undefined) {
+	// 		groupAnimation.timingFunction = animation.curve;
+	// 	}
+	// 	const animations = NSMutableArray.alloc<CAAnimation>().initWithCapacity(3);
+
+	// 	args.subPropertiesToAnimate.forEach((property) => {
+	// 		const basicAnimationArgs = { ...args, duration: undefined, repeatCount: undefined, delay: undefined, curve: undefined };
+	// 		basicAnimationArgs.propertyNameToAnimate = `${args.propertyNameToAnimate}.${property}`;
+	// 		basicAnimationArgs.fromValue = args.fromValue[property];
+	// 		basicAnimationArgs.toValue = args.toValue[property];
+
+	// 		const basicAnimation = this._createBasicAnimation(basicAnimationArgs, animation);
+	// 		animations.addObject(basicAnimation);
+	// 	});
+
+	// 	groupAnimation.animations = animations;
+
+	// 	return groupAnimation;
+	// }
+
+	private _createBasicAnimation(args: AnimationInfo, curve, duration, delay, repeatCount) {
+		const basicAnimation = (curve === 'spring' ? CASpringAnimation : CABasicAnimation).animationWithKeyPath(args.propertyNameToAnimate);
+		basicAnimation['damping'] = 0.2;
 		basicAnimation.fromValue = args.fromValue;
 		basicAnimation.toValue = args.toValue;
-		basicAnimation.duration = args.duration;
-		if (args.repeatCount !== undefined) {
+		basicAnimation.duration = duration;
+		if (repeatCount !== undefined) {
 			basicAnimation.repeatCount = args.repeatCount;
 		}
-		if (args.delay !== undefined) {
-			basicAnimation.beginTime = CACurrentMediaTime() + args.delay;
+		if (delay !== undefined) {
+			basicAnimation.beginTime = CACurrentMediaTime() + delay;
 		}
-		if (animation.curve !== undefined) {
-			basicAnimation.timingFunction = animation.curve;
+		if (curve !== undefined) {
+			basicAnimation.timingFunction = curve;
 		}
 
 		return basicAnimation;
 	}
-
-	private static _createNativeSpringAnimation(propertyAnimations: Array<PropertyAnimationInfo>, index: number, playSequentially: boolean, args: AnimationInfo, animation: PropertyAnimationInfo, valueSource: 'animation' | 'keyframe', finishedCallback: (cancelled?: boolean) => void) {
-		const nativeView: NativeScriptUIView = animation.target.nativeViewProtected;
-
+	usePropertyAnimator = false;
+	protected _createNativeUIViewAnimation(propertyAnimations: Array<PropertyAnimationInfo>, index: number, playSequentially: boolean) {
+		// const animationInfos = playSequentially ? [propertyAnimations[index]] : propertyAnimations;
+		// TODO: need to investigate why we cant handle all animations in one block
+		const animationInfos = [propertyAnimations[index]];
+		const firstAnimation = animationInfos[0];
+		const nativeView = <NativeScriptUIView>firstAnimation.target.nativeViewProtected;
+		if (!nativeView) {
+			this._rejectAnimationFinishedPromise(new Error('trying to animate view without nativeView'));
+			return;
+		}
 		let callback = undefined;
 		let nextAnimation;
 		if (index + 1 < propertyAnimations.length) {
-			callback = Animation._createiOSAnimationFunction(propertyAnimations, index + 1, playSequentially, valueSource, finishedCallback);
+			callback = this._createiOSAnimationFunction(propertyAnimations, index + 1, playSequentially);
 			if (!playSequentially) {
 				callback();
 			} else {
@@ -583,89 +545,182 @@ export class Animation extends AnimationBase {
 		}
 
 		let delay = 0;
-		if (args.delay) {
-			delay = args.delay;
+		if (firstAnimation.delay) {
+			delay = firstAnimation.delay / 1000.0;
 		}
 
-		UIView.animateWithDurationDelayUsingSpringWithDampingInitialSpringVelocityOptionsAnimationsCompletion(
-			args.duration,
-			delay,
-			0.2,
-			0,
-			UIViewAnimationOptions.CurveLinear,
-			() => {
-				if (args.repeatCount !== undefined) {
-					UIView.setAnimationRepeatCount(args.repeatCount);
-				}
+		let duration = 0.3;
+		if (firstAnimation.duration !== undefined) {
+			duration = firstAnimation.duration / 1000.0;
+		}
 
-				switch (animation.property) {
-					case Properties.backgroundColor:
-						animation.target.backgroundColor = args.toValue;
-						break;
-					case Properties.opacity:
-						animation.target.opacity = args.toValue;
-						break;
-					case Properties.height:
-					case Properties.width:
-						animation._originalValue = animation.target[animation.property];
-						nativeView.layer.setValueForKey(args.toValue, args.propertyNameToAnimate);
+		let repeatCount = undefined;
+		if (firstAnimation.iterations !== undefined) {
+			if (firstAnimation.iterations === Number.POSITIVE_INFINITY) {
+				repeatCount = Number.MAX_VALUE;
+			} else {
+				repeatCount = firstAnimation.iterations;
+			}
+		}
 
-						// Resize background during animation
-						iosBackground.drawBackgroundVisualEffects(animation.target);
+		const animationOptions = UIViewAnimationOptions.AllowUserInteraction;
 
-						animation._propertyResetCallback = function (value) {
-							animation.target[animation.property] = value;
-						};
-						break;
-					case _transform:
-						animation._originalValue = nativeView.layer.transform;
-						nativeView.layer.setValueForKey(args.toValue, args.propertyNameToAnimate);
+		const animate = () => {
+			// only one animationBlock so we can test on first
+			if (firstAnimation.animationBlock) {
+				firstAnimation.animationBlock();
+			}
+			// only one animationBlock so we can test on first
+			if (repeatCount !== undefined) {
+				UIView.setAnimationRepeatCount(repeatCount);
+			}
+			const setKeyFrame = this._valueSource === 'keyframe';
+			animationInfos.forEach((animationInfo) => {
+				switch (animationInfo.propertyName) {
+					case _transform: {
+						// we use basicAnimation for transform.
+						// UIView.animate does not handle 360 rotate correctly
+						const args = this._getNativeAnimationArguments(animationInfo, duration, delay, repeatCount, true);
+						animationInfo._originalValue = nativeView.layer.transform;
+						const basicAnimation = this._createBasicAnimation(
+							{
+								...args,
+							},
+							curve,
+							duration,
+							delay,
+							repeatCount,
+						);
 
+						// we set the destination value in animate to persist it after animation end
+						nativeView.layer.transform = args.toValue.CATransform3DValue;
 						// Shadow container layer belongs to the parent view layer, so animate its transform separately
 						if (nativeView.outerShadowContainerLayer) {
 							nativeView.outerShadowContainerLayer.setValueForKey(args.toValue, args.propertyNameToAnimate);
 						}
 
-						animation._propertyResetCallback = function (value) {
+						// we start the animation
+						nativeView.layer.addAnimationForKey(basicAnimation, args.propertyNameToAnimate);
+
+						// nativeView.layer.setValueForKey(args.toValue, args.propertyNameToAnimate);
+						animationInfo._propertyResetCallback = function (value) {
 							nativeView.layer.transform = value;
 						};
+						// Shadow layers do not inherit from animating view layer
+						if (nativeView.outerShadowContainerLayer) {
+							// we set the destination value in animate to persist it after animation end
+							nativeView.outerShadowContainerLayer.transform = args.toValue.CATransform3DValue;
+							nativeView.outerShadowContainerLayer.addAnimationForKey(basicAnimation, args.propertyNameToAnimate);
+						}
+						break;
+					}
+					case Properties.width:
+					case Properties.height: {
+						const args = this._getNativeAnimationArguments(animationInfo, duration, delay, repeatCount);
+						// Resize background during animation
+						iosBackground.drawBackgroundVisualEffects(animationInfo.target);
+						this.animateNestedLayerSizeUsingBasicAnimation(nativeView, args.toValue.CGRectValue, animationInfo, args /* nativeAnimation */, curve, duration, delay, repeatCount);
+						applyAnimationProperty(animationInfo.target, animationInfo.property, animationInfo.value, setKeyFrame);
+
+						(animationInfo.target.page || animationInfo.target).nativeViewProtected.layoutIfNeeded();
+						break;
+					}
+					default:
+						applyAnimationProperty(animationInfo.target, animationInfo.property, animationInfo.value, setKeyFrame);
+						if (animationInfo.property.affectsLayout) {
+							(animationInfo.target.page || animationInfo.target).nativeViewProtected.layoutIfNeeded();
+						}
 						break;
 				}
-			},
-			function (animationDidFinish: boolean) {
+			});
+		};
+		let finished = false;
+		const startTime = Date.now();
+		let finishedCalledOnce = false;
+		const finish = (animationDidFinish: boolean = true) => {
+			if (finished || (animationDidFinish && !finishedCalledOnce && Date.now() - startTime < duration * 1000)) {
+				//ignoring finished. Called to soon
+				// will be called again byt the CATransaction completion block
+				finishedCalledOnce = true;
+				return;
+			}
+			finished = true;
+			animationInfos.forEach((animationInfo) => {
 				if (animationDidFinish) {
-					if (animation.property === _transform) {
-						if (animation.value[Properties.translate] !== undefined) {
-							animation.target.translateX = animation.value[Properties.translate].x;
-							animation.target.translateY = animation.value[Properties.translate].y;
-						}
-						if (animation.value[Properties.rotate] !== undefined) {
-							animation.target.rotateX = animation.value[Properties.rotate].x;
-							animation.target.rotateY = animation.value[Properties.rotate].y;
-							animation.target.rotate = animation.value[Properties.rotate].z;
-						}
-						if (animation.value[Properties.scale] !== undefined) {
-							animation.target.scaleX = animation.value[Properties.scale].x;
-							animation.target.scaleY = animation.value[Properties.scale].y;
-						}
-					}
+					// not needed anymore as we set the destination value in animate to persist it
+					// if (animationInfo.propertyName === _transform) {
+					// 	if (animationInfo.value[Properties.translate] !== undefined) {
+					// 		animationInfo.target.translateX = animationInfo.value[Properties.translate].x;
+					// 		animationInfo.target.translateY = animationInfo.value[Properties.translate].y;
+					// 	}
+					// 	if (animationInfo.value[Properties.rotate] !== undefined) {
+					// 		animationInfo.target.rotateX = animationInfo.value[Properties.rotate].x;
+					// 		animationInfo.target.rotateY = animationInfo.value[Properties.rotate].y;
+					// 		animationInfo.target.rotate = animationInfo.value[Properties.rotate].z;
+					// 	}
+					// 	if (animationInfo.value[Properties.scale] !== undefined) {
+					// 		animationInfo.target.scaleX = animationInfo.value[Properties.scale].x;
+					// 		animationInfo.target.scaleY = animationInfo.value[Properties.scale].y;
+					// 	}
+					// }
 				} else {
-					if (animation._propertyResetCallback) {
-						animation._propertyResetCallback(animation._originalValue);
+					if (animationInfo._propertyResetCallback) {
+						animationInfo._propertyResetCallback(animationInfo._originalValue);
 					}
 				}
-				if (finishedCallback) {
-					const cancelled = !animationDidFinish;
-					finishedCallback(cancelled);
-				}
-				if (animationDidFinish && nextAnimation) {
-					nextAnimation();
+			});
+			const cancelled = !animationDidFinish;
+			this.animationFinishedCallback(cancelled);
+			if (animationDidFinish && nextAnimation && !this._wasCancelled) {
+				nextAnimation();
+			}
+		};
+
+		const curve = firstAnimation.curve || CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionLinear);
+		const isSpring = curve === 'spring';
+		if (this.usePropertyAnimator) {
+			const finishCallback = (position: UIViewAnimatingPosition) => finish(position === UIViewAnimatingPosition.End);
+			if (isSpring) {
+				const animator = UIViewPropertyAnimator.alloc().initWithDurationDampingRatioAnimations(duration, 0.2, null);
+				animator.manualHitTestingEnabled = true;
+				animator.addAnimations(animate);
+				animator.addCompletion(finishCallback);
+				// for seems to be the only way to use a timeout. It is not too bad but would be better to be handled natively
+				// for this example this breaks slow animations in debugger
+				if (delay) {
+					setTimeout(() => {
+						animator.startAnimation();
+					}, delay * 1000);
+				} else {
+					animator.startAnimation();
 				}
-			},
-		);
+			} else {
+				CATransaction.begin();
+				CATransaction.setAnimationTimingFunction(curve);
+				CATransaction.setAnimationDuration(duration);
+				CATransaction.setCompletionBlock(finish);
+				UIViewPropertyAnimator.runningPropertyAnimatorWithDurationDelayOptionsAnimationsCompletion(duration, delay, animationOptions, animate, finishCallback);
+				CATransaction.commit();
+			}
+		} else {
+			if (isSpring) {
+				CATransaction.begin();
+				CATransaction.setAnimationDuration(duration);
+				CATransaction.setCompletionBlock(finish);
+				UIView.animateWithDurationDelayUsingSpringWithDampingInitialSpringVelocityOptionsAnimationsCompletion(duration, delay, 0.2, 0, UIViewAnimationOptions.CurveLinear | animationOptions, animate, finish);
+				CATransaction.commit();
+			} else {
+				CATransaction.begin();
+				CATransaction.setAnimationDuration(duration);
+				CATransaction.setAnimationTimingFunction(curve);
+				CATransaction.setCompletionBlock(finish);
+				UIView.animateWithDurationDelayOptionsAnimationsCompletion(duration, delay, animationOptions, animate, finish);
+				CATransaction.commit();
+			}
+		}
 	}
 
-	private static _createNativeAffineTransform(animation: PropertyAnimation): CATransform3D {
+	protected static _createNativeAffineTransform(animation: PropertyAnimation): CATransform3D {
 		const value = animation.value;
 		let result: CATransform3D = CATransform3DIdentity;
 
@@ -676,25 +731,38 @@ export class Animation extends AnimationBase {
 		}
 
 		if (value[Properties.scale] !== undefined) {
-			const x = value[Properties.scale].x;
-			const y = value[Properties.scale].y;
-			result = CATransform3DScale(result, x === 0 ? 0.001 : x, y === 0 ? 0.001 : y, 1);
+			const x = value[Properties.scale].x || 1e-6;
+			const y = value[Properties.scale].y || 1e-6;
+			result = CATransform3DScale(result, x, y, 1);
+		}
+		if (value[Properties.rotate] !== undefined) {
+			const x = value[Properties.rotate].x;
+			const y = value[Properties.rotate].y;
+			const z = value[Properties.rotate].z;
+			const perspective = animation.target.perspective || 300;
+
+			// Set perspective in case of rotation since we use z
+			if (x || y) {
+				result.m34 = -1 / perspective;
+			}
+
+			result = iosHelper.applyRotateTransform(result, x, y, z);
 		}
 
 		return result;
 	}
 
-	private static _isAffineTransform(property: string): boolean {
-		return property === _transform || property === Properties.translate || property === Properties.scale;
+	protected static _isAffineTransform(property: string): boolean {
+		return property === _transform || property === Properties.translate || property === Properties.rotate || property === Properties.scale;
 	}
 
-	private static _canBeMerged(animation1: PropertyAnimation, animation2: PropertyAnimation) {
-		const result = Animation._isAffineTransform(animation1.property) && Animation._isAffineTransform(animation2.property) && animation1.target === animation2.target && animation1.duration === animation2.duration && animation1.delay === animation2.delay && animation1.iterations === animation2.iterations && animation1.curve === animation2.curve;
+	protected static _canBeMerged(animation1: PropertyAnimation, animation2: PropertyAnimation) {
+		const result = Animation._isAffineTransform(animation1.propertyName) && Animation._isAffineTransform(animation2.propertyName) && animation1.target === animation2.target && animation1.duration === animation2.duration && animation1.delay === animation2.delay && animation1.iterations === animation2.iterations && animation1.curve === animation2.curve;
 
 		return result;
 	}
 
-	private static _mergeAffineTransformAnimations(propertyAnimations: Array<PropertyAnimation>): Array<PropertyAnimation> {
+	protected static _mergeAffineTransformAnimations(propertyAnimations: Array<PropertyAnimation>): Array<PropertyAnimation> {
 		const result = new Array<PropertyAnimation>();
 
 		let i = 0;
@@ -705,7 +773,7 @@ export class Animation extends AnimationBase {
 				continue;
 			}
 
-			if (!Animation._isAffineTransform(propertyAnimations[i].property)) {
+			if (!Animation._isAffineTransform(propertyAnimations[i].propertyName)) {
 				// This is not an affine transform animation, so there is nothing to merge.
 				result.push(propertyAnimations[i]);
 			} else {
@@ -718,7 +786,8 @@ export class Animation extends AnimationBase {
 				// }
 				const newTransformAnimation: PropertyAnimation = {
 					target: propertyAnimations[i].target,
-					property: _transform,
+					propertyName: _transform,
+					property: null,
 					value: {},
 					duration: propertyAnimations[i].duration,
 					delay: propertyAnimations[i].delay,
@@ -728,7 +797,7 @@ export class Animation extends AnimationBase {
 				if (Trace.isEnabled()) {
 					Trace.write('Curve: ' + propertyAnimations[i].curve, Trace.categories.Animation);
 				}
-				newTransformAnimation.value[propertyAnimations[i].property] = propertyAnimations[i].value;
+				newTransformAnimation.value[propertyAnimations[i].propertyName] = propertyAnimations[i].value;
 				if (Trace.isEnabled()) {
 					Trace.write('Created new transform animation: ' + Animation._getAnimationInfo(newTransformAnimation), Trace.categories.Animation);
 				}
@@ -741,7 +810,7 @@ export class Animation extends AnimationBase {
 							if (Trace.isEnabled()) {
 								Trace.write('Merging animations: ' + Animation._getAnimationInfo(newTransformAnimation) + ' + ' + Animation._getAnimationInfo(propertyAnimations[j]) + ';', Trace.categories.Animation);
 							}
-							newTransformAnimation.value[propertyAnimations[j].property] = propertyAnimations[j].value;
+							newTransformAnimation.value[propertyAnimations[j].propertyName] = propertyAnimations[j].value;
 							// Mark that it has been merged so we can skip it on our outer loop.
 							propertyAnimations[j][_skip] = true;
 						}
@@ -755,13 +824,13 @@ export class Animation extends AnimationBase {
 		return result;
 	}
 
-	private static animateNestedLayerSizeUsingBasicAnimation(nativeView: NativeScriptUIView, bounds: CGRect, animation: PropertyAnimation, args: AnimationInfo, nativeAnimation: CABasicAnimation) {
+	protected animateNestedLayerSizeUsingBasicAnimation(nativeView: NativeScriptUIView, bounds: CGRect, animation: PropertyAnimation, args: AnimationInfo /* , nativeAnimation: CABasicAnimation */, curve, duration, delay, repeatCount) {
 		const view: View = animation.target;
 
 		// Gradient background animation
-		if (nativeView.gradientLayer) {
-			nativeView.gradientLayer.addAnimationForKey(nativeAnimation, 'bounds');
-		}
+		// if (nativeView.gradientLayer) {
+		// 	nativeView.gradientLayer.addAnimationForKey(nativeAnimation, 'bounds');
+		// }
 
 		let clipPath; // This is also used for animating shadow
 
@@ -787,7 +856,10 @@ export class Animation extends AnimationBase {
 							fromValue: nativeView.layer.mask.path,
 							toValue,
 						},
-						animation,
+						curve,
+						duration,
+						delay,
+						repeatCount,
 					),
 					'path',
 				);
@@ -810,7 +882,10 @@ export class Animation extends AnimationBase {
 									fromValue: borderMask.path,
 									toValue: innerClipPath,
 								},
-								animation,
+								curve,
+								duration,
+								delay,
+								repeatCount,
 							),
 							'path',
 						);
@@ -831,7 +906,10 @@ export class Animation extends AnimationBase {
 											fromValue: layer.path,
 											toValue: paths[i],
 										},
-										animation,
+										curve,
+										duration,
+										delay,
+										repeatCount,
 									),
 									'path',
 								);
@@ -847,7 +925,10 @@ export class Animation extends AnimationBase {
 								fromValue: nativeView.borderLayer.path,
 								toValue: innerClipPath,
 							},
-							animation,
+							curve,
+							duration,
+							delay,
+							repeatCount,
 						),
 						'path',
 					);
@@ -865,7 +946,10 @@ export class Animation extends AnimationBase {
 							fromValue: nativeView.layer.cornerRadius,
 							toValue: iosBackground.getUniformBorderRadius(animation.target, bounds),
 						},
-						animation,
+						curve,
+						duration,
+						delay,
+						repeatCount,
 					),
 					'cornerRadius',
 				);
@@ -886,7 +970,10 @@ export class Animation extends AnimationBase {
 							fromValue: shadowClipMask.path,
 							toValue: clipPath,
 						},
-						animation,
+						curve,
+						duration,
+						delay,
+						repeatCount,
 					),
 					'path',
 				);
@@ -907,7 +994,10 @@ export class Animation extends AnimationBase {
 								fromValue: shadowLayer.shadowPath,
 								toValue: shadowPath,
 							},
-							animation,
+							curve,
+							duration,
+							delay,
+							repeatCount,
 						),
 						'shadowPath',
 					);
@@ -921,7 +1011,10 @@ export class Animation extends AnimationBase {
 									fromValue: shadowLayer.mask.path,
 									toValue: maskPath,
 								},
-								animation,
+								curve,
+								duration,
+								delay,
+								repeatCount,
 							),
 							'path',
 						);
@@ -952,7 +1045,8 @@ function calculateTransform(view: View): CATransform3D {
 	// Order is important: translate, rotate, scale
 	let expectedTransform = new CATransform3D(CATransform3DIdentity);
 
-	// Only set perspective if there is 3D rotation
+	// TODO: Add perspective property to transform animations (not just rotation)
+	// Set perspective in case of rotation since we use z
 	if (view.rotateX || view.rotateY) {
 		expectedTransform.m34 = -1 / perspective;
 	}
diff --git a/packages/core/ui/animation/keyframe-animation.ts b/packages/core/ui/animation/keyframe-animation.ts
index d5617034cb..4fec76f4a6 100644
--- a/packages/core/ui/animation/keyframe-animation.ts
+++ b/packages/core/ui/animation/keyframe-animation.ts
@@ -8,7 +8,8 @@ import { Trace } from '../../trace';
 // Types.
 import { unsetValue } from '../core/properties/property-shared';
 import { Animation } from './index';
-import { backgroundColorProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, rotateProperty, opacityProperty, rotateXProperty, rotateYProperty, widthProperty, heightProperty } from '../styling/style-properties';
+import { backgroundColorProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, rotateProperty, opacityProperty, rotateXProperty, rotateYProperty } from '../styling/style-properties';
+import { AnimationNonAnimatableProperties, getPropertyFromKey } from './animation-common';
 
 export interface Keyframes {
 	name: string;
@@ -49,14 +50,13 @@ interface Keyframe {
 	backgroundColor?: Color;
 	scale?: { x: number; y: number };
 	translate?: { x: number; y: number };
-	rotate?: { x: number; y: number; z: number };
+	rotate?: { x: number; y: number; z: number } | number;
 	opacity?: number;
 	width?: CoreTypes.PercentLengthType;
 	height?: CoreTypes.PercentLengthType;
 	valueSource?: 'keyframe' | 'animation';
 	duration?: number;
 	curve?: any;
-	forceLayer?: boolean;
 }
 
 export class KeyframeAnimation {
@@ -72,7 +72,9 @@ export class KeyframeAnimation {
 
 	public static keyframeAnimationFromInfo(info: KeyframeAnimationInfo): KeyframeAnimation {
 		if (!info?.keyframes?.length) {
-			Trace.write(`No keyframes found for animation '${info.name}'.`, Trace.categories.Animation, Trace.messageType.warn);
+			if (Trace.isEnabled()) {
+				Trace.write(`No keyframes found for animation '${info.name}'.`, Trace.categories.Animation, Trace.messageType.warn);
+			}
 			return null;
 		}
 
@@ -111,7 +113,7 @@ export class KeyframeAnimation {
 		return animation;
 	}
 
-	private static parseKeyframe(info: KeyframeAnimationInfo, keyframe: KeyframeInfo, animations: Array<Object>, startDuration: number): number {
+	private static parseKeyframe(info: KeyframeAnimationInfo, keyframe: KeyframeInfo, animations: Array<Keyframe>, startDuration: number): number {
 		const animation: Keyframe = {};
 		for (const declaration of keyframe.declarations) {
 			animation[declaration.property] = declaration.value;
@@ -126,7 +128,6 @@ export class KeyframeAnimation {
 		}
 		animation.duration = info.isReverse ? info.duration - duration : duration;
 		animation.curve = keyframe.curve;
-		animation.forceLayer = true;
 		animation.valueSource = 'keyframe';
 		animations.push(animation);
 
@@ -140,7 +141,6 @@ export class KeyframeAnimation {
 	public cancel() {
 		if (!this.isPlaying) {
 			Trace.write('Keyframe animation is already playing.', Trace.categories.Animation, Trace.messageType.warn);
-
 			return;
 		}
 
@@ -190,32 +190,31 @@ export class KeyframeAnimation {
 		}
 		if (index === 0) {
 			const animation = this.animations[0];
-
-			if ('backgroundColor' in animation) {
-				view.style[backgroundColorProperty.keyframe] = animation.backgroundColor;
-			}
-			if ('scale' in animation) {
-				view.style[scaleXProperty.keyframe] = animation.scale.x;
-				view.style[scaleYProperty.keyframe] = animation.scale.y;
-			}
-			if ('translate' in animation) {
-				view.style[translateXProperty.keyframe] = animation.translate.x;
-				view.style[translateYProperty.keyframe] = animation.translate.y;
-			}
-			if ('rotate' in animation) {
-				view.style[rotateXProperty.keyframe] = animation.rotate.x;
-				view.style[rotateYProperty.keyframe] = animation.rotate.y;
-				view.style[rotateProperty.keyframe] = animation.rotate.z;
-			}
-			if ('opacity' in animation) {
-				view.style[opacityProperty.keyframe] = animation.opacity;
-			}
-			if ('height' in animation) {
-				view.style[heightProperty.keyframe] = animation.height;
-			}
-			if ('width' in animation) {
-				view.style[widthProperty.keyframe] = animation.width;
-			}
+			Object.keys(animation).forEach((key) => {
+				if (AnimationNonAnimatableProperties.indexOf(key) !== -1) {
+					return;
+				}
+				if ('scale' === key) {
+					view.style[scaleXProperty.keyframe] = animation.scale.x;
+					view.style[scaleYProperty.keyframe] = animation.scale.y;
+				} else if ('translate' === key) {
+					view.style[translateXProperty.keyframe] = animation.translate.x;
+					view.style[translateYProperty.keyframe] = animation.translate.y;
+				} else if ('rotate' === key) {
+					if (typeof animation.rotate == 'object') {
+						view.style[rotateXProperty.keyframe] = animation.rotate.x;
+						view.style[rotateYProperty.keyframe] = animation.rotate.y;
+						view.style[rotateProperty.keyframe] = animation.rotate.z;
+					} else {
+						view.style[rotateProperty.keyframe] = animation.rotate;
+					}
+				} else {
+					const property = getPropertyFromKey(key, view);
+					if (property?.keyframe) {
+						view.style[property.keyframe] = animation[key];
+					}
+				}
+			});
 
 			setTimeout(() => this.animate(view, 1, iterations), 1);
 		} else if (index < 0 || index >= this.animations.length) {
@@ -230,7 +229,7 @@ export class KeyframeAnimation {
 				this._resolveAnimationFinishedPromise();
 			}
 		} else {
-			let animation;
+			let animation: Animation;
 			const cachedAnimation = this._nativeAnimations[index - 1];
 
 			if (cachedAnimation) {
@@ -246,17 +245,14 @@ export class KeyframeAnimation {
 			// Catch the animation cancel to prevent unhandled promise rejection warnings
 			animation
 				.play(isLastIteration)
-				.then(
-					() => {
-						this.animate(view, index + 1, iterations);
-					},
-					(error: any) => {
-						Trace.write(typeof error === 'string' ? error : error.message, Trace.categories.Animation, Trace.messageType.warn);
-					},
-				)
+				.then(() => {
+					this.animate(view, index + 1, iterations);
+				})
 				.catch((error: any) => {
-					Trace.write(typeof error === 'string' ? error : error.message, Trace.categories.Animation, Trace.messageType.warn);
-				}); // tslint:disable-line
+					if (Trace.isEnabled()) {
+						Trace.write(typeof error === 'string' ? error : error.message, Trace.categories.Animation, Trace.messageType.warn);
+					}
+				});
 		}
 	}
 
@@ -273,29 +269,27 @@ export class KeyframeAnimation {
 		this._target = null;
 	}
 
-	private _resetAnimationValues(view: View, animation: Object) {
-		if ('backgroundColor' in animation) {
-			view.style[backgroundColorProperty.keyframe] = unsetValue;
-		}
-		if ('scale' in animation) {
-			view.style[scaleXProperty.keyframe] = unsetValue;
-			view.style[scaleYProperty.keyframe] = unsetValue;
-		}
-		if ('translate' in animation) {
-			view.style[translateXProperty.keyframe] = unsetValue;
-			view.style[translateYProperty.keyframe] = unsetValue;
-		}
-		if ('rotate' in animation) {
-			view.style[rotateProperty.keyframe] = unsetValue;
-		}
-		if ('opacity' in animation) {
-			view.style[opacityProperty.keyframe] = unsetValue;
-		}
-		if ('height' in animation) {
-			view.style[heightProperty.keyframe] = unsetValue;
-		}
-		if ('width' in animation) {
-			view.style[widthProperty.keyframe] = unsetValue;
-		}
+	private _resetAnimationValues(view: View, animation: Animation | Keyframe) {
+		Object.keys(animation).forEach((key) => {
+			if (AnimationNonAnimatableProperties.indexOf(key) !== -1) {
+				return;
+			}
+			if ('scale' === key) {
+				view.style[scaleXProperty.keyframe] = unsetValue;
+				view.style[scaleYProperty.keyframe] = unsetValue;
+			} else if ('translate' === key) {
+				view.style[translateXProperty.keyframe] = unsetValue;
+				view.style[translateYProperty.keyframe] = unsetValue;
+			} else if ('rotate' === key) {
+				view.style[rotateXProperty.keyframe] = unsetValue;
+				view.style[rotateYProperty.keyframe] = unsetValue;
+				view.style[rotateProperty.keyframe] = unsetValue;
+			} else {
+				const property = getPropertyFromKey(key, view);
+				if (property?.keyframe) {
+					view.style[property.keyframe] = unsetValue;
+				}
+			}
+		});
 	}
 }
diff --git a/packages/core/ui/builder/component-builder/index.ts b/packages/core/ui/builder/component-builder/index.ts
index f8553a2448..20bf6f8023 100644
--- a/packages/core/ui/builder/component-builder/index.ts
+++ b/packages/core/ui/builder/component-builder/index.ts
@@ -15,44 +15,46 @@ export interface ComponentModule {
 	exports: any;
 }
 
-const legacyShortBarrels = [
-	'text/formatted-string',
-	'text/span',
-	'ui/text-base/formatted-string',
-	'ui/text-base/span',
-	'ui/action-bar',
-	'ui/activity-indicator',
-	'ui/button',
-	'ui/content-view',
-	'ui/date-picker',
-	'ui/frame',
-	'ui/html-view',
-	'ui/image',
-	'ui/label',
-	'ui/layouts/absolute-layout',
-	'ui/layouts/dock-layout',
-	'ui/layouts/grid-layout',
-	'ui/layouts/stack-layout',
-	'ui/layouts/flexbox-layout',
-	'ui/layouts/wrap-layout',
-	'ui/list-picker',
-	'ui/page',
-	'ui/placeholder',
-	'ui/progress',
-	'ui/proxy-view-container',
-	'ui/repeater',
-	'ui/scroll-view',
-	'ui/search-bar',
-	'ui/segmented-bar',
-	'ui/slider',
-	'ui/switch',
-	'ui/tab-view',
-	'ui/web-view',
-	'ui/text-field',
-	'ui/text-view',
-	'ui/time-picker',
-	'ui/list-view',
-];
+const legacyShortBarrels = __UI_USE_EXTERNAL_RENDERER__
+	? []
+	: [
+			'text/formatted-string',
+			'text/span',
+			'ui/text-base/formatted-string',
+			'ui/text-base/span',
+			'ui/action-bar',
+			'ui/activity-indicator',
+			'ui/button',
+			'ui/content-view',
+			'ui/date-picker',
+			'ui/frame',
+			'ui/html-view',
+			'ui/image',
+			'ui/label',
+			'ui/layouts/absolute-layout',
+			'ui/layouts/dock-layout',
+			'ui/layouts/grid-layout',
+			'ui/layouts/stack-layout',
+			'ui/layouts/flexbox-layout',
+			'ui/layouts/wrap-layout',
+			'ui/list-picker',
+			'ui/page',
+			'ui/placeholder',
+			'ui/progress',
+			'ui/proxy-view-container',
+			'ui/repeater',
+			'ui/scroll-view',
+			'ui/search-bar',
+			'ui/segmented-bar',
+			'ui/slider',
+			'ui/switch',
+			'ui/tab-view',
+			'ui/web-view',
+			'ui/text-field',
+			'ui/text-view',
+			'ui/time-picker',
+			'ui/list-view',
+	  ];
 const CORE_UI_BARREL = '@nativescript/core/ui';
 const CODE_FILE = 'codeFile';
 const CSS_FILE = 'cssFile';
diff --git a/packages/core/ui/button/button-common.ts b/packages/core/ui/button/button-common.ts
index 25cb3b0caf..4e10a2a10d 100644
--- a/packages/core/ui/button/button-common.ts
+++ b/packages/core/ui/button/button-common.ts
@@ -4,10 +4,10 @@ import { CSSType } from '../core/view';
 import { booleanConverter } from '../core/view-base';
 import { AccessibilityRole } from '../../accessibility';
 
+export const tapEvent = 'tap';
+
 @CSSType('Button')
 export abstract class ButtonBase extends TextBase implements ButtonDefinition {
-	public static tapEvent = 'tap';
-
 	accessibilityRole = AccessibilityRole.Button;
 
 	get textWrap(): boolean {
diff --git a/packages/core/ui/button/index.android.ts b/packages/core/ui/button/index.android.ts
index 7be3934334..6bdd260d9b 100644
--- a/packages/core/ui/button/index.android.ts
+++ b/packages/core/ui/button/index.android.ts
@@ -1,4 +1,4 @@
-import { ButtonBase } from './button-common';
+import { ButtonBase, tapEvent } from './button-common';
 import { PseudoClassHandler } from '../core/view';
 import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, zIndexProperty, minWidthProperty, minHeightProperty } from '../styling/style-properties';
 import { Length } from '../styling/length-shared';
@@ -34,7 +34,7 @@ function initializeClickListener(): void {
 		public onClick(v: android.view.View): void {
 			const owner = this.owner;
 			if (owner) {
-				owner._emit(ButtonBase.tapEvent);
+				owner._emit(tapEvent);
 			}
 		}
 	}
@@ -57,7 +57,10 @@ function onButtonStateChange(args: TouchGestureEventData) {
 }
 
 export class Button extends ButtonBase {
-	nativeViewProtected: android.widget.Button;
+	// defining this here means tap event wont be handled
+	// by the gesture observers
+	public static tapEvent = tapEvent;
+	declare nativeViewProtected: android.widget.Button;
 
 	private _stateListAnimator: any;
 
@@ -74,7 +77,7 @@ export class Button extends ButtonBase {
 		super.initNativeView();
 		const nativeView = this.nativeViewProtected;
 		// make consistent with iOS, easier on users given css styling
-		nativeView.setAllCaps(false);
+		// nativeView.setAllCaps(false);
 		initializeClickListener();
 		const clickListener = new ClickListener(this);
 		nativeView.setOnClickListener(clickListener);
diff --git a/packages/core/ui/button/index.d.ts b/packages/core/ui/button/index.d.ts
index 0515a19c45..5970238dbc 100644
--- a/packages/core/ui/button/index.d.ts
+++ b/packages/core/ui/button/index.d.ts
@@ -1,6 +1,11 @@
 import { TextBase } from '../text-base';
 import { EventData } from '../../data/observable';
 
+/**
+ * String value used when hooking to tap event.
+ */
+export const tapEvent: string;
+
 /**
  * Represents a standard Button widget.
  *
diff --git a/packages/core/ui/button/index.ios.ts b/packages/core/ui/button/index.ios.ts
index 44091192e0..1189825f7e 100644
--- a/packages/core/ui/button/index.ios.ts
+++ b/packages/core/ui/button/index.ios.ts
@@ -11,9 +11,11 @@ export * from './button-common';
 const observableVisualStates = ['highlighted']; // States like :disabled are handled elsewhere
 
 export class Button extends ButtonBase {
-	public nativeViewProtected: UIButton;
+	// we dont defile tapEvent to let the gesture obserers handle it
+	// in some weird case with UICollectionView UIControlEvents.TouchUpInside is not working
+	public declare nativeViewProtected: UIButton;
 
-	private _tapHandler: NSObject;
+	// private _tapHandler: NSObject;
 	private _stateChangedHandler: ControlStateChangeListener;
 
 	createNativeView() {
@@ -28,12 +30,12 @@ export class Button extends ButtonBase {
 
 	public initNativeView(): void {
 		super.initNativeView();
-		this._tapHandler = TapHandlerImpl.initWithOwner(new WeakRef(this));
-		this.nativeViewProtected.addTargetActionForControlEvents(this._tapHandler, 'tap', UIControlEvents.TouchUpInside);
+		// this._tapHandler = TapHandlerImpl.initWithOwner(new WeakRef(this));
+		// this.nativeViewProtected.addTargetActionForControlEvents(this._tapHandler, 'tap', UIControlEvents.TouchUpInside);
 	}
 
 	public disposeNativeView(): void {
-		this._tapHandler = null;
+		// this._tapHandler = null;
 
 		if (this._stateChangedHandler) {
 			this._stateChangedHandler.stop();
@@ -323,27 +325,27 @@ export class Button extends ButtonBase {
 	}
 }
 
-@NativeClass
-class TapHandlerImpl extends NSObject {
-	private _owner: WeakRef<Button>;
-
-	public static initWithOwner(owner: WeakRef<Button>): TapHandlerImpl {
-		const handler = <TapHandlerImpl>TapHandlerImpl.new();
-		handler._owner = owner;
-		return handler;
-	}
-
-	public tap(args) {
-		// _owner is a {N} view which could get destroyed when a tap initiates (protect!)
-		if (this._owner) {
-			const owner = this._owner?.deref();
-			if (owner) {
-				owner._emit(ButtonBase.tapEvent);
-			}
-		}
-	}
-
-	public static ObjCExposedMethods = {
-		tap: { returns: interop.types.void, params: [interop.types.id] },
-	};
-}
+// @NativeClass
+// class TapHandlerImpl extends NSObject {
+// 	private _owner: WeakRef<Button>;
+
+// 	public static initWithOwner(owner: WeakRef<Button>): TapHandlerImpl {
+// 		const handler = <TapHandlerImpl>TapHandlerImpl.new();
+// 		handler._owner = owner;
+// 		return handler;
+// 	}
+
+// 	public tap(args) {
+// 		// _owner is a {N} view which could get destroyed when a tap initiates (protect!)
+// 		if (this._owner) {
+//			const owner = this._owner?.deref();
+// 			if (owner) {
+// 				owner._emit(ButtonBase.tapEvent);
+// 			}
+// 		}
+// 	}
+
+// 	public static ObjCExposedMethods = {
+// 		tap: { returns: interop.types.void, params: [interop.types.id] },
+// 	};
+// }
diff --git a/packages/core/ui/core/properties/index.ts b/packages/core/ui/core/properties/index.ts
index 3d2b40ef96..dd772de6a9 100644
--- a/packages/core/ui/core/properties/index.ts
+++ b/packages/core/ui/core/properties/index.ts
@@ -2,14 +2,17 @@ import { ViewBase } from '../view-base';
 import { PropertyChangeData, WrappedValue } from '../../../data/observable';
 import { Trace } from '../../../trace';
 
+import { Application } from '../../../application';
+
 import { Style } from '../../styling/style';
 
 import { profile } from '../../../profiling';
 import { unsetValue, PropertyOptions, CoerciblePropertyOptions, CssPropertyOptions, ShorthandPropertyOptions, CssAnimationPropertyOptions, isCssWideKeyword, isCssUnsetValue, isResetValue } from './property-shared';
-import { calc } from '@csstools/css-calc';
 
-// Backwards compatibility
-export { unsetValue } from './property-shared';
+export { makeValidator, makeParser } from '../../../core-types/validators';
+
+//fixes issue https://github.com/microsoft/TypeScript/issues/37663
+const isFunction = (x: unknown): x is Function => typeof x === 'function';
 
 const cssPropertyNames: string[] = [];
 const HAS_OWN = Object.prototype.hasOwnProperty;
@@ -101,7 +104,13 @@ export function _evaluateCssVariableExpression(view: ViewBase, cssName: string,
 			.map((v) => v.trim())
 			.filter((v) => !!v);
 		const cssVariableName = matched.shift();
-		let cssVariableValue = view.style.getCssVariable(cssVariableName);
+		let cssVariableValue;
+		const rootView = Application.getRootView();
+		if (typeof __ONLY_ALLOW_ROOT_VARIABLES__ !== 'undefined' && __ONLY_ALLOW_ROOT_VARIABLES__ === true && rootView) {
+			cssVariableValue = rootView.style.getCssVariable(cssVariableName);
+		} else {
+			cssVariableValue = view.style.getCssVariable(cssVariableName);
+		}
 		if (cssVariableValue === null && matched.length) {
 			cssVariableValue = _evaluateCssVariableExpression(view, cssName, matched.join(', ')).split(',')[0];
 		}
@@ -122,11 +131,23 @@ export function _evaluateCssCalcExpression(value: string) {
 	}
 
 	if (isCssCalcExpression(value)) {
-		return calc(_replaceKeywordsWithValues(_replaceDip(value)));
+		if (__CSS_USE_CSS_TOOLS__) {
+			return require('@csstools/css-calc').calc(_replaceKeywordsWithValues(_replaceDip(value)));
+		} else {
+			Trace.write(`To use css calc() you must define __CSS_USE_CSS_TOOLS__ in webpack Define`, Trace.categories.Accessibility, Trace.messageType.error);
+			return value;
+		}
 	} else {
 		return value;
 	}
-	return value;
+}
+
+export function _getStoredClassDefaultPropertyValue(property, view, defaultBlock) {
+	let defaultValue = view.constructor.prototype[property.defaultValueKey];
+	if (!defaultValue) {
+		defaultValue = view.constructor.prototype[property.defaultValueKey] = defaultBlock();
+	}
+	return defaultValue;
 }
 
 function _replaceDip(value: string) {
@@ -154,21 +175,145 @@ function getPropertiesFromMap(map): Property<any, any>[] | CssProperty<any, any>
 	return props;
 }
 
+function overrideHandlers<T, U>(property: Property<any, U> | CssProperty<any, U> | ShorthandProperty<any, U> | CssAnimationProperty<any, U>) {
+	return function (options: any) {
+		if (property instanceof CssAnimationProperty || property instanceof CssProperty || property instanceof ShorthandProperty) {
+			Object.keys(options).forEach((key) => {
+				if (key === 'cssName') {
+					if (options[key] !== undefined) {
+						//@ts-ignore ignore readonly
+						property.cssName = 'css:' + options[key];
+						//@ts-ignore ignore readonly
+						property.cssLocalName = options[key];
+					}
+				} else if (options[key] !== undefined) {
+					property[key] = options[key];
+				}
+			});
+		} else {
+			Object.keys(options).forEach((key) => {
+				if (options[key] !== undefined) {
+					property[key] = options[key];
+				}
+			});
+		}
+	};
+}
+
+function getPropertySetter<T extends ViewBase, U>(property: Property<T, U>) {
+	return function (this: T, boxedValue: U): void {
+		const reset = isResetValue(boxedValue);
+		let value: U;
+		let wrapped: boolean;
+		const key = property.key;
+		const defaultValue = property.defaultValue;
+		const actualDefaultValue = isFunction(defaultValue) ? defaultValue(property, this) : defaultValue;
+		if (reset) {
+			value = actualDefaultValue;
+			if (property instanceof CoercibleProperty) {
+				delete this[property.coerceKey];
+			}
+		} else {
+			wrapped = boxedValue && (<any>boxedValue).wrapped;
+			value = wrapped ? WrappedValue.unwrap(boxedValue) : boxedValue;
+
+			if (property.valueConverter && typeof value === 'string') {
+				value = property.valueConverter(value);
+			}
+			if (property instanceof CoercibleProperty) {
+				this[property.coerceKey] = value;
+				value = property.coerceValue(this, value);
+			}
+		}
+		const oldValue = <U>(key in this ? this[key] : actualDefaultValue);
+		const changed: boolean = property.equalityComparer ? !property.equalityComparer(oldValue, value) : oldValue !== value;
+
+		if (wrapped || changed) {
+			const defaultValueKey = property.defaultValueKey;
+			const setNative = property.setNative;
+			const valueChanged = property.valueChanged;
+			const getDefault = property.getDefault;
+			const eventName = property.eventName;
+			const propertyName = property.name;
+			if (reset) {
+				delete this[key];
+				if (valueChanged) {
+					valueChanged(this, oldValue, value);
+				}
+				if (this[setNative]) {
+					if (this._suspendNativeUpdatesCount) {
+						this._suspendedUpdates?.set(propertyName, property);
+					} else {
+						if (defaultValueKey in this) {
+							this[setNative](this[defaultValueKey]);
+						} else {
+							this[setNative](actualDefaultValue);
+						}
+					}
+				}
+			} else {
+				this[key] = value;
+				if (valueChanged) {
+					valueChanged(this, oldValue, value);
+				}
+
+				if (this[setNative]) {
+					if (this._suspendNativeUpdatesCount) {
+						this._suspendedUpdates?.set(propertyName, property);
+					} else {
+						if (!(defaultValueKey in this)) {
+							this[defaultValueKey] = this[getDefault] ? this[getDefault]() : actualDefaultValue;
+						}
+						this[setNative](value);
+					}
+				}
+			}
+
+			if ((!__UI_USE_EXTERNAL_RENDERER__ || !this._suspendNativeUpdatesCount) && this.hasListeners(eventName)) {
+				this.notify<PropertyChangeData>({
+					object: this,
+					eventName,
+					propertyName,
+					value,
+					oldValue,
+				});
+			}
+
+			if (property.affectsLayout) {
+				this.requestLayout();
+			}
+
+			if (this.domNode) {
+				if (reset) {
+					this.domNode.attributeRemoved(propertyName);
+				} else {
+					this.domNode.attributeModified(propertyName, value);
+				}
+			}
+		}
+	};
+}
+
 export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<U>, Property<T, U> {
 	private registered: boolean;
 
 	public readonly name: string;
 	public readonly key: symbol;
+	public readonly eventName: string;
 
 	public readonly getDefault: symbol;
 	public readonly setNative: symbol;
 
 	public readonly defaultValueKey: symbol;
-	public readonly defaultValue: U;
-	public readonly nativeValueChange: (owner: T, value: U) => void;
+	public readonly defaultValue: U | ((property: Property<T, U>, view: T) => U);
 
 	public isStyleProperty: boolean;
 
+	public affectsLayout?: boolean;
+	public equalityComparer?: (x: U, y: U) => boolean;
+	public valueChanged?: (target: T, oldValue: U, newValue: U) => void;
+	public valueConverter?: (value: string) => U;
+
 	public get: () => U;
 	public set: (value: U) => void;
 	public overrideHandlers: (options: PropertyOptions<T, U>) => void;
@@ -176,9 +321,9 @@ export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<
 	public configurable = true;
 
 	constructor(options: PropertyOptions<T, U>) {
-		const propertyName = options.name;
-		this.name = propertyName;
-
+		this.overrideHandlers = overrideHandlers(this);
+		this.overrideHandlers(options);
+		const propertyName = this.name;
 		const key = Symbol(propertyName + ':propertyKey');
 		this.key = key;
 
@@ -191,157 +336,68 @@ export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<
 		const defaultValueKey = Symbol(propertyName + ':nativeDefaultValue');
 		this.defaultValueKey = defaultValueKey;
 
-		const defaultValue: U = options.defaultValue;
-		this.defaultValue = defaultValue;
-
-		const eventName = propertyName + 'Change';
-
-		let equalityComparer = options.equalityComparer;
-		let affectsLayout: boolean = options.affectsLayout;
-		let valueChanged = options.valueChanged;
-		let valueConverter = options.valueConverter;
-
-		this.overrideHandlers = function (options: PropertyOptions<T, U>) {
-			if (typeof options.equalityComparer !== 'undefined') {
-				equalityComparer = options.equalityComparer;
-			}
-			if (typeof options.affectsLayout !== 'undefined') {
-				affectsLayout = options.affectsLayout;
-			}
-			if (typeof options.valueChanged !== 'undefined') {
-				valueChanged = options.valueChanged;
-			}
-			if (typeof options.valueConverter !== 'undefined') {
-				valueConverter = options.valueConverter;
+		this.eventName = propertyName + 'Change';
+		const property = this;
+		this.set = getPropertySetter(this);
+		this.get = function (this: T): U {
+			if (key in this) {
+				return <U>this[key];
 			}
+			const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(property, this) : property.defaultValue;
+			return <U>actualDefaultValue;
 		};
-
-		const property = this;
-
-		this.set = function (this: T, boxedValue: U): void {
-			const reset = isResetValue(boxedValue);
-			let value: U;
-			let wrapped: boolean;
-			if (reset) {
-				value = defaultValue;
-			} else {
-				wrapped = boxedValue && (<any>boxedValue).wrapped;
-				value = wrapped ? WrappedValue.unwrap(boxedValue) : boxedValue;
-
-				if (valueConverter && typeof value === 'string') {
-					value = valueConverter(value);
-				}
+		symbolPropertyMap[key] = this;
+	}
+	nativeValueChange(owner: T, value: U): void {
+		const key = this.key;
+		const defaultValue = this.defaultValue;
+		const actualDefaultValue = isFunction(defaultValue) ? defaultValue(this, owner) : defaultValue;
+		const oldValue = <U>(key in owner ? owner[key] : actualDefaultValue);
+		const changed = this.equalityComparer ? !this.equalityComparer(oldValue, value) : oldValue !== value;
+		if (changed) {
+			const defaultValueKey = this.defaultValueKey;
+			const getDefault = this.getDefault;
+			const eventName = this.eventName;
+			const propertyName = this.name;
+			owner[key] = value;
+			if (this.valueChanged) {
+				this.valueChanged(owner, oldValue, value);
 			}
 
-			const oldValue = <U>(key in this ? this[key] : defaultValue);
-			const changed: boolean = equalityComparer ? !equalityComparer(oldValue, value) : oldValue !== value;
-
-			if (wrapped || changed) {
-				if (affectsLayout) {
-					this.requestLayout();
-				}
-
-				if (reset) {
-					delete this[key];
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
-					if (this[setNative]) {
-						if (this._suspendNativeUpdatesCount) {
-							if (this._suspendedUpdates) {
-								this._suspendedUpdates[propertyName] = property;
-							}
-						} else if (defaultValueKey in this) {
-							this[setNative](this[defaultValueKey]);
-							delete this[defaultValueKey];
-						} else {
-							this[setNative](defaultValue);
-						}
-					}
-				} else {
-					this[key] = value;
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
-					if (this[setNative]) {
-						if (this._suspendNativeUpdatesCount) {
-							if (this._suspendedUpdates) {
-								this._suspendedUpdates[propertyName] = property;
-							}
-						} else {
-							if (!(defaultValueKey in this)) {
-								this[defaultValueKey] = this[getDefault] ? this[getDefault]() : defaultValue;
-							}
-							this[setNative](value);
-						}
-					}
-				}
-
-				if (this.hasListeners(eventName)) {
-					this.notify<PropertyChangeData>({
-						object: this,
-						eventName,
-						propertyName,
-						value,
-						oldValue,
-					});
-				}
-
-				if (this.domNode) {
-					if (reset) {
-						this.domNode.attributeRemoved(propertyName);
-					} else {
-						this.domNode.attributeModified(propertyName, value);
-					}
-				}
+			if (owner.nativeViewProtected && !(defaultValueKey in owner)) {
+				owner[defaultValueKey] = owner[getDefault] ? owner[getDefault]() : actualDefaultValue;
 			}
-		};
-
-		this.get = function (this: T): U {
-			return <U>(key in this ? this[key] : defaultValue);
-		};
-
-		this.nativeValueChange = function (owner: T, value: U): void {
-			const oldValue = <U>(key in owner ? owner[key] : defaultValue);
-			const changed = equalityComparer ? !equalityComparer(oldValue, value) : oldValue !== value;
-			if (changed) {
-				owner[key] = value;
-				if (valueChanged) {
-					valueChanged(owner, oldValue, value);
-				}
 
-				if (owner.nativeViewProtected && !(defaultValueKey in owner)) {
-					owner[defaultValueKey] = owner[getDefault] ? owner[getDefault]() : defaultValue;
-				}
-
-				if (owner.hasListeners(eventName)) {
-					owner.notify<PropertyChangeData>({
-						object: owner,
-						eventName,
-						propertyName,
-						value,
-						oldValue,
-					});
-				}
-
-				if (affectsLayout) {
-					owner.requestLayout();
-				}
+			if (owner.hasListeners(eventName)) {
+				owner.notify<PropertyChangeData>({
+					object: owner,
+					eventName,
+					propertyName,
+					value,
+					oldValue,
+				});
+			}
 
-				if (owner.domNode) {
-					owner.domNode.attributeModified(propertyName, value);
-				}
+			if (this.affectsLayout) {
+				owner.requestLayout();
 			}
-		};
 
-		symbolPropertyMap[key] = this;
+			if (owner.domNode) {
+				owner.domNode.attributeModified(propertyName, value);
+			}
+		}
 	}
-
 	public register(cls: { prototype: T }): void {
 		if (this.registered) {
 			throw new Error(`Property ${this.name} already registered.`);
 		}
 		this.registered = true;
+		// we store the property in the class static variable
+		// so that animations can get access to us
+		if (!cls['registeredProps']) {
+			cls['registeredProps'] = {};
+		}
+		cls['registeredProps'][this.name] = this;
 		Object.defineProperty(cls.prototype, this.name, this);
 	}
 
@@ -352,137 +408,19 @@ export class Property<T extends ViewBase, U> implements TypedPropertyDescriptor<
 Property.prototype.isStyleProperty = false;
 
 export class CoercibleProperty<T extends ViewBase, U> extends Property<T, U> implements CoercibleProperty<T, U> {
-	public readonly coerce: (target: T) => void;
+	coerceKey?: symbol;
+	coerceValue?: (t: T, u: U) => U;
 
 	constructor(options: CoerciblePropertyOptions<T, U>) {
 		super(options);
+		this.coerceKey = Symbol(this.name + ':coerceKey');
+	}
 
-		const propertyName = options.name;
-		const key = this.key;
-		const getDefault: symbol = this.getDefault;
-		const setNative: symbol = this.setNative;
-		const defaultValueKey = this.defaultValueKey;
-		const defaultValue: U = this.defaultValue;
-
-		const coerceKey = Symbol(propertyName + ':coerceKey');
-
-		const eventName = propertyName + 'Change';
-		let affectsLayout: boolean = options.affectsLayout;
-		let equalityComparer = options.equalityComparer;
-		let valueChanged = options.valueChanged;
-		let valueConverter = options.valueConverter;
-		let coerceCallback = options.coerceValue;
-
-		const property = this;
-
-		this.overrideHandlers = function (options: CoerciblePropertyOptions<T, U>) {
-			if (typeof options.equalityComparer !== 'undefined') {
-				equalityComparer = options.equalityComparer;
-			}
-			if (typeof options.affectsLayout !== 'undefined') {
-				affectsLayout = options.affectsLayout;
-			}
-			if (typeof options.valueChanged !== 'undefined') {
-				valueChanged = options.valueChanged;
-			}
-			if (typeof options.valueConverter !== 'undefined') {
-				valueConverter = options.valueConverter;
-			}
-			if (typeof options.coerceValue !== 'undefined') {
-				coerceCallback = options.coerceValue;
-			}
-		};
-
-		this.coerce = function (target: T): void {
-			const originalValue = <U>(coerceKey in target ? target[coerceKey] : defaultValue);
-			// need that to make coercing but also fire change events
-			target[propertyName] = originalValue;
-		};
-
-		this.set = function (this: T, boxedValue: U): void {
-			const reset = isResetValue(boxedValue);
-			let value: U;
-			let wrapped: boolean;
-			if (reset) {
-				value = defaultValue;
-				delete this[coerceKey];
-			} else {
-				wrapped = boxedValue && (<any>boxedValue).wrapped;
-				value = wrapped ? WrappedValue.unwrap(boxedValue) : boxedValue;
-
-				if (valueConverter && typeof value === 'string') {
-					value = valueConverter(value);
-				}
-
-				this[coerceKey] = value;
-				value = coerceCallback(this, value);
-			}
-
-			const oldValue = key in this ? this[key] : defaultValue;
-			const changed: boolean = equalityComparer ? !equalityComparer(oldValue, value) : oldValue !== value;
-
-			if (wrapped || changed) {
-				if (reset) {
-					delete this[key];
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
-
-					if (this[setNative]) {
-						if (this._suspendNativeUpdatesCount) {
-							if (this._suspendedUpdates) {
-								this._suspendedUpdates[propertyName] = property;
-							}
-						} else if (defaultValueKey in this) {
-							this[setNative](this[defaultValueKey]);
-							delete this[defaultValueKey];
-						} else {
-							this[setNative](defaultValue);
-						}
-					}
-				} else {
-					this[key] = value;
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
-
-					if (this[setNative]) {
-						if (this._suspendNativeUpdatesCount) {
-							if (this._suspendedUpdates) {
-								this._suspendedUpdates[propertyName] = property;
-							}
-						} else {
-							if (!(defaultValueKey in this)) {
-								this[defaultValueKey] = this[getDefault] ? this[getDefault]() : defaultValue;
-							}
-							this[setNative](value);
-						}
-					}
-				}
-
-				if (this.hasListeners(eventName)) {
-					this.notify<PropertyChangeData>({
-						object: this,
-						eventName,
-						propertyName,
-						value,
-						oldValue,
-					});
-				}
-
-				if (affectsLayout) {
-					this.requestLayout();
-				}
-
-				if (this.domNode) {
-					if (reset) {
-						this.domNode.attributeRemoved(propertyName);
-					} else {
-						this.domNode.attributeModified(propertyName, value);
-					}
-				}
-			}
-		};
+	coerce(target: T): void {
+		const actualDefaultValue = isFunction(this.defaultValue) ? this.defaultValue(this, target) : this.defaultValue;
+		const originalValue = <U>(this.coerceKey in target ? target[this.coerceKey] : actualDefaultValue);
+		// need that to make coercing but also fire change events
+		target[this.name] = originalValue;
 	}
 }
 
@@ -492,14 +430,13 @@ export class InheritedProperty<T extends ViewBase, U> extends Property<T, U> imp
 
 	constructor(options: PropertyOptions<T, U>) {
 		super(options);
-		const name = options.name;
 		const key = this.key;
-		const defaultValue = options.defaultValue;
 
-		const sourceKey = Symbol(name + ':valueSourceKey');
+		const sourceKey = Symbol(this.name + ':valueSourceKey');
 		this.sourceKey = sourceKey;
 
 		const setBase = this.set;
+		const property = this;
 		const setFunc = (valueSource: ValueSource) =>
 			function (value: U): void {
 				const that = <T>this;
@@ -512,10 +449,11 @@ export class InheritedProperty<T extends ViewBase, U> extends Property<T, U> imp
 
 					// If value is not initial or unset and view has a parent that has non-default value, use it as the reset value.
 					if (value !== 'initial' && parent && parent[sourceKey] !== ValueSource.Default) {
-						unboxedValue = parent[name];
+						unboxedValue = parent[property.name];
 						newValueSource = ValueSource.Inherited;
 					} else {
-						unboxedValue = defaultValue;
+						const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(property, that) : property.defaultValue;
+						unboxedValue = actualDefaultValue;
 						newValueSource = ValueSource.Default;
 					}
 				} else {
@@ -559,257 +497,171 @@ export class InheritedProperty<T extends ViewBase, U> extends Property<T, U> imp
 	}
 }
 
-export class CssProperty<T extends Style, U> {
-	private registered: boolean;
-
-	public readonly name: string;
-	public readonly cssName: string;
-	public readonly cssLocalName: string;
-
-	protected readonly cssValueDescriptor: PropertyDescriptor;
-	protected readonly localValueDescriptor: PropertyDescriptor;
-
-	public isStyleProperty: boolean;
-
-	public readonly key: symbol;
-	public readonly getDefault: symbol;
-	public readonly setNative: symbol;
-	public readonly sourceKey: symbol;
-	public readonly defaultValueKey: symbol;
-	public readonly defaultValue: U;
-
-	public overrideHandlers: (options: CssPropertyOptions<T, U>) => void;
-
-	constructor(options: CssPropertyOptions<T, U>) {
-		const propertyName = options.name;
-		this.name = propertyName;
+function setCssFunc<T extends Style, U>(property: CssProperty<T, U>, valueSource: ValueSource) {
+	return function (this: T, newValue: any): void {
+		const view = this.viewRef.get();
+		if (!view) {
+			Trace.write(`${newValue} not set to view because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
 
-		// Guard against undefined cssName
-		if (options.cssName) {
-			cssPropertyNames.push(options.cssName);
+			return;
 		}
+		const sourceKey = property.sourceKey;
+		if (valueSource === ValueSource.Css) {
+			const currentValueSource: number = this[sourceKey] || ValueSource.Default;
 
-		this.cssName = `css:${options.cssName}`;
-		this.cssLocalName = options.cssName;
-
-		const key = Symbol(propertyName + ':propertyKey');
-		this.key = key;
-
-		const sourceKey = Symbol(propertyName + ':valueSourceKey');
-		this.sourceKey = sourceKey;
-
-		const getDefault = Symbol(propertyName + ':getDefault');
-		this.getDefault = getDefault;
-
-		const setNative = Symbol(propertyName + ':setNative');
-		this.setNative = setNative;
-
-		const defaultValueKey = Symbol(propertyName + ':nativeDefaultValue');
-		this.defaultValueKey = defaultValueKey;
-
-		const defaultValue: U = options.defaultValue;
-		this.defaultValue = defaultValue;
-
-		const eventName = propertyName + 'Change';
-		let affectsLayout: boolean = options.affectsLayout;
-		let equalityComparer = options.equalityComparer;
-		let valueChanged = options.valueChanged;
-		let valueConverter = options.valueConverter;
-
-		this.overrideHandlers = function (options: CssPropertyOptions<T, U>) {
-			if (typeof options.equalityComparer !== 'undefined') {
-				equalityComparer = options.equalityComparer;
-			}
-			if (typeof options.affectsLayout !== 'undefined') {
-				affectsLayout = options.affectsLayout;
-			}
-			if (typeof options.valueChanged !== 'undefined') {
-				valueChanged = options.valueChanged;
-			}
-			if (typeof options.valueConverter !== 'undefined') {
-				valueConverter = options.valueConverter;
-			}
-		};
-
-		const property = this;
-
-		function setLocalValue(this: T, newValue: U | string): void {
-			const view = this.viewRef.get();
-			if (!view) {
-				Trace.write(`${newValue} not set to view because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
-
+			// We have localValueSource - NOOP.
+			if (currentValueSource === ValueSource.Local) {
 				return;
 			}
+		}
+		const defaultValue = property.defaultValue;
+		const actualDefaultValue = isFunction(defaultValue) ? defaultValue(property, view) : defaultValue;
+		const key = property.key;
+		const reset = isResetValue(newValue) || newValue === '';
+		let value: U;
+		if (reset) {
+			value = actualDefaultValue;
+			delete this[sourceKey];
+		} else {
+			this[sourceKey] = valueSource;
+			value = property.valueConverter && typeof newValue === 'string' ? property.valueConverter(newValue) : <U>newValue;
+		}
 
-			const reset = isResetValue(newValue) || newValue === '';
-			let value: U;
-
+		const oldValue = <U>(key in this ? this[key] : actualDefaultValue);
+		const changed: boolean = property.equalityComparer ? !property.equalityComparer(oldValue, value, this) : oldValue !== value;
+		if (changed) {
+			const setNative = property.setNative;
+			const defaultValueKey = property.defaultValueKey;
+			const propertyName = property.name;
+			const valueChanged = property.valueChanged;
+			const eventName = property.eventName;
 			if (reset) {
-				value = defaultValue;
-				delete this[sourceKey];
-			} else {
-				this[sourceKey] = ValueSource.Local;
-				value = valueConverter && typeof newValue === 'string' ? valueConverter(newValue) : <U>newValue;
-			}
-
-			const oldValue = <U>(key in this ? this[key] : defaultValue);
-			const changed: boolean = equalityComparer ? !equalityComparer(oldValue, value) : oldValue !== value;
-
-			if (changed) {
-				if (reset) {
-					delete this[key];
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
+				delete this[key];
+				if (valueChanged) {
+					valueChanged(this, oldValue, value);
+				}
 
-					if (view[setNative]) {
-						if (view._suspendNativeUpdatesCount) {
-							if (view._suspendedUpdates) {
-								view._suspendedUpdates[propertyName] = property;
-							}
-						} else if (defaultValueKey in this) {
+				if (view[setNative]) {
+					if (view._suspendNativeUpdatesCount) {
+						view._suspendedUpdates?.set(propertyName, property);
+					} else {
+						if (defaultValueKey in this) {
 							view[setNative](this[defaultValueKey]);
-							delete this[defaultValueKey];
 						} else {
-							view[setNative](defaultValue);
+							view[setNative](actualDefaultValue);
 						}
 					}
-				} else {
-					this[key] = value;
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
+				}
+			} else {
+				this[key] = value;
+				if (valueChanged) {
+					valueChanged(this, oldValue, value);
+				}
 
-					if (view[setNative]) {
-						if (view._suspendNativeUpdatesCount) {
-							if (view._suspendedUpdates) {
-								view._suspendedUpdates[propertyName] = property;
-							}
-						} else {
-							if (!(defaultValueKey in this)) {
-								this[defaultValueKey] = view[getDefault] ? view[getDefault]() : defaultValue;
-							}
-							view[setNative](value);
+				if (view[setNative]) {
+					if (view._suspendNativeUpdatesCount) {
+						view._suspendedUpdates?.set(propertyName, property);
+					} else {
+						if (!(defaultValueKey in this)) {
+							const getDefault = property.getDefault;
+							this[defaultValueKey] = view[getDefault] ? view[getDefault]() : actualDefaultValue;
 						}
+						view[setNative](value);
 					}
 				}
+			}
 
-				if (this.hasListeners(eventName)) {
-					this.notify<PropertyChangeData>({
-						object: this,
-						eventName,
-						propertyName,
-						value,
-						oldValue,
-					});
-				}
+			if ((!__UI_USE_EXTERNAL_RENDERER__ || !view._suspendNativeUpdatesCount) && this.hasListeners(eventName)) {
+				this.notify<PropertyChangeData>({
+					object: this,
+					eventName,
+					propertyName,
+					value,
+					oldValue,
+				});
+			}
 
-				if (affectsLayout) {
-					view.requestLayout();
-				}
+			if (property.affectsLayout) {
+				view.requestLayout();
 			}
 		}
+	};
+}
 
-		function setCssValue(this: T, newValue: U | string): void {
-			const view = this.viewRef.get();
-			if (!view) {
-				Trace.write(`${newValue} not set to view because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
+export class CssProperty<T extends Style, U> implements CssProperty<T, U> {
+	public static properties: {
+		[cssName: string]: CssProperty<any, any>;
+	} = {};
+	private registered: boolean;
 
-				return;
-			}
+	public readonly name: string;
+	public readonly cssName: string;
+	public readonly cssLocalName: string;
+	public readonly eventName: string;
 
-			const currentValueSource: number = this[sourceKey] || ValueSource.Default;
+	protected readonly cssValueDescriptor: PropertyDescriptor;
+	protected readonly localValueDescriptor: PropertyDescriptor;
 
-			// We have localValueSource - NOOP.
-			if (currentValueSource === ValueSource.Local) {
-				return;
-			}
+	public isStyleProperty: boolean;
 
-			const reset = isResetValue(newValue) || newValue === '';
-			let value: U;
+	public readonly key: symbol;
+	public readonly getDefault: symbol;
+	public readonly setNative: symbol;
+	public readonly sourceKey: symbol;
+	public readonly defaultValueKey: symbol;
+	public readonly defaultValue: U | ((property: CssProperty<T, U>, view: ViewBase) => U);
 
-			if (reset) {
-				value = defaultValue;
-				delete this[sourceKey];
-			} else {
-				value = valueConverter && typeof newValue === 'string' ? valueConverter(newValue) : <U>newValue;
-				this[sourceKey] = ValueSource.Css;
-			}
+	public affectsLayout?: boolean;
+	public equalityComparer?: (x: U, y: U, target: T) => boolean;
+	public valueChanged?: (target: T, oldValue: U, newValue: U) => void;
+	public valueConverter?: (value: string) => U;
 
-			const oldValue = <U>(key in this ? this[key] : defaultValue);
-			const changed: boolean = equalityComparer ? !equalityComparer(oldValue, value) : oldValue !== value;
+	public overrideHandlers: (options: CssPropertyOptions<T, U>) => void;
 
-			if (changed) {
-				if (reset) {
-					delete this[key];
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
+	constructor(options: CssPropertyOptions<T, U>) {
+		this.overrideHandlers = overrideHandlers(this);
+		this.overrideHandlers(options);
+		const propertyName = this.name;
 
-					if (view[setNative]) {
-						if (view._suspendNativeUpdatesCount) {
-							if (view._suspendedUpdates) {
-								view._suspendedUpdates[propertyName] = property;
-							}
-						} else if (defaultValueKey in this) {
-							view[setNative](this[defaultValueKey]);
-							delete this[defaultValueKey];
-						} else {
-							view[setNative](defaultValue);
-						}
-					}
-				} else {
-					this[key] = value;
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
+		CssProperty.properties[propertyName] = this;
+		if (this.cssLocalName && this.cssLocalName !== propertyName) {
+			CssProperty.properties[this.cssLocalName] = this;
+		}
 
-					if (view[setNative]) {
-						if (view._suspendNativeUpdatesCount) {
-							if (view._suspendedUpdates) {
-								view._suspendedUpdates[propertyName] = property;
-							}
-						} else {
-							if (!(defaultValueKey in this)) {
-								this[defaultValueKey] = view[getDefault] ? view[getDefault]() : defaultValue;
-							}
-							view[setNative](value);
-						}
-					}
-				}
+		const key = Symbol(propertyName + ':propertyKey');
+		this.key = key;
 
-				if (this.hasListeners(eventName)) {
-					this.notify<PropertyChangeData>({
-						object: this,
-						eventName,
-						propertyName,
-						value,
-						oldValue,
-					});
-				}
+		this.sourceKey = Symbol(propertyName + ':valueSourceKey');
 
-				if (affectsLayout) {
-					view.requestLayout();
-				}
-			}
-		}
+		this.getDefault = Symbol(propertyName + ':getDefault');
 
+		this.setNative = Symbol(propertyName + ':setNative');
+
+		this.defaultValueKey = Symbol(propertyName + ':nativeDefaultValue');
+
+		this.eventName = propertyName + 'Change';
+
+		const property = this;
 		function get(): U {
-			return key in this ? this[key] : defaultValue;
+			if (key in this) {
+				return <U>this[key];
+			}
+			const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(property, this.viewRef.get()) : property.defaultValue;
+			return <U>actualDefaultValue;
 		}
 
 		this.cssValueDescriptor = {
 			enumerable: true,
 			configurable: true,
 			get: get,
-			set: setCssValue,
+			set: setCssFunc(this, ValueSource.Css),
 		};
 
 		this.localValueDescriptor = {
 			enumerable: true,
 			configurable: true,
 			get: get,
-			set: setLocalValue,
+			set: setCssFunc(this, ValueSource.Local),
 		};
 
 		cssSymbolPropertyMap[key] = this;
@@ -819,6 +671,9 @@ export class CssProperty<T extends Style, U> {
 		if (this.registered) {
 			throw new Error(`Property ${this.name} already registered.`);
 		}
+		// we add it so that overrideHandlers might work
+		cssPropertyNames.push(this.cssLocalName);
+
 		this.registered = true;
 		Object.defineProperty(cls.prototype, this.name, this.localValueDescriptor);
 		Object.defineProperty(cls.prototype, this.cssName, this.cssValueDescriptor);
@@ -837,6 +692,7 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 	public readonly name: string;
 	public readonly cssName: string;
 	public readonly cssLocalName: string;
+	public readonly eventName: string;
 
 	public readonly getDefault: symbol;
 	public readonly setNative: symbol;
@@ -848,36 +704,31 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 	public readonly key: symbol;
 	private readonly source: symbol;
 
-	public readonly defaultValue: U;
+	public readonly defaultValue: U | ((property: CssAnimationProperty<T, U>, view: ViewBase) => U);
 
 	public isStyleProperty: boolean;
 
-	private static properties: {
+	public static properties: {
 		[cssName: string]: CssAnimationProperty<any, any>;
 	} = {};
 
-	public _valueConverter?: (value: string) => any;
+	readonly affectsLayout?: boolean;
+	readonly equalityComparer?: (x: U, y: U) => boolean;
+	readonly valueChanged?: (target: T, oldValue: U, newValue: U) => void;
+	readonly valueConverter?: (value: string) => U;
+	public overrideHandlers: (options: CssAnimationPropertyOptions<T, U>) => void;
 
 	constructor(options: CssAnimationPropertyOptions<T, U>) {
-		const propertyName = options.name;
-		this.name = propertyName;
+		this.overrideHandlers = overrideHandlers(this);
+		this.overrideHandlers(options);
 
-		if (options.cssName) {
-			cssPropertyNames.push(options.cssName);
-		}
+		const propertyName = this.name;
 
 		CssAnimationProperty.properties[propertyName] = this;
-		if (options.cssName && options.cssName !== propertyName) {
-			CssAnimationProperty.properties[options.cssName] = this;
+		if (this.cssLocalName && this.cssLocalName !== propertyName) {
+			CssAnimationProperty.properties[this.cssLocalName] = this;
 		}
 
-		this._valueConverter = options.valueConverter;
-
-		const cssLocalName = options.cssName || propertyName;
-		this.cssLocalName = cssLocalName;
-		const cssName = 'css:' + cssLocalName;
-		this.cssName = cssName;
-
 		const keyframeName = 'keyframe:' + propertyName;
 		this.keyframe = keyframeName;
 		const defaultName = 'default:' + propertyName;
@@ -885,9 +736,7 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 		const defaultValueKey = Symbol(defaultName);
 		this.defaultValueKey = defaultValueKey;
 
-		this.defaultValue = options.defaultValue;
-
-		const cssValue = Symbol(cssName);
+		const cssValue = Symbol(this.cssName);
 		const styleValue = Symbol(`local:${propertyName}`);
 		const keyframeValue = Symbol(keyframeName);
 		const computedValue = Symbol('computed-value:' + propertyName);
@@ -898,7 +747,7 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 		this.getDefault = Symbol(propertyName + ':getDefault');
 		const getDefault = this.getDefault;
 		const setNative = (this.setNative = Symbol(propertyName + ':setNative'));
-		const eventName = propertyName + 'Change';
+		this.eventName = propertyName + 'Change';
 
 		const property = this;
 
@@ -921,7 +770,12 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 						return;
 					}
 
-					const oldValue = this[computedValue];
+					let oldValue = this[computedValue];
+					// this[computedValue] is set at prototype level to property.defaultValue
+					// so we need to check if property.defaultValue is a function
+					if (property.defaultValue === oldValue && typeof oldValue === 'function') {
+						oldValue = oldValue(property, view);
+					}
 					const oldSource = this[computedSource];
 					const wasSet = oldSource !== ValueSource.Default;
 					const reset = isResetValue(boxedValue) || boxedValue === '';
@@ -942,8 +796,8 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 							}
 						}
 					} else {
-						if (options.valueConverter && typeof boxedValue === 'string') {
-							boxedValue = options.valueConverter(boxedValue);
+						if (property.valueConverter && typeof boxedValue === 'string') {
+							boxedValue = property.valueConverter(boxedValue);
 						}
 						this[symbol] = boxedValue;
 						if (this[computedSource] <= propertySource) {
@@ -956,34 +810,34 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 					const source = this[computedSource];
 					const isSet = source !== ValueSource.Default;
 
-					const computedValueChanged = oldValue !== value && (!options.equalityComparer || !options.equalityComparer(oldValue, value));
+					const computedValueChanged = oldValue !== value && (!property.equalityComparer || !property.equalityComparer(oldValue, value));
 
-					if (computedValueChanged && options.valueChanged) {
-						options.valueChanged(this, oldValue, value);
+					if (computedValueChanged && property.valueChanged) {
+						property.valueChanged(this, oldValue, value);
 					}
 
 					if (view[setNative] && (computedValueChanged || isSet !== wasSet)) {
 						if (view._suspendNativeUpdatesCount) {
-							if (view._suspendedUpdates) {
-								view._suspendedUpdates[propertyName] = property;
-							}
+							view._suspendedUpdates?.set(propertyName, property);
 						} else {
 							if (isSet) {
 								if (!wasSet && !(defaultValueKey in this)) {
-									this[defaultValueKey] = view[getDefault] ? view[getDefault]() : options.defaultValue;
+									const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(property, this.viewRef.get()) : property.defaultValue;
+									this[defaultValueKey] = view[getDefault] ? view[getDefault]() : actualDefaultValue;
 								}
 								view[setNative](value);
 							} else if (wasSet) {
 								if (defaultValueKey in this) {
 									view[setNative](this[defaultValueKey]);
 								} else {
-									view[setNative](options.defaultValue);
+									const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(property, this.viewRef.get()) : property.defaultValue;
+									view[setNative](actualDefaultValue);
 								}
 							}
 						}
 					}
-
-					if (computedValueChanged && this.hasListeners(eventName)) {
+					const eventName = property.eventName;
+					if (computedValueChanged && (!__UI_USE_EXTERNAL_RENDERER__ || !view._suspendNativeUpdatesCount) && this.hasListeners(eventName)) {
 						this.notify<PropertyChangeData>({
 							object: this,
 							eventName,
@@ -992,6 +846,9 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 							oldValue,
 						});
 					}
+					if (property.affectsLayout) {
+						view.requestLayout();
+					}
 				},
 			};
 		}
@@ -1005,7 +862,10 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 		cssSymbolPropertyMap[computedValue] = this;
 
 		this.register = (cls: { prototype: T }) => {
-			cls.prototype[computedValue] = options.defaultValue;
+			// we add it so that overrideHandlers might work
+			cssPropertyNames.push(this.cssLocalName);
+
+			cls.prototype[computedValue] = this.defaultValue;
 			cls.prototype[computedSource] = ValueSource.Default;
 
 			cls.prototype[cssValue] = unsetValue;
@@ -1013,10 +873,10 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 			cls.prototype[keyframeValue] = unsetValue;
 
 			Object.defineProperty(cls.prototype, defaultName, defaultPropertyDescriptor);
-			Object.defineProperty(cls.prototype, cssName, cssPropertyDescriptor);
+			Object.defineProperty(cls.prototype, this.cssName, cssPropertyDescriptor);
 			Object.defineProperty(cls.prototype, propertyName, stylePropertyDescriptor);
-			if (options.cssName && options.cssName !== options.name) {
-				Object.defineProperty(cls.prototype, options.cssName, stylePropertyDescriptor);
+			if (this.cssLocalName && this.cssLocalName !== this.name) {
+				Object.defineProperty(cls.prototype, this.cssLocalName, stylePropertyDescriptor);
 			}
 			Object.defineProperty(cls.prototype, keyframeName, keyframePropertyDescriptor);
 		};
@@ -1034,7 +894,8 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 
 		if (!(defaultValueKey in target)) {
 			const getDefault = this.getDefault;
-			target[defaultValueKey] = view[getDefault] ? view[getDefault]() : this.defaultValue;
+			const actualDefaultValue = isFunction(this.defaultValue) ? this.defaultValue(this, view) : this.defaultValue;
+			target[defaultValueKey] = view[getDefault] ? view[getDefault]() : actualDefaultValue;
 		}
 	}
 
@@ -1052,164 +913,163 @@ export class CssAnimationProperty<T extends Style, U> implements CssAnimationPro
 }
 CssAnimationProperty.prototype.isStyleProperty = true;
 
-export class InheritedCssProperty<T extends Style, U> extends CssProperty<T, U> implements InheritedCssProperty<T, U> {
-	public setInheritedValue: (value: U) => void;
-
-	constructor(options: CssPropertyOptions<T, U>) {
-		super(options);
-		const propertyName = options.name;
-
-		const key = this.key;
-		const sourceKey = this.sourceKey;
-		const getDefault = this.getDefault;
-		const setNative = this.setNative;
-		const defaultValueKey = this.defaultValueKey;
-		const eventName = propertyName + 'Change';
-		const defaultValue: U = options.defaultValue;
-
-		let affectsLayout: boolean = options.affectsLayout;
-		let equalityComparer = options.equalityComparer;
-		let valueChanged = options.valueChanged;
-		let valueConverter = options.valueConverter;
-
-		const property = this;
+function setCssInheritedFunc<T extends Style, U>(property: InheritedCssProperty<T, U>, valueSource: ValueSource) {
+	return function (this: T, boxedValue: any): void {
+		const view = this.viewRef.get();
+		if (!view) {
+			Trace.write(`${boxedValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
 
-		this.overrideHandlers = function (options: CssPropertyOptions<T, U>) {
-			if (typeof options.equalityComparer !== 'undefined') {
-				equalityComparer = options.equalityComparer;
+			return;
+		}
+		const key = property.key;
+		const defaultValue = property.defaultValue;
+		const actualDefaultValue = isFunction(defaultValue) ? defaultValue(property, view) : defaultValue;
+		const sourceKey = property.sourceKey;
+		const propertyName = property.name;
+
+		const reset = isResetValue(boxedValue) || boxedValue === '';
+		const currentValueSource: number = this[sourceKey] || ValueSource.Default;
+		if (reset) {
+			// If we want to reset cssValue and we have localValue - return;
+			if (valueSource === ValueSource.Css && currentValueSource === ValueSource.Local) {
+				return;
 			}
-			if (typeof options.affectsLayout !== 'undefined') {
-				affectsLayout = options.affectsLayout;
+		} else {
+			if (currentValueSource > valueSource) {
+				return;
 			}
-			if (typeof options.valueChanged !== 'undefined') {
-				valueChanged = options.valueChanged;
+		}
+
+		const oldValue = <U>(key in this ? this[key] : actualDefaultValue);
+		let value: U;
+		let unsetNativeValue = false;
+		if (reset) {
+			const parentStyle = view.parent ? view.parent.style : null;
+
+			// If value is not initial or unset and view has a parent that has non-default value, use it as the reset value.
+			if (boxedValue !== 'initial' && parentStyle && parentStyle[sourceKey] > ValueSource.Default) {
+				value = parentStyle[propertyName];
+				this[sourceKey] = ValueSource.Inherited;
+				this[key] = value;
+			} else {
+				value = actualDefaultValue;
+				delete this[sourceKey];
+				delete this[key];
+				unsetNativeValue = true;
 			}
-			if (typeof options.valueConverter !== 'undefined') {
-				valueConverter = options.valueConverter;
+		} else {
+			this[sourceKey] = valueSource;
+			if (property.valueConverter && typeof boxedValue === 'string') {
+				value = property.valueConverter(boxedValue);
+			} else {
+				value = boxedValue;
 			}
-		};
+			this[key] = value;
+		}
 
-		const setFunc = (valueSource: ValueSource) =>
-			function (this: T, boxedValue: any): void {
-				const view = this.viewRef.get();
-				if (!view) {
-					Trace.write(`${boxedValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
-					return;
-				}
+		const changed: boolean = property.equalityComparer ? !property.equalityComparer(oldValue, value, this) : oldValue !== value;
 
-				const reset = isResetValue(boxedValue) || boxedValue === '';
-				const currentValueSource: number = this[sourceKey] || ValueSource.Default;
+		if (changed) {
+			const setNative = property.setNative;
+			const defaultValueKey = property.defaultValueKey;
+			const eventName = property.eventName;
+			const getDefault = property.getDefault;
+			if (property.valueChanged) {
+				property.valueChanged(this, oldValue, value);
+			}
 
-				if (reset) {
-					// If we want to reset cssValue and we have localValue - return;
-					if (valueSource === ValueSource.Css && currentValueSource === ValueSource.Local) {
-						return;
-					}
+			if (view[setNative]) {
+				if (view._suspendNativeUpdatesCount) {
+					view._suspendedUpdates?.set(propertyName, property);
 				} else {
-					if (currentValueSource > valueSource) {
-						return;
+					if (unsetNativeValue) {
+						if (defaultValueKey in this) {
+							view[setNative](this[defaultValueKey]);
+						} else {
+							view[setNative](actualDefaultValue);
+						}
+					} else {
+						if (!(defaultValueKey in this)) {
+							this[defaultValueKey] = view[getDefault] ? view[getDefault]() : actualDefaultValue;
+						}
+
+						view[setNative](value);
 					}
 				}
+			}
 
-				const oldValue: U = key in this ? this[key] : defaultValue;
-				let value: U;
-				let unsetNativeValue = false;
+			if ((!__UI_USE_EXTERNAL_RENDERER__ || !view._suspendNativeUpdatesCount) && this.hasListeners(eventName)) {
+				this.notify<PropertyChangeData>({
+					object: this,
+					eventName,
+					propertyName,
+					value,
+					oldValue,
+				});
+			}
 
-				if (reset) {
-					const parentStyle = view.parent ? view.parent.style : null;
+			if (property.affectsLayout) {
+				view.requestLayout();
+			}
 
-					// If value is not initial or unset and view has a parent that has non-default value, use it as the reset value.
-					if (boxedValue !== 'initial' && parentStyle && parentStyle[sourceKey] > ValueSource.Default) {
-						value = parentStyle[propertyName];
-						this[sourceKey] = ValueSource.Inherited;
-						this[key] = value;
-					} else {
-						value = defaultValue;
-						delete this[sourceKey];
-						delete this[key];
-						unsetNativeValue = true;
+			view.eachChild((child) => {
+				const childStyle = child.style;
+				const childValueSource = childStyle[sourceKey] || ValueSource.Default;
+				if (reset) {
+					if (childValueSource === ValueSource.Inherited) {
+						property.setDefaultValue.call(childStyle, unsetValue);
 					}
 				} else {
-					this[sourceKey] = valueSource;
-					if (valueConverter && typeof boxedValue === 'string') {
-						value = valueConverter(boxedValue);
-					} else {
-						value = boxedValue;
+					if (childValueSource <= ValueSource.Inherited) {
+						property.setInheritedValue.call(childStyle, value);
 					}
-					this[key] = value;
 				}
 
-				const changed: boolean = equalityComparer ? !equalityComparer(oldValue, value) : oldValue !== value;
-
-				if (changed) {
-					if (valueChanged) {
-						valueChanged(this, oldValue, value);
-					}
-
-					if (view[setNative]) {
-						if (view._suspendNativeUpdatesCount) {
-							if (view._suspendedUpdates) {
-								view._suspendedUpdates[propertyName] = property;
-							}
-						} else if (unsetNativeValue) {
-							if (defaultValueKey in this) {
-								view[setNative](this[defaultValueKey]);
-								delete this[defaultValueKey];
-							} else {
-								view[setNative](defaultValue);
-							}
-						} else {
-							if (!(defaultValueKey in this)) {
-								this[defaultValueKey] = view[getDefault] ? view[getDefault]() : defaultValue;
-							}
+				return true;
+			});
+		}
+	};
+}
 
-							view[setNative](value);
-						}
-					}
+export class InheritedCssProperty<T extends Style, U> extends CssProperty<T, U> implements InheritedCssProperty<T, U> {
+	public setInheritedValue: (value: U) => void;
+	public setDefaultValue: (value: U) => void;
+	public static properties: {
+		[cssName: string]: InheritedCssProperty<any, any>;
+	} = {};
+	constructor(options: CssPropertyOptions<T, U>) {
+		super(options);
+		const propertyName = options.name;
+		InheritedCssProperty.properties[propertyName] = this;
 
-					if (this.hasListeners(eventName)) {
-						this.notify<PropertyChangeData>({
-							object: this,
-							eventName,
-							propertyName,
-							value,
-							oldValue,
-						});
-					}
+		this.setDefaultValue = setCssInheritedFunc(this, ValueSource.Default);
+		this.setInheritedValue = setCssInheritedFunc(this, ValueSource.Inherited);
+		this.cssValueDescriptor.set = setCssInheritedFunc(this, ValueSource.Css);
+		this.localValueDescriptor.set = setCssInheritedFunc(this, ValueSource.Local);
+		inheritableCssProperties.push(this);
+	}
+}
 
-					if (affectsLayout) {
-						view.requestLayout();
-					}
+function setShorthandFunc<T extends Style, U>(property: ShorthandProperty<T, U>, valueSource: ValueSource) {
+	return function (this: T, newValue: any): void {
+		const view = this.viewRef.get();
+		if (!view) {
+			Trace.write(`setLocalValue not executed to view because ".viewRef" is cleared`, Trace.categories.Animation, Trace.messageType.warn);
 
-					view.eachChild((child) => {
-						const childStyle = child.style;
-						const childValueSource = childStyle[sourceKey] || ValueSource.Default;
-						if (reset) {
-							if (childValueSource === ValueSource.Inherited) {
-								setDefaultFunc.call(childStyle, unsetValue);
-							}
-						} else {
-							if (childValueSource <= ValueSource.Inherited) {
-								setInheritedFunc.call(childStyle, value);
-							}
-						}
+			return;
+		}
 
-						return true;
-					});
+		view._batchUpdate(() => {
+			for (const [p, v] of property.converter(newValue)) {
+				if (valueSource === ValueSource.Css) {
+					this[p.cssName] = v;
+				} else {
+					this[p.name] = v;
 				}
-			};
-
-		const setDefaultFunc = setFunc(ValueSource.Default);
-		const setInheritedFunc = setFunc(ValueSource.Inherited);
-
-		this.setInheritedValue = setInheritedFunc;
-		this.cssValueDescriptor.set = setFunc(ValueSource.Css);
-		this.localValueDescriptor.set = setFunc(ValueSource.Local);
-
-		inheritableCssProperties.push(this);
-	}
+			}
+		});
+	};
 }
-
 export class ShorthandProperty<T extends Style, P> implements ShorthandProperty<T, P> {
 	private registered: boolean;
 
@@ -1221,69 +1081,41 @@ export class ShorthandProperty<T extends Style, P> implements ShorthandProperty<
 	protected readonly cssValueDescriptor: PropertyDescriptor;
 	protected readonly localValueDescriptor: PropertyDescriptor;
 	protected readonly propertyBagDescriptor: PropertyDescriptor;
-
+	readonly converter: (value: string | P) => [CssProperty<any, any> | CssAnimationProperty<any, any>, any][];
+	public overrideHandlers: (options: ShorthandPropertyOptions<P>) => void;
 	public readonly sourceKey: symbol;
 
-	constructor(options: ShorthandPropertyOptions<P>) {
-		this.name = options.name;
+	public static properties: {
+		[cssName: string]: ShorthandProperty<any, any>;
+	} = {};
 
+	constructor(options: ShorthandPropertyOptions<P>) {
+		this.overrideHandlers = overrideHandlers(this);
+		this.overrideHandlers(options);
 		const key = Symbol(this.name + ':propertyKey');
+		ShorthandProperty.properties[this.name] = this;
 		this.key = key;
 
-		this.cssName = `css:${options.cssName}`;
-		this.cssLocalName = `${options.cssName}`;
-
-		const converter = options.converter;
-
-		function setLocalValue(this: T, value: string | P): void {
-			const view = this.viewRef.get();
-			if (!view) {
-				Trace.write(`setLocalValue not executed to view because ".viewRef" is cleared`, Trace.categories.Animation, Trace.messageType.warn);
-
-				return;
-			}
-
-			view._batchUpdate(() => {
-				for (const [p, v] of converter(value)) {
-					this[p.name] = v;
-				}
-			});
-		}
-
-		function setCssValue(this: T, value: string): void {
-			const view = this.viewRef.get();
-			if (!view) {
-				Trace.write(`setCssValue not executed to view because ".viewRef" is cleared`, Trace.categories.Animation, Trace.messageType.warn);
-
-				return;
-			}
-
-			view._batchUpdate(() => {
-				for (const [p, v] of converter(value)) {
-					this[p.cssName] = v;
-				}
-			});
-		}
-
 		this.cssValueDescriptor = {
 			enumerable: true,
 			configurable: true,
 			get: options.getter,
-			set: setCssValue,
+			set: setShorthandFunc(this, ValueSource.Css),
 		};
 
 		this.localValueDescriptor = {
 			enumerable: true,
 			configurable: true,
 			get: options.getter,
-			set: setLocalValue,
+			set: setShorthandFunc(this, ValueSource.Local),
 		};
 
+		const property = this;
 		this.propertyBagDescriptor = {
 			enumerable: false,
 			configurable: true,
 			set(value: string) {
-				converter(value).forEach(([property, value]) => {
+				property.converter(value).forEach(([property, value]) => {
 					this[property.cssLocalName] = value;
 				});
 			},
@@ -1308,14 +1140,12 @@ export class ShorthandProperty<T extends Style, P> implements ShorthandProperty<
 	}
 }
 
-export { makeValidator, makeParser } from '../../../core-types/validators';
-
-function inheritablePropertyValuesOn(view: ViewBase): Array<{ property: InheritedProperty<any, any>; value: any }> {
+function inheritablePropertyValuesOn<T extends InheritedProperty<any, any> | InheritedCssProperty<any, any>>(view: ViewBase | Style, properties: Array<T>): Array<{ property: T; value: any }> {
 	const array = new Array<{
-		property: InheritedProperty<any, any>;
+		property: T;
 		value: any;
 	}>();
-	for (const prop of inheritableProperties) {
+	for (const prop of properties) {
 		const sourceKey = prop.sourceKey;
 		const valueSource: number = view[sourceKey] || ValueSource.Default;
 		if (valueSource !== ValueSource.Default) {
@@ -1328,51 +1158,48 @@ function inheritablePropertyValuesOn(view: ViewBase): Array<{ property: Inherite
 	return array;
 }
 
-function inheritableCssPropertyValuesOn(style: Style): Array<{ property: InheritedCssProperty<any, any>; value: any }> {
-	const array = new Array<{
-		property: InheritedCssProperty<any, any>;
-		value: any;
-	}>();
-	for (const prop of inheritableCssProperties) {
-		const sourceKey = prop.sourceKey;
-		const valueSource: number = style[sourceKey] || ValueSource.Default;
-		if (valueSource !== ValueSource.Default) {
-			// use prop.name as it will return value or default value.
-			// prop.key will return undefined if property is set the same value as default one.
-			array.push({ property: prop, value: style[prop.name] });
-		}
-	}
-
-	return array;
-}
-
 type PropertyInterface = Property<ViewBase, any> | CssProperty<Style, any> | CssAnimationProperty<Style, any>;
 
 export const initNativeView = profile('"properties".initNativeView', function initNativeView(view: ViewBase): void {
+	if (view._suspendNativeUpdatesCount) {
+		return;
+	}
+	const wasSuspended = view.suspendRequestLayout;
+	view.suspendRequestLayout = true;
+
 	if (view._suspendedUpdates) {
 		applyPendingNativeSetters(view);
+		view._suspendedUpdates.clear();
 	} else {
+		// this case can happen for example after a _teardownUI / _setupUI.
+		// in this case style props are already set to the right values
+		// so they wont trigger a change => _suspendedUpdates
+		// so we need to iterate over them all (slow but not that slow)
 		applyAllNativeSetters(view);
 	}
-	// Would it be faster to delete all members of the old object?
-	view._suspendedUpdates = {};
+
+	// if the view requestLayout was not suspended before
+	// it means we can request a layout if needed.
+	// will be done after otherwise
+	view.suspendRequestLayout = wasSuspended;
+	if (!wasSuspended) {
+		view.requestlayoutIfNeeded();
+	}
 });
 
 export function applyPendingNativeSetters(view: ViewBase): void {
 	// TODO: Check what happens if a view was suspended and its value was reset, or set back to default!
-	const suspendedUpdates = view._suspendedUpdates;
-	for (const propertyName in suspendedUpdates) {
-		if (!HAS_OWN.call(suspendedUpdates, propertyName)) continue;
-		const property = <PropertyInterface>suspendedUpdates[propertyName];
+	view._suspendedUpdates.forEach((property, propertyName) => {
 		const setNative = property.setNative;
 		if (view[setNative]) {
 			const { getDefault, isStyleProperty, defaultValueKey, defaultValue } = property;
+			const actualDefaultValue = isFunction(defaultValue) ? defaultValue(property, view) : defaultValue;
 			let value;
 			if (isStyleProperty) {
 				const style = view.style;
 				if ((<CssProperty<Style, any> | CssAnimationProperty<Style, any>>property).isSet(view.style)) {
 					if (!(defaultValueKey in style)) {
-						style[defaultValueKey] = view[getDefault] ? view[getDefault]() : defaultValue;
+						style[defaultValueKey] = view[getDefault] ? view[getDefault]() : actualDefaultValue;
 					}
 					value = view.style[propertyName];
 				} else {
@@ -1381,7 +1208,7 @@ export function applyPendingNativeSetters(view: ViewBase): void {
 			} else {
 				if ((<Property<ViewBase, any>>property).isSet(view)) {
 					if (!(defaultValueKey in view)) {
-						view[defaultValueKey] = view[getDefault] ? view[getDefault]() : defaultValue;
+						view[defaultValueKey] = view[getDefault] ? view[getDefault]() : actualDefaultValue;
 					}
 					value = view[propertyName];
 				} else {
@@ -1391,7 +1218,7 @@ export function applyPendingNativeSetters(view: ViewBase): void {
 			// TODO: Only if value is different from the value before the scope was created.
 			view[setNative](value);
 		}
-	}
+	});
 }
 
 export function applyAllNativeSetters(view: ViewBase): void {
@@ -1407,7 +1234,8 @@ export function applyAllNativeSetters(view: ViewBase): void {
 		if (setNative in view) {
 			const defaultValueKey = property.defaultValueKey;
 			if (!(defaultValueKey in view)) {
-				view[defaultValueKey] = view[getDefault] ? view[getDefault]() : property.defaultValue;
+				const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(view) : property.defaultValue;
+				view[defaultValueKey] = view[getDefault] ? view[getDefault]() : actualDefaultValue;
 			}
 
 			const value = view[symbol];
@@ -1426,7 +1254,8 @@ export function applyAllNativeSetters(view: ViewBase): void {
 		if (view[property.setNative]) {
 			const defaultValueKey = property.defaultValueKey;
 			if (!(defaultValueKey in style)) {
-				style[defaultValueKey] = view[property.getDefault] ? view[property.getDefault]() : property.defaultValue;
+				const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(view) : property.defaultValue;
+				style[defaultValueKey] = view[property.getDefault] ? view[property.getDefault]() : actualDefaultValue;
 			}
 
 			const value = style[symbol];
@@ -1446,9 +1275,9 @@ export function resetNativeView(view: ViewBase): void {
 		if (view[property.setNative]) {
 			if (property.defaultValueKey in view) {
 				view[property.setNative](view[property.defaultValueKey]);
-				delete view[property.defaultValueKey];
 			} else {
-				view[property.setNative](property.defaultValue);
+				const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(property, view) : property.defaultValue;
+				view[property.setNative](actualDefaultValue);
 			}
 		}
 	}
@@ -1465,9 +1294,9 @@ export function resetNativeView(view: ViewBase): void {
 		if (view[property.setNative]) {
 			if (property.defaultValueKey in style) {
 				view[property.setNative](style[property.defaultValueKey]);
-				delete style[property.defaultValueKey];
 			} else {
-				view[property.setNative](property.defaultValue);
+				const actualDefaultValue = isFunction(property.defaultValue) ? property.defaultValue(property, view) : property.defaultValue;
+				view[property.setNative](actualDefaultValue);
 			}
 		}
 	}
@@ -1503,8 +1332,14 @@ export function resetCSSProperties(style: Style): void {
 	}
 }
 
-export function propagateInheritableProperties(view: ViewBase, child: ViewBase): void {
-	const inheritablePropertyValues = inheritablePropertyValuesOn(view);
+export function propagateInheritableCssProperties(style: Style, child: Style) {
+	return _propagateInheritableProperties(style, child, inheritableCssProperties);
+}
+export function propagateInheritableProperties(view: ViewBase, child: ViewBase) {
+	return _propagateInheritableProperties(view, child, inheritableProperties);
+}
+function _propagateInheritableProperties<U extends ViewBase | Style, T extends InheritedProperty<any, any> | InheritedCssProperty<any, any>>(view: U, child: U, properties: Array<T>): void {
+	const inheritablePropertyValues = inheritablePropertyValuesOn(view, properties);
 	for (const pair of inheritablePropertyValues) {
 		const prop = pair.property;
 		const sourceKey = prop.sourceKey;
@@ -1515,18 +1350,6 @@ export function propagateInheritableProperties(view: ViewBase, child: ViewBase):
 	}
 }
 
-export function propagateInheritableCssProperties(parentStyle: Style, childStyle: Style): void {
-	const inheritableCssPropertyValues = inheritableCssPropertyValuesOn(parentStyle);
-	for (const pair of inheritableCssPropertyValues) {
-		const prop = pair.property;
-		const sourceKey = prop.sourceKey;
-		const currentValueSource: number = childStyle[sourceKey] || ValueSource.Default;
-		if (currentValueSource <= ValueSource.Inherited) {
-			prop.setInheritedValue.call(childStyle, pair.value, ValueSource.Inherited);
-		}
-	}
-}
-
 export function getSetProperties(view: ViewBase): [string, any][] {
 	const result = [];
 
diff --git a/packages/core/ui/core/properties/property-shared.ts b/packages/core/ui/core/properties/property-shared.ts
index 4618c78e59..060f722a99 100644
--- a/packages/core/ui/core/properties/property-shared.ts
+++ b/packages/core/ui/core/properties/property-shared.ts
@@ -1,5 +1,8 @@
 // Shared property types, interfaces, and value helpers for properties and view-base modules.
 // Only put platform-agnostic logic here.
+import type { CssAnimationProperty, CssProperty } from '.';
+import type { Style } from '../../styling/style';
+import type { ViewBase } from '../view-base';
 
 /**
  * Value specifying that Property should be set to its initial value.
@@ -8,9 +11,9 @@ export const unsetValue: any = new Object();
 
 export interface PropertyOptions<T, U> {
 	readonly name: string;
-	readonly defaultValue?: U;
+	readonly defaultValue?: U | ((property, view: ViewBase) => U);
 	readonly affectsLayout?: boolean;
-	readonly equalityComparer?: (x: U, y: U) => boolean;
+	readonly equalityComparer?: (x: U, y: U, target: T) => boolean;
 	readonly valueChanged?: (target: T, oldValue: U, newValue: U) => void;
 	readonly valueConverter?: (value: string) => U;
 }
@@ -19,32 +22,22 @@ export interface CoerciblePropertyOptions<T, U> extends PropertyOptions<T, U> {
 	readonly coerceValue: (t: T, u: U) => U;
 }
 
-export interface CssPropertyOptions<T, U> extends PropertyOptions<T, U> {
+export interface CssPropertyOptions<T extends Style, U> extends PropertyOptions<T, U> {
 	readonly cssName: string;
 }
-// TODO: revisit this after circular dependency issues are resolved to see if types can be retained.
-// export interface CssPropertyOptions<T extends Style, U> extends PropertyOptions<T, U> {
-// 	readonly cssName: string;
-// }
 
 export interface ShorthandPropertyOptions<P> {
 	readonly name: string;
 	readonly cssName: string;
-	readonly converter: (value: string | P) => [any, any][];
-	readonly getter: (this: any) => string | P;
+	readonly converter: (value: string | P) => [CssProperty<any, any> | CssAnimationProperty<any, any>, any][];
+	readonly getter: (this: Style) => string | P;
 }
-// TODO: revisit this after circular dependency issues are resolved to see if types can be retained.
-// export interface ShorthandPropertyOptions<P> {
-// 	readonly name: string;
-// 	readonly cssName: string;
-// 	readonly converter: (value: string | P) => [CssProperty<any, any> | CssAnimationProperty<any, any>, any][];
-// 	readonly getter: (this: Style) => string | P;
-// }
 
 export interface CssAnimationPropertyOptions<T, U> {
 	readonly name: string;
 	readonly cssName?: string;
 	readonly defaultValue?: U;
+	readonly affectsLayout?: boolean;
 	readonly equalityComparer?: (x: U, y: U) => boolean;
 	readonly valueChanged?: (target: T, oldValue: U, newValue: U) => void;
 	readonly valueConverter?: (value: string) => U;
diff --git a/packages/core/ui/core/view-base/index.d.ts b/packages/core/ui/core/view-base/index.d.ts
new file mode 100644
index 0000000000..4f89b3a873
--- /dev/null
+++ b/packages/core/ui/core/view-base/index.d.ts
@@ -0,0 +1,549 @@
+import { Property, CssProperty, CssAnimationProperty, InheritedProperty } from '../properties';
+import { BindingOptions } from '../bindable';
+import { Observable } from '../../../data/observable';
+import { Style } from '../../styling/style';
+import { CoreTypes } from '../../../core-types';
+import { Page } from '../../page';
+
+import { Order, FlexGrow, FlexShrink, FlexWrapBefore, AlignSelf } from '../../layouts/flexbox-layout';
+import { Length } from '../../styling/style-properties';
+import { DOMNode } from '../../../debugger/dom-node';
+
+/**
+ * Iterates through all child views (via visual tree) and executes a function.
+ * @param view - Starting view (parent container).
+ * @param callback - A function to execute on every child. If function returns false it breaks the iteration.
+ */
+export function eachDescendant(view: ViewBase, callback: (child: ViewBase) => boolean);
+
+/**
+ * Gets an ancestor from a given type.
+ * @param view - Starting view (child view).
+ * @param criterion - The type of ancestor view we are looking for. Could be a string containing a class name or an actual type.
+ * Returns an instance of a view (if found), otherwise undefined.
+ */
+export function getAncestor(view: ViewBase, criterion: string | Function): ViewBase;
+
+export function isEventOrGesture(name: string, view: ViewBase): boolean;
+
+/**
+ * Gets a child view by id.
+ * @param view - The parent (container) view of the view to look for.
+ * @param id - The id of the view to look for.
+ * Returns an instance of a view (if found), otherwise undefined.
+ */
+export function getViewById(view: ViewBase, id: string): ViewBase;
+
+/**
+ * Gets a child view by domId.
+ * @param view - The parent (container) view of the view to look for.
+ * @param domId - The id of the view to look for.
+ * Returns an instance of a view (if found), otherwise undefined.
+ */
+export function getViewByDomId(view: ViewBase, domId: number): ViewBase;
+
+export interface ShowModalOptions {
+	/**
+	 * Any context you want to pass to the modally shown view. This same context will be available in the arguments of the shownModally event handler.
+	 */
+	context: any;
+
+	/**
+	 * A function that will be called when the view is closed. Any arguments provided when calling ShownModallyData.closeCallback will be available here.
+	 */
+	closeCallback: Function;
+
+	/**
+	 * An optional parameter specifying whether to show the modal view in full-screen mode.
+	 */
+	fullscreen?: boolean;
+
+	/**
+	 * An optional parameter specifying whether to show the modal view with animation.
+	 */
+	animated?: boolean;
+
+	/**
+	 * An optional parameter specifying whether to stretch the modal view when not in full-screen mode.
+	 */
+	stretched?: boolean;
+
+	/**
+	 * An optional parameter that specify options specific to iOS as an object.
+	 */
+	ios?: {
+		/**
+		 * The UIModalPresentationStyle to be used when showing the dialog in iOS .
+		 */
+		presentationStyle?: any /* UIModalPresentationStyle */;
+		/**
+		 * width of the popup dialog
+		 */
+		width?: number;
+		/**
+		 * height of the popup dialog
+		 */
+		height?: number;
+	};
+	android?: {
+		/**
+		 * @deprecated Use ShowModalOptions.cancelable instead.
+		 * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode.
+		 */
+		cancelable?: boolean;
+		/**
+		 * An optional parameter specifying the windowSoftInputMode of the dialog window
+		 * For possible values see https://developer.android.com/reference/android/view/WindowManager.LayoutParams#softInputMode
+		 */
+		windowSoftInputMode?: number;
+		/**
+		 * An optional parameter specifying the style of the dialog window
+		 */
+		style?: number;
+	};
+	/**
+	 * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode.
+	 */
+	cancelable?: boolean;
+}
+
+export abstract class ViewBase extends Observable {
+	// Dynamic properties.
+	left: CoreTypes.LengthType;
+	top: CoreTypes.LengthType;
+	effectiveLeft: number;
+	effectiveTop: number;
+	dock: 'left' | 'top' | 'right' | 'bottom';
+	row: number;
+	col: number;
+	/**
+	 * Setting `column` property is the same as `col`
+	 */
+	column: number;
+	rowSpan: number;
+	colSpan: number;
+	/**
+	 * Setting `columnSpan` property is the same as `colSpan`
+	 */
+	columnSpan: number;
+	domNode: DOMNode;
+
+	order: Order;
+	flexGrow: FlexGrow;
+	flexShrink: FlexShrink;
+	flexWrapBefore: FlexWrapBefore;
+	alignSelf: AlignSelf;
+
+	/**
+	 * @private
+	 * Module name when the view is a module root. Otherwise, it is undefined.
+	 */
+	_moduleName?: string;
+
+	//@private
+	/**
+	 * @private
+	 */
+	_oldLeft: number;
+	/**
+	 * @private
+	 */
+	_oldTop: number;
+	/**
+	 * @private
+	 */
+	_oldRight: number;
+	/**
+	 * @private
+	 */
+	_oldBottom: number;
+	/**
+	 * @private
+	 */
+	_defaultPaddingTop: number;
+	/**
+	 * @private
+	 */
+	_defaultPaddingRight: number;
+	/**
+	 * @private
+	 */
+	_defaultPaddingBottom: number;
+	/**
+	 * @private
+	 */
+	_defaultPaddingLeft: number;
+
+	/**
+	 * A property bag holding suspended native updates.
+	 * Native setters that had to execute while there was no native view,
+	 * or the view was detached from the visual tree etc. will accumulate in this object,
+	 * and will be applied when all prerequisites are met.
+	 * @private
+	 */
+	_suspendedUpdates: {
+		[propertyName: string]: Property<any, any> | CssProperty<Style, any> | CssAnimationProperty<Style, any>;
+	};
+	//@endprivate
+
+	/**
+	 * Shows the View contained in moduleName as a modal view.
+	 * @param moduleName - The name of the module to load starting from the application root.
+	 * @param modalOptions - A ShowModalOptions instance
+	 */
+	showModal(moduleName: string, modalOptions?: ShowModalOptions): ViewBase;
+
+	/**
+	 * Shows the view passed as parameter as a modal view.
+	 * @param view - View instance to be shown modally.
+	 * @param modalOptions - A ShowModalOptions instance
+	 */
+	showModal(view: ViewBase, modalOptions?: ShowModalOptions): ViewBase;
+
+	/**
+	 * Closes the current modal view that this page is showing.
+	 * @param context - Any context you want to pass back to the host when closing the modal view.
+	 */
+	closeModal(context?: any): void;
+
+	public effectiveMinWidth: number;
+	public effectiveMinHeight: number;
+	public effectiveWidth: number;
+	public effectiveHeight: number;
+	public effectiveMarginTop: number;
+	public effectiveMarginRight: number;
+	public effectiveMarginBottom: number;
+	public effectiveMarginLeft: number;
+	public effectivePaddingTop: number;
+	public effectivePaddingRight: number;
+	public effectivePaddingBottom: number;
+	public effectivePaddingLeft: number;
+	public effectiveBorderTopWidth: number;
+	public effectiveBorderRightWidth: number;
+	public effectiveBorderBottomWidth: number;
+	public effectiveBorderLeftWidth: number;
+
+	/**
+	 * String value used when hooking to loaded event.
+	 */
+	public static loadedEvent: string;
+
+	/**
+	 * String value used when hooking to unloaded event.
+	 */
+	public static unloadedEvent: string;
+
+	/**
+	 * String value used when hooking to creation event
+	 */
+	public static createdEvent: string;
+
+	/**
+	 * String value used when hooking to disposeNativeView event
+	 */
+	public static disposeNativeViewEvent: string;
+
+	public ios: any;
+	public android: any;
+
+	/**
+	 * returns the native UIViewController.
+	 */
+	public viewController: any;
+
+	/**
+	 * read-only. If you want to set out-of-band the nativeView use the setNativeView method.
+	 */
+	public nativeViewProtected: any;
+	public nativeView: any;
+	public bindingContext: any;
+
+	/**
+	 * Gets or sets if the view is reusable.
+	 * Reusable views are not automatically destroyed when removed from the View tree.
+	 */
+	public reusable: boolean;
+
+	/**
+	 * Gets the name of the constructor function for this instance. E.g. for a Button class this will return "Button".
+	 */
+	public typeName: string;
+
+	/**
+	 * Gets the parent view. This property is read-only.
+	 */
+	public readonly parent: ViewBase;
+
+	/**
+	 * Gets the template parent or the native parent. Sets the template parent.
+	 */
+	public parentNode: ViewBase;
+
+	/**
+	 * Gets or sets the id for this view.
+	 */
+	public id: string;
+
+	/**
+	 * Gets or sets the CSS class name for this view.
+	 */
+	public className: string;
+
+	/**
+	 * Gets or sets the CSS class name for this view (get/set to className).
+	 */
+	public class: string;
+
+	/**
+	 * Gets owner page. This is a read-only property.
+	 */
+	public readonly page: Page;
+
+	/**
+	 * Gets the style object associated to this view.
+	 */
+	public readonly style: Style;
+
+	/**
+	 * Returns true if visibility is set to 'collapse'.
+	 * Readonly property
+	 */
+	public isCollapsed: boolean;
+	public readonly isLoaded: boolean;
+
+	/**
+	 * Returns the child view with the specified id.
+	 */
+	public getViewById<T extends ViewBase>(id: string): T;
+
+	/**
+	 * Returns the child view with the specified domId.
+	 */
+	public getViewByDomId<T extends ViewBase>(id: number): T;
+
+	/**
+	 * Load view.
+	 * @param view to load.
+	 */
+	public loadView(view: ViewBase): void;
+
+	/**
+	 * Unload view.
+	 * @param view to unload.
+	 */
+	public unloadView(view: ViewBase): void;
+
+	public onLoaded(): void;
+	public onUnloaded(): void;
+	public onResumeNativeUpdates(): void;
+
+	public bind(options: BindingOptions, source?: Object): void;
+	public unbind(property: string): void;
+
+	/**
+	 * Invalidates the layout of the view and triggers a new layout pass.
+	 */
+	public requestLayout(): void;
+
+	/**
+	 * Iterates over children of type ViewBase.
+	 * @param callback Called for each child of type ViewBase. Iteration stops if this method returns falsy value.
+	 */
+	public eachChild(callback: (child: ViewBase) => boolean): void;
+
+	public _addView(view: ViewBase, atIndex?: number): void;
+	/**
+	 * Method is intended to be overridden by inheritors and used as "protected"
+	 */
+	public _addViewCore(view: ViewBase, atIndex?: number): void;
+
+	public _removeView(view: ViewBase): void;
+	/**
+	 * Method is intended to be overridden by inheritors and used as "protected"
+	 */
+	public _removeViewCore(view: ViewBase): void;
+	public _parentChanged(oldParent: ViewBase): void;
+	/**
+	 * Method is intended to be overridden by inheritors and used as "protected"
+	 */
+	public _dialogClosed(): void;
+	/**
+	 * Method is intended to be overridden by inheritors and used as "protected"
+	 */
+	public _onRootViewReset(): void;
+
+	_domId: number;
+
+	_cssState: any /* "ui/styling/style-scope" */;
+	/**
+	 * @private
+	 * Notifies each child's css state for change, recursively.
+	 * Either the style scope, className or id properties were changed.
+	 */
+	_onCssStateChange(): void;
+
+	public cssClasses: Set<string>;
+	public cssPseudoClasses: Set<string>;
+
+	public _goToVisualState(state: string): void;
+
+	public setInlineStyle(style: string): void;
+
+	_context: any /* android.content.Context */;
+
+	/**
+	 * Setups the UI for ViewBase and all its children recursively.
+	 * This method should *not* be overridden by derived views.
+	 */
+	_setupUI(context: any /* android.content.Context */, atIndex?: number): void;
+
+	/**
+	 * Tears down the UI for ViewBase and all its children recursively.
+	 * This method should *not* be overridden by derived views.
+	 */
+	_tearDownUI(force?: boolean): void;
+
+	/**
+	 * Tears down the UI of a reusable node by making it no longer reusable.
+	 * @see _tearDownUI
+	 * @param forceDestroyChildren Force destroy the children (even if they are reusable)
+	 */
+	destroyNode(forceDestroyChildren?: boolean): void;
+
+	/**
+	 * Creates a native view.
+	 * Returns either android.view.View or UIView.
+	 */
+	createNativeView(): Object;
+
+	/**
+	 * Initializes properties/listeners of the native view.
+	 */
+	initNativeView(): void;
+
+	/**
+	 * Clean up references to the native view.
+	 */
+	disposeNativeView(): void;
+
+	/**
+	 * Set the nativeView field performing extra checks and updates to the native properties on the new view.
+	 * Use in cases where the createNativeView is not suitable.
+	 * As an example use in item controls where the native parent view will create the native views for child items.
+	 */
+	setNativeView(view: any): void;
+
+	_isAddedToNativeVisualTree: boolean;
+
+	/**
+	 * Performs the core logic of adding a child view to the native visual tree. Returns true if the view's native representation has been successfully added, false otherwise.
+	 */
+	_addViewToNativeVisualTree(view: ViewBase, atIndex?: number): boolean;
+	_removeViewFromNativeVisualTree(view: ViewBase): void;
+	_removeFromNativeVisualTree(): void;
+	_childIndexToNativeChildIndex(index?: number): number;
+
+	/**
+	 * @protected
+	 * @unstable
+	 * A widget can call this method to add a matching css pseudo class.
+	 */
+	public addPseudoClass(name: string): void;
+
+	/**
+	 * @protected
+	 * @unstable
+	 * A widget can call this method to discard matching css pseudo class.
+	 */
+	public deletePseudoClass(name: string): void;
+
+	/**
+	 * @unstable
+	 * Ensures a dom-node for this view.
+	 */
+	public ensureDomNode();
+
+	public recycleNativeView: 'always' | 'never' | 'auto';
+
+	/**
+	 * @private
+	 */
+	public _isPaddingRelative: boolean;
+
+	/**
+	 * @private
+	 */
+	public _ignoreFlexMinWidthHeightReset: boolean;
+
+	public _styleScope: any;
+
+	/**
+	 * @private
+	 */
+	public _automaticallyAdjustsScrollViewInsets: boolean;
+	/**
+	 * @private
+	 */
+	_isStyleScopeHost: boolean;
+
+	/**
+	 * @private
+	 */
+	public _layoutParent(): void;
+
+	/**
+	 * Determines the depth of suspended updates.
+	 * When the value is 0 the current property updates are not batched nor scoped and must be immediately applied.
+	 * If the value is 1 or greater, the current updates are batched and does not have to provide immediate update.
+	 * Do not set this field, the _batchUpdate method is responsible to keep the count up to date,
+	 * as well as adding/rmoving the view to/from the visual tree.
+	 */
+	public _suspendNativeUpdatesCount: number;
+
+	/**
+	 * Allow multiple updates to be performed on the instance at once.
+	 */
+	public _batchUpdate<T>(callback: () => T): T;
+	/**
+	 * @private
+	 */
+	_setupAsRootView(context: any): void;
+
+	/**
+	 * When returning true the callLoaded method will be run in setTimeout
+	 * Method is intended to be overridden by inheritors and used as "protected"
+	 */
+	_shouldDelayLayout(): boolean;
+
+	/**
+	 * @private
+	 */
+	_inheritStyleScope(styleScope: any /* StyleScope */): void;
+
+	/**
+	 * @private
+	 */
+	callLoaded(): void;
+
+	/**
+	 * @private
+	 */
+	callUnloaded(): void;
+	//@endprivate
+}
+
+export class Binding {
+	constructor(target: ViewBase, options: BindingOptions);
+	public bind(source: Object): void;
+	public unbind();
+}
+
+export const idProperty: Property<any, string>;
+export const classNameProperty: Property<any, string>;
+export const bindingContextProperty: InheritedProperty<any, any>;
+
+/**
+ * Converts string into boolean value.
+ * Throws error if value is not 'true' or 'false'.
+ */
+export function booleanConverter(v: string): boolean;
diff --git a/packages/core/ui/core/view-base/index.ts b/packages/core/ui/core/view-base/index.ts
index e4b2cd051e..d2a992301f 100644
--- a/packages/core/ui/core/view-base/index.ts
+++ b/packages/core/ui/core/view-base/index.ts
@@ -96,6 +96,17 @@ export interface ShowModalOptions {
 		 * For possible values see https://developer.android.com/reference/android/view/WindowManager.LayoutParams#softInputMode
 		 */
 		windowSoftInputMode?: number;
+
+		/**
+		 * An optional parameter specifying the style of the dialog window.
+		 */
+		style?: number;
+
+		/**
+		 * An optional parameter to force show the modal from background. If used then you dont get android state save mechanism
+		 * if not used then the modal showing is delayed until the app is in foreground again
+		 */
+		showImmediatelyFromBackground?: boolean;
 	};
 	/**
 	 * An optional parameter specifying whether the modal view can be dismissed when not in full-screen mode.
@@ -337,7 +348,7 @@ export abstract class ViewBase extends Observable {
 	private _iosView: Object;
 	private _androidView: Object;
 	private _style: Style;
-	private _isLoaded: boolean;
+	private _isLoaded: boolean = false;
 
 	/**
 	 * @deprecated
@@ -346,6 +357,9 @@ export abstract class ViewBase extends Observable {
 
 	private _templateParent: ViewBase;
 	private __nativeView: any;
+
+	private _needsCssChange = false;
+
 	// private _disableNativeViewRecycling: boolean;
 
 	public domNode: DOMNode;
@@ -386,6 +400,7 @@ export abstract class ViewBase extends Observable {
 	 * @nsProperty
 	 */
 	public className: string;
+	public disableCss: boolean;
 
 	/**
 	 * Gets or sets the visual state of the view.
@@ -422,11 +437,11 @@ export abstract class ViewBase extends Observable {
 	 * Native setters that had to execute while there was no native view,
 	 * or the view was detached from the visual tree etc. will accumulate in this object,
 	 * and will be applied when all prerequisites are met.
+	 * Initializing ensure we never call `applyAllNativeSetters` and always use _suspendedUpdates
 	 * @private
 	 */
-	public _suspendedUpdates: {
-		[propertyName: string]: Property<ViewBase, any> | CssProperty<Style, any> | CssAnimationProperty<Style, any>;
-	};
+	public _suspendedUpdates: Map<string, Property<ViewBase, any> | CssProperty<Style, any> | CssAnimationProperty<Style, any>> = new Map();
+
 	//@endprivate
 	/**
 	 * Determines the depth of suspended updates.
@@ -684,18 +699,29 @@ export abstract class ViewBase extends Observable {
 		if (this._isLoaded) {
 			return;
 		}
-
+		// the view is going to be layed out after
+		// no need for requestLayout which can be pretty slow because
+		// called a lot and going all up the chain to the page
+		this.suspendRequestLayout = true;
 		this._isLoaded = true;
-		this._cssState.onLoaded();
-		this._resumeNativeUpdates(SuspendType.Loaded);
+		if (this._needsCssChange) {
+			this._onCssStateChange();
+		} else if (!this.disableCss) {
+			this._cssState.onLoaded();
+		}
 
 		this.eachChild((child) => {
 			this.loadView(child);
-
 			return true;
 		});
+		this._resumeNativeUpdates(SuspendType.Loaded);
 
-		this._emit('loaded');
+		this.suspendRequestLayout = false;
+
+		if (!this.parent?.mSuspendRequestLayout && this.isLayoutRequestNeeded) {
+			this.requestLayout();
+		}
+		this._emit(ViewBase.loadedEvent);
 	}
 
 	@profile
@@ -714,7 +740,9 @@ export abstract class ViewBase extends Observable {
 		});
 
 		this._isLoaded = false;
-		this._cssState.onUnloaded();
+		if (!this.disableCss) {
+			this._cssState.onUnloaded();
+		}
 		this._emit('unloaded');
 	}
 
@@ -724,23 +752,39 @@ export abstract class ViewBase extends Observable {
 		}
 	}
 
-	public _suspendNativeUpdates(type: SuspendType): void {
+	public _suspendNativeUpdates(type: SuspendType, recursive = false, shouldSuspendRequestLayout = false): void {
+		if (shouldSuspendRequestLayout) {
+			this.suspendRequestLayout = true;
+		}
 		if (type) {
 			this._suspendNativeUpdatesCount = this._suspendNativeUpdatesCount | type;
 		} else {
 			this._suspendNativeUpdatesCount++;
 		}
+		if (recursive) {
+			this.eachChild((child) => {
+				child._suspendNativeUpdates(type, recursive, shouldSuspendRequestLayout);
+				return true;
+			});
+		}
 	}
-	public _resumeNativeUpdates(type: SuspendType): void {
+	public _resumeNativeUpdates(type: SuspendType, recursive = false, shouldResumeRequestLayout = false): void {
+		if (recursive) {
+			this.eachChild((child) => {
+				child._resumeNativeUpdates(type, recursive, shouldResumeRequestLayout);
+				return true;
+			});
+		}
 		if (type) {
 			this._suspendNativeUpdatesCount = this._suspendNativeUpdatesCount & ~type;
 		} else {
-			if ((this._suspendNativeUpdatesCount & SuspendType.IncrementalCountMask) === 0) {
-				throw new Error(`Invalid call to ${this}._resumeNativeUpdates`);
+			if (this._suspendNativeUpdatesCount > 0) {
+				this._suspendNativeUpdatesCount--;
 			}
-			this._suspendNativeUpdatesCount--;
 		}
-
+		if (shouldResumeRequestLayout) {
+			this.suspendRequestLayout = false;
+		}
 		if (!this._suspendNativeUpdatesCount) {
 			this.onResumeNativeUpdates();
 		}
@@ -921,6 +965,19 @@ export abstract class ViewBase extends Observable {
 		}
 	}
 
+	_requetLayoutNeeded = false;
+	get isLayoutRequestNeeded() {
+		return this._requetLayoutNeeded;
+	}
+	// we can initialize it to true for less unwanted requestLayout calls
+	mSuspendRequestLayout = true;
+	set suspendRequestLayout(value: boolean) {
+		this.mSuspendRequestLayout = value;
+	}
+	get suspendRequestLayout() {
+		return this.mSuspendRequestLayout;
+	}
+
 	/**
 	 * Invalidates the layout of the view and triggers a new layout pass.
 	 */
@@ -933,6 +990,13 @@ export abstract class ViewBase extends Observable {
 		}
 	}
 
+	requestlayoutIfNeeded() {
+		if (this._requetLayoutNeeded) {
+			this._requetLayoutNeeded = false;
+			this.requestLayout();
+		}
+	}
+
 	/**
 	 * Iterates over children of type ViewBase.
 	 * @param callback Called for each child of type ViewBase. Iteration stops if this method returns falsy value.
@@ -1128,7 +1192,7 @@ export abstract class ViewBase extends Observable {
 			// which is only possible by setting reusable = true. Adding it either way for feature flag safety
 			if (this.reusable) {
 				if (!this.mIsRootView && this.parent && !this._isAddedToNativeVisualTree) {
-					const nativeIndex = this.parent._childIndexToNativeChildIndex(atIndex);
+					const nativeIndex = atIndex !== undefined ? this.parent._childIndexToNativeChildIndex(atIndex) : atIndex;
 					this._isAddedToNativeVisualTree = this.parent._addViewToNativeVisualTree(this, nativeIndex);
 				}
 			}
@@ -1203,7 +1267,7 @@ export abstract class ViewBase extends Observable {
 		this.setNativeView(nativeView);
 
 		if (!this.mIsRootView && this.parent) {
-			const nativeIndex = this.parent._childIndexToNativeChildIndex(atIndex);
+			const nativeIndex = atIndex !== undefined ? this.parent._childIndexToNativeChildIndex(atIndex) : undefined;
 			this._isAddedToNativeVisualTree = this.parent._addViewToNativeVisualTree(this, nativeIndex);
 		}
 
@@ -1228,14 +1292,14 @@ export abstract class ViewBase extends Observable {
 
 		if (this.__nativeView) {
 			this._suspendNativeUpdates(SuspendType.NativeView);
-			// We may do a `this.resetNativeView()` here?
 		}
 
 		this.__nativeView = this.nativeViewProtected = value;
 		if (this.__nativeView) {
-			this._suspendedUpdates = undefined;
 			this.initNativeView();
 			this._resumeNativeUpdates(SuspendType.NativeView);
+		} else {
+			this._suspendedUpdates = undefined;
 		}
 	}
 
@@ -1262,8 +1326,6 @@ export abstract class ViewBase extends Observable {
 		}
 		const preserveNativeView = this.reusable && !force;
 
-		this.resetNativeViewInternal();
-
 		if (!preserveNativeView) {
 			this.eachChild((child) => {
 				child._tearDownUI(force);
@@ -1271,9 +1333,11 @@ export abstract class ViewBase extends Observable {
 				return true;
 			});
 		}
-
 		if (this.parent) {
 			this.parent._removeViewFromNativeVisualTree(this);
+		} else {
+			//ensure we still remove the view or we could create memory leaks
+			this._removeFromNativeVisualTree();
 		}
 
 		// const nativeView = this.nativeViewProtected;
@@ -1329,6 +1393,13 @@ export abstract class ViewBase extends Observable {
 		return true;
 	}
 
+	/**
+	 * Method is intended to be overridden by inheritors and used as "protected"
+	 */
+	public _removeFromNativeVisualTree(): void {
+		this._isAddedToNativeVisualTree = false;
+	}
+
 	/**
 	 * Method is intended to be overridden by inheritors and used as "protected"
 	 */
@@ -1418,7 +1489,7 @@ export abstract class ViewBase extends Observable {
 
 	public onResumeNativeUpdates(): void {
 		// Apply native setters...
-		initNativeView(this, undefined, undefined);
+		initNativeView(this);
 	}
 
 	public toString(): string {
@@ -1441,16 +1512,24 @@ export abstract class ViewBase extends Observable {
 	 * Notifies each child's css state for change, recursively.
 	 * Either the style scope, className or id properties were changed.
 	 */
-	_onCssStateChange(): void {
-		this._cssState.onChange();
-		eachDescendant(this, (child: ViewBase) => {
-			child._cssState.onChange();
-
+	_onCssStateChange(force = false): boolean {
+		if (this.disableCss) {
 			return true;
+		}
+		if (!this.isLoaded && !force) {
+			this._needsCssChange = true;
+			return false;
+		}
+		this._cssState.onChange(force);
+		eachDescendant(this, (child: ViewBase) => {
+			return child._onCssStateChange();
 		});
 	}
 
 	_inheritStyleScope(styleScope: StyleScope): void {
+		if (this.disableCss) {
+			return;
+		}
 		// If we are styleScope don't inherit parent stylescope.
 		// TODO: Consider adding parent scope and merge selectors.
 		if (this._isStyleScopeHost) {
@@ -1575,26 +1654,28 @@ hiddenProperty.register(ViewBase);
 export const classNameProperty = new Property<ViewBase, string>({
 	name: 'className',
 	valueChanged(view: ViewBase, oldValue: string, newValue: string) {
+		if (view.disableCss) {
+			return;
+		}
 		const cssClasses = view.cssClasses;
-		const rootViewsCssClasses = CSSUtils.getSystemCssClasses();
+		// const rootViewsCssClasses = CSSUtils.getSystemCssClasses();
 
-		const shouldAddModalRootViewCssClasses = cssClasses.has(CSSUtils.MODAL_ROOT_VIEW_CSS_CLASS);
-		const shouldAddRootViewCssClasses = cssClasses.has(CSSUtils.ROOT_VIEW_CSS_CLASS);
+		// const shouldAddModalRootViewCssClasses = cssClasses.has(CSSUtils.MODAL_ROOT_VIEW_CSS_CLASS);
+		// const shouldAddRootViewCssClasses = cssClasses.has(CSSUtils.ROOT_VIEW_CSS_CLASS);
 
 		cssClasses.clear();
 
-		if (shouldAddModalRootViewCssClasses) {
-			cssClasses.add(CSSUtils.MODAL_ROOT_VIEW_CSS_CLASS);
-		} else if (shouldAddRootViewCssClasses) {
-			cssClasses.add(CSSUtils.ROOT_VIEW_CSS_CLASS);
-		}
+		// if (shouldAddModalRootViewCssClasses) {
+		// 	cssClasses.add(CSSUtils.MODAL_ROOT_VIEW_CSS_CLASS);
+		// } else if (shouldAddRootViewCssClasses) {
+		// 	cssClasses.add(CSSUtils.ROOT_VIEW_CSS_CLASS);
+		// }
 
-		rootViewsCssClasses.forEach((c) => cssClasses.add(c));
+		// rootViewsCssClasses.forEach((c) => cssClasses.add(c));
 
 		if (typeof newValue === 'string' && newValue !== '') {
 			newValue.split(' ').forEach((c) => cssClasses.add(c));
 		}
-
 		view._onCssStateChange();
 	},
 });
@@ -1605,6 +1686,12 @@ export const idProperty = new Property<ViewBase, string>({
 	valueChanged: (view, oldValue, newValue) => view._onCssStateChange(),
 });
 idProperty.register(ViewBase);
+export const disableCssProperty = new InheritedProperty<ViewBase, boolean>({
+	name: 'disableCss',
+	defaultValue: false,
+	valueConverter: booleanConverter,
+});
+disableCssProperty.register(ViewBase);
 
 export const defaultVisualStateProperty = new Property<ViewBase, string>({
 	name: 'defaultVisualState',
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
index 68e835956c..f2b7c6d577 100644
--- a/packages/core/ui/core/view/index.android.ts
+++ b/packages/core/ui/core/view/index.android.ts
@@ -16,15 +16,16 @@ import { Background, BackgroundClearFlags, refreshBorderDrawable } from '../../s
 import { profile } from '../../../profiling';
 import { topmost } from '../../frame/frame-stack';
 import { Screen } from '../../../platform';
-import { AndroidActivityBackPressedEventData } from '../../../application/application-interfaces';
+import { Application } from '../../../application';
+import { AndroidActivityBackPressedEventData, AndroidDialogFragmentOnCreateViewEventData } from '../../../application/application-interfaces';
 import { isAppInBackground, updateA11yPropertiesCallback } from '../../../application/helpers-common';
-import { updateContentDescription } from '../../../application/helpers';
 import { accessibilityEnabledProperty, accessibilityHiddenProperty, accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityLiveRegionProperty, accessibilityMediaSessionProperty, accessibilityRoleProperty, accessibilityStateProperty, accessibilityValueProperty } from '../../../accessibility/accessibility-properties';
-import { AccessibilityLiveRegion, AccessibilityRole, AndroidAccessibilityEvent, AccessibilityState } from '../../../accessibility';
+import { AccessibilityLiveRegion, AccessibilityRole, AndroidAccessibilityEvent, AccessibilityState, updateContentDescription } from '../../../accessibility';
 import * as Utils from '../../../utils';
 import { SDK_VERSION } from '../../../utils/constants';
 import { BoxShadow } from '../../styling/box-shadow';
 import { NativeScriptAndroidView } from '../../utils';
+import { _getStoredClassDefaultPropertyValue } from '../properties';
 
 export * from './view-common';
 // helpers (these are okay re-exported here)
@@ -40,16 +41,22 @@ const statePressed = 16842919; // android.R.attr.state_pressed
 const stateEnabled = 16842910; // android.R.attr.state_enabled
 const styleAnimationDialog = 16973826; // android.R.style.Animation_Dialog
 
-const VERTICAL_GRAVITY_MASK = 112; // android.view.Gravity.VERTICAL_GRAVITY_MASK
-const HORIZONTAL_GRAVITY_MASK = 7; // android.view.Gravity.HORIZONTAL_GRAVITY_MASK
-const GRAVITY_LEFT = 3; // android.view.Gravity.LEFT
-const GRAVITY_RIGHT = 5; // android.view.Gravity.RIGHT
-const GRAVITY_TOP = 48; // android.view.Gravity.TOP
-const GRAVITY_BOTTOM = 80; // android.view.Gravity.BOTTOM
-const GRAVITY_CENTER_HORIZONTAL = 1; // android.view.Gravity.CENTER_HORIZONTAL
-const GRAVITY_FILL_HORIZONTAL = 7; // android.view.Gravity.FILL_HORIZONTAL
-const GRAVITY_CENTER_VERTICAL = 16; // android.view.Gravity.CENTER_VERTICAL
-const GRAVITY_FILL_VERTICAL = 112; // android.view.Gravity.FILL_VERTICAL
+export const VERTICAL_GRAVITY_MASK = 112; // android.view.Gravity.VERTICAL_GRAVITY_MASK
+export const HORIZONTAL_GRAVITY_MASK = 7; // android.view.Gravity.HORIZONTAL_GRAVITY_MASK
+export const GRAVITY_LEFT = 3; // android.view.Gravity.LEFT
+export const GRAVITY_RIGHT = 5; // android.view.Gravity.RIGHT
+export const GRAVITY_TOP = 48; // android.view.Gravity.TOP
+export const GRAVITY_BOTTOM = 80; // android.view.Gravity.BOTTOM
+export const GRAVITY_CENTER_HORIZONTAL = 1; // android.view.Gravity.CENTER_HORIZONTAL
+export const GRAVITY_FILL_HORIZONTAL = 7; // android.view.Gravity.FILL_HORIZONTAL
+export const GRAVITY_CENTER_VERTICAL = 16; // android.view.Gravity.CENTER_VERTICAL
+export const GRAVITY_FILL_VERTICAL = 112; // android.view.Gravity.FILL_VERTICAL
+
+export const VIEW_GONE = 8; //android.view.View.GONE;
+export const VIEW_VISIBLE = 0; //android.view.View.VISIBLE;
+export const VIEW_INVISIBLE = 4; //android.view.View.INVISIBLE;
+
+const ViewHelper = org.nativescript.widgets.ViewHelper;
 
 const SYSTEM_UI_FLAG_LIGHT_STATUS_BAR = 0x00002000;
 const STATUS_BAR_LIGHT_BCKG = -657931;
@@ -66,7 +73,8 @@ interface DialogOptions {
 	animated: boolean;
 	stretched: boolean;
 	cancelable: boolean;
-	windowSoftInputMode: number;
+	windowSoftInputMode?: number;
+	style?: number;
 	shownCallback: () => void;
 	dismissCallback: () => void;
 }
@@ -121,7 +129,7 @@ interface TouchListener {
 }
 
 interface DialogFragment {
-	new (): androidx.fragment.app.DialogFragment;
+	new (): androidx.fragment.app.DialogFragment & { showImmediatelyFromBackground?: boolean };
 }
 
 function initializeTouchListener(): void {
@@ -221,8 +229,10 @@ function initializeDialogFragment() {
 	@NativeClass
 	class DialogFragmentImpl extends androidx.fragment.app.DialogFragment {
 		public owner: View;
+		public showImmediatelyFromBackground: boolean;
 		private _fullscreen: boolean;
 		private _windowSoftInputMode: number;
+		private _animationStyle: number;
 		private _animated: boolean;
 		private _stretched: boolean;
 		private _cancelable: boolean;
@@ -258,6 +268,7 @@ function initializeDialogFragment() {
 			this._dismissCallback = options.dismissCallback;
 			this._shownCallback = options.shownCallback;
 			this._windowSoftInputMode = options.windowSoftInputMode;
+			this._animationStyle = options.style;
 			this.setStyle(androidx.fragment.app.DialogFragment.STYLE_NO_TITLE, 0);
 
 			let theme = this.getTheme();
@@ -282,7 +293,7 @@ function initializeDialogFragment() {
 			// set the modal window animation
 			// https://github.com/NativeScript/NativeScript/issues/5989
 			if (this._animated) {
-				dialog.getWindow().setWindowAnimations(styleAnimationDialog);
+				dialog.getWindow().setWindowAnimations(this._animationStyle ?? styleAnimationDialog);
 			}
 
 			dialog.setCanceledOnTouchOutside(this._cancelable);
@@ -294,11 +305,18 @@ function initializeDialogFragment() {
 			const owner = this.owner;
 			this.activity = new WeakRef(this.getActivity());
 			owner._setupAsRootView(this.getActivity());
+			owner.parent = Application.getRootView();
 			owner._isAddedToNativeVisualTree = true;
 
 			// we need to set the window SoftInputMode here.
 			// it wont work is set in onStart
 			const window = this.getDialog().getWindow();
+			Application.android.notify(<AndroidDialogFragmentOnCreateViewEventData>{
+				eventName: Application.android.dialogOnCreateViewEvent,
+				object: owner,
+				dialog: this.getDialog(),
+				window,
+			});
 			if (this._windowSoftInputMode !== undefined) {
 				window.setSoftInputMode(this._windowSoftInputMode);
 			} else {
@@ -314,6 +332,9 @@ function initializeDialogFragment() {
 			if (this._fullscreen) {
 				const window = this.getDialog().getWindow();
 				const length = android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+				// set the animations to use on showing and hiding the dialog
+				// window.setWindowAnimations(16973826); //android.R.style.Animation_Dialog
+				window.setWindowAnimations(this._animationStyle ?? 16973826 /* android.R.style.Animation_Dialog */);
 				window.setLayout(length, length);
 				// This removes the default backgroundDrawable so there are no margins.
 				window.setBackgroundDrawable(new android.graphics.drawable.ColorDrawable(android.graphics.Color.WHITE));
@@ -329,7 +350,7 @@ function initializeDialogFragment() {
 
 		public onDismiss(dialog: android.content.DialogInterface): void {
 			super.onDismiss(dialog);
-			const manager = this.getFragmentManager();
+			const manager = this.getParentFragmentManager();
 			const activity = this.activity?.get();
 			if (manager && !activity?.isChangingConfigurations()) {
 				removeModal(this.owner._domId);
@@ -359,6 +380,21 @@ function initializeDialogFragment() {
 
 				owner._isAddedToNativeVisualTree = false;
 				owner._tearDownUI(true);
+				owner.parent = null;
+			}
+		}
+
+		public show(manager, tag: string) {
+			try {
+				return super.show(manager, tag);
+			} catch (e) {
+				if (this.showImmediatelyFromBackground && manager instanceof androidx.fragment.app.FragmentManager) {
+					const ft = manager.beginTransaction();
+					ft.add(this, tag);
+					ft.commitAllowingStateLoss();
+				} else {
+					throw e;
+				}
 			}
 		}
 	}
@@ -497,7 +533,7 @@ export class View extends ViewCommon {
 	public static androidBackPressedEvent = androidBackPressedEvent;
 
 	public _dialogFragment: androidx.fragment.app.DialogFragment;
-	public _manager: androidx.fragment.app.FragmentManager;
+	public declare _manager: androidx.fragment.app.FragmentManager;
 	private touchListenerIsSet: boolean;
 	private touchListener: android.view.View.OnTouchListener;
 	private layoutChangeListenerIsSet: boolean;
@@ -506,7 +542,7 @@ export class View extends ViewCommon {
 	private insetListenerIsSet: boolean;
 	private needsInsetListener: boolean;
 
-	nativeViewProtected: android.view.View;
+	declare nativeViewProtected: android.view.View;
 
 	// TODO: Implement unobserve that detach the touchListener.
 	_observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
@@ -765,7 +801,8 @@ export class View extends ViewCommon {
 	}
 
 	setOnTouchListener() {
-		if (this.touchListenerIsSet || !this.nativeViewProtected || !this.hasGestureObservers()) {
+		const view = this.nativeViewProtected;
+		if (this.touchListenerIsSet || !view || !this.hasGestureObservers()) {
 			return;
 		}
 
@@ -773,12 +810,11 @@ export class View extends ViewCommon {
 		// false as we might need the ability for the event to pass through to a parent view
 		initializeTouchListener();
 		this.touchListener = this.touchListener || new TouchListener(this);
-		this.nativeViewProtected.setOnTouchListener(this.touchListener);
+		view.setOnTouchListener(this.touchListener);
 
 		this.touchListenerIsSet = true;
-
-		if (this.nativeViewProtected.setClickable) {
-			this.nativeViewProtected.setClickable(this.isUserInteractionEnabled);
+		if (view.setClickable) {
+			view.setClickable(this.isUserInteractionEnabled);
 		}
 	}
 
@@ -824,6 +860,11 @@ export class View extends ViewCommon {
 
 	@profile
 	public requestLayout(): void {
+		if (this.mSuspendRequestLayout) {
+			this._requetLayoutNeeded = true;
+			return;
+		}
+		this._requetLayoutNeeded = false;
 		super.requestLayout();
 		if (this.nativeViewProtected) {
 			this.nativeViewProtected.requestLayout();
@@ -960,7 +1001,7 @@ export class View extends ViewCommon {
 		// if the app is in background while triggering _showNativeModalView
 		// then DialogFragment.show will trigger IllegalStateException: Can not perform this action after onSaveInstanceState
 		// so if in background we create an event to call _showNativeModalView when loaded (going back in foreground)
-		if (isAppInBackground() && !parent.isLoaded) {
+		if (isAppInBackground() && !parent.isLoaded && options?.android?.showImmediatelyFromBackground !== true) {
 			const onLoaded = () => {
 				parent.off('loaded', onLoaded);
 				this._showNativeModalView(parent, options);
@@ -972,22 +1013,12 @@ export class View extends ViewCommon {
 		initializeDialogFragment();
 
 		const df = new DialogFragment();
+		df.showImmediatelyFromBackground = options?.android?.showImmediatelyFromBackground;
 		const args = new android.os.Bundle();
 		args.putInt(DOMID, this._domId);
 		df.setArguments(args);
 
-		let cancelable = true;
-		let windowSoftInputMode: number;
-
-		if (options.android) {
-			if ((<any>options).android.cancelable !== undefined) {
-				cancelable = !!(<any>options).android.cancelable;
-				console.log('ShowModalOptions.android.cancelable is deprecated. Use ShowModalOptions.cancelable instead.');
-			}
-			windowSoftInputMode = (<any>options).android.windowSoftInputMode;
-		}
-
-		cancelable = options.cancelable !== undefined ? !!options.cancelable : cancelable;
+		const cancelable = options.cancelable !== undefined ? !!options.cancelable : true;
 
 		const dialogOptions: DialogOptions = {
 			owner: this,
@@ -995,7 +1026,7 @@ export class View extends ViewCommon {
 			animated: !!options.animated,
 			stretched: !!options.stretched,
 			cancelable: cancelable,
-			windowSoftInputMode: windowSoftInputMode,
+			...(options?.android || {}),
 			shownCallback: () => this._raiseShownModallyEvent(),
 			dismissCallback: () => this.closeModal(),
 		};
@@ -1005,15 +1036,14 @@ export class View extends ViewCommon {
 		this._dialogFragment = df;
 		this._raiseShowingModallyEvent();
 
-		this._dialogFragment.show(parent._getRootFragmentManager(), this._domId.toString());
+		df.show(parent._getFragmentManager(), this._domId.toString());
 	}
 
 	protected _hideNativeModalView(parent: View, whenClosedCallback: () => void) {
-		if (this._dialogFragment) {
-			const manager = this._dialogFragment.getFragmentManager();
-			if (manager) {
-				this._dialogFragment.dismissAllowingStateLoss();
-			}
+		this._raiseClosingModallyEvent();
+		const df = this._dialogFragment;
+		if (df?.getParentFragmentManager()) {
+			df.dismissAllowingStateLoss();
 		}
 
 		this._dialogFragment = null;
@@ -1044,35 +1074,38 @@ export class View extends ViewCommon {
 	}
 
 	[hiddenProperty.getDefault](): boolean {
-		return this.nativeViewProtected.getVisibility() === android.view.View.GONE;
+		return _getStoredClassDefaultPropertyValue(hiddenProperty, this, () => this.nativeViewProtected.getVisibility() === VIEW_GONE);
 	}
 	[hiddenProperty.setNative](value: boolean) {
-		this.nativeViewProtected.setVisibility(value ? android.view.View.GONE : android.view.View.VISIBLE);
+		this.nativeViewProtected.setVisibility(value ? VIEW_GONE : VIEW_VISIBLE);
 	}
 
 	[visibilityProperty.getDefault](): CoreTypes.VisibilityType {
-		const nativeVisibility = this.nativeViewProtected.getVisibility();
-		switch (nativeVisibility) {
-			case android.view.View.VISIBLE:
-				return 'visible';
-			case android.view.View.INVISIBLE:
-				return 'hidden';
-			case android.view.View.GONE:
-				return 'collapse';
-			default:
-				throw new Error(`Unsupported android.view.View visibility: ${nativeVisibility}. Currently supported values are android.view.View.VISIBLE, android.view.View.INVISIBLE, android.view.View.GONE.`);
-		}
+		return _getStoredClassDefaultPropertyValue(visibilityProperty, this, () => {
+			const nativeVisibility = this.nativeViewProtected.getVisibility();
+			switch (nativeVisibility) {
+				case VIEW_VISIBLE:
+					return 'visible';
+				case VIEW_INVISIBLE:
+					return 'hidden';
+				case VIEW_GONE:
+					return 'collapse';
+				default:
+					throw new Error(`Unsupported android.view.View visibility: ${nativeVisibility}. Currently supported values are android.view.View.VISIBLE, android.view.View.INVISIBLE, android.view.View.GONE.`);
+			}
+		});
 	}
 	[visibilityProperty.setNative](value: CoreTypes.VisibilityType) {
 		switch (value) {
 			case 'visible':
-				this.nativeViewProtected.setVisibility(android.view.View.VISIBLE);
+				this.nativeViewProtected.setVisibility(VIEW_VISIBLE);
 				break;
 			case 'hidden':
-				this.nativeViewProtected.setVisibility(android.view.View.INVISIBLE);
+				this.nativeViewProtected.setVisibility(VIEW_INVISIBLE);
 				break;
 			case 'collapse':
-				this.nativeViewProtected.setVisibility(android.view.View.GONE);
+			case 'collapsed':
+				this.nativeViewProtected.setVisibility(VIEW_GONE);
 				break;
 			default:
 				throw new Error(`Invalid visibility value: ${value}. Valid values are: visible, hidden, collapse.`);
@@ -1080,7 +1113,7 @@ export class View extends ViewCommon {
 	}
 
 	[opacityProperty.getDefault](): number {
-		return this.nativeViewProtected.getAlpha();
+		return _getStoredClassDefaultPropertyValue(opacityProperty, this, () => this.nativeViewProtected.getAlpha());
 	}
 	[opacityProperty.setNative](value: number) {
 		this.nativeViewProtected.setAlpha(float(value));
@@ -1118,96 +1151,17 @@ export class View extends ViewCommon {
 	}
 
 	[horizontalAlignmentProperty.getDefault](): CoreTypes.HorizontalAlignmentType {
-		return <CoreTypes.HorizontalAlignmentType>org.nativescript.widgets.ViewHelper.getHorizontalAlignment(this.nativeViewProtected);
+		return _getStoredClassDefaultPropertyValue(horizontalAlignmentProperty, this, () => <CoreTypes.VerticalAlignmentType>ViewHelper.getHorizontalAlignment(this.nativeViewProtected));
 	}
 	[horizontalAlignmentProperty.setNative](value: CoreTypes.HorizontalAlignmentType) {
-		const nativeView = this.nativeViewProtected;
-		const lp: any = nativeView.getLayoutParams() || new org.nativescript.widgets.CommonLayoutParams();
-		const gravity = lp.gravity;
-		const weight = lp.weight;
-
-		// Set only if params gravity exists.
-		if (gravity != null) {
-			switch (value) {
-				case 'start':
-					lp.gravity = (this.direction === CoreTypes.LayoutDirection.rtl ? GRAVITY_RIGHT : GRAVITY_LEFT) | (gravity & VERTICAL_GRAVITY_MASK);
-					if (weight < 0) {
-						lp.weight = -2;
-					}
-					break;
-				case 'left':
-					lp.gravity = GRAVITY_LEFT | (gravity & VERTICAL_GRAVITY_MASK);
-					if (weight < 0) {
-						lp.weight = -2;
-					}
-					break;
-				case 'center':
-					lp.gravity = GRAVITY_CENTER_HORIZONTAL | (gravity & VERTICAL_GRAVITY_MASK);
-					if (weight < 0) {
-						lp.weight = -2;
-					}
-					break;
-				case 'right':
-					lp.gravity = GRAVITY_RIGHT | (gravity & VERTICAL_GRAVITY_MASK);
-					if (weight < 0) {
-						lp.weight = -2;
-					}
-					break;
-				case 'end':
-					lp.gravity = (this.direction === CoreTypes.LayoutDirection.rtl ? GRAVITY_LEFT : GRAVITY_RIGHT) | (gravity & VERTICAL_GRAVITY_MASK);
-					if (weight < 0) {
-						lp.weight = -2;
-					}
-					break;
-				case 'stretch':
-					lp.gravity = GRAVITY_FILL_HORIZONTAL | (gravity & VERTICAL_GRAVITY_MASK);
-					if (weight < 0) {
-						lp.weight = -1;
-					}
-					break;
-			}
-			nativeView.setLayoutParams(lp);
-		}
+		ViewHelper.setHorizontalAlignment(this.nativeViewProtected, value, this.direction === CoreTypes.LayoutDirection.rtl);
 	}
 
 	[verticalAlignmentProperty.getDefault](): CoreTypes.VerticalAlignmentType {
-		return <CoreTypes.VerticalAlignmentType>org.nativescript.widgets.ViewHelper.getVerticalAlignment(this.nativeViewProtected);
+		return _getStoredClassDefaultPropertyValue(verticalAlignmentProperty, this, () => <CoreTypes.VerticalAlignmentType>ViewHelper.getVerticalAlignment(this.nativeViewProtected));
 	}
 	[verticalAlignmentProperty.setNative](value: CoreTypes.VerticalAlignmentType) {
-		const nativeView = this.nativeViewProtected;
-		const lp: any = nativeView.getLayoutParams() || new org.nativescript.widgets.CommonLayoutParams();
-		const gravity = lp.gravity;
-		const height = lp.height;
-		// Set only if params gravity exists.
-		if (gravity !== undefined) {
-			switch (value) {
-				case 'top':
-					lp.gravity = GRAVITY_TOP | (gravity & HORIZONTAL_GRAVITY_MASK);
-					if (height < 0) {
-						lp.height = -2;
-					}
-					break;
-				case 'middle':
-					lp.gravity = GRAVITY_CENTER_VERTICAL | (gravity & HORIZONTAL_GRAVITY_MASK);
-					if (height < 0) {
-						lp.height = -2;
-					}
-					break;
-				case 'bottom':
-					lp.gravity = GRAVITY_BOTTOM | (gravity & HORIZONTAL_GRAVITY_MASK);
-					if (height < 0) {
-						lp.height = -2;
-					}
-					break;
-				case 'stretch':
-					lp.gravity = GRAVITY_FILL_VERTICAL | (gravity & HORIZONTAL_GRAVITY_MASK);
-					if (height < 0) {
-						lp.height = -1;
-					}
-					break;
-			}
-			nativeView.setLayoutParams(lp);
-		}
+		ViewHelper.setVerticalAlignment(this.nativeViewProtected, value);
 	}
 
 	[statusBarStyleProperty.getDefault]() {
@@ -1326,9 +1280,13 @@ export class View extends ViewCommon {
 	}
 
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
-		this.nativeViewProtected.setFocusable(!!value);
-
-		updateA11yPropertiesCallback(this);
+		// we should only call set focusable if user interaction is enabled and if not a layout
+		if (!this['addChild']) {
+			this.nativeViewProtected.setFocusable(!!value && this.isUserInteractionEnabled);
+		}
+		if (value) {
+			updateA11yPropertiesCallback(this);
+		}
 	}
 
 	[accessibilityIdentifierProperty.setNative](value: string): void {
@@ -1336,17 +1294,17 @@ export class View extends ViewCommon {
 	}
 
 	[accessibilityValueProperty.setNative](value: string): void {
-		this._androidContentDescriptionUpdated = true;
+		this._androidContentDescriptionNeedsUpdate = true;
 		updateContentDescription(this);
 	}
 
 	[accessibilityLabelProperty.setNative](value: string): void {
-		this._androidContentDescriptionUpdated = true;
+		this._androidContentDescriptionNeedsUpdate = true;
 		updateContentDescription(this);
 	}
 
 	[accessibilityHintProperty.setNative](value: string): void {
-		this._androidContentDescriptionUpdated = true;
+		this._androidContentDescriptionNeedsUpdate = true;
 		updateContentDescription(this);
 	}
 
@@ -1363,7 +1321,7 @@ export class View extends ViewCommon {
 	}
 
 	[androidElevationProperty.getDefault](): number {
-		return this.getDefaultElevation();
+		return _getStoredClassDefaultPropertyValue(androidElevationProperty, this, () => this.getDefaultElevation());
 	}
 	[androidElevationProperty.setNative](value: number) {
 		if (SDK_VERSION < 21) {
@@ -1443,42 +1401,42 @@ export class View extends ViewCommon {
 	}
 
 	[rotateProperty.setNative](value: number) {
-		org.nativescript.widgets.ViewHelper.setRotate(this.nativeViewProtected, float(value));
+		ViewHelper.setRotate(this.nativeViewProtected, float(value));
 	}
 
 	[rotateXProperty.setNative](value: number) {
-		org.nativescript.widgets.ViewHelper.setRotateX(this.nativeViewProtected, float(value));
+		ViewHelper.setRotateX(this.nativeViewProtected, float(value));
 	}
 
 	[rotateYProperty.setNative](value: number) {
-		org.nativescript.widgets.ViewHelper.setRotateY(this.nativeViewProtected, float(value));
+		ViewHelper.setRotateY(this.nativeViewProtected, float(value));
 	}
 
 	[perspectiveProperty.setNative](value: number) {
-		org.nativescript.widgets.ViewHelper.setPerspective(this.nativeViewProtected, float(value * Screen.mainScreen.scale));
+		ViewHelper.setPerspective(this.nativeViewProtected, float(value * Screen.mainScreen.scale));
 	}
 
 	[scaleXProperty.setNative](value: number) {
-		org.nativescript.widgets.ViewHelper.setScaleX(this.nativeViewProtected, float(value));
+		ViewHelper.setScaleX(this.nativeViewProtected, float(value));
 	}
 
 	[scaleYProperty.setNative](value: number) {
-		org.nativescript.widgets.ViewHelper.setScaleY(this.nativeViewProtected, float(value));
+		ViewHelper.setScaleY(this.nativeViewProtected, float(value));
 	}
 
 	[translateXProperty.setNative](value: CoreTypes.dip) {
-		org.nativescript.widgets.ViewHelper.setTranslateX(this.nativeViewProtected, layout.toDevicePixels(value));
+		ViewHelper.setTranslateX(this.nativeViewProtected, layout.toDevicePixels(value));
 	}
 
 	[translateYProperty.setNative](value: CoreTypes.dip) {
-		org.nativescript.widgets.ViewHelper.setTranslateY(this.nativeViewProtected, layout.toDevicePixels(value));
+		ViewHelper.setTranslateY(this.nativeViewProtected, layout.toDevicePixels(value));
 	}
 
 	[zIndexProperty.getDefault](): number {
 		return 0;
 	}
 	[zIndexProperty.setNative](value: number) {
-		org.nativescript.widgets.ViewHelper.setZIndex(this.nativeViewProtected, value);
+		ViewHelper.setZIndex(this.nativeViewProtected, value);
 	}
 
 	[backgroundInternalProperty.getDefault](): android.graphics.drawable.Drawable {
@@ -1505,28 +1463,34 @@ export class View extends ViewCommon {
 		}
 	}
 
-	public _applyBackground(background: Background, isBorderDrawable: boolean, onlyColor: boolean, backgroundDrawable: android.graphics.drawable.Drawable) {
-		const nativeView = <NativeScriptAndroidView>this.nativeViewProtected;
-
-		if (onlyColor) {
-			const backgroundColor = background.color.android;
-
+	public _applyBackground(background: Background, isBorderDrawable: boolean, onlyColor: boolean, backgroundDrawable: any, shouldClipToOutline: boolean) {
+		const nativeView = this.nativeViewProtected as NativeScriptAndroidView;
+		const canUseOutlineProvider = !background.hasBorderWidth() && !background.hasBoxShadows() && !background.clipPath && !background.image && SDK_VERSION >= 21 && (SDK_VERSION >= 33 || background.hasUniformBorderRadius());
+		if (onlyColor || canUseOutlineProvider) {
+			const backgroundColor = background.color?.android;
 			if (isBorderDrawable) {
 				// We need to duplicate the drawable or we lose the "default" cached drawable
 				backgroundDrawable = nativeView._cachedDrawable != null ? AndroidHelper.getCopyOrDrawable(nativeView._cachedDrawable, nativeView.getResources()) : null;
 				nativeView.setBackground(backgroundDrawable);
 			}
+			if (backgroundColor) {
+				if (this.needsNativeDrawableFill && backgroundDrawable) {
+					backgroundDrawable.mutate();
 
-			// Apply color to drawables when there is the need to maintain visual things like button ripple effect
-			if (this.needsNativeDrawableFill && backgroundDrawable) {
-				backgroundDrawable.mutate();
+					AndroidHelper.setDrawableColor(backgroundColor, backgroundDrawable);
+					backgroundDrawable.invalidateSelf();
+				} else {
+					nativeView.setBackgroundColor(backgroundColor);
+				}
+			}
+			// borderDrawable is slow
+			// let s use outline provider when we can
+			if (shouldClipToOutline) {
+				ViewHelper.setOutlineProvider(nativeView, background.borderTopLeftRadius, background.borderTopRightRadius, background.borderBottomRightRadius, background.borderBottomLeftRadius);
 
-				AndroidHelper.setDrawableColor(backgroundColor, backgroundDrawable);
-				backgroundDrawable.invalidateSelf();
-			} else {
-				nativeView.setBackgroundColor(backgroundColor);
 			}
 		} else {
+			ViewHelper.clearOutlineProvider(nativeView);
 			if (background.clearFlags & BackgroundClearFlags.CLEAR_BACKGROUND_COLOR) {
 				if (backgroundDrawable) {
 					backgroundDrawable.mutate();
@@ -1537,7 +1501,6 @@ export class View extends ViewCommon {
 					nativeView.setBackgroundColor(-1);
 				}
 			}
-
 			if (background.isEmpty()) {
 				// Reset background to default if not already set
 				const defaultDrawable = nativeView._cachedDrawable ?? null;
@@ -1575,7 +1538,6 @@ export class View extends ViewCommon {
 		}
 		org.nativescript.widgets.Utils.drawBoxShadow(nativeView, nativeArray);
 	}
-
 	_redrawNativeBackground(value: android.graphics.drawable.Drawable | Background): void {
 		if (value instanceof Background) {
 			this.onBackgroundOrBorderPropertyChanged();
@@ -1622,13 +1584,11 @@ export class View extends ViewCommon {
 		// prettier-ignore
 		const onlyColor = !background.hasBorderWidth()
 			&& !background.hasBorderRadius()
-			&& !background.hasBoxShadows()
 			&& !background.clipPath
 			&& !background.image
 			&& !!background.color;
-
-		this._applyBackground(background, isBorderDrawable, onlyColor, drawable);
-
+		const shouldClipToOutline = !onlyColor || !background.hasBoxShadows();
+		this._applyBackground(background, isBorderDrawable, onlyColor, drawable, shouldClipToOutline);
 		if (background.hasBoxShadows()) {
 			this._drawBoxShadow(background.getBoxShadows());
 		}
@@ -1704,7 +1664,7 @@ export class ContainerView extends View {
 }
 
 export class CustomLayoutView extends ContainerView {
-	nativeViewProtected: android.view.ViewGroup;
+	declare nativeViewProtected: android.view.ViewGroup;
 
 	public createNativeView() {
 		return new org.nativescript.widgets.ContentLayout(this._context);
@@ -1740,6 +1700,14 @@ export class CustomLayoutView extends ContainerView {
 		child._setMinHeightNative(value);
 	}
 
+	public _removeFromNativeVisualTree(): void {
+		super._removeFromNativeVisualTree();
+		const parent = this.nativeViewProtected?.getParent();
+		if (parent && parent['removeView']) {
+			parent['removeView'](this.nativeViewProtected);
+		}
+	}
+
 	public _removeViewFromNativeVisualTree(child: ViewCommon): void {
 		super._removeViewFromNativeVisualTree(child);
 
@@ -1821,40 +1789,40 @@ function createNativePercentLengthProperty(options: NativePercentLengthPropertyO
 createNativePercentLengthProperty({
 	setter: marginTopProperty.setNative,
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setMarginTop;
+		return ViewHelper.setMarginTop;
 	},
 	get setPercent() {
-		return org.nativescript.widgets.ViewHelper.setMarginTopPercent;
+		return ViewHelper.setMarginTopPercent;
 	},
 });
 
 createNativePercentLengthProperty({
 	setter: marginRightProperty.setNative,
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setMarginRight;
+		return ViewHelper.setMarginRight;
 	},
 	get setPercent() {
-		return org.nativescript.widgets.ViewHelper.setMarginRightPercent;
+		return ViewHelper.setMarginRightPercent;
 	},
 });
 
 createNativePercentLengthProperty({
 	setter: marginBottomProperty.setNative,
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setMarginBottom;
+		return ViewHelper.setMarginBottom;
 	},
 	get setPercent() {
-		return org.nativescript.widgets.ViewHelper.setMarginBottomPercent;
+		return ViewHelper.setMarginBottomPercent;
 	},
 });
 
 createNativePercentLengthProperty({
 	setter: marginLeftProperty.setNative,
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setMarginLeft;
+		return ViewHelper.setMarginLeft;
 	},
 	get setPercent() {
-		return org.nativescript.widgets.ViewHelper.setMarginLeftPercent;
+		return ViewHelper.setMarginLeftPercent;
 	},
 });
 
@@ -1862,10 +1830,10 @@ createNativePercentLengthProperty({
 	setter: widthProperty.setNative,
 	auto: -1, //android.view.ViewGroup.LayoutParams.MATCH_PARENT,
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setWidth;
+		return ViewHelper.setWidth;
 	},
 	get setPercent() {
-		return org.nativescript.widgets.ViewHelper.setWidthPercent;
+		return ViewHelper.setWidthPercent;
 	},
 });
 
@@ -1873,23 +1841,23 @@ createNativePercentLengthProperty({
 	setter: heightProperty.setNative,
 	auto: -1, //android.view.ViewGroup.LayoutParams.MATCH_PARENT,
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setHeight;
+		return ViewHelper.setHeight;
 	},
 	get setPercent() {
-		return org.nativescript.widgets.ViewHelper.setHeightPercent;
+		return ViewHelper.setHeightPercent;
 	},
 });
 
 createNativePercentLengthProperty({
 	setter: '_setMinWidthNative',
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setMinWidth;
+		return ViewHelper.setMinWidth;
 	},
 });
 
 createNativePercentLengthProperty({
 	setter: '_setMinHeightNative',
 	get setPixels() {
-		return org.nativescript.widgets.ViewHelper.setMinHeight;
+		return ViewHelper.setMinHeight;
 	},
 });
diff --git a/packages/core/ui/core/view/index.d.ts b/packages/core/ui/core/view/index.d.ts
index 75f347db1f..4024b0cd8c 100644
--- a/packages/core/ui/core/view/index.d.ts
+++ b/packages/core/ui/core/view/index.d.ts
@@ -345,7 +345,12 @@ export abstract class View extends ViewCommon {
 	/**
 	 * Internal use only. This is used to limit the number of updates to android.view.View.setContentDescription()
 	 */
-	_androidContentDescriptionUpdated?: boolean;
+	_androidContentDescriptionNeedsUpdate?: boolean;
+
+	/**
+	 * Internal use only. Determine if the view has a default contentDescription
+	 */
+	_hasDefaultAccessibilityContentDescription?: boolean;
 
 	/**
 	 *
@@ -852,6 +857,11 @@ export abstract class View extends ViewCommon {
 	 */
 	public createAnimation(options: AnimationDefinition): Animation;
 
+	/**
+	 * Cancel all animations started with `animate`
+	 */
+	public cancelAllAnimations();
+
 	/**
 	 * Returns the iOS safe area insets of this view.
 	 */
@@ -1062,7 +1072,7 @@ export abstract class View extends ViewCommon {
 	 * @private
 	 *  method called on Android to apply the background. This allows custom handling
 	 */
-	_applyBackground(background: Background, isBorderDrawable: boolean, onlyColor: boolean, backgroundDrawable: any);
+	_applyBackground(background: Background, isBorderDrawable: boolean, onlyColor: boolean, backgroundDrawable: any, shouldClipToOutline: boolean);
 
 	/**
 	 * @private
diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
index deff407d4e..d614c6ecac 100644
--- a/packages/core/ui/core/view/index.ios.ts
+++ b/packages/core/ui/core/view/index.ios.ts
@@ -1,7 +1,5 @@
 import type { Point, Position } from './view-interfaces';
 import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty, iosGlassEffectProperty, GlassEffectType, GlassEffectVariant, GlassEffectConfig, statusBarStyleProperty } from './view-common';
-import { isAccessibilityServiceEnabled } from '../../../application';
-import { updateA11yPropertiesCallback } from '../../../application/helpers-common';
 import { ShowModalOptions, hiddenProperty } from '../view-base';
 import { Trace } from '../../../trace';
 import { layout, ios as iosUtils, getWindow } from '../../../utils';
@@ -11,11 +9,15 @@ import { ios as iosBackground, Background } from '../../styling/background';
 import { perspectiveProperty, visibilityProperty, opacityProperty, rotateProperty, rotateXProperty, rotateYProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, zIndexProperty, backgroundInternalProperty, directionProperty } from '../../styling/style-properties';
 import { profile } from '../../../profiling';
 import { accessibilityEnabledProperty, accessibilityHiddenProperty, accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityLanguageProperty, accessibilityLiveRegionProperty, accessibilityMediaSessionProperty, accessibilityRoleProperty, accessibilityStateProperty, accessibilityValueProperty, accessibilityIgnoresInvertColorsProperty } from '../../../accessibility/accessibility-properties';
-import { IOSPostAccessibilityNotificationType, AccessibilityEventOptions, AccessibilityRole, AccessibilityState } from '../../../accessibility';
+import { IOSPostAccessibilityNotificationType, AccessibilityEventOptions, AccessibilityRole, AccessibilityState , isAccessibilityServiceEnabled} from '../../../accessibility';
+
+import { updateA11yPropertiesCallback } from '../../../application/helpers-common';
+
 import { CoreTypes } from '../../../core-types';
 import type { ModalTransition } from '../../transition/modal-transition';
 import { SharedTransition } from '../../transition/shared-transition';
 import { NativeScriptUIView } from '../../utils';
+import { Application } from '../../../application';
 import { Color } from '../../../color';
 
 export * from './view-common';
@@ -66,16 +68,43 @@ export class View extends ViewCommon {
 	get isLayoutRequested(): boolean {
 		return (this._privateFlags & PFLAG_FORCE_LAYOUT) === PFLAG_FORCE_LAYOUT;
 	}
+	initNativeView() {
+		super.initNativeView();
+		const nativeView = this.nativeViewProtected;
+		/**
+		 * We need to map back from the UIView to the NativeScript View for accessibility.
+		 *
+		 * We do that by setting the uiView's tag to the View's domId.
+		 * This way we can do reverse lookup.
+		 */
+		nativeView.tag = this._domId;
+	}
+
+	requestlayoutIfNeeded() {
+		if (this.isLayoutRequired || this._requetLayoutNeeded) {
+			this._requetLayoutNeeded = false;
+			this.requestLayout();
+		}
+	}
 
 	disposeNativeView() {
 		super.disposeNativeView();
 
+		if (this.viewController) {
+			this.viewController = null;
+		}
+
 		this._cachedFrame = null;
 		this._isLaidOut = false;
 		this._isTransformed = false;
 	}
 
 	public requestLayout(): void {
+		if (this.mSuspendRequestLayout) {
+			this._requetLayoutNeeded = true;
+			return;
+		}
+		this._requetLayoutNeeded = false;
 		this._privateFlags |= PFLAG_FORCE_LAYOUT;
 		super.requestLayout();
 
@@ -84,8 +113,9 @@ export class View extends ViewCommon {
 			nativeView.setNeedsLayout();
 		}
 
-		if (this.viewController && this.viewController.view !== nativeView) {
-			this.viewController.view.setNeedsLayout();
+		const controller = this.viewController;
+		if (controller && controller.view !== nativeView) {
+			controller.view.setNeedsLayout();
 		}
 	}
 
@@ -155,12 +185,17 @@ export class View extends ViewCommon {
 	private layoutOuterShadows(): void {
 		const nativeView: NativeScriptUIView = <NativeScriptUIView>this.nativeViewProtected;
 		if (nativeView?.outerShadowContainerLayer) {
-			CATransaction.setDisableActions(true);
+			const isInTheMiddleOfAnimation = UIView.inheritedAnimationDuration > 0;
+			if (!isInTheMiddleOfAnimation) {
+				CATransaction.setDisableActions(true);
+			}
 
 			nativeView.outerShadowContainerLayer.bounds = nativeView.bounds;
 			nativeView.outerShadowContainerLayer.position = nativeView.center;
 
-			CATransaction.setDisableActions(false);
+			if (!isInTheMiddleOfAnimation) {
+				CATransaction.setDisableActions(false);
+			}
 		}
 	}
 
@@ -401,6 +436,11 @@ export class View extends ViewCommon {
 	}
 
 	public updateNativeTransform() {
+		// if (!this.isLayoutValid) {
+		// 	this._hasPendingTransform = true;
+		// 	return;
+		// }
+
 		const scaleX = this.scaleX || 1e-6;
 		const scaleY = this.scaleY || 1e-6;
 		const perspective = this.perspective || 300;
@@ -423,15 +463,19 @@ export class View extends ViewCommon {
 				CATransaction.begin();
 			}
 			// Disable CALayer animatable property changes
-			CATransaction.setDisableActions(true);
-
+			const isInTheMiddleOfAnimation = UIView.inheritedAnimationDuration > 0;
+			if (!isInTheMiddleOfAnimation) {
+				CATransaction.setDisableActions(true);
+			}
 			this.nativeViewProtected.layer.transform = transform;
 			if (nativeView.outerShadowContainerLayer) {
 				nativeView.outerShadowContainerLayer.transform = transform;
 			}
 			this._isTransformed = this.nativeViewProtected && !CATransform3DEqualToTransform(this.nativeViewProtected.transform3D, CATransform3DIdentity);
 
-			CATransaction.setDisableActions(false);
+			if (!isInTheMiddleOfAnimation) {
+				CATransaction.setDisableActions(false);
+			}
 			if (!updateSuspended) {
 				CATransaction.commit();
 			}
@@ -443,7 +487,10 @@ export class View extends ViewCommon {
 		const newPoint = CGPointMake(originX, originY);
 
 		// Disable CALayer animatable property changes
-		CATransaction.setDisableActions(true);
+		const isInTheMiddleOfAnimation = UIView.inheritedAnimationDuration > 0;
+		if (!isInTheMiddleOfAnimation) {
+			CATransaction.setDisableActions(true);
+		}
 
 		nativeView.layer.anchorPoint = newPoint;
 
@@ -464,7 +511,9 @@ export class View extends ViewCommon {
 			nativeView.outerShadowContainerLayer.position = CGPointMake(frame.origin.x + frame.size.width * originX, frame.origin.y + frame.size.height * originY);
 		}
 
-		CATransaction.setDisableActions(false);
+		if (!isInTheMiddleOfAnimation) {
+			CATransaction.setDisableActions(false);
+		}
 	}
 
 	// By default we update the view's presentation layer when setting backgroundColor and opacity properties.
@@ -483,33 +532,28 @@ export class View extends ViewCommon {
 	}
 
 	protected _showNativeModalView(parent: View, options: ShowModalOptions) {
-		const parentWithController = IOSHelper.getParentWithViewController(parent);
+		let parentWithController = IOSHelper.getParentWithViewController(parent);
 		if (!parentWithController) {
 			Trace.write(`Could not find parent with viewController for ${parent} while showing modal view.`, Trace.categories.ViewHierarchy, Trace.messageType.error);
 
 			return;
 		}
 
-		const parentController = parentWithController.viewController;
-		if (parentController.presentedViewController) {
-			Trace.write('Parent is already presenting view controller. Close the current modal page before showing another one!', Trace.categories.ViewHierarchy, Trace.messageType.error);
-
-			return;
-		}
-
-		if (!parentController.view || !parentController.view.window) {
-			Trace.write('Parent page is not part of the window hierarchy.', Trace.categories.ViewHierarchy, Trace.messageType.error);
-
-			return;
+		let parentController = parentWithController.viewController;
+		// we loop to ensure we are showing from the top presented view controller
+		while (parentController.presentedViewController && !parentController.presentedViewController.beingDismissed) {
+			parentController = parentController.presentedViewController;
+			parentWithController = parentWithController['_modal'] || parentWithController;
 		}
 
 		this._setupAsRootView({});
 
 		super._showNativeModalView(<ViewCommon>parentWithController, options);
-		let controller = this.viewController;
+		let controller: IOSHelper.UILayoutViewController = this.viewController;
 		if (!controller) {
 			const nativeView = this.ios || this.nativeViewProtected;
-			controller = <UIViewController>IOSHelper.UILayoutViewController.initWithOwner(new WeakRef(this));
+			controller = <IOSHelper.UILayoutViewController>IOSHelper.UILayoutViewController.initWithOwner(new WeakRef(this));
+			controller.modal = true;
 
 			if (nativeView instanceof UIView) {
 				controller.view.addSubview(nativeView);
@@ -517,6 +561,8 @@ export class View extends ViewCommon {
 
 			this.viewController = controller;
 		}
+		// we set the parent to root to access all css root variables
+		this.parent = Application.getRootView();
 
 		if (options.transition) {
 			controller.modalPresentationStyle = UIModalPresentationStyle.Custom;
@@ -607,7 +653,6 @@ export class View extends ViewCommon {
 		//   console.log('accessibilityPerformEscape!!')
 		//   return true;
 		// }
-
 		parentController.presentViewControllerAnimatedCompletion(controller, animated, null);
 		const transitionCoordinator = parentController.transitionCoordinator;
 		if (transitionCoordinator) {
@@ -632,6 +677,7 @@ export class View extends ViewCommon {
 
 			return;
 		}
+		this._raiseClosingModallyEvent();
 
 		// modal view has already been closed by UI, probably as a popover
 		if (!parent.viewController.presentedViewController) {
@@ -640,12 +686,20 @@ export class View extends ViewCommon {
 			return;
 		}
 
-		const parentController = parent.viewController;
+		let parentController = parent.viewController;
+		// if a dialog (UIAlertController or custom one defining isAlertController) we need to loop over to get the
+		// top presentedViewController to correctly hide without hiding the dialog
+		// though we dont want to go "over" to not go into possible top shown modal
+		if (parentController.presentedViewController && parentController.presentedViewController.presentedViewController && (parentController.presentedViewController instanceof UIAlertController || parentController.presentedViewController['isAlertController'])) {
+			parentController = parentController.presentedViewController;
+		}
+
+		// while(parentController.presentedViewController && parentController.presentedViewController.presentedViewController) {
+		// }
 		let animated = true;
 		if (this._modalAnimatedOptions?.length) {
 			animated = this._modalAnimatedOptions.slice(-1)[0];
 		}
-
 		parentController.dismissViewControllerAnimatedCompletion(animated, () => {
 			const transitionState = SharedTransition.getState(this.transitionId);
 			if (!transitionState?.interactiveCancelled) {
@@ -789,10 +843,11 @@ export class View extends ViewCommon {
 				break;
 			case CoreTypes.Visibility.hidden:
 			case CoreTypes.Visibility.collapse:
+			case CoreTypes.Visibility.collapsed:
 				nativeView.hidden = true;
 				break;
 			default:
-				throw new Error(`Invalid visibility value: ${value}. Valid values are: "${CoreTypes.Visibility.visible}", "${CoreTypes.Visibility.hidden}", "${CoreTypes.Visibility.collapse}".`);
+				throw new Error(`Invalid visibility value: ${value}. Valid values are: "${CoreTypes.Visibility.visible}", "${CoreTypes.Visibility.hidden}", "${CoreTypes.Visibility.collapse}", "${CoreTypes.Visibility.collapsed}".`);
 		}
 
 		// Apply visibility value to shadows as well
@@ -811,7 +866,10 @@ export class View extends ViewCommon {
 			CATransaction.begin();
 		}
 		// Disable CALayer animatable property changes
-		CATransaction.setDisableActions(true);
+		const isInTheMiddleOfAnimation = UIView.inheritedAnimationDuration > 0;
+		if (!isInTheMiddleOfAnimation) {
+			CATransaction.setDisableActions(true);
+		}
 
 		nativeView.alpha = value;
 		// Apply opacity value to shadows as well
@@ -819,7 +877,9 @@ export class View extends ViewCommon {
 			nativeView.outerShadowContainerLayer.opacity = value;
 		}
 
-		CATransaction.setDisableActions(false);
+		if (!isInTheMiddleOfAnimation) {
+			CATransaction.setDisableActions(false);
+		}
 		if (!updateSuspended) {
 			CATransaction.commit();
 		}
@@ -1046,7 +1106,7 @@ export class View extends ViewCommon {
 			args = options.message;
 		}
 
-		switch (options.iosNotificationType) {
+		switch (options.iosNotificationType as IOSPostAccessibilityNotificationType) {
 			case IOSPostAccessibilityNotificationType.Announcement: {
 				notification = UIAccessibilityAnnouncementNotification;
 				break;
@@ -1111,12 +1171,16 @@ export class View extends ViewCommon {
 	}
 
 	_redrawNativeBackground(value: UIColor | Background): void {
+		const isInTheMiddleOfAnimation = UIView.inheritedAnimationDuration > 0;
 		const updateSuspended = this._isPresentationLayerUpdateSuspended();
+
 		if (!updateSuspended) {
 			CATransaction.begin();
 		}
-		// Disable CALayer animatable property changes
-		CATransaction.setDisableActions(true);
+		if (!isInTheMiddleOfAnimation) {
+			// Disable CALayer animatable property changes
+			CATransaction.setDisableActions(true);
+		}
 
 		const nativeView = this.nativeViewProtected;
 		if (nativeView) {
@@ -1130,7 +1194,9 @@ export class View extends ViewCommon {
 			}
 		}
 
-		CATransaction.setDisableActions(false);
+		if (!isInTheMiddleOfAnimation) {
+			CATransaction.setDisableActions(false);
+		}
 		if (!updateSuspended) {
 			CATransaction.commit();
 		}
@@ -1265,6 +1331,13 @@ export class CustomLayoutView extends ContainerView {
 		return false;
 	}
 
+	public _removeFromNativeVisualTree(): void {
+		super._removeFromNativeVisualTree();
+		if (this.nativeViewProtected) {
+			this.nativeViewProtected.removeFromSuperview();
+		}
+	}
+
 	public _removeViewFromNativeVisualTree(child: View): void {
 		super._removeViewFromNativeVisualTree(child);
 
diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
index ee5dff2014..71a53b1b7c 100644
--- a/packages/core/ui/core/view/view-common.ts
+++ b/packages/core/ui/core/view/view-common.ts
@@ -10,8 +10,8 @@ import { Property, InheritedProperty, CssProperty } from '../properties';
 import { Style } from '../../styling/style';
 import { EventData } from '../../../data/observable';
 import { ViewHelper } from './view-helper';
-import { setupAccessibleView } from '../../../application/helpers';
 
+import { backgroundInternalProperty, fontInternalProperty } from '../../styling/style-properties';
 import { PercentLength } from '../../styling/length-shared';
 
 import { observe as gestureObserve, GesturesObserver, GestureTypes, fromString as gestureFromString, toString as gestureToString, TouchManager, TouchAnimationOptions, VisionHoverOptions } from '../../gestures';
@@ -24,7 +24,7 @@ import { LinearGradient } from '../../styling/linear-gradient';
 
 import { Animation } from '../../animation';
 import type { AnimationPromise } from '../../animation/animation-types';
-import { AccessibilityEventOptions, AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, getFontScale } from '../../../accessibility';
+import { AccessibilityEventOptions, AccessibilityLiveRegion, AccessibilityRole, AccessibilityState, getFontScale, setupAccessibleView } from '../../../accessibility';
 import { accessibilityHintProperty, accessibilityIdentifierProperty, accessibilityLabelProperty, accessibilityValueProperty, accessibilityIgnoresInvertColorsProperty } from '../../../accessibility/accessibility-properties';
 import { accessibilityBlurEvent, accessibilityFocusChangedEvent, accessibilityFocusEvent, accessibilityPerformEscapeEvent } from '../../../accessibility';
 import { ShadowCSSValues } from '../../styling/css-shadow';
@@ -76,6 +76,7 @@ export abstract class ViewCommon extends ViewBase {
 	public static layoutChangedEvent = 'layoutChanged';
 	public static shownModallyEvent = 'shownModally';
 	public static showingModallyEvent = 'showingModally';
+	public static closingModallyEvent = 'closingModally';
 	public static accessibilityBlurEvent = accessibilityBlurEvent;
 	public static accessibilityFocusEvent = accessibilityFocusEvent;
 	public static accessibilityFocusChangedEvent = accessibilityFocusChangedEvent;
@@ -141,7 +142,7 @@ export abstract class ViewCommon extends ViewBase {
 
 	public readonly _gestureObservers = {} as Record<GestureTypes, Array<GesturesObserver>>;
 
-	_androidContentDescriptionUpdated?: boolean;
+	_androidContentDescriptionNeedsUpdate?: boolean;
 
 	get css(): string {
 		const scope = this._styleScope;
@@ -161,6 +162,9 @@ export abstract class ViewCommon extends ViewBase {
 	}
 
 	public changeCssFile(cssFileName: string): void {
+		if (this.disableCss) {
+			return;
+		}
 		const scope = this._styleScope;
 		if (scope && cssFileName) {
 			scope.changeCssFile(cssFileName);
@@ -169,6 +173,9 @@ export abstract class ViewCommon extends ViewBase {
 	}
 
 	public _updateStyleScope(cssFileName?: string, cssString?: string, css?: string): void {
+		if (this.disableCss) {
+			return;
+		}
 		let scope = this._styleScope;
 		if (!scope) {
 			scope = new StyleScope();
@@ -437,7 +444,7 @@ export abstract class ViewCommon extends ViewBase {
 		if (closeCallback) {
 			closeCallback(...args);
 		} else {
-			const parent = this.parent;
+			const parent = this._modalParent || this.parent;
 			if (parent) {
 				parent.closeModal(...args);
 			}
@@ -474,6 +481,11 @@ export abstract class ViewCommon extends ViewBase {
 			};
 
 			const whenClosedCallback = () => {
+				// if we are closing a modal which itself has modals we need
+				// to clean up and fire events
+				if (this._modal?._closeModalCallback) {
+					this._modal._closeModalCallback();
+				}
 				const transitionState = SharedTransition.getState(this.transitionId);
 				if (transitionState?.interactiveBegan) {
 					SharedTransition.updateState(this.transitionId, {
@@ -490,6 +502,7 @@ export abstract class ViewCommon extends ViewBase {
 					}
 
 					this._tearDownUI(true);
+					this.parent = null;
 				}
 			};
 
@@ -497,7 +510,6 @@ export abstract class ViewCommon extends ViewBase {
 			if (!transitionState?.interactiveBegan) {
 				cleanupModalViews();
 			}
-
 			this._hideNativeModalView(parent, whenClosedCallback);
 		};
 	}
@@ -531,6 +543,13 @@ export abstract class ViewCommon extends ViewBase {
 		};
 		this.notify(args);
 	}
+	protected _raiseClosingModallyEvent() {
+		const args: EventData = {
+			eventName: ViewCommon.closingModallyEvent,
+			object: this,
+		};
+		this.notify(args);
+	}
 
 	private _isEvent(name: string): boolean {
 		return this.constructor && `${name}Event` in this.constructor;
@@ -567,6 +586,20 @@ export abstract class ViewCommon extends ViewBase {
 		}
 	}
 
+	public onResumeNativeUpdates(): void {
+		// special handling of backgroundInternal property to prevent too many slow updates
+		const background = this.style.backgroundInternal;
+		if (background?.isDirty) {
+			this._suspendedUpdates?.set('backgroundInternal', backgroundInternalProperty);
+		}
+		// special handling of fontInternal property to prevent too many slow updates
+		const font = this.style.fontInternal;
+		if (font?.isDirty) {
+			this._suspendedUpdates?.set('fontInternal', fontInternalProperty);
+		}
+		super.onResumeNativeUpdates();
+	}
+
 	// START Style property shortcuts
 	get flexFlow(): FlexFlow {
 		return this.style.flexFlow;
@@ -1177,6 +1210,12 @@ export abstract class ViewCommon extends ViewBase {
 		return promise as AnimationPromise;
 	}
 
+	public cancelAllAnimations() {
+		if (this._localAnimations) {
+			this._localAnimations.forEach((a) => this._removeAnimation(a));
+		}
+	}
+
 	public createAnimation(animation: any): Animation {
 		if (!this._localAnimations) {
 			this._localAnimations = new Set();
@@ -1249,7 +1288,7 @@ export abstract class ViewCommon extends ViewBase {
 	public _redrawNativeBackground(value: any): void {
 		//
 	}
-	public _applyBackground(background, isBorderDrawable: boolean, onlyColor: boolean, backgroundDrawable: android.graphics.drawable.Drawable) {
+	public _applyBackground(background, isBorderDrawable: boolean, onlyColor: boolean, backgroundDrawable: any, shouldClipToOutline: boolean) {
 		//
 	}
 
diff --git a/packages/core/ui/core/view/view-helper/index.d.ts b/packages/core/ui/core/view/view-helper/index.d.ts
index 34557670d3..0ea31d5327 100644
--- a/packages/core/ui/core/view/view-helper/index.d.ts
+++ b/packages/core/ui/core/view/view-helper/index.d.ts
@@ -69,8 +69,9 @@ export namespace IOSHelper {
 	export function getFrameFromPosition(position: Position, insets?: Position): any; /* CGRect */
 	export function shrinkToSafeArea(view: View, frame: any /* CGRect */): any; /* CGRect */
 	export function expandBeyondSafeArea(view: View, frame: any /* CGRect */): any; /* CGRect */
-	export class UILayoutViewController {
+	export class UILayoutViewController extends UIViewController {
 		public static initWithOwner(owner: WeakRef<View>): UILayoutViewController;
+		modal?: boolean;
 	}
 	export class UIAdaptivePresentationControllerDelegateImp {
 		public static initWithOwnerAndCallback(owner: WeakRef<View>, whenClosedCallback: Function): UIAdaptivePresentationControllerDelegateImp;
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 c24beceaa2..725cb51911 100644
--- a/packages/core/ui/core/view/view-helper/index.ios.ts
+++ b/packages/core/ui/core/view/view-helper/index.ios.ts
@@ -13,6 +13,9 @@ export const AndroidHelper = 0;
 @NativeClass
 class UILayoutViewController extends UIViewController {
 	public owner: WeakRef<View>;
+	// used to know if we are a modal controller
+	// in this case the owner has a parent (rootView) but we still need to load/unload it
+	public modal;
 
 	public static initWithOwner(owner: WeakRef<View>): UILayoutViewController {
 		const controller = <UILayoutViewController>UILayoutViewController.new();
@@ -99,7 +102,7 @@ class UILayoutViewController extends UIViewController {
 
 		IOSHelper.updateAutoAdjustScrollInsets(this, owner);
 
-		if (!owner.isLoaded && !owner.parent) {
+		if (!owner.isLoaded && (!owner.parent || this.modal)) {
 			owner.callLoaded();
 		}
 	}
@@ -107,7 +110,7 @@ class UILayoutViewController extends UIViewController {
 	public viewDidDisappear(animated: boolean): void {
 		super.viewDidDisappear(animated);
 		const owner = this.owner?.deref();
-		if (owner && owner.isLoaded && !owner.parent) {
+		if (owner && owner.isLoaded && (!owner.parent || this.modal)) {
 			owner.callUnloaded();
 		}
 	}
diff --git a/packages/core/ui/core/view/view-helper/view-helper-common.ts b/packages/core/ui/core/view/view-helper/view-helper-common.ts
index 90863943fd..6aee34cd4d 100644
--- a/packages/core/ui/core/view/view-helper/view-helper-common.ts
+++ b/packages/core/ui/core/view/view-helper/view-helper-common.ts
@@ -67,6 +67,7 @@ export class ViewHelper {
 				childTop = top + effectiveMarginTop;
 				break;
 
+			case 'center':
 			case 'middle':
 				childTop = top + (bottom - top - childHeight + (effectiveMarginTop - effectiveMarginBottom)) / 2;
 				break;
@@ -88,12 +89,7 @@ export class ViewHelper {
 		const effectiveMarginLeft = child.effectiveMarginLeft;
 		const effectiveMarginRight = child.effectiveMarginRight;
 
-		let hAlignment: CoreTypes.HorizontalAlignmentType;
-		if (child.effectiveWidth >= 0 && childStyle.horizontalAlignment === 'stretch') {
-			hAlignment = 'center';
-		} else {
-			hAlignment = childStyle.horizontalAlignment;
-		}
+		const hAlignment: CoreTypes.HorizontalAlignmentType = childStyle.horizontalAlignment;
 
 		switch (hAlignment) {
 			case 'start':
@@ -102,6 +98,7 @@ export class ViewHelper {
 			case 'left':
 				childLeft = left + effectiveMarginLeft;
 				break;
+			case 'middle':
 			case 'center':
 				childLeft = left + (right - left - childWidth + (effectiveMarginLeft - effectiveMarginRight)) / 2;
 				break;
diff --git a/packages/core/ui/date-picker/index.android.ts b/packages/core/ui/date-picker/index.android.ts
index 97a9f4b1dc..2dd64fbb9c 100644
--- a/packages/core/ui/date-picker/index.android.ts
+++ b/packages/core/ui/date-picker/index.android.ts
@@ -59,7 +59,7 @@ function initializeDateChangedListener(): void {
 }
 
 export class DatePicker extends DatePickerBase {
-	nativeViewProtected: android.widget.DatePicker;
+	declare nativeViewProtected: android.widget.DatePicker;
 	timePicker: TimePicker;
 
 	public createNativeView() {
diff --git a/packages/core/ui/date-picker/index.ios.ts b/packages/core/ui/date-picker/index.ios.ts
index 13f1e10594..7ab16ddc2b 100644
--- a/packages/core/ui/date-picker/index.ios.ts
+++ b/packages/core/ui/date-picker/index.ios.ts
@@ -1,16 +1,16 @@
 import { DatePickerBase, yearProperty, monthProperty, dayProperty, dateProperty, maxDateProperty, minDateProperty, hourProperty, minuteProperty, secondProperty, showTimeProperty, iosPreferredDatePickerStyleProperty } from './date-picker-common';
 import { colorProperty } from '../styling/style-properties';
 import { Color } from '../../color';
-import { Device } from '../../platform';
+import { SDK_VERSION } from '../../utils';
 
 export * from './date-picker-common';
 
-const SUPPORT_DATE_PICKER_STYLE = __VISIONOS__ || parseFloat(Device.osVersion) >= 13.4;
-const SUPPORT_TEXT_COLOR = !__VISIONOS__ && parseFloat(Device.osVersion) < 14.0;
+const SUPPORT_DATE_PICKER_STYLE = __VISIONOS__ || SDK_VERSION >= 13.4;
+const SUPPORT_TEXT_COLOR = !__VISIONOS__ && SDK_VERSION < 14.0;
 
 export class DatePicker extends DatePickerBase {
 	private _changeHandler: NSObject;
-	public nativeViewProtected: UIDatePicker;
+	public declare nativeViewProtected: UIDatePicker;
 
 	public createNativeView() {
 		const picker = UIDatePicker.new();
diff --git a/packages/core/ui/dialogs/dialogs-common.ts b/packages/core/ui/dialogs/dialogs-common.ts
index d5db6f5bb2..0223fbda3f 100644
--- a/packages/core/ui/dialogs/dialogs-common.ts
+++ b/packages/core/ui/dialogs/dialogs-common.ts
@@ -34,6 +34,11 @@ export interface CancelableOptions {
 	 * [Android only] Sets the theme of the Dialog. Usable themes can be found: https://developer.android.com/reference/android/R.style
 	 */
 	theme?: number;
+
+	/**
+	 * [iOS only] if a viewController is already presenting this will close it.If set to false an error will be thrown
+	 */
+	iosForceClosePresentedViewController?: boolean;
 }
 
 /**
diff --git a/packages/core/ui/dialogs/index.android.ts b/packages/core/ui/dialogs/index.android.ts
index 896c3e163a..5df09bdb06 100644
--- a/packages/core/ui/dialogs/index.android.ts
+++ b/packages/core/ui/dialogs/index.android.ts
@@ -4,7 +4,7 @@
 import { DialogOptions, ConfirmOptions, PromptOptions, PromptResult, LoginOptions, LoginResult, ActionOptions } from './dialogs-common';
 import { getLabelColor, getButtonColors, isDialogOptions, inputType, capitalizationType, DialogStrings, parseLoginOptions } from './dialogs-common';
 import { android as androidUtils } from '../../utils/native-helper';
-import { getNativeApp } from '../../application/helpers-common';
+import { getApplicationContext } from '../../application/helpers.android';
 
 export * from './dialogs-common';
 
@@ -260,19 +260,19 @@ export function login(...args: any[]): Promise<LoginResult> {
 		try {
 			const alert = createAlertDialog(options);
 
-			const userNameInput = new android.widget.EditText(getNativeApp<android.app.Application>().getApplicationContext());
+			const userNameInput = new android.widget.EditText(getApplicationContext());
 
 			userNameInput.setHint(options.userNameHint ? options.userNameHint : '');
 			userNameInput.setText(options.userName ? options.userName : '');
 
-			const passwordInput = new android.widget.EditText(getNativeApp<android.app.Application>().getApplicationContext());
+			const passwordInput = new android.widget.EditText(getApplicationContext());
 			passwordInput.setInputType(android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD);
 			passwordInput.setTypeface(android.graphics.Typeface.DEFAULT);
 
 			passwordInput.setHint(options.passwordHint ? options.passwordHint : '');
 			passwordInput.setText(options.password ? options.password : '');
 
-			const layout = new android.widget.LinearLayout(getNativeApp<android.app.Application>().getApplicationContext());
+			const layout = new android.widget.LinearLayout(getApplicationContext());
 			layout.setOrientation(1);
 			layout.addView(userNameInput);
 			layout.addView(passwordInput);
diff --git a/packages/core/ui/dialogs/index.ios.ts b/packages/core/ui/dialogs/index.ios.ts
index 17c8642dcd..9ed2b0b410 100644
--- a/packages/core/ui/dialogs/index.ios.ts
+++ b/packages/core/ui/dialogs/index.ios.ts
@@ -2,9 +2,10 @@
  * iOS specific dialogs functions implementation.
  */
 import { Trace } from '../../trace';
-import { ConfirmOptions, PromptOptions, PromptResult, LoginOptions, LoginResult, ActionOptions, getCurrentPage, getLabelColor, getButtonColors, getTextFieldColor, isDialogOptions, inputType, capitalizationType, DialogStrings, parseLoginOptions } from './dialogs-common';
+import { ConfirmOptions, PromptOptions, PromptResult, LoginOptions, LoginResult, ActionOptions, getCurrentPage, getLabelColor, getButtonColors, getTextFieldColor, isDialogOptions, inputType, capitalizationType, DialogStrings, parseLoginOptions, CancelableOptions } from './dialogs-common';
 import { isString, isDefined, isFunction } from '../../utils/types';
-import { getiOSWindow } from '../../application/helpers-common';
+import { getiOSWindow, getRootView } from '../../application/helpers-common';
+import type { View } from '../core/view';
 
 export * from './dialogs-common';
 
@@ -44,23 +45,40 @@ function raiseCallback(callback, result) {
 	}
 }
 
-function showUIAlertController(alertController: UIAlertController) {
-	let viewController = getiOSWindow()?.rootViewController;
-
-	while (viewController && viewController.presentedViewController && !viewController.presentedViewController.beingDismissed) {
-		viewController = viewController.presentedViewController;
+function showUIAlertController(alertController: UIAlertController, options: CancelableOptions) {
+	// TODO: llok at using getiOSWindow() for multi window support
+	const rootViewController = getiOSWindow()?.rootViewController;
+	let viewController = rootViewController;
+	let rootView = getRootView();
+	if (rootView.parent) {
+		rootView = rootView.parent as any;
+	}
+	let currentView: View = getCurrentPage();
+	if (currentView) {
+		currentView = currentView.modal || currentView;
+		viewController = currentView.viewController;
 	}
-
 	if (!viewController) {
 		Trace.write(`No root controller found to open dialog.`, Trace.categories.Error, Trace.messageType.warn);
-
 		return;
 	}
+	if (!viewController.presentedViewController) {
+		if (rootView.viewController.presentedViewController && !rootView.viewController.presentedViewController.beingDismissed) {
+			viewController = rootView.viewController.presentedViewController;
+		} else if (rootView.viewController.presentedViewController && !rootViewController.presentedViewController.beingDismissed) {
+			viewController = rootViewController.presentedViewController;
+		}
+	}
 
-	if (alertController.popoverPresentationController) {
-		alertController.popoverPresentationController.sourceView = viewController.view;
-		alertController.popoverPresentationController.sourceRect = CGRectMake(viewController.view.bounds.size.width / 2.0, viewController.view.bounds.size.height / 2.0, 1.0, 1.0);
-		alertController.popoverPresentationController.permittedArrowDirections = 0 as UIPopoverArrowDirection;
+	while (viewController.presentedViewController && !viewController.presentedViewController.beingDismissed) {
+		while (viewController.presentedViewController instanceof UIAlertController || (viewController.presentedViewController['isAlertController'] && viewController.presentedViewController.presentedViewController)) {
+			viewController = viewController.presentedViewController;
+		}
+		if (viewController.presentedViewController instanceof UIAlertController || viewController.presentedViewController['isAlertController']) {
+			break;
+		} else {
+			viewController = viewController.presentedViewController;
+		}
 	}
 
 	const color = getButtonColors().color;
@@ -79,7 +97,25 @@ function showUIAlertController(alertController: UIAlertController) {
 			alertController.setValueForKey(message, 'attributedMessage');
 		}
 	}
-
+	function block() {
+		if (alertController.popoverPresentationController) {
+			alertController.popoverPresentationController.sourceView = viewController.view;
+			alertController.popoverPresentationController.sourceRect = CGRectMake(viewController.view.bounds.size.width / 2.0, viewController.view.bounds.size.height / 2.0, 1.0, 1.0);
+			alertController.popoverPresentationController.permittedArrowDirections = 0 as UIPopoverArrowDirection;
+		}
+		viewController.presentViewControllerAnimatedCompletion(alertController, true, null);
+	}
+	if (viewController.presentedViewController) {
+		if (viewController.presentedViewController.beingDismissed || options.iosForceClosePresentedViewController === true) {
+			viewController.dismissViewControllerAnimatedCompletion(true, () => {
+				block();
+			});
+		} else {
+			throw new Error('controller_already_presented');
+		}
+	} else {
+		block();
+	}
 	viewController.presentModalViewControllerAnimated(alertController, true);
 }
 
@@ -99,7 +135,7 @@ export function alert(arg: any): Promise<void> {
 				resolve();
 			});
 
-			showUIAlertController(alertController);
+			showUIAlertController(alertController, options);
 		} catch (ex) {
 			reject(ex);
 		}
@@ -123,7 +159,7 @@ export function confirm(arg: any): Promise<boolean> {
 				resolve(r);
 			});
 
-			showUIAlertController(alertController);
+			showUIAlertController(alertController, options);
 		} catch (ex) {
 			reject(ex);
 		}
@@ -205,7 +241,7 @@ export function prompt(...args): Promise<PromptResult> {
 				resolve({ result: r, text: textField.text });
 			});
 
-			showUIAlertController(alertController);
+			showUIAlertController(alertController, options);
 		} catch (ex) {
 			reject(ex);
 		}
@@ -252,7 +288,7 @@ export function login(...args: any[]): Promise<LoginResult> {
 				});
 			});
 
-			showUIAlertController(alertController);
+			showUIAlertController(alertController, options);
 		} catch (ex) {
 			reject(ex);
 		}
@@ -315,7 +351,7 @@ export function action(...args): Promise<string> {
 				);
 			}
 
-			showUIAlertController(alertController);
+			showUIAlertController(alertController, options);
 		} catch (ex) {
 			reject(ex);
 		}
diff --git a/packages/core/ui/editable-text-base/editable-text-base-common.ts b/packages/core/ui/editable-text-base/editable-text-base-common.ts
index 346baf2653..cfa8570e32 100644
--- a/packages/core/ui/editable-text-base/editable-text-base-common.ts
+++ b/packages/core/ui/editable-text-base/editable-text-base-common.ts
@@ -7,6 +7,7 @@ import { Style } from '../styling/style';
 import { Color } from '../../color';
 import { CoreTypes } from '../../core-types';
 import { EventData } from '../../data/observable';
+import { colorConverter } from '../styling/style-properties';
 
 function focusChangeHandler(args: EventData): void {
 	const view = args.object as EditableTextBase;
@@ -31,6 +32,7 @@ export abstract class EditableTextBase extends TextBase implements EditableTextB
 	public autocapitalizationType: CoreTypes.AutocapitalizationInputType;
 	public autofillType: CoreTypes.AutofillType;
 	public editable: boolean;
+	public selectable: boolean;
 	public autocorrect: boolean;
 	public hint: string;
 	public maxLength: number;
@@ -63,7 +65,7 @@ export const placeholderColorProperty = new CssProperty<Style, Color>({
 	name: 'placeholderColor',
 	cssName: 'placeholder-color',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 placeholderColorProperty.register(Style);
 
@@ -87,6 +89,13 @@ export const editableProperty = new Property<EditableTextBase, boolean>({
 });
 editableProperty.register(EditableTextBase);
 
+export const selectableProperty = new Property<EditableTextBase, boolean>({
+	name: 'selectable',
+	defaultValue: true,
+	valueConverter: booleanConverter,
+});
+selectableProperty.register(EditableTextBase);
+
 export const updateTextTriggerProperty = new Property<EditableTextBase, CoreTypes.UpdateTextTriggerType>({ name: 'updateTextTrigger', defaultValue: CoreTypes.UpdateTextTrigger.textChanged });
 updateTextTriggerProperty.register(EditableTextBase);
 
diff --git a/packages/core/ui/editable-text-base/index.android.ts b/packages/core/ui/editable-text-base/index.android.ts
index 8ff4a4e072..cc49cb748f 100644
--- a/packages/core/ui/editable-text-base/index.android.ts
+++ b/packages/core/ui/editable-text-base/index.android.ts
@@ -1,4 +1,4 @@
-import { EditableTextBase as EditableTextBaseCommon, autofillTypeProperty, keyboardTypeProperty, returnKeyTypeProperty, editableProperty, autocapitalizationTypeProperty, autocorrectProperty, hintProperty, placeholderColorProperty, maxLengthProperty } from './editable-text-base-common';
+import { EditableTextBase as EditableTextBaseCommon, autofillTypeProperty, keyboardTypeProperty, returnKeyTypeProperty, editableProperty, autocapitalizationTypeProperty, autocorrectProperty, hintProperty, placeholderColorProperty, maxLengthProperty, selectableProperty } from './editable-text-base-common';
 import { textTransformProperty, textProperty, resetSymbol } from '../text-base';
 import { Color } from '../../color';
 import { ad } from '../../utils';
@@ -63,7 +63,7 @@ function initializeEditTextListeners(): void {
 			this.owner?.get()?.beforeTextChanged(text, start, count, after);
 		}
 
-		public onTextChanged(text: string, start: number, before: number, count: number): void {
+		public onTextChanged(text: any /* java.lang.CharSequence */, start: number, before: number, count: number): void {
 			this.owner?.get()?.onTextChanged(text, start, before, count);
 		}
 
@@ -106,6 +106,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 	public initNativeView(): void {
 		super.initNativeView();
 		const editText = this.nativeTextViewProtected;
+		editText.setTextIsSelectable(this.selectable);
 		this._configureEditText(editText);
 		initializeEditTextListeners();
 		const listeners = new EditTextListeners(new WeakRef(this));
@@ -168,7 +169,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 		const nativeView = this.nativeTextViewProtected;
 		try {
 			this._changeFromCode = true;
-			nativeView.setInputType(parseInt(<any>inputType, 10));
+			nativeView.setInputType(this.editable ? parseInt(<any>inputType, 10) : 0);
 		} finally {
 			this._changeFromCode = false;
 		}
@@ -236,6 +237,10 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 				newInputType = android.text.InputType.TYPE_CLASS_NUMBER;
 				break;
 
+			case 'decimal':
+				newInputType = android.text.InputType.TYPE_CLASS_NUMBER | android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL;
+				break;
+
 			default: {
 				const inputType = +value;
 				if (!isNaN(inputType)) {
@@ -369,6 +374,13 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 		}
 	}
 
+	[selectableProperty.getDefault](): boolean {
+		return true;
+	}
+	[selectableProperty.setNative](value: boolean) {
+		this.nativeViewProtected.setTextIsSelectable(value);
+	}
+
 	[autocapitalizationTypeProperty.getDefault](): 'none' | 'words' | 'sentences' | 'allcharacters' | string {
 		const inputType = this.nativeTextViewProtected.getInputType();
 		if ((inputType & android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS) === android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS) {
@@ -498,11 +510,18 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 		// called by android.text.TextWatcher
 	}
 
-	public onTextChanged(text: string, start: number, before: number, count: number): void {
+	public onTextChanged(text: any /* java.lang.CharSequence */, start: number, before: number, count: number): void {
+		if (text === <any>this.text) {
+			return;
+		}
 		// called by android.text.TextWatcher
 		if (this.valueFormatter) {
-			this.text = this.valueFormatter(text.toString());
-			this.android.setSelection((this.text || '').length);
+			const newValue = <any>this.text instanceof java.lang.CharSequence ? this.text : this.valueFormatter?.(text.toString()) || text.toString();
+			// prevent infinite loop
+			if (newValue !== this.text) {
+				this.text = newValue;
+				this.nativeTextViewProtected.setSelection((newValue || '').length);
+			}
 		}
 		// const owner = this.owner;
 		// let selectionStart = owner.android.getSelectionStart();
diff --git a/packages/core/ui/editable-text-base/index.ios.ts b/packages/core/ui/editable-text-base/index.ios.ts
index e12efe3eb1..bf6ab0215d 100644
--- a/packages/core/ui/editable-text-base/index.ios.ts
+++ b/packages/core/ui/editable-text-base/index.ios.ts
@@ -1,12 +1,12 @@
-import { EditableTextBase as EditableTextBaseCommon, autofillTypeProperty, keyboardTypeProperty, returnKeyTypeProperty, autocapitalizationTypeProperty, autocorrectProperty } from './editable-text-base-common';
+import { EditableTextBase as EditableTextBaseCommon, autofillTypeProperty, keyboardTypeProperty, returnKeyTypeProperty, autocapitalizationTypeProperty, autocorrectProperty, selectableProperty } from './editable-text-base-common';
 import { FormattedString } from '../text-base/formatted-string';
 import { CoreTypes } from '../../core-types';
 
 export * from './editable-text-base-common';
 
 export abstract class EditableTextBase extends EditableTextBaseCommon {
-	public nativeViewProtected: UITextField | UITextView;
-	public readonly nativeTextViewProtected: UITextField | UITextView;
+	public declare nativeViewProtected: UITextField | UITextView;
+	public declare readonly nativeTextViewProtected: UITextField | UITextView;
 	public dismissSoftInput() {
 		this.nativeTextViewProtected.resignFirstResponder();
 		this.notify({ eventName: EditableTextBase.blurEvent, object: this });
@@ -64,6 +64,10 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 				newKeyboardType = UIKeyboardType.NumberPad;
 				break;
 
+			case 'decimal':
+				newKeyboardType = UIKeyboardType.DecimalPad;
+				break;
+
 			default: {
 				const kt = +value;
 				if (!isNaN(kt)) {
@@ -244,6 +248,13 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 		this.nativeTextViewProtected.autocorrectionType = newValue;
 		this.nativeTextViewProtected.spellCheckingType = spelling;
 	}
+
+	[selectableProperty.getDefault](): boolean {
+		return true;
+	}
+	[selectableProperty.setNative](value: boolean) {
+		this.nativeViewProtected['selectable'] = value;
+	}
 	public setSelection(start: number, stop?: number) {
 		const view = this.nativeTextViewProtected;
 		if (view) {
diff --git a/packages/core/ui/frame/fragment.android.ts b/packages/core/ui/frame/fragment.android.ts
index 0e114ae121..b7067eda3b 100644
--- a/packages/core/ui/frame/fragment.android.ts
+++ b/packages/core/ui/frame/fragment.android.ts
@@ -14,6 +14,10 @@ const FragmentClass = (<any>org.nativescript.widgets.FragmentBase).extend('com.t
 		return this._callbacks.onCreateAnimator(this, transit, enter, nextAnim, superProto.onCreateAnimator);
 	},
 
+	onCreateAnimation(transit: number, enter: boolean, nextAnim: number): android.view.animation.Animation {
+		return this._callbacks.onCreateAnimation(this, transit, enter, nextAnim, superProto.onCreateAnimation);
+	},
+
 	onStop(): void {
 		this._callbacks.onStop(this, superProto.onStop);
 	},
diff --git a/packages/core/ui/frame/fragment.transitions.android.ts b/packages/core/ui/frame/fragment.transitions.android.ts
index 434c69ce85..feb8cd598b 100644
--- a/packages/core/ui/frame/fragment.transitions.android.ts
+++ b/packages/core/ui/frame/fragment.transitions.android.ts
@@ -9,6 +9,8 @@ import { _resolveAnimationCurve } from '../animation';
 import { CoreTypes } from '../enums';
 import lazy from '../../utils/lazy';
 import { Trace } from '../../trace';
+import { FadeTransition } from '../transition/fade-transition';
+import { SlideTransition } from '../transition/slide-transition';
 import { SharedTransition, SharedTransitionAnimationType } from '../transition/shared-transition';
 
 interface TransitionListener {
@@ -28,6 +30,7 @@ let AnimationListener: android.animation.Animator.AnimatorListener;
 
 interface ExpandedTransitionListener extends androidx.transition.Transition.TransitionListener {
 	entry: ExpandedEntry;
+	backEntry?: BackstackEntry;
 	transition: androidx.transition.Transition;
 }
 
@@ -53,7 +56,6 @@ export interface ExpandedEntry extends BackstackEntry {
 	frameId: number;
 
 	isNestedDefaultTransition: boolean;
-	isAnimationRunning: boolean;
 }
 
 export function _setAndroidFragmentTransitions(animated: boolean, navigationTransition: NavigationTransition, currentEntry: ExpandedEntry, newEntry: ExpandedEntry, frameId: number, fragmentTransaction: androidx.fragment.app.FragmentTransaction, layoutDirection: CoreTypes.LayoutDirectionType, isNestedDefaultTransition?: boolean): void {
@@ -63,49 +65,44 @@ export function _setAndroidFragmentTransitions(animated: boolean, navigationTran
 	if (entries && entries.size > 0) {
 		throw new Error('Calling navigation before previous navigation finish.');
 	}
-	newEntry.isAnimationRunning = false;
 
 	allowTransitionOverlap(currentFragment);
 	allowTransitionOverlap(newFragment);
 
 	let name = '';
-	let transition: Transition;
+	let customTransition: Transition;
 
 	if (navigationTransition) {
-		transition = navigationTransition.instance;
+		customTransition = navigationTransition.instance;
 		name = navigationTransition.name ? navigationTransition.name.toLowerCase() : '';
 	}
 
 	if (!animated) {
 		name = 'none';
-	} else if (transition) {
+	} else if (customTransition) {
 		name = 'custom';
-	} else if (name.indexOf('slide') !== 0 && name !== 'fade' && name.indexOf('flip') !== 0 && name.indexOf('explode') !== 0) {
+	} else if (name.indexOf('slide') !== 0 && name !== 'fade' && name.indexOf('flip') !== 0) {
 		// If we are given name that doesn't match any of ours - fallback to default.
 		name = 'default';
 	}
-
 	let currentFragmentNeedsDifferentAnimation = false;
 	if (currentEntry) {
 		_updateTransitions(currentEntry);
-		if (currentEntry.transitionName !== name || currentEntry.transition !== transition || isNestedDefaultTransition) {
+		if (currentEntry.transitionName !== name || currentEntry.transition !== customTransition || isNestedDefaultTransition) {
 			clearExitAndReenterTransitions(currentEntry, true);
 			currentFragmentNeedsDifferentAnimation = true;
 		}
 	}
-
+	let transition: Transition;
 	if (name === 'none') {
 		const noTransition = new NoTransition(0, null);
-
-		// Setup empty/immediate animator when transitioning to nested frame for first time.
-		// Also setup empty/immediate transition to be executed when navigating back to this page.
-		// TODO: Consider removing empty/immediate animator when migrating to official androidx.fragment.app.Fragment:1.2.
 		if (isNestedDefaultTransition) {
-			fragmentTransaction.setCustomAnimations(animFadeIn, animFadeOut);
-			setupAllAnimation(newEntry, noTransition);
-			setupNewFragmentCustomTransition({ duration: 0, curve: null }, newEntry, noTransition);
-		} else {
-			setupNewFragmentCustomTransition({ duration: 0, curve: null }, newEntry, noTransition);
+			// with androidx.fragment 1.3.0 the first fragment animation is not triggered
+			// so let's simulate a transition end
+			setTimeout(() => {
+				addToWaitingQueue(newEntry);
+				transitionOrAnimationCompleted(newEntry, null);
+			});
 		}
 
 		newEntry.isNestedDefaultTransition = isNestedDefaultTransition;
@@ -113,56 +110,42 @@ export function _setAndroidFragmentTransitions(animated: boolean, navigationTran
 		if (currentFragmentNeedsDifferentAnimation) {
 			setupCurrentFragmentCustomTransition({ duration: 0, curve: null }, currentEntry, noTransition);
 		}
-	} else if (name === 'custom') {
+	} else if (customTransition) {
 		setupNewFragmentCustomTransition(
 			{
-				duration: transition.getDuration(),
-				curve: transition.getCurve(),
+				duration: customTransition.getDuration(),
+				curve: customTransition.getCurve(),
 			},
 			newEntry,
-			transition,
+			customTransition,
 		);
 		if (currentFragmentNeedsDifferentAnimation) {
 			setupCurrentFragmentCustomTransition(
 				{
-					duration: transition.getDuration(),
-					curve: transition.getCurve(),
+					duration: customTransition.getDuration(),
+					curve: customTransition.getCurve(),
 				},
 				currentEntry,
-				transition,
+				customTransition,
 			);
 		}
 	} else if (name === 'default') {
-		setupNewFragmentFadeTransition({ duration: 150, curve: null }, newEntry);
-		if (currentFragmentNeedsDifferentAnimation) {
-			setupCurrentFragmentFadeTransition({ duration: 150, curve: null }, currentEntry);
-		}
+		transition = new FadeTransition(150, null);
 	} else if (name.indexOf('slide') === 0) {
 		const defaultDirection = layoutDirection === CoreTypes.LayoutDirection.rtl ? 'right' : 'left';
 		const direction = name.substring('slide'.length) || defaultDirection; // Extract the direction from the string
-
-		setupNewFragmentSlideTransition(navigationTransition, newEntry, direction);
-		if (currentFragmentNeedsDifferentAnimation) {
-			setupCurrentFragmentSlideTransition(navigationTransition, currentEntry, direction);
-		}
+		transition = new SlideTransition(direction, navigationTransition.duration, navigationTransition.curve);
 	} else if (name === 'fade') {
-		setupNewFragmentFadeTransition(navigationTransition, newEntry);
-		if (currentFragmentNeedsDifferentAnimation) {
-			setupCurrentFragmentFadeTransition(navigationTransition, currentEntry);
-		}
-	} else if (name === 'explode') {
-		setupNewFragmentExplodeTransition(navigationTransition, newEntry);
-		if (currentFragmentNeedsDifferentAnimation) {
-			setupCurrentFragmentExplodeTransition(navigationTransition, currentEntry);
-		}
+		transition = new FadeTransition(navigationTransition.duration, navigationTransition.curve);
 	} else if (name.indexOf('flip') === 0) {
 		const defaultDirection = layoutDirection === CoreTypes.LayoutDirection.rtl ? 'left' : 'right';
 		const direction = name.substring('flip'.length) || defaultDirection; // Extract the direction from the string
-		const flipTransition = new FlipTransition(direction, navigationTransition.duration, navigationTransition.curve);
-
-		setupNewFragmentCustomTransition(navigationTransition, newEntry, flipTransition);
+		transition = new FlipTransition(direction, navigationTransition.duration, navigationTransition.curve);
+	}
+	if (transition) {
+		setupNewFragmentCustomTransition(navigationTransition, newEntry, transition);
 		if (currentFragmentNeedsDifferentAnimation) {
-			setupCurrentFragmentCustomTransition(navigationTransition, currentEntry, flipTransition);
+			setupCurrentFragmentCustomTransition(navigationTransition, currentEntry, transition);
 		}
 	}
 
@@ -171,12 +154,13 @@ export function _setAndroidFragmentTransitions(animated: boolean, navigationTran
 	if (currentEntry) {
 		currentEntry.transitionName = name;
 		if (name === 'custom') {
-			currentEntry.transition = transition;
+			currentEntry.transition = transition || customTransition;
 		}
 	}
-
-	printTransitions(currentEntry);
-	printTransitions(newEntry);
+	if (Trace.isEnabled()) {
+		printTransitions(currentEntry);
+		printTransitions(newEntry);
+	}
 }
 
 function setupAllAnimation(entry: ExpandedEntry, transition: Transition): void {
@@ -231,11 +215,11 @@ function getAnimationListener(): android.animation.Animator.AnimatorListener {
 
 			onAnimationStart(animator: ExpandedAnimator): void {
 				const entry = animator.entry;
+				const backEntry = animator.backEntry;
 				addToWaitingQueue(entry);
 				if (Trace.isEnabled()) {
 					Trace.write(`START ${animator.transitionType} for ${entry.fragmentTag}`, Trace.categories.Transition);
 				}
-				entry.isAnimationRunning = true;
 			}
 
 			onAnimationRepeat(animator: ExpandedAnimator): void {
@@ -245,18 +229,19 @@ function getAnimationListener(): android.animation.Animator.AnimatorListener {
 			}
 
 			onAnimationEnd(animator: ExpandedAnimator): void {
+				const entry = animator.entry;
+				const backEntry = animator.backEntry;
 				if (Trace.isEnabled()) {
-					Trace.write(`END ${animator.transitionType} for ${animator.entry.fragmentTag}`, Trace.categories.Transition);
+					Trace.write(`END ${animator.transitionType} for ${entry.fragmentTag} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
 				}
-				animator.entry.isAnimationRunning = false;
-				transitionOrAnimationCompleted(animator.entry, animator.backEntry);
+				transitionOrAnimationCompleted(entry, backEntry);
+				animator.backEntry = null;
 			}
 
 			onAnimationCancel(animator: ExpandedAnimator): void {
 				if (Trace.isEnabled()) {
-					Trace.write(`CANCEL ${animator.transitionType} for ${animator.entry.fragmentTag}`, Trace.categories.Transition);
+					Trace.write(`CANCEL ${animator.transitionType} for ${animator.entry.fragmentTag} backEntry:${animator.backEntry?.fragmentTag ?? 'none'}`, Trace.categories.Transition);
 				}
-				animator.entry.isAnimationRunning = false;
 			}
 		}
 
@@ -377,7 +362,6 @@ function getTransitionListener(entry: ExpandedEntry, transition: androidx.transi
 
 			public onTransitionStart(transition: androidx.transition.Transition): void {
 				const entry = this.entry;
-				entry.isAnimationRunning = true;
 				addToWaitingQueue(entry);
 				if (Trace.isEnabled()) {
 					Trace.write(`START ${toShortString(transition)} transition for ${entry.fragmentTag}`, Trace.categories.Transition);
@@ -389,14 +373,17 @@ function getTransitionListener(entry: ExpandedEntry, transition: androidx.transi
 
 			onTransitionEnd(transition: androidx.transition.Transition): void {
 				const entry = this.entry;
+				const backEntry = this.backEntry;
 				if (Trace.isEnabled()) {
-					Trace.write(`END ${toShortString(transition)} transition for ${entry.fragmentTag}`, Trace.categories.Transition);
+					Trace.write(`END ${toShortString(transition)} transition for ${entry.fragmentTag} backEntry:${backEntry ? backEntry.fragmentTag : 'none'}`, Trace.categories.Transition);
 				}
-				entry.isAnimationRunning = false;
-				transitionOrAnimationCompleted(entry, this.backEntry);
+				transitionOrAnimationCompleted(entry, backEntry);
+				entry?.transition?.onTransitionEnd?.(entry);
+
 				if (entry?.transition) {
 					notifySharedTransition(entry.transition?.id, SharedTransition.finishedEvent);
 				}
+				this.backEntry = null;
 			}
 
 			onTransitionResume(transition: androidx.transition.Transition): void {
@@ -414,9 +401,8 @@ function getTransitionListener(entry: ExpandedEntry, transition: androidx.transi
 
 			onTransitionCancel(transition: androidx.transition.Transition): void {
 				const entry = this.entry;
-				entry.isAnimationRunning = false;
 				if (Trace.isEnabled()) {
-					Trace.write(`CANCEL ${toShortString(transition)} transition for ${this.entry.fragmentTag}`, Trace.categories.Transition);
+					Trace.write(`CANCEL ${toShortString(transition)} transition for ${this.entry.fragmentTag} backEntry:${this.backEntry?.fragmentTag ?? 'none'}`, Trace.categories.Transition);
 				}
 			}
 		}
@@ -628,56 +614,6 @@ function setReturnTransition(navigationTransition: NavigationTransition, entry:
 	fragment.setReturnTransition(transition);
 }
 
-function setupNewFragmentSlideTransition(navTransition: NavigationTransition, entry: ExpandedEntry, direction: string): void {
-	setupCurrentFragmentSlideTransition(navTransition, entry, direction);
-
-	switch (direction) {
-		case 'left':
-			setEnterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.RIGHT));
-			setReturnTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.RIGHT));
-			break;
-
-		case 'right':
-			setEnterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.LEFT));
-			setReturnTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.LEFT));
-			break;
-
-		case 'top':
-			setEnterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.BOTTOM));
-			setReturnTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.BOTTOM));
-			break;
-
-		case 'bottom':
-			setEnterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.TOP));
-			setReturnTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.TOP));
-			break;
-	}
-}
-
-function setupCurrentFragmentSlideTransition(navTransition: NavigationTransition, entry: ExpandedEntry, direction: string): void {
-	switch (direction) {
-		case 'left':
-			setExitTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.LEFT));
-			setReenterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.LEFT));
-			break;
-
-		case 'right':
-			setExitTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.RIGHT));
-			setReenterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.RIGHT));
-			break;
-
-		case 'top':
-			setExitTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.TOP));
-			setReenterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.TOP));
-			break;
-
-		case 'bottom':
-			setExitTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.BOTTOM));
-			setReenterTransition(navTransition, entry, new androidx.transition.Slide(android.view.Gravity.BOTTOM));
-			break;
-	}
-}
-
 function setupCurrentFragmentCustomTransition(navTransition: NavigationTransition, entry: ExpandedEntry, transition: Transition): void {
 	const exitAnimator = transition.createAndroidAnimator(Transition.AndroidTransitionType.exit);
 	const exitTransition = new org.nativescript.widgets.CustomTransition(exitAnimator, transition.constructor.name + Transition.AndroidTransitionType.exit.toString());
@@ -694,7 +630,25 @@ function setupNewFragmentCustomTransition(navTransition: NavigationTransition, e
 	setupCurrentFragmentCustomTransition(navTransition, entry, transition);
 
 	const enterAnimator = transition.createAndroidAnimator(Transition.AndroidTransitionType.enter);
+
 	const enterTransition = new org.nativescript.widgets.CustomTransition(enterAnimator, transition.constructor.name + Transition.AndroidTransitionType.enter.toString());
+
+	// if the animation is cancelled during the transition
+	// the fragment will get stuck in an in-between state
+	// use that listener to force to go to the end position
+	enterAnimator.addListener(
+		new android.animation.Animator.AnimatorListener({
+			onAnimationStart: function (animator: android.animation.Animator): void {},
+			onAnimationEnd: (animator: android.animation.Animator) => {},
+			onAnimationRepeat: function (animator: android.animation.Animator): void {},
+			onAnimationCancel: (animator: android.animation.Animator) => {
+				const immediateAnimatorSet = animator.clone();
+				immediateAnimatorSet.setDuration(0);
+				immediateAnimatorSet.start();
+			},
+		})
+	);
+
 	setEnterTransition(navTransition, entry, enterTransition);
 
 	const returnAnimator = transition.createAndroidAnimator(Transition.AndroidTransitionType.popExit);
@@ -722,19 +676,10 @@ function setupCurrentFragmentFadeTransition(navTransition: NavigationTransition,
 	setReenterTransition(navTransition, entry, fadeInReenter);
 }
 
-function setupCurrentFragmentExplodeTransition(navTransition: NavigationTransition, entry: ExpandedEntry): void {
-	setExitTransition(navTransition, entry, new androidx.transition.Explode());
-	setReenterTransition(navTransition, entry, new androidx.transition.Explode());
-}
-
-function setupNewFragmentExplodeTransition(navTransition: NavigationTransition, entry: ExpandedEntry): void {
-	setupCurrentFragmentExplodeTransition(navTransition, entry);
-
-	setEnterTransition(navTransition, entry, new androidx.transition.Explode());
-	setReturnTransition(navTransition, entry, new androidx.transition.Explode());
-}
-
 function setUpNativeTransition(navigationTransition: NavigationTransition, nativeTransition: androidx.transition.Transition) {
+	if (!navigationTransition) {
+		return;
+	}
 	if (navigationTransition.duration) {
 		nativeTransition.setDuration(navigationTransition.duration);
 	}
@@ -796,7 +741,7 @@ function toShortString(nativeTransition: androidx.transition.Transition): string
 }
 
 function printTransitions(entry: ExpandedEntry) {
-	if (entry && Trace.isEnabled()) {
+	if (entry) {
 		let result = `${entry.fragmentTag} Transitions:`;
 		if (entry.transitionName) {
 			result += `transitionName=${entry.transitionName}, `;
diff --git a/packages/core/ui/frame/frame-common.ts b/packages/core/ui/frame/frame-common.ts
index 33edd741c1..55fc04f6e9 100644
--- a/packages/core/ui/frame/frame-common.ts
+++ b/packages/core/ui/frame/frame-common.ts
@@ -118,10 +118,14 @@ export class FrameBase extends CustomLayoutView {
 	public _addChildFromBuilder(name: string, value: any) {
 		throw new Error(`Frame should not have a view. Use 'defaultPage' property instead.`);
 	}
-
+	inOnLoaded = false;
 	@profile
 	public onLoaded() {
+		// there we dont want to call "loadView" on pages in the backstack as they are not visible
+		this.inOnLoaded = true;
 		super.onLoaded();
+		this.inOnLoaded = false;
+
 		this._processNextNavigationEntry();
 	}
 
@@ -261,9 +265,8 @@ export class FrameBase extends CustomLayoutView {
 
 		// In case we navigated forward to a page that was in the backstack
 		// with clearHistory: true
+		this._resolvedPage = newPage;
 		if (!newPage.frame) {
-			this._resolvedPage = newPage;
-
 			this._addView(newPage);
 		}
 
@@ -292,8 +295,8 @@ export class FrameBase extends CustomLayoutView {
 	public _updateBackstack(entry: BackstackEntry, navigationType: NavigationType): void {
 		const isBack = navigationType === NavigationType.back;
 		const isReplace = navigationType === NavigationType.replace;
-		this.raiseCurrentPageNavigatedEvents(isBack);
 		const current = this._currentEntry;
+		this.raiseCurrentPageNavigatedEvents(isBack);
 
 		// Do nothing for Hot Module Replacement
 		if (isBack) {
@@ -427,39 +430,51 @@ export class FrameBase extends CustomLayoutView {
 
 	@profile
 	public performNavigation(navigationContext: NavigationContext) {
-		this._executingContext = navigationContext;
-
-		const backstackEntry = navigationContext.entry;
-		const isBackNavigation = navigationContext.navigationType === NavigationType.back;
-		this._onNavigatingTo(backstackEntry, isBackNavigation);
-		const navigationTransition = this._getNavigationTransition(backstackEntry.entry);
-		if (navigationTransition?.instance) {
-			const state = SharedTransition.getState(navigationTransition?.instance.id);
-			SharedTransition.updateState(navigationTransition?.instance.id, {
-				// Allow setting custom page context to override default (from) page
-				// helpful for deeply nested frame navigation setups (eg: Nested Tab Navigation)
-				// when sharing elements in this condition, the (from) page would
-				// get overridden on each frame preventing shared element matching
-				page: state?.page || this.currentPage,
-				toPage: this,
-			});
+		try {
+			this._executingContext = navigationContext;
+
+			const backstackEntry = navigationContext.entry;
+			const isBackNavigation = navigationContext.navigationType === NavigationType.back;
+			this._onNavigatingTo(backstackEntry, isBackNavigation);
+			const navigationTransition = this._getNavigationTransition(backstackEntry.entry);
+			if (navigationTransition?.instance) {
+				const state = SharedTransition.getState(navigationTransition?.instance.id);
+				SharedTransition.updateState(navigationTransition?.instance.id, {
+					// Allow setting custom page context to override default (from) page
+					// helpful for deeply nested frame navigation setups (eg: Nested Tab Navigation)
+					// when sharing elements in this condition, the (from) page would
+					// get overridden on each frame preventing shared element matching
+					page: state?.page || this.currentPage,
+					toPage: this,
+				});
+			}
+			this._navigateCore(backstackEntry);
+		} catch (error) {
+			// reset _executingContext or next navigations will be blocked
+			this._executingContext = null;
+			throw error;
 		}
-		this._navigateCore(backstackEntry);
 	}
 
 	@profile
 	performGoBack(navigationContext: NavigationContext) {
-		const backstack = this._backStack;
-		const backstackEntry = navigationContext.entry || backstack[backstack.length - 1];
+		try {
+			const backstack = this._backStack;
+			const backstackEntry = navigationContext.entry || backstack[backstack.length - 1];
 
-		if (backstackEntry) {
-			navigationContext.entry = backstackEntry;
+			if (backstackEntry) {
+				navigationContext.entry = backstackEntry;
 
-			this._executingContext = navigationContext;
-			this._onNavigatingTo(backstackEntry, true);
-			this._goBackCore(backstackEntry);
-		} else {
-			Trace.write('Frame.performGoBack: No backstack entry found to navigate back to', Trace.categories.Navigation, Trace.messageType.warn);
+				this._executingContext = navigationContext;
+				this._onNavigatingTo(backstackEntry, true);
+				this._goBackCore(backstackEntry);
+			} else {
+				Trace.write('Frame.performGoBack: No backstack entry found to navigate back to', Trace.categories.Navigation, Trace.messageType.warn);
+			}
+		} catch (error) {
+			// reset _executingContext or next navigations will be blocked
+			this._executingContext = null;
+			throw error;
 		}
 	}
 
@@ -479,6 +494,9 @@ export class FrameBase extends CustomLayoutView {
 		if (this.currentPage) {
 			this.currentPage.onNavigatingFrom(isBack);
 		}
+		if (isBack) {
+			backstackEntry.resolvedPage.callLoaded();
+		}
 
 		backstackEntry.resolvedPage.onNavigatingTo(backstackEntry.entry.context, isBack, backstackEntry.entry.bindingContext);
 		this.notify<NavigationData>({
@@ -581,6 +599,15 @@ export class FrameBase extends CustomLayoutView {
 		if (page) {
 			callback(page);
 		}
+		if (this.inOnLoaded) {
+			return;
+		}
+		for (let index = 0; index < this.backStack.length; index++) {
+			const backstackEntry = this.backStack[index];
+			if (backstackEntry.resolvedPage) {
+				callback(backstackEntry.resolvedPage);
+			}
+		}
 	}
 
 	public _getIsAnimatedNavigation(entry: NavigationEntry): boolean {
@@ -595,7 +622,7 @@ export class FrameBase extends CustomLayoutView {
 		return FrameBase.defaultAnimatedNavigation;
 	}
 
-	public _getNavigationTransition(entry: NavigationEntry): NavigationTransition {
+	public _getNavigationTransition(entry: NavigationEntry, returnDefault = true): NavigationTransition {
 		if (entry) {
 			if (__APPLE__ && entry.transitioniOS !== undefined) {
 				return entry.transitioniOS;
@@ -614,7 +641,7 @@ export class FrameBase extends CustomLayoutView {
 			return this.transition;
 		}
 
-		return FrameBase.defaultTransition;
+		return returnDefault ? FrameBase.defaultTransition : undefined;
 	}
 
 	public get navigationBarHeight(): number {
diff --git a/packages/core/ui/frame/frame-helper-for-android.ts b/packages/core/ui/frame/frame-helper-for-android.ts
index e6d505ede9..0bcea2e8ee 100644
--- a/packages/core/ui/frame/frame-helper-for-android.ts
+++ b/packages/core/ui/frame/frame-helper-for-android.ts
@@ -2,10 +2,8 @@ import { Trace } from '../../trace';
 import { _clearEntry, _clearFragment, _getAnimatedEntries, _reverseTransitions, _setAndroidFragmentTransitions, _updateTransitions } from './fragment.transitions';
 import type { BackstackEntry } from '.';
 import { profile } from '../../profiling';
-import { getNativeApp } from '../../application/helpers-common';
-import { Color } from '../../color';
 import type { Page } from '../page';
-import type { AndroidFrame as Frame } from '.';
+import type { Frame } from '.';
 export const FRAMEID = '_frameId';
 export const CALLBACKS = '_callbacks';
 export const framesCache = new Array<WeakRef<any>>();
@@ -37,6 +35,12 @@ function findPageForFragment(fragment: androidx.fragment.app.Fragment, frame: Fr
 		entry = current;
 	} else if (executingContext && executingContext.entry && executingContext.entry.fragmentTag === fragmentTag) {
 		entry = executingContext.entry;
+	} else {
+		frame.backStack.forEach((e) => {
+			if (e && e.fragmentTag === fragmentTag) {
+				entry = e;
+			}
+		});
 	}
 
 	let page: Page;
@@ -73,6 +77,9 @@ export class FragmentCallbacksImplementation implements AndroidFragmentCallbacks
 	public onCreateAnimator(fragment: androidx.fragment.app.Fragment, transit: number, enter: boolean, nextAnim: number, superFunc: Function): android.animation.Animator {
 		let animator = null;
 		const entry = <any>this.entry;
+		if (Trace.isEnabled()) {
+			Trace.write(`${fragment}.onCreateAnimator(${transit},${enter}, ${nextAnim})`, Trace.categories.Animation);
+		}
 
 		// Return enterAnimator only when new (no current entry) nested transition.
 		if (enter && entry.isNestedDefaultTransition) {
@@ -83,6 +90,14 @@ export class FragmentCallbacksImplementation implements AndroidFragmentCallbacks
 		return animator || superFunc.call(fragment, transit, enter, nextAnim);
 	}
 
+	@profile
+	public onCreateAnimation(fragment: androidx.fragment.app.Fragment, transit: number, enter: boolean, nextAnim: number, superFunc: Function): globalAndroid.view.animation.Animation {
+		if (Trace.isEnabled()) {
+			Trace.write(`${fragment}.onCreateAnimation(${transit},${enter}, ${nextAnim})`, Trace.categories.Animation);
+		}
+		return superFunc.call(fragment, transit, enter, nextAnim);
+	}
+
 	@profile
 	public onCreate(fragment: androidx.fragment.app.Fragment, savedInstanceState: android.os.Bundle, superFunc: Function): void {
 		if (Trace.isEnabled()) {
@@ -202,17 +217,17 @@ export class FragmentCallbacksImplementation implements AndroidFragmentCallbacks
 				Trace.write(`${fragment}.onDestroyView()`, Trace.categories.NativeLifecycle);
 			}
 
-			const hasRemovingParent = fragment.getRemovingParentFragment();
-
-			if (hasRemovingParent) {
-				const nativeFrameView = this.frame.nativeViewProtected;
-				if (nativeFrameView) {
-					const bitmapDrawable = new android.graphics.drawable.BitmapDrawable(getNativeApp<android.app.Application>().getApplicationContext().getResources(), this.backgroundBitmap);
-					this.frame._originalBackground = this.frame.backgroundColor || new Color('White');
-					nativeFrameView.setBackgroundDrawable(bitmapDrawable);
-					this.backgroundBitmap = null;
-				}
-			}
+			// const hasRemovingParent = fragment.getRemovingParentFragment();
+
+			// if (hasRemovingParent) {
+			// 	const nativeFrameView = this.frame.nativeViewProtected;
+			// 	if (nativeFrameView) {
+			// 		const bitmapDrawable = new android.graphics.drawable.BitmapDrawable(getApplicationContext().getResources(), this.backgroundBitmap);
+			// 		this.frame._originalBackground = this.frame.backgroundColor || new Color('White');
+			// 		nativeFrameView.setBackgroundDrawable(bitmapDrawable);
+			// 		this.backgroundBitmap = null;
+			// 	}
+			// }
 		} finally {
 			superFunc.call(fragment);
 		}
@@ -238,52 +253,15 @@ export class FragmentCallbacksImplementation implements AndroidFragmentCallbacks
 		// "IllegalStateException: Failure saving state: active fragment has cleared index: -1"
 		// in a specific mixed parent / nested frame navigation scenario
 		entry.fragment = null;
-
-		const page = entry.resolvedPage;
-		if (!page) {
-			// todo: check why this happens when using shared element transition!!!
-			// commented out the Trace.error to prevent a crash (the app will still work interestingly)
-			console.log(`${fragment}.onDestroy: entry has no resolvedPage`);
-			// Trace.error(`${fragment}.onDestroy: entry has no resolvedPage`);
-
-			return null;
-		}
 	}
 
 	@profile
 	public onPause(fragment: org.nativescript.widgets.FragmentBase, superFunc: Function): void {
-		try {
-			// Get view as bitmap and set it as background. This is workaround for the disapearing nested fragments.
-			// TODO: Consider removing it when update to androidx.fragment:1.2.0
-			const hasRemovingParent = fragment.getRemovingParentFragment();
-
-			if (hasRemovingParent) {
-				this.backgroundBitmap = this.loadBitmapFromView(this.frame.nativeViewProtected);
-			}
-		} finally {
-			superFunc.call(fragment);
-		}
+		superFunc.call(fragment);
 	}
 
 	@profile
 	public onResume(fragment: org.nativescript.widgets.FragmentBase, superFunc: Function): void {
-		const frame = this.entry.resolvedPage.frame;
-		// on some cases during the first navigation on nested frames the animation doesn't trigger
-		// we depend on the animation (even None animation) to set the entry as the current entry
-		// animation should start between start and resume, so if we have an executing navigation here it probably means the animation was skipped
-		// so we manually set the entry
-		// also, to be compatible with fragments 1.2.x we need this setTimeout as animations haven't run on onResume yet
-		const weakRef = new WeakRef(this);
-		setTimeout(() => {
-			const owner = weakRef.get();
-			if (!owner) {
-				return;
-			}
-			if (frame._executingContext && !(<any>owner.entry).isAnimationRunning) {
-				frame.setCurrent(owner.entry, frame._executingContext.navigationType);
-			}
-		}, 0);
-
 		superFunc.call(fragment);
 	}
 
diff --git a/packages/core/ui/frame/frame-interfaces.ts b/packages/core/ui/frame/frame-interfaces.ts
index 8e958816a6..3de2307e53 100644
--- a/packages/core/ui/frame/frame-interfaces.ts
+++ b/packages/core/ui/frame/frame-interfaces.ts
@@ -34,6 +34,10 @@ export interface BackstackEntry {
 	viewSavedState?: any;
 	frameId?: number;
 	recreated?: boolean;
+
+	transition?: NavigationTransition;
+	transitioniOS?: NavigationTransition;
+	transitionAndroid?: NavigationTransition;
 }
 
 export interface NavigationContext {
@@ -130,6 +134,7 @@ export interface AndroidActivityCallbacks {
 export interface AndroidFragmentCallbacks {
 	onHiddenChanged(fragment: any, hidden: boolean, superFunc: Function): void;
 	onCreateAnimator(fragment: any, transit: number, enter: boolean, nextAnim: number, superFunc: Function): any;
+	onCreateAnimation(fragment: any, transit: number, enter: boolean, nextAnim: number): any;
 	onCreate(fragment: any, savedInstanceState: any, superFunc: Function): void;
 	onCreateView(fragment: any, inflater: any, container: any, savedInstanceState: any, superFunc: Function): any;
 	onSaveInstanceState(fragment: any, outState: any, superFunc: Function): void;
diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
index 3dfaa70450..bc0f9ce2f0 100644
--- a/packages/core/ui/frame/index.android.ts
+++ b/packages/core/ui/frame/index.android.ts
@@ -10,6 +10,8 @@ import { _clearEntry, _clearFragment, _getAnimatedEntries, _getTransitionState,
 import { profile } from '../../profiling';
 import { android as androidUtils } from '../../utils/native-helper';
 import type { ExpandedEntry } from './fragment.transitions.android';
+import { ContentView } from '../content-view';
+import { Transition } from '../transition';
 import { ensureFragmentClass, fragmentClass } from './fragment';
 import { getAppMainEntry } from '../../application/helpers-common';
 
@@ -70,7 +72,6 @@ function getAttachListener(): android.view.View.OnAttachStateChangeListener {
 }
 
 export class Frame extends FrameBase {
-	public _originalBackground: any;
 	private _android: AndroidFrame;
 	private _containerViewId = -1;
 	private _tearDownPending = false;
@@ -205,7 +206,9 @@ export class Frame extends FrameBase {
 			// NOTE: we are restoring the animation settings in Frame.setCurrent(...) as navigation completes asynchronously
 			const cachedTransitionState = _getTransitionState(this._currentEntry);
 
-			if (cachedTransitionState) {
+			// we can end up here also after an activity recreate. In this case the entry fragment was destroyed
+			// and we also dont have cachedTransitionState. We still need to navigate again
+			if (cachedTransitionState || !entry.fragment) {
 				this._cachedTransitionState = cachedTransitionState;
 				this._currentEntry = null;
 				// NavigateCore will eventually call _processNextNavigationEntry again.
@@ -245,12 +248,6 @@ export class Frame extends FrameBase {
 	}
 
 	onLoaded(): void {
-		if (this._originalBackground) {
-			this.backgroundColor = null;
-			this.backgroundColor = this._originalBackground;
-			this._originalBackground = null;
-		}
-
 		this._ensureEntryFragment();
 		super.onLoaded();
 	}
@@ -301,7 +298,7 @@ export class Frame extends FrameBase {
 			return;
 		}
 		const fragment: androidx.fragment.app.Fragment = this._currentEntry.fragment;
-		const fragmentManager: androidx.fragment.app.FragmentManager = fragment.getFragmentManager();
+		const fragmentManager: androidx.fragment.app.FragmentManager = fragment.getParentFragmentManager();
 
 		const transaction = fragmentManager.beginTransaction();
 		const fragmentExitTransition = fragment.getExitTransition();
@@ -331,7 +328,11 @@ export class Frame extends FrameBase {
 		backstackEntry.fragment = newFragment;
 		backstackEntry.fragmentTag = fragmentTag;
 		backstackEntry.navDepth = navDepth;
-
+		Application.android.notify({
+			eventName: Application.AndroidApplication.fragmentCreateEvent,
+			object: Application.android,
+			fragment: newFragment,
+		});
 		return newFragment;
 	}
 
@@ -420,7 +421,6 @@ export class Frame extends FrameBase {
 	// HACK: because the function parameter type is evaluated with 'typeof'
 	@profile
 	public _navigateCore(newEntry: BackstackEntry) {
-		// should be (newEntry: BackstackEntry)
 		super._navigateCore(newEntry);
 
 		// set frameId here so that we could use it in fragment.transitions
@@ -478,11 +478,25 @@ export class Frame extends FrameBase {
 			// transaction.setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
 		}
 
-		transaction.replace(this.containerViewId, newFragment, newFragmentTag);
-
+		if (this._currentEntry) {
+			// we only hide the fragment to fix some black blick issues with GLSurfaceView and GLTextureView
+			// it will be removed once the navigation is done
+			transaction.hide(this._currentEntry.fragment);
+		}
+		if (clearHistory || isReplace) {
+			// we need to ensure we dont listen for animations of
+			// in between fragments or they could break our transition end handling
+			// and set the wrong current entry
+			for (let index = 0; index < this.backStack.length; index++) {
+				_clearEntry(this.backStack[index]);
+			}
+			transaction.replace(this.containerViewId, newFragment, newFragmentTag);
+		} else {
+			transaction.add(this.containerViewId, newFragment, newFragmentTag);
+		}
 		navigationTransition?.instance?.androidFragmentTransactionCallback?.(transaction, currentEntry, newEntry);
 
-		transaction.commitAllowingStateLoss();
+		transaction.commitNowAllowingStateLoss();
 	}
 
 	public _goBackCore(backstackEntry: BackstackEntry & ExpandedEntry) {
@@ -491,7 +505,7 @@ export class Frame extends FrameBase {
 
 		const manager: androidx.fragment.app.FragmentManager = this._getFragmentManager();
 		const transaction = manager.beginTransaction();
-
+		let wasCreated = false;
 		if (!backstackEntry.fragment) {
 			// Happens on newer API levels. On older all fragments
 			// are recreated once activity is created.
@@ -499,22 +513,68 @@ export class Frame extends FrameBase {
 			// We need to recreate its animations and then reverse it.
 			backstackEntry.fragment = this.createFragment(backstackEntry, backstackEntry.fragmentTag);
 			_updateTransitions(backstackEntry);
+			wasCreated = true;
 		}
 
 		_reverseTransitions(backstackEntry, this._currentEntry);
 
-		transaction.replace(this.containerViewId, backstackEntry.fragment, backstackEntry.fragmentTag);
+		const currentIndex = this.backStack.length;
+		const goBackToIndex = this.backStack.indexOf(backstackEntry);
+
+		// the order is important so that the last transition listener called be
+		// the one from the current entry we are going back from
+		for (let index = goBackToIndex + 1; index < currentIndex; index++) {
+			// we need to ensure we dont listen for animations of
+			// in between fragments or they could break our transition end handling
+			// and set the wrong current entry
+			_clearEntry(this.backStack[index]);
+			transaction.remove(this.backStack[index].fragment);
+		}
+		if (this._currentEntry !== backstackEntry) {
+			const entry = this._currentEntry as ExpandedEntry;
+			// if we are going back we need to store where we are backing to
+			// so that we can set the current entry
+			// it only needs to be done on the return transition
+			if (entry.returnTransitionListener) {
+				entry.returnTransitionListener.backEntry = backstackEntry;
+			}
+
+			// we only hide the fragment to fix some black blick issues with GLSurfaceView and GLTextureView
+			// it will be removed once the navigation is done
+			transaction.hide(this._currentEntry.fragment);
 
-		backstackEntry.transition?.androidFragmentTransactionCallback?.(transaction, this._currentEntry, backstackEntry);
+			// let's show the previous fragment
+			if (wasCreated) {
+				transaction.add(this.containerViewId, backstackEntry.fragment, backstackEntry.fragmentTag);
+			} else {
+				transaction.show(backstackEntry.fragment);
+			}
+		}
+
+		let navigationTransition: Transition;
+		if (backstackEntry) {
+			navigationTransition = this._getNavigationTransition(backstackEntry, false)?.instance;
+		}
+		if (navigationTransition === undefined) {
+			navigationTransition = backstackEntry.transition;
+		}
+
+		navigationTransition?.androidFragmentTransactionCallback?.(transaction, this._currentEntry, backstackEntry);
 
-		transaction.commitAllowingStateLoss();
+		transaction.commitNowAllowingStateLoss();
 	}
 
 	public _removeEntry(removed: BackstackEntry): void {
 		super._removeEntry(removed);
-
 		if (removed.fragment) {
+			// we only did hide the fragment to fix some black blick issues with GLSurfaceView and GLTextureView
+			// so lets remove it
+			const manager: androidx.fragment.app.FragmentManager = this._getFragmentManager();
+			const transaction = manager.beginTransaction();
+			transaction.remove(removed.fragment);
+			// clear entry before commit because commit now will release the fragment right away
 			_clearEntry(removed);
+			transaction.commitNowAllowingStateLoss();
 			removed.fragment = null;
 		}
 
@@ -835,16 +895,17 @@ if (parseInt(Device.sdkVersion) >= 33) {
 	});
 }
 
-const activityRootViewsMap = new Map<number, WeakRef<View>>();
+const activityRootViewsMap = new Map<number, WeakRef<ContentView>>();
 const ROOT_VIEW_ID_EXTRA = 'com.tns.activity.rootViewId';
 
 export let moduleLoaded: boolean;
 
 export class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
-	private _rootView: View;
+	private _rootView: ContentView;
+	private _subRootView: View;
 
 	public getRootView(): View {
-		return this._rootView;
+		return this._subRootView || this._rootView;
 	}
 
 	@profile
@@ -874,6 +935,7 @@ export class ActivityCallbacksImplementation implements AndroidActivityCallbacks
 			const rootViewId = savedInstanceState.getInt(ROOT_VIEW_ID_EXTRA, -1);
 			if (rootViewId !== -1 && activityRootViewsMap.has(rootViewId)) {
 				this._rootView = activityRootViewsMap.get(rootViewId)?.get();
+				this._subRootView = this._rootView.content;
 			}
 		}
 
@@ -886,6 +948,12 @@ export class ActivityCallbacksImplementation implements AndroidActivityCallbacks
 			});
 		}
 
+		Application.android.notify({
+			eventName: Application.AndroidApplication.activityCreateEvent,
+			object: Application.android,
+			activity,
+		});
+
 		this.setActivityContent(activity, savedInstanceState, true);
 		moduleLoaded = true;
 	}
@@ -978,12 +1046,16 @@ export class ActivityCallbacksImplementation implements AndroidActivityCallbacks
 			if (rootView) {
 				rootView._tearDownUI(true);
 			}
+			this._rootView = null;
 
 			// this may happen when the user changes the system theme
 			// In such case, isFinishing() is false (and isChangingConfigurations is true), and the app will start again (onCreate) with a savedInstanceState
 			// as a result, launchEvent will never be called
 			// possible alternative: always fire launchEvent and exitEvent, but pass extra flags to make it clear what kind of launch/destroy is happening
 			if (activity.isFinishing()) {
+				// only clear _subRootView is finishing
+				// other we might reuse it
+				this._subRootView = null;
 				const exitArgs = {
 					eventName: Application.exitEvent,
 					object: Application.android,
@@ -1079,6 +1151,7 @@ export class ActivityCallbacksImplementation implements AndroidActivityCallbacks
 		}
 		// Delete previously cached root view in order to recreate it.
 		this._rootView = null;
+		this._subRootView = null;
 		this.setActivityContent(activity, null, false);
 		this._rootView.callLoaded();
 	}
@@ -1089,40 +1162,52 @@ export class ActivityCallbacksImplementation implements AndroidActivityCallbacks
 	// 3. Livesync if rootView has no custom _onLivesync. this._rootView should have been cleared upfront. Launch event should not fired
 	// 4. resetRootView method. this._rootView should have been cleared upfront. Launch event should not fired
 	private setActivityContent(activity: androidx.appcompat.app.AppCompatActivity, savedInstanceState: android.os.Bundle, fireLaunchEvent: boolean): void {
-		let rootView = this._rootView;
+		const rootView = new ContentView();
+		activityRootViewsMap.set(rootView._domId, new WeakRef(rootView));
+		// setup view as styleScopeHost
+		rootView._setupAsRootView(activity);
+		this._rootView = rootView;
+		// sets root classes once rootView is ready...
+		let subRootView = this._subRootView;
+		// in case we recreate the activity, subRootView is already created.
+		// we just want to set it as content
+		if (subRootView) {
+			if (subRootView.parent && subRootView.parent !== rootView) {
+				try {
+					// we might catch errors if the nativeView is already disposed
+					subRootView.parent._removeView(subRootView);
+				} catch (err) {}
+			}
+			rootView.content = subRootView;
+		}
+		Application.initRootView(rootView);
+		if (isEmbedded()) {
+			setEmbeddedView(rootView);
+		} else {
+			activity.setContentView(rootView.nativeViewProtected, new org.nativescript.widgets.CommonLayoutParams());
+		}
 
 		if (Trace.isEnabled()) {
-			Trace.write(`Frame.setActivityContent rootView: ${rootView} shouldCreateRootFrame: false fireLaunchEvent: ${fireLaunchEvent}`, Trace.categories.NativeLifecycle);
+			Trace.write(`Frame.setActivityContent rootView: ${rootView} subRootView: ${subRootView} shouldCreateRootFrame: false fireLaunchEvent: ${fireLaunchEvent}`, Trace.categories.NativeLifecycle);
 		}
 
 		const intent = activity.getIntent();
-		rootView = Application.createRootView(rootView, fireLaunchEvent, {
+		subRootView = Application.createRootView(subRootView, fireLaunchEvent, {
 			// todo: deprecate in favor of args.intent?
 			android: intent,
 			intent,
 			savedInstanceState,
 		});
 
-		if (!rootView) {
+		if (!subRootView) {
 			// no root view created
 			return;
 		}
-
-		activityRootViewsMap.set(rootView._domId, new WeakRef(rootView));
-
-		// setup view as styleScopeHost
-		rootView._setupAsRootView(activity);
-
-		if (isEmbedded()) {
-			setEmbeddedView(rootView);
-		} else {
-			activity.setContentView(rootView.nativeViewProtected, new org.nativescript.widgets.CommonLayoutParams());
+		this._subRootView = subRootView;
+		if (subRootView.parent && subRootView.parent !== rootView) {
+			subRootView.parent._removeView(subRootView);
 		}
-
-		this._rootView = rootView;
-
-		// sets root classes once rootView is ready...
-		Application.initRootView(rootView);
+		rootView.content = subRootView;
 	}
 }
 
diff --git a/packages/core/ui/frame/index.ios.ts b/packages/core/ui/frame/index.ios.ts
index 5dca6e46ca..84cda51cb5 100644
--- a/packages/core/ui/frame/index.ios.ts
+++ b/packages/core/ui/frame/index.ios.ts
@@ -318,7 +318,7 @@ export class Frame extends FrameBase {
 						if (page && page.actionBarHidden !== undefined) {
 							newValue = !page.actionBarHidden;
 						} else {
-							newValue = this.ios.controller.viewControllers.count > 1 || (page && page.actionBar && !page.actionBar._isEmpty());
+							newValue = this.ios.controller.viewControllers.count > 1 || (page && page.hasActionBar && !page.actionBar._isEmpty());
 						}
 
 						newValue = !!newValue;
@@ -527,7 +527,7 @@ class UINavigationControllerImpl extends UINavigationController {
 	public viewWillAppear(animated: boolean): void {
 		super.viewWillAppear(animated);
 		const owner = this._owner?.deref?.();
-		if (owner && !owner.isLoaded && !owner.parent) {
+		if (owner && !owner.isLoaded) {
 			owner.callLoaded();
 		}
 	}
@@ -536,7 +536,7 @@ class UINavigationControllerImpl extends UINavigationController {
 	public viewDidDisappear(animated: boolean): void {
 		super.viewDidDisappear(animated);
 		const owner = this._owner?.deref?.();
-		if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) {
+		if (owner && owner.isLoaded && !this.presentedViewController) {
 			owner.callUnloaded();
 			owner._tearDownUI(true);
 		}
diff --git a/packages/core/ui/gestures/gestures-common.ts b/packages/core/ui/gestures/gestures-common.ts
index ac2cf9ce6a..b65654608f 100644
--- a/packages/core/ui/gestures/gestures-common.ts
+++ b/packages/core/ui/gestures/gestures-common.ts
@@ -1,6 +1,7 @@
 import type { GesturesObserverDefinition, GestureEvents, GestureStateTypes, SwipeDirection, TouchAction, GestureEventData, TapGestureEventData, TouchGestureEventData, Pointer, GestureEventDataWithState, PinchGestureEventData, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData } from './gestures-types';
 import { GestureTypes } from './gestures-types';
 import type { View } from '../core/view';
+export { GesturesObserverBase as GesturesObserver };
 
 /**
  * Returns a string representation of a gesture type.
@@ -102,6 +103,4 @@ export abstract class GesturesObserverBase implements GesturesObserverDefinition
 	}
 }
 
-export { GesturesObserverBase as GesturesObserver };
-
-export { TouchAction, GestureStateTypes, GestureTypes, SwipeDirection, GestureEvents } from './gestures-types';
+export { TouchAction, GestureStateTypes, GestureTypes, SwipeDirection, GestureEvents } from './gestures-types';
\ No newline at end of file
diff --git a/packages/core/ui/gestures/gestures-types.ts b/packages/core/ui/gestures/gestures-types.ts
index 13e249d16d..9598dc7e35 100644
--- a/packages/core/ui/gestures/gestures-types.ts
+++ b/packages/core/ui/gestures/gestures-types.ts
@@ -1,6 +1,6 @@
 // Shared types/interfaces for gestures
 import type { View } from '../core/view';
-import type { EventData } from '../../data/observable';
+import type { EventData, Observable } from '../../data/observable';
 
 export interface GesturesObserverDefinition {
 	/**
@@ -37,94 +37,298 @@ export interface GesturesObserverDefinition {
 	androidOnTouchEvent: (motionEvent: any /* android.view.MotionEvent */) => void;
 }
 
-// Shared gesture types, interfaces, and enums for gestures-common.ts and touch-manager.ts
+/**
+ * Events emitted during gesture lifecycle
+ */
 export enum GestureEvents {
+	/**
+	 * When the gesture is attached to the view
+	 * Provides access to the native gesture recognizer for further customization
+	 *
+	 * @nsEvent {GestureEventData} gestureAttached
+	 */
 	gestureAttached = 'gestureAttached',
+	/**
+	 * When a touch down was detected
+	 *
+	 * @nsEvent touchDown
+	 */
 	touchDown = 'touchDown',
+	/**
+	 * When a touch up was detected
+	 *
+	 * @nsEvent touchUp
+	 */
 	touchUp = 'touchUp',
 }
 
+/**
+ * Defines an enum with supported gesture types.
+ */
 export enum GestureTypes {
+	/**
+	 * Denotes tap (click) gesture.
+	 *
+	 * @nsEvent {TapGestureEventData} tap
+	 */
 	tap = 1 << 0,
+	/**
+	 * Denotes double tap gesture.
+	 *
+	 * @nsEvent {TapGestureEventData} doubleTap
+	 */
 	doubleTap = 1 << 1,
+	/**
+	 * Denotes pinch gesture.
+	 *
+	 * @nsEvent {PinchGestureEventData} pinch
+	 */
 	pinch = 1 << 2,
+	/**
+	 * Denotes pan gesture.
+	 *
+	 * @nsEvent {PanGestureEventData} pan
+	 */
 	pan = 1 << 3,
+	/**
+	 * Denotes swipe gesture.
+	 *
+	 * @nsEvent {SwipeGestureEventData} swipe
+	 */
 	swipe = 1 << 4,
+	/**
+	 * Denotes rotation gesture.
+	 *
+	 * @nsEvent {RotationGestureEventData} rotate
+	 */
 	rotation = 1 << 5,
+	/**
+	 * Denotes long press gesture.
+	 *
+	 * @nsEvent {GestureEventDataWithState} longPress
+	 */
 	longPress = 1 << 6,
+	/**
+	 * Denotes touch action.
+	 *
+	 * @nsEvent {TouchGestureEventData} touch
+	 */
 	touch = 1 << 7,
 }
 
+/**
+ * Defines an enum with supported gesture states.
+ */
 export enum GestureStateTypes {
+	/**
+	 * Gesture canceled.
+	 */
 	cancelled,
+	/**
+	 * Gesture began.
+	 */
 	began,
+	/**
+	 * Gesture changed.
+	 */
 	changed,
+	/**
+	 * Gesture ended.
+	 */
 	ended,
 }
 
+/**
+ * Defines an enum for swipe gesture direction.
+ */
 export enum SwipeDirection {
+	/**
+	 * Denotes right direction for swipe gesture.
+	 */
 	right = 1 << 0,
+	/**
+	 * Denotes left direction for swipe gesture.
+	 */
 	left = 1 << 1,
+	/**
+	 * Denotes up direction for swipe gesture.
+	 */
 	up = 1 << 2,
+	/**
+	 * Denotes down direction for swipe gesture.
+	 */
 	down = 1 << 3,
 }
 
+/**
+ * Defines a touch action
+ */
 export enum TouchAction {
+	/**
+	 * Down action.
+	 */
 	down = 'down',
+
+	/**
+	 * Up action.
+	 */
 	up = 'up',
+
+	/**
+	 * Move action.
+	 */
 	move = 'move',
+
+	/**
+	 * Cancel action.
+	 */
 	cancel = 'cancel',
 }
 
-export interface GestureEventData extends EventData {
+/**
+ * Provides gesture event data.
+ */
+export interface GestureEventData<T = Observable> extends EventData<T> {
+	/**
+	 * Gets the type of the gesture.
+	 */
 	type: GestureTypes;
+	/**
+	 * Gets the view which originates the gesture.
+	 */
 	view: View;
-	ios: any;
+	/**
+	 * Gets the underlying native iOS specific [UIGestureRecognizer](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIGestureRecognizer_Class/).
+	 */
+	ios: any /* UIGestureRecognizer */;
+	/**
+	 * Gets the underlying native android specific [gesture detector](http://developer.android.com/reference/android/view/GestureDetector.html).
+	 */
 	android: any;
 }
 
+/**
+ * Provides gesture event data.
+ */
 export interface TapGestureEventData extends GestureEventData {
+	/**
+	 * Gets the number of pointers in the event.
+	 */
 	getPointerCount(): number;
+	/**
+	 * Gets the X coordinate of this event inside the view that triggered the event
+	 */
 	getX(): number;
+	/**
+	 * Gets the Y coordinate of the event inside the view that triggered the event.
+	 */
 	getY(): number;
 }
 
+/**
+ * Provides gesture event data.
+ */
 export interface TouchGestureEventData extends TapGestureEventData {
+	/**
+	 * Gets action of the touch. Possible values: 'up', 'move', 'down', 'cancel'
+	 */
 	action: 'up' | 'move' | 'down' | 'cancel';
+	/**
+	 * Gets the pointers that triggered the event.
+	 * Note: In Android there is aways only one active pointer.
+	 */
 	getActivePointers(): Array<Pointer>;
+
+	/**
+	 * Gets all pointers.
+	 */
 	getAllPointers(): Array<Pointer>;
 }
 
+/**
+ * Pointer is an object representing a finger (or other object) that is touching the screen.
+ */
 export interface Pointer {
+	/**
+	 * The id of the pointer.
+	 */
 	android: any;
+
+	/**
+	 * The UITouch object associated to the touch
+	 */
 	ios: any;
+
+	/**
+	 * Gets the X coordinate of the pointer inside the view that triggered the event.
+	 */
 	getX(): number;
+
+	/**
+	 * Gets the Y coordinate of the pointer inside the view that triggered the event.
+	 */
 	getY(): number;
+
+	/**
+	 * Gests the X coordinate of the pointer inside the view that triggered the event.
+	 * @returns The X coordinate in _Device Pixels_.
+	 */
 	getXPixels(): number;
+
+	/**
+	 * Gets the X coordinate of the pointer inside the view that triggered the event.
+	 * @returns The X coordinate in _Device Independent Pixels_.
+	 */
 	getXDIP(): number;
+
+	/**
+	 * Gests the Y coordinate of the pointer inside the view that triggered the event.
+	 * @returns The Y coordinate in _Device Pixels_.
+	 */
 	getYPixels(): number;
+
+	/**
+	 * Gets the Y coordinate of the pointer inside the view that triggered the event.
+	 * @returns The Y coordinate in _Device Independent Pixels_.
+	 */
 	getYDIP(): number;
 }
 
+/**
+ * Provides gesture event data.
+ */
 export interface GestureEventDataWithState extends GestureEventData {
 	state: number;
 }
 
+/**
+ * Provides gesture event data for pinch gesture.
+ */
 export interface PinchGestureEventData extends GestureEventDataWithState {
 	scale: number;
+
 	getFocusX(): number;
 	getFocusY(): number;
 }
 
+/**
+ * Provides gesture event data for swipe gesture.
+ */
 export interface SwipeGestureEventData extends GestureEventData {
 	direction: SwipeDirection;
 }
 
+/**
+ * Provides gesture event data for pan gesture.
+ */
 export interface PanGestureEventData extends GestureEventDataWithState {
 	deltaX: number;
 	deltaY: number;
 }
 
+/**
+ * Provides gesture event data for rotation gesture.
+ */
 export interface RotationGestureEventData extends GestureEventDataWithState {
 	rotation: number;
-}
+}
\ No newline at end of file
diff --git a/packages/core/ui/html-view/html-view-common.ts b/packages/core/ui/html-view/html-view-common.ts
index 98bb11da1f..bbe031aeab 100644
--- a/packages/core/ui/html-view/html-view-common.ts
+++ b/packages/core/ui/html-view/html-view-common.ts
@@ -1,6 +1,7 @@
 import { View, CSSType } from '../core/view';
 import { booleanConverter } from '../core/view-base';
 import { Property } from '../core/properties';
+import { colorConverter } from '../styling/style-properties';
 import { Color } from '../../color';
 import { HtmlView as HtmlViewDefinition } from '.';
 
@@ -31,6 +32,6 @@ selectableProperty.register(HtmlViewBase);
 export const linkColorProperty = new Property<HtmlViewBase, Color>({
 	name: 'linkColor',
 	equalityComparer: Color.equals,
-	valueConverter: (value) => new Color(value),
+	valueConverter: colorConverter,
 });
 linkColorProperty.register(HtmlViewBase);
diff --git a/packages/core/ui/html-view/index.android.ts b/packages/core/ui/html-view/index.android.ts
index 3865cb594c..08a58ae9c0 100644
--- a/packages/core/ui/html-view/index.android.ts
+++ b/packages/core/ui/html-view/index.android.ts
@@ -7,7 +7,7 @@ import { HtmlViewBase, htmlProperty, selectableProperty, linkColorProperty } fro
 export * from './html-view-common';
 
 export class HtmlView extends HtmlViewBase {
-	nativeViewProtected: android.widget.TextView;
+	declare nativeViewProtected: android.widget.TextView;
 
 	public createNativeView() {
 		return new android.widget.TextView(this._context);
@@ -25,11 +25,6 @@ export class HtmlView extends HtmlViewBase {
 		nativeView.setMovementMethod(android.text.method.LinkMovementMethod.getInstance());
 	}
 
-	public resetNativeView(): void {
-		super.resetNativeView();
-		this.nativeViewProtected.setAutoLinkMask(0);
-	}
-
 	[htmlProperty.getDefault](): string {
 		return '';
 	}
diff --git a/packages/core/ui/image/image-common.ts b/packages/core/ui/image/image-common.ts
index 6c2bd59e09..2c7f2790f5 100644
--- a/packages/core/ui/image/image-common.ts
+++ b/packages/core/ui/image/image-common.ts
@@ -7,6 +7,7 @@ import { ImageSource, iosSymbolScaleType } from '../../image-source';
 import { isDataURI, isFontIconURI, isFileOrResourcePath, RESOURCE_PREFIX, SYSTEM_PREFIX } from '../../utils';
 import { Color } from '../../color';
 import { Style } from '../styling/style';
+import { colorConverter } from '../styling/style-properties';
 import { Length } from '../styling/length-shared';
 import { Property, InheritedCssProperty } from '../core/properties';
 import { Trace } from '../../trace';
@@ -175,7 +176,7 @@ export const tintColorProperty = new InheritedCssProperty<Style, Color>({
 	name: 'tintColor',
 	cssName: 'tint-color',
 	equalityComparer: Color.equals,
-	valueConverter: (value) => new Color(value),
+	valueConverter: colorConverter,
 });
 tintColorProperty.register(Style);
 
diff --git a/packages/core/ui/image/index.android.ts b/packages/core/ui/image/index.android.ts
index 26b2c73171..c907dfc6fb 100644
--- a/packages/core/ui/image/index.android.ts
+++ b/packages/core/ui/image/index.android.ts
@@ -45,7 +45,7 @@ function initializeImageLoadedListener() {
 }
 
 export class Image extends ImageBase {
-	nativeViewProtected: org.nativescript.widgets.ImageView;
+	declare nativeViewProtected: org.nativescript.widgets.ImageView;
 
 	public useCache = true;
 
@@ -73,11 +73,6 @@ export class Image extends ImageBase {
 		super.disposeNativeView();
 	}
 
-	public resetNativeView(): void {
-		super.resetNativeView();
-		this.nativeViewProtected.setImageMatrix(new android.graphics.Matrix());
-	}
-
 	public _createImageSourceFromSrc(value: string | ImageSource | ImageAsset) {
 		const imageView = this.nativeViewProtected;
 		if (!imageView) {
diff --git a/packages/core/ui/image/index.ios.ts b/packages/core/ui/image/index.ios.ts
index 53c08adb32..f00ae74b1f 100644
--- a/packages/core/ui/image/index.ios.ts
+++ b/packages/core/ui/image/index.ios.ts
@@ -9,7 +9,7 @@ import { SDK_VERSION } from '../../utils/constants';
 export * from './image-common';
 
 export class Image extends ImageBase {
-	nativeViewProtected: UIImageView;
+	declare nativeViewProtected: UIImageView;
 	private _imageSourceAffectsLayout = true;
 	private _templateImageWasCreated: boolean;
 
diff --git a/packages/core/ui/label/index.android.ts b/packages/core/ui/label/index.android.ts
index c26aab7059..ea5aa275db 100644
--- a/packages/core/ui/label/index.android.ts
+++ b/packages/core/ui/label/index.android.ts
@@ -9,8 +9,8 @@ export * from '../text-base';
 
 @CSSType('Label')
 export class Label extends TextBase implements LabelDefinition {
-	nativeViewProtected: org.nativescript.widgets.StyleableTextView;
-	nativeTextViewProtected: org.nativescript.widgets.StyleableTextView;
+	declare nativeViewProtected: org.nativescript.widgets.StyleableTextView;
+	declare nativeTextViewProtected: org.nativescript.widgets.StyleableTextView;
 
 	get textWrap(): boolean {
 		return this.style.whiteSpace === 'normal';
@@ -45,6 +45,5 @@ export class Label extends TextBase implements LabelDefinition {
 	}
 }
 
-Label.prototype._isSingleLine = true;
 Label.prototype._isManualRtlTextStyleNeeded = true;
 Label.prototype.recycleNativeView = 'auto';
diff --git a/packages/core/ui/layouts/absolute-layout/index.android.ts b/packages/core/ui/layouts/absolute-layout/index.android.ts
index cd1e3fffb6..93479d8bdd 100644
--- a/packages/core/ui/layouts/absolute-layout/index.android.ts
+++ b/packages/core/ui/layouts/absolute-layout/index.android.ts
@@ -23,7 +23,7 @@ View.prototype[leftProperty.setNative] = makeNativeSetter<number>(function (this
 });
 
 export class AbsoluteLayout extends AbsoluteLayoutBase {
-	nativeViewProtected: org.nativescript.widgets.AbsoluteLayout;
+	declare nativeViewProtected: org.nativescript.widgets.AbsoluteLayout;
 
 	public createNativeView() {
 		return new org.nativescript.widgets.AbsoluteLayout(this._context);
diff --git a/packages/core/ui/layouts/dock-layout/index.android.ts b/packages/core/ui/layouts/dock-layout/index.android.ts
index 4c472fd089..07407db438 100644
--- a/packages/core/ui/layouts/dock-layout/index.android.ts
+++ b/packages/core/ui/layouts/dock-layout/index.android.ts
@@ -33,7 +33,7 @@ View.prototype[dockProperty.setNative] = function (this: View, value: 'left' | '
 };
 
 export class DockLayout extends DockLayoutBase {
-	nativeViewProtected: org.nativescript.widgets.DockLayout;
+	declare nativeViewProtected: org.nativescript.widgets.DockLayout;
 
 	public createNativeView() {
 		return new org.nativescript.widgets.DockLayout(this._context);
diff --git a/packages/core/ui/layouts/flexbox-layout/index.android.ts b/packages/core/ui/layouts/flexbox-layout/index.android.ts
index 2289af0686..e1566bb6a2 100644
--- a/packages/core/ui/layouts/flexbox-layout/index.android.ts
+++ b/packages/core/ui/layouts/flexbox-layout/index.android.ts
@@ -81,7 +81,7 @@ const alignSelfMap = {
 };
 
 export class FlexboxLayout extends FlexboxLayoutBase {
-	nativeViewProtected: org.nativescript.widgets.FlexboxLayout;
+	declare nativeViewProtected: org.nativescript.widgets.FlexboxLayout;
 
 	constructor() {
 		super();
@@ -92,42 +92,22 @@ export class FlexboxLayout extends FlexboxLayoutBase {
 		return new widgetFlexboxLayout(this._context);
 	}
 
-	public resetNativeView(): void {
-		super.resetNativeView();
-		(<any>this.nativeViewProtected).invalidateOrdersCache();
-	}
-
-	[flexDirectionProperty.getDefault](): FlexDirection {
-		return flexDirectionProperty.defaultValue;
-	}
 	[flexDirectionProperty.setNative](flexDirection: FlexDirection) {
 		this.nativeViewProtected.setFlexDirection(flexDirectionMap[flexDirection]);
 	}
 
-	[flexWrapProperty.getDefault](): FlexWrap {
-		return flexWrapProperty.defaultValue;
-	}
 	[flexWrapProperty.setNative](flexWrap: FlexWrap) {
 		this.nativeViewProtected.setFlexWrap(flexWrapMap[flexWrap]);
 	}
 
-	[justifyContentProperty.getDefault](): JustifyContent {
-		return justifyContentProperty.defaultValue;
-	}
 	[justifyContentProperty.setNative](justifyContent: JustifyContent) {
 		this.nativeViewProtected.setJustifyContent(justifyContentMap[justifyContent]);
 	}
 
-	[alignItemsProperty.getDefault](): AlignItems {
-		return alignItemsProperty.defaultValue;
-	}
 	[alignItemsProperty.setNative](alignItems: AlignItems) {
 		this.nativeViewProtected.setAlignItems(alignItemsMap[alignItems]);
 	}
 
-	[alignContentProperty.getDefault](): AlignContent {
-		return alignContentProperty.defaultValue;
-	}
 	[alignContentProperty.setNative](alignContent: AlignContent) {
 		this.nativeViewProtected.setAlignContent(alignContentMap[alignContent]);
 	}
diff --git a/packages/core/ui/layouts/grid-layout/grid-layout-common.ts b/packages/core/ui/layouts/grid-layout/grid-layout-common.ts
index 8a68e2de97..df56412540 100644
--- a/packages/core/ui/layouts/grid-layout/grid-layout-common.ts
+++ b/packages/core/ui/layouts/grid-layout/grid-layout-common.ts
@@ -149,7 +149,7 @@ export class ItemSpec extends Observable implements ItemSpecDefinition {
 }
 
 @CSSType('GridLayout')
-export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
+export abstract class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
 	protected _rows: Array<ItemSpec> = new Array<ItemSpec>();
 	protected _cols: Array<ItemSpec> = new Array<ItemSpec>();
 
@@ -291,37 +291,13 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
 		this.invalidate();
 	}
 
-	public onRowChanged(element: View, oldValue: number, newValue: number) {
-		this.invalidate();
-	}
+	public abstract _onRowAdded(itemSpec: ItemSpec);
 
-	public onRowSpanChanged(element: View, oldValue: number, newValue: number) {
-		this.invalidate();
-	}
+	public abstract _onColumnAdded(itemSpec: ItemSpec);
 
-	public onColumnChanged(element: View, oldValue: number, newValue: number) {
-		this.invalidate();
-	}
+	public abstract _onRowRemoved(itemSpec: ItemSpec, index: number): void;
 
-	public onColumnSpanChanged(element: View, oldValue: number, newValue: number) {
-		this.invalidate();
-	}
-
-	public _onRowAdded(itemSpec: ItemSpec) {
-		//
-	}
-
-	public _onColumnAdded(itemSpec: ItemSpec) {
-		//
-	}
-
-	public _onRowRemoved(itemSpec: ItemSpec, index: number): void {
-		//
-	}
-
-	public _onColumnRemoved(itemSpec: ItemSpec, index: number): void {
-		//
-	}
+	public abstract _onColumnRemoved(itemSpec: ItemSpec, index: number): void;
 
 	public getColumns(): Array<ItemSpec> {
 		return this._cols.slice();
@@ -339,20 +315,32 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
 		return this._rows;
 	}
 
-	protected invalidate(): void {
-		// handled natively in android and overridden in ios.
-	}
+	protected abstract invalidate();
 
+	_rowsStr: string;
+	get rows() {
+		return this._rowsStr;
+	}
 	set rows(value: string) {
-		this.removeRows();
-		const specs = parseAndAddItemSpecs(value);
-		this.addRows(specs);
+		if (this._rowsStr !== value) {
+			this._rowsStr = value;
+			this.removeRows();
+			const specs = parseAndAddItemSpecs(value);
+			this.addRows(specs);
+		}
 	}
 
+	_colsStr: string;
+	get columns() {
+		return this._colsStr;
+	}
 	set columns(value: string) {
-		this.removeColumns();
-		const specs = parseAndAddItemSpecs(value);
-		this.addColumns(specs);
+		if (this._colsStr !== value) {
+			this._colsStr = value;
+			this.removeColumns();
+			const specs = parseAndAddItemSpecs(value);
+			this.addColumns(specs);
+		}
 	}
 }
 
@@ -361,12 +349,7 @@ GridLayoutBase.prototype.recycleNativeView = 'auto';
 export const columnProperty = new Property<View, number>({
 	name: 'col',
 	defaultValue: 0,
-	valueChanged: (target, oldValue, newValue) => {
-		const grid = target.parent;
-		if (grid instanceof GridLayoutBase) {
-			grid.onColumnChanged(target, oldValue, newValue);
-		}
-	},
+	affectsLayout: __IOS__,
 	valueConverter: (v) => Math.max(0, parseInt(v)),
 });
 columnProperty.register(View);
@@ -374,12 +357,7 @@ columnProperty.register(View);
 export const columnSpanProperty = new Property<View, number>({
 	name: 'colSpan',
 	defaultValue: 1,
-	valueChanged: (target, oldValue, newValue) => {
-		const grid = target.parent;
-		if (grid instanceof GridLayoutBase) {
-			grid.onColumnSpanChanged(target, oldValue, newValue);
-		}
-	},
+	affectsLayout: __IOS__,
 	valueConverter: (v) => Math.max(1, parseInt(v)),
 });
 columnSpanProperty.register(View);
@@ -387,12 +365,7 @@ columnSpanProperty.register(View);
 export const rowProperty = new Property<View, number>({
 	name: 'row',
 	defaultValue: 0,
-	valueChanged: (target, oldValue, newValue) => {
-		const grid = target.parent;
-		if (grid instanceof GridLayoutBase) {
-			grid.onRowChanged(target, oldValue, newValue);
-		}
-	},
+	affectsLayout: __IOS__,
 	valueConverter: (v) => Math.max(0, parseInt(v)),
 });
 rowProperty.register(View);
@@ -400,12 +373,7 @@ rowProperty.register(View);
 export const rowSpanProperty = new Property<View, number>({
 	name: 'rowSpan',
 	defaultValue: 1,
-	valueChanged: (target, oldValue, newValue) => {
-		const grid = target.parent;
-		if (grid instanceof GridLayoutBase) {
-			grid.onRowSpanChanged(target, oldValue, newValue);
-		}
-	},
+	affectsLayout: __IOS__,
 	valueConverter: (v) => Math.max(1, parseInt(v)),
 });
 rowSpanProperty.register(View);
diff --git a/packages/core/ui/layouts/grid-layout/index.android.ts b/packages/core/ui/layouts/grid-layout/index.android.ts
index 25727c55de..b9db153fc0 100644
--- a/packages/core/ui/layouts/grid-layout/index.android.ts
+++ b/packages/core/ui/layouts/grid-layout/index.android.ts
@@ -4,21 +4,16 @@ import { layout } from '../../../utils';
 
 export * from './grid-layout-common';
 
-function makeNativeSetter<T>(setter: (lp: org.nativescript.widgets.CommonLayoutParams, value: T) => void) {
-	return function (this: View, value: T) {
-		const nativeView: android.view.View = this.nativeViewProtected;
-		const lp = nativeView.getLayoutParams() || new org.nativescript.widgets.CommonLayoutParams();
-		if (lp instanceof org.nativescript.widgets.CommonLayoutParams) {
-			setter(lp, value);
-			nativeView.setLayoutParams(lp);
-		}
+function makeNativeSetter(type: string) {
+	return function (this: View, value: number) {
+		org.nativescript.widgets.ViewHelper.setCommonGridLayoutParam(this.nativeViewProtected, type, value);
 	};
 }
 
-View.prototype[rowProperty.setNative] = makeNativeSetter<number>((lp, value) => (lp.row = value));
-View.prototype[columnProperty.setNative] = makeNativeSetter<number>((lp, value) => (lp.column = value));
-View.prototype[rowSpanProperty.setNative] = makeNativeSetter<number>((lp, value) => (lp.rowSpan = value));
-View.prototype[columnSpanProperty.setNative] = makeNativeSetter<number>((lp, value) => (lp.columnSpan = value));
+View.prototype[rowProperty.setNative] = makeNativeSetter('row');
+View.prototype[columnProperty.setNative] = makeNativeSetter('column');
+View.prototype[rowSpanProperty.setNative] = makeNativeSetter('rowSpan');
+View.prototype[columnSpanProperty.setNative] = makeNativeSetter('columnSpan');
 
 ItemSpecBase.prototype.toJSON = function () {
 	let result;
@@ -43,7 +38,7 @@ interface ItemSpec extends ItemSpecBase {
 }
 
 export class GridLayout extends GridLayoutBase {
-	nativeViewProtected: org.nativescript.widgets.GridLayout;
+	declare nativeViewProtected: org.nativescript.widgets.GridLayout;
 
 	public createNativeView() {
 		return new org.nativescript.widgets.GridLayout(this._context);
diff --git a/packages/core/ui/layouts/grid-layout/index.ios.ts b/packages/core/ui/layouts/grid-layout/index.ios.ts
index ca2e253ec2..c633e0dd14 100644
--- a/packages/core/ui/layouts/grid-layout/index.ios.ts
+++ b/packages/core/ui/layouts/grid-layout/index.ios.ts
@@ -42,7 +42,6 @@ export class GridLayout extends GridLayoutBase {
 	}
 
 	protected invalidate(): void {
-		super.invalidate();
 		this.requestLayout();
 	}
 
diff --git a/packages/core/ui/layouts/layout-base-common.ts b/packages/core/ui/layouts/layout-base-common.ts
index 0a240601ed..9230f6d50d 100644
--- a/packages/core/ui/layouts/layout-base-common.ts
+++ b/packages/core/ui/layouts/layout-base-common.ts
@@ -3,6 +3,7 @@ import { CoreTypes } from '../../core-types';
 import { View, CustomLayoutView, AddChildFromBuilder } from '../core/view';
 import { booleanConverter, getViewById } from '../core/view-base';
 import { Property } from '../core/properties';
+import { profile } from '../../profiling';
 
 export class LayoutBaseCommon extends CustomLayoutView implements LayoutBaseDefinition, AddChildFromBuilder {
 	private _subViews = new Array<View>();
@@ -42,6 +43,7 @@ export class LayoutBaseCommon extends CustomLayoutView implements LayoutBaseDefi
 		//Overridden
 	}
 
+	@profile
 	public addChild(child: View): void {
 		// TODO: Do we need this method since we have the core logic in the View implementation?
 		this._subViews.push(child);
@@ -59,6 +61,7 @@ export class LayoutBaseCommon extends CustomLayoutView implements LayoutBaseDefi
 		return false;
 	}
 
+	@profile
 	public removeChild(child: View): void {
 		this._removeView(child);
 
@@ -156,9 +159,10 @@ export class LayoutBaseCommon extends CustomLayoutView implements LayoutBaseDefi
 	}
 }
 
+// by default android view are not clipped while iOS are
 export const clipToBoundsProperty = new Property<LayoutBaseCommon, boolean>({
 	name: 'clipToBounds',
-	defaultValue: true,
+	defaultValue: __IOS__ ? false : true,
 	valueConverter: booleanConverter,
 });
 clipToBoundsProperty.register(LayoutBaseCommon);
diff --git a/packages/core/ui/layouts/layout-base.android.ts b/packages/core/ui/layouts/layout-base.android.ts
index d0516d7bbd..927f83066c 100644
--- a/packages/core/ui/layouts/layout-base.android.ts
+++ b/packages/core/ui/layouts/layout-base.android.ts
@@ -10,18 +10,12 @@ export class LayoutBase extends LayoutBaseCommon {
 		return true;
 	}
 	[clipToBoundsProperty.setNative](value: boolean) {
-		// TODO: Use ClipRectangle if API > 16!
-
-		// We can't implement this without calling setClipChildren(false) on every ancestor up in the visual tree,
-		// which will kill performance. It will also lead to unwanted side effects such as other totally unrelated
-		// views being affected by setting the parents' setClipChildren to false.
-		// The problem in Android is that a ViewGroup either clips ALL of its children or it does not. Unlike iOS, the clipping
-		// cannot be controlled on a per view basis. So clipToBounds=false will have to be somehow achieved with stacking different
-		// views on top of one another in an AbsoluteLayout or GridLayout. There is always a workaround when playing with layouts.
-		//
-		// The following article explains this in detail:
-		// http://stackoverflow.com/questions/25044085/when-drawing-outside-the-view-clip-bounds-with-android-how-do-i-prevent-underli
-		console.warn(`clipToBounds with value false is not supported on Android. You can use this.android.getParent().setClipChildren(false) as an alternative`);
+		if ((<any>this.nativeViewProtected).setClipToBounds) {
+			(<any>this.nativeViewProtected).setClipToBounds(value);
+		}
+		if (this.nativeViewProtected.setClipToOutline) {
+			this.nativeViewProtected.setClipToOutline(value);
+		}
 	}
 
 	[isPassThroughParentEnabledProperty.setNative](value: boolean) {
diff --git a/packages/core/ui/layouts/layout-base.ios.ts b/packages/core/ui/layouts/layout-base.ios.ts
index 7c70039639..464518af82 100644
--- a/packages/core/ui/layouts/layout-base.ios.ts
+++ b/packages/core/ui/layouts/layout-base.ios.ts
@@ -4,7 +4,7 @@ import { View } from '../core/view';
 export * from './layout-base-common';
 
 export class LayoutBase extends LayoutBaseCommon {
-	nativeViewProtected: UIView;
+	declare nativeViewProtected: UIView;
 
 	public addChild(child: View): void {
 		super.addChild(child);
@@ -35,9 +35,6 @@ export class LayoutBase extends LayoutBaseCommon {
 		}
 	}
 
-	[clipToBoundsProperty.getDefault](): boolean {
-		return false;
-	}
 	[clipToBoundsProperty.setNative](value: boolean) {
 		this._setNativeClipToBounds();
 	}
diff --git a/packages/core/ui/layouts/stack-layout/index.android.ts b/packages/core/ui/layouts/stack-layout/index.android.ts
index 6f8242d647..40755b3363 100644
--- a/packages/core/ui/layouts/stack-layout/index.android.ts
+++ b/packages/core/ui/layouts/stack-layout/index.android.ts
@@ -3,7 +3,7 @@ import { StackLayoutBase, orientationProperty } from './stack-layout-common';
 export * from './stack-layout-common';
 
 export class StackLayout extends StackLayoutBase {
-	nativeViewProtected: org.nativescript.widgets.StackLayout;
+	declare nativeViewProtected: org.nativescript.widgets.StackLayout;
 
 	public createNativeView() {
 		return new org.nativescript.widgets.StackLayout(this._context);
diff --git a/packages/core/ui/layouts/stack-layout/index.ios.ts b/packages/core/ui/layouts/stack-layout/index.ios.ts
index 1239bda48e..97601fb25b 100644
--- a/packages/core/ui/layouts/stack-layout/index.ios.ts
+++ b/packages/core/ui/layouts/stack-layout/index.ios.ts
@@ -113,6 +113,7 @@ export class StackLayout extends StackLayoutBase {
 		const childRight = right - left - paddingRight;
 
 		switch (this.verticalAlignment) {
+			case CoreTypes.VerticalAlignment.center:
 			case CoreTypes.VerticalAlignment.middle:
 				childTop = (bottom - top - this._totalLength) / 2 + paddingTop;
 				break;
@@ -151,6 +152,7 @@ export class StackLayout extends StackLayoutBase {
 				childLeft = this.direction === CoreTypes.LayoutDirection.rtl ? right - left - this._totalLength + paddingLeft : paddingLeft;
 				break;
 			case CoreTypes.HorizontalAlignment.center:
+			case CoreTypes.HorizontalAlignment.middle:
 				childLeft = (right - left - this._totalLength) / 2 + paddingLeft;
 				break;
 			case CoreTypes.HorizontalAlignment.right:
diff --git a/packages/core/ui/layouts/wrap-layout/index.android.ts b/packages/core/ui/layouts/wrap-layout/index.android.ts
index ab03d5c781..81ff8cfc0e 100644
--- a/packages/core/ui/layouts/wrap-layout/index.android.ts
+++ b/packages/core/ui/layouts/wrap-layout/index.android.ts
@@ -5,7 +5,7 @@ import { Length } from '../../styling/length-shared';
 export * from './wrap-layout-common';
 
 export class WrapLayout extends WrapLayoutBase {
-	nativeViewProtected: org.nativescript.widgets.WrapLayout;
+	declare nativeViewProtected: org.nativescript.widgets.WrapLayout;
 
 	public createNativeView() {
 		return new org.nativescript.widgets.WrapLayout(this._context);
diff --git a/packages/core/ui/list-picker/index.android.ts b/packages/core/ui/list-picker/index.android.ts
index dce59d3b27..0dc6e063ee 100644
--- a/packages/core/ui/list-picker/index.android.ts
+++ b/packages/core/ui/list-picker/index.android.ts
@@ -84,7 +84,7 @@ function getSelectorWheelPaint(picker: android.widget.NumberPicker): android.gra
 }
 
 export class ListPicker extends ListPickerBase {
-	nativeViewProtected: android.widget.NumberPicker;
+	declare nativeViewProtected: android.widget.NumberPicker;
 	private _selectorWheelPaint: android.graphics.Paint;
 
 	public createNativeView() {
diff --git a/packages/core/ui/list-picker/index.ios.ts b/packages/core/ui/list-picker/index.ios.ts
index fbb11fbafd..5e7934021f 100644
--- a/packages/core/ui/list-picker/index.ios.ts
+++ b/packages/core/ui/list-picker/index.ios.ts
@@ -6,7 +6,7 @@ import { profile } from '../../profiling';
 export * from './list-picker-common';
 
 export class ListPicker extends ListPickerBase {
-	nativeViewProtected: UIPickerView;
+	declare nativeViewProtected: UIPickerView;
 	// tslint:disable-next-line
 	private _dataSource: ListPickerDataSource;
 	private _delegate: ListPickerDelegateImpl;
diff --git a/packages/core/ui/list-view/index.android.ts b/packages/core/ui/list-view/index.android.ts
index 7fa33c2f86..d67eee8b0f 100644
--- a/packages/core/ui/list-view/index.android.ts
+++ b/packages/core/ui/list-view/index.android.ts
@@ -63,7 +63,7 @@ function initializeItemClickListener(): void {
 }
 
 export class ListView extends ListViewBase {
-	nativeViewProtected: android.widget.ListView;
+	declare nativeViewProtected: android.widget.ListView;
 	private _androidViewId = -1;
 
 	public _realizedItems = new Map<
diff --git a/packages/core/ui/list-view/index.ios.ts b/packages/core/ui/list-view/index.ios.ts
index 3dff3a77c3..a030f51530 100644
--- a/packages/core/ui/list-view/index.ios.ts
+++ b/packages/core/ui/list-view/index.ios.ts
@@ -433,7 +433,7 @@ class UISearchResultsUpdatingImpl extends NSObject implements UISearchResultsUpd
 }
 
 export class ListView extends ListViewBase {
-	public nativeViewProtected: UITableView;
+	public declare nativeViewProtected: UITableView;
 	// tslint:disable-next-line
 	private _dataSource;
 	private _delegate;
diff --git a/packages/core/ui/list-view/list-view-common.ts b/packages/core/ui/list-view/list-view-common.ts
index f005b17629..0936b4fd32 100644
--- a/packages/core/ui/list-view/list-view-common.ts
+++ b/packages/core/ui/list-view/list-view-common.ts
@@ -1,6 +1,7 @@
 import { ListView as ListViewDefinition, ItemsSource, ItemEventData, TemplatedItemsView, SearchEventData } from '.';
 import { View, ContainerView, Template, KeyedTemplate, CSSType } from '../core/view';
 import { Property, CoercibleProperty, CssProperty } from '../core/properties';
+import { colorConverter } from '../styling/style-properties';
 import { Length } from '../styling/length-shared';
 import { Style } from '../styling/style';
 import { Color } from '../../color';
@@ -303,7 +304,7 @@ export const separatorColorProperty = new CssProperty<Style, Color>({
 	name: 'separatorColor',
 	cssName: 'separator-color',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 separatorColorProperty.register(Style);
 
diff --git a/packages/core/ui/page/index.android.ts b/packages/core/ui/page/index.android.ts
index 5801f9d4e0..71f553005b 100644
--- a/packages/core/ui/page/index.android.ts
+++ b/packages/core/ui/page/index.android.ts
@@ -1,4 +1,3 @@
-import { isAccessibilityServiceEnabled } from '../../application';
 import { PageBase, actionBarHiddenProperty, androidStatusBarBackgroundProperty } from './page-common';
 import { View } from '../core/view';
 import { Color } from '../../color';
@@ -6,12 +5,14 @@ import { ActionBar } from '../action-bar';
 import { GridLayout } from '../layouts/grid-layout';
 import { SDK_VERSION } from '../../utils/constants';
 import { profile } from '../../profiling';
-import { AndroidAccessibilityEvent, getLastFocusedViewOnPage } from '../../accessibility/accessibility-common';
+import { getLastFocusedViewOnPage } from '../../accessibility/accessibility-common';
+import { AndroidAccessibilityEvent } from '../../accessibility/accessibility-types';
+import { isAccessibilityServiceEnabled } from '../../accessibility';
 
 export * from './page-common';
 
 export class Page extends PageBase {
-	nativeViewProtected: org.nativescript.widgets.GridLayout;
+	declare nativeViewProtected: org.nativescript.widgets.GridLayout;
 
 	public createNativeView() {
 		const layout = new org.nativescript.widgets.GridLayout(this._context);
@@ -114,7 +115,8 @@ export class Page extends PageBase {
 
 			return;
 		}
-
-		this.actionBar.accessibilityScreenChanged();
+		if (this.hasActionBar) {
+			this.actionBar.accessibilityScreenChanged();
+		}
 	}
 }
diff --git a/packages/core/ui/page/index.ios.ts b/packages/core/ui/page/index.ios.ts
index 1c917060dd..d64657eef8 100644
--- a/packages/core/ui/page/index.ios.ts
+++ b/packages/core/ui/page/index.ios.ts
@@ -1,4 +1,3 @@
-import { isAccessibilityServiceEnabled } from '../../application';
 import type { Frame } from '../frame';
 import { BackstackEntry, NavigationType } from '../frame/frame-interfaces';
 import { View, IOSHelper } from '../core/view';
@@ -9,6 +8,7 @@ import { layout } from '../../utils/layout-helper';
 import { SDK_VERSION } from '../../utils/constants';
 import { getLastFocusedViewOnPage } from '../../accessibility/accessibility-common';
 import { SharedTransition } from '../transition/shared-transition';
+import { isAccessibilityServiceEnabled } from '../../accessibility';
 
 export * from './page-common';
 
@@ -27,33 +27,53 @@ class UIViewControllerImpl extends UIViewController {
 
 	public isBackstackSkipped: boolean;
 	public isBackstackCleared: boolean;
-	private didFirstLayout: boolean;
+	// private didFirstLayout: boolean;
 	// this is initialized in initWithOwner since the constructor doesn't run on native classes
-	private _isRunningLayout: number;
-	private get isRunningLayout() {
-		return this._isRunningLayout !== 0;
-	}
-	private startRunningLayout() {
-		this._isRunningLayout++;
-	}
-	private finishRunningLayout() {
-		this._isRunningLayout--;
-		this.didFirstLayout = true;
-	}
-	private runLayout(cb: () => void) {
-		try {
-			this.startRunningLayout();
-			cb();
-		} finally {
-			this.finishRunningLayout();
-		}
-	}
+	// private _isRunningLayout: number;
+	// private get isRunningLayout() {
+	// 	return this._isRunningLayout !== 0;
+	// }
+	// private startRunningLayout() {
+	// 	this._isRunningLayout++;
+	// }
+	// private finishRunningLayout() {
+	// 	this._isRunningLayout--;
+	// 	this.clearScheduledLayout();
+	// }
+	// private runLayout(cb: () => void) {
+	// 	try {
+	// 		this.startRunningLayout();
+	// 		cb();
+	// 	} finally {
+	// 		this.finishRunningLayout();
+	// 	}
+	// }
+
+	// layoutTimer: number;
+
+	// private clearScheduledLayout() {
+	// 	if (this.layoutTimer) {
+	// 		clearTimeout(this.layoutTimer);
+	// 		this.layoutTimer = null;
+	// 	}
+	// }
+
+	// private scheduleLayout() {
+	// 	if (this.layoutTimer) {
+	// 		return;
+	// 	}
+	// 	setTimeout(() => {
+	// 		this.layoutTimer = null;
+	// 		if (!this.isRunningLayout) {
+	// 			this.runLayout(() => this.layoutOwner());
+	// 		}
+	// 	});
+	// }
 
 	public static initWithOwner(owner: WeakRef<Page>): UIViewControllerImpl {
 		const controller = <UIViewControllerImpl>UIViewControllerImpl.new();
 		controller._owner = owner;
-		controller._isRunningLayout = 0;
-		controller.didFirstLayout = false;
+		// controller._isRunningLayout = 0;
 
 		return controller;
 	}
@@ -138,7 +158,6 @@ class UIViewControllerImpl extends UIViewController {
 
 		const navigationController = this.navigationController;
 		const frame: Frame = navigationController ? (<any>navigationController).owner : null;
-
 		if (frame) {
 			const newEntry: BackstackEntry = this[ENTRY];
 
@@ -195,12 +214,13 @@ class UIViewControllerImpl extends UIViewController {
 			}
 		}
 
-		if (!this.presentedViewController) {
+		// TODO: testing without the check. Does not seem necessary and have very bad side effects.
+		// if (!this.presentedViewController) {
 			// clear presented viewController here only if no presented controller.
 			// this is needed because in iOS9 the order of events could be - willAppear, willDisappear, didAppear.
 			// If we clean it when we have viewController then once presented VC is dismissed then
 			owner._presentedViewController = null;
-		}
+		// }
 	}
 
 	@profile
@@ -248,17 +268,17 @@ class UIViewControllerImpl extends UIViewController {
 
 	public viewSafeAreaInsetsDidChange(): void {
 		super.viewSafeAreaInsetsDidChange();
-		if (this.isRunningLayout || !this.didFirstLayout) {
-			return;
-		}
-		const owner = this._owner?.deref();
-		if (owner) {
-			this.runLayout(() => IOSHelper.layoutView(this, owner));
-		}
+		// if (this.isRunningLayout || !this.didFirstLayout) {
+		// 	return;
+		// }
+		// const owner = this._owner?.deref();
+		// if (owner) {
+		// 	this.runLayout(() => IOSHelper.layoutView(this, owner));
+		// }
 	}
 
 	public viewDidLayoutSubviews(): void {
-		this.startRunningLayout();
+		// this.startRunningLayout();
 		super.viewDidLayoutSubviews();
 		const owner = this._owner?.deref();
 		if (owner) {
@@ -312,7 +332,7 @@ class UIViewControllerImpl extends UIViewController {
 
 			IOSHelper.layoutView(this, owner);
 		}
-		this.finishRunningLayout();
+		// this.finishRunningLayout();
 	}
 
 	// Mind implementation for other controllerss
@@ -370,8 +390,8 @@ class UIViewControllerImpl extends UIViewController {
 }
 
 export class Page extends PageBase {
-	nativeViewProtected: UIView;
-	viewController: UIViewControllerImpl;
+	declare nativeViewProtected: UIView;
+	declare viewController: UIViewControllerImpl;
 	onAccessibilityPerformEscape: () => boolean;
 
 	private _backgroundColor = SDK_VERSION <= 12 && !UIColor.systemBackgroundColor ? UIColor.whiteColor : UIColor.systemBackgroundColor;
@@ -605,7 +625,7 @@ export class Page extends PageBase {
 			return;
 		}
 
-		if (this.actionBar.accessibilityLabel || this.actionBar.title) {
+		if (this.hasActionBar && (this.actionBar.accessibilityLabel || this.actionBar.title)) {
 			UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification, this.actionBar.nativeView);
 
 			return;
diff --git a/packages/core/ui/page/page-common.ts b/packages/core/ui/page/page-common.ts
index 9ba90bf73f..f36ab155e2 100644
--- a/packages/core/ui/page/page-common.ts
+++ b/packages/core/ui/page/page-common.ts
@@ -4,6 +4,7 @@ import { View, CSSType } from '../core/view';
 import { ShownModallyData } from '../core/view/view-interfaces';
 import { booleanConverter } from '../core/view-base';
 import { Property, CssProperty } from '../core/properties';
+import { colorConverter } from '../styling/style-properties';
 import { Style } from '../styling/style';
 import { Color } from '../../color';
 import { EventData } from '../../data/observable';
@@ -14,7 +15,10 @@ import { KeyframeAnimationInfo } from '../animation/keyframe-animation';
 import { profile } from '../../profiling';
 import { PageEvents } from './events';
 
-interface NavigatedData extends EventData {
+// was defined here before, some plugins depend on it right now
+export { statusBarStyleProperty } from '../core/view/view-common'
+
+interface NavigatedData extends EventData<PageDefinition> {
 	context: any;
 	isBackNavigation: boolean;
 }
@@ -74,17 +78,8 @@ export class PageBase extends ContentView {
 		return this;
 	}
 
-	public _parentChanged(oldParent: View): void {
-		const newParent = this.parent;
-		if (newParent && !isFrame(newParent)) {
-			throw new Error(`Page can only be nested inside Frame. New parent: ${newParent}`);
-		}
-
-		super._parentChanged(oldParent);
-	}
-
 	public _addChildFromBuilder(name: string, value: any) {
-		if (value instanceof ActionBar) {
+		if (value.constructor.name === 'ActionBar') {
 			this.actionBar = value;
 		} else {
 			super._addChildFromBuilder(name, value);
@@ -96,7 +91,7 @@ export class PageBase extends ContentView {
 	}
 
 	get frame(): Frame {
-		return <Frame>this.parent;
+		return isFrame(this.parent) ? <Frame>this.parent : null;
 	}
 
 	private createNavigatedData(eventName: string, isBackNavigation: boolean): NavigatedData {
@@ -214,6 +209,6 @@ export const androidStatusBarBackgroundProperty = new CssProperty<Style, Color>(
 	name: 'androidStatusBarBackground',
 	cssName: 'android-status-bar-background',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 androidStatusBarBackgroundProperty.register(Style);
diff --git a/packages/core/ui/placeholder/placeholder-common.ts b/packages/core/ui/placeholder/placeholder-common.ts
index b94f5b91c3..b152e6ad8e 100644
--- a/packages/core/ui/placeholder/placeholder-common.ts
+++ b/packages/core/ui/placeholder/placeholder-common.ts
@@ -1,6 +1,7 @@
+import type { Placeholder } from '.';
 import { EventData } from '../../data/observable';
 
-export interface CreateViewEventData extends EventData {
+export interface CreateViewEventData extends EventData<Placeholder> {
 	/**
 	 * The native view that should be added to the visual tree.
 	 */
diff --git a/packages/core/ui/progress/index.android.ts b/packages/core/ui/progress/index.android.ts
index eade177023..c299657e73 100644
--- a/packages/core/ui/progress/index.android.ts
+++ b/packages/core/ui/progress/index.android.ts
@@ -8,7 +8,7 @@ export * from './progress-common';
 const R_ATTR_PROGRESS_BAR_STYLE_HORIZONTAL = 0x01010078;
 
 export class Progress extends ProgressBase {
-	nativeViewProtected: android.widget.ProgressBar;
+	declare nativeViewProtected: android.widget.ProgressBar;
 
 	public createNativeView() {
 		return new android.widget.ProgressBar(this._context, null, R_ATTR_PROGRESS_BAR_STYLE_HORIZONTAL);
diff --git a/packages/core/ui/progress/index.ios.ts b/packages/core/ui/progress/index.ios.ts
index 026cfdce27..c2b1a0c711 100644
--- a/packages/core/ui/progress/index.ios.ts
+++ b/packages/core/ui/progress/index.ios.ts
@@ -5,7 +5,7 @@ import { colorProperty, backgroundColorProperty, backgroundInternalProperty } fr
 export * from './progress-common';
 
 export class Progress extends ProgressBase {
-	nativeViewProtected: UIProgressView;
+	declare nativeViewProtected: UIProgressView;
 
 	createNativeView() {
 		return UIProgressView.new();
diff --git a/packages/core/ui/repeater/index.ts b/packages/core/ui/repeater/index.ts
index 459c64a293..747bf1a28c 100644
--- a/packages/core/ui/repeater/index.ts
+++ b/packages/core/ui/repeater/index.ts
@@ -28,8 +28,8 @@ export class Repeater extends CustomLayoutView {
 	private _isDirty = false;
 	private _itemTemplateSelector: (item: any, index: number, items: any) => string;
 	private _itemTemplateSelectorBindable;
-	public ios;
-	public android;
+	declare ios;
+	declare android;
 
 	constructor() {
 		super();
diff --git a/packages/core/ui/scroll-view/index.android.ts b/packages/core/ui/scroll-view/index.android.ts
index a6cd9f82a9..3053287041 100644
--- a/packages/core/ui/scroll-view/index.android.ts
+++ b/packages/core/ui/scroll-view/index.android.ts
@@ -6,7 +6,7 @@ import { isUserInteractionEnabledProperty } from '../core/view';
 export * from './scroll-view-common';
 
 export class ScrollView extends ScrollViewBase {
-	nativeViewProtected: org.nativescript.widgets.VerticalScrollView | org.nativescript.widgets.HorizontalScrollView;
+	declare nativeViewProtected: org.nativescript.widgets.VerticalScrollView | org.nativescript.widgets.HorizontalScrollView;
 	private _androidViewId = -1;
 	private handler: android.view.ViewTreeObserver.OnScrollChangedListener;
 
diff --git a/packages/core/ui/scroll-view/index.ios.ts b/packages/core/ui/scroll-view/index.ios.ts
index a3a7ec375d..33ac7844f7 100644
--- a/packages/core/ui/scroll-view/index.ios.ts
+++ b/packages/core/ui/scroll-view/index.ios.ts
@@ -175,7 +175,8 @@ export class ScrollView extends ScrollViewBase {
 	}
 
 	public onLayout(left: number, top: number, right: number, bottom: number): void {
-		if (!this.nativeViewProtected) {
+		const view = this.nativeViewProtected;
+		if (!view) {
 			return;
 		}
 
@@ -188,7 +189,7 @@ export class ScrollView extends ScrollViewBase {
 			// Disable automatic adjustment of scroll view insets
 			// Consider exposing this as property with all 4 modes
 			// https://developer.apple.com/documentation/uikit/uiscrollview/contentinsetadjustmentbehavior
-			this.nativeViewProtected.contentInsetAdjustmentBehavior = 2;
+			view.contentInsetAdjustmentBehavior = 2;
 		}
 
 		let scrollInsetWidth = scrollWidth + insets.left + insets.right;
@@ -202,7 +203,7 @@ export class ScrollView extends ScrollViewBase {
 			scrollHeight = Math.max(this._contentMeasuredHeight, scrollHeight);
 		}
 
-		this.nativeViewProtected.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(scrollInsetWidth), layout.toDeviceIndependentPixels(scrollInsetHeight));
+		view.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(scrollInsetWidth), layout.toDeviceIndependentPixels(scrollInsetHeight));
 
 		// RTL handling
 		if (this.orientation === 'horizontal') {
@@ -212,7 +213,7 @@ export class ScrollView extends ScrollViewBase {
 				if (this.direction === CoreTypes.LayoutDirection.rtl) {
 					const scrollableWidth = scrollInsetWidth - this.getMeasuredWidth();
 					if (scrollableWidth > 0) {
-						this.nativeViewProtected.contentOffset = CGPointMake(layout.toDeviceIndependentPixels(scrollableWidth), this.verticalOffset);
+						view.contentOffset = CGPointMake(layout.toDeviceIndependentPixels(scrollableWidth), this.verticalOffset);
 					}
 				}
 			}
diff --git a/packages/core/ui/search-bar/index.android.ts b/packages/core/ui/search-bar/index.android.ts
index ae6979a20c..69c1c4abc0 100644
--- a/packages/core/ui/search-bar/index.android.ts
+++ b/packages/core/ui/search-bar/index.android.ts
@@ -114,7 +114,7 @@ function enableUserInteractionSearchView(nativeView: any, value: boolean) {
 }
 
 export class SearchBar extends SearchBarBase {
-	nativeViewProtected: androidx.appcompat.widget.SearchView;
+	declare nativeViewProtected: androidx.appcompat.widget.SearchView;
 	private _searchTextView: android.widget.TextView;
 	private _searchPlate: android.widget.LinearLayout;
 
diff --git a/packages/core/ui/search-bar/index.ios.ts b/packages/core/ui/search-bar/index.ios.ts
index bf02ac310f..2a07040351 100644
--- a/packages/core/ui/search-bar/index.ios.ts
+++ b/packages/core/ui/search-bar/index.ios.ts
@@ -69,7 +69,7 @@ class UISearchBarImpl extends UISearchBar {
 }
 
 export class SearchBar extends SearchBarBase {
-	nativeViewProtected: UISearchBar;
+	declare nativeViewProtected: UISearchBar;
 	private _delegate;
 	private _textField: UITextField;
 
diff --git a/packages/core/ui/search-bar/search-bar-common.ts b/packages/core/ui/search-bar/search-bar-common.ts
index 9cf5508a27..d87b8f9ce1 100644
--- a/packages/core/ui/search-bar/search-bar-common.ts
+++ b/packages/core/ui/search-bar/search-bar-common.ts
@@ -1,6 +1,7 @@
 import { SearchBar as SearchBarDefinition } from '.';
 import { View, CSSType } from '../core/view';
 import { Property } from '../core/properties';
+import { colorConverter } from '../styling/style-properties';
 import { Color } from '../../color';
 
 @CSSType('SearchBar')
@@ -35,14 +36,14 @@ hintProperty.register(SearchBarBase);
 export const textFieldHintColorProperty = new Property<SearchBarBase, Color>({
 	name: 'textFieldHintColor',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 textFieldHintColorProperty.register(SearchBarBase);
 
 export const textFieldBackgroundColorProperty = new Property<SearchBarBase, Color>({
 	name: 'textFieldBackgroundColor',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 textFieldBackgroundColorProperty.register(SearchBarBase);
 
diff --git a/packages/core/ui/segmented-bar/index.android.ts b/packages/core/ui/segmented-bar/index.android.ts
index bc2f5729e8..21464e9a96 100644
--- a/packages/core/ui/segmented-bar/index.android.ts
+++ b/packages/core/ui/segmented-bar/index.android.ts
@@ -5,6 +5,7 @@ import { colorProperty, fontInternalProperty, fontSizeProperty } from '../stylin
 import { Color } from '../../color';
 import { layout } from '../../utils';
 import { SDK_VERSION } from '../../utils/constants';
+import { VIEW_GONE } from '../core/view/index.android';
 import { Trace } from '../../trace';
 import { CoreTypes } from '../../core-types';
 
@@ -80,7 +81,7 @@ function initializeNativeClasses(): void {
 			// This is collapsed by default and made visible
 			// by android when TabItem becomes visible/selected.
 			// TODO: Try commenting visibility change.
-			tv.setVisibility(android.view.View.GONE);
+			tv.setVisibility(VIEW_GONE);
 			tv.setMaxLines(1);
 			tv.setEllipsize(isRtl ? android.text.TextUtils.TruncateAt.START : android.text.TextUtils.TruncateAt.END);
 
@@ -107,7 +108,7 @@ function initializeNativeClasses(): void {
 }
 
 export class SegmentedBarItem extends SegmentedBarItemBase {
-	nativeViewProtected: android.widget.TextView;
+	declare nativeViewProtected: android.widget.TextView;
 
 	public setupNativeView(tabIndex: number): void {
 		// TabHost.TabSpec.setIndicator DOES NOT WORK once the title has been set.
@@ -193,7 +194,7 @@ export class SegmentedBarItem extends SegmentedBarItemBase {
 }
 
 export class SegmentedBar extends SegmentedBarBase {
-	nativeViewProtected: android.widget.TabHost;
+	declare nativeViewProtected: android.widget.TabHost;
 	private _tabContentFactory: android.widget.TabHost.TabContentFactory;
 	private _addingTab: boolean;
 
@@ -216,7 +217,7 @@ export class SegmentedBar extends SegmentedBarBase {
 
 		const frame = new android.widget.FrameLayout(context);
 		frame.setId(R_ID_TABCONTENT);
-		frame.setVisibility(android.view.View.GONE);
+		frame.setVisibility(VIEW_GONE);
 		tabHostLayout.addView(frame);
 
 		nativeView.addView(tabHostLayout);
diff --git a/packages/core/ui/segmented-bar/index.ios.ts b/packages/core/ui/segmented-bar/index.ios.ts
index 27e27ea12d..8c5a5d69ec 100644
--- a/packages/core/ui/segmented-bar/index.ios.ts
+++ b/packages/core/ui/segmented-bar/index.ios.ts
@@ -19,7 +19,7 @@ export class SegmentedBarItem extends SegmentedBarItemBase {
 }
 
 export class SegmentedBar extends SegmentedBarBase {
-	nativeViewProtected: UISegmentedControl;
+	declare nativeViewProtected: UISegmentedControl;
 	private _selectionHandler: NSObject;
 
 	createNativeView() {
diff --git a/packages/core/ui/segmented-bar/segmented-bar-common.ts b/packages/core/ui/segmented-bar/segmented-bar-common.ts
index 03247835f9..70af56f81f 100644
--- a/packages/core/ui/segmented-bar/segmented-bar-common.ts
+++ b/packages/core/ui/segmented-bar/segmented-bar-common.ts
@@ -4,6 +4,7 @@ import { ViewBase } from '../core/view-base';
 import { Property, CoercibleProperty, InheritedCssProperty } from '../core/properties';
 import { Color } from '../../color';
 import { Style } from '../styling/style';
+import { colorConverter } from '../styling/style-properties';
 import { EventData } from '../../data/observable';
 
 @CSSType('SegmentedBarItem')
@@ -148,8 +149,7 @@ export const selectedBackgroundColorProperty = new InheritedCssProperty<Style, C
 	name: 'selectedBackgroundColor',
 	cssName: 'selected-background-color',
 	equalityComparer: Color.equals,
-	defaultValue: new Color('blue'),
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 selectedBackgroundColorProperty.register(Style);
 
diff --git a/packages/core/ui/slider/index.android.ts b/packages/core/ui/slider/index.android.ts
index f76b283f78..d04a56ab26 100644
--- a/packages/core/ui/slider/index.android.ts
+++ b/packages/core/ui/slider/index.android.ts
@@ -51,7 +51,7 @@ function getListener(): android.widget.SeekBar.OnSeekBarChangeListener {
 
 export class Slider extends SliderBase {
 	_supressNativeValue: boolean;
-	nativeViewProtected: OwnerSeekBar;
+	declare nativeViewProtected: OwnerSeekBar;
 
 	public createNativeView() {
 		if (!SeekBar) {
@@ -75,14 +75,6 @@ export class Slider extends SliderBase {
 		super.disposeNativeView();
 	}
 
-	public resetNativeView(): void {
-		super.resetNativeView();
-		const nativeView = this.nativeViewProtected;
-		nativeView.setMax(100);
-		nativeView.setProgress(0);
-		nativeView.setKeyProgressIncrement(1);
-	}
-
 	/**
 	 * There is no minValue in Android. We simulate this by subtracting the minValue from the native value and maxValue.
 	 * We need this method to call native setMax and setProgress methods when minValue property is changed,
diff --git a/packages/core/ui/slider/index.ios.ts b/packages/core/ui/slider/index.ios.ts
index 95ccd106ed..4c1e70ff93 100644
--- a/packages/core/ui/slider/index.ios.ts
+++ b/packages/core/ui/slider/index.ios.ts
@@ -65,7 +65,7 @@ class SliderChangeHandlerImpl extends NSObject {
 }
 
 export class Slider extends SliderBase {
-	nativeViewProtected: TNSSlider;
+	declare nativeViewProtected: TNSSlider;
 	private _changeHandler: NSObject;
 
 	public createNativeView(): TNSSlider {
diff --git a/packages/core/ui/styling/background-common.ts b/packages/core/ui/styling/background-common.ts
index 3411f7823c..43493a4d9e 100644
--- a/packages/core/ui/styling/background-common.ts
+++ b/packages/core/ui/styling/background-common.ts
@@ -22,6 +22,8 @@ export const enum BackgroundClearFlags {
 export class Background {
 	public static default = new Background();
 
+	isDirty = false;
+
 	public color: Color;
 	public image: string | LinearGradient;
 	public repeat: CoreTypes.BackgroundRepeatType;
@@ -43,167 +45,150 @@ export class Background {
 	public boxShadows: BoxShadow[];
 	public clearFlags: number = BackgroundClearFlags.NONE;
 
-	private clone(): Background {
-		const clone = new Background();
-
-		clone.color = this.color;
-		clone.image = this.image;
-		clone.repeat = this.repeat;
-		clone.position = this.position;
-		clone.size = this.size;
-		clone.borderTopColor = this.borderTopColor;
-		clone.borderRightColor = this.borderRightColor;
-		clone.borderBottomColor = this.borderBottomColor;
-		clone.borderLeftColor = this.borderLeftColor;
-		clone.borderTopWidth = this.borderTopWidth;
-		clone.borderRightWidth = this.borderRightWidth;
-		clone.borderBottomWidth = this.borderBottomWidth;
-		clone.borderLeftWidth = this.borderLeftWidth;
-		clone.borderTopLeftRadius = this.borderTopLeftRadius;
-		clone.borderTopRightRadius = this.borderTopRightRadius;
-		clone.borderBottomRightRadius = this.borderBottomRightRadius;
-		clone.borderBottomLeftRadius = this.borderBottomLeftRadius;
-		clone.clipPath = this.clipPath;
-		clone.boxShadows = this.boxShadows;
-		clone.clearFlags = this.clearFlags;
-
+	cloneOrDirty(forceClone: boolean = true) {
+		let clone = <Background>this;
+		if (clone === Background.default || forceClone) {
+			clone = new Background();
+			Object.assign(clone, this);
+		} else {
+			clone.isDirty = true;
+		}
 		return clone;
 	}
 
-	public withColor(value: Color): Background {
-		const clone = this.clone();
+	public withColor(value: Color, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.color = value;
 		if (!value) {
 			clone.clearFlags |= BackgroundClearFlags.CLEAR_BACKGROUND_COLOR;
 		}
-
 		return clone;
 	}
 
-	public withImage(value: string | LinearGradient): Background {
-		const clone = this.clone();
+	public withImage(value: string | LinearGradient, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.image = value;
 
 		return clone;
 	}
 
-	public withRepeat(value: CoreTypes.BackgroundRepeatType): Background {
-		const clone = this.clone();
+	public withRepeat(value: CoreTypes.BackgroundRepeatType, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.repeat = value;
 
 		return clone;
 	}
 
-	public withPosition(value: string): Background {
-		const clone = this.clone();
+	public withPosition(value: string, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.position = value;
 
 		return clone;
 	}
 
-	public withSize(value: string): Background {
-		const clone = this.clone();
+	public withSize(value: string, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.size = value;
 
 		return clone;
 	}
 
-	public withBorderTopColor(value: Color): Background {
-		const clone = this.clone();
+	public withBorderTopColor(value: Color, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderTopColor = value;
 
 		return clone;
 	}
 
-	public withBorderRightColor(value: Color): Background {
-		const clone = this.clone();
+	public withBorderRightColor(value: Color, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderRightColor = value;
 
 		return clone;
 	}
 
-	public withBorderBottomColor(value: Color): Background {
-		const clone = this.clone();
+	public withBorderBottomColor(value: Color, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderBottomColor = value;
 
 		return clone;
 	}
 
-	public withBorderLeftColor(value: Color): Background {
-		const clone = this.clone();
+	public withBorderLeftColor(value: Color, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderLeftColor = value;
 
 		return clone;
 	}
 
-	public withBorderTopWidth(value: number): Background {
-		const clone = this.clone();
+	public withBorderTopWidth(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderTopWidth = value;
 
 		return clone;
 	}
 
-	public withBorderRightWidth(value: number): Background {
-		const clone = this.clone();
+	public withBorderRightWidth(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderRightWidth = value;
 
 		return clone;
 	}
 
-	public withBorderBottomWidth(value: number): Background {
-		const clone = this.clone();
+	public withBorderBottomWidth(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderBottomWidth = value;
 
 		return clone;
 	}
 
-	public withBorderLeftWidth(value: number): Background {
-		const clone = this.clone();
+	public withBorderLeftWidth(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderLeftWidth = value;
 
 		return clone;
 	}
 
-	public withBorderTopLeftRadius(value: number): Background {
-		const clone = this.clone();
+	public withBorderTopLeftRadius(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderTopLeftRadius = value;
 
 		return clone;
 	}
 
-	public withBorderTopRightRadius(value: number): Background {
-		const clone = this.clone();
+	public withBorderTopRightRadius(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderTopRightRadius = value;
 
 		return clone;
 	}
 
-	public withBorderBottomRightRadius(value: number): Background {
-		const clone = this.clone();
+	public withBorderBottomRightRadius(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderBottomRightRadius = value;
 
 		return clone;
 	}
 
-	public withBorderBottomLeftRadius(value: number): Background {
-		const clone = this.clone();
+	public withBorderBottomLeftRadius(value: number, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.borderBottomLeftRadius = value;
 
 		return clone;
 	}
 
-	public withClipPath(value: string | ClipPathFunction): Background {
-		const clone = this.clone();
+	public withClipPath(value: string | ClipPathFunction, forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.clipPath = value;
 
 		return clone;
 	}
 
-	public withBoxShadows(value: BoxShadow[]): Background {
-		const clone = this.clone();
+	public withBoxShadows(value: BoxShadow[], forceClone = true): Background {
+		const clone = this.cloneOrDirty(forceClone);
 		clone.boxShadows = value;
-		if (!value?.length) {
-			clone.clearFlags |= BackgroundClearFlags.CLEAR_BOX_SHADOW;
+		if (!value) {
+			this.clearFlags |= BackgroundClearFlags.CLEAR_BOX_SHADOW;
 		}
 
 		return clone;
@@ -256,6 +241,8 @@ export class Background {
 			value1.borderTopRightRadius === value2.borderTopRightRadius &&
 			value1.borderBottomRightRadius === value2.borderBottomRightRadius &&
 			value1.borderBottomLeftRadius === value2.borderBottomLeftRadius &&
+			value1.boxShadows === value2.boxShadows &&
+			value1.clipPath === value2.clipPath && 
 			isClipPathEqual
 			// && value1.clearFlags === value2.clearFlags
 		);
@@ -324,10 +311,4 @@ export class Background {
 	public getBoxShadows(): BoxShadow[] {
 		return this.boxShadows;
 	}
-
-	public toString(): string {
-		return `isEmpty: ${this.isEmpty()}; color: ${this.color}; image: ${this.image}; repeat: ${this.repeat}; position: ${this.position}; size: ${this.size}; borderTopColor: ${this.borderTopColor}; borderRightColor: ${this.borderRightColor}; borderBottomColor: ${this.borderBottomColor}; borderLeftColor: ${this.borderLeftColor}; borderTopWidth: ${this.borderTopWidth}; borderRightWidth: ${this.borderRightWidth}; borderBottomWidth: ${this.borderBottomWidth}; borderLeftWidth: ${this.borderLeftWidth}; borderTopLeftRadius: ${this.borderTopLeftRadius}; borderTopRightRadius: ${
-			this.borderTopRightRadius
-		}; borderBottomRightRadius: ${this.borderBottomRightRadius}; borderBottomLeftRadius: ${this.borderBottomLeftRadius}; clipPath: ${this.clipPath};`;
-	}
 }
diff --git a/packages/core/ui/styling/background.android.ts b/packages/core/ui/styling/background.android.ts
index 8f1f3239b0..7dd8c5569d 100644
--- a/packages/core/ui/styling/background.android.ts
+++ b/packages/core/ui/styling/background.android.ts
@@ -45,37 +45,36 @@ export function refreshBorderDrawable(view: View, borderDrawable: org.nativescri
 		const blackColor = -16777216; //android.graphics.Color.BLACK;
 
 		let imageUri: string;
-		if (background.image && typeof background.image === 'string' && background.image !== 'none') {
-			imageUri = background.image;
-			const match = imageUri.match(pattern);
-			if (match && match[2]) {
-				imageUri = match[2];
-			}
-		}
-
 		let bitmap: android.graphics.Bitmap = null;
-		if (isDataURI(imageUri)) {
-			const base64Data = imageUri.split(',')[1];
-			if (base64Data !== undefined) {
-				bitmap = fromBase64(base64Data);
-				imageUri = null;
-			}
-		} else if (isFileOrResourcePath(imageUri)) {
-			if (imageUri.indexOf(RESOURCE_PREFIX) !== 0) {
-				let fileName = imageUri;
-				if (fileName.indexOf('~/') === 0) {
-					fileName = path.join(knownFolders.currentApp().path, fileName.replace('~/', ''));
+		let gradient: org.nativescript.widgets.LinearGradientDefinition = null;
+		if (background.image) {
+			if (typeof background.image === 'string' && background.image !== 'none') {
+				imageUri = background.image;
+				const match = imageUri.match(pattern);
+				if (match && match[2]) {
+					imageUri = match[2];
 				}
-
-				imageUri = FILE_PREFIX + fileName;
+				if (isDataURI(imageUri)) {
+					const base64Data = imageUri.split(',')[1];
+					if (base64Data !== undefined) {
+						bitmap = fromBase64(base64Data);
+						imageUri = null;
+					}
+				} else if (isFileOrResourcePath(imageUri)) {
+					if (imageUri.indexOf(RESOURCE_PREFIX) !== 0) {
+						let fileName = imageUri;
+						if (fileName.indexOf('~/') === 0) {
+							fileName = path.join(knownFolders.currentApp().path, fileName.replace('~/', ''));
+						}
+
+						imageUri = FILE_PREFIX + fileName;
+					}
+				}
+			} else if (background.image instanceof LinearGradient) {
+				gradient = fromGradient(background.image);
 			}
 		}
 
-		let gradient: org.nativescript.widgets.LinearGradientDefinition = null;
-		if (background.image && background.image instanceof LinearGradient) {
-			gradient = fromGradient(background.image);
-		}
-
 		borderDrawable.refresh(
 			background.borderTopColor ? background.borderTopColor.android : blackColor,
 			background.borderRightColor ? background.borderRightColor.android : blackColor,
diff --git a/packages/core/ui/styling/background.ios.ts b/packages/core/ui/styling/background.ios.ts
index 613971e528..1ddf5c26ea 100644
--- a/packages/core/ui/styling/background.ios.ts
+++ b/packages/core/ui/styling/background.ios.ts
@@ -69,6 +69,11 @@ export namespace ios {
 	}
 
 	export function drawBackgroundVisualEffects(view: View): void {
+		const isInTheMiddleOfAnimation = UIView.inheritedAnimationDuration > 0;
+		CATransaction.begin();
+		if (!isInTheMiddleOfAnimation) {
+			CATransaction.setDisableActions(true);
+		}
 		const background = view.style.backgroundInternal;
 		const nativeView = <NativeScriptUIView>view.nativeViewProtected;
 		const layer: CALayer = nativeView.layer;
@@ -111,6 +116,10 @@ export namespace ios {
 		if (needsLayerAdjustmentOnScroll) {
 			registerAdjustLayersOnScrollListener(view);
 		}
+		if (!isInTheMiddleOfAnimation) {
+			CATransaction.setDisableActions(false);
+		}
+		CATransaction.commit();
 	}
 
 	export function clearBackgroundVisualEffects(view: View): void {
diff --git a/packages/core/ui/styling/css-animation-parser.ts b/packages/core/ui/styling/css-animation-parser.ts
index f071c738e0..7a853b81bf 100644
--- a/packages/core/ui/styling/css-animation-parser.ts
+++ b/packages/core/ui/styling/css-animation-parser.ts
@@ -186,9 +186,9 @@ export function parseKeyframeDeclarations(unparsedKeyframeDeclarations: Keyframe
 	const declarations = unparsedKeyframeDeclarations.reduce((declarations, { property: unparsedProperty, value: unparsedValue }) => {
 		const property = CssAnimationProperty._getByCssName(unparsedProperty);
 		unparsedValue = cleanupImportantFlags(unparsedValue, property?.cssLocalName);
-
-		if (typeof unparsedProperty === 'string' && property?._valueConverter) {
-			declarations[property.name] = property._valueConverter(<string>unparsedValue);
+		const valueConverter = property?.valueConverter;
+		if (typeof unparsedProperty === 'string' && valueConverter) {
+			declarations[property.name] = valueConverter(<string>unparsedValue);
 		} else if (unparsedProperty === 'transform') {
 			const transformations = transformConverter(unparsedValue);
 			Object.assign(declarations, transformations);
diff --git a/packages/core/ui/styling/font-common.ts b/packages/core/ui/styling/font-common.ts
index 3472f6c59b..e949128ecf 100644
--- a/packages/core/ui/styling/font-common.ts
+++ b/packages/core/ui/styling/font-common.ts
@@ -1,16 +1,31 @@
-import { Font as FontDefinition } from './font';
+import { Font } from './font';
 import { ParsedFont, FontStyleType, FontWeightType, FontVariationSettingsType } from './font-interfaces';
 import { makeValidator, makeParser } from '../core/properties';
 import { Trace } from '../../trace';
 
 export const FONTS_BASE_PATH = '/fonts';
 
-export abstract class Font implements FontDefinition {
+export abstract class FontBase implements Font {
 	public static default = undefined;
 	public readonly fontStyle: FontStyleType;
 	public readonly fontWeight: FontWeightType;
 	public readonly fontScale: number;
 
+	isDirty = false;
+
+	cloneOrDirty(force = true) {
+		let clone = <Font>this;
+		if (clone === Font.default || force) {
+			clone = new Font(undefined, undefined);
+			Object.assign(clone, this);
+		} else {
+			clone.isDirty = true;
+			// clear android cached typeface. need to find a better way
+			clone['_typeface'] = null;
+		}
+		return clone;
+	}
+
 	get isItalic(): boolean {
 		return this.fontStyle === FontStyle.ITALIC;
 	}
@@ -34,12 +49,46 @@ export abstract class Font implements FontDefinition {
 
 	public abstract getAndroidTypeface(): any; /* android.graphics.Typeface */
 	public abstract getUIFont(defaultFont: any /* UIFont */): any; /* UIFont */
-	public abstract withFontFamily(family: string): Font;
-	public abstract withFontStyle(style: FontStyleType): Font;
-	public abstract withFontWeight(weight: FontWeightType): Font;
-	public abstract withFontSize(size: number): Font;
-	public abstract withFontScale(scale: number): Font;
-	public abstract withFontVariationSettings(variationSettings: FontVariationSettingsType[]): Font;
+
+	public withFontFamily(family: string, forceClone = true): Font {
+		const clone = this.cloneOrDirty(forceClone);
+		clone.fontFamily = family;
+		return clone;
+	}
+
+	public withFontStyle(style: FontStyleType, forceClone = true): Font {
+		const clone = this.cloneOrDirty(forceClone);
+		clone.fontStyle = style;
+		return clone;
+	}
+
+	public withFontWeight(weight: FontWeightType, forceClone = true): Font {
+		const clone = this.cloneOrDirty(forceClone);
+		clone.fontWeight = weight;
+		return clone;
+	}
+
+	public withFontSize(size: number, forceClone = true): Font {
+		const clone = this.cloneOrDirty(forceClone);
+		clone.fontSize = size;
+		return clone;
+	}
+
+	public withFontScale(scale: number, forceClone = true): Font {
+		const clone = this.cloneOrDirty(forceClone);
+		clone.fontScale = scale;
+		return clone;
+	}
+
+	public withFontVariationSettings(variationSettings: Array<FontVariationSettingsType> | null, forceClone = true): Font {
+		const clone = this.cloneOrDirty(forceClone);
+		clone.fontVariationSettings = variationSettings;
+		return clone;
+	}
+
+	public isEqualToDefaultFont() {
+		return this === Font.default || (!this.fontFamily && this.fontScale === undefined && this.fontSize === undefined && !this.fontStyle && !this.fontWeight && !this.fontVariationSettings);
+	}
 
 	public static equals(value1: Font, value2: Font): boolean {
 		// both values are falsy
diff --git a/packages/core/ui/styling/font.android.ts b/packages/core/ui/styling/font.android.ts
index bb6a308e24..c22bfa0853 100644
--- a/packages/core/ui/styling/font.android.ts
+++ b/packages/core/ui/styling/font.android.ts
@@ -1,6 +1,6 @@
-import { Font as FontBase, parseFontFamily, genericFontFamilies, FontWeight, FontVariationSettings, FONTS_BASE_PATH } from './font-common';
+import { FontBase, parseFontFamily, genericFontFamilies, FontWeight, FontVariationSettings, FONTS_BASE_PATH } from './font-common';
 import { FontStyleType, FontWeightType, FontVariationSettingsType } from './font-interfaces';
-import { getNativeApp } from '../../application/helpers-common';
+import { getApplicationContext } from '../../application/helpers.android';
 import { Trace } from '../../trace';
 import { SDK_VERSION } from '../../utils/constants';
 import * as fs from '../../file-system';
@@ -15,30 +15,6 @@ export class Font extends FontBase {
 
 	private _typeface: android.graphics.Typeface;
 
-	public withFontFamily(family: string): Font {
-		return new Font(family, this.fontSize, this.fontStyle, this.fontWeight, 1, this.fontVariationSettings);
-	}
-
-	public withFontStyle(style: FontStyleType): Font {
-		return new Font(this.fontFamily, this.fontSize, style, this.fontWeight, 1, this.fontVariationSettings);
-	}
-
-	public withFontWeight(weight: FontWeightType): Font {
-		return new Font(this.fontFamily, this.fontSize, this.fontStyle, weight, 1, this.fontVariationSettings);
-	}
-
-	public withFontSize(size: number): Font {
-		return new Font(this.fontFamily, size, this.fontStyle, this.fontWeight, 1, this.fontVariationSettings);
-	}
-
-	public withFontScale(scale: number): Font {
-		return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, 1, this.fontVariationSettings);
-	}
-
-	public withFontVariationSettings(variationSettings: Array<FontVariationSettingsType> | null): Font {
-		return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, 1, variationSettings);
-	}
-
 	getAndroidTypeface(): android.graphics.Typeface {
 		if (!this._typeface) {
 			this._typeface = SDK_VERSION >= 28 ? createTypeface(this) : createTypefaceLegacy(this);
@@ -60,7 +36,7 @@ function computeFontCacheKey(fontFamily: string, font: Font) {
 function loadFontFromFile(fontFamily: string, font: Font): android.graphics.Typeface {
 	const cacheKey = SDK_VERSION >= 26 ? computeFontCacheKey(fontFamily, font) : fontFamily;
 
-	appAssets = appAssets || getNativeApp<android.app.Application>().getApplicationContext().getAssets();
+	appAssets = appAssets || getApplicationContext().getAssets();
 	if (!appAssets) {
 		return null;
 	}
diff --git a/packages/core/ui/styling/font.d.ts b/packages/core/ui/styling/font.d.ts
index bbbc8ae85b..2cdbd094c6 100644
--- a/packages/core/ui/styling/font.d.ts
+++ b/packages/core/ui/styling/font.d.ts
@@ -16,17 +16,21 @@ export declare class Font extends FontBase {
 	public isBold: boolean;
 	public isItalic: boolean;
 
+	public isDirty: boolean;
+
+	public isEqualToDefaultFont();
+
 	constructor(family: string, size: number, style?: FontStyleType, weight?: FontWeightType, scale?: number, fontVariationSettings?: FontVariationSettings[]);
 
 	public getAndroidTypeface(): any /* android.graphics.Typeface */;
 	public getUIFont(defaultFont: any /* UIFont */): any /* UIFont */;
 
-	public withFontFamily(family: string): Font;
-	public withFontStyle(style: FontStyleType): Font;
-	public withFontWeight(weight: FontWeightType): Font;
-	public withFontSize(size: number): Font;
-	public withFontScale(scale: number): Font;
-	public withFontVariationSettings(variationSettings: FontVariationSettings[]): Font;
+	public withFontFamily(family: string, forceClone?: boolean): Font;
+	public withFontStyle(style: FontStyleType, forceClone?: boolean): Font;
+	public withFontWeight(weight: FontWeightType, forceClone?: boolean): Font;
+	public withFontSize(size: number, forceClone?: boolean): Font;
+	public withFontScale(scale: numbe, forceClone?: boolean): Font;
+	public withFontVariationSettings(variationSettings: FontVariationSettings[], forceClone?: boolean): Font;
 
 	public static equals(value1: Font, value2: Font): boolean;
 }
diff --git a/packages/core/ui/styling/font.ios.ts b/packages/core/ui/styling/font.ios.ts
index c0708bea44..affa2383a7 100644
--- a/packages/core/ui/styling/font.ios.ts
+++ b/packages/core/ui/styling/font.ios.ts
@@ -1,4 +1,4 @@
-import { Font as FontBase, parseFontFamily, FontWeight, FontVariationSettings, fuzzySearch, FONTS_BASE_PATH } from './font-common';
+import { FontBase, parseFontFamily, FontWeight, FontVariationSettings, fuzzySearch, FONTS_BASE_PATH } from './font-common';
 import { FontStyleType, FontWeightType, FontVariationSettingsType } from './font-interfaces';
 import { Trace } from '../../trace';
 import { File, FileSystemEntity, Folder, knownFolders, path } from '../../file-system';
@@ -73,35 +73,11 @@ export class Font extends FontBase {
 		super(family, size, style, weight, scale, variationSettings);
 	}
 
-	public withFontFamily(family: string): Font {
-		return new Font(family, this.fontSize, this.fontStyle, this.fontWeight, this.fontScale, this.fontVariationSettings);
-	}
-
-	public withFontStyle(style: FontStyleType): Font {
-		return new Font(this.fontFamily, this.fontSize, style, this.fontWeight, this.fontScale, this.fontVariationSettings);
-	}
-
-	public withFontWeight(weight: FontWeightType): Font {
-		return new Font(this.fontFamily, this.fontSize, this.fontStyle, weight, this.fontScale, this.fontVariationSettings);
-	}
-
-	public withFontSize(size: number): Font {
-		return new Font(this.fontFamily, size, this.fontStyle, this.fontWeight, this.fontScale, this.fontVariationSettings);
-	}
-
-	public withFontScale(scale: number): Font {
-		return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, scale, this.fontVariationSettings);
-	}
-
-	public withFontVariationSettings(variationSettings: Array<FontVariationSettingsType> | null): Font {
-		return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, this.fontScale, variationSettings);
-	}
-
 	getUIFont(defaultFont: UIFont): UIFont {
 		return getUIFontCached({
 			fontFamily: parseFontFamily(this.fontFamily),
 			// Apply a11y scale and calculate proper font size (avoid applying multiplier to native point size as it's messing calculations)
-			fontSize: this.fontSize ? this.fontSize * this.fontScale : defaultFont.pointSize,
+			fontSize: this.fontSize ? this.fontSize * this.fontScale : defaultFont.pointSize * this.fontScale,
 			fontWeight: getNativeFontWeight(this.fontWeight),
 			fontVariationSettings: this.fontVariationSettings,
 			isBold: this.isBold,
diff --git a/packages/core/ui/styling/length-shared.ts b/packages/core/ui/styling/length-shared.ts
index 335b56a2d5..914a2a7d43 100644
--- a/packages/core/ui/styling/length-shared.ts
+++ b/packages/core/ui/styling/length-shared.ts
@@ -101,9 +101,8 @@ export namespace PercentLength {
 				}
 
 				return { unit: '%', value };
-			} else if (stringValue.indexOf('px') !== -1) {
-				stringValue = stringValue.replace('px', '').trim();
-				const value: CoreTypes.px = parseFloat(stringValue);
+			} else if (stringValue.endsWith('px')) {
+				const value: CoreTypes.px = parseFloat(stringValue.slice(-2).trim());
 				if (isNaN(value) || !isFinite(value)) {
 					throw new Error(`Invalid value: ${fromValue}`);
 				}
@@ -143,8 +142,8 @@ export namespace FixedLength {
 	export function parse(fromValue: string | CoreTypes.FixedLengthType): CoreTypes.FixedLengthType {
 		if (typeof fromValue === 'string') {
 			let stringValue = fromValue.trim();
-			if (stringValue.indexOf('px') !== -1) {
-				stringValue = stringValue.replace('px', '').trim();
+			if (stringValue.endsWith('px')) {
+				stringValue = stringValue.slice(0, -2).trim();
 				const value: CoreTypes.px = parseFloat(stringValue);
 				if (isNaN(value) || !isFinite(value)) {
 					throw new Error(`Invalid value: ${stringValue}`);
diff --git a/packages/core/ui/styling/style-properties.ts b/packages/core/ui/styling/style-properties.ts
index bb65f7f602..0f2dcd1b53 100644
--- a/packages/core/ui/styling/style-properties.ts
+++ b/packages/core/ui/styling/style-properties.ts
@@ -18,6 +18,8 @@ import { transformConverter } from './css-transform';
 import { ClipPathFunction } from './clip-path-function';
 import { parseCSSCommaSeparatedListOfValues } from './css-utils';
 
+export { Length, FixedLength, PercentLength } from './length-shared';
+
 interface ShorthandPositioning {
 	top: string;
 	right: string;
@@ -56,7 +58,7 @@ function equalsCommon(a: CoreTypes.PercentLengthType, b: CoreTypes.PercentLength
 }
 
 function convertToStringCommon(length: CoreTypes.LengthType | CoreTypes.PercentLengthType): string {
-	if (length == 'auto' || isCssWideKeyword(length)) {
+	if (length == 'auto' || length === null || length === undefined || isCssWideKeyword(length)) {
 		return 'auto';
 	}
 
@@ -73,15 +75,12 @@ function convertToStringCommon(length: CoreTypes.LengthType | CoreTypes.PercentL
 }
 
 function toDevicePixelsCommon(length: CoreTypes.PercentLengthType, auto: number = Number.NaN, parentAvailableWidth: number = Number.NaN): number {
-	if (length == 'auto' || isCssWideKeyword(length)) {
+	if (length == 'auto' || length === null || length === undefined || isCssWideKeyword(length)) {
 		return auto;
 	}
 	if (typeof length === 'number') {
 		return layout.round(layout.toDevicePixels(length));
 	}
-	if (!length) {
-		return auto;
-	}
 	// @ts-ignore
 	switch (length.unit) {
 		case 'px':
@@ -97,6 +96,13 @@ function toDevicePixelsCommon(length: CoreTypes.PercentLengthType, auto: number
 	}
 }
 
+export function colorConverter(v: string | Color): Color {
+	if (!v || v instanceof Color) {
+		return v as Color;
+	}
+	return new Color(v);
+}
+
 function isNonNegativeFiniteNumber(value: number): boolean {
 	return isFinite(value) && !isNaN(value) && value >= 0;
 }
@@ -280,7 +286,7 @@ export const minWidthProperty = new CssProperty<Style, CoreTypes.LengthType>({
 	name: 'minWidth',
 	cssName: 'min-width',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueChanged: (target, oldValue, newValue) => {
 		const view = target.viewRef.get();
@@ -298,7 +304,7 @@ export const minHeightProperty = new CssProperty<Style, CoreTypes.LengthType>({
 	name: 'minHeight',
 	cssName: 'min-height',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueChanged: (target, oldValue, newValue) => {
 		const view = target.viewRef.get();
@@ -316,17 +322,9 @@ export const widthProperty = new CssAnimationProperty<Style, CoreTypes.PercentLe
 	name: 'width',
 	cssName: 'width',
 	defaultValue: 'auto',
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
-	// TODO: CSSAnimationProperty was needed for keyframe (copying other impls), but `affectsLayout` does not exist
-	//       on the animation property, so fake it here. x_x
-	valueChanged: (target, oldValue, newValue) => {
-		if (global.isIOS) {
-			const view = target.viewRef.get();
-			if (view) {
-				view.requestLayout();
-			}
-		}
-	},
+
 	valueConverter: PercentLength.parse,
 });
 widthProperty.register(Style);
@@ -336,16 +334,7 @@ export const heightProperty = new CssAnimationProperty<Style, CoreTypes.PercentL
 	cssName: 'height',
 	defaultValue: 'auto',
 	equalityComparer: Length.equals,
-	// TODO: CSSAnimationProperty was needed for keyframe (copying other impls), but `affectsLayout` does not exist
-	//       on the animation property, so fake it here. -_-
-	valueChanged: (target, oldValue, newValue) => {
-		if (global.isIOS) {
-			const view = target.viewRef.get();
-			if (view) {
-				view.requestLayout();
-			}
-		}
-	},
+	affectsLayout: __IOS__,
 	valueConverter: PercentLength.parse,
 });
 heightProperty.register(Style);
@@ -368,7 +357,7 @@ export const marginLeftProperty = new CssProperty<Style, CoreTypes.PercentLength
 	name: 'marginLeft',
 	cssName: 'margin-left',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueConverter: PercentLength.parse,
 });
@@ -378,7 +367,7 @@ export const marginRightProperty = new CssProperty<Style, CoreTypes.PercentLengt
 	name: 'marginRight',
 	cssName: 'margin-right',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueConverter: PercentLength.parse,
 });
@@ -388,7 +377,7 @@ export const marginTopProperty = new CssProperty<Style, CoreTypes.PercentLengthT
 	name: 'marginTop',
 	cssName: 'margin-top',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueConverter: PercentLength.parse,
 });
@@ -398,7 +387,7 @@ export const marginBottomProperty = new CssProperty<Style, CoreTypes.PercentLeng
 	name: 'marginBottom',
 	cssName: 'margin-bottom',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueConverter: PercentLength.parse,
 });
@@ -422,7 +411,7 @@ export const paddingLeftProperty = new CssProperty<Style, CoreTypes.LengthType>(
 	name: 'paddingLeft',
 	cssName: 'padding-left',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueChanged: (target, oldValue, newValue) => {
 		const view = target.viewRef.get();
@@ -440,7 +429,7 @@ export const paddingRightProperty = new CssProperty<Style, CoreTypes.LengthType>
 	name: 'paddingRight',
 	cssName: 'padding-right',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueChanged: (target, oldValue, newValue) => {
 		const view = target.viewRef.get();
@@ -458,7 +447,7 @@ export const paddingTopProperty = new CssProperty<Style, CoreTypes.LengthType>({
 	name: 'paddingTop',
 	cssName: 'padding-top',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueChanged: (target, oldValue, newValue) => {
 		const view = target.viewRef.get();
@@ -476,7 +465,7 @@ export const paddingBottomProperty = new CssProperty<Style, CoreTypes.LengthType
 	name: 'paddingBottom',
 	cssName: 'padding-bottom',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
 	valueChanged: (target, oldValue, newValue) => {
 		const view = target.viewRef.get();
@@ -494,17 +483,17 @@ export const horizontalAlignmentProperty = new CssProperty<Style, CoreTypes.Hori
 	name: 'horizontalAlignment',
 	cssName: 'horizontal-align',
 	defaultValue: CoreTypes.HorizontalAlignment.stretch,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	valueConverter: CoreTypes.HorizontalAlignment.parse,
 });
 horizontalAlignmentProperty.register(Style);
 
-export const verticalAlignmentProperty = new CssProperty<Style, CoreTypes.VerticalAlignmentTextType>({
+export const verticalAlignmentProperty = new CssProperty<Style, CoreTypes.VerticalAlignmentType>({
 	name: 'verticalAlignment',
 	cssName: 'vertical-align',
-	defaultValue: CoreTypes.VerticalAlignmentText.stretch,
-	affectsLayout: global.isIOS,
-	valueConverter: CoreTypes.VerticalAlignmentText.parse,
+	defaultValue: CoreTypes.VerticalAlignment.stretch,
+	affectsLayout: __IOS__,
+	valueConverter: CoreTypes.VerticalAlignment.parse,
 });
 verticalAlignmentProperty.register(Style);
 
@@ -618,15 +607,39 @@ export const backgroundInternalProperty = new CssProperty<Style, Background>({
 	name: 'backgroundInternal',
 	cssName: '_backgroundInternal',
 	defaultValue: Background.default,
+	equalityComparer: (value1: Background, value2: Background, target) => {
+		if (value1 === value2) {
+			const view = target.viewRef.get();
+
+			// if view layout or updates are suspended we will check the backgroundInternal at the end
+			if (value1.isDirty && !view._suspendNativeUpdatesCount) {
+				value1.isDirty = false;
+				return false;
+			}
+			return true;
+		}
+		return Background.equals(value1, value2);
+	},
 });
 backgroundInternalProperty.register(Style);
 
+function backgroundInternalSubPropertyValueChanged<T extends Style, U>(block: (target: T, oldValue: U, newValue: U) => Background) {
+	return function (target: T, oldValue: U, newValue: U) {
+		const newBackgroundInternal = block(target, oldValue, newValue);
+		const view = target.viewRef.get();
+		if (target.backgroundInternal !== newBackgroundInternal || !view._suspendNativeUpdatesCount) {
+			target.backgroundInternal = newBackgroundInternal;
+		} else {
+			// let s not go through another property set which takes time during batch updates
+			// we will check and update backgroundInternal once the update is done
+		}
+	};
+}
+
 export const backgroundImageProperty = new CssProperty<Style, string | LinearGradient>({
 	name: 'backgroundImage',
 	cssName: 'background-image',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withImage(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withImage(newValue)),
 	equalityComparer: (value1, value2) => {
 		if (value1 instanceof LinearGradient && value2 instanceof LinearGradient) {
 			return LinearGradient.equals(value1, value2);
@@ -650,11 +663,9 @@ backgroundImageProperty.register(Style);
 export const backgroundColorProperty = new CssAnimationProperty<Style, Color>({
 	name: 'backgroundColor',
 	cssName: 'background-color',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withColor(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withColor(newValue, false)),
 	equalityComparer: Color.equals,
-	valueConverter: (value) => new Color(value),
+	valueConverter: colorConverter,
 });
 backgroundColorProperty.register(Style);
 
@@ -662,27 +673,21 @@ export const backgroundRepeatProperty = new CssProperty<Style, CoreTypes.Backgro
 	name: 'backgroundRepeat',
 	cssName: 'background-repeat',
 	valueConverter: CoreTypes.BackgroundRepeat.parse,
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withRepeat(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withRepeat(newValue, false)),
 });
 backgroundRepeatProperty.register(Style);
 
 export const backgroundSizeProperty = new CssProperty<Style, string>({
 	name: 'backgroundSize',
 	cssName: 'background-size',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withSize(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withSize(newValue, false)),
 });
 backgroundSizeProperty.register(Style);
 
 export const backgroundPositionProperty = new CssProperty<Style, string>({
 	name: 'backgroundPosition',
 	cssName: 'background-position',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withPosition(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withPosition(newValue, false)),
 });
 backgroundPositionProperty.register(Style);
 
@@ -722,44 +727,36 @@ borderColorProperty.register(Style);
 export const borderTopColorProperty = new CssProperty<Style, Color>({
 	name: 'borderTopColor',
 	cssName: 'border-top-color',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withBorderTopColor(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withBorderTopColor(newValue, false)),
 	equalityComparer: Color.equals,
-	valueConverter: (value) => new Color(value),
+	valueConverter: colorConverter,
 });
 borderTopColorProperty.register(Style);
 
 export const borderRightColorProperty = new CssProperty<Style, Color>({
 	name: 'borderRightColor',
 	cssName: 'border-right-color',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withBorderRightColor(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withBorderRightColor(newValue, false)),
 	equalityComparer: Color.equals,
-	valueConverter: (value) => new Color(value),
+	valueConverter: colorConverter,
 });
 borderRightColorProperty.register(Style);
 
 export const borderBottomColorProperty = new CssProperty<Style, Color>({
 	name: 'borderBottomColor',
 	cssName: 'border-bottom-color',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withBorderBottomColor(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withBorderBottomColor(newValue, false)),
 	equalityComparer: Color.equals,
-	valueConverter: (value) => new Color(value),
+	valueConverter: colorConverter,
 });
 borderBottomColorProperty.register(Style);
 
 export const borderLeftColorProperty = new CssProperty<Style, Color>({
 	name: 'borderLeftColor',
 	cssName: 'border-left-color',
-	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withBorderLeftColor(newValue);
-	},
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => target.backgroundInternal.withBorderLeftColor(newValue, false)),
 	equalityComparer: Color.equals,
-	valueConverter: (value) => new Color(value),
+	valueConverter: colorConverter,
 });
 borderLeftColorProperty.register(Style);
 
@@ -800,12 +797,12 @@ export const borderTopWidthProperty = new CssProperty<Style, CoreTypes.LengthTyp
 	name: 'borderTopWidth',
 	cssName: 'border-top-width',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-top-width should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
 
 		const view = target.viewRef.get();
@@ -814,8 +811,8 @@ export const borderTopWidthProperty = new CssProperty<Style, CoreTypes.LengthTyp
 		} else {
 			Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderTopWidth(value);
-	},
+		return target.backgroundInternal.withBorderTopWidth(value, false);
+	}),
 	valueConverter: Length.parse,
 });
 borderTopWidthProperty.register(Style);
@@ -824,12 +821,12 @@ export const borderRightWidthProperty = new CssProperty<Style, CoreTypes.LengthT
 	name: 'borderRightWidth',
 	cssName: 'border-right-width',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-right-width should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
 
 		const view = target.viewRef.get();
@@ -838,8 +835,8 @@ export const borderRightWidthProperty = new CssProperty<Style, CoreTypes.LengthT
 		} else {
 			Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderRightWidth(value);
-	},
+		return target.backgroundInternal.withBorderRightWidth(value, false);
+	}),
 	valueConverter: Length.parse,
 });
 borderRightWidthProperty.register(Style);
@@ -848,12 +845,12 @@ export const borderBottomWidthProperty = new CssProperty<Style, CoreTypes.Length
 	name: 'borderBottomWidth',
 	cssName: 'border-bottom-width',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-bottom-width should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
 
 		const view = target.viewRef.get();
@@ -862,8 +859,8 @@ export const borderBottomWidthProperty = new CssProperty<Style, CoreTypes.Length
 		} else {
 			Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderBottomWidth(value);
-	},
+		return target.backgroundInternal.withBorderBottomWidth(value, false);
+	}),
 	valueConverter: Length.parse,
 });
 borderBottomWidthProperty.register(Style);
@@ -872,12 +869,12 @@ export const borderLeftWidthProperty = new CssProperty<Style, CoreTypes.LengthTy
 	name: 'borderLeftWidth',
 	cssName: 'border-left-width',
 	defaultValue: CoreTypes.zeroLength,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	equalityComparer: Length.equals,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-left-width should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
 
 		const view = target.viewRef.get();
@@ -886,8 +883,8 @@ export const borderLeftWidthProperty = new CssProperty<Style, CoreTypes.LengthTy
 		} else {
 			Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderLeftWidth(value);
-	},
+		return target.backgroundInternal.withBorderLeftWidth(value, false);
+	}),
 	valueConverter: Length.parse,
 });
 borderLeftWidthProperty.register(Style);
@@ -929,14 +926,14 @@ export const borderTopLeftRadiusProperty = new CssProperty<Style, CoreTypes.Leng
 	name: 'borderTopLeftRadius',
 	cssName: 'border-top-left-radius',
 	defaultValue: 0,
-	affectsLayout: global.isIOS,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	affectsLayout: __IOS__,
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-top-left-radius should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderTopLeftRadius(value);
-	},
+		return target.backgroundInternal.withBorderTopLeftRadius(value, false);
+	}),
 	valueConverter: Length.parse,
 	equalityComparer: Length.equals,
 });
@@ -946,14 +943,14 @@ export const borderTopRightRadiusProperty = new CssProperty<Style, CoreTypes.Len
 	name: 'borderTopRightRadius',
 	cssName: 'border-top-right-radius',
 	defaultValue: 0,
-	affectsLayout: global.isIOS,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	affectsLayout: __IOS__,
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-top-right-radius should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderTopRightRadius(value);
-	},
+		return target.backgroundInternal.withBorderTopRightRadius(value, false);
+	}),
 	valueConverter: Length.parse,
 	equalityComparer: Length.equals,
 });
@@ -963,14 +960,14 @@ export const borderBottomRightRadiusProperty = new CssProperty<Style, CoreTypes.
 	name: 'borderBottomRightRadius',
 	cssName: 'border-bottom-right-radius',
 	defaultValue: 0,
-	affectsLayout: global.isIOS,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	affectsLayout: __IOS__,
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-bottom-right-radius should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderBottomRightRadius(value);
-	},
+		return target.backgroundInternal.withBorderBottomRightRadius(value, false);
+	}),
 	valueConverter: Length.parse,
 	equalityComparer: Length.equals,
 });
@@ -980,14 +977,14 @@ export const borderBottomLeftRadiusProperty = new CssProperty<Style, CoreTypes.L
 	name: 'borderBottomLeftRadius',
 	cssName: 'border-bottom-left-radius',
 	defaultValue: 0,
-	affectsLayout: global.isIOS,
-	valueChanged: (target, oldValue, newValue) => {
-		const value = Length.toDevicePixels(newValue, 0);
+	affectsLayout: __IOS__,
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		let value = Length.toDevicePixels(newValue, 0);
 		if (!isNonNegativeFiniteNumber(value)) {
-			throw new Error(`border-bottom-left-radius should be Non-Negative Finite number. Value: ${value}`);
+			value = 0;
 		}
-		target.backgroundInternal = target.backgroundInternal.withBorderBottomLeftRadius(value);
-	},
+		return target.backgroundInternal.withBorderBottomLeftRadius(value, false);
+	}),
 	valueConverter: Length.parse,
 	equalityComparer: Length.equals,
 });
@@ -996,8 +993,8 @@ borderBottomLeftRadiusProperty.register(Style);
 const boxShadowProperty = new CssProperty<Style, ShadowCSSValues[]>({
 	name: 'boxShadow',
 	cssName: 'box-shadow',
-	valueChanged: (target, _oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withBoxShadows(
+	valueChanged: backgroundInternalSubPropertyValueChanged((target, oldValue, newValue) => {
+		return target.backgroundInternal.withBoxShadows(
 			newValue?.length
 				? newValue.map((v) => {
 						return {
@@ -1009,9 +1006,9 @@ const boxShadowProperty = new CssProperty<Style, ShadowCSSValues[]>({
 							color: v.color,
 						};
 					})
-				: null,
+				: null, false
 		);
-	},
+	}),
 	valueConverter: (value) => {
 		const values = parseCSSCommaSeparatedListOfValues(value);
 		const result: ShadowCSSValues[] = [];
@@ -1033,7 +1030,7 @@ export const clipPathProperty = new CssProperty<Style, string | ClipPathFunction
 	name: 'clipPath',
 	cssName: 'clip-path',
 	valueChanged: (target, oldValue, newValue) => {
-		target.backgroundInternal = target.backgroundInternal.withClipPath(newValue);
+		target.backgroundInternal = target.backgroundInternal.withClipPath(newValue, false);
 	},
 	equalityComparer: (value1, value2) => {
 		if (value1 instanceof ClipPathFunction && value2 instanceof ClipPathFunction) {
@@ -1092,27 +1089,54 @@ export const colorProperty = new InheritedCssProperty<Style, Color>({
 	name: 'color',
 	cssName: 'color',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 colorProperty.register(Style);
 
 export const fontInternalProperty = new CssProperty<Style, Font>({
 	name: 'fontInternal',
+	defaultValue: Font.default,
 	cssName: '_fontInternal',
+	equalityComparer: (value1: Font, value2: Font, target) => {
+		if (value1 === value2) {
+			const view = target.viewRef.get();
+
+			// if view layout or updates are suspended we will check the backgroundInternal at the end
+			if (value1.isDirty && !view._suspendNativeUpdatesCount) {
+				value1.isDirty = false;
+				return false;
+			}
+			return true;
+		}
+		return Font.equals(value1, value2);
+	},
 });
 fontInternalProperty.register(Style);
 
+function fontInternalSubPropertyValueChanged<T extends Style, U>(block: (target: T, oldValue: U, newValue: U) => Font, shouldIgnore?: Function) {
+	return function (target: T, oldValue: U, newValue: U) {
+		if (shouldIgnore?.(target, oldValue, newValue)) {
+			return;
+		}
+		let newFontInternal = block(target, oldValue, newValue);
+		if (newFontInternal.isEqualToDefaultFont()) {
+			newFontInternal = unsetValue;
+		}
+		const view = target.viewRef.get();
+		if (target.fontInternal !== newFontInternal || !view._suspendNativeUpdatesCount) {
+			target.fontInternal = newFontInternal;
+		} else {
+			// let s not go through another property set which takes time during batch updates
+			// we will check and update fontInternal once the update is done
+		}
+	};
+}
+
 export const fontFamilyProperty = new InheritedCssProperty<Style, string>({
 	name: 'fontFamily',
 	cssName: 'font-family',
-	affectsLayout: global.isIOS,
-	valueChanged: (target, oldValue, newValue) => {
-		const currentFont = target.fontInternal || Font.default;
-		if (currentFont.fontFamily !== newValue) {
-			const newFont = currentFont.withFontFamily(newValue);
-			target.fontInternal = Font.equals(Font.default, newFont) ? unsetValue : newFont;
-		}
-	},
+	affectsLayout: __IOS__,
+	valueChanged: fontInternalSubPropertyValueChanged((target, oldValue, newValue) => target.fontInternal.withFontFamily(newValue, false)),
 });
 fontFamilyProperty.register(Style);
 
@@ -1120,24 +1144,18 @@ export const fontScaleInternalProperty = new InheritedCssProperty<Style, number>
 	name: 'fontScaleInternal',
 	cssName: '_fontScaleInternal',
 	defaultValue: 1.0,
-	valueConverter: (v) => parseFloat(v),
+	valueConverter: parseFloat,
 });
 fontScaleInternalProperty.register(Style);
 
 export const fontSizeProperty = new InheritedCssProperty<Style, number>({
 	name: 'fontSize',
 	cssName: 'font-size',
-	affectsLayout: global.isIOS,
-	valueChanged: (target, oldValue, newValue) => {
-		if (target.viewRef['handleFontSize'] === true) {
-			return;
-		}
-		const currentFont = target.fontInternal || Font.default;
-		if (currentFont.fontSize !== newValue) {
-			const newFont = currentFont.withFontSize(newValue);
-			target.fontInternal = Font.equals(Font.default, newFont) ? unsetValue : newFont;
-		}
-	},
+	affectsLayout: __IOS__,
+	valueChanged: fontInternalSubPropertyValueChanged(
+		(target, oldValue, newValue) => target.fontInternal.withFontSize(newValue, false),
+		(target) => target.viewRef.get()?.['handleFontSize'] === true,
+	),
 	valueConverter: (v) => parseFloat(v),
 });
 fontSizeProperty.register(Style);
@@ -1145,32 +1163,21 @@ fontSizeProperty.register(Style);
 export const fontStyleProperty = new InheritedCssProperty<Style, FontStyleType>({
 	name: 'fontStyle',
 	cssName: 'font-style',
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	defaultValue: FontStyle.NORMAL,
 	valueConverter: FontStyle.parse,
-	valueChanged: (target, oldValue, newValue) => {
-		const currentFont = target.fontInternal || Font.default;
-		if (currentFont.fontStyle !== newValue) {
-			const newFont = currentFont.withFontStyle(newValue);
-			target.fontInternal = Font.equals(Font.default, newFont) ? unsetValue : newFont;
-		}
-	},
+
+	valueChanged: fontInternalSubPropertyValueChanged((target, oldValue, newValue) => target.fontInternal.withFontStyle(newValue, false)),
 });
 fontStyleProperty.register(Style);
 
 export const fontWeightProperty = new InheritedCssProperty<Style, FontWeightType>({
 	name: 'fontWeight',
 	cssName: 'font-weight',
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	defaultValue: FontWeight.NORMAL,
 	valueConverter: FontWeight.parse,
-	valueChanged: (target, oldValue, newValue) => {
-		const currentFont = target.fontInternal || Font.default;
-		if (currentFont.fontWeight !== newValue) {
-			const newFont = currentFont.withFontWeight(newValue);
-			target.fontInternal = Font.equals(Font.default, newFont) ? unsetValue : newFont;
-		}
-	},
+	valueChanged: fontInternalSubPropertyValueChanged((target, oldValue, newValue) => target.fontInternal.withFontWeight(newValue, false)),
 });
 fontWeightProperty.register(Style);
 
@@ -1206,14 +1213,8 @@ fontProperty.register(Style);
 export const fontVariationSettingsProperty = new InheritedCssProperty<Style, FontVariationSettingsType[]>({
 	name: 'fontVariationSettings',
 	cssName: 'font-variation-settings',
-	affectsLayout: global.isIOS,
-	valueChanged: (target, oldValue, newValue) => {
-		const currentFont = target.fontInternal || Font.default;
-		if (currentFont.fontVariationSettings !== newValue) {
-			const newFont = currentFont.withFontVariationSettings(newValue);
-			target.fontInternal = Font.equals(Font.default, newFont) ? unsetValue : newFont;
-		}
-	},
+	affectsLayout: __IOS__,
+	valueChanged: fontInternalSubPropertyValueChanged((target, oldValue, newValue) => target.fontInternal.withFontVariationSettings(newValue, false)),
 	valueConverter: (value) => {
 		return FontVariationSettings.parse(value);
 	},
@@ -1224,12 +1225,12 @@ export const visibilityProperty = new CssProperty<Style, CoreTypes.VisibilityTyp
 	name: 'visibility',
 	cssName: 'visibility',
 	defaultValue: CoreTypes.Visibility.visible,
-	affectsLayout: global.isIOS,
+	affectsLayout: __IOS__,
 	valueConverter: CoreTypes.Visibility.parse,
 	valueChanged: (target, oldValue, newValue) => {
 		const view = target.viewRef.get();
 		if (view) {
-			view.isCollapsed = newValue === CoreTypes.Visibility.collapse;
+			view.isCollapsed = newValue === CoreTypes.Visibility.collapse || newValue === CoreTypes.Visibility.collapsed;
 		} else {
 			Trace.write(`${newValue} not set to view's property because ".viewRef" is cleared`, Trace.categories.Style, Trace.messageType.warn);
 		}
diff --git a/packages/core/ui/styling/style-scope.ts b/packages/core/ui/styling/style-scope.ts
index 81a1616e85..217a3ed1d8 100644
--- a/packages/core/ui/styling/style-scope.ts
+++ b/packages/core/ui/styling/style-scope.ts
@@ -1,9 +1,10 @@
 import { getNativeScriptGlobals } from '../../globals/global-utils';
 import { ViewBase } from '../core/view-base';
 import { View } from '../core/view';
-import { _evaluateCssVariableExpression, _evaluateCssCalcExpression, isCssVariable, isCssVariableExpression, isCssCalcExpression } from '../core/properties';
+import { CssAnimationProperty, _evaluateCssVariableExpression, _evaluateCssCalcExpression, isCssVariable, isCssVariableExpression, isCssCalcExpression } from '../core/properties';
 import { unsetValue } from '../core/properties/property-shared';
 import * as ReworkCSS from '../../css';
+import { SyntaxTree, Keyframes as KeyframesDefinition, Node as CssNode } from '../../css';
 
 import { RuleSet, StyleSheetSelectorScope, SelectorCore, SelectorsMatch, ChangeMap, fromAstNode, Node, MEDIA_QUERY_SEPARATOR, matchMediaQueryString } from './css-selector';
 import { Trace } from './styling-shared';
@@ -17,10 +18,6 @@ import { CssAnimationParser } from './css-animation-parser';
 import { sanitizeModuleName } from '../../utils/common';
 import { resolveModuleName } from '../../module-name-resolver';
 import { cleanupImportantFlags } from './css-utils';
-import { cssTreeParse } from '../../css/css-tree-parser';
-import { CSS3Parser } from '../../css/CSS3Parser';
-import { CSSNativeScript } from '../../css/CSSNativeScript';
-import { parse as parseCss } from '../../css/lib/parse';
 // @ts-ignore apps resolve this at runtime with path alias in project bundlers
 import appConfig from '~/package.json';
 
@@ -241,14 +238,14 @@ class CSSSource {
 	private async parseCSSAst() {
 		if (this._source) {
 			if (__CSS_PARSER__ === 'css-tree') {
-				this._ast = cssTreeParse(this._source, this._file);
+				this._ast = (await import('../../css/css-tree-parser')).cssTreeParse(this._source, this._file);
 			} else if (__CSS_PARSER__ === 'nativescript') {
-				const cssparser = new CSS3Parser(this._source);
+				const cssparser = new (await import('../../css/CSS3Parser')).CSS3Parser(this._source);
 				const stylesheet = cssparser.parseAStylesheet();
-				const cssNS = new CSSNativeScript();
+				const cssNS = new (await import('../../css/CSSNativeScript')).CSSNativeScript();
 				this._ast = cssNS.parseStylesheet(stylesheet);
 			} else if (__CSS_PARSER__ === 'rework') {
-				this._ast = parseCss(this._source, { source: this._file });
+				this._ast = (await import('../../css/lib/parse')).parse(this._source, { source: this._file });
 			}
 		}
 	}
@@ -545,9 +542,9 @@ export class CssState {
 	 * Called when a change had occurred that may invalidate the statically matching selectors (class, id, ancestor selectors).
 	 * As a result, at some point in time, the selectors matched have to be requerried from the style scope and applied to the view.
 	 */
-	public onChange(): void {
+	public onChange(force = false): void {
 		const view = this.viewRef.get();
-		if (view && view.isLoaded) {
+		if (view && (force || view.isLoaded)) {
 			this.unsubscribeFromDynamicUpdates();
 			this.updateMatch();
 			this.subscribeForDynamicUpdates();
@@ -571,6 +568,7 @@ export class CssState {
 		return this.viewRef.get()._styleScope.getSelectorsVersion() === this._appliedSelectorsVersion;
 	}
 
+	@profile
 	public onLoaded(): void {
 		if (this._matchInvalid) {
 			this.updateMatch();
@@ -661,15 +659,9 @@ export class CssState {
 
 		const view = this.viewRef.get();
 		if (view) {
-			view.style['keyframe:rotate'] = unsetValue;
-			view.style['keyframe:rotateX'] = unsetValue;
-			view.style['keyframe:rotateY'] = unsetValue;
-			view.style['keyframe:scaleX'] = unsetValue;
-			view.style['keyframe:scaleY'] = unsetValue;
-			view.style['keyframe:translateX'] = unsetValue;
-			view.style['keyframe:translateY'] = unsetValue;
-			view.style['keyframe:backgroundColor'] = unsetValue;
-			view.style['keyframe:opacity'] = unsetValue;
+			Object.values(CssAnimationProperty.properties).forEach((property) => {
+				view.style[property.keyframe] = unsetValue;
+			});
 		} else {
 			Trace.write(`KeyframeAnimations cannot be stopped because ".viewRef" is cleared`, Trace.categories.Animation, Trace.messageType.warn);
 		}
@@ -1104,28 +1096,35 @@ function resolveFilePathFromImport(importSource: string, fileName: string): stri
 export const applyInlineStyle = profile(function applyInlineStyle(view: ViewBase, styleStr: string) {
 	const localStyle = `local { ${styleStr} }`;
 	const inlineRuleSet = CSSSource.fromSource(localStyle).selectors;
+	const oldInlineRuleSet = view['oldInlineStyle'] ? CSSSource.fromSource(`local { ${view['oldInlineStyle']} }`).selectors : null;
 
 	// Reset unscoped css-variables
 	view.style.resetUnscopedCssVariables();
 
+	const declarations = inlineRuleSet?.[0]?.declarations || [];
+	const oldDeclarations = oldInlineRuleSet?.[0]?.declarations;
 	// Set all the css-variables first, so we can be sure they are up-to-date
-	inlineRuleSet[0].declarations.forEach((d) => {
+	for (let index = declarations.length - 1; index >= 0; index--) {
+		const d = declarations[index];
 		// Use the actual property name so that a local value is set.
 		const property = d.property;
 		if (isCssVariable(property)) {
 			view.style.setUnscopedCssVariable(property, d.value);
+			declarations.splice(index, 1);
 		}
-	});
+		if (oldDeclarations) {
+			const oldIndex = oldDeclarations.findIndex((d2) => d2.property === d.property);
+			if (oldIndex >= 0) {
+				oldDeclarations.splice(oldIndex, 1);
+			}
+		}
+	}
 
-	inlineRuleSet[0].declarations.forEach((d) => {
+	for (let index = declarations.length - 1; index >= 0; index--) {
+		const d = declarations[index];
 		// Use the actual property name so that a local value is set.
 		const property = d.property;
 		try {
-			if (isCssVariable(property)) {
-				// Skip css-variables, they have been handled
-				return;
-			}
-
 			const value = evaluateCssExpressions(view, property, d.value);
 			if (property in view.style) {
 				view.style[property] = value;
@@ -1135,7 +1134,24 @@ export const applyInlineStyle = profile(function applyInlineStyle(view: ViewBase
 		} catch (e) {
 			Trace.write(`Failed to apply property [${d.property}] with value [${d.value}] to ${view}. ${e}`, Trace.categories.Error, Trace.messageType.error);
 		}
-	});
+	}
+	if (oldDeclarations) {
+		for (let index = oldDeclarations.length - 1; index >= 0; index--) {
+			const d = oldDeclarations[index];
+			// Use the actual property name so that a local value is set.
+			const property = d.property;
+			try {
+				if (property in view.style) {
+					view.style[property] = '';
+				} else {
+					view[property] = null;
+				}
+			} catch (e) {
+				Trace.write(`Failed to apply property [${d.property}] with value [${d.value}] to ${view}. ${e}`, Trace.categories.Error, Trace.messageType.error);
+			}
+		}
+	}
+	view['oldInlineStyle'] = styleStr;
 
 	// This is needed in case of changes to css-variable or css-calc expressions.
 	view._onCssStateChange();
diff --git a/packages/core/ui/styling/style/index.ts b/packages/core/ui/styling/style/index.ts
index 2b9ae8b3d0..dc5e67f950 100644
--- a/packages/core/ui/styling/style/index.ts
+++ b/packages/core/ui/styling/style/index.ts
@@ -8,7 +8,7 @@ import { Observable } from '../../../data/observable';
 import { FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent, Order, FlexGrow, FlexShrink, FlexWrapBefore, AlignSelf, FlexFlow, Flex } from '../../layouts/flexbox-layout';
 import { Trace } from '../../../trace';
 import { CoreTypes } from '../../../core-types';
-import { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState } from '../../../accessibility';
+import type { AccessibilityLiveRegion, AccessibilityRole, AccessibilityState } from '../../../accessibility/accessibility-types';
 import { ShadowCSSValues } from '../css-shadow';
 import { StrokeCSSValues } from '../css-stroke';
 import { ClipPathFunction } from '../clip-path-function';
diff --git a/packages/core/ui/switch/index.android.ts b/packages/core/ui/switch/index.android.ts
index 20017170d7..a9d91a21b2 100644
--- a/packages/core/ui/switch/index.android.ts
+++ b/packages/core/ui/switch/index.android.ts
@@ -35,8 +35,8 @@ function initializeCheckedChangeListener(): void {
 }
 
 export class Switch extends SwitchBase {
-	nativeViewProtected: android.widget.Switch;
-	public checked: boolean;
+	declare nativeViewProtected: android.widget.Switch;
+	declare checked: boolean;
 
 	public createNativeView() {
 		return new android.widget.Switch(this._context);
diff --git a/packages/core/ui/switch/index.ios.ts b/packages/core/ui/switch/index.ios.ts
index d9be33862e..91473173f0 100644
--- a/packages/core/ui/switch/index.ios.ts
+++ b/packages/core/ui/switch/index.ios.ts
@@ -29,7 +29,7 @@ class SwitchChangeHandlerImpl extends NSObject {
 }
 
 export class Switch extends SwitchBase {
-	nativeViewProtected: UISwitch;
+	declare nativeViewProtected: UISwitch;
 	private _handler: NSObject;
 	// Defer color updates while iOS 26+ "glass" toggle animation runs
 	private _toggleColorTimer: NodeJS.Timeout | null = null;
diff --git a/packages/core/ui/switch/switch-common.ts b/packages/core/ui/switch/switch-common.ts
index a64a1efa7c..82cbde5d29 100644
--- a/packages/core/ui/switch/switch-common.ts
+++ b/packages/core/ui/switch/switch-common.ts
@@ -3,6 +3,7 @@ import { View, CSSType } from '../core/view';
 import { booleanConverter } from '../core/view-base';
 import { Property } from '../core/properties';
 import { Switch as SwitchDefinition } from '.';
+import { colorConverter } from '../styling/style-properties';
 
 @CSSType('Switch')
 export class SwitchBase extends View implements SwitchDefinition {
@@ -37,6 +38,6 @@ checkedProperty.register(SwitchBase);
 export const offBackgroundColorProperty = new Property<SwitchBase, Color>({
 	name: 'offBackgroundColor',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 offBackgroundColorProperty.register(SwitchBase);
diff --git a/packages/core/ui/tab-view/index.android.ts b/packages/core/ui/tab-view/index.android.ts
index be11df1e58..6a608827b9 100644
--- a/packages/core/ui/tab-view/index.android.ts
+++ b/packages/core/ui/tab-view/index.android.ts
@@ -11,7 +11,7 @@ import { fontSizeProperty, fontInternalProperty } from '../styling/style-propert
 import { RESOURCE_PREFIX, android as androidUtils, layout } from '../../utils';
 import { FONT_PREFIX, isFontIconURI } from '../../utils/common';
 import { Frame } from '../frame';
-import { getNativeApp } from '../../application/helpers-common';
+import { getApplicationContext } from '../../application/helpers.android';
 import { AndroidHelper } from '../core/view';
 
 export * from './tab-view-common';
@@ -85,49 +85,6 @@ function initializeNativeClasses() {
 
 			return tabItem.view.nativeViewProtected;
 		}
-
-		public onDestroyView() {
-			const hasRemovingParent = this.getRemovingParentFragment();
-
-			// Get view as bitmap and set it as background. This is workaround for the disapearing nested fragments.
-			// TODO: Consider removing it when update to androidx.fragment:1.2.0
-			if (hasRemovingParent && this.owner.selectedIndex === this.index) {
-				const bitmapDrawable = new android.graphics.drawable.BitmapDrawable(appResources, this.backgroundBitmap);
-				this.owner._originalBackground = this.owner.backgroundColor || new Color('White');
-				this.owner.nativeViewProtected.setBackground(bitmapDrawable);
-				this.backgroundBitmap = null;
-			}
-
-			super.onDestroyView();
-		}
-
-		public onPause(): void {
-			const hasRemovingParent = this.getRemovingParentFragment();
-
-			// Get view as bitmap and set it as background. This is workaround for the disapearing nested fragments.
-			// TODO: Consider removing it when update to androidx.fragment:1.2.0
-			if (hasRemovingParent && this.owner.selectedIndex === this.index) {
-				this.backgroundBitmap = this.loadBitmapFromView(this.owner.nativeViewProtected);
-			}
-
-			super.onPause();
-		}
-
-		private loadBitmapFromView(view: android.view.View): android.graphics.Bitmap {
-			// Another way to get view bitmap. Test performance vs setDrawingCacheEnabled
-			// const width = view.getWidth();
-			// const height = view.getHeight();
-			// const bitmap = android.graphics.Bitmap.createBitmap(width, height, android.graphics.Bitmap.Config.ARGB_8888);
-			// const canvas = new android.graphics.Canvas(bitmap);
-			// view.layout(0, 0, width, height);
-			// view.draw(canvas);
-
-			view.setDrawingCacheEnabled(true);
-			const bitmap = android.graphics.Bitmap.createBitmap(view.getDrawingCache());
-			view.setDrawingCacheEnabled(false);
-
-			return bitmap;
-		}
 	}
 
 	const POSITION_UNCHANGED = -1;
@@ -285,7 +242,7 @@ function initializeNativeClasses() {
 	}
 
 	PagerAdapter = FragmentPagerAdapter;
-	appResources = getNativeApp<android.app.Application>().getApplicationContext().getResources();
+	appResources = getApplicationContext().getResources();
 }
 
 function createTabItemSpec(item: TabViewItem): org.nativescript.widgets.TabItemSpec {
@@ -335,7 +292,7 @@ function getDefaultAccentColor(context: android.content.Context): number {
 }
 
 export class TabViewItem extends TabViewItemBase {
-	nativeViewProtected: android.widget.TextView;
+	declare nativeViewProtected: android.widget.TextView;
 	public tabItemSpec: org.nativescript.widgets.TabItemSpec;
 	public index: number;
 	private _defaultTransformationMethod: android.text.method.TransformationMethod;
@@ -355,14 +312,6 @@ export class TabViewItem extends TabViewItemBase {
 		super.onLoaded();
 	}
 
-	public resetNativeView(): void {
-		super.resetNativeView();
-		if (this.nativeViewProtected) {
-			// We reset it here too because this could be changed by multiple properties - whiteSpace, secure, textTransform
-			this.nativeViewProtected.setTransformationMethod(this._defaultTransformationMethod);
-		}
-	}
-
 	public disposeNativeView(): void {
 		(<TabViewItemDefinition>this).canBeLoaded = false;
 		super.disposeNativeView();
@@ -463,7 +412,6 @@ export class TabView extends TabViewBase {
 	private _viewPager: androidx.viewpager.widget.ViewPager;
 	private _pagerAdapter: androidx.viewpager.widget.PagerAdapter;
 	private _androidViewId = -1;
-	public _originalBackground: any;
 
 	constructor() {
 		super();
@@ -610,20 +558,14 @@ export class TabView extends TabViewBase {
 
 	public onLoaded(): void {
 		super.onLoaded();
-
-		if (this._originalBackground) {
-			this.backgroundColor = null;
-			this.backgroundColor = this._originalBackground;
-			this._originalBackground = null;
-		}
-
 		this.setAdapterItems(this.items);
 	}
 
 	public onUnloaded(): void {
-		super.onUnloaded();
-
+		// clear fragments before calling super to ensure the fragmentManager is the
+		// same as the one used during item instantiation
 		this.setAdapterItems(null);
+		super.onUnloaded();
 	}
 
 	public disposeNativeView() {
diff --git a/packages/core/ui/tab-view/tab-view-common.ts b/packages/core/ui/tab-view/tab-view-common.ts
index 23f4014d20..8ea75c838e 100644
--- a/packages/core/ui/tab-view/tab-view-common.ts
+++ b/packages/core/ui/tab-view/tab-view-common.ts
@@ -2,6 +2,7 @@ import { TabView as TabViewDefinition, TabViewItem as TabViewItemDefinition, Sel
 import { View, AddArrayFromBuilder, AddChildFromBuilder, CSSType } from '../core/view';
 import { ViewBase, booleanConverter } from '../core/view-base';
 import { Style } from '../styling/style';
+import { colorConverter } from '../styling/style-properties';
 import { EventData } from '../../data/observable';
 import { Color } from '../../color';
 import { Property, CssProperty, CoercibleProperty } from '../core/properties';
@@ -308,7 +309,7 @@ export const tabTextColorProperty = new CssProperty<Style, Color>({
 	name: 'tabTextColor',
 	cssName: 'tab-text-color',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 tabTextColorProperty.register(Style);
 
@@ -322,7 +323,7 @@ export const tabBackgroundColorProperty = new CssProperty<Style, Color>({
 	name: 'tabBackgroundColor',
 	cssName: 'tab-background-color',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 tabBackgroundColorProperty.register(Style);
 
@@ -330,7 +331,7 @@ export const selectedTabTextColorProperty = new CssProperty<Style, Color>({
 	name: 'selectedTabTextColor',
 	cssName: 'selected-tab-text-color',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 selectedTabTextColorProperty.register(Style);
 
@@ -338,6 +339,6 @@ export const androidSelectedTabHighlightColorProperty = new CssProperty<Style, C
 	name: 'androidSelectedTabHighlightColor',
 	cssName: 'android-selected-tab-highlight-color',
 	equalityComparer: Color.equals,
-	valueConverter: (v) => new Color(v),
+	valueConverter: colorConverter,
 });
 androidSelectedTabHighlightColorProperty.register(Style);
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
index cb018133c3..453e08ad2c 100644
--- a/packages/core/ui/text-base/index.android.ts
+++ b/packages/core/ui/text-base/index.android.ts
@@ -11,6 +11,7 @@ import { Span } from './span';
 import { CoreTypes } from '../../core-types';
 import { layout } from '../../utils';
 import { SDK_VERSION } from '../../utils/constants';
+import { _getStoredClassDefaultPropertyValue } from '../core/properties';
 import { isString, isNullOrUndefined } from '../../utils/types';
 import { accessibilityIdentifierProperty } from '../../accessibility/accessibility-properties';
 import { testIDProperty } from '../core/view';
@@ -18,47 +19,6 @@ import { isCssWideKeyword } from '../core/properties/property-shared';
 
 export * from './text-base-common';
 
-let TextTransformation: TextTransformation;
-
-export interface TextTransformation {
-	new (owner: TextBase): android.text.method.TransformationMethod;
-}
-
-function initializeTextTransformation(): void {
-	if (TextTransformation) {
-		return;
-	}
-
-	@NativeClass
-	@Interfaces([android.text.method.TransformationMethod])
-	class TextTransformationImpl extends java.lang.Object implements android.text.method.TransformationMethod {
-		constructor(public textBase: TextBase) {
-			super();
-
-			return global.__native(this);
-		}
-
-		public getTransformation(charSeq: any, view: android.view.View): any {
-			// NOTE: Do we need to transform the new text here?
-			const formattedText = this.textBase.formattedText;
-			if (formattedText) {
-				return this.textBase.createFormattedTextNative(formattedText);
-			} else {
-				const text = this.textBase.text;
-				const stringValue = isNullOrUndefined(text) ? '' : text.toString();
-
-				return getTransformedText(stringValue, this.textBase.textTransform);
-			}
-		}
-
-		public onFocusChanged(view: android.view.View, sourceText: string, focused: boolean, direction: number, previouslyFocusedRect: android.graphics.Rect): void {
-			// Do nothing for now.
-		}
-	}
-
-	TextTransformation = TextTransformationImpl;
-}
-
 interface ClickableSpan {
 	new (owner: Span): android.text.style.ClickableSpan;
 }
@@ -169,14 +129,11 @@ function initializeBaselineAdjustedSpan(): void {
 export class TextBase extends TextBaseCommon {
 	public nativeViewProtected: org.nativescript.widgets.StyleableTextView;
 
-	private _defaultTransformationMethod: android.text.method.TransformationMethod;
 	private _paintFlags: number;
-	private _minHeight: number;
-	private _maxHeight: number;
-	private _minLines: number;
-	private _maxLines: number;
 	private _tappable = false;
 	private _defaultMovementMethod: android.text.method.MovementMethod;
+	// so that we dont set fontInternal when setting fontSize (useless)
+	protected handleFontSize = true;
 
 	get nativeTextViewProtected(): org.nativescript.widgets.StyleableTextView {
 		return super.nativeTextViewProtected;
@@ -184,7 +141,6 @@ export class TextBase extends TextBaseCommon {
 
 	public initNativeView(): void {
 		super.initNativeView();
-		initializeTextTransformation();
 
 		const nativeView = this.nativeTextViewProtected;
 
@@ -192,13 +148,6 @@ export class TextBase extends TextBaseCommon {
 		// Disable font padding to prevent extra spacing around text
 		nativeView.setIncludeFontPadding(false);
 
-		this._defaultTransformationMethod = nativeView.getTransformationMethod();
-		this._defaultMovementMethod = nativeView.getMovementMethod();
-		this._minHeight = nativeView.getMinHeight();
-		this._maxHeight = nativeView.getMaxHeight();
-		this._minLines = nativeView.getMinLines();
-		this._maxLines = nativeView.getMaxLines();
-
 		if (layout.hasRtlSupport() && this._isManualRtlTextStyleNeeded) {
 			// This is a default to match iOS layout direction behaviour
 			nativeView.setTextAlignment(android.view.View.TEXT_ALIGNMENT_VIEW_START);
@@ -209,43 +158,6 @@ export class TextBase extends TextBaseCommon {
 		super.disposeNativeView();
 
 		this._tappable = false;
-		this._defaultTransformationMethod = null;
-		this._defaultMovementMethod = null;
-		this._paintFlags = 0;
-		this._minHeight = 0;
-		this._maxHeight = 0;
-		this._minLines = 0;
-		this._maxLines = 0;
-	}
-
-	public resetNativeView(): void {
-		super.resetNativeView();
-		const nativeView = this.nativeTextViewProtected;
-		// We reset it here too because this could be changed by multiple properties - whiteSpace, secure, textTransform
-		nativeView.setSingleLine(this._isSingleLine);
-		nativeView.setTransformationMethod(this._defaultTransformationMethod);
-		this._defaultTransformationMethod = null;
-
-		if (this._paintFlags !== undefined) {
-			nativeView.setPaintFlags(this._paintFlags);
-			this._paintFlags = undefined;
-		}
-
-		if (this._minLines !== -1) {
-			nativeView.setMinLines(this._minLines);
-		} else {
-			nativeView.setMinHeight(this._minHeight);
-		}
-
-		this._minHeight = this._minLines = undefined;
-
-		if (this._maxLines !== -1) {
-			nativeView.setMaxLines(this._maxLines);
-		} else {
-			nativeView.setMaxHeight(this._maxHeight);
-		}
-
-		this._maxHeight = this._maxLines = undefined;
 	}
 
 	[textProperty.getDefault](): symbol | number {
@@ -270,11 +182,6 @@ export class TextBase extends TextBaseCommon {
 	}
 	[formattedTextProperty.setNative](value: FormattedString) {
 		const nativeView = this.nativeTextViewProtected;
-		if (!value) {
-			if (nativeView instanceof android.widget.Button && nativeView.getTransformationMethod() instanceof TextTransformation) {
-				nativeView.setTransformationMethod(this._defaultTransformationMethod);
-			}
-		}
 
 		// Don't change the transformation method if this is secure TextField or we'll lose the hiding characters.
 		if ((<any>this).secure) {
@@ -284,29 +191,12 @@ export class TextBase extends TextBaseCommon {
 		const spannableStringBuilder = this.createFormattedTextNative(value);
 		nativeView.setText(<any>spannableStringBuilder);
 		this._setTappableState(isStringTappable(value));
-
-		textProperty.nativeValueChange(this, value === null || value === undefined ? '' : value.toString());
-
-		if (spannableStringBuilder && nativeView instanceof android.widget.Button && !(nativeView.getTransformationMethod() instanceof TextTransformation)) {
-			// Replace Android Button's default transformation (in case the developer has not already specified a text-transform) method
-			// with our transformation method which can handle formatted text.
-			// Otherwise, the default tranformation method of the Android Button will overwrite and ignore our spannableStringBuilder.
-			nativeView.setTransformationMethod(new TextTransformation(this));
-		}
 	}
 
+	[textTransformProperty.getDefault](): CoreTypes.TextTransformType {
+		return 'initial';
+	}
 	[textTransformProperty.setNative](value: CoreTypes.TextTransformType) {
-		if (value === 'initial') {
-			this.nativeTextViewProtected.setTransformationMethod(this._defaultTransformationMethod);
-			return;
-		}
-
-		// Don't change the transformation method if this is secure TextField or we'll lose the hiding characters.
-		if ((<any>this).secure) {
-			return;
-		}
-
-		this.nativeTextViewProtected.setTransformationMethod(new TextTransformation(this));
 	}
 
 	[textAlignmentProperty.getDefault](): CoreTypes.TextAlignmentType {
@@ -406,7 +296,7 @@ export class TextBase extends TextBaseCommon {
 	}
 
 	[colorProperty.getDefault](): android.content.res.ColorStateList {
-		return this.nativeTextViewProtected.getTextColors();
+		return _getStoredClassDefaultPropertyValue(colorProperty, this, () => this.nativeTextViewProtected.getTextColors());
 	}
 	[colorProperty.setNative](value: Color | android.content.res.ColorStateList) {
 		if (!this.formattedText || !(value instanceof Color)) {
@@ -432,16 +322,19 @@ export class TextBase extends TextBaseCommon {
 	}
 
 	[fontInternalProperty.getDefault](): android.graphics.Typeface {
-		return this.nativeTextViewProtected.getTypeface();
+		return _getStoredClassDefaultPropertyValue(fontInternalProperty, this, () => this.nativeTextViewProtected.getTypeface());
 	}
 	[fontInternalProperty.setNative](value: Font | android.graphics.Typeface) {
 		if (!this.formattedText || !(value instanceof Font)) {
 			this.nativeTextViewProtected.setTypeface(value instanceof Font ? value.getAndroidTypeface() : value);
+			if (SDK_VERSION < 28 && this.lineHeight !== undefined) {
+				this[lineHeightProperty.setNative](this.lineHeight as any);
+			}
 		}
 	}
 
 	[textDecorationProperty.getDefault]() {
-		return (this._paintFlags = this.nativeTextViewProtected.getPaintFlags());
+		return _getStoredClassDefaultPropertyValue(textDecorationProperty, this, () => this.nativeTextViewProtected.getPaintFlags());
 	}
 
 	[textDecorationProperty.setNative](value: number | CoreTypes.TextDecorationType) {
@@ -466,12 +359,12 @@ export class TextBase extends TextBaseCommon {
 	}
 
 	[textShadowProperty.getDefault]() {
-		return {
+		return _getStoredClassDefaultPropertyValue(textShadowProperty, this, () => ({
 			radius: this.nativeTextViewProtected.getShadowRadius(),
 			offsetX: this.nativeTextViewProtected.getShadowDx(),
 			offsetY: this.nativeTextViewProtected.getShadowDy(),
 			color: this.nativeTextViewProtected.getShadowColor(),
-		};
+		}));
 	}
 
 	[textShadowProperty.setNative](value: ShadowCSSValues) {
@@ -513,14 +406,14 @@ export class TextBase extends TextBaseCommon {
 	}
 
 	[lineHeightProperty.getDefault](): number {
-		return this.nativeTextViewProtected.getLineSpacingExtra() / layout.getDisplayDensity();
+		return _getStoredClassDefaultPropertyValue(lineHeightProperty, this, () => this.nativeTextViewProtected.getLineSpacingExtra() / layout.getDisplayDensity());
 	}
 	[lineHeightProperty.setNative](value: number) {
 		this.nativeTextViewProtected.setLineSpacing(value * layout.getDisplayDensity(), 1);
 	}
 
 	[letterSpacingProperty.getDefault](): number {
-		return org.nativescript.widgets.ViewHelper.getLetterspacing(this.nativeTextViewProtected);
+		return _getStoredClassDefaultPropertyValue(letterSpacingProperty, this, () => org.nativescript.widgets.ViewHelper.getLetterspacing(this.nativeTextViewProtected));
 	}
 	[letterSpacingProperty.setNative](value: number) {
 		org.nativescript.widgets.ViewHelper.setLetterspacing(this.nativeTextViewProtected, value);
@@ -549,13 +442,14 @@ export class TextBase extends TextBaseCommon {
 	_setNativeText(reset = false): void {
 		if (reset) {
 			this.nativeTextViewProtected.setText(null);
-
 			return;
 		}
 
 		let transformedText: any;
 		if (this.formattedText) {
 			transformedText = this.createFormattedTextNative(this.formattedText);
+		} else if ((this.text as any) instanceof android.text.Spanned) {
+			transformedText = this.text;
 		} else {
 			const text = this.text;
 			const stringValue = text === null || text === undefined ? '' : text.toString();
@@ -575,14 +469,18 @@ export class TextBase extends TextBaseCommon {
 	_setTappableState(tappable: boolean) {
 		if (this._tappable !== tappable) {
 			this._tappable = tappable;
+			const nativeView = this.nativeViewProtected;
 			if (this._tappable) {
 				// Setting singleLine to true results in conflicts with LinkMovementMethod
 				// See https://stackoverflow.com/a/34407901
-				this.nativeTextViewProtected.setSingleLine(false);
-				this.nativeTextViewProtected.setMovementMethod(android.text.method.LinkMovementMethod.getInstance());
-				this.nativeTextViewProtected.setHighlightColor(null);
-			} else {
-				this.nativeTextViewProtected.setMovementMethod(this._defaultMovementMethod);
+				nativeView.setSingleLine(false);
+				if (!this._defaultMovementMethod) {
+					this._defaultMovementMethod = nativeView.getMovementMethod();
+				}
+				nativeView.setMovementMethod(android.text.method.LinkMovementMethod.getInstance());
+				nativeView.setHighlightColor(null);
+			} else if (this._defaultMovementMethod) {
+				nativeView.setMovementMethod(this._defaultMovementMethod);
 			}
 		}
 	}
@@ -706,3 +604,4 @@ function setSpanModifiers(ssb: android.text.SpannableStringBuilder, span: Span,
 	//     ssb.setSpan(new android.text.style.ScaleXSpan((letterSpacing + 1) / 10), start, end, android.text.Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 	// }
 }
+TextBase.prototype._hasDefaultAccessibilityContentDescription = true;
diff --git a/packages/core/ui/text-base/index.d.ts b/packages/core/ui/text-base/index.d.ts
index 0219da4a05..ce35cdff3f 100644
--- a/packages/core/ui/text-base/index.d.ts
+++ b/packages/core/ui/text-base/index.d.ts
@@ -199,11 +199,6 @@ export class TextBase extends View implements AddChildFromBuilder {
 	 */
 	_setNativeText(reset?: boolean): void;
 
-	/**
-	 * @private
-	 */
-	_isSingleLine: boolean;
-
 	/**
 	 * @private
 	 */
diff --git a/packages/core/ui/text-base/index.ios.ts b/packages/core/ui/text-base/index.ios.ts
index 310ac2342b..e675004a82 100644
--- a/packages/core/ui/text-base/index.ios.ts
+++ b/packages/core/ui/text-base/index.ios.ts
@@ -124,7 +124,10 @@ class UILabelClickHandlerImpl extends NSObject {
 }
 
 export class TextBase extends TextBaseCommon {
-	public nativeViewProtected: UITextField | UITextView | UILabel | UIButton;
+	//TODO: remove as it needs to be added after TS 5.7 change https://github.com/microsoft/TypeScript/pull/59860
+	[key: symbol]: (...args: any[]) => any | void;
+
+	declare nativeViewProtected: UITextField | UITextView | UILabel | UIButton;
 	public _spanRanges: NSRange[];
 
 	private _tappable = false;
@@ -185,7 +188,7 @@ export class TextBase extends TextBaseCommon {
 	[formattedTextProperty.setNative](value: FormattedString) {
 		this._setNativeText();
 		this._setTappableState(isStringTappable(value));
-		textProperty.nativeValueChange(this, !value ? '' : value.toString());
+		// textProperty.nativeValueChange(this, !value ? '' : value.toString());
 		this._requestLayoutOnTextChanged();
 	}
 
@@ -269,6 +272,9 @@ export class TextBase extends TextBaseCommon {
 		this._setNativeText();
 	}
 
+	[textTransformProperty.getDefault](): CoreTypes.TextTransformType {
+		return 'initial';
+	}
 	[textTransformProperty.setNative](value: CoreTypes.TextTransformType) {
 		this._setNativeText();
 	}
@@ -327,44 +333,174 @@ export class TextBase extends TextBaseCommon {
 		}
 	}
 
+	clearText() {
+		const nativeView = this.nativeTextViewProtected;
+		if (nativeView instanceof UIButton) {
+			// Clear attributedText or title won't be affected.
+			nativeView.setAttributedTitleForState(null, UIControlState.Normal);
+			nativeView.setTitleForState(null, UIControlState.Normal);
+		} else {
+			// Clear attributedText or text won't be affected.
+			nativeView.attributedText = null;
+			nativeView.text = null;
+		}
+	}
+
 	_setNativeText(reset = false): void {
 		this._animationWrap(() => {
+			const nativeView = this.nativeTextViewProtected;
 			if (reset) {
-				const nativeView = this.nativeTextViewProtected;
-				if (nativeView instanceof UIButton) {
-					// Clear attributedText or title won't be affected.
-					nativeView.setAttributedTitleForState(null, UIControlState.Normal);
-					nativeView.setTitleForState(null, UIControlState.Normal);
-				} else {
-					// Clear attributedText or text won't be affected.
-					nativeView.attributedText = null;
-					nativeView.text = null;
-				}
-
+				this.clearText();
 				return;
 			}
 
-			const letterSpacing = this.style.letterSpacing ? this.style.letterSpacing : 0;
-			const lineHeight = this.style.lineHeight ? this.style.lineHeight : 0;
+			// const letterSpacing = this.style.letterSpacing ? this.style.letterSpacing : 0;
+			// const lineHeight = this.style.lineHeight ? this.style.lineHeight : 0;
 			if (this.formattedText) {
-				this.nativeTextViewProtected.nativeScriptSetFormattedTextDecorationAndTransformLetterSpacingLineHeight(this.getFormattedStringDetails(this.formattedText) as any, letterSpacing, lineHeight);
-			} else {
+				this.setFormattedTextDecorationAndTransform();
+				// this.nativeTextViewProtected.nativeScriptSetFormattedTextDecorationAndTransformLetterSpacingLineHeight(this.getFormattedStringDetails(this.formattedText), letterSpacing, lineHeight);
+			} else if (this.text) {
+				this.setTextDecorationAndTransform();
 				// console.log('setTextDecorationAndTransform...')
-				const text = getTransformedText(isNullOrUndefined(this.text) ? '' : `${this.text}`, this.textTransform);
-				this.nativeTextViewProtected.nativeScriptSetTextDecorationAndTransformTextDecorationLetterSpacingLineHeight(text, this.style.textDecoration || '', letterSpacing, lineHeight);
+				// const text = getTransformedText(isNullOrUndefined(this.text) ? '' : `${this.text}`, this.textTransform);
+				// this.nativeTextViewProtected.nativeScriptSetTextDecorationAndTransformTextDecorationLetterSpacingLineHeight(text, this.style.textDecoration || '', letterSpacing, lineHeight);
 
-				if (!this.style?.color && SDK_VERSION >= 13 && UIColor.labelColor) {
-					this._setColor(UIColor.labelColor);
-				}
+				// if (!this.style?.color && SDK_VERSION >= 13 && UIColor.labelColor) {
+				// 	this._setColor(UIColor.labelColor);
+				// }
+			} else {
+				this.clearText();
+				return;
 			}
-			if (this.style?.textStroke) {
-				this.nativeTextViewProtected.nativeScriptSetFormattedTextStrokeColor(Length.toDevicePixels(this.style.textStroke.width, 0), this.style.textStroke.color.ios);
+
+			if (this.style?.textStroke && nativeView instanceof UILabel) {
+				nativeView.nativeScriptSetFormattedTextStrokeColor(Length.toDevicePixels(this.style.textStroke.width, 0), this.style.textStroke.color.ios);
 			}
 		});
 	}
+	setFormattedTextDecorationAndTransform() {
+		const attrText = this.createFormattedTextNative(this.formattedText);
+		if (this.letterSpacing !== 0) {
+			attrText.addAttributeValueRange(NSKernAttributeName, this.letterSpacing * this.nativeTextViewProtected.font.pointSize, { location: 0, length: attrText.length });
+		}
+
+		if (this.style.lineHeight) {
+			const paragraphStyle = NSMutableParagraphStyle.alloc().init();
+			paragraphStyle.minimumLineHeight = this.lineHeight;
+			// make sure a possible previously set text alignment setting is not lost when line height is specified
+			if (this.nativeTextViewProtected instanceof UIButton) {
+				paragraphStyle.alignment = (<UIButton>this.nativeTextViewProtected).titleLabel.textAlignment;
+			} else {
+				paragraphStyle.alignment = (<UITextField | UITextView | UILabel>this.nativeTextViewProtected).textAlignment;
+			}
+
+			if (this.nativeTextViewProtected instanceof UILabel) {
+				// make sure a possible previously set line break mode is not lost when line height is specified
+				paragraphStyle.lineBreakMode = this.nativeTextViewProtected.lineBreakMode;
+			}
+			attrText.addAttributeValueRange(NSParagraphStyleAttributeName, paragraphStyle, { location: 0, length: attrText.length });
+		} else if (this.nativeTextViewProtected instanceof UITextView) {
+			const paragraphStyle = NSMutableParagraphStyle.alloc().init();
+			paragraphStyle.alignment = (<UITextView>this.nativeTextViewProtected).textAlignment;
+			attrText.addAttributeValueRange(NSParagraphStyleAttributeName, paragraphStyle, { location: 0, length: attrText.length });
+		}
+
+		if (this.nativeTextViewProtected instanceof UIButton) {
+			this.nativeTextViewProtected.setAttributedTitleForState(attrText, UIControlState.Normal);
+		} else {
+			if (SDK_VERSION >= 13 && UIColor.labelColor) {
+				this.nativeTextViewProtected.textColor = UIColor.labelColor;
+			}
+
+			this.nativeTextViewProtected.attributedText = attrText;
+		}
+	}
+	setTextDecorationAndTransform() {
+		const style = this.style;
+		const dict = new Map<string, any>();
+		switch (style.textDecoration) {
+			case 'none':
+				break;
+			case 'underline':
+				dict.set(NSUnderlineStyleAttributeName, NSUnderlineStyle.Single);
+				break;
+			case 'line-through':
+				dict.set(NSStrikethroughStyleAttributeName, NSUnderlineStyle.Single);
+				break;
+			case 'underline line-through':
+				dict.set(NSUnderlineStyleAttributeName, NSUnderlineStyle.Single);
+				dict.set(NSStrikethroughStyleAttributeName, NSUnderlineStyle.Single);
+				break;
+			default:
+				throw new Error(`Invalid text decoration value: ${style.textDecoration}. Valid values are: 'none', 'underline', 'line-through', 'underline line-through'.`);
+		}
+
+		if (style.letterSpacing !== 0 && this.nativeTextViewProtected.font) {
+			const kern = style.letterSpacing * this.nativeTextViewProtected.font.pointSize;
+			dict.set(NSKernAttributeName, kern);
+			if (this.nativeTextViewProtected instanceof UITextField) {
+				this.nativeTextViewProtected.defaultTextAttributes.setValueForKey(kern, NSKernAttributeName);
+			}
+		}
+
+		const isTextView = this.nativeTextViewProtected instanceof UITextView;
+		if (style.lineHeight) {
+			const paragraphStyle = NSMutableParagraphStyle.alloc().init();
+			paragraphStyle.lineSpacing = style.lineHeight;
+			// make sure a possible previously set text alignment setting is not lost when line height is specified
+			if (this.nativeTextViewProtected instanceof UIButton) {
+				paragraphStyle.alignment = (<UIButton>this.nativeTextViewProtected).titleLabel.textAlignment;
+			} else {
+				paragraphStyle.alignment = (<UITextField | UITextView | UILabel>this.nativeTextViewProtected).textAlignment;
+			}
+
+			if (this.nativeTextViewProtected instanceof UILabel) {
+				// make sure a possible previously set line break mode is not lost when line height is specified
+				paragraphStyle.lineBreakMode = this.nativeTextViewProtected.lineBreakMode;
+			}
+			dict.set(NSParagraphStyleAttributeName, paragraphStyle);
+		} else if (isTextView) {
+			const paragraphStyle = NSMutableParagraphStyle.alloc().init();
+			paragraphStyle.alignment = (<UITextView>this.nativeTextViewProtected).textAlignment;
+			dict.set(NSParagraphStyleAttributeName, paragraphStyle);
+		}
+
+		const source = getTransformedText(isNullOrUndefined(this.text) ? '' : `${this.text}`, this.textTransform);
+		if (dict.size > 0 || isTextView) {
+			if (isTextView && this.nativeTextViewProtected.font) {
+				// UITextView's font seems to change inside.
+				dict.set(NSFontAttributeName, this.nativeTextViewProtected.font);
+			}
+
+			const result = <any>source instanceof NSAttributedString ? NSMutableAttributedString.alloc().initWithAttributedString(<any>source) : NSMutableAttributedString.alloc().initWithString(source);
+			result.setAttributesRange(<any>dict, {
+				location: 0,
+				length: source.length,
+			});
+			if (this.nativeTextViewProtected instanceof UIButton) {
+				this.nativeTextViewProtected.setAttributedTitleForState(result, UIControlState.Normal);
+			} else {
+				this.nativeTextViewProtected.attributedText = result;
+			}
+		} else {
+			if (this.nativeTextViewProtected instanceof UIButton) {
+				// Clear attributedText or title won't be affected.
+				this.nativeTextViewProtected.setAttributedTitleForState(null, UIControlState.Normal);
+				this.nativeTextViewProtected.setTitleForState(source, UIControlState.Normal);
+			} else {
+				// Clear attributedText or text won't be affected.
+				this.nativeTextViewProtected.attributedText = undefined;
+				this.nativeTextViewProtected.text = source;
+			}
+		}
+
+		if (!style.color && SDK_VERSION >= 13 && UIColor.labelColor) {
+			this._setColor(UIColor.labelColor);
+		}
+	}
 
 	createFormattedTextNative(value: FormattedString) {
-		return NativeScriptUtils.createMutableStringWithDetails(<any>this.getFormattedStringDetails(value));
+		return NativeScriptUtils.createMutableStringWithDetails(this.getFormattedStringDetails(value) as any);
 	}
 
 	getFormattedStringDetails(formattedString: FormattedString) {
@@ -508,8 +644,9 @@ function isStringTappable(formattedString: FormattedString) {
 	if (!formattedString) {
 		return false;
 	}
-	for (let i = 0, length = formattedString.spans.length; i < length; i++) {
-		const span = formattedString.spans.getItem(i);
+	const spans = formattedString.spans;
+	for (let i = 0, length = spans.length; i < length; i++) {
+		const span = spans.getItem(i);
 		if (span.tappable) {
 			return true;
 		}
diff --git a/packages/core/ui/text-base/span.ts b/packages/core/ui/text-base/span.ts
index 457bcde3b8..55fb52b8a4 100644
--- a/packages/core/ui/text-base/span.ts
+++ b/packages/core/ui/text-base/span.ts
@@ -103,7 +103,7 @@ export class Span extends ViewBase implements SpanDefinition {
 				this._text = '';
 			} else {
 				// value can be a number
-				this._text = isString(value) ? `${value}`.replace('\\n', '\n').replace('\\t', '\t') : `${value}`;
+				this._text = value + '';
 			}
 			this.notifyPropertyChange('text', this._text);
 		}
diff --git a/packages/core/ui/text-base/text-base-common.ts b/packages/core/ui/text-base/text-base-common.ts
index e26e947603..e477779a38 100644
--- a/packages/core/ui/text-base/text-base-common.ts
+++ b/packages/core/ui/text-base/text-base-common.ts
@@ -1,7 +1,7 @@
 // Types
 import { PropertyChangeData } from '../../data/observable';
 import { ViewBase, booleanConverter } from '../core/view-base';
-import { FontStyleType, FontWeightType } from '../styling/font-interfaces';
+import { FontStyleType, FontVariationSettingsType, FontWeightType } from '../styling/font-interfaces';
 
 // Requires.
 import { FormattedString } from './formatted-string';
@@ -15,14 +15,11 @@ import { TextBase as TextBaseDefinition } from '.';
 import { ShadowCSSValues, parseCSSShadow } from '../styling/css-shadow';
 import { StrokeCSSValues, parseCSSStroke } from '../styling/css-stroke';
 
-const CHILD_SPAN = 'Span';
 const CHILD_FORMATTED_TEXT = 'formattedText';
-const CHILD_FORMATTED_STRING = 'FormattedString';
 
 export abstract class TextBaseCommon extends View implements TextBaseDefinition {
 	public static iosTextAnimationFallback = true;
 
-	public _isSingleLine: boolean;
 	public _isManualRtlTextStyleNeeded: boolean;
 	public text: string;
 	public formattedText: FormattedString;
@@ -80,6 +77,13 @@ export abstract class TextBaseCommon extends View implements TextBaseDefinition
 		this.style.fontWeight = value;
 	}
 
+	get fontVariationSettings(): FontVariationSettingsType[] {
+		return this.style.fontVariationSettings;
+	}
+	set fontVariationSettings(value: FontVariationSettingsType[]) {
+		this.style.fontVariationSettings = value;
+	}
+
 	get letterSpacing(): number {
 		return this.style.letterSpacing;
 	}
@@ -194,7 +198,7 @@ export abstract class TextBaseCommon extends View implements TextBaseDefinition
 	}
 
 	public _addChildFromBuilder(name: string, value: any): void {
-		if (name === CHILD_SPAN) {
+		if (name === Span.name) {
 			if (!this.formattedText) {
 				const formattedText = new FormattedString();
 				formattedText.spans.push(value);
@@ -202,7 +206,7 @@ export abstract class TextBaseCommon extends View implements TextBaseDefinition
 			} else {
 				this.formattedText.spans.push(value);
 			}
-		} else if (name === CHILD_FORMATTED_TEXT || name === CHILD_FORMATTED_STRING) {
+		} else if (name === CHILD_FORMATTED_TEXT || name === FormattedString.name) {
 			this.formattedText = value;
 		}
 	}
@@ -223,7 +227,9 @@ export abstract class TextBaseCommon extends View implements TextBaseDefinition
 	}
 }
 
-TextBaseCommon.prototype._isSingleLine = false;
+export function isBold(fontWeight: FontWeightType): boolean {
+	return fontWeight === 'bold' || fontWeight === '700' || fontWeight === '800' || fontWeight === '900';
+}
 TextBaseCommon.prototype._isManualRtlTextStyleNeeded = false;
 
 export const textProperty = new Property<TextBaseCommon, string>({
@@ -296,7 +302,6 @@ const textTransformConverter = makeParser<CoreTypes.TextTransformType>(makeValid
 export const textTransformProperty = new InheritedCssProperty<Style, CoreTypes.TextTransformType>({
 	name: 'textTransform',
 	cssName: 'text-transform',
-	defaultValue: 'initial',
 	valueConverter: textTransformConverter,
 });
 textTransformProperty.register(Style);
diff --git a/packages/core/ui/text-field/index.android.ts b/packages/core/ui/text-field/index.android.ts
index f3ca90085e..3ba3ec01d8 100644
--- a/packages/core/ui/text-field/index.android.ts
+++ b/packages/core/ui/text-field/index.android.ts
@@ -98,5 +98,3 @@ export class TextField extends TextFieldBase {
 		this._setInputType(inputType);
 	}
 }
-
-TextField.prototype._isSingleLine = true;
diff --git a/packages/core/ui/text-view/index.android.ts b/packages/core/ui/text-view/index.android.ts
index cf305ad0c0..2bd29d4cb4 100644
--- a/packages/core/ui/text-view/index.android.ts
+++ b/packages/core/ui/text-view/index.android.ts
@@ -10,11 +10,6 @@ export class TextView extends TextViewBaseCommon {
 		editText.setGravity(android.view.Gravity.TOP | android.view.Gravity.START);
 	}
 
-	public resetNativeView(): void {
-		super.resetNativeView();
-		this.nativeTextViewProtected.setGravity(android.view.Gravity.TOP | android.view.Gravity.START);
-	}
-
 	public _onReturnPress() {
 		this.notify({ eventName: TextView.returnPressEvent, object: this });
 	}
diff --git a/packages/core/ui/text-view/index.ios.ts b/packages/core/ui/text-view/index.ios.ts
index e9f3275944..a5afa2944b 100644
--- a/packages/core/ui/text-view/index.ios.ts
+++ b/packages/core/ui/text-view/index.ios.ts
@@ -99,8 +99,8 @@ class NoScrollAnimationUITextView extends UITextView {
 
 @CSSType('TextView')
 export class TextView extends TextViewBaseCommon {
-	nativeViewProtected: UITextView;
-	nativeTextViewProtected: UITextView;
+	declare nativeViewProtected: UITextView;
+	declare nativeTextViewProtected: UITextView;
 	private _delegate: UITextViewDelegateImpl;
 	private _isShowingHint: boolean;
 
diff --git a/packages/core/ui/text-view/text-view-common.ts b/packages/core/ui/text-view/text-view-common.ts
index 0bb9b076ac..e8c2406957 100644
--- a/packages/core/ui/text-view/text-view-common.ts
+++ b/packages/core/ui/text-view/text-view-common.ts
@@ -6,7 +6,6 @@ import { EditableTextBase } from '../editable-text-base';
 export class TextViewBase extends EditableTextBase implements TextViewDefinition {
 	public static returnPressEvent = 'returnPress';
 
-	public maxLines: number;
 	public isWritingToolsActive: boolean;
 	public enableWritingToolsEvents: boolean;
 }
diff --git a/packages/core/ui/time-picker/index.android.ts b/packages/core/ui/time-picker/index.android.ts
index b64140f883..4b4c96a152 100644
--- a/packages/core/ui/time-picker/index.android.ts
+++ b/packages/core/ui/time-picker/index.android.ts
@@ -38,7 +38,7 @@ function initializeTimeChangedListener(): void {
 }
 
 export class TimePicker extends TimePickerBase {
-	nativeViewProtected: android.widget.TimePicker;
+	declare nativeViewProtected: android.widget.TimePicker;
 	updatingNativeValue: boolean;
 
 	public createNativeView() {
diff --git a/packages/core/ui/time-picker/index.ios.ts b/packages/core/ui/time-picker/index.ios.ts
index 8bd113eec6..8f3ce6479f 100644
--- a/packages/core/ui/time-picker/index.ios.ts
+++ b/packages/core/ui/time-picker/index.ios.ts
@@ -1,12 +1,12 @@
 import { TimePickerBase, timeProperty, minuteIntervalProperty, minuteProperty, minMinuteProperty, maxMinuteProperty, hourProperty, minHourProperty, maxHourProperty } from './time-picker-common';
 import { Color } from '../../color';
 import { colorProperty } from '../styling/style-properties';
-import { Device } from '../../platform';
+import { SDK_VERSION } from '../../utils';
 
 export * from './time-picker-common';
 
-const SUPPORT_DATE_PICKER_STYLE = __VISIONOS__ || parseFloat(Device.osVersion) >= 13.4;
-const SUPPORT_TEXT_COLOR = !__VISIONOS__ && parseFloat(Device.osVersion) < 14.0;
+const SUPPORT_DATE_PICKER_STYLE = __VISIONOS__ || SDK_VERSION >= 13.4;
+const SUPPORT_TEXT_COLOR = !__VISIONOS__ && SDK_VERSION < 14.0;
 
 function getDate(hour: number, minute: number): Date {
 	const components = NSDateComponents.alloc().init();
@@ -21,7 +21,7 @@ function getComponents(date: Date | NSDate): NSDateComponents {
 }
 
 export class TimePicker extends TimePickerBase {
-	nativeViewProtected: UIDatePicker;
+	declare nativeViewProtected: UIDatePicker;
 	private _changeHandler: NSObject;
 
 	constructor() {
diff --git a/packages/core/ui/transition/fade-transition.ios.ts b/packages/core/ui/transition/fade-transition.ios.ts
index 565b8e8b1e..86ff49bde9 100644
--- a/packages/core/ui/transition/fade-transition.ios.ts
+++ b/packages/core/ui/transition/fade-transition.ios.ts
@@ -2,9 +2,9 @@
 import { Transition } from '.';
 
 export class FadeTransition extends Transition {
-	transitionController: FadeTransitionController;
-	presented: UIViewController;
-	presenting: UIViewController;
+	declare transitionController: FadeTransitionController;
+	declare presented: UIViewController;
+	declare presenting: UIViewController;
 	operation: number;
 
 	iosNavigatedController(navigationController: UINavigationController, operation: number, fromVC: UIViewController, toVC: UIViewController): UIViewControllerAnimatedTransitioning {
diff --git a/packages/core/ui/transition/index.d.ts b/packages/core/ui/transition/index.d.ts
index cb5196366d..acad2f8500 100644
--- a/packages/core/ui/transition/index.d.ts
+++ b/packages/core/ui/transition/index.d.ts
@@ -56,4 +56,5 @@ export declare class Transition {
 	iosNavigatedController?(navigationController: any /* UINavigationController */, operation: number, fromVC: any /* UIViewController */, toVC: any /* UIViewController */): any /* UIViewControllerAnimatedTransitioning */;
 
 	androidFragmentTransactionCallback?(fragmentTransaction: any /* androidx.fragment.app.FragmentTransaction */, currentEntry: BackstackEntry, newEntry: BackstackEntry): void;
+	onTransitionEnd?(entry: BackstackEntry);
 }
diff --git a/packages/core/ui/transition/modal-transition.ios.ts b/packages/core/ui/transition/modal-transition.ios.ts
index f7c70bf13f..b1daf6a1bb 100644
--- a/packages/core/ui/transition/modal-transition.ios.ts
+++ b/packages/core/ui/transition/modal-transition.ios.ts
@@ -7,12 +7,12 @@ import { SharedTransitionHelper } from './shared-transition-helper';
 import { PanGestureEventData, GestureStateTypes } from '../gestures';
 
 export class ModalTransition extends Transition {
-	transitionController: ModalTransitionController;
-	interactiveController: UIPercentDrivenInteractiveTransition;
+	declare transitionController: ModalTransitionController;
+	declare interactiveController: UIPercentDrivenInteractiveTransition;
 	interactiveGestureRecognizer: UIScreenEdgePanGestureRecognizer;
-	presented: UIViewController;
-	presenting: UIViewController;
-	sharedElements: {
+	declare presented: UIViewController;
+	declare presenting: UIViewController;
+	declare sharedElements: {
 		presented?: Array<SharedElementSettings>;
 		presenting?: Array<SharedElementSettings>;
 		// independent sharedTransitionTags which are part of the shared transition but only on one page
diff --git a/packages/core/ui/transition/page-transition.android.ts b/packages/core/ui/transition/page-transition.android.ts
index 2950290a1b..1f26bde57c 100644
--- a/packages/core/ui/transition/page-transition.android.ts
+++ b/packages/core/ui/transition/page-transition.android.ts
@@ -65,12 +65,12 @@ class CustomLinearInterpolator extends android.view.animation.LinearInterpolator
 	}
 }
 
-function setTransitionName(view: ViewBase) {
+function setTransitionName(view: ViewBase, value?) {
 	if (!view?.sharedTransitionTag) {
 		return;
 	}
 	try {
-		androidx.core.view.ViewCompat.setTransitionName(view.nativeView, view.sharedTransitionTag);
+		androidx.core.view.ViewCompat.setTransitionName(view.nativeView, value !== undefined ? value : view.sharedTransitionTag);
 	} catch (err) {
 		// ignore
 	}
@@ -188,13 +188,18 @@ export class PageTransition extends Transition {
 			return;
 		}
 
+		const pageStart = state.pageStart;
 		const pageEnd = state.pageEnd;
 
 		//we can't look for presented right now as the toPage might not be loaded
 		// and thus some views like ListView/Pager... might not have loaded their "children"
 		// presented will be handled in loaded event of toPage
-		const { presenting } = SharedTransition.getSharedElements(fromPage, toPage);
+		let { presenting } = SharedTransition.getSharedElements(fromPage, null);
 
+		if (pageStart?.sharedTransitionTags) {
+			const keys = Object.keys(pageStart?.sharedTransitionTags);
+			presenting = presenting.filter((v) => keys.indexOf(v.sharedTransitionTag) !== -1);
+		}
 		// Note: we can enhance android more over time with element targeting across different screens
 		// const pageStart = state.pageStart;
 		// const pageEndIndependentTags = Object.keys(pageEnd?.sharedTransitionTags || {});
@@ -228,9 +233,13 @@ export class PageTransition extends Transition {
 		const onPageLoaded = () => {
 			// add a timeout so that Views like ListView / CollectionView can have their children instantiated
 			setTimeout(() => {
-				const { presented } = SharedTransition.getSharedElements(fromPage, toPage);
+				let { presented } = SharedTransition.getSharedElements(fromPage, toPage);
+				if (pageEnd?.sharedTransitionTags) {
+					const keys = Object.keys(pageEnd?.sharedTransitionTags);
+					presented = presented.filter((v) => keys.indexOf(v.sharedTransitionTag) !== -1);
+				}
 				// const sharedElementTags = sharedElements.map((v) => v.sharedTransitionTag);
-				presented.forEach(setTransitionName);
+				presented.forEach((v) => setTransitionName(v));
 				newFragment.startPostponedEnterTransition();
 			}, this.pageLoadedTimeout);
 		};
@@ -247,7 +256,9 @@ export class PageTransition extends Transition {
 		const transitionSet = new androidx.transition.TransitionSet();
 		transitionSet.setDuration(customDuration > -1 ? customDuration : this.getDuration());
 		transitionSet.addTransition(new androidx.transition.ChangeBounds());
+		transitionSet.addTransition(new androidx.transition.ChangeClipBounds());
 		transitionSet.addTransition(new androidx.transition.ChangeTransform());
+		transitionSet.addTransition(new androidx.transition.ChangeImageTransform());
 		transitionSet.setOrdering(androidx.transition.TransitionSet.ORDERING_TOGETHER);
 
 		if (customDuration) {
@@ -285,6 +296,21 @@ export class PageTransition extends Transition {
 			toPage.once('loaded', onPageLoaded);
 		}
 	}
+	onTransitionEnd(entry) {
+		// as we use hide on fragments instead of remove
+		// we need to reset setTransitionName after transition end
+		// otherwise it will break next transitions using the same transitionName
+		const fromPage = entry?.resolvedPage;
+		const { presenting } = SharedTransition.getSharedElements(fromPage, null);
+		presenting.forEach((v) => {
+			setTransitionName(v, null);
+			// androidx.transition.ChangeTransform does not restore setTransitionAlpha
+			// which makes the view invisible.
+			// can be a problem when the transition view on the return animation is not the same as enter
+			// one example is RecyclerView to ViewPager transition
+			(v.nativeViewProtected as android.view.View).setTransitionAlpha(1);
+		});
+	}
 }
 
 function renderToImageSource(hostView: View): ImageSource {
diff --git a/packages/core/ui/transition/page-transition.ios.ts b/packages/core/ui/transition/page-transition.ios.ts
index 6dcfa596cd..97b6d6249e 100644
--- a/packages/core/ui/transition/page-transition.ios.ts
+++ b/packages/core/ui/transition/page-transition.ios.ts
@@ -7,13 +7,13 @@ import { SharedTransition, SharedTransitionAnimationType } from './shared-transi
 import { SharedTransitionHelper } from './shared-transition-helper';
 
 export class PageTransition extends Transition {
-	transitionController: PageTransitionController;
-	interactiveController: UIPercentDrivenInteractiveTransition;
-	presented: UIViewController;
-	presenting: UIViewController;
+	declare transitionController: PageTransitionController;
+	declare interactiveController: UIPercentDrivenInteractiveTransition;
+	declare presented: UIViewController;
+	declare presenting: UIViewController;
 	navigationController: UINavigationController;
 	operation: number;
-	sharedElements: {
+	declare sharedElements: {
 		presented?: Array<SharedElementSettings>;
 		presenting?: Array<SharedElementSettings>;
 		// independent sharedTransitionTags which are part of the shared transition but only on one page
diff --git a/packages/core/ui/transition/shared-transition.ts b/packages/core/ui/transition/shared-transition.ts
index 0090462d45..5a3f56c406 100644
--- a/packages/core/ui/transition/shared-transition.ts
+++ b/packages/core/ui/transition/shared-transition.ts
@@ -293,12 +293,30 @@ export class SharedTransition {
 		presented: Array<View>;
 		presenting: Array<View>;
 	} {
+		let presentedSharedElements: Array<View> = [];
+		let presentingSharedElements: Array<View> = [];
 		// 1. Presented view: gather all sharedTransitionTag views
-		const presentedSharedElements = <Array<View>>querySelectorAll(toPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore && typeof v.sharedTransitionTag === 'string');
-		// console.log('presented sharedTransitionTag total:', presentedSharedElements.length);
+		if (toPage) {
+			if (toPage.hasListeners('sharedElementTo')) {
+				toPage.notify({ eventName: 'sharedElementTo', views: presentedSharedElements });
+			} else {
+				presentedSharedElements = <Array<View>>querySelectorAll(toPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore && typeof v.sharedTransitionTag === 'string');
+			}
+		}
+
+		// console.log(
+		// 	'presented sharedTransitionTags:',
+		// 	presentedSharedElements.map((v) => v.sharedTransitionTag)
+		// );
 
 		// 2. Presenting view: gather all sharedTransitionTag views
-		const presentingSharedElements = <Array<View>>querySelectorAll(fromPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore && typeof v.sharedTransitionTag === 'string');
+		if (fromPage) {
+			if (fromPage.hasListeners('sharedElementFrom')) {
+				fromPage.notify({ eventName: 'sharedElementFrom', views: presentingSharedElements });
+			} else {
+				presentingSharedElements = <Array<View>>querySelectorAll(fromPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore && typeof v.sharedTransitionTag === 'string');
+			}
+		}
 		// console.log(
 		// 	'presenting sharedTransitionTags:',
 		// 	presentingSharedElements.map((v) => v.sharedTransitionTag)
diff --git a/packages/core/ui/transition/slide-transition.android.ts b/packages/core/ui/transition/slide-transition.android.ts
index 675fbaf9a4..5aa02712fc 100644
--- a/packages/core/ui/transition/slide-transition.android.ts
+++ b/packages/core/ui/transition/slide-transition.android.ts
@@ -112,7 +112,6 @@ export class SlideTransition extends Transition {
 			animator.setDuration(duration);
 		}
 		animator.setInterpolator(this.getCurve());
-
 		const animatorSet = new android.animation.AnimatorSet();
 		animatorSet.play(animator);
 		return animatorSet;
diff --git a/packages/core/ui/transition/slide-transition.ios.ts b/packages/core/ui/transition/slide-transition.ios.ts
index 54555d7bb8..42bace8845 100644
--- a/packages/core/ui/transition/slide-transition.ios.ts
+++ b/packages/core/ui/transition/slide-transition.ios.ts
@@ -3,9 +3,9 @@ import { Screen } from '../../platform/screen';
 import { CORE_ANIMATION_DEFAULTS } from '../../utils/animation-helpers';
 
 export class SlideTransition extends Transition {
-	transitionController: SlideTransitionController;
-	presented: UIViewController;
-	presenting: UIViewController;
+	declare transitionController: SlideTransitionController;
+	declare presented: UIViewController;
+	declare presenting: UIViewController;
 	operation: number;
 	direction: string;
 
diff --git a/packages/core/ui/web-view/index.android.ts b/packages/core/ui/web-view/index.android.ts
index ea1617fe4b..c9141fe744 100644
--- a/packages/core/ui/web-view/index.android.ts
+++ b/packages/core/ui/web-view/index.android.ts
@@ -2,6 +2,7 @@ import { disableZoomProperty, WebViewBase, WebViewClient } from './web-view-comm
 import { Trace } from '../../trace';
 import { knownFolders } from '../../file-system';
 import { openUrl } from '../../utils';
+import { FILE_PREFIX } from '../../utils/common';
 
 export * from './web-view-common';
 
@@ -98,7 +99,7 @@ function initializeWebViewClient(): void {
 }
 
 export class WebView extends WebViewBase {
-	nativeViewProtected: android.webkit.WebView;
+	declare nativeViewProtected: android.webkit.WebView;
 
 	public createNativeView() {
 		const nativeView = new android.webkit.WebView(this._context);
@@ -127,8 +128,9 @@ export class WebView extends WebViewBase {
 				(<any>nativeView).client.owner = null;
 			}
 			nativeView.destroy();
+			nativeView.setWebViewClient(null);
+			(<any>nativeView).client.owner = null;
 		}
-
 		super.disposeNativeView();
 	}
 
@@ -160,7 +162,7 @@ export class WebView extends WebViewBase {
 			return;
 		}
 
-		const baseUrl = `file:///${knownFolders.currentApp().path}/`;
+		const baseUrl = `${FILE_PREFIX}${knownFolders.currentApp().path}/`;
 		nativeView.loadDataWithBaseURL(baseUrl, src, 'text/html', 'utf-8', null);
 	}
 
diff --git a/packages/core/ui/web-view/index.ios.ts b/packages/core/ui/web-view/index.ios.ts
index 9e8f4acc24..2d847b538e 100644
--- a/packages/core/ui/web-view/index.ios.ts
+++ b/packages/core/ui/web-view/index.ios.ts
@@ -5,6 +5,7 @@ import { Trace } from '../../trace';
 export * from './web-view-common';
 import { knownFolders } from '../../file-system';
 import { booleanConverter } from '../core/view-base';
+import { FILE_PREFIX } from '../../utils';
 
 @NativeClass
 class WKNavigationDelegateImpl extends NSObject implements WKNavigationDelegate {
@@ -156,7 +157,7 @@ class UIScrollViewDelegateImpl extends NSObject implements UIScrollViewDelegate
 }
 
 export class WebView extends WebViewBase {
-	nativeViewProtected: WKWebView;
+	declare nativeViewProtected: WKWebView;
 	private _delegate: WKNavigationDelegateImpl;
 	private _scrollDelegate: UIScrollViewDelegateImpl;
 	private _uiDelegate: WKUIDelegateImpl;
@@ -224,7 +225,7 @@ export class WebView extends WebViewBase {
 	}
 
 	public _loadUrl(src: string) {
-		if (src.startsWith('file:///')) {
+		if (src.startsWith(FILE_PREFIX)) {
 			const cachePath = src.substring(0, src.lastIndexOf('/'));
 			this.nativeViewProtected.loadFileURLAllowingReadAccessToURL(NSURL.URLWithString(src), NSURL.URLWithString(cachePath));
 		} else {
@@ -233,7 +234,7 @@ export class WebView extends WebViewBase {
 	}
 
 	public _loadData(content: string) {
-		this.nativeViewProtected.loadHTMLStringBaseURL(content, NSURL.alloc().initWithString(`file:///${knownFolders.currentApp().path}/`));
+		this.nativeViewProtected.loadHTMLStringBaseURL(content, NSURL.alloc().initWithString(`${FILE_PREFIX}${knownFolders.currentApp().path}/`));
 	}
 
 	get canGoBack(): boolean {
diff --git a/packages/core/ui/web-view/web-view-common.ts b/packages/core/ui/web-view/web-view-common.ts
index 9c95a6045b..7c7c177e83 100644
--- a/packages/core/ui/web-view/web-view-common.ts
+++ b/packages/core/ui/web-view/web-view-common.ts
@@ -1,9 +1,11 @@
+/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { LoadEventData, WebViewNavigationType } from './web-view-interfaces';
 import { ContainerView, CSSType } from '../core/view';
 import { Property } from '../core/properties';
 import { EventData } from '../../data/observable';
 import { knownFolders } from '../../file-system';
 import { booleanConverter } from '../core/view-base';
+import { FILE_PREFIX } from '../../utils/common';
 
 export * from './web-view-interfaces';
 
@@ -84,11 +86,11 @@ export abstract class WebViewBase extends ContainerView {
 		}
 
 		// loading local files from paths with spaces may fail
-		if (src.toLowerCase().indexOf('file:///') === 0) {
+		if (src.toLowerCase().indexOf(FILE_PREFIX) === 0) {
 			src = encodeURI(src);
 		}
 
-		if (src.toLowerCase().indexOf('http://') === 0 || src.toLowerCase().indexOf('https://') === 0 || src.toLowerCase().indexOf('file:///') === 0) {
+		if (src.toLowerCase().indexOf('http://') === 0 || src.toLowerCase().indexOf('https://') === 0 || src.toLowerCase().indexOf(FILE_PREFIX) === 0) {
 			this._loadUrl(src);
 		} else {
 			this._loadData(src);
diff --git a/packages/core/ui/web-view/web-view-interfaces.ts b/packages/core/ui/web-view/web-view-interfaces.ts
index 44e4262fe7..fef7b32ee0 100644
--- a/packages/core/ui/web-view/web-view-interfaces.ts
+++ b/packages/core/ui/web-view/web-view-interfaces.ts
@@ -1,9 +1,10 @@
 import { WebView } from '.';
-import { EventData } from '../../data/observable';
+import { EventData, Observable } from '../../data/observable';
+import type { WebViewBase } from './web-view-common';
 
 export type WebViewNavigationType = 'linkClicked' | 'formSubmitted' | 'backForward' | 'reload' | 'formResubmitted' | 'other' | undefined;
 
-export interface LoadEventData extends EventData {
+export interface LoadEventData<T = WebViewBase> extends EventData<T> {
 	url: string;
 	navigationType: WebViewNavigationType;
 	error: string;
diff --git a/packages/core/utils/debug-source.ts b/packages/core/utils/debug-source.ts
index 6ae704ee7f..83c1dcfc43 100644
--- a/packages/core/utils/debug-source.ts
+++ b/packages/core/utils/debug-source.ts
@@ -1,4 +1,4 @@
-import { getNativeApp } from '../application/helpers-common';
+import { getApplicationContext } from '../application/helpers.android';
 
 // console.log('__dirname:', global.__dirname);
 
@@ -16,7 +16,7 @@ function getCurrentAppPath(): string {
 
 		return appPath;
 	} else {
-		const dir = getNativeApp<android.app.Application>().getApplicationContext().getFilesDir();
+		const dir = getApplicationContext().getFilesDir();
 
 		return `${dir.getCanonicalPath()}/app`;
 	}
diff --git a/packages/core/utils/index.android.ts b/packages/core/utils/index.android.ts
index bd799a0519..88304db167 100644
--- a/packages/core/utils/index.android.ts
+++ b/packages/core/utils/index.android.ts
@@ -60,6 +60,23 @@ export function releaseNativeObject(object: java.lang.Object) {
 	__releaseNativeCounterpart(object);
 }
 
+export function wrapNativeException<T = any>(ex: NSError, wrapError: (...args) => T = (msg) => new Error(msg) as any) {
+	if (!ex) {
+		return;
+	}
+	if (typeof ex === 'string') {
+		return wrapError(ex);
+	}
+	if (!(ex instanceof Error)) {
+		const err = wrapError(ex.toString());
+		err['nativeException'] = ex;
+		//@ts-ignore
+		err['stackTrace'] = com.tns.NativeScriptException.getStackTraceAsString(ex);
+		return err;
+	}
+	return ex;
+}
+
 export function openUrl(location: string): boolean {
 	const context = androidUtils.getApplicationContext();
 	try {
@@ -67,10 +84,7 @@ export function openUrl(location: string): boolean {
 		intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
 		context.startActivity(intent);
 	} catch (e) {
-		// We don't do anything with an error. We just output it
-		Trace.write(`Failed to start activity for handling URL: ${location}`, Trace.categories.Error, Trace.messageType.error);
-
-		return false;
+		throw wrapNativeException(e);
 	}
 
 	return true;
@@ -190,7 +204,7 @@ Applications cannot access internal storage of other application on Android (see
 		const providerName = `${context.getPackageName()}.provider`;
 		Trace.write(`fully-qualified provider name [${providerName}]`, Trace.categories.Debug);
 
-		const apkURI = androidx.core.content.FileProvider.getUriForFile(context, providerName, new java.io.File(filePath));
+		const apkURI = filePath.startsWith('content://') ? android.net.Uri.parse(filePath) : androidx.core.content.FileProvider.getUriForFile(context, providerName, new java.io.File(filePath));
 
 		// Set flags & URI as data type on the view action
 		intent.addFlags(android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION);
diff --git a/packages/core/utils/index.d.ts b/packages/core/utils/index.d.ts
index 24d5379466..510a35b63a 100644
--- a/packages/core/utils/index.d.ts
+++ b/packages/core/utils/index.d.ts
@@ -41,6 +41,11 @@ export function queueGC(delay?: number, useThrottle?: boolean);
  */
 export function releaseNativeObject(object: any /*java.lang.Object | NSObject*/);
 
+/**
+ * Wrap native exception in a JS Error
+ */
+export function wrapNativeException<T = any>(exception: any, wrapError?: (...args) => T): T;
+
 /**
  * Queues the passed function to be ran in a macroTask
  * @param task the function to execute as a macroTask
diff --git a/packages/core/utils/index.ios.ts b/packages/core/utils/index.ios.ts
index aafcc85b04..37be01fd49 100644
--- a/packages/core/utils/index.ios.ts
+++ b/packages/core/utils/index.ios.ts
@@ -31,6 +31,24 @@ export function openFile(filePath: string): boolean {
 	return false;
 }
 
+export function wrapNativeException<T = any>(ex: NSError, wrapError: (...args) => T = (msg) => new Error(msg) as any) {
+	if (!ex) {
+		return;
+	}
+	if (typeof ex === 'string') {
+		return wrapError(ex);
+	}
+	if (!(ex instanceof Error)) {
+		const err = wrapError(ex.localizedDescription);
+		err['nativeException'] = ex;
+		err['code'] = ex.code;
+		err['domain'] = ex.domain;
+		// TODO: we loose native stack. see how to get it
+		return err;
+	}
+	return ex;
+}
+
 export function GC() {
 	__collect();
 }
@@ -83,8 +101,6 @@ export function openUrl(location: string): boolean {
 		// We Don't do anything with an error.  We just output it
 		Trace.write('Error in OpenURL', Trace.categories.Error, Trace.messageType.error);
 	}
-
-	return false;
 }
 
 export function openUrlAsync(location: string): Promise<boolean> {
diff --git a/packages/core/utils/native-helper-for-android.ts b/packages/core/utils/native-helper-for-android.ts
index beac14f549..c7a200b2e5 100644
--- a/packages/core/utils/native-helper-for-android.ts
+++ b/packages/core/utils/native-helper-for-android.ts
@@ -1,10 +1,13 @@
 import { Color } from '../color';
 import { numberHasDecimals, numberIs64Bit } from './types';
 import { getNativeApp } from '../application/helpers-common';
+import { getApplicationContext } from '../application/helpers.android';
 import { androidGetCurrentActivity } from '../application/helpers';
 import { Trace } from '../trace';
 import { topmost } from '../ui/frame/frame-stack';
 
+export { getApplicationContext } from '../application/helpers.android';
+
 export function dataDeserialize(nativeData?: any) {
 	if (nativeData === null || typeof nativeData !== 'object') {
 		return nativeData;
@@ -143,9 +146,6 @@ export function dataSerialize(data?: any, wrapPrimitives?: boolean) {
 	}
 }
 
-export function getApplicationContext() {
-	return getApplication().getApplicationContext();
-}
 export function getCurrentActivity() {
 	return androidGetCurrentActivity();
 }
@@ -187,12 +187,21 @@ export function showSoftInput(nativeView: android.view.View): void {
 export function dismissSoftInput(nativeView?: android.view.View): void {
 	const inputManager = getInputMethodManager();
 	let windowToken: android.os.IBinder;
-
 	if (nativeView instanceof android.view.View) {
+		windowToken = nativeView.getWindowToken();
+
+		if (windowToken == null) {
+			// in this case the view might already have been removed from view tree
+			// but the user might still be wanting to hide the keyboard
+			// let s use a deprecated method to ensure we hide it
+			if (inputManager?.isAcceptingText()) {
+				inputManager.toggleSoftInput(0, 0);
+			}
+			return;
+		}
 		if (!nativeView.hasFocus()) {
 			return;
 		}
-		windowToken = nativeView.getWindowToken();
 	} else if (getCurrentActivity() instanceof androidx.appcompat.app.AppCompatActivity) {
 		const modalDialog = (topmost()?._modalParent ?? (topmost()?.modal as any))?._dialogFragment?.getDialog();
 		const window = (modalDialog ?? getCurrentActivity()).getWindow();
diff --git a/packages/core/utils/shared.ts b/packages/core/utils/shared.ts
index 70baf70fdf..0d1fe89ee8 100644
--- a/packages/core/utils/shared.ts
+++ b/packages/core/utils/shared.ts
@@ -6,15 +6,19 @@
  * @param param2 Options for the debounce behavior
  * @returns A new debounced function
  */
-export function debounce(fn: any, delay = 300, { leading }: { leading?: boolean } = {}) {
+export function debounce(fn: any, delay = 300, { leading, trailing, ignoreFirstTrail }: { leading?: boolean; trailing?: boolean; ignoreFirstTrail?: boolean } = {}) {
 	let timer: NodeJS.Timeout;
 	return (...args: Array<any>) => {
+		let noTrail = false;
 		if (timer === undefined && leading) {
+			noTrail = ignoreFirstTrail === true;
 			fn.apply(this, args);
 		}
 		clearTimeout(timer);
 		timer = setTimeout(() => {
-			fn.apply(this, args);
+			if (trailing !== false && !noTrail) {
+				fn.apply(this, args);
+			}
 			timer = undefined;
 		}, delay);
 	};
diff --git a/packages/core/vitest.setup.ts b/packages/core/vitest.setup.ts
index e116da77a9..b26a1b619c 100644
--- a/packages/core/vitest.setup.ts
+++ b/packages/core/vitest.setup.ts
@@ -13,6 +13,8 @@ global.__ANDROID__ = false;
 global.__IOS__ = true;
 global.__VISIONOS__ = false;
 global.__APPLE__ = true;
+global.__UI_USE_EXTERNAL_RENDERER__ = true;
+global.__CSS_USE_CSS_TOOLS__ = true;
 global.__COMMONJS__ = false;
 global.WeakRef.prototype.get = global.WeakRef.prototype.deref;
 global.NativeClass = function () {};
diff --git a/packages/types-android/src/lib/android/android-declarations.d.ts b/packages/types-android/src/lib/android/android-declarations.d.ts
index f49e25a4a4..ff8093ac48 100644
--- a/packages/types-android/src/lib/android/android-declarations.d.ts
+++ b/packages/types-android/src/lib/android/android-declarations.d.ts
@@ -8,6 +8,12 @@ declare function long(num: number): any;
  */
 declare var gc: () => void;
 
+
+/**
+ * Returns the version of the runtime.
+ */
+declare const __runtimeVersion: string;
+
 /**
  * Releases the reference to the wrapped native object
  * @param object The Java object to release.
diff --git a/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts b/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
index 72d3fecabb..fdd05561f7 100644
--- a/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
+++ b/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
@@ -623,7 +623,7 @@
                 public static setMarginBottomPercent(view: android.view.View, value: number): void;
 
                 public static getHorizontalAlignment(view: android.view.View): string;
-                public static setHorizontalAlignment(view: android.view.View, value: string): void;
+                public static setHorizontalAlignment(view: android.view.View, value: string, rtl: boolean): void;
 
                 public static getVerticalAlignment(view: android.view.View): string;
                 public static setVerticalAlignment(view: android.view.View, value: string): void;
@@ -673,6 +673,18 @@
                 public static setLetterspacing(view: android.view.View, value: number): void;
 
                 public static setBackground(view: android.view.View, background: android.graphics.drawable.Drawable): void;
+
+                public static setCommonGridLayoutParam(view: android.view.View, type: string, value: number): void;
+
+                public static setOutlineProvider(view: android.view.View, borderTopLeftRadius: number,
+                     borderTopRightRadius: number,
+                     borderBottomRightRadius: number,
+                     borderBottomLeftRadius: number);
+                public static clearOutlineProvider(view: android.view.View);
+
+                public static isTextView(view: android.view.View): boolean;
+                public static getChildAppCompatTextView(view: android.view.View): androidx.appcompat.widget.AppCompatTextView;
+                public static toolbarAccessibilityScreenChanged(view: androidx.appcompat.widget.Toolbar);
             }
 
             export class DisableUserInteractionListener extends java.lang.Object implements android.view.View.OnTouchListener {
@@ -747,6 +759,48 @@ declare module org {
 	}
 }
 
+declare namespace org {
+	export namespace nativescript {
+		export namespace widgets {
+			export class FolderHelper extends java.lang.Object {
+				public static class: java.lang.Class<org.nativescript.widgets.FolderHelper>;
+				public getParent(): androidx.documentfile.provider.DocumentFile;
+				public createFile(param0: string, param1: string): string;
+				public rename(param0: globalAndroid.content.Context, param1: string, param2: org.nativescript.widgets.FolderHelper.Callback): void;
+				public static fromUri(param0: globalAndroid.content.Context, param1: globalAndroid.net.Uri): org.nativescript.widgets.FolderHelper;
+				public getOrCreateFile(param0: string, param1: boolean): androidx.documentfile.provider.DocumentFile;
+				public getName(): string;
+				public getDocumentFile(): androidx.documentfile.provider.DocumentFile;
+				public createDirectory(param0: string): string;
+				public static fromString(param0: globalAndroid.content.Context, param1: string): org.nativescript.widgets.FolderHelper;
+				public getOrCreateFolder(param0: string, param1: boolean): androidx.documentfile.provider.DocumentFile;
+				public exists(): boolean;
+				public renameSync(param0: globalAndroid.content.Context, param1: string, param2: org.nativescript.widgets.FolderHelper.Callback): void;
+				public static exists(param0: globalAndroid.content.Context, param1: globalAndroid.net.Uri): boolean;
+				public static exists(param0: globalAndroid.content.Context, param1: string): boolean;
+				public containsFileOrFolder(param0: string): boolean;
+				public getLastModified(): number;
+				public delete(param0: globalAndroid.content.Context): boolean;
+			}
+			export namespace FolderHelper {
+				export class Callback extends java.lang.Object {
+					public static class: java.lang.Class<org.nativescript.widgets.FolderHelper.Callback>;
+					/**
+					 * Constructs a new instance of the org.nativescript.widgets.FolderHelper$Callback interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+					 */
+					public constructor(implementation: {
+						onError(param0: java.lang.Exception): void;
+						onSuccess(param0: any): void;
+					});
+					public constructor();
+					public onError(param0: java.lang.Exception): void;
+					public onSuccess(param0: any): void;
+				}
+			}
+		}
+	}
+}
+
 declare module org {
 	export module nativescript {
 		export module widgets {
@@ -754,7 +808,7 @@ declare module org {
 				public static class: java.lang.Class<org.nativescript.widgets.Utils>;
                 public static getBitmapFromDrawable(param0: globalAndroid.graphics.drawable.Drawable): globalAndroid.graphics.Bitmap;
                 public static getBitmapFromView(param0: globalAndroid.view.View): globalAndroid.graphics.Bitmap;
-				public static loadImageAsync(param0: globalAndroid.content.Context, param1: string, param2: string, param3: number, param4: number, param5: org.nativescript.widgets.Utils.AsyncImageCallback): void;
+				public static loadImageAsync(param0: globalAndroid.content.Context, param1: string, param2: string, param5: org.nativescript.widgets.Utils.AsyncImageCallback): void;
                 public static clipCanvasOutPath(param0: globalAndroid.graphics.Canvas, param1: globalAndroid.graphics.Path): void;
 				public static drawBoxShadow(param0: globalAndroid.view.View, param1: number[]): void;
                 public static saveToFileAsync(param0: globalAndroid.graphics.Bitmap, param1: string, param2: string, param3: number, param4: org.nativescript.widgets.Utils.AsyncImageCallback): void;
diff --git a/packages/types-ios/src/lib/ios/runtime.d.ts b/packages/types-ios/src/lib/ios/runtime.d.ts
index 18d517e068..21694b2f89 100644
--- a/packages/types-ios/src/lib/ios/runtime.d.ts
+++ b/packages/types-ios/src/lib/ios/runtime.d.ts
@@ -1,5 +1,12 @@
 /// <reference path="interop.d.ts" />
 
+
+
+/**
+ * Returns the version of the runtime.
+ */
+declare const __runtimeVersion: string;
+
 /**
  * Triggers garbage collection in JavaScript
  */
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
index 86839dc3e3..07d3fbed81 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
@@ -20,18 +20,25 @@
 import android.os.Build;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import org.nativescript.widgets.image.BitmapOwner;
 import org.nativescript.widgets.image.Fetcher;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
+import android.os.Build;
+import android.util.Log;
+
 /**
  * Created by hristov on 6/15/2016.
  */
 public class BorderDrawable extends ColorDrawable implements BitmapOwner {
-	private final float density;
+	private float density;
 	private String id;
 
 	private int borderTopColor;
@@ -202,44 +209,54 @@ public boolean hasUniformBorder() {
 			this.hasUniformBorderRadius();
 	}
 
+	private void init(float density, String id) {
+		borderPaint.setAntiAlias(true);
+		backgroundColorPaint.setAntiAlias(true);
+		backgroundPaint.setAntiAlias(true);
+		backgroundPaint.setFilterBitmap(true);
+		borderPath.setFillType(Path.FillType.EVEN_ODD);
+
+		this.density = density;
+		this.id = id;
+	}
+
 	public BorderDrawable(float density) {
 		super();
-		this.density = density;
+		this.init(density, null);
 	}
 
 	public BorderDrawable(float density, String id) {
 		super();
-		this.density = density;
-		this.id = id;
+		this.init(density, id);
 	}
 
 	public void refresh(int borderTopColor,
-											int borderRightColor,
-											int borderBottomColor,
-											int borderLeftColor,
-
-											float borderTopWidth,
-											float borderRightWidth,
-											float borderBottomWidth,
-											float borderLeftWidth,
-
-											float borderTopLeftRadius,
-											float borderTopRightRadius,
-											float borderBottomRightRadius,
-											float borderBottomLeftRadius,
-
-											String clipPath,
-
-											int backgroundColor,
-											String backgroundImageUri,
-											Bitmap backgroundBitmap,
-											LinearGradientDefinition backgroundGradient,
-											Context context,
-											String backgroundRepeat,
-											String backgroundPosition,
-											CSSValue[] backgroundPositionParsedCSSValues,
-											String backgroundSize,
-											CSSValue[] backgroundSizeParsedCSSValues) {
+						int borderRightColor,
+						int borderBottomColor,
+						int borderLeftColor,
+
+						float borderTopWidth,
+						float borderRightWidth,
+						float borderBottomWidth,
+						float borderLeftWidth,
+
+						float borderTopLeftRadius,
+						float borderTopRightRadius,
+						float borderBottomRightRadius,
+						float borderBottomLeftRadius,
+
+						String clipPath,
+
+						int backgroundColor,
+						String backgroundImageUri,
+						Bitmap backgroundBitmap,
+						LinearGradientDefinition backgroundGradient,
+						Context context,
+						String backgroundRepeat,
+						String backgroundPosition,
+						CSSValue[] backgroundPositionParsedCSSValues,
+						String backgroundSize,
+						CSSValue[] backgroundSizeParsedCSSValues) {
 
 		this.borderTopColor = borderTopColor;
 		this.borderRightColor = borderRightColor;
@@ -284,12 +301,12 @@ public void refresh(int borderTopColor,
 	RectF backgroundRect = new RectF();
 	Paint backgroundColorPaint = new Paint();
 	Path backgroundNoRepeatPath = new Path();
-	Paint backgroundImagePaint = new Paint();
-	Paint backgroundGradientPaint = new Paint();
+	Paint backgroundPaint = new Paint();
 	Paint borderPaint = new Paint();
 	Path borderPath = new Path();
-	RectF borderOuterRect = new RectF();
-	RectF borderInnerRect = new RectF();
+	RectF borderRect = new RectF();
+
+	BitmapShader backgroundImageShader = null;
 
 	PointF lto = new PointF(); // left-top-outside
 	PointF lti = new PointF(); // left-top-inside
@@ -303,19 +320,6 @@ public void refresh(int borderTopColor,
 	PointF lbo = new PointF(); // left-bottom-outside
 	PointF lbi = new PointF(); // left-bottom-inside
 
-
-	Paint topBorderPaint = new Paint();
-	Path topBorderPath = new Path();
-
-	Paint rightBorderPaint = new Paint();
-	Path rightBorderPath = new Path();
-
-	Paint bottomBorderPaint = new Paint();
-	Path bottomBorderPath = new Path();
-
-	Paint leftBorderPaint = new Paint();
-	Path leftBorderPath = new Path();
-
 	@Override
 	public void draw(Canvas canvas) {
 		Rect bounds = this.getBounds();
@@ -352,10 +356,8 @@ public void draw(Canvas canvas) {
 
 		// draw background
 		if (this.backgroundColor != 0) {
-			backgroundColorPaint.reset();
 			backgroundColorPaint.setStyle(Paint.Style.FILL);
 			backgroundColorPaint.setColor(this.backgroundColor);
-			backgroundColorPaint.setAntiAlias(true);
 
 			if (this.clipPath != null && !this.clipPath.isEmpty()) {
 				drawClipPath(this.clipPath, canvas, backgroundColorPaint, backgroundBoundsF, this.density);
@@ -376,19 +378,8 @@ public void draw(Canvas canvas) {
 				params.sizeY = this.backgroundBitmap.getHeight();
 			}
 			transform.postTranslate(params.posX, params.posY);
-
-
-			backgroundImagePaint.reset();
-
-			BitmapShader shader = new BitmapShader(
-				this.backgroundBitmap,
-				params.repeatX ? Shader.TileMode.REPEAT : Shader.TileMode.CLAMP,
-				params.repeatY ? Shader.TileMode.REPEAT : Shader.TileMode.CLAMP
-			);
-			shader.setLocalMatrix(transform);
-			backgroundImagePaint.setAntiAlias(true);
-			backgroundImagePaint.setFilterBitmap(true);
-			backgroundImagePaint.setShader(shader);
+			backgroundImageShader.setLocalMatrix(transform);
+			backgroundPaint.setShader(backgroundImageShader);
 
 			float imageWidth = params.repeatX ? width : params.sizeX;
 			float imageHeight = params.repeatY ? height : params.sizeY;
@@ -396,19 +387,19 @@ public void draw(Canvas canvas) {
 			params.posY = params.repeatY ? 0 : params.posY;
 
 			if (this.clipPath != null && !this.clipPath.isEmpty()) {
-				drawClipPath(this.clipPath, canvas, backgroundImagePaint, backgroundBoundsF, this.density);
+				drawClipPath(this.clipPath, canvas, backgroundPaint, backgroundBoundsF, this.density);
 			} else {
 				boolean supportsPathOp = android.os.Build.VERSION.SDK_INT >= 19;
 				if (supportsPathOp) {
 					backgroundNoRepeatPath.reset();
 					backgroundNoRepeatPath.addRect(params.posX, params.posY, params.posX + imageWidth, params.posY + imageHeight, Path.Direction.CCW);
 					intersect(backgroundNoRepeatPath, backgroundPath);
-					canvas.drawPath(backgroundNoRepeatPath, backgroundImagePaint);
+					canvas.drawPath(backgroundNoRepeatPath, backgroundPaint);
 				} else {
 					// Clipping here will not be anti-aliased but at least it won't shine through the rounded corners.
 					canvas.save();
 					canvas.clipRect(params.posX, params.posY, params.posX + imageWidth, params.posY + imageHeight);
-					canvas.drawPath(backgroundPath, backgroundImagePaint);
+					canvas.drawPath(backgroundPath, backgroundPaint);
 					canvas.restore();
 				}
 			}
@@ -416,21 +407,16 @@ public void draw(Canvas canvas) {
 
 		if (this.backgroundGradient != null) {
 			LinearGradientDefinition def = this.backgroundGradient;
-
-			backgroundGradientPaint.reset();
-
 			LinearGradient shader = new LinearGradient(
 				def.getStartX() * width, def.getStartY() * height,
 				def.getEndX() * width, def.getEndY() * height,
 				def.getColors(), def.getStops(), Shader.TileMode.MIRROR);
-			backgroundGradientPaint.setAntiAlias(true);
-			backgroundGradientPaint.setFilterBitmap(true);
-			backgroundGradientPaint.setShader(shader);
+			backgroundPaint.setShader(shader);
 
 			if (this.clipPath != null && !this.clipPath.isEmpty()) {
-				drawClipPath(this.clipPath, canvas, backgroundGradientPaint, backgroundBoundsF, this.density);
+				drawClipPath(this.clipPath, canvas, backgroundPaint, backgroundBoundsF, this.density);
 			} else {
-				canvas.drawPath(backgroundPath, backgroundGradientPaint);
+				canvas.drawPath(backgroundPath, backgroundPaint);
 			}
 		}
 
@@ -438,7 +424,6 @@ public void draw(Canvas canvas) {
 		if (this.clipPath != null && !this.clipPath.isEmpty()) {
 			float borderWidth = this.getUniformBorderWidth();
 			if (borderWidth > 0) {
-				borderPaint.reset();
 				borderPaint.setColor(this.getUniformBorderColor());
 				borderPaint.setStyle(Paint.Style.STROKE);
 				borderPaint.setStrokeWidth(borderWidth);
@@ -449,14 +434,12 @@ public void draw(Canvas canvas) {
 		} else if (this.hasUniformBorderColor()) {
 			// iOS and browsers use black when no color is specified.
 			if (borderLeftWidth > 0 || borderTopWidth > 0 || borderRightWidth > 0 || borderBottomWidth > 0) {
-				borderPaint.reset();
 				borderPaint.setColor(this.getUniformBorderColor());
 				borderPaint.setStyle(Paint.Style.FILL);
-				borderPaint.setAntiAlias(true);
 
 				borderPath.reset();
 
-				borderOuterRect.set(0, 0, width, height);
+				borderRect.set(0, 0, width, height);
 
 				float[] borderOuterRadii = {
 					borderTopLeftRadius, borderTopLeftRadius,
@@ -464,9 +447,9 @@ public void draw(Canvas canvas) {
 					borderBottomRightRadius, borderBottomRightRadius,
 					borderBottomLeftRadius, borderBottomLeftRadius
 				};
-				borderPath.addRoundRect(borderOuterRect, borderOuterRadii, Path.Direction.CW);
+				borderPath.addRoundRect(borderRect, borderOuterRadii, Path.Direction.CW);
 
-				borderInnerRect.set(
+				borderRect.set(
 					borderLeftWidth,
 					borderTopWidth,
 					width - borderRightWidth,
@@ -478,7 +461,7 @@ public void draw(Canvas canvas) {
 					Math.max(0, borderBottomRightRadius - borderRightWidth), Math.max(0, borderBottomRightRadius - borderBottomWidth),
 					Math.max(0, borderBottomLeftRadius - borderLeftWidth), Math.max(0, borderBottomLeftRadius - borderBottomWidth)
 				};
-				borderPath.addRoundRect(borderInnerRect, borderInnerRadii, Path.Direction.CCW);
+				borderPath.addRoundRect(borderRect, borderInnerRadii, Path.Direction.CCW);
 
 				canvas.drawPath(borderPath, borderPaint);
 			}
@@ -512,64 +495,55 @@ public void draw(Canvas canvas) {
 			lbi.set(left, bounds.bottom - bottom); // left-bottom-inside
 
 
+			borderPaint.setStyle(Paint.Style.FILL);
 			if (this.borderTopWidth > 0) {
-				topBorderPaint.reset();
-				topBorderPaint.setColor(this.borderTopColor);
-				topBorderPaint.setAntiAlias(true);
-
-				topBorderPath.reset();
-				topBorderPath.setFillType(Path.FillType.EVEN_ODD);
-				topBorderPath.moveTo(lto.x, lto.y);
-				topBorderPath.lineTo(rto.x, rto.y);
-				topBorderPath.lineTo(rti.x, rti.y);
-				topBorderPath.lineTo(lti.x, lti.y);
-				topBorderPath.close();
-				canvas.drawPath(topBorderPath, topBorderPaint);
+				borderPaint.setColor(this.borderTopColor);
+
+				borderPath.reset();
+				borderPath.moveTo(lto.x, lto.y);
+				borderPath.lineTo(rto.x, rto.y);
+				borderPath.lineTo(rti.x, rti.y);
+				borderPath.lineTo(lti.x, lti.y);
+				borderPath.close();
+				canvas.drawPath(borderPath, borderPaint);
 			}
 
 			if (this.borderRightWidth > 0) {
-				rightBorderPaint.reset();
-				rightBorderPaint.setColor(this.borderRightColor);
-				rightBorderPaint.setAntiAlias(true);
-
-				rightBorderPath.reset();
-				rightBorderPath.setFillType(Path.FillType.EVEN_ODD);
-				rightBorderPath.moveTo(rto.x, rto.y);
-				rightBorderPath.lineTo(rbo.x, rbo.y);
-				rightBorderPath.lineTo(rbi.x, rbi.y);
-				rightBorderPath.lineTo(rti.x, rti.y);
-				rightBorderPath.close();
-				canvas.drawPath(rightBorderPath, rightBorderPaint);
+				borderPaint.setColor(this.borderRightColor);
+
+				borderPath.reset();
+				borderPath.moveTo(rto.x, rto.y);
+				borderPath.lineTo(rbo.x, rbo.y);
+				borderPath.lineTo(rbi.x, rbi.y);
+				borderPath.lineTo(rti.x, rti.y);
+				borderPath.close();
+				canvas.drawPath(borderPath, borderPaint);
 			}
 
 			if (this.borderBottomWidth > 0) {
-				bottomBorderPaint.reset();
-				bottomBorderPaint.setColor(this.borderBottomColor);
-				bottomBorderPaint.setAntiAlias(true);
-
-				bottomBorderPath.reset();
-				bottomBorderPath.setFillType(Path.FillType.EVEN_ODD);
-				bottomBorderPath.moveTo(rbo.x, rbo.y);
-				bottomBorderPath.lineTo(lbo.x, lbo.y);
-				bottomBorderPath.lineTo(lbi.x, lbi.y);
-				bottomBorderPath.lineTo(rbi.x, rbi.y);
-				bottomBorderPath.close();
-				canvas.drawPath(bottomBorderPath, bottomBorderPaint);
+				borderPaint.setColor(this.borderBottomColor);
+
+				borderPath.reset();
+				borderPath.setFillType(Path.FillType.EVEN_ODD);
+				borderPath.moveTo(rbo.x, rbo.y);
+				borderPath.lineTo(lbo.x, lbo.y);
+				borderPath.lineTo(lbi.x, lbi.y);
+				borderPath.lineTo(rbi.x, rbi.y);
+				borderPath.close();
+				canvas.drawPath(borderPath, borderPaint);
 			}
 
 			if (this.borderLeftWidth > 0) {
-				leftBorderPaint.reset();
-				leftBorderPaint.setColor(this.borderLeftColor);
-				leftBorderPaint.setAntiAlias(true);
-
-				leftBorderPath.reset();
-				leftBorderPath.setFillType(Path.FillType.EVEN_ODD);
-				leftBorderPath.moveTo(lbo.x, lbo.y);
-				leftBorderPath.lineTo(lto.x, lto.y);
-				leftBorderPath.lineTo(lti.x, lti.y);
-				leftBorderPath.lineTo(lbi.x, lbi.y);
-				leftBorderPath.close();
-				canvas.drawPath(leftBorderPath, leftBorderPaint);
+				borderPaint.setColor(this.borderLeftColor);
+
+				borderPath.reset();
+				borderPath.setFillType(Path.FillType.EVEN_ODD);
+				borderPath.moveTo(lbo.x, lbo.y);
+				borderPath.lineTo(lto.x, lto.y);
+				borderPath.lineTo(lti.x, lti.y);
+				borderPath.lineTo(lbi.x, lbi.y);
+				borderPath.close();
+				canvas.drawPath(borderPath, borderPaint);
 			}
 		}
 	}
@@ -874,6 +848,13 @@ public String toDebugString() {
 	@Override
 	public void setBitmap(Bitmap value) {
 		backgroundBitmap = value;
+		BackgroundDrawParams params = this.getDrawParams(0, 0);
+
+		backgroundImageShader = new BitmapShader(
+				this.backgroundBitmap,
+				params.repeatX ? Shader.TileMode.REPEAT : Shader.TileMode.CLAMP,
+				params.repeatY ? Shader.TileMode.REPEAT : Shader.TileMode.CLAMP
+			);
 		invalidateSelf();
 		drawable = null;
 	}
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
index 3f01913428..23dacaac1b 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
@@ -23,7 +23,7 @@ public class CommonLayoutParams extends FrameLayout.LayoutParams {
 	static final String TAG = "NSLayout";
 	static int debuggable = -1;
 	private static final int NOT_SET = Integer.MIN_VALUE;
-	private static final StringBuilder sb = new StringBuilder();
+	private static StringBuilder debugSb = null;
 
 	public CommonLayoutParams() {
 		super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, Gravity.FILL);
@@ -189,14 +189,14 @@ protected static void layoutChild(View child, int left, int top, int right, int
 				int widthMeasureSpec = MeasureSpec.makeMeasureSpec(canChangeWidth ? width : lp.width, MeasureSpec.EXACTLY);
 				int heightMeasureSpec = MeasureSpec.makeMeasureSpec(canChangeHeight ? height : lp.height, MeasureSpec.EXACTLY);
 				if (debuggable > 0) {
-					sb.setLength(0);
-					sb.append("remeasure ");
-					sb.append(child);
-					sb.append(" with ");
-					sb.append(MeasureSpec.toString(widthMeasureSpec));
-					sb.append(", ");
-					sb.append(MeasureSpec.toString(heightMeasureSpec));
-					log(TAG, sb.toString());
+					debugSb.setLength(0);
+					debugSb.append("remeasure ");
+					debugSb.append(child);
+					debugSb.append(" with ");
+					debugSb.append(MeasureSpec.toString(widthMeasureSpec));
+					debugSb.append(", ");
+					debugSb.append(MeasureSpec.toString(heightMeasureSpec));
+					Log.v(TAG, debugSb.toString());
 				}
 
 				child.measure(widthMeasureSpec, heightMeasureSpec);
@@ -204,19 +204,19 @@ protected static void layoutChild(View child, int left, int top, int right, int
 		}
 
 		if (debuggable > 0) {
-			sb.setLength(0);
-			sb.append(child.getParent().toString());
-			sb.append(" :layoutChild: ");
-			sb.append(child);
-			sb.append(" ");
-			sb.append(childLeft);
-			sb.append(", ");
-			sb.append(childTop);
-			sb.append(", ");
-			sb.append(childRight);
-			sb.append(", ");
-			sb.append(childBottom);
-			log(TAG, sb.toString());
+			debugSb.setLength(0);
+			debugSb.append(child.getParent().toString());
+			debugSb.append(" :layoutChild: ");
+			debugSb.append(child);
+			debugSb.append(" ");
+			debugSb.append(childLeft);
+			debugSb.append(", ");
+			debugSb.append(childTop);
+			debugSb.append(", ");
+			debugSb.append(childRight);
+			debugSb.append(", ");
+			debugSb.append(childBottom);
+			Log.v(TAG, debugSb.toString());
 		}
 
 		child.layout(childLeft, childTop, childRight, childBottom);
@@ -227,6 +227,7 @@ protected static void measureChild(View child, int widthMeasureSpec, int heightM
 			return;
 		}
 
+		// TODO: do we really need that code?
 		// Negative means not initialized.
 		if (debuggable < 0) {
 			try {
@@ -235,6 +236,9 @@ protected static void measureChild(View child, int widthMeasureSpec, int heightM
 				android.os.Bundle bundle = ai.metaData;
 				Boolean debugLayouts = bundle != null && bundle.getBoolean("debugLayouts", false);
 				debuggable = debugLayouts ? 1 : 0;
+				if (debuggable == 1) {
+					CommonLayoutParams.debugSb = new StringBuilder();
+				}
 			} catch (NameNotFoundException e) {
 				debuggable = 0;
 				Log.e(TAG, "Failed to load meta-data, NameNotFound: " + e.getMessage());
@@ -248,15 +252,15 @@ protected static void measureChild(View child, int widthMeasureSpec, int heightM
 		int childHeightMeasureSpec = getMeasureSpec(child, heightMeasureSpec, false);
 
 		if (debuggable > 0) {
-			sb.setLength(0);
-			sb.append(child.getParent().toString());
-			sb.append(" :measureChild: ");
-			sb.append(child);
-			sb.append(" ");
-			sb.append(MeasureSpec.toString(childWidthMeasureSpec));
-			sb.append(", ");
-			sb.append(MeasureSpec.toString(childHeightMeasureSpec));
-			log(TAG, sb.toString());
+			debugSb.setLength(0);
+			debugSb.append(child.getParent().toString());
+			debugSb.append(" :measureChild: ");
+			debugSb.append(child);
+			debugSb.append(" ");
+			debugSb.append(MeasureSpec.toString(childWidthMeasureSpec));
+			debugSb.append(", ");
+			debugSb.append(MeasureSpec.toString(childHeightMeasureSpec));
+			Log.v(TAG, debugSb.toString());
 		}
 
 		child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
@@ -386,13 +390,9 @@ protected static void restoreOriginalParams(ViewGroup viewGroup) {
 		}
 	}
 
-	static void log(String tag, String message) {
-		Log.v(tag, message);
-	}
-
 	static StringBuilder getStringBuilder() {
-		sb.setLength(0);
-		return sb;
+		debugSb.setLength(0);
+		return debugSb;
 	}
 
 	private static int getMeasureSpec(View view, int parentMeasureSpec, boolean horizontal) {
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FileHelper.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FileHelper.java
index edaca7c898..d7411366ee 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FileHelper.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FileHelper.java
@@ -25,6 +25,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.StringWriter;
 import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
@@ -529,12 +530,12 @@ private String readTextSyncInternal(Context context, @Nullable String encoding)
 		}
 
 		InputStream is = getInputStream(context, uri);
-		InputStreamReader isr = new InputStreamReader(is, characterSet);
-		BufferedReader reader = new BufferedReader(isr);
+		int n = 0;
 		char[] buf = new char[is.available()];
-		reader.read(buf);
-		reader.close();
-		return new String(buf);
+		InputStreamReader isr = new InputStreamReader(is, characterSet);
+		StringWriter writer = new StringWriter();
+    	while (-1 != (n = isr.read(buf))) writer.write(buf, 0, n);
+    	return writer.toString();
 	}
 
 	public String readTextSync(Context context, @Nullable String encoding, @Nullable Callback callback) {
@@ -719,27 +720,8 @@ public void copyToFile(Context context, File file, Callback callback) {
 
 	public boolean delete(Context context) {
 		try {
-			if (Build.VERSION.SDK_INT >= 19) {
-				if (isExternalStorageDocument(uri)) {
-					File file = getFile(context, uri);
-					if (file != null) {
-						return file.delete();
-					}
-					return false;
-				} else {
-					if (DocumentsContract.isDocumentUri(context, uri)) {
-						if (Build.VERSION.SDK_INT >= 29) {
-							if (!uri.toString().startsWith("content://com.android.providers.downloads.documents")) {
-								return context.getContentResolver().delete(
-									MediaStore.getMediaUri(context, uri), null, null
-								) > 0;
-							}
-
-						} else {
-							return DocumentsContract.deleteDocument(context.getContentResolver(), uri);
-						}
-					}
-				}
+			if (Build.VERSION.SDK_INT >= 19 && DocumentsContract.isDocumentUri(context, uri)) {
+				return DocumentsContract.deleteDocument(context.getContentResolver(), uri);
 			}
 			return context.getContentResolver().delete(uri, null, null) > 0;
 		} catch (SecurityException | FileNotFoundException e) {
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FolderHelper.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FolderHelper.java
new file mode 100644
index 0000000000..a6716571f7
--- /dev/null
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/FolderHelper.java
@@ -0,0 +1,899 @@
+package org.nativescript.widgets;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.DocumentsContract;
+import android.provider.MediaStore;
+import android.webkit.MimeTypeMap;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.documentfile.provider.DocumentFile;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.lang.ref.WeakReference;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class FolderHelper {
+	static final String TAG = "FolderHelper";
+	private Uri uri;
+	private final ExecutorService executor = Executors.newSingleThreadExecutor();
+	private final Handler handler;
+
+
+	private DocumentFile documentFile;
+
+	private WeakReference<Context> context;
+
+	public interface Callback {
+		void onError(Exception exception);
+
+		void onSuccess(@Nullable Object result);
+	}
+
+	FolderHelper(Context context, Uri uri) {
+		handler = new Handler(Looper.myLooper());
+		this.context = new WeakReference<>(context);
+		this.uri = uri;
+		// if (DocumentFile.isDocumentUri(context, uri)) {
+			documentFile = DocumentFile.fromTreeUri(context, uri);
+			String[] split1 = uri.toString().split("/");
+			String[] split2 = documentFile.getUri().toString().split("/");
+
+			if (!split1[split1.length - 1].equals(split2[split2.length - 1])) {
+				// if the path ends with subpaths with %2F fromTreeUri wont get them and get the parent folder...
+				// if so we try to get it with findFile
+				String[] subDirParts = uri.toString().split("%2F");
+				if (subDirParts.length > 0 &&  !documentFile.getName().equals(subDirParts[subDirParts.length -1 ])) {
+					for (int index = 1; index < subDirParts.length; index++) {
+						documentFile = documentFile.findFile(subDirParts[index]);
+					}
+				}
+			}
+		// }
+	}
+
+	private static boolean isExternalStorageDocument(Uri uri) {
+		return "com.android.externalstorage.documents".equals(uri
+			.getAuthority());
+	}
+
+	private static @Nullable
+	Cursor getCursor(Context context, Uri uri) {
+		return getCursor(context, uri, new String[]{
+			MediaStore.MediaColumns.DISPLAY_NAME,
+			MediaStore.MediaColumns.DATE_MODIFIED,
+			MediaStore.MediaColumns.SIZE
+		});
+	}
+
+	private static @Nullable
+	Cursor getCursor(Context context, Uri uri, String[] projections) {
+		Cursor cursor = null;
+		try {
+			if (Build.VERSION.SDK_INT >= 19) {
+				if (DocumentsContract.isDocumentUri(context, uri)) {
+					if (Build.VERSION.SDK_INT >= 29) {
+						if (!uri.toString().startsWith("content://com.android.providers.downloads.documents")) {
+							cursor = context.getContentResolver().query(
+								MediaStore.getMediaUri(context, uri), projections, null, null, null, null
+							);
+						}
+					}
+				}
+			}
+			if (cursor == null) {
+				cursor = context.getContentResolver().query(uri, projections, null, null, null);
+			}
+		} catch (Exception ignored) {
+		}
+
+		return cursor;
+
+	}
+
+	public static boolean exists(Context context, String string) {
+		try {
+			return exists(context, Uri.parse(string));
+		} catch (Exception ignored) {
+			return false;
+		}
+	}
+
+	// static File getDocumentFile(Context context, Uri uri) {
+	// 	if (Build.VERSION.SDK_INT >= 19 && DocumentsContract.isDocumentUri(context, uri)) {
+	// 		return getFile(context, uri);
+	// 	}
+	// 	return null;
+	// }
+
+	public static boolean exists(Context context, Uri uri) {
+		if (Build.VERSION.SDK_INT >= 19) {
+			// if (DocumentsContract.isDocumentUri(context, uri)) {
+				DocumentFile file = DocumentFile.fromTreeUri(context, uri);
+				if (file != null) {
+					return file.isDirectory() && file.exists();
+				}
+			// }
+			// File file = getDocumentFile(context, uri);
+			// if (file != null) {
+			// 	return file.exists();
+			// }
+			return false;
+		}
+		Cursor cursor = getCursor(context, uri);
+		if (cursor == null) {
+			return false;
+		}
+		boolean exists = cursor.moveToFirst();
+		cursor.close();
+		return exists;
+	}
+
+	public static @Nullable
+	FolderHelper fromString(Context context, String string) {
+		return fromUri(context, Uri.parse(string));
+	}
+
+	// @SuppressWarnings("deprecation")
+	// private static @Nullable
+	// File getFile(Context context, Uri uri) {
+	// 	if (Build.VERSION.SDK_INT >= 19) {
+	// 		if (isExternalStorageDocument(uri)) {
+	// 			String docId = DocumentsContract.getDocumentId(uri);
+	// 			String[] split = docId.split(":");
+	// 			String type = split[0];
+	// 			String path = split[1];
+
+	// 			if ("primary".equals(type)) {
+	// 				int nameIndex = path.lastIndexOf("/");
+	// 				String seg = path.substring(0, nameIndex);
+	// 				String[] parts = Uri.decode(uri.toString()).split(":" + seg);
+	// 				String file = Environment.getExternalStorageDirectory() + "/" + path + "/" + parts[1];
+	// 				return new File(file);
+	// 			} else {
+	// 				File[] cacheDirs = context.getExternalCacheDirs();
+	// 				String storageDir = null;
+	// 				for (File cacheDir : cacheDirs) {
+	// 					final String cachePath = cacheDir.getPath();
+	// 					int index = cachePath.indexOf(type);
+	// 					if (index >= 0) {
+	// 						storageDir = cachePath.substring(0, index + type.length());
+	// 					}
+	// 				}
+
+	// 				if (storageDir != null) {
+	// 					return new File(storageDir + "/" + path);
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// 	return null;
+	// }
+
+	public static @Nullable
+	FolderHelper fromUri(Context context, Uri contentUri) {
+		return new FolderHelper(context, contentUri);
+	}
+
+	// private long getFileSize() {
+	// 	if (documentFile != null) {
+	// 		return documentFile.length();
+	// 	}
+	// 	Context context = this.context.get();
+	// 	if (context == null) {
+	// 		return 0;
+	// 	}
+	// 	if (Build.VERSION.SDK_INT >= 19 && DocumentsContract.isDocumentUri(context, uri)) {
+	// 		File file = getDocumentFile(context, uri);
+	// 		if (file == null) {
+	// 			return 0;
+	// 		}
+	// 		return file.length();
+	// 	}
+
+	// 	Cursor cursor = getCursor(context, uri, null);
+
+	// 	if (cursor == null) {
+	// 		return 0;
+	// 	}
+
+	// 	long size = 0;
+
+	// 	boolean moved = cursor.moveToFirst();
+	// 	if (moved) {
+	// 		int sizeIndex = cursor.getColumnIndex(
+	// 			MediaStore.MediaColumns.SIZE
+	// 		);
+
+	// 		size = cursor.getLong(sizeIndex);
+
+	// 	}
+	// 	cursor.close();
+
+	// 	return size;
+	// }
+
+	// private void updateInternal(Context context) {
+	// 	updateInternal(context, true);
+	// }
+
+
+	// private void updateValue(Context context, Uri uri, ContentValues values) {
+	// 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+	// 		context.getContentResolver().update(uri, values, null);
+	// 	} else {
+	// 		context.getContentResolver().update(uri, values, null, null);
+	// 	}
+	// }
+
+	// private void updateInternal(Context context, boolean force) {
+
+	// 	if (force) {
+	// 		// trigger db update
+	// 		ContentValues values = new ContentValues();
+	// 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+	// 			if (isExternalStorageDocument(uri)) {
+	// 				return;
+	// 			}
+	// 			if (DocumentsContract.isDocumentUri(context, uri)) {
+	// 				DocumentFile file = DocumentFile.fromTreeUri(context, uri);
+	// 				if (file != null) {
+	// 					updateValue(context, file.getUri(), values);
+	// 				}
+	// 			} else {
+	// 				updateValue(context, uri, values);
+	// 			}
+	// 		} else {
+	// 			updateValue(context, uri, values);
+	// 		}
+	// 	}
+	// }
+
+	// public long getSize() {
+	// 	return getFileSize();
+	// }
+
+	public DocumentFile getDocumentFile() {
+		return documentFile;
+	}
+	public DocumentFile getParent() {
+		if (documentFile != null) {
+			return documentFile.getParentFile();
+		}
+		return null;
+	}
+	public boolean exists() {
+		if (documentFile != null) {
+			return documentFile.exists();
+		}
+		return false;
+	}
+	public String createDirectory(String name){
+		if (documentFile != null) {
+			return documentFile.createDirectory(name).getUri().toString();
+		}
+		return null;
+	}
+	public String createFile(String mimeType, String name){
+		if (documentFile != null) {
+			return documentFile.createFile(mimeType, name).getUri().toString();
+		}
+		return null;
+	}
+	public boolean containsFileOrFolder(String name){
+		if (documentFile != null) {
+			DocumentFile[] children = documentFile.listFiles();
+			for (DocumentFile file : children) {
+				if (name.equals(file.getName())) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public DocumentFile getOrCreateFile(String fileName, boolean create){
+		if (documentFile != null) {
+			DocumentFile child = documentFile.findFile(fileName);
+			if (create && child == null) {
+				child = documentFile.createFile("*/*", fileName);
+			}
+			return child;
+		}
+		return null;
+	}
+	public DocumentFile getOrCreateFolder(String fileName, boolean create){
+		if (documentFile != null) {
+			DocumentFile child = documentFile.findFile(fileName);
+			if (create && child == null) {
+				child = documentFile.createDirectory(fileName);
+			}
+			if(child != null && child.isDirectory()) {
+				return child;
+			}
+			return null;
+		}
+		return null;
+	}
+
+	public String getName() {
+		if (documentFile != null) {
+			return documentFile.getName();
+		}
+
+		String name = null;
+
+		Context context = this.context.get();
+		if (context != null) {
+			// if (DocumentFile.isDocumentUri(context, uri)) {
+			// 	File file = getDocumentFile(context, uri);
+			// 	if (file != null) {
+			// 		name = file.getName();
+			// 	}
+			// } else {
+
+			Cursor cursor = getCursor(context, uri, null);
+
+			if (cursor == null) {
+				return null;
+			}
+
+			boolean moved = cursor.moveToFirst();
+			if (moved) {
+				int nameIndex = cursor.getColumnIndex(
+					MediaStore.MediaColumns.DISPLAY_NAME
+				);
+
+				name = cursor.getString(nameIndex);
+
+			}
+			cursor.close();
+
+			return name;
+			// }
+		}
+
+		return name;
+	}
+
+	// public String getMime() {
+	// 	String mime = null;
+
+	// 	Context context = this.context.get();
+	// 	if (context != null) {
+	// 		mime = context.getContentResolver().getType(uri);
+	// 	}
+
+	// 	if (mime == null) {
+	// 		return "application/octet-stream";
+	// 	}
+	// 	return mime;
+	// }
+
+	// public String getExtension() {
+	// 	String mime = getMime();
+	// 	if (mime == null) {
+	// 		return "";
+	// 	}
+	// 	return MimeTypeMap.getSingleton().getExtensionFromMimeType(mime);
+	// }
+
+	public long getLastModified() {
+		long lastModified = 0;
+		if (documentFile != null) {
+			return documentFile.lastModified();
+		}
+		Context context = this.context.get();
+		if (context != null) {
+			// if (DocumentFile.isDocumentUri(context, uri)) {
+			// 	File file = getDocumentFile(context, uri);
+			// 	if (file != null) {
+			// 		lastModified = file.lastModified() / 1000;
+			// 	}
+			// } else {
+			Cursor cursor = getCursor(context, uri, null);
+
+			if (cursor == null) {
+				return 0;
+			}
+
+			boolean moved = cursor.moveToFirst();
+			if (moved) {
+				int sizeIndex = cursor.getColumnIndex(
+					MediaStore.MediaColumns.DATE_MODIFIED
+				);
+
+				lastModified = cursor.getLong(sizeIndex);
+
+			}
+			cursor.close();
+			// }
+		}
+
+		return lastModified;
+	}
+
+	// private InputStream getInputStream(Context context, Uri uri) throws Exception {
+	// 	if (Build.VERSION.SDK_INT >= 19) {
+	// 		if (DocumentsContract.isDocumentUri(context, uri)) {
+	// 			return context.getContentResolver().openInputStream(DocumentFile.fromTreeUri(context, uri).getUri());
+	// 		}
+	// 		if (isExternalStorageDocument(uri)) {
+	// 			File file = getFile(context, uri);
+	// 			return new FileInputStream(file);
+	// 		}
+	// 	}
+	// 	return context.getContentResolver().openInputStream(uri);
+	// }
+
+	// private OutputStream getOutputStream(Context context, Uri uri) throws Exception {
+	// 	return getOutputStream(context, uri, false);
+	// }
+
+	// private OutputStream getOutputStream(Context context, Uri uri, boolean append) throws Exception {
+	// 	if (Build.VERSION.SDK_INT >= 19) {
+	// 		if (DocumentsContract.isDocumentUri(context, uri)) {
+	// 			return context.getContentResolver().openOutputStream(DocumentFile.fromTreeUri(context, uri).getUri(), append ? "wa" : "w");
+	// 		}
+	// 		if (isExternalStorageDocument(uri)) {
+	// 			File file = getFile(context, uri);
+	// 			return new FileOutputStream(file, append);
+	// 		}
+	// 	}
+	// 	return context.getContentResolver().openOutputStream(uri, append ? "wa" : "w");
+	// }
+
+	// public void appendSync(Context context, byte[] content, @Nullable Callback callback) {
+	// 	try {
+	// 		writeSyncInternal(context, content, true);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// }
+
+	// public void append(Context context, byte[] content, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			writeSyncInternal(context, content, true);
+	// 			handler.post(() -> callback.onSuccess(null));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// public void appendBufferSync(Context context, ByteBuffer content, @Nullable Callback callback) {
+	// 	try {
+	// 		writeBufferSyncInternal(context, content, true);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// }
+
+	// public void appendBuffer(Context context, ByteBuffer content, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			writeBufferSyncInternal(context, content, true);
+	// 			handler.post(() -> callback.onSuccess(null));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// public void appendTextSync(Context context, String content, @Nullable String encoding, @Nullable Callback callback) {
+	// 	try {
+	// 		writeTextSyncInternal(context, content, encoding, true);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// }
+
+	// public void appendText(Context context, String content, @Nullable String encoding, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			writeTextSyncInternal(context, content, encoding, true);
+	// 			handler.post(() -> callback.onSuccess(null));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// private byte[] readSyncInternal(Context context) throws Exception {
+	// 	InputStream is = getInputStream(context, uri);
+
+	// 	Async.Http.RequestResult.ByteArrayOutputStream2 ret = new Async.Http.RequestResult.ByteArrayOutputStream2();
+
+	// 	byte[] buff = new byte[4096];
+	// 	int read;
+	// 	while ((read = is.read(buff, 0, buff.length)) != -1) {
+	// 		ret.write(buff, 0, read);
+	// 	}
+
+	// 	is.close();
+	// 	return ret.buf();
+	// }
+
+	// private ByteBuffer readBufferSyncInternal(Context context) throws Exception {
+	// 	InputStream is = getInputStream(context, uri);
+
+	// 	ReadableByteChannel channel = Channels.newChannel(is);
+	// 	ByteBuffer buffer = ByteBuffer.allocateDirect(is.available());
+	// 	channel.read(buffer);
+
+	// 	return buffer;
+	// }
+
+	// public @Nullable
+	// byte[] readSync(Context context, @Nullable Callback callback) {
+	// 	try {
+	// 		return readSyncInternal(context);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// 	return null;
+	// }
+
+	// public void read(Context context, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			byte[] result = readSyncInternal(context);
+	// 			handler.post(() -> callback.onSuccess(result));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// public @Nullable
+	// ByteBuffer readBufferSync(Context context, @Nullable Callback callback) {
+	// 	try {
+	// 		return readBufferSyncInternal(context);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// 	return null;
+	// }
+
+	// public void readBuffer(Context context, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			ByteBuffer result = readBufferSyncInternal(context);
+	// 			handler.post(() -> callback.onSuccess(result));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// private String readTextSyncInternal(Context context, @Nullable String encoding) throws Exception {
+	// 	String characterSet = encoding;
+	// 	if (characterSet == null) {
+	// 		characterSet = "UTF-8";
+	// 	}
+
+	// 	InputStream is = getInputStream(context, uri);
+	// 	int n = 0;
+	// 	char[] buf = new char[is.available()];
+	// 	InputStreamReader isr = new InputStreamReader(is, characterSet);
+	// 	StringWriter writer = new StringWriter();
+    // 	while (-1 != (n = isr.read(buf))) writer.write(buf, 0, n);
+    // 	return writer.toString();
+	// }
+
+	// public String readTextSync(Context context, @Nullable String encoding, @Nullable Callback callback) {
+	// 	try {
+	// 		return readTextSyncInternal(context, encoding);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// 	return null;
+	// }
+
+	// public void readText(Context context, @Nullable String encoding, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			String result = readTextSyncInternal(context, encoding);
+	// 			handler.post(() -> callback.onSuccess(result));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// private void writeSyncInternal(Context context, byte[] content) throws Exception {
+	// 	writeSyncInternal(context, content, false);
+	// }
+
+	// private void writeSyncInternal(Context context, byte[] content, boolean append) throws Exception {
+	// 	OutputStream os = getOutputStream(context, uri, append);
+	// 	os.write(content, 0, content.length);
+	// 	os.flush();
+	// 	os.close();
+	// 	try {
+	// 		updateInternal(context);
+	// 	} catch (Exception exception){
+	// 		Log.e(TAG, "Failed to updateValue: " + exception.getMessage());
+	// 	}
+	// }
+
+	// private void writeBufferSyncInternal(Context context, ByteBuffer content) throws Exception {
+	// 	writeBufferSyncInternal(context, content, false);
+	// }
+
+	// private void writeBufferSyncInternal(Context context, ByteBuffer content, boolean append) throws Exception {
+	// 	OutputStream os = getOutputStream(context, uri, append);
+	// 	WritableByteChannel channel = Channels.newChannel(os);
+	// 	channel.write(content);
+	// 	os.flush();
+	// 	os.close();
+	// 	try {
+	// 		updateInternal(context);
+	// 	} catch (Exception exception){
+	// 		Log.e(TAG, "Failed to updateValue: " + exception.getMessage());
+	// 	}
+	// }
+
+	// public void writeSync(Context context, byte[] content, @Nullable Callback callback) {
+	// 	try {
+	// 		writeSyncInternal(context, content);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// }
+
+	// public void write(Context context, byte[] content, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			writeSyncInternal(context, content);
+	// 			handler.post(() -> callback.onSuccess(null));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// public void writeBufferSync(Context context, ByteBuffer content, @Nullable Callback callback) {
+	// 	try {
+	// 		writeBufferSyncInternal(context, content);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// }
+
+	// public void writeBuffer(Context context, ByteBuffer content, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			writeBufferSyncInternal(context, content);
+	// 			handler.post(() -> callback.onSuccess(null));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// private void writeTextSyncInternal(Context context, String content, @Nullable String encoding) throws Exception {
+	// 	writeTextSyncInternal(context, content, encoding, false);
+	// }
+
+	// private void writeTextSyncInternal(Context context, String content, @Nullable String encoding, boolean append) throws Exception {
+	// 	OutputStream os = getOutputStream(context, uri, append);
+	// 	String characterSet = encoding;
+	// 	if (characterSet == null) {
+	// 		characterSet = "UTF-8";
+	// 	}
+	// 	OutputStreamWriter osw = new OutputStreamWriter(os, characterSet);
+	// 	osw.write(content);
+	// 	osw.flush();
+	// 	osw.close();
+	// 	try {
+	// 		updateInternal(context);
+	// 	} catch (Exception exception){
+	// 		Log.e(TAG, "Failed to updateValue: " + exception.getMessage());
+	// 	}
+	// }
+
+	// public void writeTextSync(Context context, String content, @Nullable String encoding, @Nullable Callback callback) {
+	// 	try {
+	// 		writeTextSyncInternal(context, content, encoding);
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// }
+
+	// public void writeText(Context context, String content, @Nullable String encoding, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			writeTextSyncInternal(context, content, encoding);
+	// 			handler.post(() -> callback.onSuccess(null));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	// private void copyToFileInternal(InputStream is, OutputStream os) throws Exception {
+	// 	int read;
+	// 	byte[] buf = new byte[1024];
+	// 	while ((read = is.read(buf)) != -1) {
+	// 		os.write(buf, 0, read);
+	// 	}
+	// 	is.close();
+	// 	os.flush();
+	// 	os.close();
+	// }
+
+	// private void copyToFileInternal(Context context, File file) throws Exception {
+	// 	InputStream is = getInputStream(context, uri);
+	// 	FileOutputStream os = new FileOutputStream(file);
+	// 	copyToFileInternal(is, os);
+	// }
+
+	// public boolean copyToFileSync(Context context, File file, @Nullable Callback callback) {
+	// 	boolean completed = false;
+	// 	try {
+	// 		copyToFileInternal(context, file);
+	// 		completed = true;
+	// 	} catch (Exception e) {
+	// 		if (callback != null) {
+	// 			callback.onError(e);
+	// 		}
+	// 	}
+	// 	return completed;
+	// }
+
+	// public void copyToFile(Context context, File file, Callback callback) {
+	// 	executor.execute(() -> {
+	// 		try {
+	// 			copyToFileInternal(context, file);
+	// 			handler.post(() -> callback.onSuccess(true));
+	// 		} catch (Exception e) {
+	// 			handler.post(() -> callback.onError(e));
+	// 		}
+	// 	});
+	// }
+
+	public boolean delete(Context context) {
+		try {
+			if (documentFile != null) {
+				return documentFile.delete();
+			}
+			if (Build.VERSION.SDK_INT >= 19) {
+				// if (isExternalStorageDocument(uri)) {
+				// 	File file = getFile(context, uri);
+				// 	if (file != null) {
+				// 		return file.delete();
+				// 	}
+				// 	return false;
+				// } else {
+					if (DocumentsContract.isDocumentUri(context, uri)) {
+						if (Build.VERSION.SDK_INT >= 29) {
+							if (!uri.toString().startsWith("content://com.android.providers.downloads.documents")) {
+								return context.getContentResolver().delete(
+									MediaStore.getMediaUri(context, uri), null, null
+								) > 0;
+							}
+
+						} else {
+							return DocumentsContract.deleteDocument(context.getContentResolver(), uri);
+						}
+					}
+				// }
+			}
+			return context.getContentResolver().delete(uri, null, null) > 0;
+		} catch (SecurityException | FileNotFoundException e) {
+			return false;
+		}
+	}
+
+
+	private void renameInternal(Context context, String newName) throws Exception {
+		if (documentFile != null) {
+			documentFile.renameTo(newName);
+			return;
+		}
+		ContentValues values = new ContentValues();
+		values.put(MediaStore.MediaColumns.DISPLAY_NAME, newName);
+
+		if (Build.VERSION.SDK_INT >= 19) {
+			// if (isExternalStorageDocument(uri)) {
+			// 	File file = getFile(context, uri);
+			// 	if (file != null) {
+			// 		file.renameTo(new File(file.getParentFile(), newName));
+			// 		return;
+			// 	}
+			// 	return;
+			// }
+
+			if (DocumentsContract.isDocumentUri(context, uri)) {
+				if (Build.VERSION.SDK_INT >= 29) {
+					if (!uri.toString().startsWith("content://com.android.providers.downloads.documents")) {
+						context.getContentResolver().update(
+							uri, values, null, null
+						);
+						return;
+					}
+					DocumentsContract.renameDocument(context.getContentResolver(), uri, newName);
+				} else if (Build.VERSION.SDK_INT >= 21) {
+					DocumentsContract.renameDocument(context.getContentResolver(), uri, newName);
+					return;
+				}
+			}
+
+		}
+		try {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+				context.getContentResolver().update(uri, values, null);
+			} else {
+				context.getContentResolver().update(uri, values, null, null);
+			}
+			// updateInternal(context, false);
+		} catch (Exception exception){
+			Log.e(TAG, "Failed to updateValue: " + exception.getMessage());
+		}
+		
+	}
+
+	public void renameSync(Context context, String newName, @Nullable Callback callback) {
+		try {
+			renameInternal(context, newName);
+		} catch (Exception e) {
+			if (callback != null) {
+				callback.onError(e);
+			}
+		}
+	}
+
+	public void rename(Context context, String newName, Callback callback) {
+		executor.execute(() -> {
+			try {
+				renameInternal(context, newName);
+				handler.post(() -> callback.onSuccess(null));
+			} catch (Exception e) {
+				handler.post(() -> callback.onError(e));
+			}
+		});
+	}
+
+}
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java
index 16a23457a5..2d53bdec29 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/GridLayout.java
@@ -41,7 +41,7 @@ public GridLayout(Context context, AttributeSet attrs, int defStyleAttr) {
 	}
 
 	public GridLayout(Context context, String rows) {
-		this(context);
+		this(context, null, 0);
 		this.addRowsFromJSON(rows);
 	}
 
@@ -61,7 +61,6 @@ private static void validateItemSpec(ItemSpec itemSpec) {
 	}
 
 	public void addRow(ItemSpec itemSpec) {
-		validateItemSpec(itemSpec);
 		itemSpec.owner = this;
 		this._rows.add(itemSpec);
 
@@ -76,7 +75,6 @@ public void addRow(int value, GridUnitType type) {
 	}
 
 	public void addColumn(ItemSpec itemSpec) {
-		validateItemSpec(itemSpec);
 		itemSpec.owner = this;
 		this._cols.add(itemSpec);
 
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java
index 81c7de963e..84ac0f896e 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java
@@ -14,6 +14,7 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -135,7 +136,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 			sb.append(", measureHeight: ");
 			sb.append(measureHeight);
 
-			CommonLayoutParams.log(CommonLayoutParams.TAG, sb.toString());
+			Log.v(CommonLayoutParams.TAG, sb.toString());
 		}
 
 		int widthSizeAndState = resolveSizeAndState(measureWidth, widthMeasureSpec, 0);
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java
index fd40c6ee38..69d94cb058 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java
@@ -1,6 +1,14 @@
 package org.nativescript.widgets;
 
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -148,10 +156,10 @@ protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams fro
 		return new CommonLayoutParams(from);
 	}
 
-	@Override
-	public boolean shouldDelayChildPressedState() {
-		return false;
-	}
+    @Override
+    public boolean shouldDelayChildPressedState() {
+        return false;
+    }
 
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
index 399dfb1796..57b5afb0c2 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
@@ -35,6 +35,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.lang.Throwable;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileDescriptor;
@@ -183,7 +184,6 @@ public static void drawBoxShadow(View view, int[] values) {
 		if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M) {
 			return;
 		}
-		Log.d("BoxShadowDrawable", "drawBoxShadow");
 
 		Drawable background = view.getBackground();
 		Drawable wrappedBg;
@@ -281,14 +281,14 @@ private static Pair<Integer, Integer> getAspectSafeDimensions(float sourceWidth,
 	}
 
 
-	private static Pair<Integer, Integer> getRequestedImageSize(Pair<Integer, Integer> src, Pair<Integer, Integer> maxSize, ImageAssetOptions options) {
+	private static Pair<Integer, Integer> getRequestedImageSize(Pair<Integer, Integer> src, ImageAssetOptions options) {
 		int reqWidth = options.width;
 		if (reqWidth <= 0) {
-			reqWidth = Math.min(src.first, maxSize.first);
+			reqWidth = src.first;
 		}
 		int reqHeight = options.height;
 		if (reqHeight <= 0) {
-			reqHeight = Math.min(src.second, maxSize.second);
+			reqHeight = src.second;
 		}
 
 		if (options.keepAspectRatio) {
@@ -359,7 +359,7 @@ private static int calculateAngleFromFileDescriptor(FileDescriptor fd) {
 		return rotationAngle;
 	}
 
-	public static void loadImageAsync(final Context context, final String src, final String options, final int maxWidth, final int maxHeight, final AsyncImageCallback callback) {
+	public static void loadImageAsync(final Context context, final String src, final String options, final AsyncImageCallback callback) {
 		final Handler mHandler = new Handler(Looper.myLooper());
 		executors.execute(new Runnable() {
 			@Override
@@ -393,12 +393,21 @@ public void run() {
 					ImageAssetOptions opts = new ImageAssetOptions();
 					opts.keepAspectRatio = true;
 					opts.autoScaleFactor = true;
+					opts.width = bitmapOptions.outWidth;
+					opts.height = bitmapOptions.outHeight;
 
 					try {
 						JSONObject object = new JSONObject(options);
-						// Coerce numeric strings or numbers; fallback to 0 for invalid values
-						opts.width = parsePositiveInt(object, "width");
-						opts.height = parsePositiveInt(object, "height");
+						if (object.has("width")) {
+							opts.width = object.optInt("width", bitmapOptions.outWidth);
+						} else if (object.has("maxWidth")) {
+							opts.width = Math.min(bitmapOptions.outWidth, object.optInt("maxWidth", bitmapOptions.outWidth));
+						}
+						if (object.has("height")) {
+							opts.height = object.optInt("height", bitmapOptions.outHeight);
+						} else if (object.has("maxHeight")) {
+							opts.height = Math.min(bitmapOptions.outHeight, object.optInt("maxHeight", bitmapOptions.outHeight));
+						}
 						opts.keepAspectRatio = object.optBoolean("keepAspectRatio", true);
 						opts.autoScaleFactor = object.optBoolean("autoScaleFactor", true);
 					} catch (JSONException ignored) {
@@ -406,12 +415,18 @@ public void run() {
 
 
 					Pair<Integer, Integer> sourceSize = new Pair<>(bitmapOptions.outWidth, bitmapOptions.outHeight);
-					Pair<Integer, Integer> maxSize = new Pair<>(maxWidth, maxHeight);
-					Pair<Integer, Integer> requestedSize = getRequestedImageSize(sourceSize, maxSize, opts);
+					Pair<Integer, Integer> requestedSize = getRequestedImageSize(sourceSize, opts);
 					int sampleSize = org.nativescript.widgets.image.Fetcher.calculateInSampleSize(bitmapOptions.outWidth, bitmapOptions.outHeight, requestedSize.first, requestedSize.second);
 					BitmapFactory.Options finalBitmapOptions = new BitmapFactory.Options();
 					finalBitmapOptions.inSampleSize = sampleSize;
-
+					if (sampleSize != 1) {
+						// scale to exact size
+						finalBitmapOptions.inScaled = true;
+						finalBitmapOptions.inDensity = sourceSize.first;
+						finalBitmapOptions.inTargetDensity =  bitmapOptions.outWidth * sampleSize;
+					} else {
+						finalBitmapOptions.inScaled = false;
+					}
 
 					String error = null;
 					// read as minimum bitmap as possible (slightly bigger than the requested size)
@@ -425,10 +440,6 @@ public void run() {
 
 
 					if (bitmap != null) {
-						if (requestedSize.first != bitmap.getWidth() || requestedSize.second != bitmap.getHeight()) {
-							// scale to exact size
-							bitmap = android.graphics.Bitmap.createScaledBitmap(bitmap, requestedSize.first, requestedSize.second, true);
-						}
 						int rotationAngle;
 
 						if (pfd != null) {
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ViewHelper.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ViewHelper.java
index 733981a246..e9dbea49c8 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ViewHelper.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ViewHelper.java
@@ -1,12 +1,22 @@
 package org.nativescript.widgets;
 
 import android.annotation.TargetApi;
+import android.graphics.Outline;
+import android.graphics.Path;
 import android.graphics.Rect;
 import android.view.Gravity;
+import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+import java.lang.reflect.Field;
+import java.lang.Class;
+
 /**
  * Created by hhristov on 8/23/16.
  */
@@ -17,6 +27,9 @@ private ViewHelper() {
 	}
 
 	static final int version = android.os.Build.VERSION.SDK_INT;
+	static final boolean LOLLIPOP = android.os.Build.VERSION.SDK_INT >= 21;
+	static final boolean PI = android.os.Build.VERSION.SDK_INT >= 28;
+	static final boolean TIRAMISU = android.os.Build.VERSION.SDK_INT >= 33;
 
 	public static int getMinWidth(android.view.View view) {
 		return view.getMinimumWidth();
@@ -350,31 +363,76 @@ public static String getHorizontalAlignment(android.view.View view) {
 		return "stretch";
 	}
 
-	public static void setHorizontalAlignment(android.view.View view, String value) {
+	private static Field getField(Class clazz, String field) {
+		Field result = null;
+		try {
+			result = clazz.getDeclaredField(field);
+		} catch (Throwable e) {}
+		if (result != null) {
+			return result;
+		}
+		while((clazz = clazz.getSuperclass()) != null) {
+			try {
+				result = clazz.getDeclaredField(field);
+			} catch (Throwable e) {}
+			if (result != null) {
+				return result;
+			}
+		}
+		return result;
+	}
+
+	public static void setHorizontalAlignment(android.view.View view, String value, boolean rtl) throws Throwable {
 		ViewGroup.LayoutParams params = view.getLayoutParams();
 		// Initialize if empty.
 		if (params == null) {
 			params = new CommonLayoutParams();
 		}
 
-		// Set margins only if params are of the correct type.
-		if (params instanceof FrameLayout.LayoutParams) {
-			FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) params;
+		Field field = getField(params.getClass(), "gravity");
+		if (field != null) {
+			int gravity = field.getInt(params);
+			Field weightField = getField(params.getClass(), "weight");
 			switch (value) {
+				case "start":
+					gravity = (rtl ? Gravity.RIGHT : Gravity.LEFT) | (gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					if (weightField != null && weightField.getFloat(params) < 0) {
+						weightField.setFloat(params, -2.0f);
+					}
+					break;
 				case "left":
-					lp.gravity = Gravity.LEFT | (lp.gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					gravity = Gravity.LEFT | (gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					if (weightField != null && weightField.getFloat(params) < 0) {
+						weightField.setFloat(params, -2.0f);
+					}
 					break;
 				case "center":
 				case "middle":
-					lp.gravity = Gravity.CENTER_HORIZONTAL | (lp.gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					gravity = Gravity.CENTER_HORIZONTAL | (gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					if (weightField != null && weightField.getFloat(params) < 0) {
+						weightField.setFloat(params, -2.0f);
+					}
 					break;
 				case "right":
-					lp.gravity = Gravity.RIGHT | (lp.gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					gravity = Gravity.RIGHT | (gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					if (weightField != null && weightField.getFloat(params) < 0) {
+						weightField.setFloat(params, -2.0f);
+					}
+					break;
+				case "end":
+					gravity = (rtl ? Gravity.LEFT : Gravity.RIGHT) | (gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					if (weightField != null && weightField.getFloat(params) < 0) {
+						weightField.setFloat(params, -2.0f);
+					}
 					break;
 				case "stretch":
-					lp.gravity = Gravity.FILL_HORIZONTAL | (lp.gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					gravity = Gravity.FILL_HORIZONTAL | (gravity & Gravity.VERTICAL_GRAVITY_MASK);
+					if (weightField != null && weightField.getFloat(params) < 0) {
+						weightField.setFloat(params, -1.0f);
+					}
 					break;
 			}
+			field.setInt(params, gravity);
 			view.setLayoutParams(params);
 		}
 	}
@@ -401,31 +459,44 @@ public static String getVerticalAlignment(android.view.View view) {
 		return "stretch";
 	}
 
-	public static void setVerticalAlignment(android.view.View view, String value) {
+	public static void setVerticalAlignment(android.view.View view, String value) throws Throwable{
 		ViewGroup.LayoutParams params = view.getLayoutParams();
 		// Initialize if empty.
 		if (params == null) {
 			params = new CommonLayoutParams();
 		}
 
-		// Set margins only if params are of the correct type.
-		if (params instanceof FrameLayout.LayoutParams) {
-			FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) params;
+		Field field = getField(params.getClass(), "gravity");
+		if (field != null) {
+			int gravity = field.getInt(params);
 			switch (value) {
 				case "top":
-					lp.gravity = Gravity.TOP | (lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					gravity = Gravity.TOP | (gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					if (params.height < 0) {
+						params.height = -2;
+					}
 					break;
 				case "center":
 				case "middle":
-					lp.gravity = Gravity.CENTER_VERTICAL | (lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					gravity = Gravity.CENTER_VERTICAL | (gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					if (params.height < 0) {
+						params.height = -2;
+					}
 					break;
 				case "bottom":
-					lp.gravity = Gravity.BOTTOM | (lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					gravity = Gravity.BOTTOM | (gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					if (params.height < 0) {
+						params.height = -2;
+					}
 					break;
 				case "stretch":
-					lp.gravity = Gravity.FILL_VERTICAL | (lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					gravity = Gravity.FILL_VERTICAL | (gravity & Gravity.HORIZONTAL_GRAVITY_MASK);
+					if (params.height < 0) {
+						params.height = -1;
+					}
 					break;
 			}
+			field.setInt(params, gravity);
 			view.setLayoutParams(params);
 		}
 	}
@@ -532,7 +603,7 @@ public static void setTranslateY(android.view.View view, float value) {
 
 	@TargetApi(21)
 	public static float getZIndex(android.view.View view) {
-		if (ViewHelper.version >= 21) {
+		if (LOLLIPOP) {
 			return view.getZ();
 		}
 
@@ -541,14 +612,14 @@ public static float getZIndex(android.view.View view) {
 
 	@TargetApi(21)
 	public static void setZIndex(android.view.View view, float value) {
-		if (ViewHelper.version >= 21) {
+		if (LOLLIPOP) {
 			view.setZ(value);
 		}
 	}
 
 	@TargetApi(21)
 	public static float getLetterspacing(android.widget.TextView textView) {
-		if (ViewHelper.version >= 21) {
+		if (LOLLIPOP) {
 			return textView.getLetterSpacing();
 		}
 
@@ -557,8 +628,120 @@ public static float getLetterspacing(android.widget.TextView textView) {
 
 	@TargetApi(21)
 	public static void setLetterspacing(android.widget.TextView textView, float value) {
-		if (ViewHelper.version >= 21) {
+		if (LOLLIPOP) {
 			textView.setLetterSpacing(value);
 		}
 	}
+
+	public static void setCommonGridLayoutParam(android.view.View view, String type, int value) throws Throwable {
+		ViewGroup.LayoutParams params = view.getLayoutParams();
+		// Initialize if empty.
+		if (params == null) {
+			params = new CommonLayoutParams();
+		}
+		if (params instanceof CommonLayoutParams) {
+			switch(type) {
+				case "row":
+					((CommonLayoutParams)params).row = value;
+					break;
+				case "rowSpan":
+					((CommonLayoutParams)params).rowSpan = value;
+					break;
+				case "column":
+					((CommonLayoutParams)params).column = value;
+					break;
+				case "columnSpan":
+					((CommonLayoutParams)params).columnSpan = value;
+					break;
+			}
+			view.setLayoutParams(params);
+		}
+		
+	}
+
+	@TargetApi(21)
+	public static void setOutlineProvider(android.view.View view, int borderTopLeftRadius,
+		int borderTopRightRadius,
+		int borderBottomRightRadius,
+		int borderBottomLeftRadius) {
+		if (LOLLIPOP) {
+			view.setOutlineProvider(new ViewOutlineProvider() {
+				@Override
+				public void getOutline(View view, Outline outline) {
+					if (borderTopLeftRadius == borderTopRightRadius  && borderTopLeftRadius == borderBottomRightRadius && borderTopLeftRadius == borderBottomLeftRadius) {
+						outline.setRoundRect(0,0, view.getWidth(), view.getHeight(), borderTopLeftRadius);
+					} else if (TIRAMISU) {
+						Path path = new Path();
+						float[] radii = {
+							borderTopLeftRadius,
+							borderTopLeftRadius,
+							borderTopRightRadius,
+							borderTopRightRadius,
+							borderBottomRightRadius,
+							borderBottomRightRadius,
+							borderBottomLeftRadius,
+							borderBottomLeftRadius}
+						;
+						path.addRoundRect(
+						0, 0, view.getWidth(), view.getHeight(), radii, Path.Direction.CW);
+						outline.setConvexPath(path);
+					}
+				}
+			});
+			view.setClipToOutline(true);
+		}
+	}
+
+	@TargetApi(21)
+	public static void clearOutlineProvider(android.view.View view) {
+		view.setClipToOutline(false);
+		view.setOutlineProvider(null);
+	}
+
+	public static boolean isTextView(View view) {
+		return view instanceof android.widget.TextView;
+	}
+
+	public static View getChildAppCompatTextView(ViewGroup view) {
+		int numChildren = view.getChildCount();
+
+		for (int i = 0; i < numChildren; i += 1) {
+			View childAndroidView = view.getChildAt(i);
+			if (childAndroidView instanceof AppCompatTextView) {
+				return childAndroidView;
+			}
+		}
+		return null;
+	}
+
+	public static void toolbarAccessibilityScreenChanged(androidx.appcompat.widget.Toolbar nativeView) {
+		nativeView.setFocusable(false);
+		nativeView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+
+		android.view.View announceView = null;
+		int numChildren = nativeView.getChildCount();
+		for (int i = 0; i < numChildren; i += 1) {
+			View childView = nativeView.getChildAt(i);
+			if (childView == null) {
+				continue;
+			}
+
+			childView.setFocusable(true);
+			if (childView instanceof AppCompatTextView) {
+				announceView = childView;
+				if (PI) {
+					announceView.setAccessibilityHeading(true);
+				}
+			}
+		}
+		if (announceView == null) {
+			announceView = nativeView;
+		}
+
+		announceView.setFocusable(true);
+		announceView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+
+		announceView.sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED);
+		announceView.sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+	}
 }
diff --git a/packages/ui-mobile-base/build.sh b/packages/ui-mobile-base/build.sh
index e7f449d025..c05eff809a 100755
--- a/packages/ui-mobile-base/build.sh
+++ b/packages/ui-mobile-base/build.sh
@@ -1,8 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
-echo "Set exit on simple errors"
-set -e
+function throwErrors()
+{
+  echo "Set exit on simple errors"
+    set -e
+}
 
+function ignoreErrors()
+{
+  echo "ignore errors"
+    set +e
+}
+
+throwErrors
 
 echo "Use dumb gradle terminal"
 export TERM=dumb
@@ -11,8 +21,19 @@ echo "Clean dist"
 rm -rf dist
 
 export SKIP_PACK=true
+
+# we ignore android widgets lib build errors for scenarios like:
+# macOS dev without android dev env
+ignoreErrors
 ./build.android.sh
-./build.ios.sh
+throwErrors
+
+
+# only build ios widgets framework on macOS
+if [[ "$OSTYPE" =~ "darwin" ]];
+then
+  ./build.ios.sh
+fi
 
 echo "Copy NPM artifacts"
 cp .npmignore README.md package.json dist/package
diff --git a/packages/ui-mobile-base/ios/TNSWidgets/TNSWidgets/TNSProcess.h b/packages/ui-mobile-base/ios/TNSWidgets/TNSWidgets/TNSProcess.h
new file mode 120000
index 0000000000..da6659af59
--- /dev/null
+++ b/packages/ui-mobile-base/ios/TNSWidgets/TNSWidgets/TNSProcess.h
@@ -0,0 +1 @@
+../../../../ui-mobile-base/ios/TNSWidgets/TNSProcess.h
\ No newline at end of file
diff --git a/packages/ui-mobile-base/ios/TNSWidgets/TNSWidgets/TNSProcess.m b/packages/ui-mobile-base/ios/TNSWidgets/TNSWidgets/TNSProcess.m
new file mode 120000
index 0000000000..503e965035
--- /dev/null
+++ b/packages/ui-mobile-base/ios/TNSWidgets/TNSWidgets/TNSProcess.m
@@ -0,0 +1 @@
+../../../../ui-mobile-base/ios/TNSWidgets/TNSProcess.m
\ No newline at end of file
diff --git a/packages/ui-mobile-base/ios/TNSWidgets/build.xcconfig b/packages/ui-mobile-base/ios/TNSWidgets/build.xcconfig
new file mode 100644
index 0000000000..f5b2a4bb9d
--- /dev/null
+++ b/packages/ui-mobile-base/ios/TNSWidgets/build.xcconfig
@@ -0,0 +1,2 @@
+EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8
+EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))
\ No newline at end of file
diff --git a/packages/ui-mobile-base/ios/build.sh b/packages/ui-mobile-base/ios/build.sh
index 4e36765462..7b3338e57f 100755
--- a/packages/ui-mobile-base/ios/build.sh
+++ b/packages/ui-mobile-base/ios/build.sh
@@ -5,6 +5,7 @@ set -e
 
 BUILD_DIR=$(PWD)/TNSWidgets/build
 rm -rf $BUILD_DIR
+arch=$(uname -m)
 
 echo "Build for iphonesimulator"
 xcodebuild \
@@ -47,43 +48,52 @@ xcodebuild \
     BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
     -quiet
 
-# Only available with Xcode >= 15.2
-echo "Build for visionOS Simulator"
-xcodebuild \
-    -project TNSWidgets/TNSWidgets.xcodeproj \
-    -scheme TNSWidgets \
-    -configuration Release \
-    -destination "generic/platform=visionOS Simulator" \
-    clean build \
-    BUILD_DIR=$BUILD_DIR \
-    SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
-    -quiet
+if [ "$arch" = "arm64" ]; then
+    # Only available with Xcode >= 15.2
+    echo "Build for visionOS Simulator"
+    xcodebuild \
+        -project TNSWidgets/TNSWidgets.xcodeproj \
+        -scheme TNSWidgets \
+        -configuration Release \
+        -destination "generic/platform=visionOS Simulator" \
+        clean build \
+        BUILD_DIR=$BUILD_DIR \
+        SKIP_INSTALL=NO \
+        BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
+        -quiet
 
-echo "Build for visionOS"
-xcodebuild \
-    -project TNSWidgets/TNSWidgets.xcodeproj \
-    -scheme TNSWidgets \
-    -configuration Release \
-    -destination "generic/platform=visionOS" \
-    clean build \
-    BUILD_DIR=$BUILD_DIR \
-    SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
-    -quiet
+    echo "Build for visionOS"
+    xcodebuild \
+        -project TNSWidgets/TNSWidgets.xcodeproj \
+        -scheme TNSWidgets \
+        -configuration Release \
+        -destination "generic/platform=visionOS" \
+        clean build \
+        BUILD_DIR=$BUILD_DIR \
+        SKIP_INSTALL=NO \
+        BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
+        -quiet
+fi
 
 echo "Creating XCFramework"
 BASE=$BUILD_DIR/Release
-xcodebuild \
-    -create-xcframework \
+
+extra_frameworks=""
+
+# Check hardware arch (works even if running under Rosetta)
+if [ "$arch" = "arm64" ]; then
+  extra_frameworks="\
+    -framework     $BASE-xrsimulator/TNSWidgets.framework \
+    -debug-symbols $BASE-xrsimulator/TNSWidgets.framework.dSYM \
+    -framework     $BASE-xros/TNSWidgets.framework \
+    -debug-symbols $BASE-xros/TNSWidgets.framework.dSYM"
+fi
+xcodebuild -create-xcframework \
     -framework     $BASE-iphoneos/TNSWidgets.framework \
     -debug-symbols $BASE-iphoneos/TNSWidgets.framework.dSYM \
     -framework     $BASE-iphonesimulator/TNSWidgets.framework \
     -debug-symbols $BASE-iphonesimulator/TNSWidgets.framework.dSYM \
     -framework     $BASE-maccatalyst/TNSWidgets.framework \
     -debug-symbols $BASE-maccatalyst/TNSWidgets.framework.dSYM \
-    -framework     $BASE-xrsimulator/TNSWidgets.framework \
-    -debug-symbols $BASE-xrsimulator/TNSWidgets.framework.dSYM \
-    -framework     $BASE-xros/TNSWidgets.framework \
-    -debug-symbols $BASE-xros/TNSWidgets.framework.dSYM \
+    $extra_frameworks \
     -output        $BUILD_DIR/TNSWidgets.xcframework
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
index 052a93546b..d42a5be08d 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
@@ -361,6 +361,7 @@ exports[`angular configuration for android 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: true,
         __IOS__: false,
         __VISIONOS__: false,
@@ -794,6 +795,7 @@ exports[`angular configuration for ios 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: false,
         __IOS__: true,
         __VISIONOS__: false,
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
index 85186700e1..6f5bb737b0 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
@@ -263,6 +263,7 @@ exports[`base configuration for android 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: true,
         __IOS__: false,
         __VISIONOS__: false,
@@ -591,6 +592,7 @@ exports[`base configuration for ios 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: false,
         __IOS__: true,
         __VISIONOS__: false,
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
index 05db5382e0..f2b2f1bf33 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
@@ -263,6 +263,7 @@ exports[`javascript configuration for android 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: true,
         __IOS__: false,
         __VISIONOS__: false,
@@ -590,6 +591,7 @@ exports[`javascript configuration for ios 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: false,
         __IOS__: true,
         __VISIONOS__: false,
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
index f5f97000a2..21b408bf49 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
@@ -285,6 +285,7 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: true,
         __IOS__: false,
         __VISIONOS__: false,
@@ -624,6 +625,7 @@ exports[`react configuration > android > base config 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: true,
         __IOS__: false,
         __VISIONOS__: false,
@@ -970,6 +972,7 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: false,
         __IOS__: true,
         __VISIONOS__: false,
@@ -1310,6 +1313,7 @@ exports[`react configuration > ios > base config 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: false,
         __IOS__: true,
         __VISIONOS__: false,
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
index 276d6790ad..fab2b44013 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
@@ -290,6 +290,7 @@ exports[`svelte configuration for android 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: true,
         __IOS__: false,
         __VISIONOS__: false,
@@ -639,6 +640,7 @@ exports[`svelte configuration for ios 1`] = `
         __CSS_PARSER__: '"css-tree"',
         __UI_USE_XML_PARSER__: true,
         __UI_USE_EXTERNAL_RENDERER__: false,
+        __CSS_USE_CSS_TOOLS__: false,
         __ANDROID__: false,
         __IOS__: true,
         __VISIONOS__: false,
diff --git a/packages/webpack5/src/configuration/base.ts b/packages/webpack5/src/configuration/base.ts
index 30a72f5288..9b987e01f3 100644
--- a/packages/webpack5/src/configuration/base.ts
+++ b/packages/webpack5/src/configuration/base.ts
@@ -641,6 +641,7 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
 				__CSS_PARSER__: JSON.stringify(getValue('cssParser', 'css-tree')),
 				__UI_USE_XML_PARSER__: true,
 				__UI_USE_EXTERNAL_RENDERER__: false,
+				__CSS_USE_CSS_TOOLS__: false,
 				__COMMONJS__: !!env.commonjs,
 				__ANDROID__: platform === 'android',
 				__IOS__: platform === 'ios',
diff --git a/packages/webpack5/src/helpers/flavor.ts b/packages/webpack5/src/helpers/flavor.ts
index f95fc3e329..4d5ebafc27 100644
--- a/packages/webpack5/src/helpers/flavor.ts
+++ b/packages/webpack5/src/helpers/flavor.ts
@@ -2,6 +2,30 @@ import { defaultConfigs } from '..';
 import { getAllDependencies } from './dependencies';
 import { error } from './log';
 
+/**
+ * Utility to determine the project flavor based on installed dependencies
+ * (vue, angular, react, svelete, typescript, javascript...)
+ */
+export function projectUsesCustomFlavor(): boolean {
+	const dependencies = getAllDependencies();
+	return [
+		'vue',
+		'angular',
+		'react',
+		'svelte',
+		//@ts-ignore
+	].includes(determineProjectFlavor());
+	if (
+		dependencies.includes('nativescript-vue') ||
+		dependencies.includes('@nativescript/angular') ||
+		dependencies.includes('react-nativescript') ||
+		dependencies.includes('svelte-native')
+	) {
+		return true;
+	}
+
+	return false;
+}
 /**
  * Utility to determine the project flavor based on installed dependencies
  * (vue, angular, react, svelete, typescript, javascript...)
diff --git a/packages/webpack5/src/helpers/index.ts b/packages/webpack5/src/helpers/index.ts
index 260095b6a7..c32478d88c 100644
--- a/packages/webpack5/src/helpers/index.ts
+++ b/packages/webpack5/src/helpers/index.ts
@@ -9,7 +9,7 @@ import { addVirtualEntry, addVirtualModule } from './virtualModules';
 import { applyFileReplacements } from './fileReplacements';
 import { addCopyRule, removeCopyRule } from './copyRules';
 import { error, info, warn, warnOnce } from './log';
-import { determineProjectFlavor } from './flavor';
+import { determineProjectFlavor, projectUsesCustomFlavor } from './flavor';
 import { readTsConfig } from './typescript';
 import { getValue } from './config';
 import { getIPS } from './host';
@@ -48,6 +48,7 @@ export default {
 	},
 	flavor: {
 		determineProjectFlavor,
+		projectUsesCustomFlavor,
 	},
 	host: {
 		getIPS,
diff --git a/packages/webpack5/tsconfig.json b/packages/webpack5/tsconfig.json
index ee380011a9..d47f0194de 100644
--- a/packages/webpack5/tsconfig.json
+++ b/packages/webpack5/tsconfig.json
@@ -2,7 +2,7 @@
 	"compilerOptions": {
 		"rootDir": ".",
 		"baseUrl": ".",
-		"target": "es2018",
+		"target": "es2022",
 		"module": "commonjs",
 		"declaration": true,
 		"emitDecoratorMetadata": true,
diff --git a/references.d.ts b/references.d.ts
index 4ac6847d8e..c1fc734180 100644
--- a/references.d.ts
+++ b/references.d.ts
@@ -1,2 +1 @@
-/// <reference path="./packages/types-ios/src/index.d.ts" />
-/// <reference path="./packages/types-android/src/index.d.ts" />
+/// <reference path="./packages/core/references.d.ts" />
diff --git a/tools/assets/App_Resources/Android/native-api-usage.json b/tools/assets/App_Resources/Android/native-api-usage.json
new file mode 100644
index 0000000000..78a4df71f9
--- /dev/null
+++ b/tools/assets/App_Resources/Android/native-api-usage.json
@@ -0,0 +1,15 @@
+{
+    "whitelist-plugins-usages": true,
+    "whitelist": [
+        "androidx.appcompat.content.res:AppCompatResources",
+        "android.os:MessageQueue",
+        "android.os:Message",
+        "java.lang.reflect:AccessibleObject",
+        "android.view:ViewGroup.MarginLayoutParams"
+    ],
+    "blacklist": [
+        "androidx.appcompat*:R.*", "androidx.appcompat*:R*", "*:*BuildConfig", 
+        "com.nativescript*:R.*", "com.nativescript*:R", 
+        "org.nativescript*:R.*", "org.nativescript*:R"
+    ]
+  }
\ No newline at end of file
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 56ecf4a96d..f1aa634ce2 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -7,7 +7,7 @@
 		"sourceMap": true,
 		"declaration": true,
 		"moduleResolution": "bundler",
-		"emitDecoratorMetadata": true,
+		"emitDecoratorMetadata": false,
 		"experimentalDecorators": true,
 		"noEmitOnError": true,
 		"noEmitHelpers": true,