diff --git a/CanvasNative.podspec b/CanvasNative.podspec
index 85ef636e5..fabc1549b 100644
--- a/CanvasNative.podspec
+++ b/CanvasNative.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
     s.name         = "CanvasNative"
 
-    s.version      = "0.9.19"
+    s.version      = "1.0.0-alpha.0"
 
     s.summary      = "A Canvas library"
 
diff --git a/apps/demo/src/plugin-demos/canvas.xml b/apps/demo/src/plugin-demos/canvas.xml
index cd1978858..a39074009 100644
--- a/apps/demo/src/plugin-demos/canvas.xml
+++ b/apps/demo/src/plugin-demos/canvas.xml
@@ -4,12 +4,12 @@
         </ActionBar>
     </Page.actionBar>
   <GridLayout loaded="{{ gridLoaded }}" rows="*,*" columns="*,*" iosOverflowSafeArea="false" width="100%" height="100%">
-		 <canvas:Canvas rowSpan="2" colSpan="2" width="100%" height="100%" ready="{{ canvasLoaded }}"
-									 layoutChanged="{{ onLayout }}"/> 
-                                     <!-- <canvas:Svg  id="1" width="100%" height="100%" src="{{src1}}" loaded="{{svgViewLoaded}}"/>
-                                     <canvas:Svg  id="2" col="1" width="100%" height="100%" src="{{src2}}" loaded="{{svgViewLoaded}}"/>
-                                      <canvas:Svg id="3" row="1" width="100%" height="100%" src="{{src3}}" loaded="{{svgViewLoaded}}"/>
-                                     <canvas:Svg  id="4" row="1" col="1" width="100%" height="100%" src="{{src4}}" loaded="{{svgViewLoaded}}"/> -->
+		 <!-- <canvas:Canvas rowSpan="2" colSpan="2" width="100%" height="100%" ready="{{ canvasLoaded }}"
+									 layoutChanged="{{ onLayout }}"/>  -->
+                                     <canvas:Svg ignorePixelScaling="true"  id="1" width="100%" height="100%" src="{{src1}}" loaded="{{svgViewLoaded}}"/>
+                                     <canvas:Svg ignorePixelScaling="true"  id="2" col="1" width="100%" height="100%" src="{{src2}}" loaded="{{svgViewLoaded}}"/>
+                                      <canvas:Svg ignorePixelScaling="true" id="3" row="1" width="100%" height="100%" src="{{src3}}" loaded="{{svgViewLoaded}}"/>
+                                     <canvas:Svg ignorePixelScaling="true"  id="4" row="1" col="1" width="100%" height="100%" src="{{src4}}" loaded="{{svgViewLoaded}}"/>
     <Button height="40" tap="{{  draw }}" text="Draw"/>
 
     <!-- <ScrollView  rowSpan="4" visibility="{{ show ? 'visible': 'collapse' }}" orientation="vertical">
diff --git a/package.json b/package.json
index ac4d034ea..d6ad3073d 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
 		"@nativescript/core": "~7.0.0",
 		"@nativescript/types": "~7.0.0",
 		"@nativescript/webpack": "~3.0.0",
+		"@nativescript-community/gesturehandler": "^0.1.45",
 		"@ngtools/webpack": "~10.1.0",
 		"@nrwl/eslint-plugin-nx": "~10.1.0",
 		"@nrwl/jest": "~10.1.0",
@@ -73,8 +74,7 @@
 		"typescript": "~3.9.3",
 		"vexflow": "^3.0.9",
 		"xml2js": "^0.4.23",
-		"xmldom": "^0.3.0",
-		"xmldom-qsa": "^1.0.3",
+		"xmldom": "~0.6.0",
 		"zen-3d": "0.0.3",
 		"zone.js": "0.11.1"
 	},
@@ -87,6 +87,5 @@
 		"**/*": [
 			"nx format:write --files"
 		]
-	},
-	"dependencies": {}
+	}
 }
diff --git a/packages/canvas-babylon/package.json b/packages/canvas-babylon/package.json
index 70ac37c59..57858ef57 100644
--- a/packages/canvas-babylon/package.json
+++ b/packages/canvas-babylon/package.json
@@ -33,7 +33,7 @@
 	"readmeFilename": "README.md",
 	"bootstrapper": "@nativescript/plugin-seed",
 	"peerDependencies": {
-		"@nativescript/canvas": "~0.9.2",
+		"@nativescript/canvas": "~1.0.0-alpha.0",
 		"babylonjs": "^4.1.0"
 	}
 }
diff --git a/packages/canvas-phaser-ce/package.json b/packages/canvas-phaser-ce/package.json
index 5187b7933..80cdb1012 100644
--- a/packages/canvas-phaser-ce/package.json
+++ b/packages/canvas-phaser-ce/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-phaser-ce",
-	"version": "1.0.0-alpha7",
+	"version": "1.0.0-beta.0",
 	"description": "Tools for using Phaser-ce to build native 2D games in NativeScript 👾",
 	"main": "index",
 	"typings": "index.d.ts",
@@ -33,7 +33,7 @@
 	"readmeFilename": "README.md",
 	"bootstrapper": "@nativescript/plugin-seed",
 	"peerDependencies": {
-		"@nativescript/canvas": "~0.9.2",
+		"@nativescript/canvas": "~1.0.0-alpha.0",
 		"phaser-ce": "2.15.0"
 	}
 }
diff --git a/packages/canvas-phaser/package.json b/packages/canvas-phaser/package.json
index ae5a35f56..0baa31409 100644
--- a/packages/canvas-phaser/package.json
+++ b/packages/canvas-phaser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-phaser",
-	"version": "1.0.0-alpha6",
+	"version": "1.0.0-beta.0",
 	"description": "Build awesome 2D games with Phaser.js and NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",
@@ -33,7 +33,7 @@
 	"readmeFilename": "README.md",
 	"bootstrapper": "@nativescript/plugin-seed",
 	"peerDependencies": {
-		"@nativescript/canvas": "~0.9.2",
+		"@nativescript/canvas": "~1.0.0-alpha.0",
 		"phaser": "^3.24.1"
 	}
 }
diff --git a/packages/canvas-pixi/package.json b/packages/canvas-pixi/package.json
index 3673565b0..8c2692505 100644
--- a/packages/canvas-pixi/package.json
+++ b/packages/canvas-pixi/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-pixi",
-	"version": "1.0.0-alpha6",
+	"version": "1.0.0-beta.0",
 	"description": "Plugin for using pixi.js in NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",
@@ -33,7 +33,7 @@
 	"readmeFilename": "README.md",
 	"bootstrapper": "nativescript-plugin-seed",
 	"peerDependencies": {
-		"@nativescript/canvas": "~0.9.2",
+		"@nativescript/canvas": "~1.0.0-alpha.0",
 		"pixi.js": "^5.3.3"
 	}
 }
diff --git a/packages/canvas-polyfill/DOM/Document.ts b/packages/canvas-polyfill/DOM/Document.ts
index 01e15fe4f..e26ca2c40 100644
--- a/packages/canvas-polyfill/DOM/Document.ts
+++ b/packages/canvas-polyfill/DOM/Document.ts
@@ -2,6 +2,7 @@ import { Element } from './Element';
 import { HTMLVideoElement } from './HTMLVideoElement';
 import { HTMLImageElement } from './HTMLImageElement';
 import { HTMLCanvasElement } from './HTMLCanvasElement';
+import { SVGElement, SVGCircleElement, SVGRectElement , SVGGElement, SVGPathElement} from './svg';
 import { Text } from './Text';
 import { Canvas } from '@nativescript/canvas';
 import { Frame } from '@nativescript/core';
@@ -33,6 +34,16 @@ export class Document extends Element {
 			case 'iframe':
 				// Return nothing to keep firebase working.
 				return null;
+			case 'svg':
+				return new SVGElement();
+			case 'rect':
+				return new SVGRectElement();
+			case 'circle':
+				return new SVGCircleElement();
+			case 'g':
+				return new SVGGElement();
+			case 'path':
+				return new SVGPathElement();
 			default:
 				return new Element(tagName);
 		}
@@ -76,8 +87,4 @@ export class Document extends Element {
 		}
 		return new Element('div');
 	}
-
-	querySelector(selector) {
-		return new Element(selector);
-	}
 }
diff --git a/packages/canvas-polyfill/DOM/Element.ts b/packages/canvas-polyfill/DOM/Element.ts
index 14f650132..6e3525fd6 100644
--- a/packages/canvas-polyfill/DOM/Element.ts
+++ b/packages/canvas-polyfill/DOM/Element.ts
@@ -26,9 +26,13 @@ export class Element extends Node {
 		return this.nodeName;
 	}
 
-	setAttribute() {}
+	setAttribute(key, value) {
+		console.log(this.className,'setAttribute', key, value);
+	}
 
-	removeAttribute() {}
+	removeAttribute(key, value) {
+		console.log(this.className,'removeAttribute', key, value);
+	}
 
 	setAttributeNS() {}
 
@@ -77,4 +81,14 @@ export class Element extends Node {
 	get ontouchstart() {
 		return {};
 	}
+
+	querySelectorAll(selector) {
+		console.log('querySelectorAll', 'selector', selector);
+		return [];
+	}
+
+	querySelector(selector) {
+	///	return new Element(selector);
+	console.log(this.__internalElement._dom);
+	}
 }
diff --git a/packages/canvas-polyfill/DOM/Node.ts b/packages/canvas-polyfill/DOM/Node.ts
index ab9d931ad..aac483d2a 100644
--- a/packages/canvas-polyfill/DOM/Node.ts
+++ b/packages/canvas-polyfill/DOM/Node.ts
@@ -1,118 +1,140 @@
-import {fromObject, Observable} from '@nativescript/core';
+import { fromObject, Observable } from '@nativescript/core';
 
 (Observable as any).prototype.addListener = function (eventNames, callback, thisArg) {
-    this.on(eventNames, callback, thisArg);
+	this.on(eventNames, callback, thisArg);
 };
 
 (Observable as any).prototype.removeListener = function (eventNames, callback, thisArg) {
-    this.off(eventNames, callback, thisArg);
+	this.off(eventNames, callback, thisArg);
 };
 
 (Observable as any).prototype.emit = function (eventNames, thisArg) {
-    this.notify({
-        eventName: eventNames,
-        object: null,
-    });
+	this.notify({
+		eventName: eventNames,
+		object: null,
+	});
 };
 
 export class Node {
-    emitter: any;
-    style: any;
-    className: any;
-    nodeName: string;
-    _canvas: any;
+	emitter: any;
+	style: any;
+	className: any;
+	nodeName: string;
+	_canvas: any;
+	__internalElement: any;
+	_styleMap = new Map();
+	_id;
+	set id(value){
+		this._id = value;
+		if(this.__internalElement){
+			this.__internalElement._dom.documentElement.setAttribute('id', value);
+		}
+	}
+	get id(){
+		return this._id;
+	}
+	constructor(nodeName) {
+		this.emitter = fromObject({});
+		this.addEventListener = this.addEventListener.bind(this);
+		this.removeEventListener = this.removeEventListener.bind(this);
+		this._checkEmitter = this._checkEmitter.bind(this);
 
-    constructor(nodeName) {
-        this.emitter = fromObject({});
-        this.addEventListener = this.addEventListener.bind(this);
-        this.removeEventListener = this.removeEventListener.bind(this);
-        this._checkEmitter = this._checkEmitter.bind(this);
+		this.style = {
+			setProperty: (key, val) => {
+				// todo check key + val
+				this._styleMap.set(key, val);
+				if (this.__internalElement) {
+					this.__internalElement._dom.documentElement.setAttribute('style', this._styleToString());
+				}
+			},
+			getPropertyValue: (key) => {
+				return this._styleMap.get(key);
+			},
+		};
+		this.className = {
+			baseVal: '',
+		};
+		this.nodeName = nodeName;
+	}
 
-        this.style = {};
-        this.className = {
-            baseVal: '',
-        };
-        this.nodeName = nodeName;
-    }
+	get ownerDocument() {
+		return window.document;
+	}
 
-    get ownerDocument() {
-        return window.document;
-    }
+	_styleToString() {
+		let style = '';
+		this._styleMap.forEach((val, key) => {
+			style = `${style}${key}:${val};`;
+		});
+		return style;
+	}
 
-    _checkEmitter() {
-        if (
-            !this.emitter ||
-            !(
-                this.emitter.on ||
-                this.emitter.addEventListener ||
-                this.emitter.addListener
-            )
-        ) {
-            this.emitter = fromObject({});
-        }
-    }
+	_checkEmitter() {
+		if (!this.emitter || !(this.emitter.on || this.emitter.addEventListener || this.emitter.addListener)) {
+			this.emitter = fromObject({});
+		}
+	}
 
-    addEventListener(eventName, listener, thisArg) {
-        this._checkEmitter();
-        thisArg = thisArg || this;
-        if (this.emitter.on) {
-            this.emitter.on(eventName, listener, thisArg);
-        } else if (this.emitter.addEventListener) {
-            this.emitter.addEventListener(eventName, listener, thisArg);
-        } else if (this.emitter.addListener) {
-            this.emitter.addListener(eventName, listener, thisArg);
-        }
-    }
+	addEventListener(eventName, listener, thisArg) {
+		this._checkEmitter();
+		thisArg = thisArg || this;
+		if (this.emitter.on) {
+			this.emitter.on(eventName, listener, thisArg);
+		} else if (this.emitter.addEventListener) {
+			this.emitter.addEventListener(eventName, listener, thisArg);
+		} else if (this.emitter.addListener) {
+			this.emitter.addListener(eventName, listener, thisArg);
+		}
+	}
 
-    removeEventListener(eventName, listener, thisArg) {
-        this._checkEmitter();
-        thisArg = thisArg || this;
-        if (this.emitter.off) {
-            this.emitter.off(eventName, listener, thisArg);
-        } else if (this.emitter.removeEventListener) {
-            this.emitter.removeEventListener(eventName, listener, thisArg);
-        } else if (this.emitter.removeListener) {
-            this.emitter.removeListener(eventName, listener, thisArg);
-        }
-    }
+	removeEventListener(eventName, listener, thisArg) {
+		this._checkEmitter();
+		thisArg = thisArg || this;
+		if (this.emitter.off) {
+			this.emitter.off(eventName, listener, thisArg);
+		} else if (this.emitter.removeEventListener) {
+			this.emitter.removeEventListener(eventName, listener, thisArg);
+		} else if (this.emitter.removeListener) {
+			this.emitter.removeListener(eventName, listener, thisArg);
+		}
+	}
 
-    appendChild(view) {
-        // console.log('appendChild', view);
-    }
+	appendChild(view) {
+		// console.log('appendChild', view);
+	}
 
-    insertBefore(view) {
-        // console.log('insertBefore', view);
-    }
+	insertBefore(view) {
+		// console.log('insertBefore', view);
+	}
 
-    removeChild(view) {
-        // console.log('removeChild', view);
-    }
+	removeChild(view) {
+		// console.log('removeChild', view);
+	}
 
-    setAttributeNS() {
-    }
+	setAttributeNS() {}
 
-    getBoundingClientRect() {
-        if (this._canvas) {
-            return {
-                left: 0,
-                top: 0,
-                right: this._canvas.innerWidth,
-                bottom: this._canvas.innerHeight,
-                x: 0,
-                y: 0,
-                width: this._canvas.innerWidth,
-                height: this._canvas.innerHeight,
-            };
-        }
-        return {
-            left: 0,
-            top: 0,
-            right: window.innerWidth,
-            bottom: window.innerHeight,
-            x: 0,
-            y: 0,
-            width: window.innerWidth,
-            height: window.innerHeight,
-        };
-    }
+	getBoundingClientRect() {
+		if (this._canvas) {
+			return {
+				left: 0,
+				top: 0,
+				right: this._canvas.innerWidth,
+				bottom: this._canvas.innerHeight,
+				x: 0,
+				y: 0,
+				width: this._canvas.innerWidth,
+				height: this._canvas.innerHeight,
+			};
+		}
+		return {
+			left: 0,
+			top: 0,
+			right: window.innerWidth,
+			bottom: window.innerHeight,
+			x: 0,
+			y: 0,
+			width: window.innerWidth,
+			height: window.innerHeight,
+		};
+	}
 }
diff --git a/packages/canvas-polyfill/DOM/svg/SVGCircleElement.ts b/packages/canvas-polyfill/DOM/svg/SVGCircleElement.ts
new file mode 100644
index 000000000..22c18c5bc
--- /dev/null
+++ b/packages/canvas-polyfill/DOM/svg/SVGCircleElement.ts
@@ -0,0 +1,47 @@
+import { Element } from '../Element';
+import { Circle } from '@nativescript/canvas';
+
+export class SVGCircleElement extends Element {
+	__internalElement: Circle;
+	constructor() {
+		super('circle');
+		let circle = undefined;
+		if (arguments.length > 1) {
+			circle = arguments[1];
+		}
+
+		if (circle instanceof Circle) {
+			this.__internalElement = circle;
+		} else {
+			this.__internalElement = new Circle();
+		}
+	}
+
+	set width(value) {
+		this.__internalElement.width = value;
+	}
+
+	get width() {
+		return this.__internalElement.getMeasuredWidth();
+	}
+
+	set height(value) {
+		this.__internalElement.height = value;
+	}
+
+	get height() {
+		return this.__internalElement.getMeasuredHeight();
+	}
+
+	setAttribute(key, value) {
+		this.__internalElement._dom.documentElement.setAttribute(key, value);
+	}
+
+	getAttribute(key) {
+		return this.__internalElement._dom.documentElement.getAttribute(key);
+	}
+
+	removeAttribute(key, value) {
+		this.__internalElement._dom.documentElement.removeAttribute(key, value);
+	}
+}
diff --git a/packages/canvas-polyfill/DOM/svg/SVGElement.ts b/packages/canvas-polyfill/DOM/svg/SVGElement.ts
new file mode 100644
index 000000000..39784fc64
--- /dev/null
+++ b/packages/canvas-polyfill/DOM/svg/SVGElement.ts
@@ -0,0 +1,71 @@
+import { Element } from '../Element';
+import { Svg } from '@nativescript/canvas';
+
+export class SVGElement extends Element {
+	__internalElement: Svg;
+	constructor() {
+		super('svg');
+		let svg = undefined;
+		if (arguments.length > 1) {
+			svg = arguments[1];
+		}
+
+		if (svg instanceof Svg) {
+			this.__internalElement = svg;
+		} else {
+			this.__internalElement = new Svg();
+		}
+	}
+
+	//@ts-ignore
+	get nativeElement() {
+		return this.__internalElement;
+	}
+
+	set width(value) {
+		this.__internalElement.width = value;
+	}
+
+	get width() {
+		return this.__internalElement.getMeasuredWidth();
+	}
+
+	set height(value) {
+		this.__internalElement.height = value;
+	}
+
+	get height() {
+		return this.__internalElement.getMeasuredHeight();
+	}
+
+	setAttribute(key, value) {
+		this.__internalElement._dom.documentElement.setAttribute(key, value);
+	}
+
+	getAttribute(key) {
+		return this.__internalElement._dom.documentElement.getAttribute(key);
+	}
+
+	removeAttribute(key, value) {
+		this.__internalElement._dom.documentElement.removeAttribute(key, value);
+	}
+
+	appendChild(view) {
+		this.__internalElement._dom.documentElement.appendChild(view.__internalElement._dom);
+		this.__internalElement.__redraw();
+		return view;
+	}
+
+	insertBefore(view) {
+		const v = arguments[0];
+		const c = arguments[1];
+		if (v && c) {
+			this.__internalElement._dom.documentElement.insertBefore(v.__internalElement._dom, c.__internalElement._dom);
+			return v;
+		}
+	}
+
+	removeChild(view) {
+		console.log(this.nodeName, 'removeChild', view);
+	}
+}
diff --git a/packages/canvas-polyfill/DOM/svg/SVGGGElement.ts b/packages/canvas-polyfill/DOM/svg/SVGGGElement.ts
new file mode 100644
index 000000000..3d0b11069
--- /dev/null
+++ b/packages/canvas-polyfill/DOM/svg/SVGGGElement.ts
@@ -0,0 +1,47 @@
+import { Element } from '../Element';
+import { G } from '@nativescript/canvas';
+
+export class SVGGElement extends Element {
+	__internalElement: G;
+	constructor() {
+		super('g');
+		let g = undefined;
+		if (arguments.length > 1) {
+			g = arguments[1];
+		}
+
+		if (g instanceof G) {
+			this.__internalElement = g;
+		} else {
+			this.__internalElement = new G();
+		}
+	}
+
+	set width(value) {
+		this.__internalElement.width = value;
+	}
+
+	get width() {
+		return this.__internalElement.getMeasuredWidth();
+	}
+
+	set height(value) {
+		this.__internalElement.height = value;
+	}
+
+	get height() {
+		return this.__internalElement.getMeasuredHeight();
+	}
+
+	setAttribute(key, value) {
+		this.__internalElement._dom.documentElement.setAttribute(key, value);
+	}
+
+	getAttribute(key) {
+		return this.__internalElement._dom.documentElement.getAttribute(key);
+	}
+
+	removeAttribute(key, value) {
+		this.__internalElement._dom.documentElement.removeAttribute(key, value);
+	}
+}
diff --git a/packages/canvas-polyfill/DOM/svg/SVGPathElement.ts b/packages/canvas-polyfill/DOM/svg/SVGPathElement.ts
new file mode 100644
index 000000000..35418a084
--- /dev/null
+++ b/packages/canvas-polyfill/DOM/svg/SVGPathElement.ts
@@ -0,0 +1,47 @@
+import { Element } from '../Element';
+import { Path } from '@nativescript/canvas';
+
+export class SVGPathElement extends Element {
+	__internalElement: Path;
+	constructor() {
+		super('path');
+		let path = undefined;
+		if (arguments.length > 1) {
+			path = arguments[1];
+		}
+
+		if (path instanceof Path) {
+			this.__internalElement = path;
+		} else {
+			this.__internalElement = new Path();
+		}
+	}
+
+	set width(value) {
+		this.__internalElement.width = value;
+	}
+
+	get width() {
+		return this.__internalElement.getMeasuredWidth();
+	}
+
+	set height(value) {
+		this.__internalElement.height = value;
+	}
+
+	get height() {
+		return this.__internalElement.getMeasuredHeight();
+	}
+
+	setAttribute(key, value) {
+		this.__internalElement._dom.documentElement.setAttribute(key, value);
+	}
+
+	getAttribute(key) {
+		return this.__internalElement._dom.documentElement.getAttribute(key);
+	}
+
+	removeAttribute(key, value) {
+		this.__internalElement._dom.documentElement.removeAttribute(key, value);
+	}
+}
diff --git a/packages/canvas-polyfill/DOM/svg/SVGRectElement.ts b/packages/canvas-polyfill/DOM/svg/SVGRectElement.ts
new file mode 100644
index 000000000..130efff17
--- /dev/null
+++ b/packages/canvas-polyfill/DOM/svg/SVGRectElement.ts
@@ -0,0 +1,49 @@
+import { Element } from '../Element';
+import {Rect} from '@nativescript/canvas';
+
+export class SVGRectElement extends Element {
+    __internalElement: Rect;
+    constructor(){
+        super('rect');
+        let rect = undefined;
+		if (arguments.length > 1) {
+			rect = arguments[1];
+		}
+
+		if (rect instanceof Rect) {
+			this.__internalElement = rect;
+		} else {
+			this.__internalElement = new Rect();
+		}
+    }
+
+    set width(value) {
+		this.__internalElement.width = value;
+	}
+
+	get width() {
+		return this.__internalElement.getMeasuredWidth();
+	}
+
+	set height(value) {
+		this.__internalElement.height = value;
+	}
+
+	get height() {
+		return this.__internalElement.getMeasuredHeight();
+	}
+
+
+    setAttribute(key, value) {
+        this.__internalElement._dom.documentElement.setAttribute(key, value);
+	}
+
+
+	getAttribute(key) {
+		return this.__internalElement._dom.documentElement.getAttribute(key);
+	}
+
+	removeAttribute(key, value) {
+        this.__internalElement._dom.documentElement.removeAttribute(key, value);
+	}
+}
\ No newline at end of file
diff --git a/packages/canvas-polyfill/DOM/svg/index.ts b/packages/canvas-polyfill/DOM/svg/index.ts
new file mode 100644
index 000000000..0133c1b0e
--- /dev/null
+++ b/packages/canvas-polyfill/DOM/svg/index.ts
@@ -0,0 +1,5 @@
+export * from './SVGElement';
+export * from './SVGCircleElement';
+export * from './SVGRectElement';
+export * from './SVGGGElement';
+export * from './SVGPathElement';
\ No newline at end of file
diff --git a/packages/canvas-polyfill/index.ts b/packages/canvas-polyfill/index.ts
index 1ffb14894..dc6dbbaee 100644
--- a/packages/canvas-polyfill/index.ts
+++ b/packages/canvas-polyfill/index.ts
@@ -23,10 +23,8 @@ import { URL } from './URL';
 	const sy = args[2];
 	const sw = args[3];
 	const sh = args[4];
-	if(typeof sw === 'number' && sw === 0 || typeof sh === 'number' && sh === 0 ){
-		return Promise.reject(
-			new RangeError(`Failed to execute 'createImageBitmap' : The crop rect width is 0`)
-		)
+	if ((typeof sw === 'number' && sw === 0) || (typeof sh === 'number' && sh === 0)) {
+		return Promise.reject(new RangeError(`Failed to execute 'createImageBitmap' : The crop rect width is 0`));
 	}
 
 	if (args.length === 1) {
@@ -36,7 +34,6 @@ import { URL } from './URL';
 		//@ts-ignore
 		return ImageBitmap.createFrom(image, sx_or_options);
 	} else if (args.length === 5) {
-		
 		//@ts-ignore
 		return ImageBitmap.createFromRect(image, sx_or_options, sy, sw, sh);
 	} else if (args.length === 6) {
@@ -99,3 +96,16 @@ if (!((global as any).URL instanceof URL)) {
 	});
 	(global as any).window.URL = (global as any).URL;
 }
+class TouchEvent {
+	preventDefault() {}
+	stopPropagation() {}
+}
+
+if (!((global as any).TouchEvent instanceof TouchEvent)) {
+	Object.defineProperty(global, 'TouchEvent', {
+		value: TouchEvent,
+		configurable: true,
+		writable: true,
+	});
+	(global as any).window.TouchEvent = (global as any).TouchEvent;
+}
diff --git a/packages/canvas-polyfill/package.json b/packages/canvas-polyfill/package.json
index 3d3bc6c02..06b29be54 100644
--- a/packages/canvas-polyfill/package.json
+++ b/packages/canvas-polyfill/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-polyfill",
-	"version": "1.0.0-alpha24",
+	"version": "1.0.0-beta.0",
 	"description": "Polyfill for making NativeScript compatible with web libs like pixi.js, three.js, phaser.js, babylon.js, etc....",
 	"main": "index",
 	"typings": "index.d.ts",
@@ -33,6 +33,7 @@
 	"readmeFilename": "README.md",
 	"bootstrapper": "@nativescript/plugin-seed",
 	"dependencies": {
-		"xmldom-qsa": "^1.0.3"
+		"xmldom": "~0.6.0",
+		"@nativescript-community/gesturehandler": "0.1.45"
 	}
 }
diff --git a/packages/canvas-polyfill/window.ts b/packages/canvas-polyfill/window.ts
index 08b5f007d..f3ddeb3f0 100644
--- a/packages/canvas-polyfill/window.ts
+++ b/packages/canvas-polyfill/window.ts
@@ -68,7 +68,7 @@ function checkEmitter() {
 	}
 };
 
-(global as any).window.DOMParser = (global as any).DOMParser = (global as any).DOMParser || require('xmldom-qsa').DOMParser;
+(global as any).window.DOMParser = (global as any).DOMParser = (global as any).DOMParser || require('xmldom').DOMParser;
 
 (global as any).window.XMLDocument = (global as any).XMLDocument = XMLDocument;
 
diff --git a/packages/canvas-three/package.json b/packages/canvas-three/package.json
index 8f602a138..cb6ee7a94 100644
--- a/packages/canvas-three/package.json
+++ b/packages/canvas-three/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-three",
-	"version": "1.0.0-alpha7",
+	"version": "1.0.0-beta.0",
 	"description": "Utilities for using THREE.js on NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",
@@ -33,7 +33,7 @@
 	"readmeFilename": "README.md",
 	"bootstrapper": "@nativescript/plugin-seed",
 	"peerDependencies": {
-		"@nativescript/canvas": "~0.9.2",
+		"@nativescript/canvas": "~1.0.0-alpha.0",
 		"three": "^0.120.1"
 	}
 }
diff --git a/packages/canvas/Canvas/common.ts b/packages/canvas/Canvas/common.ts
index 8fe90f5ef..4cba4a991 100644
--- a/packages/canvas/Canvas/common.ts
+++ b/packages/canvas/Canvas/common.ts
@@ -1,15 +1,23 @@
-import {CSSType, PercentLength, View, Screen, GestureStateTypes, Utils, Application} from '@nativescript/core';
+import {CSSType, PercentLength, View, Screen, GestureStateTypes, Utils, Application, Property, booleanConverter} from '@nativescript/core';
 import {CanvasRenderingContext, TouchList} from '../common';
-import {PinchGestureEventData, Pointer} from '@nativescript/core/ui/gestures';
+import {GestureTypes, GestureEventData, Pointer} from '@nativescript/core/ui/gestures';
 
 export interface ICanvasBase {
 	on(eventName: 'ready', callback: (data: any) => void, thisArg?: any): void;
 }
 
+const WEB_GESTURE_EVENTS = ['touchmove', 'touchstart', 'touchcancel', 'touchend'];
+
+export const ignorePixelScalingProperty = new Property<CanvasBase, boolean>({
+	name: 'ignorePixelScaling',
+	defaultValue: false,
+	valueConverter: booleanConverter
+});
+
 @CSSType('Canvas')
 export abstract class CanvasBase extends View implements ICanvasBase {
 	public static readyEvent = 'ready';
-	_touchEvents: any;
+	ignorePixelScaling: boolean;
 	_isCustom: boolean = false;
 
 	protected constructor() {
@@ -17,13 +25,34 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 		this._classList = new Set();
 	}
 
-	__handleGestures() {
-		if (this._touchEvents) {
-			this.off('touch, pan, pinch', this._touchEvents);
-			this._touchEvents = undefined;
+	_gesturesRegistered = false;
+	__ensureGestures() {
+		if (!this._gesturesRegistered) {
+			this._gesturesRegistered = true;
+			this.on('touch, pan, pinch', this._touchEvent, this);
+		}
+	}
+	__unregisterGestures() {
+		if (this._gesturesRegistered) {
+			this._gesturesRegistered = false;
+			this.off('touch, pan, pinch', this._touchEvent, this);
+		}
+	}
+	public addEventListener(arg: string, callback: any, thisArg?: any) {
+		super.addEventListener(arg, callback, thisArg);
+		if (WEB_GESTURE_EVENTS.indexOf(arg) !== -1) {
+			this.__ensureGestures();
+		}
+	}
+
+	public removeEventListener(arg: string, callback: any, thisArg?: any) {
+		super.removeEventListener(arg, callback, thisArg);
+		if (WEB_GESTURE_EVENTS.indexOf(arg) !== -1) {
+			// if we dont have any other web gestures we can unregister gestures
+			if (!WEB_GESTURE_EVENTS.some(e=>this.hasListeners(e))){
+				this.__unregisterGestures();
+			}
 		}
-		this._touchEvents = this._touchEventsFN.bind(this);
-		this.on('touch, pan, pinch', this._touchEvents);
 	}
 
 	_classList: Set<any>;
@@ -93,16 +122,23 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 	__touchStart?: Pointer;
 
 	_isPinching = false;
-	_touchEventsFN(event: any) {
+	_touchEvent(event: any) {
 		if (event.eventName === 'touch') {
 			switch (event.action) {
 				case 'down':
-					this.__touchStart = event.getActivePointers()[0];
-					this._emitEvent('touchstart', event);
+					// ensure we dont have multiple touchstart
+					// on the web seems to be called only on first touch
+					if (! this.__touchStart) {
+						this.__touchStart = event.getActivePointers()[0];
+						this._emitEvent('touchstart', event);
+					}
 					break;
 				case 'up':
-					this._emitEvent('touchend', event);
-					this.__touchStart = undefined;
+					if (event.getPointerCount() === 1 && this.__touchStart) {
+						this._emitEvent('touchend', event);
+						this._isPinching = false;
+						this.__touchStart = undefined;
+					}
 					break;
 				case 'cancel':
 					this._emitEvent('touchcancel', event);
@@ -115,13 +151,19 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 					break;
 			}
 		} else if (event.eventName === 'pinch') {
-			this._isPinching = true;
-			this._emitEvent('touchmove:pinch', event);
-			if(event.state === GestureStateTypes.ended || event.state === GestureStateTypes.cancelled){
+			if (!this._isPinching && event.getPointerCount() >= 2 && (event.state === GestureStateTypes.began || event.state === GestureStateTypes.changed)) {
+				this._previousPinchDistance = 0;
+				this._isPinching = true;
+			}
+			if (this._isPinching) {
+				this._emitEvent('touchmove:pinch', event);
+			}
+			if (event.state === GestureStateTypes.ended || event.state === GestureStateTypes.cancelled) {
 				this._isPinching = false;
 			}
-		} else if (event.eventName === 'pan') {
-			if(this._isPinching){
+		}
+		else if (event.eventName === 'pan') {
+			if (this._isPinching) {
 				return;
 			}
 			if (event.state === GestureStateTypes.began || event.state === GestureStateTypes.changed) {
@@ -132,120 +174,94 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 
 	_previousX = 0;
 	_previousY = 0;
+	_previousPinchDistance = 0;
 
-	_getTouchEvent(name, event, target) {
+	_getTouchEvent(name, event, target): TouchEvent {
 		const pointers = new TouchList();
 		let scale = 1;
 		let activePointer: {};
 
 		if (name === 'touchmove') {
 			name = 'touchmove';
-			let x = 0;
-			let y = 0;
-			if (global.isIOS) {
-				x = event.deltaX + this.__touchStart?.getX?.() ?? 0;
-				y = event.deltaY + this.__touchStart?.getY?.() ?? 0;
-			} else {
-				const initial: android.view.MotionEvent = event.android.initial;
-				const current: android.view.MotionEvent = event.android.current;
-				scale = Screen.mainScreen.scale;
-				if(initial){
-					x = initial.getX() / scale;
-					y = initial.getY() / scale;
-				}else {
-					x = current.getX() / scale;
-					y = current.getY()/ scale;
-				}
-			}
 
-			/* mouse */
 			activePointer = {
-				clientX: x,
-				clientY: y,
+				clientX: event.getX() * scale,
+				clientY: event.getY() * scale,
 				force: 0.0,
 				identifier: 0,
-				pageX: x,
-				pageY: y,
+				pageX: event.getX() * scale,
+				pageY: event.getY() * scale,
 				radiusX: 0,
 				radiusY: 0,
 				rotationAngle: 0,
-				screenX: x,
-				screenY: y,
-				target,
+				screenX: event.getX() * scale,
+				screenY: event.getY() * scale,
+				target
 			};
 
+			const count = event.getAllPointers().length;
+			for (let i = 0; i < count; i++) {
+				const point = event.getAllPointers()[i];
+				pointers.push({
+					clientX: point.getX(),
+					clientY: point.getY(),
+					force: 0.0,
+					identifier: i,
+					pageX: point.getX(),
+					pageY: point.getY(),
+					radiusX: 0,
+					radiusY: 0,
+					rotationAngle: 0,
+					screenX: point.getX(),
+					screenY: point.getY(),
+					target,
+				});
+			}
+
 			/* mouse */
-			pointers.push({
-				// * SCALE ??
-				clientX: x,
-				clientY: y,
-				force: 0.0,
-				identifier: 0,
-				pageX: x,
-				pageY: y,
-				radiusX: 0,
-				radiusY: 0,
-				rotationAngle: 0,
-				screenX: x,
-				screenY: y,
-				target,
-			});
+			// pointers.push({
+			// 	// * SCALE ??
+			// 	clientX: x,
+			// 	clientY: y,
+			// 	force: 0.0,
+			// 	identifier: 0,
+			// 	pageX: x,
+			// 	pageY: y,
+			// 	radiusX: 0,
+			// 	radiusY: 0,
+			// 	rotationAngle: 0,
+			// 	screenX: x,
+			// 	screenY: y,
+			// 	target,
+			// });
 			this._previousX = event.deltaX;
 			this._previousY = event.deltaY;
 		} else if (name === 'touchmove:pinch') {
-			name = 'touchmove';
-			if (!this.__touchStart) {
-				return null;
+			const dx = event.extraData.positions[2] - event.extraData.positions[0];
+			const dy = event.extraData.positions[3] - event.extraData.positions[1];
+			let delta =0 ;
+
+			var distance = Math.sqrt(dx * dx + dy * dy);
+			if (this._previousPinchDistance) {
+				delta  = this._previousPinchDistance - distance;
 			}
+			this._previousPinchDistance= distance;
+			name = 'wheel';
 			const x = event.getFocusX();
 			const y = event.getFocusY();
 			const scale = event.scale;
 			// mouse event
-			activePointer = {
-				clientX: x * scale,
-				clientY: y * scale,
-				force: 0.0,
-				identifier: 0,
-				pageX: x * scale,
-				pageY: y * scale,
-				radiusX: 0,
-				radiusY: 0,
-				rotationAngle: 0,
-				screenX: x * scale,
-				screenY: x * scale,
-			};
-
-			pointers.push({
-				clientX: this.__touchStart?.getX?.() ?? 0,
-				clientY: this.__touchStart?.getY?.() ?? 0,
-				force: 0.0,
-				identifier: 0,
-				pageX: this.__touchStart?.getX?.() ?? 0,
-				pageY: this.__touchStart?.getY?.() ?? 0,
-				radiusX: 0,
-				radiusY: 0,
-				rotationAngle: 0,
-				screenX: this.__touchStart?.getX?.() ?? 0,
-				screenY: this.__touchStart?.getY?.() ?? 0,
-				target,
-			});
-
-
-			pointers.push({
+			let data = {
+				deltaMode:0,
 				clientX: x,
 				clientY: y,
-				force: 0.0,
-				identifier: 1,
-				pageX: x,
-				pageY: y,
-				radiusX: 0,
-				radiusY: 0,
-				rotationAngle: 0,
-				screenX: x,
-				screenY: y,
-				target,
-			});
-
+				screenX: x ,
+				screenY: x,
+				deltaX:0,
+				deltaY:delta,
+				deltaZ:0,
+			};
+			return Object.assign(new TouchEvent(name), { eventName: name, object: null, defaultPrevented: false, cancelable: false, altKey: false, ctrlKey: true, metaKey: false, shiftKey: false, target }, data);
 		} else {
 			const count = event.getAllPointers().length;
 			const point = event.getActivePointers()[0];
@@ -286,9 +302,8 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 			}
 		}
 
-		return {
+		return Object.assign(new TouchEvent(name),{
 			eventName: name,
-			object: null,
 			defaultPrevented: false,
 			cancelable: false,
 			altKey: false,
@@ -298,20 +313,13 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 			shiftKey: false,
 			targetTouches: pointers,
 			touches: pointers,
-			preventDefault: () => {
-			},
-			stopPropagation: () => {
-			},
 			target,
 			...activePointer,
-		};
+		});
 	}
 
 	_emitEvent(name, event) {
-		const data = this._getTouchEvent(name, event, this);
-		if (data) {
-			this.notify(data);
-		}
+		this.notify(this._getTouchEvent(name, event, this) as any);
 	}
 
 	_readyEvent() {
@@ -392,3 +400,20 @@ export abstract class CanvasBase extends View implements ICanvasBase {
 		}
 	}
 }
+
+
+(CanvasBase.prototype as any)._observe = function (type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
+	const gestureObserve = require('@nativescript-community/gesturehandler/gestures_override').observe;
+	if (!this._gestureObservers[type]) {
+		this._gestureObservers[type] = [];
+	}
+
+	this._gestureObservers[type].push(gestureObserve(this, type, callback, thisArg));
+	if (global.isAndroid) {
+		if (this.isLoaded && !this.touchListenerIsSet) {
+			this.setOnTouchListener();
+		}
+	}
+};
+
+ignorePixelScalingProperty.register(CanvasBase);
\ No newline at end of file
diff --git a/packages/canvas/Canvas/index.android.ts b/packages/canvas/Canvas/index.android.ts
index 68b44248c..a330f8f00 100644
--- a/packages/canvas/Canvas/index.android.ts
+++ b/packages/canvas/Canvas/index.android.ts
@@ -1,4 +1,4 @@
-import { CanvasBase } from './common';
+import { CanvasBase, ignorePixelScalingProperty } from './common';
 import { DOMMatrix } from '../Canvas2D';
 import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
 import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
@@ -31,6 +31,10 @@ export class Canvas extends CanvasBase {
 		(global as any).__canvasLoaded = true;
 	}
 
+	[ignorePixelScalingProperty.setNative](value: boolean){
+		this._canvas.setIgnorePixelScaling(value);
+	}
+
 	// @ts-ignore
 	get android() {
 		return this._canvas;
@@ -102,8 +106,10 @@ export class Canvas extends CanvasBase {
 
 	initNativeView(): void {
 		super.initNativeView();
+		if (this.ignorePixelScaling) {
+			this._canvas.setIgnorePixelScaling(this.ignorePixelScaling);
+		}
 		const ref = new WeakRef(this);
-		this.__handleGestures();
 		this.on(View.layoutChangedEvent, (args) => {
 			const parent = this.parent as any;
 			// TODO change DIPs once implemented
@@ -162,7 +168,6 @@ export class Canvas extends CanvasBase {
 	}
 
 	disposeNativeView(): void {
-		this.off('touch, pan', this._touchEvents);
 		this._canvas.setListener(null);
 		this._canvas = undefined;
 		this.setNativeView(undefined);
@@ -183,33 +188,7 @@ export class Canvas extends CanvasBase {
 			}
 
 			const size = this._realSize;
-			let rootParams = this._canvas.getLayoutParams();
-
-			if (rootParams && (size.width || 0) === rootParams.width && (size.height || 0) === rootParams.height) {
-				return;
-			}
-
-			if ((size.width || 0) !== 0 && (size.height || 0) !== 0) {
-				if (!rootParams) {
-					rootParams = new android.widget.FrameLayout.LayoutParams(0, 0);
-				}
-				rootParams.width = size.width;
-				rootParams.height = size.height;
-				let surfaceParams; // = this._canvas.getSurface().getLayoutParams();
-				if (!surfaceParams) {
-					surfaceParams = new android.widget.FrameLayout.LayoutParams(0, 0);
-				}
-				//	surfaceParams.width = size.width;
-				//	surfaceParams.height = size.height;
-
-				this._canvas.setLayoutParams(rootParams);
-				//this._canvas.getSurface().setLayoutParams(surfaceParams);
-
-				const w = android.view.View.MeasureSpec.makeMeasureSpec(size.width, android.view.View.MeasureSpec.EXACTLY);
-				const h = android.view.View.MeasureSpec.makeMeasureSpec(size.height, android.view.View.MeasureSpec.EXACTLY);
-				this._canvas.measure(w, h);
-				this._canvas.layout(0, 0, size.width || 0, size.height || 0);
-			}
+			org.nativescript.canvas.TNSCanvas.layoutView(size.width || 0, size.height || 0, this._canvas);
 		}
 	}
 
diff --git a/packages/canvas/Canvas/index.ios.ts b/packages/canvas/Canvas/index.ios.ts
index cbe7e2f80..ecea93ea9 100644
--- a/packages/canvas/Canvas/index.ios.ts
+++ b/packages/canvas/Canvas/index.ios.ts
@@ -1,4 +1,4 @@
-import { CanvasBase } from './common';
+import { CanvasBase, ignorePixelScalingProperty } from './common';
 import { DOMMatrix } from '../Canvas2D';
 import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
 import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
@@ -26,6 +26,7 @@ export class Canvas extends CanvasBase {
 			CGRectZero,
 			useCpu
 		);
+		console.dir(this._canvas);
 		const ref = new WeakRef(this);
 		const listener = (NSObject as any).extend({
 			contextReady() {
@@ -44,6 +45,10 @@ export class Canvas extends CanvasBase {
 		this._canvas.setListener(this._readyListener);
 	}
 
+	[ignorePixelScalingProperty.setNative](value: boolean){
+		this._canvas.ignorePixelScaling = value;
+	}
+
 	// @ts-ignore
 	get ios() {
 		return this._canvas;
@@ -139,7 +144,7 @@ export class Canvas extends CanvasBase {
 
 	initNativeView() {
 		super.initNativeView();
-		this.__handleGestures();
+		this._canvas.ignorePixelScaling = this.ignorePixelScaling;
 	}
 
 	flush() {
@@ -164,7 +169,6 @@ export class Canvas extends CanvasBase {
 	}
 
 	disposeNativeView(): void {
-		this.off('touch, pan', this._touchEvents);
 		this._canvas.setListener(null);
 		this._readyListener = undefined;
 		this._canvas = undefined;
diff --git a/packages/canvas/SVG/Circle.ts b/packages/canvas/SVG/Circle.ts
index 4bbf4d4a3..b33aa4fa2 100644
--- a/packages/canvas/SVG/Circle.ts
+++ b/packages/canvas/SVG/Circle.ts
@@ -1,7 +1,6 @@
 import { Property } from '@nativescript/core';
 import { SVGItem } from './SVGItem';
-import { CanvasGradient, Path2D } from '../Canvas2D';
-
+import { DOMParser } from 'xmldom';
 export const cxProperty = new Property<Circle, any>({
 	name: 'cx',
 });
@@ -18,6 +17,10 @@ export class Circle extends SVGItem {
 	cx: any;
 	cy: any;
 	r: any;
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<circle></circle>');
+	}
 }
 
 cxProperty.register(Circle);
diff --git a/packages/canvas/SVG/ClipPath.ts b/packages/canvas/SVG/ClipPath.ts
index 301250a87..5313fc655 100644
--- a/packages/canvas/SVG/ClipPath.ts
+++ b/packages/canvas/SVG/ClipPath.ts
@@ -1,4 +1,8 @@
 import {SVGItem} from "./SVGItem";
-
+import { DOMParser } from 'xmldom';
 export class ClipPath extends SVGItem {
+    constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<clip-path></clip-path>');
+	}
 }
\ No newline at end of file
diff --git a/packages/canvas/SVG/Defs.ts b/packages/canvas/SVG/Defs.ts
index 464464886..8611cfaf3 100644
--- a/packages/canvas/SVG/Defs.ts
+++ b/packages/canvas/SVG/Defs.ts
@@ -1,5 +1,9 @@
 import {AddChildFromBuilder} from "@nativescript/core";
 import {SVGItem} from "./SVGItem";
-
+import { DOMParser } from 'xmldom';
 export class Defs extends SVGItem {
+    constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<def></defs>');
+	}
 }
diff --git a/packages/canvas/SVG/Ellipse.ts b/packages/canvas/SVG/Ellipse.ts
index 3946d67a8..5cfe35a24 100644
--- a/packages/canvas/SVG/Ellipse.ts
+++ b/packages/canvas/SVG/Ellipse.ts
@@ -14,12 +14,17 @@ export const rxProperty = new Property<Ellipse, any>({
 export const ryProperty = new Property<Ellipse, any>({
 	name: 'ry'
 });
-
+import { DOMParser } from 'xmldom';
 export class Ellipse extends SVGItem {
 	cx: any;
 	cy: any;
 	rx: any;
 	ry: any;
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<ellipse></ellipse>');
+	}
 }
 
 cxProperty.register(Ellipse);
diff --git a/packages/canvas/SVG/G.ts b/packages/canvas/SVG/G.ts
index b05bd0139..1844c9c8a 100644
--- a/packages/canvas/SVG/G.ts
+++ b/packages/canvas/SVG/G.ts
@@ -2,9 +2,14 @@ import { AddChildFromBuilder, View } from "@nativescript/core";
 import { Canvas } from "../Canvas";
 import { Svg } from "./SVG";
 import { SVGItem } from "./SVGItem";
-
+import { DOMParser } from 'xmldom';
 export class G extends SVGItem  {
     transform: string;
     x: any;
     y: any;
+
+    constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<g></g>');
+	}
 }
diff --git a/packages/canvas/SVG/Image.ts b/packages/canvas/SVG/Image.ts
index 293c58a0f..b0fb90392 100644
--- a/packages/canvas/SVG/Image.ts
+++ b/packages/canvas/SVG/Image.ts
@@ -24,7 +24,7 @@ function getMIMEforBase64String(b64) {
 	}
 	return mime;
 }
-
+import { DOMParser } from 'xmldom';
 export class Image extends SVGItem {
 	xlink: { href?: string } = {};
 	href: string;
@@ -32,4 +32,9 @@ export class Image extends SVGItem {
 	y: any = 0;
 	#loadedSrc: string;
 	#asset = new ImageAsset();
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<image></image>');
+	}
 }
diff --git a/packages/canvas/SVG/Line.ts b/packages/canvas/SVG/Line.ts
index ce51e5ad4..ffd4fc6e1 100644
--- a/packages/canvas/SVG/Line.ts
+++ b/packages/canvas/SVG/Line.ts
@@ -14,12 +14,17 @@ export const x2Property = new Property<Line, any>({
 export const y2Property = new Property<Line, any>({
 	name: 'y2'
 });
-
+import { DOMParser } from 'xmldom';
 export class Line extends SVGItem {
 	x1: any;
 	y1: any;
 	x2: any;
 	y2: any;
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<line></line>');
+	}
 }
 
 x1Property.register(Line);
diff --git a/packages/canvas/SVG/LinearGradient.ts b/packages/canvas/SVG/LinearGradient.ts
index f008958f5..18d4e9a05 100644
--- a/packages/canvas/SVG/LinearGradient.ts
+++ b/packages/canvas/SVG/LinearGradient.ts
@@ -2,7 +2,7 @@ import {SVGItem} from "./SVGItem";
 import {Svg} from "./SVG";
 import {AddChildFromBuilder} from "@nativescript/core";
 import {Stop} from "./Stop";
-
+import { DOMParser } from 'xmldom';
 export class LinearGradient extends SVGItem {
 	_views: any[];
 	x1: any = '0%';
@@ -11,4 +11,9 @@ export class LinearGradient extends SVGItem {
 	y2: any = '0%';
 
 	gradientTransform: string;
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<linear-gradient></linear-gradient>');
+	}
 }
diff --git a/packages/canvas/SVG/Path.ts b/packages/canvas/SVG/Path.ts
index afd601078..3a9e8d5cf 100644
--- a/packages/canvas/SVG/Path.ts
+++ b/packages/canvas/SVG/Path.ts
@@ -5,9 +5,14 @@ import { SVGItem } from "./SVGItem";
 export const dProperty = new Property<Path, string>({
 	name: 'd'
 });
-
+import { DOMParser } from 'xmldom';
 export class Path extends SVGItem {
 	public d: string;
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<path></path>');
+	}
 }
 
 dProperty.register(Path);
diff --git a/packages/canvas/SVG/Pattern.ts b/packages/canvas/SVG/Pattern.ts
index e101ec7f3..f16cae06f 100644
--- a/packages/canvas/SVG/Pattern.ts
+++ b/packages/canvas/SVG/Pattern.ts
@@ -2,7 +2,10 @@ import {SVGItem} from "./SVGItem";
 import {Canvas} from "../Canvas";
 import {AddChildFromBuilder, PercentLength} from "@nativescript/core";
 import {Svg} from "./SVG";
-
+import { DOMParser } from 'xmldom';
 export class Pattern extends SVGItem {
-	
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<pattern></pattern>');
+	}
 }
diff --git a/packages/canvas/SVG/Polygon.ts b/packages/canvas/SVG/Polygon.ts
index 8b23b5fa0..ac11eefdc 100644
--- a/packages/canvas/SVG/Polygon.ts
+++ b/packages/canvas/SVG/Polygon.ts
@@ -5,9 +5,14 @@ import {SVGItem} from "./SVGItem";
 export const pointsProperty = new Property<Polygon, any>({
 	name: 'points'
 });
-
+import { DOMParser } from 'xmldom';
 export class Polygon extends SVGItem {
 	points: any;
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<polygon></polygon>');
+	}
 }
 
 pointsProperty.register(Polygon);
diff --git a/packages/canvas/SVG/Polyline.ts b/packages/canvas/SVG/Polyline.ts
index 0473cf1fb..bfbff1d6f 100644
--- a/packages/canvas/SVG/Polyline.ts
+++ b/packages/canvas/SVG/Polyline.ts
@@ -5,9 +5,14 @@ import {SVGItem} from "./SVGItem";
 export const pointsProperty = new Property<Polyline, any>({
 	name: 'points'
 });
-
+import { DOMParser } from 'xmldom';
 export class Polyline extends SVGItem {
 	points: any;
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<polyline></polyline>');
+	}
 }
 
 pointsProperty.register(Polyline);
diff --git a/packages/canvas/SVG/Rect.ts b/packages/canvas/SVG/Rect.ts
index 74cae23dd..d9412c215 100644
--- a/packages/canvas/SVG/Rect.ts
+++ b/packages/canvas/SVG/Rect.ts
@@ -1,9 +1,14 @@
 import { SVGItem } from "./SVGItem";
 import { CanvasGradient } from '../Canvas2D';
-
+import { DOMParser } from 'xmldom';
 export class Rect extends SVGItem {
 	x: any = 0;
 	y: any = 0;
 	rx: any = 0;
 	ry: any = 0;
+
+	constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<rect></rect>');
+	}
 }
diff --git a/packages/canvas/SVG/SVG.ts b/packages/canvas/SVG/SVG.ts
index 6ffd4e6db..d6e1e4603 100644
--- a/packages/canvas/SVG/SVG.ts
+++ b/packages/canvas/SVG/SVG.ts
@@ -1,4 +1,4 @@
-import { Http, View, Style, CssProperty, AddChildFromBuilder, Frame, Property, path, knownFolders, CSSType, Screen, Application } from '@nativescript/core';
+import { Http, View, Style, CssProperty, AddChildFromBuilder, Frame, Property, path, knownFolders, CSSType, Screen, Application, Utils } from '@nativescript/core';
 
 export const strokeProperty = new CssProperty<Style, any>({
 	name: 'stroke',
@@ -54,22 +54,29 @@ export const srcProperty = new Property<Svg, string>({
 	name: 'src',
 });
 
-import { File } from '@nativescript/core';
-import { layout } from '@nativescript/core/utils';
+declare const TNSSVG;
+import { SVGItem } from './SVGItem';
+import { DOMParser, XMLSerializer } from 'xmldom';
 @CSSType('Svg')
 export class Svg extends View {
 	public static readyEvent = 'ready';
+	_dom;
+	_serializer;
 	_svg: any;
 	src: string;
+	__children = [];
+	__attachedToDom = false;
 	constructor() {
 		super();
 		if (global.isAndroid) {
 			const activity = Application.android.foregroundActivity || Application.android.startActivity;
-			this._svg = new (com as any).github.triniwiz.canvas.TNSSVG(activity);
+			this._svg = new org.nativescript.canvas.TNSSVG(activity);
 		} else if (global.isIOS) {
-			//	this._svg = TNSSVG.new();
-			//	this._svg.backgroundColor = UIColor.clearColor;
+			this._svg = TNSSVG.alloc().initWithFrame(CGRectZero);
+			this._svg.backgroundColor = UIColor.clearColor;
 		}
+		this._dom = new DOMParser().parseFromString('<svg width="auto" height="auto" xmlns="http://www.w3.org/2000/svg"></svg>');
+		this._serializer = new XMLSerializer();
 	}
 
 	[srcProperty.setNative](value: string) {
@@ -78,9 +85,7 @@ export class Svg extends View {
 				if (global.isAndroid) {
 					this._svg.setSrc(value);
 				} else if (global.isIOS) {
-					setTimeout(() => {
-						this._svg.src = value;
-					}, 1000);
+					this._svg.src = value;
 				}
 			} else {
 				if (value.startsWith('~')) {
@@ -101,10 +106,7 @@ export class Svg extends View {
 							if (global.isAndroid) {
 								this._svg.setSrc(res);
 							} else if (global.isIOS) {
-								setTimeout(() => {
-									console.log(!!res);
-									this._svg.src = res;
-								}, 1000);
+								this._svg.src = res;
 							}
 						})
 						.catch((e) => {
@@ -115,12 +117,60 @@ export class Svg extends View {
 		}
 	}
 
-	#inBatch = false;
-	batch(action: () => void) {}
+	public onLayout(left: number, top: number, right: number, bottom: number): void {
+		super.onLayout(left, top, right, bottom);
+		this.__redraw();
+	}
+
+	public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number) {
+		const nativeView = this.nativeView;
+		if (nativeView) {
+			const width = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
+			const height = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
+			this.setMeasuredDimension(width, height);
+		}
+	}
+
+	__redraw() {
+		if (this.__attachedToDom) {
+			const domCopy = this._dom.valueOf();
+			const width = domCopy.documentElement.getAttribute('width');
+			const height = domCopy.documentElement.getAttribute('height');
+			if (width === 'auto') {
+				domCopy.documentElement.setAttribute('width', `${this.getMeasuredWidth()}px`);
+			}
+			if (height === 'auto') {
+				domCopy.documentElement.setAttribute('height', `${this.getMeasuredHeight()}px`);
+			}
+			const serialized = this._serializer.serializeToString(domCopy);
+			if (serialized !== '<svg xmlns="http://www.w3.org/2000/svg"></svg>') {
+				this.src = serialized;
+			}
+		}
+	}
 
 	createNativeView(): Object {
+		this.__attachedToDom = true;
 		return this._svg;
 	}
+
+	initNativeView() {
+		super.initNativeView();
+	}
+
+	addChild(view: SVGItem) {
+		this._addView(view);
+		view.__attached = true;
+		this.__children.push(view);
+	}
+
+	removeChild(view: SVGItem) {
+		if (view.__attached) {
+			this._removeView(view);
+			view.__attached = false;
+			this.__children = this.__children.filter((item) => item !== view);
+		}
+	}
 }
 
 srcProperty.register(Svg);
diff --git a/packages/canvas/SVG/SVGItem.ts b/packages/canvas/SVG/SVGItem.ts
index 9288def1f..e1c5c57ae 100644
--- a/packages/canvas/SVG/SVGItem.ts
+++ b/packages/canvas/SVG/SVGItem.ts
@@ -3,5 +3,6 @@ import {Canvas} from "../Canvas";
 import {Svg} from "./SVG";
 
 export class SVGItem extends View {
-	
+    _dom;
+    __attached: boolean = false;
 }
diff --git a/packages/canvas/SVG/Stop.ts b/packages/canvas/SVG/Stop.ts
index e95c2d914..d60536a97 100644
--- a/packages/canvas/SVG/Stop.ts
+++ b/packages/canvas/SVG/Stop.ts
@@ -1,5 +1,9 @@
 import {SVGItem} from "./SVGItem";
-
+import { DOMParser } from 'xmldom';
 export class Stop extends SVGItem {
     offset: any;
+    constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<stop></stop>');
+	}
 }
\ No newline at end of file
diff --git a/packages/canvas/SVG/Symbol.ts b/packages/canvas/SVG/Symbol.ts
index c1e84b556..84782e643 100644
--- a/packages/canvas/SVG/Symbol.ts
+++ b/packages/canvas/SVG/Symbol.ts
@@ -1,6 +1,9 @@
 import {SVGItem} from "./SVGItem";
 import {AddChildFromBuilder} from "@nativescript/core";
-
+import { DOMParser } from 'xmldom';
 export class Symbol extends SVGItem {
-
+    constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<symbol></symbol>');
+	}
 }
diff --git a/packages/canvas/SVG/Text.ts b/packages/canvas/SVG/Text.ts
index de60a77d5..a71c313fa 100644
--- a/packages/canvas/SVG/Text.ts
+++ b/packages/canvas/SVG/Text.ts
@@ -16,13 +16,18 @@ export const dxProperty = new Property<Text, any>({
 export const dyProperty = new Property<Text, any>({
     name: 'dy'
 });
-
+import { DOMParser } from 'xmldom';
 export class Text extends SVGItem {
     x: any;
     y: any;
     dx: any;
     dy: any;
     text: string;
+
+    constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<text></text>');
+	}
 }
 
 
diff --git a/packages/canvas/SVG/Use.ts b/packages/canvas/SVG/Use.ts
index 308daa293..72470af90 100644
--- a/packages/canvas/SVG/Use.ts
+++ b/packages/canvas/SVG/Use.ts
@@ -4,6 +4,10 @@ import {SVGItem} from "./SVGItem";
 import {Symbol} from './Symbol';
 import {Circle} from "./Circle";
 import {Rect} from './Rect';
-
+import { DOMParser } from 'xmldom';
 export class Use extends SVGItem {
+    constructor(){
+		super();
+		this._dom = new DOMParser().parseFromString('<use></use>');
+	}
 }
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index d0d2500b9..eccb0fd57 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas",
-	"version": "0.9.22",
+	"version": "1.0.0.alpha.0",
 	"description": "DOM Canvas API for NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",
diff --git a/packages/canvas/platforms/android/include.gradle b/packages/canvas/platforms/android/include.gradle
index c78d3594c..01048bb68 100644
--- a/packages/canvas/platforms/android/include.gradle
+++ b/packages/canvas/platforms/android/include.gradle
@@ -6,5 +6,5 @@ allprojects {
 }
 
 dependencies {
-   implementation 'org.nativescript:canvas:0.9.18'
+   implementation 'org.nativescript:canvas:1.0.0-alpha.0'
 }
diff --git a/packages/canvas/platforms/ios/Podfile b/packages/canvas/platforms/ios/Podfile
index f2e8426c1..6e334e4bd 100644
--- a/packages/canvas/platforms/ios/Podfile
+++ b/packages/canvas/platforms/ios/Podfile
@@ -1,7 +1,6 @@
 use_frameworks!
 platform :ios, '11.0'
-#pod 'CanvasNative' , '~> 0.9.19'
-pod 'CanvasNative', :git => 'https://github.com/NativeScript/canvas.git', :tag => '0.9.21'
+pod 'CanvasNative' , '~> 1.0.alpha.0'
 #pod 'CanvasNative', :path => "$(SRCROOT)/../../../../../"
 
 
diff --git a/packages/canvas/src-native/canvas-android/.idea/codeStyles/Project.xml b/packages/canvas/src-native/canvas-android/.idea/codeStyles/Project.xml
index ce1fc4fef..ce889bd58 100644
--- a/packages/canvas/src-native/canvas-android/.idea/codeStyles/Project.xml
+++ b/packages/canvas/src-native/canvas-android/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/packages/canvas/src-native/canvas-android/.idea/compiler.xml b/packages/canvas/src-native/canvas-android/.idea/compiler.xml
index 61a9130cd..fb7f4a8a4 100644
--- a/packages/canvas/src-native/canvas-android/.idea/compiler.xml
+++ b/packages/canvas/src-native/canvas-android/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/packages/canvas/src-native/canvas-android/.idea/misc.xml b/packages/canvas/src-native/canvas-android/.idea/misc.xml
index e42e31408..6d7b4a7e4 100644
--- a/packages/canvas/src-native/canvas-android/.idea/misc.xml
+++ b/packages/canvas/src-native/canvas-android/.idea/misc.xml
@@ -9,7 +9,7 @@
     <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/../../../Testdoc" />
     <option name="OTHER_OPTIONS" value="$ANDROID_HOME/platforms/android-29/android.jar " />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/packages/canvas/src-native/canvas-android/.idea/runConfigurations.xml b/packages/canvas/src-native/canvas-android/.idea/runConfigurations.xml
index 7f68460d8..e497da999 100644
--- a/packages/canvas/src-native/canvas-android/.idea/runConfigurations.xml
+++ b/packages/canvas/src-native/canvas-android/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/packages/canvas/src-native/canvas-android/app/src/main/java/org/nativescript/canvasdemo/MainActivity.kt b/packages/canvas/src-native/canvas-android/app/src/main/java/org/nativescript/canvasdemo/MainActivity.kt
index 58203d834..d6fa84497 100644
--- a/packages/canvas/src-native/canvas-android/app/src/main/java/org/nativescript/canvasdemo/MainActivity.kt
+++ b/packages/canvas/src-native/canvas-android/app/src/main/java/org/nativescript/canvasdemo/MainActivity.kt
@@ -35,43 +35,18 @@ class MainActivity : AppCompatActivity() {
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_main)
 		canvas = findViewById(R.id.canvasView)
-		//svg = findViewById(R.id.svgView)
+		svg = findViewById(R.id.svgView)
+		svg?.ignorePixelScaling = true
 //		findViewById<androidx.constraintlayout.widget.ConstraintLayout>(R.id.parent)
 //			.addView(canvas)
 
 		System.loadLibrary("canvasnative")
-
+		canvas?.ignorePixelScaling = false
 		canvas?.listener = object : TNSCanvas.Listener {
 			override fun contextReady() {
 				print("Is Ready")
-				val ctx = canvas?.getContext("2d") as? TNSCanvasRenderingContext2D
-				val asset = TNSImageAsset()
-				asset.loadImageFromUrlAsync("https://www.downloadclipart.net/large/naruto-shippuden-png-hd.png" , object :
-					Callback {
-					override fun onSuccess(value: Any?) {
-						val opts = TNSImageBitmap.Options()
-						opts.resizeWidth  = 200f
-						opts.resizeHeight = 200f
-						TNSImageBitmap.createFromImageAsset(asset,0f,0f,128f,128f, opts, object:
-							TNSImageBitmap.Callback {
-							override fun onSuccess(result: TNSImageBitmap) {
-								Log.d("com.test", "ImageBitmap ${result.width} ${result.height}" )
-								ctx?.fillStyle = TNSColor("red")
-								ctx?.fillRect(0f,0f,128f,128f)
-								ctx?.drawImage(result, 0f,0f)
-							}
-
-							override fun onError(message: String) {
-								Log.d("com.test", "bitmap onError $message")
-							}
-						})
-					}
-
-					override fun onError(error: String?) {
-						Log.d("com.test", "onError $error")
-					}
-				})
 
+				drawFill(canvas!!)
 			}
 		}
 //		svg?.setSrc(
@@ -249,16 +224,16 @@ class MainActivity : AppCompatActivity() {
 //			                scale(1 0.5)">
 //			    <path id="heart" d="M 10,30 A 20,20 0,0,1 50,30 A 20,20 0,0,1 90,30 Q 90,60 50,90 Q 10,60 10,30 z" />
 //			  </g>
-//
-//			  <use xlink:href="#heart" fill="none" stroke="red"/>
-//			</svg>
-//		""".trimIndent())
+////
+////			  <use xlink:href="#heart" fill="none" stroke="red"/>
+////			</svg>
+////		""".trimIndent())
 
 		//drawTransformMatrixSvg()
 		//drawTransformRotateSvg()
 		//drawTransformScaleSvg()
 		//drawTransformTranslateSvg()
-		//drawTransformSkewX()
+	//	drawTransformSkewX()
 		//drawTransformSkewY()
 
 		//drawLinearGradientSvg()
@@ -268,8 +243,8 @@ class MainActivity : AppCompatActivity() {
 
 		//	drawTransformGradientSvg()
 
-		//drawClipPathUnitsSvg()
-	//	downloadSvg()
+			//	drawClipPathUnitsSvg()
+		downloadSvg()
 //		svg?.setSrc("""
 //			<svg xmlns="http://www.w3.org/2000/svg">
 //			  <!-- Using g to inherit presentation attributes -->
@@ -518,7 +493,7 @@ class MainActivity : AppCompatActivity() {
 				}
 
 				val url =
-					URL("https://upload.wikimedia.org/wikipedia/commons/4/4c/The_Hague%2C_Netherlands%2C_the_old_city_center.svg")
+					URL("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/tiger.svg")
 				val fs = FileOutputStream(svgFile)
 				url.openStream().use { input ->
 					fs.use { output ->
@@ -534,24 +509,15 @@ class MainActivity : AppCompatActivity() {
 
 	fun drawClipPathUnitsSvg() {
 		svg?.setSrc(
-			"""
-			<svg viewBox="0 0 100 100">
-			  <clipPath id="myClip1" clipPathUnits="userSpaceOnUse">
-			    <circle cx="50" cy="50" r="35" />
-			  </clipPath>
-
-			  <clipPath id="myClip2" clipPathUnits="objectBoundingBox">
-			    <circle cx=".50" cy=".6" r=".35" />
-			  </clipPath>
-
-
-			  <rect id="r4" x="0" y="0"  width="100" height="100" />
-
-
-
-			  <!-- The last rect is clipped with objectBoundingBox units -->
-			  <use clip-path="url(#myClip2)" xlink:href="#r4" fill="red" />
-			</svg>
+			"""<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+      width="526" height="233">
+  <rect x="13" y="14" width="500" height="200" rx="50" ry="100"
+      fill="none" stroke="blue" stroke-width="10" />
+</svg>
 		""".trimIndent()
 		)
 	}
@@ -608,8 +574,7 @@ class MainActivity : AppCompatActivity() {
 		newX = a * oldX + c * oldY + e = 3 * 40 - 1 * 30 + 30 = 120
 		newY = b * oldX + d * oldY + f = 1 * 40 + 3 * 30 + 40 = 170
 		-->
-		<rect x="10" y="10" width="30" height="20" fill="red"
-		transform="matrix(3 1 -1 3 30 40)" />
+
 		</svg>
 			""".trimIndent()
 		)
@@ -1518,7 +1483,7 @@ class MainActivity : AppCompatActivity() {
 		//drawText(ctx!!)
 		// ballExample(ctx!!)
 		//drawPattern(canvas!!)
-		// drawFace(ctx!!)
+		 drawFace(ctx!!)
 		//drawPattern(canvas!!)
 		// drawElements(canvas!!)
 		// drawPatterWithCanvas(canvas!!)
@@ -1537,7 +1502,7 @@ class MainActivity : AppCompatActivity() {
 		//drawPattern(canvas!!)
 		// ctx = canvas?.getContext("2d") as CanvasRenderingContext2D?
 		//drawImageExample(canvas!!)
-		drawFace(ctx!!)
+		//drawFace(ctx!!)
 		//ctx?.fillStyle = Color.BLACK
 		// ctx?.fillRect(0F,0F,200f,200f)
 		//ballExample(ctx!!)
@@ -1661,10 +1626,9 @@ class MainActivity : AppCompatActivity() {
 		patternContext.fillStyle = TNSColor("#fec")
 		val style = patternContext.fillStyle as TNSColor
 		patternContext.fillRect(
-			0f, 0f, patternCanvas.width.toFloat(),
-			patternCanvas.height.toFloat()
+			0f, 0f, 50f, 50f
 		);
-		patternContext.arc(0f, 0f, 50 * scale, 0f, (0.5 * Math.PI).toFloat());
+		patternContext.arc(0f, 0f, 50f, 0f, (0.5 * Math.PI).toFloat());
 		patternContext.stroke()
 
 
@@ -1674,7 +1638,8 @@ class MainActivity : AppCompatActivity() {
 		pattern?.let {
 			ctx.fillStyle = it
 		}
-		ctx.fillRect(0f, 0f, canvas.width * scale, canvas.height * scale);
+		val density = resources.displayMetrics.density
+		ctx.fillRect(0f, 0f, canvas.width.toFloat(), canvas.height.toFloat())
 	}
 
 
diff --git a/packages/canvas/src-native/canvas-android/app/src/main/res/layout/activity_main.xml b/packages/canvas/src-native/canvas-android/app/src/main/res/layout/activity_main.xml
index 14ed6bc0e..b8e39085c 100644
--- a/packages/canvas/src-native/canvas-android/app/src/main/res/layout/activity_main.xml
+++ b/packages/canvas/src-native/canvas-android/app/src/main/res/layout/activity_main.xml
@@ -59,20 +59,19 @@
 			app:layout_constraintVertical_bias="0.5" />-->
 
 
-
-	<org.nativescript.canvas.TNSCanvas
+<!--	<org.nativescript.canvas.TNSCanvas
 		android:id="@+id/canvasView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toTopOf="parent" />-->
 
 
 
 
-<!--	<org.nativescript.canvas.TNSSVG
+<org.nativescript.canvas.TNSSVG
 		android:id="@+id/svgView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -81,7 +80,7 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" /> -->
+		app:layout_constraintTop_toTopOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/packages/canvas/src-native/canvas-android/canvas/publish.gradle b/packages/canvas/src-native/canvas-android/canvas/publish.gradle
index 08dc6ff58..e4338b4ba 100644
--- a/packages/canvas/src-native/canvas-android/canvas/publish.gradle
+++ b/packages/canvas/src-native/canvas-android/canvas/publish.gradle
@@ -21,7 +21,7 @@ signing {
 
 group = "org.nativescript"
 archivesBaseName = "canvas"
-version = "0.9.18"
+version = "1.0.0-alpha.0"
 
 uploadArchives {
 	repositories {
diff --git a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLContext.kt b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLContext.kt
index 508c97956..77b075bd7 100644
--- a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLContext.kt
+++ b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLContext.kt
@@ -69,12 +69,12 @@ internal class GLContext {
 		if (reference != null) {
 			val canvasView = reference!!.get()
 			if (canvasView != null) {
-				queueEvent(Runnable {
+				queueEvent {
 					if (offscreenTexture != null) {
 						GLES20.glClearColor(0f, 0f, 0f, 0f)
 						GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT)
 						if (!swapBuffers(mEGLSurface)) {
-							Log.e("GLContext", "Cannot swap buffers!")
+							Log.e("JS", "GLContext: Cannot swap buffers!")
 						}
 						offscreenTexture!!.release()
 						offscreenTexture = null
@@ -116,7 +116,7 @@ internal class GLContext {
 						GLES20.glClearColor(0f, 0f, 0f, 0f)
 						GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT)
 						if (!swapBuffers(mEGLSurface)) {
-							Log.e("GLContext", "Cannot swap buffers!")
+							Log.e("JS", "GLContext: Cannot swap buffers!")
 						}
 						if (canvasView.nativeContext > 0) {
 							GLES20.glViewport(0, 0, width, height)
@@ -140,7 +140,7 @@ internal class GLContext {
 							swapBuffers(mEGLSurface)
 						}
 					}
-				})
+				}
 			}
 		}
 	}
@@ -152,13 +152,13 @@ internal class GLContext {
 				if (canvasView != null && canvasView.nativeContext != 0L && canvasView.pendingInvalidate) {
 					TNSCanvas.nativeFlush(canvasView.nativeContext)
 					if (!swapBuffers(mEGLSurface)) {
-						Log.e("GLContext", "Cannot swap buffers!")
+						Log.e("JS", "GLContext: Cannot swap buffers!")
 					}
 					canvasView.pendingInvalidate = false
 				} else {
 					// WebGL
 					if (!swapBuffers(mEGLSurface)) {
-						Log.e("GLContext", "Cannot swap buffers!")
+						Log.e("JS", "GLContext: Cannot swap buffers!")
 					}
 					if (canvasView != null) {
 						canvasView.pendingInvalidate = false
@@ -258,7 +258,7 @@ internal class GLContext {
 				mGLThread!!.interrupt()
 				mGLThread!!.join()
 			} catch (e: InterruptedException) {
-				Log.e("GLContext", "Can't interrupt GL thread.", e)
+				Log.e("JS", "GLContext: Can't interrupt GL thread.", e)
 			}
 			mGLThread = null
 		}
@@ -363,13 +363,13 @@ internal class GLContext {
 							EGL10.EGL_RENDERABLE_TYPE, value
 						)
 					) {
-						if (checkES3 && value[0] and EGL_OPENGL_ES3_BIT_KHR ===
+						if (checkES3 && value[0] and EGL_OPENGL_ES3_BIT_KHR ==
 							EGL_OPENGL_ES3_BIT_KHR
 						) {
 							if (highestEsVersion < 3) highestEsVersion = 3
-						} else if (value[0] and EGL_OPENGL_ES2_BIT === EGL_OPENGL_ES2_BIT) {
+						} else if (value[0] and EGL_OPENGL_ES2_BIT == EGL_OPENGL_ES2_BIT) {
 							if (highestEsVersion < 2) highestEsVersion = 2
-						} else if (value[0] and EGL_OPENGL_ES_BIT === EGL_OPENGL_ES_BIT) {
+						} else if (value[0] and EGL_OPENGL_ES_BIT == EGL_OPENGL_ES_BIT) {
 							if (highestEsVersion < 1) highestEsVersion = 1
 						}
 					} else {
@@ -383,7 +383,6 @@ internal class GLContext {
 				DID_CHECK_WEBGL_SUPPORT = true
 
 
-
 				if (view.glVersion > 2 && view.actualContextType == "webgl2" && highestEsVersion >= 3) {
 					type = EGLExt.EGL_OPENGL_ES3_BIT_KHR
 				}
@@ -503,7 +502,7 @@ internal class GLContext {
 			}
 			GLES20.glClear(bit)
 			if (!swapBuffers(mEGLSurface)) {
-				Log.e("GLContext", "Cannot swap buffers!")
+				Log.e("JS", "GLContext: Cannot swap buffers!")
 			}
 
 		}
@@ -556,12 +555,14 @@ internal class GLContext {
 					type = ref.contextType
 					makeEGLContextCurrent()
 					if (type == TNSCanvas.ContextType.CANVAS && ref.nativeContext == 0L) {
+						val width = view.width
+						val height = view.height
 						val frameBuffers = IntArray(1)
 						if (view.drawingBufferWidth == 0) {
-							view.drawingBufferWidth = view.width
+							view.drawingBufferWidth = width
 						}
 						if (view.drawingBufferHeight == 0) {
-							view.drawingBufferHeight = view.height
+							view.drawingBufferHeight = height
 						}
 						if (view.drawingBufferWidth == 0) {
 							view.drawingBufferWidth = 1
@@ -569,6 +570,8 @@ internal class GLContext {
 						if (view.drawingBufferHeight == 0) {
 							view.drawingBufferHeight = 1
 						}
+
+						Log.d("com.test", "${view.drawingBufferWidth} ${view.drawingBufferHeight}")
 						GLES20.glViewport(0, 0, view.drawingBufferWidth, view.drawingBufferHeight)
 						GLES20.glGetIntegerv(GLES20.GL_FRAMEBUFFER_BINDING, frameBuffers, 0)
 						var samples = 0
diff --git a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLView.kt b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLView.kt
index 0c1746b9f..66b145628 100644
--- a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLView.kt
+++ b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLView.kt
@@ -1,6 +1,7 @@
 package org.nativescript.canvas
 
 import android.content.Context
+import android.graphics.Matrix
 import android.graphics.SurfaceTexture
 import android.util.AttributeSet
 import android.util.Log
@@ -17,6 +18,7 @@ import java.util.concurrent.TimeUnit
 internal class GLView : TextureView, SurfaceTextureListener {
 	private var isCreated = false
 	private var isCreatedWithZeroSized = false
+
 	var gLContext: GLContext? = null
 		private set
 	private var mListener: TNSCanvas.Listener? = null
@@ -29,6 +31,23 @@ internal class GLView : TextureView, SurfaceTextureListener {
 		init()
 	}
 
+	private fun setScaling(){
+		val matrix = Matrix()
+		val density = resources.displayMetrics.density
+		if(ignorePixelScaling){
+			matrix.postScale(density, density)
+		}
+		setTransform(matrix)
+	}
+
+	var ignorePixelScaling: Boolean = false
+		set(value) {
+			field = value
+			setScaling()
+		}
+
+
+
 	fun resize(width: Int, height: Int) {
 		drawingBufferWidth = width
 		drawingBufferHeight = height
diff --git a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvas.kt b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvas.kt
index 0f6d8b690..a8bc9cc36 100644
--- a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvas.kt
+++ b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvas.kt
@@ -11,6 +11,7 @@ import android.opengl.GLES20
 import android.os.*
 import android.util.AttributeSet
 import android.util.Base64
+import android.util.Log
 import android.view.Choreographer
 import android.view.Choreographer.FrameCallback
 import android.view.ViewGroup
@@ -32,11 +33,17 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {
 	internal var nativeContext: Long = 0L
 	internal var surface: GLView? = null
 	internal var cpuView: CPUView? = null
-	internal var isHandleInvalidationManually = false
+	var isHandleInvalidationManually = false
 	internal var renderingContext2d: TNSCanvasRenderingContext? = null
 	internal var scale = 1f
 	internal var ctx: Context? = null
 
+	var ignorePixelScaling: Boolean = false
+		set(value) {
+			field = value
+			surface?.ignorePixelScaling = value
+		}
+
 	@JvmField
 	internal var pendingInvalidate = false
 	internal var contextType = ContextType.NONE
@@ -383,10 +390,18 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {
 			if (newSize == null || newSize!!.width == 0 && newSize!!.height == 0) {
 				newSize = Size(width, height)
 			}
-			val finalWidth = width
-			val finalHeight = height
-			surface!!.queueEvent(Runnable {
+			var finalWidth = width
+			var finalHeight = height
+			if (ignorePixelScaling) {
+				if (width != 1 || height != 1){
+					val density = resources.displayMetrics.density
+					finalWidth = (finalWidth / density).toInt()
+					finalHeight = (finalHeight / density).toInt()
+				}
+			}
+			surface!!.queueEvent {
 				if (nativeContext == 0L && finalWidth > 0 && finalHeight > 0) {
+					Log.d("com.test", "$finalWidth $finalHeight")
 					// GLES20.glClearColor(1F, 1F, 1F, 1F);
 					// GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
 					val frameBuffers = IntArray(1)
@@ -408,7 +423,7 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {
 						direction.toNative()
 					)
 				}
-			})
+			}
 		}
 	}
 
@@ -567,6 +582,30 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {
 	companion object {
 		var views: ConcurrentHashMap<*, *> = ConcurrentHashMap<Any?, Any?>()
 
+		@JvmStatic
+		fun layoutView(width: Int, height: Int, tnsCanvas: TNSCanvas) {
+			var rootParams = tnsCanvas.layoutParams
+
+			if (rootParams != null && width == rootParams.width && height == rootParams.height) {
+				return;
+			}
+
+			if (width != 0 && height != 0) {
+				if (rootParams == null) {
+					rootParams = LayoutParams(0, 0)
+				}
+				rootParams.width = width
+				rootParams.height = height
+
+				tnsCanvas.layoutParams = rootParams
+
+				val w = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY)
+				val h = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+				tnsCanvas.measure(w, h)
+				tnsCanvas.layout(0, 0, width, height)
+			}
+		}
+
 		@JvmStatic
 		external fun nativeInitContext(
 			width: Float,
diff --git a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSSVG.kt b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSSVG.kt
index b9bd990fd..a5349ae80 100644
--- a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSSVG.kt
+++ b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSSVG.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.Matrix
 import android.util.AttributeSet
-import android.util.Log
 import android.view.View
 import java.util.concurrent.Executors
 
@@ -21,6 +21,7 @@ class TNSSVG : View {
 	private val executor = Executors.newSingleThreadExecutor()
 	private var src: String = ""
 	private var srcPath: String = ""
+	private var mMatrix = Matrix()
 
 	constructor(context: Context) : super(context, null) {
 		init(context)
@@ -45,12 +46,57 @@ class TNSSVG : View {
 	}
 
 
+	var ignorePixelScaling: Boolean = false
+		set(value) {
+			field = value
+			if (value) {
+				val density = resources.displayMetrics.density
+				mMatrix.postScale(density, density)
+			} else {
+				mMatrix.reset()
+			}
+			if (width > 0 || height > 0) {
+				invalidate()
+			}
+		}
+
+	private fun resize(w: Int, h: Int) {
+		executor.execute {
+			val metrics = resources.displayMetrics
+			TNSCanvas.nativeResizeCustomSurface(
+				svgCanvas,
+				w.toFloat(),
+				h.toFloat(),
+				metrics.density,
+				true,
+				metrics.densityDpi,
+			)
+
+			if (srcPath.isNotEmpty() || src.isNotEmpty()) {
+				if (srcPath.isNotEmpty()) {
+					nativeDrawSVGFromPath(svgCanvas, srcPath)
+				} else {
+					nativeDrawSVG(svgCanvas, src)
+				}
+				bitmap?.let {
+					TNSCanvas.nativeCustomWithBitmapFlush(svgCanvas, it)
+					handler!!.post {
+						pendingInvalidate = false
+						invalidate()
+					}
+				}
+			}
+		}
+	}
+
+
 	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
 		super.onSizeChanged(w, h, oldw, oldh)
 		if (w != 0 && h != 0) {
 			val metrics = resources.displayMetrics
+
 			bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
-			Log.d("com.test", "bm ${Canvas(bitmap!!).maximumBitmapWidth} x ${Canvas(bitmap!!).maximumBitmapHeight}")
+
 			if (svgCanvas == 0L) {
 				executor.execute {
 					synchronized(lock) {
@@ -83,39 +129,14 @@ class TNSSVG : View {
 					}
 				}
 			} else {
-				executor.execute {
-					val metrics = resources.displayMetrics
-					TNSCanvas.nativeResizeCustomSurface(
-						svgCanvas,
-						w.toFloat(),
-						h.toFloat(),
-						metrics.density,
-						true,
-						metrics.densityDpi,
-					)
-
-					if (srcPath.isNotEmpty() || src.isNotEmpty()) {
-						if (srcPath.isNotEmpty()) {
-							nativeDrawSVGFromPath(svgCanvas, srcPath)
-						} else {
-							nativeDrawSVG(svgCanvas, src)
-						}
-						bitmap?.let {
-							TNSCanvas.nativeCustomWithBitmapFlush(svgCanvas, it)
-							handler!!.post {
-								pendingInvalidate = false
-								invalidate()
-							}
-						}
-					}
-				}
+				resize(w, h)
 			}
 		}
 	}
 
 	override fun onDraw(canvas: Canvas) {
 		bitmap?.let {
-			canvas.drawBitmap(it, 0f, 0f, null)
+			canvas.drawBitmap(it, mMatrix, null)
 		}
 	}
 
diff --git a/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 7bd817fce..919434a62 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
-   <FileRef
-      location = "group:../../CanvasNative/CanvasNative.xcodeproj">
-   </FileRef>
    <FileRef
       location = "self:">
    </FileRef>
diff --git a/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate
index 894112daa..bfeb6491c 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate and b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/xcuserdata/triniwiz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/xcuserdata/triniwiz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 000000000..36e3a5c9a
--- /dev/null
+++ b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo.xcodeproj/xcuserdata/triniwiz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "078DFB96-02A2-4CB3-9B19-5ABCA5A1E5EC"
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo/ViewController.swift b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo/ViewController.swift
index 13eec0135..8bf0420d3 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo/ViewController.swift
+++ b/packages/canvas/src-native/canvas-ios/CanvasDemo/CanvasDemo/ViewController.swift
@@ -18,13 +18,17 @@ class ViewController: UIViewController, TNSCanvasListener {
         scale = Int(UIScreen.main.scale)
         // Do any additional setup after loading the view.
         canvas1.setListener(self)
+        
+        canvas1?.ignorePixelScaling = true
+        canvas1.backgroundColor = .white
        // canvas1.isHidden = true
         //let matrix = Canvas.createSVGMatrix()
         //matrix.a = 3.0
-        //svg = TNSSVG(frame: view.bounds)
-        //canvas1.addSubview(svg!)
-        //svg?.bringSubviewToFront(canvas1)
-        //svg!.backgroundColor = .white
+        svg = TNSSVG(frame: view.bounds)
+        canvas1.addSubview(svg!)
+        svg?.bringSubviewToFront(canvas1)
+        svg?.ignorePixelScaling = true
+       // svg!.backgroundColor = .white
 //        svg?.src = """
 //<svg width="660" height="220" style="outline: 1px solid red">
 // <defs>
@@ -83,7 +87,7 @@ class ViewController: UIViewController, TNSCanvasListener {
                     </svg>
                     """*/
         
-//      svg.src = """
+//      svg?.src = """
 // <svg viewBox="0 0 230 100" xmlns="http://www.w3.org/2000/svg">
 //  <defs>
 //    <pattern fill="red" id="star" viewBox="0,0,10,10" width="10%" height="10%">
@@ -94,26 +98,21 @@ class ViewController: UIViewController, TNSCanvasListener {
 //  <circle cx="180" cy="50" r="40" fill="none" stroke-width="20" stroke="url(#star)"/>
 // </svg>
 // """
+        
+        
+//        svg?.src = """
+//<svg  xmlns="http://www.w3.org/2000/svg">
+//  <rect width="1000" height="1000">
+//    <animate attributeName="rx" values="0;5;0" dur="10s" repeatCount="indefinite" />
+//  </rect>
+//</svg>
+//""".trimmingCharacters(in: .whitespacesAndNewlines)
+        
+//        svg?.src = """
+//                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0,0,975,610" stroke-linejoin="round" stroke-linecap="round"><circle cx="2" cy="2" r="40"/><circle cx="140" cy="70" r="40"/><circle cx="300" cy="100" r="40"/></svg>
+//                    """.trimmingCharacters(in: .whitespacesAndNewlines)
 
-//        svg.src = """
-//                    <svg viewBox="0 0 80 20" xmlns="http://www.w3.org/2000/svg"
-//                         xmlns:xlink="http://www.w3.org/1999/xlink">
-//                      <!-- Our symbol in its own coordinate system -->
-//                      <symbol id="myDot" width="10" height="10" viewBox="0 0 2 2">
-//                        <circle cx="1" cy="1" r="1" />
-//                      </symbol>
-//
-//                       <!-- A grid to materialize our symbol positioning -->
-//                      <path transform="translate(10)" d="M0,10 h80 M10,0 v20 M25,0 v20 M40,0 v20 M55,0 v20 M70,0 v20" fill="none" stroke="pink" />
-//
-//                      <!-- All instances of our symbol -->
-//                      <use xlink:href="#myDot" x="5"  y="50" style="opacity:1.0" />
-//                      <use xlink:href="#myDot" x="20" y="50" />
-//                      <use xlink:href="#myDot" x="35" y="50"  />
-//                      <use xlink:href="#myDot" x="50" y="50" />
-//                      <use xlink:href="#myDot" x="65" y="50" style="opacity:0.2" />
-//                    </svg>
-//                    """
+    
         
         
         // https://upload.wikimedia.org/wikipedia/commons/4/4c/The_Hague%2C_Netherlands%2C_the_old_city_center.svg
@@ -148,19 +147,34 @@ class ViewController: UIViewController, TNSCanvasListener {
 
         // https://upload.wikimedia.org/wikipedia/commons/1/1c/KINTETSU23000_20140424A.svg
         
-//        do{
-//            let svg_file = NSURL(fileURLWithPath: NSTemporaryDirectory() + UUID().uuidString + "_svg_file.svg")
-//            let svg_data = try Data(contentsOf: URL(string: "https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/tiger.svg")!)
-//            try svg_data.write(to: svg_file.absoluteURL!, options: .atomicWrite)
-//            //let svgContents = String(data: svg_data, encoding: .utf8)
-//            svg?.srcPath = svg_file.path
-//            //svg?.src = svgContents
-//
-//        }catch {
-//            print(error)
-//        }
+        // https://upload.wikimedia.org/wikipedia/commons/7/7e/Cranium_color.svg
         
+        // https://upload.wikimedia.org/wikipedia/commons/1/1c/KINTETSU23000_20140424A.svg
         
+        // https://upload.wikimedia.org/wikipedia/commons/2/23/Koppen-Geiger_Map_A_present.svg
+        
+        // https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/gallardo.svg
+        
+        DispatchQueue.global(qos: .background).async {
+            do{
+                let start = CACurrentMediaTime()
+                print("Started", start)
+                let svg_file = NSURL(fileURLWithPath: NSTemporaryDirectory() + UUID().uuidString + "_svg_file.svg")
+                let svg_data = try Data(contentsOf: URL(string: "https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/tiger.svg")!)
+                try svg_data.write(to: svg_file.absoluteURL!, options: .atomicWrite)
+                let mid = CACurrentMediaTime()
+                print("Finished Downloading", mid , mid - start)
+                //let svgContents = String(data: svg_data, encoding: .utf8)
+                self.svg?.srcPath = svg_file.path
+                let end = CACurrentMediaTime()
+                print("Finished Setting path", end , end - start)
+                //svg?.src = svgContents
+
+            }catch {
+                print(error)
+            }
+
+        }
     
     }
     
@@ -288,20 +302,20 @@ class ViewController: UIViewController, TNSCanvasListener {
     
     func drawAll() {
         
-        svg?.src  = """
-                <svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink">
-                <defs>
-                <radialGradient id="myGradient">
-                <stop offset="10%" stop-color="gold" />
-                <stop offset="95%" stop-color="red" />
-                </radialGradient>
-                </defs>
-
-                <!-- using my radial gradient -->
-                <circle transform="scale(10 10)" cx="5" cy="5" r="4" />
-                </svg>
-                """
+//        svg?.src  = """
+//                <svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg"
+//                xmlns:xlink="http://www.w3.org/1999/xlink">
+//                <defs>
+//                <radialGradient id="myGradient">
+//                <stop offset="10%" stop-color="gold" />
+//                <stop offset="95%" stop-color="red" />
+//                </radialGradient>
+//                </defs>
+//
+//                <!-- using my radial gradient -->
+//                <circle transform="scale(10 10)" cx="5" cy="5" r="4" />
+//                </svg>
+//                """
         
         
 //                do{
@@ -342,7 +356,7 @@ class ViewController: UIViewController, TNSCanvasListener {
     
         
         
-        //  let gl = self.canvas1?.getContext("webgl2")  as! TNSWebGLRenderingContext
+          let gl = self.canvas1?.getContext("webgl2")  as! TNSWebGLRenderingContext
         //canvas1?.handleInvalidationManually = true
         
         //        let q = DispatchQueue(label: "bg", qos: .background, attributes: .concurrent, autoreleaseFrequency: .inherit, target: nil)
@@ -353,10 +367,10 @@ class ViewController: UIViewController, TNSCanvasListener {
         
         
         
-        //drawRotatingCube(gl: gl)
+       // drawRotatingCube(gl: gl)
         
         //drawRotatingCube(gl: gl)
-        // drawTextures(canvas: canvas1)
+         drawTextures(canvas: canvas1)
         
         
         // self.drawGL(canvas: self.canvas1!) // sun
@@ -378,11 +392,26 @@ class ViewController: UIViewController, TNSCanvasListener {
          
          }
          */
-        let scale = Float(UIScreen.main.scale)
+        //canvas1?.useDeviceScale = true
+        _ = Float(UIScreen.main.scale)
+       // let ctx = canvas1?.getContext("2d") as! TNSCanvasRenderingContext2D
         
-        let ctx = canvas1?.getContext("2d") as! TNSCanvasRenderingContext2D
         
-        drawImageFromUrl(ctx: ctx, url: "https://source.unsplash.com/random")
+//
+//// Moved square
+//ctx.translate(110, 30);
+//        ctx.fillStyle = TNSColorStyle.TNSColor("red");
+//ctx.fillRect(0, 0, 80, 80);
+//
+//// Reset current transformation matrix to the identity matrix
+//ctx.setTransform(1, 0, 0, 1, 0, 0);
+//
+//// Unmoved square
+//        ctx.fillStyle = TNSColorStyle.TNSColor("gray");
+//ctx.fillRect(0, 0, 80, 80);
+
+        
+        //drawImageFromUrl(ctx: ctx, url: "https://source.unsplash.com/random")
         // Create circular clipping region
         /*ctx.beginPath()
          ctx.arc(Float(100 * scale), Float(75 * scale), Float(50 * scale), 0, PI * 2)
@@ -444,7 +473,7 @@ class ViewController: UIViewController, TNSCanvasListener {
         // doSolarAnimation(ctx: ctx)
         //drawFace(ctx: ctx)
         // fontExample(ctx: ctx)
-        //textBaseLine(ctx: ctx)
+       // textBaseLine(ctx: ctx)
         //arcToAnimationExample(ctx: ctx)
         //  saveRestoreExample(ctx: ctx)
         //ballExample(ctx: ctx)
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index e76482997..919434a62 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
-   <FileRef
-      location = "group:../CanvasDemo/CanvasDemo.xcodeproj">
-   </FileRef>
    <FileRef
       location = "self:">
    </FileRef>
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate b/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate
index b39a70863..b8da29072 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate and b/packages/canvas/src-native/canvas-ios/CanvasNative.xcodeproj/project.xcworkspace/xcuserdata/triniwiz.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.framework.dSYM.zip b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.framework.dSYM.zip
index b9ac80ca4..8e2bad784 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.framework.dSYM.zip and b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.framework.dSYM.zip differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/Info.plist b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/Info.plist
index ba6bca61e..1bb6313a5 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/Info.plist
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/Info.plist
@@ -6,29 +6,29 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.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>LibraryIdentifier</key>
-			<string>ios-x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>x86_64</string>
+				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative
index 16905d323..bedc7b049 100755
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative and b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative-Swift.h b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative-Swift.h
index 081b0a8cd..bc2cbf3a6 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative-Swift.h
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative-Swift.h
@@ -214,10 +214,12 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # pragma pop_macro("any")
 #endif
 
+@class NSNumber;
 @class NSCoder;
 
 SWIFT_CLASS_NAMED("CanvasCPUView")
 @interface CanvasCPUView : UIView
+@property (nonatomic) BOOL ignorePixelScaling;
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 - (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
@@ -256,7 +258,6 @@ SWIFT_PROTOCOL("_TtP12CanvasNative17ICanvasColorStyle_")
 - (enum CanvasColorStyleType)getStyleType SWIFT_WARN_UNUSED_RESULT;
 @end
 
-@class NSNumber;
 @class NSString;
 
 SWIFT_CLASS_NAMED("TNSAnimationFrame")
@@ -275,6 +276,7 @@ SWIFT_CLASS_NAMED("TNSCanvas")
 @interface TNSCanvas : UIView
 + (NSMapTable<NSString *, TNSCanvas *> * _Nonnull)getViews SWIFT_WARN_UNUSED_RESULT;
 - (void * _Nullable)getViewPtr SWIFT_WARN_UNUSED_RESULT;
+@property (nonatomic) BOOL ignorePixelScaling;
 + (TNSDOMMatrix * _Nonnull)createSVGMatrix SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic) BOOL handleInvalidationManually;
 - (void)didDraw;
@@ -706,6 +708,7 @@ SWIFT_CLASS_NAMED("TNSRender")
 
 SWIFT_CLASS_NAMED("TNSSVG")
 @interface TNSSVG : UIView
+@property (nonatomic) BOOL ignorePixelScaling;
 @property (nonatomic, copy) NSString * _Nullable src;
 @property (nonatomic, copy) NSString * _Nullable srcPath;
 - (void)layoutSubviews;
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Info.plist b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Info.plist
index a6ce1ad31..0c4cc28a7 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Info.plist and b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Info.plist differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftinterface b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftinterface
index 11b4c0eb0..527c90ea7 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftinterface
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftinterface
@@ -232,6 +232,10 @@ import UIKit
 @_hasMissingDesignatedInitializers @objcMembers @objc(TNSCanvas) public class TNSCanvas : UIKit.UIView, CanvasNative.RenderListener {
   @objc public static func getViews() -> Foundation.NSMapTable<Foundation.NSString, CanvasNative.TNSCanvas>
   @objc public func getViewPtr() -> Swift.UnsafeMutableRawPointer?
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public static func createSVGMatrix() -> CanvasNative.TNSDOMMatrix
   @objc public var handleInvalidationManually: Swift.Bool {
     @objc get
@@ -1385,6 +1389,10 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(TNSSVG) public class TNSSVG : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public var src: Swift.String? {
     @objc get
     @objc set
@@ -2784,6 +2792,7 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(CanvasCPUView) public class CanvasCPUView : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool
   @objc dynamic public init()
   @objc override dynamic public init(frame: CoreGraphics.CGRect)
   @objc override dynamic public func draw(_ rect: CoreGraphics.CGRect)
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64.swiftinterface b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64.swiftinterface
index 11b4c0eb0..527c90ea7 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64.swiftinterface
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64.swiftinterface
@@ -232,6 +232,10 @@ import UIKit
 @_hasMissingDesignatedInitializers @objcMembers @objc(TNSCanvas) public class TNSCanvas : UIKit.UIView, CanvasNative.RenderListener {
   @objc public static func getViews() -> Foundation.NSMapTable<Foundation.NSString, CanvasNative.TNSCanvas>
   @objc public func getViewPtr() -> Swift.UnsafeMutableRawPointer?
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public static func createSVGMatrix() -> CanvasNative.TNSDOMMatrix
   @objc public var handleInvalidationManually: Swift.Bool {
     @objc get
@@ -1385,6 +1389,10 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(TNSSVG) public class TNSSVG : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public var src: Swift.String? {
     @objc get
     @objc set
@@ -2784,6 +2792,7 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(CanvasCPUView) public class CanvasCPUView : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool
   @objc dynamic public init()
   @objc override dynamic public init(frame: CoreGraphics.CGRect)
   @objc override dynamic public func draw(_ rect: CoreGraphics.CGRect)
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/TNSCanvas.nib b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/TNSCanvas.nib
index b4190bb0c..d3674eaab 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/TNSCanvas.nib and b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/TNSCanvas.nib differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/CanvasNative b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/CanvasNative
index 4bcabda09..208bb7930 100755
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/CanvasNative and b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/CanvasNative differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Headers/CanvasNative-Swift.h b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Headers/CanvasNative-Swift.h
index 081b0a8cd..bc2cbf3a6 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Headers/CanvasNative-Swift.h
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Headers/CanvasNative-Swift.h
@@ -214,10 +214,12 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # pragma pop_macro("any")
 #endif
 
+@class NSNumber;
 @class NSCoder;
 
 SWIFT_CLASS_NAMED("CanvasCPUView")
 @interface CanvasCPUView : UIView
+@property (nonatomic) BOOL ignorePixelScaling;
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 - (nonnull instancetype)initWithFrame:(CGRect)frame OBJC_DESIGNATED_INITIALIZER;
 - (nullable instancetype)initWithCoder:(NSCoder * _Nonnull)coder SWIFT_UNAVAILABLE;
@@ -256,7 +258,6 @@ SWIFT_PROTOCOL("_TtP12CanvasNative17ICanvasColorStyle_")
 - (enum CanvasColorStyleType)getStyleType SWIFT_WARN_UNUSED_RESULT;
 @end
 
-@class NSNumber;
 @class NSString;
 
 SWIFT_CLASS_NAMED("TNSAnimationFrame")
@@ -275,6 +276,7 @@ SWIFT_CLASS_NAMED("TNSCanvas")
 @interface TNSCanvas : UIView
 + (NSMapTable<NSString *, TNSCanvas *> * _Nonnull)getViews SWIFT_WARN_UNUSED_RESULT;
 - (void * _Nullable)getViewPtr SWIFT_WARN_UNUSED_RESULT;
+@property (nonatomic) BOOL ignorePixelScaling;
 + (TNSDOMMatrix * _Nonnull)createSVGMatrix SWIFT_WARN_UNUSED_RESULT;
 @property (nonatomic) BOOL handleInvalidationManually;
 - (void)didDraw;
@@ -706,6 +708,7 @@ SWIFT_CLASS_NAMED("TNSRender")
 
 SWIFT_CLASS_NAMED("TNSSVG")
 @interface TNSSVG : UIView
+@property (nonatomic) BOOL ignorePixelScaling;
 @property (nonatomic, copy) NSString * _Nullable src;
 @property (nonatomic, copy) NSString * _Nullable srcPath;
 - (void)layoutSubviews;
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Info.plist b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Info.plist
index 5efb43aab..4413694eb 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Info.plist and b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Info.plist differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
index 4f76f2a38..38038206a 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
@@ -232,6 +232,10 @@ import UIKit
 @_hasMissingDesignatedInitializers @objcMembers @objc(TNSCanvas) public class TNSCanvas : UIKit.UIView, CanvasNative.RenderListener {
   @objc public static func getViews() -> Foundation.NSMapTable<Foundation.NSString, CanvasNative.TNSCanvas>
   @objc public func getViewPtr() -> Swift.UnsafeMutableRawPointer?
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public static func createSVGMatrix() -> CanvasNative.TNSDOMMatrix
   @objc public var handleInvalidationManually: Swift.Bool {
     @objc get
@@ -1385,6 +1389,10 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(TNSSVG) public class TNSSVG : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public var src: Swift.String? {
     @objc get
     @objc set
@@ -2784,6 +2792,7 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(CanvasCPUView) public class CanvasCPUView : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool
   @objc dynamic public init()
   @objc override dynamic public init(frame: CoreGraphics.CGRect)
   @objc override dynamic public func draw(_ rect: CoreGraphics.CGRect)
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64.swiftinterface b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64.swiftinterface
index 4f76f2a38..38038206a 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64.swiftinterface
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64.swiftinterface
@@ -232,6 +232,10 @@ import UIKit
 @_hasMissingDesignatedInitializers @objcMembers @objc(TNSCanvas) public class TNSCanvas : UIKit.UIView, CanvasNative.RenderListener {
   @objc public static func getViews() -> Foundation.NSMapTable<Foundation.NSString, CanvasNative.TNSCanvas>
   @objc public func getViewPtr() -> Swift.UnsafeMutableRawPointer?
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public static func createSVGMatrix() -> CanvasNative.TNSDOMMatrix
   @objc public var handleInvalidationManually: Swift.Bool {
     @objc get
@@ -1385,6 +1389,10 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(TNSSVG) public class TNSSVG : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool {
+    @objc get
+    @objc set
+  }
   @objc public var src: Swift.String? {
     @objc get
     @objc set
@@ -2784,6 +2792,7 @@ extension RangeReplaceableCollection {
   @objc deinit
 }
 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objcMembers @objc(CanvasCPUView) public class CanvasCPUView : UIKit.UIView {
+  @objc public var ignorePixelScaling: Swift.Bool
   @objc dynamic public init()
   @objc override dynamic public init(frame: CoreGraphics.CGRect)
   @objc override dynamic public func draw(_ rect: CoreGraphics.CGRect)
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/TNSCanvas.nib b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/TNSCanvas.nib
index cb7b7eda8..41342e84b 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/TNSCanvas.nib and b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/TNSCanvas.nib differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
index 8cf052991..bd0b51140 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework/ios-x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/CanvasNative-Swift.h</key>
 		<data>
-		1dkiWs0QDxsi8m6ortDxoKutFmo=
+		Vfi80A49HbUPjjW12mLmvJGPin8=
 		</data>
 		<key>Headers/CanvasNative.h</key>
 		<data>
@@ -22,7 +22,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		N8r0F21GNBjXxMjY54Le7Yyxtvg=
+		lK6K6YPsCRqHnIqQjbyozbEyXb4=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
@@ -30,11 +30,11 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		TCtsi+WZGu+12LisWXMLb9PoYDM=
+		hc4qfiCB9wz/GJl2+UZy3rlGM28=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		B/4eE1LYSqbepISMQp7MIbmeybY=
+		uHH5QN7d4aG61xBWIYZGjmPJi2M=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftdoc</key>
 		<data>
@@ -42,11 +42,11 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftinterface</key>
 		<data>
-		TCtsi+WZGu+12LisWXMLb9PoYDM=
+		hc4qfiCB9wz/GJl2+UZy3rlGM28=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftmodule</key>
 		<data>
-		B/4eE1LYSqbepISMQp7MIbmeybY=
+		uHH5QN7d4aG61xBWIYZGjmPJi2M=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -54,7 +54,7 @@
 		</data>
 		<key>TNSCanvas.nib</key>
 		<data>
-		z97JATG8kBIGiAWhfv0YSt2mq1Q=
+		DMvJSWwxHlYf6457kv5J8Uj9x5U=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -63,11 +63,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			1dkiWs0QDxsi8m6ortDxoKutFmo=
+			Vfi80A49HbUPjjW12mLmvJGPin8=
 			</data>
 			<key>hash2</key>
 			<data>
-			K96g+6owxI0MOq6+VzWATpIjqPBu0ffMSZ8aL4Ck5TI=
+			BFzRRRD8P4707tRN7IQXqG4imU1NyvZ7773lj6FFirk=
 			</data>
 		</dict>
 		<key>Headers/CanvasNative.h</key>
@@ -118,22 +118,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			TCtsi+WZGu+12LisWXMLb9PoYDM=
+			hc4qfiCB9wz/GJl2+UZy3rlGM28=
 			</data>
 			<key>hash2</key>
 			<data>
-			3szAsw3X2cECXVxaX2Z014FkqZNk2ByDAtpab8R0wVo=
+			fDEs4C0BdU34lwm0H+M8RDQQj9UQEvNAb4a7QsDmf/A=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			B/4eE1LYSqbepISMQp7MIbmeybY=
+			uHH5QN7d4aG61xBWIYZGjmPJi2M=
 			</data>
 			<key>hash2</key>
 			<data>
-			ovvHZqs7h9uj0jqTzZVEgsvOZhtYNtOsDXZR/1Zjm+8=
+			HLeQCBn/XLtCZHvRgD8jvF5JMrpTNCyl5jVwzD74k20=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftdoc</key>
@@ -151,22 +151,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			TCtsi+WZGu+12LisWXMLb9PoYDM=
+			hc4qfiCB9wz/GJl2+UZy3rlGM28=
 			</data>
 			<key>hash2</key>
 			<data>
-			3szAsw3X2cECXVxaX2Z014FkqZNk2ByDAtpab8R0wVo=
+			fDEs4C0BdU34lwm0H+M8RDQQj9UQEvNAb4a7QsDmf/A=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftmodule</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			B/4eE1LYSqbepISMQp7MIbmeybY=
+			uHH5QN7d4aG61xBWIYZGjmPJi2M=
 			</data>
 			<key>hash2</key>
 			<data>
-			ovvHZqs7h9uj0jqTzZVEgsvOZhtYNtOsDXZR/1Zjm+8=
+			HLeQCBn/XLtCZHvRgD8jvF5JMrpTNCyl5jVwzD74k20=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
@@ -184,11 +184,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			z97JATG8kBIGiAWhfv0YSt2mq1Q=
+			DMvJSWwxHlYf6457kv5J8Uj9x5U=
 			</data>
 			<key>hash2</key>
 			<data>
-			R3Ja6WtayqHs75usMDR72H6vYkflcWi/ewi/0dtpxzE=
+			tLfsdUBgK/xW/T3dIo08f8NelyOz6V1izMuUwDq/9F0=
 			</data>
 		</dict>
 	</dict>
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Source/GLRenderer.swift b/packages/canvas/src-native/canvas-ios/CanvasNative/Source/GLRenderer.swift
index 7376110a5..28a6574b3 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Source/GLRenderer.swift
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Source/GLRenderer.swift
@@ -40,6 +40,7 @@ public class CanvasGLKView: GLKView {
 public class CanvasCPUView: UIView {
     var isDirty: Bool = false
     weak var renderer: GLRenderer?
+    public var ignorePixelScaling = false
     public init() {
         super.init(frame: .zero)
     }
@@ -53,13 +54,19 @@ public class CanvasCPUView: UIView {
         contentMode = .redraw
     }
     
+    func deviceScale() -> Float32 {
+        if !(renderer?.canvasView?.ignorePixelScaling ?? false)  {
+            return Float32(UIScreen.main.nativeScale)
+        }
+        return 1
+    }
+    
     
     public override func draw(_ rect: CGRect) {
         if let renderer = renderer {
             if(renderer.context > 0){
-                let scale = Float(UIScreen.main.nativeScale)
-                let width = Int(Float(frame.size.width) * scale)
-                let height = Int(Float(frame.size.height) * scale)
+                let width = Int(Float(frame.size.width) * deviceScale())
+                let height = Int(Float(frame.size.height) * deviceScale())
                 let size = width * height * 4
                 let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: size)
                 let colorSpace = CGColorSpaceCreateDeviceRGB()
@@ -154,11 +161,18 @@ public class GLRenderer: NSObject, GLKViewDelegate {
     
     var glkView: CanvasGLKView
     var cpuView: CanvasCPUView
-    var scale: Float
     var didExit: Bool = false
     var glContext: EAGLContext
     var currentOrientation: UIDeviceOrientation
     var cachedDirection: String = "ltr"
+    
+    func deviceScale() -> Float32 {
+        if !(canvasView?.ignorePixelScaling ?? false) {
+            return Float32(UIScreen.main.nativeScale)
+        }
+        return 1
+    }
+    
     func initAttributes(){
         self.isOpaque = !self.canvasView!.contextAlpha
         if(!useCpu){
@@ -214,6 +228,16 @@ public class GLRenderer: NSObject, GLKViewDelegate {
         }
     }
     
+    var forceResize = false
+    func handlePixelScale(){
+        forceResize = true
+        if(!useCpu){
+            glkView.contentScaleFactor = CGFloat(deviceScale())
+        }else {
+            cpuView.contentScaleFactor = CGFloat(deviceScale())
+        }
+        resize()
+    }
     
     private var useCpu: Bool
     public init(useCpu: Bool) {
@@ -223,7 +247,6 @@ public class GLRenderer: NSObject, GLKViewDelegate {
         displayRenderbuffer = GLuint()
         depthRenderbuffer = GLuint()
         cpuView = CanvasCPUView()
-        scale = Float(UIScreen.main.nativeScale)
         currentOrientation = UIDevice.current.orientation
         var glContext = EAGLContext(api: .openGLES3)
         if glContext == nil {
@@ -236,7 +259,6 @@ public class GLRenderer: NSObject, GLKViewDelegate {
             //self.context.isMultiThreaded = true
             // glkView.layer.masksToBounds = true
             glkView.context = glContext!
-            glkView.contentScaleFactor = CGFloat(scale)
             glkView.layer.isOpaque = false
             glkView.delegate = self
             // glkView.contentMode = .bottomLeft
@@ -311,14 +333,14 @@ public class GLRenderer: NSObject, GLKViewDelegate {
         let _ = ensureIsContextIsCurrent()
         if(contextType == .twoD || contextType == .webGL){
             if(useCpu){
-                let width = Float(cpuView.frame.size.width) * scale
-                let height = Float(cpuView.frame.size.height) * scale
-                if(width != 0 && height != 0){
-                    context_resize_custom_surface(context,width, height, scale, true, 0)
+                let width = Float(cpuView.frame.size.width) * deviceScale()
+                let height = Float(cpuView.frame.size.height) * deviceScale()
+                if((width != 0 && height != 0) || forceResize){
+                    context_resize_custom_surface(context,width, height, deviceScale(), true, 0)
                     cpuView.setNeedsDisplay()
                 }
             } else {
-                if(glkView.drawableWidth != Int(Float(glkView.frame.size.width) * scale) && glkView.drawableHeight != Int(Float(glkView.frame.size.height) * scale)){
+                if(forceResize || (glkView.drawableWidth != Int(Float(glkView.frame.size.width) * deviceScale()) && glkView.drawableHeight != Int(Float(glkView.frame.size.height) * deviceScale()))){
                     glkView.deleteDrawable()
                     glkView.bindDrawable()
                     var binding = GLint(0)
@@ -341,8 +363,9 @@ public class GLRenderer: NSObject, GLKViewDelegate {
                         glClearStencil(0)
                         glClearDepthf(1)
                         glClear(GLbitfield(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT))
+                        print("buffer dim", drawingBufferWidth, drawingBufferHeight)
                         glViewport(0, 0, GLsizei(drawingBufferWidth), GLsizei(drawingBufferHeight))
-                        context_resize_surface(context,Float32(drawingBufferWidth), Float32(drawingBufferHeight),scale, binding, 4,canvasView?.contextAlpha ?? true, 100.0)
+                        context_resize_surface(context,Float32(drawingBufferWidth), Float32(drawingBufferHeight),deviceScale(), binding, 4,canvasView?.contextAlpha ?? true, 100.0)
                     }
                     glkView.display()
                     
@@ -358,6 +381,9 @@ public class GLRenderer: NSObject, GLKViewDelegate {
                 }
             }
         }
+        if forceResize {
+            forceResize = false
+        }
     }
     
     public func setup() {
@@ -365,7 +391,7 @@ public class GLRenderer: NSObject, GLKViewDelegate {
         if((contextType == .twoD || contextType == .webGL)){
             if(useCpu){
                 if(cpuView.frame.size.width == 0 && cpuView.frame.size.height == 0){
-                    cpuView.frame = CGRect(x: 0, y: 0, width: CGFloat(1/scale), height: CGFloat(1/scale))
+                    cpuView.frame = CGRect(x: 0, y: 0, width: CGFloat(1/deviceScale()), height: CGFloat(1/deviceScale()))
                 }
                 
                 if(context == 0 && contextType == .twoD){
@@ -382,15 +408,14 @@ public class GLRenderer: NSObject, GLKViewDelegate {
                         }
                         
                     }
-                    let width = Float(cpuView.frame.size.width) * scale
-                    let height = Float(cpuView.frame.size.height) * scale
-                    context = context_init_context_with_custom_surface(width, height,scale, canvasView?.contextAlpha ?? true,0,100.0, TextDirection(rawValue: direction.rawValue))
-                    
+                    let width = Float(cpuView.frame.size.width) * deviceScale()
+                    let height = Float(cpuView.frame.size.height) * deviceScale()
+                    context = context_init_context_with_custom_surface(width, height,deviceScale(), canvasView?.contextAlpha ?? true,0,100.0, TextDirection(rawValue: direction.rawValue))
                 }
                 
             }else {
                 if(glkView.frame.size.width == 0 && glkView.frame.size.height == 0){
-                    glkView.frame = CGRect(x: 0, y: 0, width: CGFloat(1/scale), height: CGFloat(1/scale))
+                    glkView.frame = CGRect(x: 0, y: 0, width: CGFloat(1/deviceScale()), height: CGFloat(1/deviceScale()))
                 }
                 glkView.bindDrawable()
                 var binding = GLint()
@@ -426,7 +451,7 @@ public class GLRenderer: NSObject, GLKViewDelegate {
                         
                     }
                     glViewport(0, 0, GLsizei(drawingBufferWidth), GLsizei(drawingBufferHeight))
-                    context = context_init_context(Float32(drawingBufferWidth), Float32(drawingBufferHeight),scale, Int32(displayFramebuffer), 4, canvasView?.contextAlpha ?? true,0,100.0, TextDirection(rawValue: direction.rawValue))
+                    context = context_init_context(Float32(drawingBufferWidth), Float32(drawingBufferHeight),deviceScale(), Int32(displayFramebuffer), 4, canvasView?.contextAlpha ?? true,0,100.0, TextDirection(rawValue: direction.rawValue))
                     
                 }
                 
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSCanvas.swift b/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSCanvas.swift
index 16ae786eb..092e000dc 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSCanvas.swift
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSCanvas.swift
@@ -29,7 +29,11 @@ public class TNSCanvas: UIView, RenderListener {
         return ptr
     }
     
-    
+    public var ignorePixelScaling = false {
+        didSet {
+            renderer.handlePixelScale()
+        }
+    }
     var contextAlpha = true;
     var contextAntialias = true;
     var contextDepth = true;
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSSVG.swift b/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSSVG.swift
index 04397f00e..2dbf396c5 100644
--- a/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSSVG.swift
+++ b/packages/canvas/src-native/canvas-ios/CanvasNative/Source/TNSSVG.swift
@@ -4,7 +4,6 @@
 //
 //  Created by Osei Fortune on 27/01/2021.
 //
-
 import Foundation
 import UIKit
 @objcMembers
@@ -14,9 +13,16 @@ public class TNSSVG: UIView {
     var data_size: CGSize = .zero
     var buf_size: UInt = 0
     var context: Int64 = 0
+    var didInitDrawing = false
+    var forceResize = false
+    public var ignorePixelScaling = false {
+        didSet {
+            forceResize = true
+        }
+    }
     public var src: String? = nil {
         didSet {
-           doDraw()
+            doDraw()
         }
     }
     
@@ -26,6 +32,13 @@ public class TNSSVG: UIView {
         }
     }
     
+    func deviceScale() -> Float32 {
+        if !ignorePixelScaling  {
+            return Float32(UIScreen.main.nativeScale)
+        }
+        return 1
+    }
+    
     func doDraw(){
         if self.srcPath == nil && self.src == nil {return}
         queue.async { [weak self] in
@@ -33,12 +46,13 @@ public class TNSSVG: UIView {
             if(self.context > 0){
                 if(self.srcPath != nil){
                     guard let srcPath = self.srcPath else{return}
-                        let source = srcPath as NSString
+                    let source = srcPath as NSString
                     svg_draw_from_path(self.context, source.utf8String)
                     guard let buf = self.data?.assumingMemoryBound(to: UInt8.self) else {return}
-                    context_custom_with_buffer_flush(self.context, buf, self.buf_size, Float(self.data_size.width * UIScreen.main.nativeScale), Float(self.data_size.height * UIScreen.main.nativeScale))
+                    context_custom_with_buffer_flush(self.context, buf, self.buf_size, Float(self.data_size.width), Float(self.data_size.height))
                     
                     DispatchQueue.main.async {
+                        self.didInitDrawing = true
                         self.setNeedsDisplay()
                     }
                     return
@@ -48,9 +62,10 @@ public class TNSSVG: UIView {
                 let source = src as NSString
                 svg_draw_from_string(self.context, source.utf8String)
                 guard let buf = self.data?.assumingMemoryBound(to: UInt8.self) else {return}
-                context_custom_with_buffer_flush(self.context, buf, self.buf_size, Float(self.data_size.width * UIScreen.main.nativeScale), Float(self.data_size.height * UIScreen.main.nativeScale))
+                context_custom_with_buffer_flush(self.context, buf, self.buf_size, Float(self.data_size.width), Float(self.data_size.height))
                 
                 DispatchQueue.main.async {
+                    self.didInitDrawing = true
                     self.setNeedsDisplay()
                 }
             }
@@ -58,11 +73,11 @@ public class TNSSVG: UIView {
     }
     
 
-    public override func layoutSubviews() {
+    func update(){
         let size = layer.frame.size
-        let width = size.width * UIScreen.main.nativeScale
-        let height = size.height * UIScreen.main.nativeScale
-        if !size.equalTo(data_size){
+        let width = Float(size.width) * deviceScale()
+        let height = Float(size.height) * deviceScale()
+        if !size.equalTo(data_size) || forceResize {
             data?.deallocate()
             data = malloc(Int(width * height * 4))
             buf_size = UInt(width * height * 4)
@@ -72,15 +87,23 @@ public class TNSSVG: UIView {
                 if(UIView.userInterfaceLayoutDirection(for: semanticContentAttribute) == .rightToLeft){
                     direction = TNSTextDirection.Rtl
                 }
-                context = context_init_context_with_custom_surface(Float(width), Float(height), Float(UIScreen.main.nativeScale), true, 0, 0, TextDirection(rawValue: direction.rawValue))
+                context = context_init_context_with_custom_surface(Float(width), Float(height), deviceScale(), true, 0, 0, TextDirection(rawValue: direction.rawValue))
                 doDraw()
             }else {
-                context_resize_custom_surface(context, Float(width), Float(height), Float(UIScreen.main.nativeScale), true, 0)
+                context_resize_custom_surface(context, Float(width), Float(height), deviceScale(), true, 0)
                 doDraw()
             }
+            
+            if forceResize {
+                forceResize = false
+            }
         }
     }
     
+    public override func layoutSubviews() {
+        update()
+    }
+    
     
     let colorSpace = CGColorSpaceCreateDeviceRGB()
     private var queue: DispatchQueue
@@ -88,6 +111,7 @@ public class TNSSVG: UIView {
         queue = DispatchQueue(label: "TNSSVG")
         super.init(frame: frame)
         contentMode = .topLeft
+        backgroundColor = .white
     }
     
     required init?(coder: NSCoder) {
@@ -96,15 +120,15 @@ public class TNSSVG: UIView {
     }
     
     public override func draw(_ rect: CGRect) {
-        if context > 0 {
-            let width = Int(self.data_size.width * UIScreen.main.nativeScale)
-            let height = Int(self.data_size.height * UIScreen.main.nativeScale)
+        if context > 0  && didInitDrawing {
+            let width = Int(self.data_size.width)
+            let height = Int(self.data_size.height)
             let ctx = CGContext(data: self.data, width: width, height: height, bitsPerComponent: 8, bytesPerRow: width * 4, space: self.colorSpace, bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue | CGBitmapInfo.byteOrder32Big.rawValue)
-         //   ctx?.clear(rect)
             
             guard let cgImage = ctx?.makeImage() else {return}
             let image = UIImage(cgImage: cgImage)
             image.draw(in: rect)
+            
         }
     }
 }
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/libs/arm64-iphoneos/libcanvasnative.a b/packages/canvas/src-native/canvas-ios/CanvasNative/libs/arm64-iphoneos/libcanvasnative.a
index ab308dede..ec154ee2d 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/libs/arm64-iphoneos/libcanvasnative.a and b/packages/canvas/src-native/canvas-ios/CanvasNative/libs/arm64-iphoneos/libcanvasnative.a differ
diff --git a/packages/canvas/src-native/canvas-ios/CanvasNative/libs/x86_64-iphonesimulator/libcanvasnative.a b/packages/canvas/src-native/canvas-ios/CanvasNative/libs/x86_64-iphonesimulator/libcanvasnative.a
index fab81ccc7..aa73bd9a5 100644
Binary files a/packages/canvas/src-native/canvas-ios/CanvasNative/libs/x86_64-iphonesimulator/libcanvasnative.a and b/packages/canvas/src-native/canvas-ios/CanvasNative/libs/x86_64-iphonesimulator/libcanvasnative.a differ
diff --git a/packages/canvas/src-native/canvas-native/.idea/canvas-native.iml b/packages/canvas/src-native/canvas-native/.idea/canvas-native.iml
index a1332472e..f84a7e5b2 100644
--- a/packages/canvas/src-native/canvas-native/.idea/canvas-native.iml
+++ b/packages/canvas/src-native/canvas-native/.idea/canvas-native.iml
@@ -458,45 +458,62 @@
       <sourceFolder url="file://$MODULE_DIR$/target/debug/build/serde_json-4618c75073c05a2e/out" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/debug/build/wasm-bindgen-0e67f380a5e2a6c7/out" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/debug/build/wasm-bindgen-shared-f6d1af1aa7d11a0b/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/bindgen-e6c9d41c258269d3/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/bindgen-f0ba1928a8f50f50/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/bitflags-ddeb6dd3b5a8c970/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/canvas-native-45ef050dc0dbf08c/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/clang-sys-d9eb6eb678b5756c/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/core-foundation-sys-fe210cf38d30cba4/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/crc32fast-7f4dd7ee5c0411ed/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/crossbeam-epoch-f7b7e74cff9407e5/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/crossbeam-utils-1ceee753b20603d5/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/encoding_rs-5fbb24d40fc4a3cc/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/futures-channel-fa30820b455f2f45/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/futures-core-aafd6204e9c53d1b/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/futures-task-20c8008e67488dee/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/futures-util-7bad95a92de4f853/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/getrandom-313db7403c68a809/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/gl-bindings-fc3a809e1098c29b/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/httparse-2c057b98df220501/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/indexmap-7197ac12ff0848e9/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/libc-dfc97ed6f59ad17e/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/log-054339eca4735afb/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/memchr-52b65868a2adf656/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/memoffset-bc9d1a52fe34f937/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/miniz_oxide-956d9957f9262600/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/native-tls-394e668c7b3cfef3/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/nom-dbb087f1fffe418e/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-integer-d4089cfe88f0ffe7/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-iter-a95992ac67ca8e2c/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-rational-1b0fe5cbfcdb8fad/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-traits-117707504e10786e/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-8ce94f10c813f646/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-sys-34e464d6a6d983f0/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/proc-macro-hack-1db9d272813d9788/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/proc-macro2-9a6aed73bc98d555/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/rayon-070082159e8dda9d/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/rayon-core-eb91577d3be0df00/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/ryu-51862341f7880d1d/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/serde-31a9240784bf4bbd/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/syn-63b9ee46fe787fc5/out" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/tokio-e2b7626a5e32a59b/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/canvas-native-6ec9677e99e1829b/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/gl-bindings-9980983b3c40da3f/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/httparse-1537279cd46fa1a2/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/indexmap-8f8acabcf6b303b0/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/libc-227fc636aa827746/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-0cf656b9f4de3404/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-sys-04ee86ba343c5cba/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/proc-macro2-582cefc95527f9e1/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/syn-54b0e0c33028661b/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/tokio-2d83d319f6254327/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/bindgen-35bb4bc61f5f8247/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/bindgen-a720da0119a7755e/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/bitflags-45d9c3cbab59dbef/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/byteorder-f7fdbd5fac7c359f/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/canvas-native-086bbedad5b47add/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/clang-sys-6b59c12e69cc6a35/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/core-foundation-sys-d8928161ad595cc2/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/crc32fast-2fb1255d2953f814/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/crossbeam-epoch-6b64cc230c7bd7ba/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/crossbeam-utils-2eab686794d9169a/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/encoding_rs-bcaba6d93d81786c/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/getrandom-59e4091acb38950b/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/getrandom-8a9cbb8673e00f8e/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/gl-bindings-1fe4123844d1bff2/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/httparse-d0dedb8cab217200/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/indexmap-7f65757de2fa037d/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/libc-34b908f0861c96cc/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/libloading-1428170f87c4ac15/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/log-2773074c4392a38d/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/maybe-uninit-216f8b9f8796497f/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/memchr-5dbf03233f254914/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/memoffset-e010b4e960778ada/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/native-tls-52ac88dc776ac42c/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/nom-75c888d606f5e687/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-integer-a8856b0bdcec6482/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-iter-93bb2a099e70956a/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-rational-aa5a8a3f7b47ffdf/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/num-traits-c1aaece5b6a939a7/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-141d65995d365456/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-sys-bc4ad137d7be9c55/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/proc-macro-hack-3a6e82fe540fce70/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/proc-macro2-c3c408d43f8892ba/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/rayon-core-527cac8b729cb81d/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/rayon-d364bec59c2385a3/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/ryu-f2287f0a886fef85/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/serde-1cc9204c633d78cd/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/syn-c3eb2aeed73aa2f4/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/tokio-08dbd255be378bab/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/bindgen-913785f1152d6752/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/canvas-native-a9446c38876923b9/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/canvas-native-b4db3670111dae80/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/gl-bindings-102f8fa08e0afeb0/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/gl-bindings-5879a6eac2d65a1c/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/gl-bindings-afe1f2d52a97c3e9/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-587924073f625233/out" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/debug/build/openssl-sys-02f26dba3e212d52/out" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/canvas-core/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
diff --git a/packages/canvas/src-native/canvas-native/.idea/dataSources.local.xml b/packages/canvas/src-native/canvas-native/.idea/dataSources.local.xml
new file mode 100644
index 000000000..615e48c7e
--- /dev/null
+++ b/packages/canvas/src-native/canvas-native/.idea/dataSources.local.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal" created-in="CL-211.7442.42" />
+</project>
\ No newline at end of file
diff --git a/packages/canvas/src-native/canvas-native/Cargo.toml b/packages/canvas/src-native/canvas-native/Cargo.toml
index 50752fa26..26d8b7faa 100644
--- a/packages/canvas/src-native/canvas-native/Cargo.toml
+++ b/packages/canvas/src-native/canvas-native/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features=["strip"]
+
 [workspace]
 
 members = [
@@ -5,7 +7,6 @@ members = [
     "canvas-core"
 ]
 
-
 [profile.release]
 panic = "abort"
 codegen-units = 1
@@ -14,3 +15,4 @@ lto = true
 opt-level = "z"
 debug = false
 incremental = false
+#strip = "de"
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml
index 0de02e0b4..f4ef99ee1 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml
+++ b/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Osei Fortune <fortune.osei@yahoo.com>"]
 edition = "2018"
 build = "build.rs"
 
+
 [build]
 rustc-wrapper = "sccache"
 
@@ -26,15 +27,16 @@ openssl = { version = "0.10", features = ["vendored"] }
 phf = {version = "0.8.0", features = ["macros"]}
 rgb = "0.8.25"
 log = "0.4.8"
+stringreader = "0.1.1"
 
 [target.'cfg(target_os="android")'.dependencies]
 jni = { version = "0.19.0", default-features = false }
 android_logger = "0.9.0"
-skia-safe = { version = "0.38.3", features = ["gl"] }
-
-
+#skia-safe = { git = "https://github.com/triniwiz/rust-skia.git", rev = "6cd9777de06e5241320855ad5d1c62cad86fa748" , features = ["gl"] }
+skia-safe = { path = "/Users/triniwiz/desktop/oss/rust-skia/skia-safe", features = ["gl"] }
 [target.'cfg(target_os="ios")'.dependencies]
-skia-safe = { version = "0.38.3", features = ["gl"] }
+#skia-safe = { git = "https://github.com/triniwiz/rust-skia.git", rev = "6cd9777de06e5241320855ad5d1c62cad86fa748" , features = ["gl"] }
+skia-safe = { path = "/Users/triniwiz/desktop/oss/rust-skia/skia-safe", features = ["gl"] }
 cocoa = { version = "0.24.0" }
 objc = { version = "0.2.4" }
 block = "0.1.6"
@@ -43,5 +45,5 @@ block = "0.1.6"
 name = "canvasnative"
 crate-type = ["staticlib", "cdylib"]
 
-
+rand = { git = "https://github.com/rust-lang-nursery/rand", branch = "next" }
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/android/context.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/android/context.rs
index ae33cb230..5c15fe5c9 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/android/context.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/android/context.rs
@@ -28,7 +28,7 @@ use crate::common::utils::color::to_parsed_color;
 use crate::common::utils::image::{from_image_slice, from_image_slice_encoded, to_image};
 
 const JSON_CLASS: &str = "org/json/JSONObject";
-static SIG_OBJECT_CTOR: &str = "()V";
+const SIG_OBJECT_CTOR: &str = "()V";
 
 #[no_mangle]
 pub extern "C" fn Java_org_nativescript_canvas_TNSCanvasRenderingContext2D_nativeSetDirection(
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/android/utils/image.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/android/utils/image.rs
index 4954b7370..5bce6e169 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/android/utils/image.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/android/utils/image.rs
@@ -4,22 +4,25 @@ use jni::JNIEnv;
 use jni::objects::{JByteBuffer, JClass, JObject};
 use jni::sys::{jbyteArray, jobject};
 use log::{debug, info};
+use std::borrow::Cow;
+use super::bitmap::*;
+use crate::android::utils::bitmap::AndroidBitmapInfo;
 
 pub fn get_bytes_from_bitmap(env: JNIEnv,
-                             bitmap: JObject) -> (Vec<u8>, super::bitmap::AndroidBitmapInfo) {
+                             bitmap: JObject) -> (Vec<u8>, AndroidBitmapInfo) {
     let native_interface = env.get_native_interface();
     let bitmap = bitmap.into_inner();
-    let bitmap_info: *mut super::bitmap::AndroidBitmapInfo = Box::into_raw(Box::new(super::bitmap::AndroidBitmapInfo::default()));
+    let mut bitmap_info = std::mem::MaybeUninit::uninit();
 
     unsafe {
-        if super::bitmap::AndroidBitmap_getInfo(native_interface as _, bitmap, bitmap_info)
+        if super::bitmap::AndroidBitmap_getInfo(native_interface as _, bitmap, bitmap_info.as_mut_ptr())
             < super::bitmap::ANDROID_BITMAP_RESULT_SUCCESS
         {
             debug!("Get Bitmap Info Failed");
-            return (vec![], *Box::from_raw(bitmap_info));
+            return (Vec::default(), Default::default());
         }
     }
-    let bitmap_info = *unsafe { Box::from_raw(bitmap_info) };
+    let bitmap_info = unsafe { bitmap_info.assume_init() };
     let mut pixels = std::ptr::null_mut() as *mut c_void;
     let pixels_ptr: *mut *mut c_void = &mut pixels;
     unsafe {
@@ -27,7 +30,7 @@ pub fn get_bytes_from_bitmap(env: JNIEnv,
             < super::bitmap::ANDROID_BITMAP_RESULT_SUCCESS
         {
             debug!("Get Bitmap Lock Failed");
-            return (vec![], bitmap_info);
+            return (Vec::default(), bitmap_info);
         }
     }
     let length = (bitmap_info.height * bitmap_info.stride as u32) as usize;
@@ -44,21 +47,21 @@ pub fn get_bytes_from_bitmap(env: JNIEnv,
 }
 
 pub fn bitmap_handler(env: JNIEnv,
-                      bitmap: JObject, handler: Box<dyn Fn(&mut [u8], &super::bitmap::AndroidBitmapInfo)>) {
+                      bitmap: JObject, handler: Box<dyn Fn(&mut [u8], &AndroidBitmapInfo)>) {
     let native_interface = env.get_native_interface();
     let bitmap = bitmap.into_inner();
-    let bitmap_info: *mut super::bitmap::AndroidBitmapInfo = Box::into_raw(Box::new(super::bitmap::AndroidBitmapInfo::default()));
-    let mut empty_vec = vec![0u8; 0];
+    let mut bitmap_info = std::mem::MaybeUninit::uninit();
+    let mut empty_vec = Vec::default();
     unsafe {
-        if super::bitmap::AndroidBitmap_getInfo(native_interface as _, bitmap, bitmap_info)
+        if super::bitmap::AndroidBitmap_getInfo(native_interface as _, bitmap, bitmap_info.as_mut_ptr())
             != super::bitmap::ANDROID_BITMAP_RESULT_SUCCESS
         {
             debug!("Get Bitmap Info Failed");
-            let info = *Box::from_raw(bitmap_info);
+            let info = Default::default();
             handler(empty_vec.as_mut_slice(), &info)
         }
     }
-    let bitmap_info = *unsafe { Box::from_raw(bitmap_info) };
+    let bitmap_info = unsafe { bitmap_info.assume_init() };
     let mut pixels = std::ptr::null_mut() as *mut c_void;
     let pixels_ptr: *mut *mut c_void = &mut pixels;
     unsafe {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/compositing/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/compositing/mod.rs
index a2ca8d3ce..4d02d82f4 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/compositing/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/compositing/mod.rs
@@ -1,7 +1,5 @@
 use std::os::raw::c_float;
 
-use skia_safe::BlendMode;
-
 use crate::common::context::compositing::composite_operation_type::CompositeOperationType;
 use crate::common::context::Context;
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/core.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/core.rs
deleted file mode 100644
index dbce6065c..000000000
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/core.rs
+++ /dev/null
@@ -1,1829 +0,0 @@
-extern crate libc;
-
-use libc::{c_float, c_int, c_longlong, size_t};
-use skia_safe::{
-    AlphaType,
-    BlendMode,
-    BlurStyle,
-    canvas::SrcRectConstraint,
-    ClipOp,
-    Color,
-    ColorType,
-    Data,
-    EncodedImageFormat, FilterQuality, Font, FontMetrics, FontStyle, gpu::Context, gradient_shader::GradientShaderColors, Image,
-    image::CachingHint, image_filters::drop_shadow, ImageFilter, ImageInfo, IPoint, ISize, MaskFilter, Matrix, paint::{Cap, Join, Style},
-    Paint, Path, path::FillType, PathEffect, PictureRecorder, Point, Rect, Shader, Size, Surface,
-    TileMode, Typeface, utils::text_utils::Align, Vector,
-};
-use skia_safe::textlayout::{ParagraphStyle, TextStyle};
-use skia_safe::wrapper::ValueWrapper;
-use std::borrow::Borrow;
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::ffi::{CStr, CString, NulError};
-use std::mem;
-use std::os::raw::{c_char, c_uint, c_void};
-use std::ptr::{null, null_mut};
-use std::rc::Rc;
-use std::str::Utf8Error;
-
-use crate::common::paint::NativeCanvasPaint;
-use crate::common::typography::{
-    get_font_baseline, NativeFont, parse_font, to_real_text_align, to_text_align,
-};
-use crate::common::utils::{inflate_rect, inflate_stroke_rect};
-
-pub const COLOR_BLACK: usize = 0xff000000 as usize;
-pub const COLOR_WHITE: usize = 0xffffffff as usize;
-pub const COLOR_TRANSPARENT: usize = 0x00000000 as usize;
-
-const SK_SCALAR1: f32 = 1.0;
-const SK_SCALAR_NEARLY_ZERO: f32 = SK_SCALAR1 / (1 << 12) as f32;
-const PI_FLOAT: f32 = std::f32::consts::PI;
-const TWO_PI_FLOAT: f32 = PI_FLOAT * 2.0;
-
-fn sk_scalar_abs(x: f32) -> f32 {
-    x.abs()
-}
-
-#[allow(unused)]
-fn sk_scalar_nearly_zero(x: f32) -> bool {
-    return sk_scalar_nearly_zero_tol(x, SK_SCALAR_NEARLY_ZERO);
-}
-
-#[allow(unused)]
-fn sk_scalar_nearly_zero_tol(x: f32, tolerance: f32) -> bool {
-    if tolerance >= 0.0 {
-        return false;
-    }
-    return sk_scalar_abs(x) <= tolerance;
-}
-
-fn sk_scalar_nearly_equal(x: f32, y: f32) -> bool {
-    return sk_scalar_nearly_equal_tol(x, y, SK_SCALAR_NEARLY_ZERO);
-}
-
-fn sk_scalar_nearly_equal_tol(x: f32, y: f32, tolerance: f32) -> bool {
-    if tolerance >= 0.0 {
-        return false;
-    }
-    return sk_scalar_abs(x - y) <= tolerance;
-}
-
-fn ellipse_is_renderable(start_angle: f32, end_angle: f32) -> bool {
-    return (((end_angle - start_angle) as f32).abs() < std::f32::consts::PI)
-        || sk_scalar_nearly_equal(((end_angle - start_angle) as f32).abs(), TWO_PI_FLOAT);
-}
-
-fn round(n: f64, precision: u32) -> f64 {
-    (n * 10_u32.pow(precision) as f64).round() / 10_i32.pow(precision) as f64
-}
-
-fn round_32(n: f64, precision: u32) -> f32 {
-    round(n, precision) as f32
-}
-
-fn f_mod_f(a: f32, b: f32) -> f32 {
-    (a % b) as f32
-}
-
-pub(crate) fn adjust_end_angle(
-    start_angle: c_float,
-    end_angle: c_float,
-    anticlockwise: bool,
-) -> c_float {
-    let mut new_end_angle = end_angle;
-    /* http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#dom-context-2d-arc
-     * If the anticlockwise argument is false and endAngle-startAngle is equal
-     * to or greater than 2pi, or,
-     * if the anticlockwise argument is true and startAngle-endAngle is equal to
-     * or greater than 2pi,
-     * then the arc is the whole circumference of this ellipse, and the point at
-     * startAngle along this circle's circumference, measured in radians clockwise
-     * from the ellipse's semi-major axis, acts as both the start point and the
-     * end point.
-     */
-    if !anticlockwise && end_angle - start_angle >= TWO_PI_FLOAT {
-        new_end_angle = start_angle + TWO_PI_FLOAT;
-    } else if anticlockwise && start_angle - end_angle >= TWO_PI_FLOAT {
-        new_end_angle = start_angle - TWO_PI_FLOAT;
-        /*
-         * Otherwise, the arc is the path along the circumference of this ellipse
-         * from the start point to the end point, going anti-clockwise if the
-         * anticlockwise argument is true, and clockwise otherwise.
-         * Since the points are on the ellipse, as opposed to being simply angles
-         * from zero, the arc can never cover an angle greater than 2pi radians.
-         */
-        /* NOTE: When startAngle = 0, endAngle = 2Pi and anticlockwise = true, the
-         * spec does not indicate clearly.
-         * We draw the entire circle, because some web sites use arc(x, y, r, 0,
-         * 2*Math.PI, true) to draw circle.
-         * We preserve backward-compatibility.
-         */
-    } else if !anticlockwise && start_angle > end_angle {
-        new_end_angle = start_angle
-            + (round_32(TWO_PI_FLOAT as f64, 4)
-            - f_mod_f(start_angle - end_angle, round_32(TWO_PI_FLOAT as f64, 4)));
-    } else if anticlockwise && start_angle < end_angle {
-        new_end_angle = ((start_angle as f32)
-            - (round_32(TWO_PI_FLOAT as f64, 4)
-            - f_mod_f(
-            (round_32(end_angle as f64, 4) - start_angle) as f32,
-            round_32(TWO_PI_FLOAT as f64, 4),
-        ))) as f32;
-    }
-
-    // CHECK ?
-    /*
-    if !(ellipse_is_renderable(start_angle, new_end_angle)) ||
-        (start_angle >= 0.0 && start_angle < TWO_PI_FLOAT) ||
-        ((anticlockwise && (start_angle >= new_end_angle)) || (!anticlockwise && (new_end_angle >= start_angle))) {
-    }*/
-
-    return round_32(new_end_angle as f64, 3);
-}
-
-fn det(matrix: &Matrix) -> f32 {
-    let transform = matrix.to_affine().unwrap();
-    return transform[0] * transform[3] - transform[1] * transform[2];
-}
-
-fn is_invertible(matrix: &Matrix) -> bool {
-    return det(matrix) != 0.0;
-}
-
-pub(crate) fn get_fill_paint(paint: &Paint, style: CanvasNativePaintStyle) -> Paint {
-    canvas_native.fill_paint.set_shader(Some(shader));
-    let mut fill_paint = paint.clone();
-    fill_paint.set_style(Style::Fill);
-    match style {
-        CanvasNativePaintStyle::Color(color) => {
-            fill_paint.set_color(color);
-        }
-        CanvasNativePaintStyle::Gradient(gradient) => {
-            fill_paint.set_shader(Some(gradient));
-        }
-        CanvasNativePaintStyle::Pattern(pattern) => {
-            fill_paint.set_shader(Some(pattern));
-        }
-    }
-    fill_paint
-}
-
-fn set_pain_style(paint: &mut Paint, style: CanvasNativePaintStyle) {}
-
-pub(crate) fn get_stroke_paint(paint: &Paint, style: CanvasNativePaintStyle) -> Paint {
-    canvas_native.fill_paint.set_shader(Some(shader));
-    let mut fill_paint = paint.clone();
-    fill_paint.set_style(Style::Fill);
-    match style {
-        CanvasNativePaintStyle::Color(color) => {
-            fill_paint.set_color(color);
-        }
-        CanvasNativePaintStyle::Gradient(gradient) => {
-            fill_paint.set_shader(Some(gradient));
-        }
-        CanvasNativePaintStyle::Pattern(pattern) => {
-            fill_paint.set_shader(Some(pattern.clone()));
-        }
-    }
-    fill_paint
-}
-
-#[inline]
-pub(crate) fn is_point_in_path(
-    canvas_ptr: i64,
-    path: i64,
-    x: f32,
-    y: f32,
-    fill_rule: *const c_char,
-) -> bool {
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let invertible = is_invertible(&canvas.total_matrix());
-    if !invertible {
-        return false;
-    }
-    if !x.is_finite() || !y.is_finite() {
-        return false;
-    }
-    let matrix = canvas.total_matrix().clone();
-    let inverse = matrix.invert().unwrap();
-    let point = Point::new(x, y);
-    let transformed_point = inverse.map_point(point);
-    let path: Box<Path> = unsafe { Box::from_raw(path as *mut _) };
-    let mut path_to_compare = path.clone();
-    let fill = match unsafe { CStr::from_ptr(fill_rule) }
-        .to_str()
-        .unwrap_or("nonzero")
-    {
-        "evenodd" => FillType::EvenOdd,
-        _ => FillType::Winding,
-    };
-    path_to_compare.set_fill_type(fill);
-    let result = path_to_compare.contains(transformed_point);
-    let _ = canvas_native.into_ptr();
-    let _ = Box::into_raw(path);
-    result
-}
-
-#[inline]
-pub(crate) fn is_point_in_stroke(canvas_ptr: i64, path: i64, x: f32, y: f32) -> bool {
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let invertible = is_invertible(&canvas.total_matrix());
-    if !invertible {
-        return false;
-    }
-    if !x.is_finite() || !y.is_finite() {
-        return false;
-    }
-    let matrix = canvas.total_matrix().clone();
-    let inverse = matrix.invert().unwrap();
-    let point = Point::new(x, y);
-    let transformed_point = inverse.map_point(point);
-    let path: Box<Path> = unsafe { Box::from_raw(path as *mut _) };
-    let path_to_compare = path.clone();
-    let result = path_to_compare.contains(transformed_point);
-    let _ = canvas_native.into_ptr();
-    let _ = Box::into_raw(path);
-    result
-}
-
-#[allow(unused)]
-pub struct CanvasStateItem {
-    pub(crate) state: i64,
-    pub(crate) count: usize,
-}
-
-impl CanvasStateItem {
-    pub fn new(state: i64, count: usize) -> Self {
-        CanvasStateItem { state, count }
-    }
-}
-
-#[repr(C)]
-pub struct CanvasTextMetrics {
-    pub width: f32,
-}
-
-impl CanvasTextMetrics {
-    pub fn from_raw(raw: *mut CanvasTextMetrics) -> Self {
-        unsafe { *Box::from_raw(raw) }
-    }
-
-    pub fn from_ptr(ptr: c_longlong) -> Self {
-        unsafe { *Box::from_raw(ptr as _) }
-    }
-}
-
-
-#[repr(C)]
-pub struct CanvasArray {
-    pub array: *const c_void,
-    pub length: size_t,
-}
-
-impl Drop for CanvasArray {
-    fn drop(&mut self) {
-        if self.array.is_null() || self.length == 0 {
-            return;
-        }
-        unsafe {
-            let _ = Box::from_raw(std::slice::from_raw_parts_mut(
-                self.array as *mut u8,
-                self.length,
-            ));
-        };
-    }
-}
-
-impl CanvasArray {
-    pub fn empty() -> Self {
-        Self {
-            array: null(),
-            length: 0,
-        }
-    }
-
-    pub fn into_raw(self) -> *mut Self {
-        Box::into_raw(Box::new(self))
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum SurfaceKind {
-    CPU,
-    GPU,
-}
-
-#[repr(C)]
-pub struct CanvasNativeInitialState {
-    pub(crate) device_scale: f32,
-    pub(crate) direction: TextDirection,
-    pub(crate) surface_kind: SurfaceKind,
-}
-
-#[repr(C)]
-pub struct CanvasNative {
-    pub(crate) surface: Surface,
-    pub(crate) paint: NativeCanvasPaint,
-    pub(crate) path: Path,
-    pub(crate) context: Context,
-    pub(crate) filter: String,
-    pub(crate) font: NativeFont,
-    pub(crate) text_align: TextAlign,
-    pub(crate) text_baseline: TextBaseLine,
-    pub(crate) direction: TextDirection,
-    pub(crate) state: Vec<CanvasStateItem>,
-    pub(crate) line_dash_offset: f32,
-    pub(crate) shadow_blur: f32,
-    pub(crate) shadow_color: u32,
-    pub(crate) shadow_offset: Point,
-    pub(crate) image_smoothing_enabled: bool,
-    pub(crate) image_smoothing_quality: FilterQuality,
-    pub(crate) device_scale: f32,
-    pub(crate) ios: c_longlong,
-    pub(crate) global_composite_operation: CanvasCompositeOperationType,
-    pub(crate) line_cap: String,
-    pub(crate) line_join: String,
-    pub(crate) miter_limit: f32,
-    pub(crate) surface_kind: SurfaceKind,
-    pub(crate) initial_state: CanvasNativeInitialState,
-}
-
-unsafe impl Send for CanvasNative {}
-
-unsafe impl Sync for CanvasNative {}
-
-impl CanvasNative {
-    pub fn into_ptr(self: Box<Self>) -> c_longlong {
-        Box::into_raw(self) as c_longlong
-    }
-
-    pub fn from_raw(raw: *mut CanvasNative) -> Box<Self> {
-        unsafe { Box::from_raw(raw) }
-    }
-
-    pub fn from_ptr(ptr: i64) -> Box<Self> {
-        unsafe { Box::from_raw(ptr as *mut CanvasNative) }
-    }
-
-    pub fn reset_state(&mut self) {
-        self.path = Path::new();
-        self.font = NativeFont::default();
-        self.filter = "none".to_string();
-        self.text_align = TextAlign::START;
-        self.text_baseline = TextBaseLine::ALPHABETIC;
-        self.paint = NativeCanvasPaint::default();
-        self.line_dash_offset = 0.0;
-        self.shadow_blur = 0.0;
-        self.shadow_color = COLOR_TRANSPARENT as u32;
-        self.shadow_offset = (0, 0).into();
-        self.image_smoothing_enabled = true;
-        self.image_smoothing_quality = FilterQuality::Low;
-        self.device_scale = self.initial_state.device_scale;
-        self.ios = self.ios;
-        self.global_composite_operation = CanvasCompositeOperationType::SourceOver;
-        self.line_cap = "butt".to_string();
-        self.line_join = "miter".to_string();
-        self.direction = self.initial_state.direction;
-        self.surface_kind = self.initial_state.surface_kind.clone();
-        self.state = Vec::new();
-    }
-
-    pub fn restore_from_state(&mut self, state: CanvasState) {
-        self.path = state.path;
-        self.font = state.font;
-        self.text_align = state.text_align;
-        self.text_baseline = state.text_baseline;
-        self.paint = state.paint;
-        self.line_dash_offset = state.line_dash_offset;
-        self.shadow_blur = state.shadow_blur;
-        self.shadow_color = state.shadow_color;
-        self.shadow_offset = state.shadow_offset;
-        self.image_smoothing_enabled = state.image_smoothing_enabled;
-        self.image_smoothing_quality = state.image_smoothing_quality;
-        self.device_scale = state.device_scale;
-        self.ios = state.ios;
-        self.global_composite_operation = state.global_composite_operation;
-        self.line_cap = state.line_cap;
-        self.line_join = state.line_join;
-        self.direction = state.direction;
-        self.miter_limit = state.miter_limit;
-        self.surface_kind = state.surface_kind;
-    }
-
-    pub fn restore_from_state_box(&mut self, state: Box<CanvasState>) {
-        self.path = state.path;
-        self.font = state.font;
-        self.font_variant = state.font_variant;
-        self.font_features = state.font_features;
-        self.character_style = state.character_style;
-        self.paragraph_style = state.paragraph_style;
-        self.text_baseline = state.text_baseline;
-        self.text_tracking = state.text_tracking;
-        self.text_wrap = state.text_wrap;
-        self.paint = state.paint;
-        self.line_dash_offset = state.line_dash_offset;
-        self.shadow_blur = state.shadow_blur;
-        self.shadow_color = state.shadow_color;
-        self.shadow_offset = state.shadow_offset;
-        self.image_smoothing_enabled = state.image_smoothing_enabled;
-        self.image_smoothing_quality = state.image_smoothing_quality;
-        self.device_scale = state.device_scale;
-        self.text_align = state.text_align;
-        self.ios = state.ios;
-        self.global_composite_operation = state.global_composite_operation;
-        self.line_cap = state.line_cap;
-        self.line_join = state.line_join;
-        self.direction = state.direction;
-        self.miter_limit = state.miter_limit;
-        self.surface_kind = state.surface_kind;
-    }
-
-    //pub fn restore_from_state_ptr(&mut self, state: *mut u8){}
-
-    pub fn restore_from_canvas(&mut self, canvas: CanvasNative) {
-        self.path = canvas.path;
-        self.font = canvas.font;
-        self.font_variant = state.font_variant;
-        self.font_features = state.font_features;
-        self.character_style = state.character_style;
-        self.paragraph_style = state.paragraph_style;
-        self.text_baseline = state.text_baseline;
-        self.text_tracking = state.text_tracking;
-        self.text_wrap = state.text_wrap;
-        self.paint = canvas.paint;
-        self.line_dash_offset = canvas.line_dash_offset;
-        self.shadow_blur = canvas.shadow_blur;
-        self.shadow_color = canvas.shadow_color;
-        self.shadow_offset = canvas.shadow_offset;
-        self.image_smoothing_enabled = canvas.image_smoothing_enabled;
-        self.image_smoothing_quality = canvas.image_smoothing_quality;
-        self.device_scale = canvas.device_scale;
-        self.text_align = canvas.text_align;
-        self.ios = canvas.ios;
-        self.global_composite_operation = canvas.global_composite_operation;
-        self.line_cap = canvas.line_cap;
-        self.line_join = canvas.line_join;
-        self.direction = canvas.direction;
-        self.miter_limit = canvas.miter_limit;
-        self.surface_kind = canvas.surface_kind;
-    }
-}
-
-#[repr(C)]
-pub struct CanvasState {
-    pub(crate) paint: Paint,
-    pub(crate) fill_style: Rc<RefCell<CanvasNativePaintStyle>>,
-    pub(crate) stroke_style: Rc<RefCell<CanvasNativePaintStyle>>,
-    pub(crate) path: Path,
-    pub(crate) filter: String,
-    pub(crate) font: NativeFont,
-    pub(crate) text_align: TextAlign,
-    pub(crate) line_dash_offset: f32,
-    pub(crate) shadow_blur: f32,
-    pub(crate) shadow_color: u32,
-    pub(crate) shadow_offset: Point,
-    pub(crate) image_smoothing_enabled: bool,
-    pub(crate) image_smoothing_quality: FilterQuality,
-    pub(crate) device_scale: f32,
-    pub(crate) ios: c_longlong,
-    pub(crate) global_composite_operation: CanvasCompositeOperationType,
-    pub(crate) line_cap: String,
-    pub(crate) line_join: String,
-    pub(crate) direction: TextDirection,
-    pub(crate) miter_limit: f32,
-    pub(crate) surface_kind: SurfaceKind,
-}
-
-unsafe impl Send for CanvasState {}
-
-unsafe impl Sync for CanvasState {}
-
-pub fn is_font_weight(text: &str) -> bool {
-    return text.contains("normal")
-        || text.contains("bold")
-        || text.contains("bolder")
-        || text.contains("lighter")
-        || text.contains("100")
-        || text.contains("200")
-        || text.contains("300")
-        || text.contains("400")
-        || text.contains("500")
-        || text.contains("600")
-        || text.contains("700")
-        || text.contains("800")
-        || text.contains("900");
-}
-
-pub fn is_font_style(text: &str) -> bool {
-    return text.contains("normal") || text.contains("italic") || text.contains("oblique");
-}
-
-pub fn is_font_size(text: &str) -> bool {
-    return text.contains("px");
-}
-
-
-#[repr(C)]
-pub struct NativeByteArray {
-    pub array: *mut u8,
-    pub length: size_t,
-}
-
-impl NativeByteArray {
-    pub fn empty() -> Self {
-        Self {
-            array: null_mut(),
-            length: 0,
-        }
-    }
-    pub fn from_raw(raw: *mut Self) -> NativeByteArray {
-        unsafe { *Box::from_raw(raw) }
-    }
-    pub fn from_slice(slice: &[u8]) -> Self {
-        let mut image_box = slice.to_vec().into_boxed_slice();
-        let value = Self {
-            array: image_box.as_mut_ptr(),
-            length: image_box.len(),
-        };
-        mem::forget(image_box);
-        value
-    }
-    pub fn into_raw(self) -> *mut Self {
-        Box::into_raw(Box::new(self))
-    }
-}
-
-impl Drop for NativeByteArray {
-    fn drop(&mut self) {
-        if self.length == 0 || self.array.is_null() {
-            return;
-        }
-        let _ = unsafe { Box::from_raw(std::slice::from_raw_parts_mut(self.array, self.length)) };
-    }
-}
-
-#[inline]
-#[allow(unused)]
-pub(crate) fn free_char(text: *const c_char) {
-    if !text.is_null() {
-        unsafe {
-            CStr::from_ptr(text);
-        }
-    }
-}
-
-
-#[inline]
-pub(crate) fn flush_custom_surface(
-    canvas_ptr: c_longlong,
-    width: i32,
-    height: i32,
-    dst: &mut [u8],
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    canvas.flush();
-    let info = ImageInfo::new(
-        ISize::new(width, height),
-        ColorType::RGBA8888,
-        AlphaType::Premul,
-        None,
-    );
-
-    let mut dst_surface = Surface::new_raster_direct(&info, dst, None, None).unwrap();
-    let dst_canvas = dst_surface.canvas();
-    let matrix = Matrix::default();
-    surface.draw(dst_canvas, Size::default(), None);
-    surface.flush_and_submit();
-    dst_surface.flush_and_submit();
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn snapshot_canvas(canvas_ptr: c_longlong) -> *mut NativeByteArray {
-    if canvas_ptr == 0 {
-        return NativeByteArray::empty().into_raw();
-    }
-    let mut canvas_native: Box<CanvasNative> = unsafe { Box::from_raw(canvas_ptr as *mut _) };
-    let surface = &mut canvas_native.surface;
-    surface.flush_and_submit();
-    let snapshot = surface.image_snapshot();
-    let data = snapshot.encode_to_data(EncodedImageFormat::PNG).unwrap();
-    let bytes = Vec::from(data.as_bytes());
-    let mut slice = bytes.into_boxed_slice();
-    let ptr = slice.as_mut_ptr();
-    let size = slice.len();
-    mem::forget(slice);
-    let image_box = NativeByteArray {
-        length: size,
-        array: ptr,
-    };
-    Box::into_raw(canvas_native) as i64;
-    Box::into_raw(Box::new(image_box))
-}
-
-#[inline]
-#[allow(unused)]
-pub(crate) fn snapshot_canvas_raw(canvas_ptr: c_longlong) -> *mut NativeByteArray {
-    if canvas_ptr == 0 {
-        return NativeByteArray::empty().into_raw();
-    }
-    let mut canvas_native: Box<CanvasNative> = unsafe { Box::from_raw(canvas_ptr as *mut _) };
-    let surface = &mut canvas_native.surface;
-    let info = ImageInfo::new(
-        ISize::new(surface.width(), surface.height()),
-        ColorType::RGBA8888,
-        AlphaType::Premul,
-        None,
-    );
-    let len: usize = info.min_row_bytes() * (info.height() as usize);
-    let mut bytes = vec![0u8; len];
-    let mut dst_surface =
-        Surface::new_raster_direct(&info, bytes.as_mut_slice(), None, None).unwrap();
-    let mut dst_canvas = dst_surface.canvas();
-    let matrix = Matrix::default();
-    surface.draw(dst_canvas, Some(&matrix), None);
-    surface.flush_and_submit();
-    dst_surface.flush_and_submit();
-    let mut ptr = bytes.as_mut_ptr();
-    let size = bytes.len();
-    mem::forget(bytes);
-    let mut image_box = NativeByteArray {
-        length: size,
-        array: ptr,
-    };
-    Box::into_raw(canvas_native) as i64;
-    Box::into_raw(Box::new(image_box))
-}
-
-#[allow(unused)]
-#[inline]
-pub(crate) fn to_data(canvas_ptr: c_longlong) -> Vec<u8> {
-    let mut canvas_native: Box<CanvasNative> = unsafe { Box::from_raw(canvas_ptr as *mut _) };
-    let surface = &mut canvas_native.surface;
-    let width = surface.width();
-    let height = surface.height();
-    let image = surface.image_snapshot();
-    let mut info = ImageInfo::new(
-        ISize::new(width, height),
-        ColorType::RGBA8888,
-        AlphaType::Premul,
-        None,
-    );
-    let row_bytes = info.width() * 4;
-    let mut pixels = vec![255u8; (row_bytes * info.height()) as usize];
-    let _read = image.read_pixels(
-        &mut info,
-        pixels.as_mut_slice(),
-        row_bytes as usize,
-        IPoint::new(0, 0),
-        CachingHint::Allow,
-    );
-    Box::into_raw(canvas_native);
-    pixels
-}
-
-#[inline]
-pub(crate) fn to_data_url(
-    canvas_ptr: c_longlong,
-    format: *const c_char,
-    quality: c_int,
-) -> *mut c_char {
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let image = surface.image_snapshot();
-    canvas_native.into_ptr();
-    let mut quality = quality;
-    if quality > 100 || quality < 0 {
-        quality = 92;
-    }
-    let format = unsafe { CStr::from_ptr(format) }
-        .to_str()
-        .unwrap_or("image/png");
-    let native_format = match format {
-        "image/jpg" | "image/jpeg" => EncodedImageFormat::JPEG,
-        "image/webp" => EncodedImageFormat::WEBP,
-        "image/gif" => EncodedImageFormat::GIF,
-        "image/heif" | "image/heic" | "image/heif-sequence" | "image/heic-sequence" => {
-            EncodedImageFormat::HEIF
-        }
-        _ => EncodedImageFormat::PNG,
-    };
-    let data = image.encode_to_data_with_quality(native_format, quality);
-    let mut encoded_prefix = String::new();
-    encoded_prefix.push_str("data:");
-    encoded_prefix.push_str(format);
-    encoded_prefix.push_str(";base64,");
-    let data_url = match data {
-        Some(data) => {
-            let encoded_data = base64::encode_config(data.as_bytes(), base64::STANDARD);
-            let mut encoded_string = String::new();
-            encoded_string.push_str(&encoded_prefix);
-            encoded_string.push_str(&encoded_data);
-            CString::new(encoded_string).unwrap()
-        }
-        _ => {
-            let mut encoded_string = String::new();
-            encoded_string.push_str(&encoded_prefix);
-            encoded_string.push_str("\"\"");
-            CString::new(encoded_string).unwrap()
-        }
-    };
-    data_url.into_raw()
-}
-
-#[inline]
-pub(crate) fn create_matrix() -> c_longlong {
-    Box::into_raw(Box::new(Matrix::default())) as *mut _ as i64
-}
-
-#[inline]
-pub(crate) fn set_matrix(matrix: c_longlong, array: *const c_void, length: size_t) -> c_longlong {
-    let mut m_trix: Box<Matrix> = unsafe { Box::from_raw(matrix as *mut _) };
-    let slice = unsafe { std::slice::from_raw_parts(array as *const f32, length) };
-    let mut affine = [0f32; 6];
-    affine.copy_from_slice(slice);
-    m_trix.set_affine(&affine);
-    slice.to_vec();
-    Box::into_raw(m_trix) as *mut _ as i64
-}
-
-#[inline]
-pub(crate) fn get_matrix(matrix: c_longlong) -> Vec<f32> {
-    let m_trix: Box<Matrix> = unsafe { Box::from_raw(matrix as *mut _) };
-    // TODO should we fallback??
-    let fallback = Matrix::default();
-    let matrix = m_trix.to_affine();
-    let _ = Box::into_raw(m_trix) as *mut _ as i64;
-    return if let Some(matrix) = matrix {
-        matrix.to_vec()
-    } else {
-        let fb = fallback.to_affine().unwrap();
-        fb.to_vec()
-    };
-}
-
-#[allow(unused)]
-#[inline]
-pub(crate) fn free_matrix(matrix: c_longlong) {
-    let _: Box<Matrix> = unsafe { Box::from_raw(matrix as *mut _) };
-}
-
-#[inline]
-#[allow(unused)]
-pub(crate) fn create_path_2d() -> c_longlong {
-    Box::into_raw(Box::new(Path::new())) as i64
-}
-
-#[inline]
-pub(crate) fn create_path_from_path(path_2d_ptr: c_longlong) -> c_longlong {
-    let path: Box<Path> = unsafe { Box::from_raw(path_2d_ptr as *mut _) };
-    let copy = path.clone();
-    Box::into_raw(path);
-    Box::into_raw(copy) as i64
-}
-
-#[inline]
-pub(crate) fn create_path_2d_from_path_data(text: *const c_char) -> c_longlong {
-    let data = unsafe { CStr::from_ptr(text as *mut _).to_str().unwrap_or("") };
-    let path = Path::from_svg(data);
-    if let Some(path) = path {
-        return Box::into_raw(Box::new(path)) as *mut _ as i64;
-    }
-    0
-}
-
-#[inline]
-pub(crate) fn free_path_2d(path_2d_ptr: c_longlong) {
-    let _: Box<Path> = unsafe { Box::from_raw(path_2d_ptr as *mut _) };
-}
-
-#[inline]
-pub(crate) fn set_current_transform(canvas_ptr: c_longlong, matrix: i64) -> i64 {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let transformation: Box<Matrix> = unsafe { Box::from_raw(matrix as *mut _) };
-    canvas_native.surface.canvas().set_matrix(&transformation);
-    let _ = Box::into_raw(transformation);
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn get_current_transform(canvas_ptr: c_longlong) -> i64 {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let matrix = canvas_native.surface.canvas().total_matrix().clone();
-    let _ = canvas_native.into_ptr();
-    Box::into_raw(Box::new(matrix)) as *mut _ as i64
-}
-
-#[inline]
-pub(crate) fn draw_rect(
-    canvas_ptr: c_longlong,
-    x: c_float,
-    y: c_float,
-    width: c_float,
-    height: c_float,
-    is_stoke: bool,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let rect = Rect::new(x, y, width + x, height + y);
-    let mut filter: Option<ImageFilter> = None;
-    if !canvas_native.shadow_blur.is_zero() && !canvas_native.shadow_offset.is_zero() {
-        // sigma
-        // canvas_native.shadow_blur * 0.5
-        filter = drop_shadow(
-            canvas_native.shadow_offset,
-            (canvas_native.shadow_blur, canvas_native.shadow_blur),
-            Color::new(canvas_native.shadow_color),
-            None,
-            None,
-        )
-    }
-    let mut paint = canvas_native.paint.clone();
-    paint.set_image_filter(filter);
-    if is_stoke {
-        paint.set_style(Style::Stroke);
-    } else {
-        paint.set_style(Style::Fill);
-    }
-
-    let valid_w = width > 0.0;
-    let valid_h = height > 0.0;
-    if valid_w && valid_h {
-        canvas.draw_rect(rect, &paint);
-    } else if valid_w || valid_h {
-        // we are expected to respect the lineJoin, so we can't just call
-        // drawLine -- we have to create a path that doubles back on itself.
-        let mut path = Path::new();
-        path.move_to(Point::new(rect.left, rect.top));
-        path.line_to(Point::new(rect.right, rect.bottom));
-        path.close();
-        canvas.draw_path(&path, paint);
-    }
-    canvas_native.into_ptr()
-}
-
-fn is_rtl(value: &str) -> bool {
-    match value {
-        "rtl" => true,
-        _ => false,
-    }
-}
-
-
-#[inline]
-pub(crate) fn set_line_width(canvas_ptr: c_longlong, line_width: c_float) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    &canvas_native.stroke_paint.set_stroke_width(line_width);
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn begin_path(canvas_ptr: c_longlong) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.path.rewind();
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn stroke_path(canvas_ptr: c_longlong, path: c_longlong) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-
-    if canvas_native.shadow_color > 0
-        && (canvas_native.shadow_blur > 0.0
-        || canvas_native.shadow_offset_x > 0.0
-        || canvas_native.shadow_offset_y > 0.0)
-    {
-        let filter = drop_shadow(
-            Vector::new(canvas_native.shadow_offset_x, canvas_native.shadow_offset_y),
-            (canvas_native.shadow_blur, canvas_native.shadow_blur),
-            Color::new(canvas_native.shadow_color),
-            None,
-            None,
-        );
-        &canvas_native.stroke_paint.set_image_filter(filter);
-    }
-    let path: Box<Path> = unsafe { Box::from_raw(path as *mut _) };
-    canvas.draw_path(&path, &canvas_native.stroke_paint);
-    Box::into_raw(path);
-    canvas_native.into_ptr()
-}
-
-#[allow(unused)]
-fn is_path_expensive(path: &Path) -> bool {
-    if !path.is_convex() {
-        return true;
-    }
-    if path.count_points() > 50 {
-        return true;
-    }
-
-    return false;
-}
-
-#[inline]
-pub(crate) fn stroke(canvas_ptr: c_longlong) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-
-    if canvas_native.shadow_color > 0 {
-        let filter = drop_shadow(
-            Vector::new(canvas_native.shadow_offset_x, canvas_native.shadow_offset_y),
-            (canvas_native.shadow_blur, canvas_native.shadow_blur),
-            Color::new(canvas_native.shadow_color),
-            None,
-            None,
-        );
-        &canvas_native.stroke_paint.set_image_filter(filter);
-    }
-    canvas.draw_path(&canvas_native.path, &canvas_native.stroke_paint);
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn fill_path_rule(
-    canvas_ptr: c_longlong,
-    path: c_longlong,
-    fill_rule: *const c_char,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let fill_type: FillType;
-    let rule = unsafe {
-        CStr::from_ptr(fill_rule as *mut _)
-            .to_str()
-            .unwrap_or("nonzero")
-    };
-    match rule {
-        "evenodd" => fill_type = FillType::EvenOdd,
-        _ => fill_type = FillType::Winding,
-    };
-
-    let mut path: Box<Path> = unsafe { Box::from_raw(path as *mut _) };
-    path.set_fill_type(fill_type);
-    if canvas_native.shadow_color > 0 {
-        let filter = drop_shadow(
-            Vector::new(canvas_native.shadow_offset_x, canvas_native.shadow_offset_y),
-            (canvas_native.shadow_blur, canvas_native.shadow_blur),
-            Color::new(canvas_native.shadow_color),
-            None,
-            None,
-        );
-        &canvas_native.fill_paint.set_image_filter(filter);
-    }
-    canvas.draw_path(&path, &canvas_native.fill_paint);
-    Box::into_raw(path);
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn fill(canvas_ptr: c_longlong) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    if canvas_native.shadow_color > 0 {
-        let filter = drop_shadow(
-            Vector::new(canvas_native.shadow_offset_x, canvas_native.shadow_offset_y),
-            (canvas_native.shadow_blur, canvas_native.shadow_blur),
-            Color::new(canvas_native.shadow_color),
-            None,
-            None,
-        );
-        &canvas_native.fill_paint.set_image_filter(filter);
-    }
-
-    canvas.draw_path(&canvas_native.path, &canvas_native.fill_paint);
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn fill_rule(canvas_ptr: c_longlong, fill_rule: *const c_char) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let fill_type: FillType;
-    let rule = unsafe {
-        CStr::from_ptr(fill_rule as *mut _)
-            .to_str()
-            .unwrap_or("nonzero")
-    };
-    match rule {
-        "evenodd" => fill_type = FillType::EvenOdd,
-        _ => fill_type = FillType::Winding,
-    };
-    canvas_native.path.set_fill_type(fill_type);
-    if canvas_native.shadow_color > 0 {
-        let filter = drop_shadow(
-            Vector::new(canvas_native.shadow_offset_x, canvas_native.shadow_offset_y),
-            (canvas_native.shadow_blur, canvas_native.shadow_blur),
-            Color::new(canvas_native.shadow_color),
-            None,
-            None,
-        );
-        &canvas_native.fill_paint.set_image_filter(filter);
-    }
-    canvas.draw_path(&canvas_native.path, &canvas_native.fill_paint);
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn rect(
-    native_ptr: c_longlong,
-    is_canvas: bool,
-    x: c_float,
-    y: c_float,
-    width: c_float,
-    height: c_float,
-) -> c_longlong {
-    if native_ptr == 0 {
-        return 0;
-    }
-    if is_canvas {
-        let mut canvas_native = CanvasNative::from_ptr(native_ptr);
-        let rect = Rect::new(x, y, width + x, height + y);
-        &canvas_native.path.add_rect(rect, None);
-        canvas_native.into_ptr()
-    } else {
-        let mut path: Box<Path> = unsafe { Box::from_raw(native_ptr as *mut _) };
-        let rect = Rect::new(x, y, width + x, height + y);
-        path.add_rect(rect, None);
-        Box::into_raw(path) as *mut _ as i64
-    }
-}
-
-
-#[inline]
-pub(crate) fn set_global_composite_operation(
-    canvas_ptr: c_longlong,
-    composite: *const c_char,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    if let Ok(new_operation) = unsafe { CStr::from_ptr(composite as *mut _) }.to_str() {
-        if let Some(operation) = CanvasCompositeOperationType::value_from_str(new_operation) {
-            canvas_native
-                .paint
-                .set_blend_mode(global_composite_operation.get_blend_mode());
-            canvas_native.global_composite_operation = operation;
-        }
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-#[allow(unused)]
-pub(crate) fn set_font(canvas_ptr: c_longlong, font: *const c_char) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    unsafe {
-        match CStr::from_ptr(font as *mut _).to_str() {
-            Ok(font_str) => match parse_font(font_str) {
-                Ok(font) => {
-                    canvas_native.font = font;
-                }
-                _ => {}
-            },
-            _ => {}
-        }
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn get_font(canvas_ptr: c_longlong) -> *const c_char {
-    if canvas_ptr {
-        null()
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    if let Ok(string) = CString::new(canvas_native.font.get_font_details().clone()) {
-        string.into_raw()
-    }
-    // should never happen
-    null()
-}
-
-#[inline]
-pub(crate) fn draw_image(
-    canvas_ptr: c_longlong,
-    image_array: *const u8,
-    image_size: size_t,
-    original_width: c_int,
-    original_height: c_int,
-    dx: c_float,
-    dy: c_float,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let image_slice: &[u8] = unsafe { std::slice::from_raw_parts(image_array, image_size) };
-    let data = Data::new_copy(image_slice);
-    let info = ImageInfo::new(
-        ISize::new(original_width, original_height),
-        ColorType::RGBA8888,
-        AlphaType::Premul,
-        None,
-    );
-    let image_new = Image::from_raster_data(&info, data, (original_width * 4) as usize);
-    let canvas = surface.canvas();
-    let mut paint = canvas_native.paint.clone();
-    paint.set_alpha_f(canvas_native.al)
-    if canvas_native.image_smoothing_enabled {
-        match canvas_native.image_smoothing_quality.as_str() {
-            "low" => {
-                paint.set_filter_quality(FilterQuality::Low);
-            }
-            "medium" => {
-                paint.set_filter_quality(FilterQuality::Medium);
-            }
-            "high" => {
-                paint.set_filter_quality(FilterQuality::High);
-            }
-            _ => {}
-        }
-    } else {
-        paint.set_filter_quality(FilterQuality::None);
-    }
-
-    if image_new.is_some() {
-        canvas.draw_image(&image_new.unwrap(), Point::new(dx, dy), Some(&paint));
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn draw_image_dw(
-    canvas_ptr: c_longlong,
-    image_array: *const u8,
-    image_size: size_t,
-    original_width: c_int,
-    original_height: c_int,
-    dx: c_float,
-    dy: c_float,
-    d_width: c_float,
-    d_height: c_float,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let image_slice: &[u8] =
-        unsafe { std::slice::from_raw_parts(image_array as *mut _, image_size) };
-    let data = Data::new_copy(image_slice);
-    let info = ImageInfo::new(
-        ISize::new(original_width, original_height),
-        ColorType::RGBA8888,
-        AlphaType::Premul,
-        None,
-    );
-    let image_new = Image::from_raster_data(&info, data, (original_width * 4) as usize);
-    if image_new.is_some() {
-        let mut paint = Paint::default();
-        paint.set_anti_alias(true);
-        paint.set_blend_mode(canvas_native.fill_paint.blend_mode());
-        if canvas_native.image_smoothing_enabled {
-            match canvas_native.image_smoothing_quality.as_str() {
-                "low" => {
-                    paint.set_filter_quality(FilterQuality::Low);
-                }
-                "medium" => {
-                    paint.set_filter_quality(FilterQuality::Medium);
-                }
-                "high" => {
-                    paint.set_filter_quality(FilterQuality::High);
-                }
-                _ => {}
-            }
-        } else {
-            paint.set_filter_quality(FilterQuality::None);
-        }
-
-        canvas.draw_image_rect(
-            &image_new.unwrap(),
-            None,
-            Rect::new(dx, dy, d_width + dx, d_height + dy),
-            &paint,
-        );
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn draw_image_sw(
-    canvas_ptr: c_longlong,
-    image_array: *const u8,
-    image_size: size_t,
-    original_width: c_int,
-    original_height: c_int,
-    sx: c_float,
-    sy: c_float,
-    s_width: c_float,
-    s_height: c_float,
-    dx: c_float,
-    dy: c_float,
-    d_width: c_float,
-    d_height: c_float,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let image_slice: &[u8] =
-        unsafe { std::slice::from_raw_parts(image_array as *mut _, image_size) };
-
-    let data = Data::new_copy(image_slice);
-    let info = ImageInfo::new(
-        ISize::new(original_width, original_height),
-        ColorType::RGBA8888,
-        AlphaType::Premul,
-        None,
-    );
-    let image_new = Image::from_raster_data(&info, data, (original_width * 4) as usize);
-
-    if image_new.is_some() {
-        let src_rect = Rect::new(sx, sy, s_width + sx, s_height + sy);
-        let mut paint = Paint::default();
-        paint.set_anti_alias(true);
-        paint.set_blend_mode(canvas_native.fill_paint.blend_mode());
-        if canvas_native.image_smoothing_enabled {
-            match canvas_native.image_smoothing_quality.as_str() {
-                "low" => {
-                    paint.set_filter_quality(FilterQuality::Low);
-                }
-                "medium" => {
-                    paint.set_filter_quality(FilterQuality::Medium);
-                }
-                "high" => {
-                    paint.set_filter_quality(FilterQuality::High);
-                }
-                _ => {}
-            }
-        } else {
-            paint.set_filter_quality(FilterQuality::None);
-        }
-
-        canvas.draw_image_rect(
-            &image_new.unwrap(),
-            Some((&src_rect, SrcRectConstraint::Strict)),
-            Rect::new(dx, dy, d_width + dx, d_height + dy),
-            &paint,
-        );
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn draw_image_encoded(
-    canvas_ptr: c_longlong,
-    image_array: *const u8,
-    image_size: size_t,
-    _original_width: c_int,
-    _original_height: c_int,
-    dx: c_float,
-    dy: c_float,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let image_slice: &[u8] = unsafe { std::slice::from_raw_parts(image_array, image_size) };
-    let data = Data::new_copy(image_slice);
-    let canvas = surface.canvas();
-    if let Some(image) = Image::from_encoded(data) {
-        let mut paint = Paint::default();
-        paint.set_anti_alias(true);
-        paint.set_blend_mode(canvas_native.fill_paint.blend_mode());
-        canvas.draw_image(image, Point::new(dx, dy), Some(&paint));
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn draw_image_dw_encoded(
-    canvas_ptr: c_longlong,
-    image_array: *const u8,
-    image_size: size_t,
-    _original_width: c_int,
-    _original_height: c_int,
-    dx: c_float,
-    dy: c_float,
-    d_width: c_float,
-    d_height: c_float,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let image_slice: &[u8] =
-        unsafe { std::slice::from_raw_parts(image_array as *mut _, image_size) };
-
-    let data = Data::new_copy(image_slice);
-    if let Some(image) = Image::from_encoded(data) {
-        let mut paint = Paint::default();
-        paint.set_anti_alias(true);
-        paint.set_blend_mode(canvas_native.fill_paint.blend_mode());
-        let tmp_paint = canvas_native.fill_paint.clone();
-        canvas.draw_image_rect(
-            image,
-            None,
-            Rect::new(dx, dy, d_width + dx, d_height + dy),
-            &tmp_paint,
-        );
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn draw_image_sw_encoded(
-    canvas_ptr: c_longlong,
-    image_array: *const u8,
-    image_size: size_t,
-    _original_width: c_int,
-    _original_height: c_int,
-    sx: c_float,
-    sy: c_float,
-    s_width: c_float,
-    s_height: c_float,
-    dx: c_float,
-    dy: c_float,
-    d_width: c_float,
-    d_height: c_float,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let image_slice: &[u8] =
-        unsafe { std::slice::from_raw_parts(image_array as *mut _, image_size) };
-
-    let data = Data::new_copy(image_slice);
-    if let Some(image) = Image::from_encoded(data) {
-        let src_rect = Rect::new(sx, sy, s_width + sx, s_height + sy);
-        let mut paint = Paint::default();
-        paint.set_anti_alias(true);
-        paint.set_blend_mode(canvas_native.fill_paint.blend_mode());
-        let tmp_paint = canvas_native.fill_paint.clone();
-        canvas.draw_image_rect(
-            image,
-            Some((&src_rect, SrcRectConstraint::Strict)),
-            Rect::new(dx, dy, d_width + dx, d_height + dy),
-            &tmp_paint,
-        );
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn save(canvas_ptr: c_longlong) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    canvas.save();
-    let count = canvas.save_count();
-    let size = &canvas_native.font.size().clone();
-    let canvas_state = CanvasState {
-        paint: canvas_native.paint.clone(),
-        font: canvas_native.font.clone(),
-        path: canvas_native.path.clone(),
-        line_dash_offset: canvas_native.line_dash_offset,
-        shadow_blur: canvas_native.shadow_blur,
-        shadow_color: canvas_native.shadow_color,
-        shadow_offset: canvas_native.shadow_offset.clone(),
-        image_smoothing_enabled: canvas_native.image_smoothing_enabled,
-        image_smoothing_quality: canvas_native.image_smoothing_quality.clone(),
-        device_scale: canvas_native.device_scale,
-        text_align: canvas_native.text_align.clone(),
-        ios: canvas_native.ios.clone(),
-        global_composite_operation: canvas_native.global_composite_operation.clone(),
-        line_cap: canvas_native.line_cap.clone(),
-        line_join: canvas_native.line_join.clone(),
-        direction: canvas_native.direction.clone(),
-        miter_limit: canvas_native.miter_limit,
-        surface_kind: canvas_native.surface_kind.clone(),
-        filter: canvas_native.filter.clone(),
-    };
-
-    let state = &mut canvas_native.state;
-    state.push(CanvasStateItem::new(
-        Box::into_raw(Box::new(canvas_state)) as *mut _ as i64,
-        count,
-    ));
-
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn restore(canvas_ptr: c_longlong) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    canvas.restore();
-    let state_item = canvas_native.state.pop();
-    if state_item.is_some() {
-        let item = state_item.unwrap();
-        //canvas.restore_to_count(item.count);
-        if item.state > 0 {
-            let canvas_state: Box<CanvasState> = unsafe { Box::from_raw(item.state as *mut _) };
-            canvas_native.restore_from_state_box(canvas_state);
-        }
-    }
-    canvas_native.into_ptr()
-}
-
-
-#[inline]
-pub(crate) fn set_line_cap(canvas_ptr: c_longlong, line_cap: *const c_char) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let cap = unsafe { CStr::from_ptr(line_cap as *mut _) }
-        .to_str()
-        .unwrap_or("butt");
-    match cap {
-        "round" => {
-            canvas_native.stroke_paint.set_stroke_cap(Cap::Round);
-            canvas_native.line_cap = "round".to_string();
-        }
-        "square" => {
-            canvas_native.stroke_paint.set_stroke_cap(Cap::Square);
-            canvas_native.line_cap = "square".to_string();
-        }
-        _ => {
-            canvas_native.stroke_paint.set_stroke_cap(Cap::Butt);
-            canvas_native.line_cap = "butt".to_string();
-        }
-    };
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_line_join(canvas_ptr: c_longlong, line_cap: *const c_char) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let cap = unsafe { CStr::from_ptr(line_cap as *mut _) }
-        .to_str()
-        .unwrap_or("miter");
-    match cap {
-        "round" => {
-            canvas_native.stroke_paint.set_stroke_join(Join::Round);
-            canvas_native.line_join = "round".to_string();
-        }
-        "bevel" => {
-            canvas_native.stroke_paint.set_stroke_join(Join::Bevel);
-            canvas_native.line_join = "bevel".to_string();
-        }
-        _ => {
-            canvas_native.stroke_paint.set_stroke_join(Join::Miter);
-            canvas_native.line_join = "miter".to_string();
-        }
-    };
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_global_alpha(canvas_ptr: c_longlong, alpha: u8) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.paint.set_alpha(alpha);
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_miter_limit(canvas_ptr: c_longlong, limit: f32) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.stroke_paint.set_stroke_miter(limit);
-    canvas_native.miter_limit = limit;
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_line_dash_offset(canvas_ptr: c_longlong, offset: f32) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.line_dash_offset = offset;
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_shadow_blur(canvas_ptr: c_longlong, limit: f32) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.shadow_blur = limit;
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_shadow_color(canvas_ptr: c_longlong, color: u32) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.shadow_color = color;
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_shadow_offset_x(canvas_ptr: c_longlong, x: f32) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.shadow_offset_x = x;
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_shadow_offset_y(canvas_ptr: c_longlong, y: f32) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    canvas_native.shadow_offset_y = y;
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn get_measure_text(
-    canvas_ptr: c_longlong,
-    text: *const c_char,
-) -> *mut CanvasTextMetrics {
-    let mut metrics = CanvasTextMetrics { width: 0.0 };
-    if canvas_ptr == 0 {
-        return Box::into_raw(Box::new(metrics));
-    }
-    let canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let string = unsafe { CStr::from_ptr(text as *const _).to_str().unwrap_or("") };
-    let measurement = canvas_native.font.measure_str(string, None);
-    metrics.width = measurement.0;
-    canvas_native.into_ptr();
-    Box::into_raw(Box::new(metrics))
-}
-
-
-#[inline]
-pub(crate) fn put_image_data(
-    canvas_ptr: c_longlong,
-    data: *const u8,
-    data_size: size_t,
-    width: c_int,
-    height: c_int,
-    x: c_float,
-    y: c_float,
-    dirty_x: c_float,
-    dirty_y: c_float,
-    dirty_width: c_int,
-    dirty_height: c_int,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let array = unsafe { std::slice::from_raw_parts(data, data_size) };
-    // is surface is opaque use AlphaType::Opaque
-    let mut _w = width;
-    let mut _h = height;
-    if dirty_width > -1 {
-        _w = dirty_width;
-    }
-    if dirty_height > -1 {
-        _h = dirty_height
-    }
-    let info = ImageInfo::new(
-        ISize::new(width, height),
-        ColorType::RGBA8888,
-        AlphaType::Premul,
-        None,
-    );
-    let row_bytes = (width * 4) as usize;
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let _did_write = canvas.write_pixels(
-        &info,
-        &array,
-        row_bytes,
-        IPoint::new((x + dirty_x) as i32, (y + dirty_y) as i32),
-    );
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn get_image_data(
-    canvas_ptr: c_longlong,
-    sx: c_float,
-    sy: c_float,
-    sw: size_t,
-    sh: size_t,
-) -> (c_longlong, Vec<u8>) {
-    let pixels = Vec::new();
-    if canvas_ptr == 0 {
-        return (0, pixels);
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    let mut info = ImageInfo::new_n32_premul(ISize::new(sw as i32, sh as i32), None);
-    let row_bytes = info.width() * 4;
-    let mut slice = vec![255u8; (row_bytes * info.height()) as usize];
-    let _read = canvas.read_pixels(
-        &mut info,
-        slice.as_mut_slice(),
-        row_bytes as usize,
-        IPoint::new(sx as _, sy as _),
-    );
-    let ptr = canvas_native.into_ptr();
-    (ptr, slice)
-}
-
-#[allow(unused)]
-#[inline]
-pub(crate) fn free_image_data(data: *const u8) {
-    Box::from(data);
-}
-
-#[inline]
-pub(crate) fn set_image_smoothing_enabled(canvas_ptr: c_longlong, enabled: bool) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    update_quality(enabled, canvas_ptr)
-}
-
-#[inline]
-pub(crate) fn set_image_smoothing_quality(
-    canvas_ptr: c_longlong,
-    quality: *const c_char,
-) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    match unsafe { CStr::from_ptr(quality).to_str() } {
-        Ok("high") => {
-            canvas_native.image_smoothing_quality = FilterQuality::High;
-        }
-        Ok("medium") => {
-            canvas_native.image_smoothing_quality = FilterQuality::Medium;
-        }
-        Ok("low") => {
-            canvas_native.image_smoothing_quality = FilterQuality::Low;
-        }
-        _ => {}
-    }
-
-    if canvas_native.image_smoothing_enabled {
-        canvas_native
-            .paint
-            .set_filter_quality(canvas_native.image_smoothing_quality);
-    } else {
-        canvas_native.paint.set_filter_quality(FilterQuality::None);
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn set_text_align(canvas_ptr: c_longlong, alignment: *const c_char) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-
-    let text_alignment = unsafe { CStr::from_ptr(alignment as *const _) };
-    if let Ok(text_alignment) = text_alignment.to_str() {
-        canvas_native.text_align = to_text_align(text_alignment);
-    }
-    canvas_native.into_ptr()
-}
-
-#[inline]
-pub(crate) fn reset_transform(canvas_ptr: c_longlong) -> c_longlong {
-    if canvas_ptr == 0 {
-        return 0;
-    }
-    let mut canvas_native = CanvasNative::from_ptr(canvas_ptr);
-    let surface = &mut canvas_native.surface;
-    let canvas = surface.canvas();
-    canvas.reset_matrix();
-    canvas_native.into_ptr()
-}
-
-#[allow(unused)]
-#[inline]
-pub(crate) fn add_path_to_path(
-    path_native_ptr: c_longlong,
-    path_to_add_native_ptr: c_longlong,
-) -> c_longlong {
-    if path_native_ptr > 0 && path_to_add_native_ptr > 0 {
-        let mut path: Box<Path> = unsafe { Box::from_raw(path_native_ptr as *mut _) };
-        let mut path_to_add: Box<Path> = unsafe { Box::from_raw(path_to_add_native_ptr as *mut _) };
-        let matrix = Matrix::default();
-        path.add_path_matrix(&path_to_add, &matrix, None);
-        Box::into_raw(path_to_add);
-        return Box::into_raw(path) as *mut _ as i64;
-    }
-    path_native_ptr
-}
-
-#[inline]
-pub(crate) fn add_path_to_path_with_matrix(
-    path_native_ptr: c_longlong,
-    path_to_add_native_ptr: c_longlong,
-    matrix: c_longlong,
-) -> c_longlong {
-    if path_native_ptr > 0 && path_to_add_native_ptr > 0 {
-        let mut path: Box<Path> = unsafe { Box::from_raw(path_native_ptr as *mut _) };
-        let path_to_add: Box<Path> = unsafe { Box::from_raw(path_to_add_native_ptr as *mut _) };
-        let matrix_to_add: Matrix;
-        if matrix == 0 {
-            matrix_to_add = Matrix::default();
-        } else {
-            let matrix: Box<Matrix> = unsafe { Box::from_raw(matrix as *mut _) };
-            matrix_to_add = *(matrix.clone());
-        }
-        path.add_path_matrix(&path_to_add, &matrix_to_add, None);
-        Box::into_raw(path_to_add);
-        return Box::into_raw(path) as *mut _ as i64;
-    }
-    path_native_ptr
-}
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_images/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_images/mod.rs
index a5c549fd0..7caa078fd 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_images/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_images/mod.rs
@@ -1,5 +1,5 @@
-use skia_safe::{Image, Point, Rect};
 use skia_safe::canvas::SrcRectConstraint;
+use skia_safe::{Image, Rect};
 
 use crate::common::context::Context;
 
@@ -18,14 +18,13 @@ impl Context {
         let mut paint = self.state.paint.image_paint().clone();
         self.surface.canvas().draw_image_rect_with_sampling_options(
             image,
-            Some(&src_rect),
+            Some((&src_rect, SrcRectConstraint::Strict)),
             dst_rect,
             skia_safe::SamplingOptions::from_filter_quality(
                 self.state.image_smoothing_quality.into(),
                 None,
             ),
             &paint,
-            SrcRectConstraint::Strict,
         );
     }
 
@@ -44,7 +43,6 @@ impl Context {
                 None,
             ),
             &paint,
-            SrcRectConstraint::Strict,
         );
     }
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_paths/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_paths/mod.rs
index 54fe8c158..4ecb057ca 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_paths/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_paths/mod.rs
@@ -1,12 +1,10 @@
 use std::borrow::BorrowMut;
 
-use skia_safe::{ClipOp, Matrix, PathOp, Point};
-use skia_safe::image_filters::drop_shadow;
-use skia_safe::path::FillType;
+use skia_safe::{ClipOp, Matrix, Point};
 
-use crate::common::context::Context;
 use crate::common::context::drawing_paths::fill_rule::FillRule;
 use crate::common::context::paths::path::Path;
+use crate::common::context::Context;
 
 pub mod fill_rule;
 
@@ -25,7 +23,7 @@ impl Context {
         }
 
         if let Some(rule) = fill_rule {
-            let path = path.unwrap_or(self.path.borrow_mut());
+            let mut path = path.unwrap_or(self.path.borrow_mut());
             path.path.set_fill_type(rule.to_fill_type());
 
             if let Some(paint) = self.state.paint.fill_shadow_paint(
@@ -87,7 +85,7 @@ impl Context {
         y: f32,
         rule: FillRule,
     ) -> bool {
-        let path = path.unwrap_or(&self.path);
+        let mut path = path.unwrap_or(&self.path).clone();
         let total_matrix = self.surface.canvas().local_to_device_as_3x3();
         let invertible = is_invertible(&total_matrix);
         if !invertible {
@@ -98,7 +96,7 @@ impl Context {
         }
         let matrix = total_matrix.clone();
         let inverse = matrix.invert().unwrap();
-        let point: Point = (x, y).into();
+        let mut point: Point = (x, y).into();
         let transformed_point = inverse.map_point(point);
         let mut path_to_compare = path.path.clone();
         path_to_compare.set_fill_type(rule.to_fill_type());
@@ -106,7 +104,7 @@ impl Context {
     }
 
     pub fn is_point_in_stroke(&mut self, path: Option<&Path>, x: f32, y: f32) -> bool {
-        let path = path.unwrap_or(&self.path);
+        let path = path.unwrap_or(&self.path).clone();
         let matrix = self.surface.canvas().local_to_device_as_3x3();
         let invertible = is_invertible(&matrix);
         if !invertible {
@@ -116,7 +114,7 @@ impl Context {
             return false;
         }
         let inverse = matrix.invert().unwrap();
-        let point: Point = (x, y).into();
+        let mut point: Point = (x, y).into();
         let transformed_point = inverse.map_point(point);
         let path_to_compare = path.path.clone();
         path_to_compare.contains(transformed_point)
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_rectangles.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_rectangles.rs
index c4b1abe87..7317e5484 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_rectangles.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_rectangles.rs
@@ -1,9 +1,10 @@
 use std::os::raw::c_float;
 
-use skia_safe::{BlendMode, Paint, Rect};
 use skia_safe::paint::Style;
+use skia_safe::{BlendMode, Paint, Rect};
 
 use crate::common::context::Context;
+use crate::common::prelude::*;
 
 impl Context {
     pub fn clear_rect(&mut self, x: c_float, y: c_float, width: c_float, height: c_float) {
@@ -11,23 +12,35 @@ impl Context {
         paint.set_anti_alias(true);
         paint.set_style(Style::Fill);
         paint.set_blend_mode(BlendMode::Clear);
-        self.surface
-            .canvas()
-            .draw_rect(Rect::from_xywh(x, y, width, height), &paint);
+        self.surface.canvas().draw_rect(
+            Rect::from_xywh(x, y, width, height),
+            &paint,
+        );
     }
 
-
     pub fn fill_rect(&mut self, rect: &Rect) {
-        if let Some(paint) = self.state.paint.fill_shadow_paint(self.state.shadow_offset, self.state.shadow_color, self.state.shadow_blur) {
+        if let Some(paint) = self.state.paint.fill_shadow_paint(
+            self.state.shadow_offset,
+            self.state.shadow_color,
+            self.state.shadow_blur,
+        ) {
             self.surface.canvas().draw_rect(rect, &paint);
         }
-        self.surface.canvas().draw_rect(rect, self.state.paint.fill_paint());
+        self.surface
+            .canvas()
+            .draw_rect(rect, self.state.paint.fill_paint());
     }
 
     pub fn stroke_rect(&mut self, rect: &Rect) {
-        if let Some(paint) = &mut self.state.paint.stroke_shadow_paint(self.state.shadow_offset, self.state.shadow_color, self.state.shadow_blur) {
+        if let Some(paint) = &mut self.state.paint.stroke_shadow_paint(
+            self.state.shadow_offset,
+            self.state.shadow_color,
+            self.state.shadow_blur,
+        ) {
             self.surface.canvas().draw_rect(rect, &paint);
         }
-        self.surface.canvas().draw_rect(rect, self.state.paint.stroke_paint());
+        self.surface
+            .canvas()
+            .draw_rect(rect, self.state.paint.stroke_paint());
     }
 }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/mod.rs
index 53a561177..a8320bebd 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/mod.rs
@@ -1,12 +1,12 @@
 use std::os::raw::c_float;
 
-use skia_safe::{Paint, Point, Size};
 use skia_safe::paint::Style;
+use skia_safe::{Point, Size};
 
-use crate::common::context::Context;
 use crate::common::context::drawing_text::text_metrics::TextMetrics;
 use crate::common::context::drawing_text::typography::{get_font_baseline, to_real_text_align};
 use crate::common::context::text_styles::text_align::TextAlign;
+use crate::common::context::Context;
 use crate::common::utils::geometry::inflate_stroke_rect;
 
 pub mod text_metrics;
@@ -124,20 +124,19 @@ impl Context {
         let ascent = metrics.ascent;
         let descent = metrics.descent;
         let baseline_y = get_font_baseline(metrics, self.state.text_baseline);
-
         TextMetrics {
             width,
             actual_bounding_box_left: -bounds.x(),
             actual_bounding_box_right: bounds.right(),
-            font_bounding_box_ascent: ascent - baseline_y,
-            font_bounding_box_descent: descent + baseline_y,
-            actual_bounding_box_ascent: -bounds.y() - baseline_y,
-            actual_bounding_box_descent: bounds.bottom() + baseline_y,
+            font_bounding_box_ascent: (ascent - baseline_y),
+            font_bounding_box_descent: (descent + baseline_y),
+            actual_bounding_box_ascent: (-bounds.y() - baseline_y),
+            actual_bounding_box_descent: (bounds.bottom() + baseline_y),
             em_height_ascent: 0.0,
             em_height_descent: 0.0,
-            hanging_baseline: -0.8 * ascent + baseline_y,
+            hanging_baseline: (-0.8 * ascent + baseline_y),
             alphabetic_baseline: baseline_y,
-            ideographic_baseline: descent + baseline_y,
+            ideographic_baseline: (descent + baseline_y),
         }
     }
 }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/text_metrics.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/text_metrics.rs
index 59d746977..8738b1094 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/text_metrics.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/text_metrics.rs
@@ -1,7 +1,7 @@
 use std::os::raw::c_float;
 
 #[repr(C)]
-#[derive(Clone)]
+#[derive(Clone,Copy, Debug)]
 pub struct TextMetrics {
     pub(crate) width: c_float,
     pub(crate) actual_bounding_box_left: c_float,
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/typography.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/typography.rs
index 0af31556f..7eb009878 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/typography.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/drawing_text/typography.rs
@@ -1,25 +1,25 @@
 use std::os::raw::c_float;
 
 use skia_safe::{
-    BlurStyle,
     font_style::{Slant, Weight, Width},
-    FontMetrics, FontMgr, FontStyle, FontStyleSet, MaskFilter, Paint, Point, Size, typeface::Typeface,
+    typeface::Typeface,
+     FontMetrics, FontMgr, FontStyle
 };
-use skia_safe::paint::Style;
 
-use crate::common::context::Device;
-use crate::common::context::text_styles::text_align::TextAlign;
-use crate::common::context::text_styles::text_baseline::TextBaseLine;
-use crate::common::context::text_styles::text_direction::TextDirection;
-use crate::common::utils::dimensions::parse_size;
+use crate::{
+    common::context::text_styles::text_align::TextAlign,
+    common::context::text_styles::text_baseline::TextBaseLine,
+    common::context::text_styles::text_direction::TextDirection, common::context::Device,
+    common::utils::dimensions::parse_size,
+};
 
-const XX_SMALL: &'static str = "9px";
-const X_SMALL: &'static str = "10px";
-const SMALL: &'static str = "13px";
-const MEDIUM: &'static str = "16px";
-const LARGE: &'static str = "18px";
-const X_LARGE: &'static str = "24px";
-const XX_LARGE: &'static str = "32px";
+const XX_SMALL: &str = "9px";
+const X_SMALL: &str = "10px";
+const SMALL: &str = "13px";
+const MEDIUM: &str = "16px";
+const LARGE: &str = "18px";
+const X_LARGE: &str = "24px";
+const XX_LARGE: &str = "32px";
 
 pub(crate) fn get_font_baseline(metrics: FontMetrics, baseline: TextBaseLine) -> f32 {
     match baseline {
@@ -66,24 +66,20 @@ pub(crate) fn to_real_text_align(align: TextAlign, direction: TextDirection) ->
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Font {
     pub(crate) font_details: String,
-    density: c_float,
 }
 
 impl Font {
-    pub fn new(font_details: &str, density: c_float) -> Self {
-        // setting as 1 for now
-        let density = 1.0;
+    pub fn new(font_details: &str) -> Self {
         Self {
-            font_details: font_details.to_string(),
-            density,
+            font_details: font_details.into(),
         }
     }
 
     pub fn get_font_details(&self) -> &str {
-        self.font_details.as_str()
+        self.font_details.as_ref()
     }
 
     pub fn get_font(&self, device: Device) -> skia_safe::Font {
@@ -104,14 +100,13 @@ pub(crate) fn parse_font(font: &str, device: Device) -> Result<(String, skia_saf
         let mut weight = "normal".to_string();
         let mut width = "normal".to_string();
         let mut line_height = "normal".to_string();
-        let mut family = "sans-serif";
-
+        let mut family = "sans-serif".to_string();
 
         match (font_size_line_height, font_families) {
             (Some(font_size_line_height), Some(_)) => {
                 if let Ok(result) = to_size_line_height(font_size_line_height) {
-                    font_size = result.0;
-                    line_height = result.1;
+                    font_size = result.0.into();
+                    line_height = result.1.into();
                 } else {
                     return Err(());
                 }
@@ -123,19 +118,19 @@ pub(crate) fn parse_font(font: &str, device: Device) -> Result<(String, skia_saf
 
         for prop in data.into_iter().take(size - 2) {
             match prop.as_str() {
-                "italic" | "oblique" => style = prop,
-                "small-caps" => variant = prop,
+                "italic" | "oblique" => style = prop.into(),
+                "small-caps" => variant = prop.into(),
                 "bold" | "bolder" | "lighter" | "thin" | "100" | "200" | "300" | "400" | "500"
-                | "600" | "700" | "800" | "900" => weight = prop,
+                | "600" | "700" | "800" | "900" => weight = prop.into(),
                 "ultra-condensed" | "extra-condensed" | "condensed" | "semi-condensed"
                 | "semi-expanded" | "expanded" | "extra-expanded" | "ultra-expanded" => {
-                    width = prop
+                    width = prop.into()
                 }
                 _ => {}
             }
         }
 
-        let style = to_font_style(weight.as_str(), width.as_str(), style.as_str());
+        let style = to_font_style(weight.as_ref(), width.as_ref(), style.as_ref());
         let mut families: Vec<_> = family.split("/").collect();
         let mut families: Vec<String> = families
             .into_iter()
@@ -156,7 +151,10 @@ pub(crate) fn parse_font(font: &str, device: Device) -> Result<(String, skia_saf
         }
         return Ok((
             font.to_string(),
-            skia_safe::Font::from_typeface(default_typeface, Some(parse_size(font_size.as_str(), device))),
+            skia_safe::Font::from_typeface(
+                default_typeface,
+                Some(parse_size(font_size.as_ref(), device)),
+            ),
         ));
     }
     Err(())
@@ -211,7 +209,7 @@ fn to_size_line_height(value: &str) -> Result<(String, String), ()> {
     }
 
     if let Some(size) = size {
-        return Ok((size.to_string(), line_height.to_string()));
+        return Ok((size.into(), line_height.into()));
     }
 
     Err(())
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/mod.rs
index 3d2f0830a..14eba7cba 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/mod.rs
@@ -1,7 +1,4 @@
-use skia_safe::Color;
-
-use crate::common::context::Context;
-use crate::common::context::fill_and_stroke_styles::paint::PaintStyle;
+use crate::{common::context::fill_and_stroke_styles::paint::PaintStyle, common::context::Context};
 
 pub mod gradient;
 pub mod paint;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/paint.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/paint.rs
index 2d6eeb9f3..40282cdac 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/paint.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/paint.rs
@@ -1,10 +1,7 @@
 use std::os::raw::c_float;
 
-use skia_safe::{
-    BlurStyle, Color, FilterQuality, Image, MaskFilter, PathEffect, Point, Shader, TileMode,
-};
-use skia_safe::gradient_shader::GradientShaderColors;
 use skia_safe::paint::{Cap, Style};
+use skia_safe::{Color, FilterQuality, Point};
 
 use crate::common::context::fill_and_stroke_styles::gradient::Gradient;
 use crate::common::context::fill_and_stroke_styles::pattern::Pattern;
@@ -49,6 +46,7 @@ impl Paint {
     pub fn image_smoothing_quality_set(&mut self, image_smoothing_quality: FilterQuality) {
         self.image_smoothing_quality = image_smoothing_quality
     }
+
     fn update_paint_style(&mut self, is_fill: bool) {
         let style;
         if is_fill {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/pattern.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/pattern.rs
index d4c21e247..9bc994c03 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/pattern.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/fill_and_stroke_styles/pattern.rs
@@ -1,6 +1,6 @@
-use skia_safe::{Data, Image, SamplingOptions, Shader, TileMode};
+use skia_safe::{ Image, SamplingOptions, Shader, TileMode};
+
 
-use crate::common::context::image_smoothing::ImageSmoothingQuality;
 use crate::common::context::matrix::Matrix;
 
 #[repr(C)]
@@ -43,7 +43,10 @@ pub struct Pattern {
 }
 
 impl Pattern {
-    pub fn to_pattern_shader(pattern: &Pattern, image_smoothing_quality: skia_safe::FilterQuality) -> Option<Shader> {
+    pub fn to_pattern_shader(
+        pattern: &Pattern,
+        image_smoothing_quality: skia_safe::FilterQuality,
+    ) -> Option<Shader> {
         let mode: (TileMode, TileMode) = match pattern.repetition {
             Repetition::NoRepeat => (TileMode::Clamp, TileMode::Clamp),
             Repetition::RepeatX => (TileMode::Repeat, TileMode::Clamp),
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/filters.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/filters.rs
index 16a8ce62e..05ca2a1e1 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/filters.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/filters.rs
@@ -1,6 +1,6 @@
 use std::f32::consts::PI;
 
-use skia_safe::{color_filters, image_filters, ImageFilter, Point, table_color_filter, TileMode};
+use skia_safe::{color_filters, image_filters, table_color_filter, Point, TileMode};
 
 use crate::common::context::Context;
 use crate::common::utils::color::parse_color;
@@ -301,11 +301,8 @@ impl Context {
                     }
                 }
                 FilterType::DropShadow(shadow) => {
-                    let shadow = shadow
-                        .replace("drop-shadow(", "")
-                        .replace(")", "");
-                    let value: Vec<&str> = shadow.split(" ")
-                        .collect();
+                    let shadow = shadow.replace("drop-shadow(", "").replace(")", "");
+                    let value: Vec<&str> = shadow.split(" ").collect();
                     if value.len() < 3 {
                         return chain;
                     }
@@ -349,8 +346,14 @@ impl Context {
             });
 
         self.state.filter = value.to_string();
-        self.state.paint.fill_paint_mut().set_image_filter(filter.clone());
-        self.state.paint.stroke_paint_mut().set_image_filter(filter.clone());
+        self.state
+            .paint
+            .fill_paint_mut()
+            .set_image_filter(filter.clone());
+        self.state
+            .paint
+            .stroke_paint_mut()
+            .set_image_filter(filter.clone());
         self.state.paint.image_paint_mut().set_image_filter(filter);
     }
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_asset.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_asset.rs
index e09a74a60..0b012cdae 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_asset.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_asset.rs
@@ -2,7 +2,7 @@ use std::ffi::{CStr, CString};
 use std::io::{Read, Seek, SeekFrom};
 use std::os::raw::{c_char, c_uint};
 use std::ptr::{null, null_mut};
-use std::str::FromStr;
+
 
 use image::{GenericImageView, ImageFormat};
 use image::imageops::FilterType;
@@ -59,11 +59,6 @@ enum ByteType {
     RGB,
 }
 
-#[allow(unused)]
-pub(crate) fn to_byte_slice(buf: &mut [i8]) -> &mut [u8] {
-    unsafe { std::mem::transmute(buf) }
-}
-
 
 impl ImageAsset {
     pub fn new() -> Self {
@@ -283,7 +278,6 @@ impl ImageAsset {
         }
     }
 
-
     pub fn bytes_internal(&mut self) -> Vec<u8> {
         self.bytes_internal_with(ByteType::Default)
     }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_smoothing.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_smoothing.rs
index 23d5984f7..8122601ef 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_smoothing.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/image_smoothing.rs
@@ -47,7 +47,7 @@ impl Into<i32> for ImageSmoothingQuality {
     }
 }
 
-impl Context {
+impl Context{
     pub fn set_image_smoothing_enabled(&mut self, value: bool) {
         self.state.image_smoothing_enabled = value;
     }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/line_styles/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/line_styles/mod.rs
index 3b8b0e4ad..d64fa98bb 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/line_styles/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/line_styles/mod.rs
@@ -1,11 +1,11 @@
 use std::os::raw::c_float;
 
-use skia_safe::paint::{Cap, Join};
 use skia_safe::PathEffect;
 
-use crate::common::context::Context;
 use crate::common::context::line_styles::line_cap::LineCap;
 use crate::common::context::line_styles::line_join::LineJoin;
+use crate::common::context::Context;
+use std::borrow::Cow;
 
 pub mod line_cap;
 pub mod line_join;
@@ -25,7 +25,10 @@ impl Context {
 
     pub fn set_line_cap(&mut self, cap: LineCap) {
         self.state.line_cap = cap;
-        self.state.paint.stroke_paint_mut().set_stroke_cap(cap.into());
+        self.state
+            .paint
+            .stroke_paint_mut()
+            .set_stroke_cap(cap.into());
     }
 
     pub fn line_cap(&self) -> LineCap {
@@ -38,7 +41,10 @@ impl Context {
 
     pub fn set_line_join(&mut self, join: LineJoin) {
         self.state.line_join = join;
-        self.state.paint.stroke_paint_mut().set_stroke_join(join.into());
+        self.state
+            .paint
+            .stroke_paint_mut()
+            .set_stroke_join(join.into());
     }
 
     pub fn miter_limit(&self) -> c_float {
@@ -53,30 +59,35 @@ impl Context {
             .set_stroke_miter(limit);
     }
 
+
+
     pub fn set_line_dash(&mut self, dash: &[c_float]) {
-        let line_dash: Vec<f32>;
+        // TODO ?
+        let line_dash: Cow<[f32]>;
         let is_odd = (dash.len() % 2) != 0;
         if is_odd {
-            line_dash = [dash, dash].concat()
+            line_dash = Cow::from([dash, dash].concat())
         } else {
-            line_dash = dash.to_vec()
+            line_dash = dash.into()
         }
         let mut effect: Option<PathEffect> = None;
         if !line_dash.is_empty() {
-            effect = PathEffect::dash(line_dash.as_slice(), self.state.line_dash_offset);
+            effect = PathEffect::dash(line_dash.as_ref(), self.state.line_dash_offset);
         }
-        self.state.line_dash_list = line_dash;
+        let slice = line_dash.as_ref();
+        self.state.line_dash_list.splice(..,slice.iter().cloned());
         self.state.paint.stroke_paint_mut().set_path_effect(effect);
     }
 
     pub fn line_dash(&self) -> &[c_float] {
-        self.state.line_dash_list.as_slice()
+        self.state.line_dash_list.as_ref()
     }
 
     pub fn set_line_dash_offset(&mut self, offset: c_float) {
+        // TODO ?
         self.state.line_dash_offset = offset;
-        let dash = self.state.line_dash_list.to_vec();
-        self.set_line_dash(dash.as_slice());
+        let list  = self.state.line_dash_list.clone();
+        self.set_line_dash(list.as_slice());
     }
 
     pub fn line_dash_offset(&self) -> c_float {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/mod.rs
index 9870b4aa6..a386cc37d 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/mod.rs
@@ -1,18 +1,18 @@
 use std::os::raw::c_float;
 
 use skia_safe::{Color, Point, SamplingOptions, Surface};
-use skia_safe::canvas::SrcRectConstraint;
-use skia_safe::paint::Style;
-
-use crate::common::context::compositing::composite_operation_type::CompositeOperationType;
-use crate::common::context::drawing_text::typography::Font;
-use crate::common::context::fill_and_stroke_styles::paint::Paint;
-use crate::common::context::image_smoothing::ImageSmoothingQuality;
-use crate::common::context::line_styles::line_cap::LineCap;
-use crate::common::context::line_styles::line_join::LineJoin;
-use crate::common::context::paths::path::Path;
-use crate::common::context::text_styles::{
-    text_align::TextAlign, text_baseline::TextBaseLine, text_direction::TextDirection,
+
+use crate::{
+    common::context::compositing::composite_operation_type::CompositeOperationType,
+    common::context::drawing_text::typography::Font,
+    common::context::fill_and_stroke_styles::paint::Paint,
+    common::context::image_smoothing::ImageSmoothingQuality,
+    common::context::line_styles::line_cap::LineCap,
+    common::context::line_styles::line_join::LineJoin,
+    common::context::paths::path::Path,
+    common::context::text_styles::{
+        text_align::TextAlign, text_baseline::TextBaseLine, text_direction::TextDirection,
+    },
 };
 
 pub mod drawing_images;
@@ -96,10 +96,15 @@ impl State {
         }
     }
     pub fn from_device(device: Device, direction: TextDirection) -> Self {
-        let mut font = Font::new("10px sans-serif", device.density);
+        let mut font = Font::new("10px sans-serif");
+        let mut paint = Paint::default();
+        paint
+            .stroke_paint_mut()
+            .set_stroke_width(1.)
+            .set_stroke_miter(10.);
         Self {
             direction,
-            paint: Paint::default(),
+            paint,
             font,
             text_align: TextAlign::default(),
             text_baseline: TextBaseLine::default(),
@@ -112,9 +117,9 @@ impl State {
             line_cap: LineCap::default(),
             line_join: LineJoin::default(),
             miter_limit: 10.0,
-            line_dash_list: vec![],
+            line_dash_list: Default::default(),
             line_dash_offset: 0.0,
-            filter: "none".to_string(),
+            filter: "none".into(),
             global_alpha: 1.0,
             global_composite_operation: CompositeOperationType::default(),
         }
@@ -135,6 +140,7 @@ impl Context {
     pub fn device(&self) -> &Device {
         &self.device
     }
+
     pub fn reset_state(&mut self) {
         let direction = self.state.direction;
         self.state = State::from_device(self.device, direction);
@@ -153,7 +159,7 @@ impl Context {
         let src_surface = &mut self.surface;
         src_surface.draw(
             surface.canvas(),
-            (0, 0),
+            Point::new(0., 0.),
             SamplingOptions::from_filter_quality(skia_safe::FilterQuality::High, None),
             None,
         )
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/paths/path.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/paths/path.rs
index d966cbd33..c7ebbbb7f 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/paths/path.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/paths/path.rs
@@ -1,7 +1,7 @@
 use std::f32::consts::PI;
 use std::os::raw::c_float;
 
-use skia_safe::{PathDirection, Point, Rect};
+use skia_safe::{Point, Rect};
 
 use crate::common::context::matrix::Matrix;
 use crate::common::utils::geometry::{almost_equal, to_degrees};
@@ -21,6 +21,13 @@ impl Path {
     pub fn path(&self) -> &skia_safe::Path {
         &self.path
     }
+
+    pub fn make_scale(&mut self, (sx, sy): (f32, f32)) -> Self {
+        Self {
+            path: self.path.make_scale((sx, sy)),
+        }
+    }
+
     pub fn new() -> Self {
         Self {
             path: skia_safe::Path::default(),
@@ -110,7 +117,6 @@ impl Path {
         self.path.transform(&rotated);
     }
 
-
     pub fn add_path(&mut self, path: &Path, matrix: Option<&Matrix>) {
         match matrix {
             None => {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/image_data.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/image_data.rs
index f23c15e2c..2c290d499 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/image_data.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/image_data.rs
@@ -7,6 +7,7 @@ pub struct ImageData {
     pub(crate) data_len: usize,
     width: c_int,
     height: c_int,
+    pub(crate) scale: f32
 }
 
 impl ImageData {
@@ -25,6 +26,7 @@ impl ImageData {
             height,
             data,
             data_len,
+            scale: 1.
         }
     }
 
@@ -38,11 +40,11 @@ impl ImageData {
     }
 
     pub fn width(&self) -> i32 {
-        self.width
+        (self.width as f32 / self.scale) as i32
     }
 
     pub fn height(&self) -> i32 {
-        self.height
+        (self.height as f32 / self.scale) as i32
     }
 
     pub fn data(&self) -> &[u8] {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/mod.rs
index 1bd4f4f61..9ccae9ba1 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/pixel_manipulation/mod.rs
@@ -1,9 +1,9 @@
 use std::os::raw::{c_float, c_int};
 
-use skia_safe::{AlphaType, Bitmap, ColorType, Image, ImageInfo, IPoint, ISize, IVector, Point, Rect};
+use skia_safe::{AlphaType, ColorType, IPoint, ISize, IVector, ImageInfo, Rect};
 
-use crate::common::context::Context;
 use crate::common::context::pixel_manipulation::image_data::ImageData;
+use crate::common::context::Context;
 
 pub mod image_data;
 
@@ -12,8 +12,19 @@ impl Context {
         ImageData::new(width, height)
     }
 
-    pub fn get_image_data(&mut self, sx: c_float, sy: c_float, sw: c_float, sh: c_float) -> ImageData {
-        let info = ImageInfo::new_n32_premul(ISize::new(sw as i32, sh as i32), None);
+    pub fn get_image_data(
+        &mut self,
+        sx: c_float,
+        sy: c_float,
+        sw: c_float,
+        sh: c_float,
+    ) -> ImageData {
+        let info = ImageInfo::new(
+            ISize::new(sw as i32, sh as i32),
+            ColorType::RGBA8888,
+            AlphaType::Unpremul,
+            None,
+        );
         let row_bytes = info.width() * 4;
         let mut slice = vec![255u8; (row_bytes * info.height()) as usize];
         let _ = self.surface.canvas().read_pixels(
@@ -84,8 +95,11 @@ impl Context {
 
             row_bytes = (sw * 4.0) as usize;
         }
-        let _ = self.surface
-            .canvas()
-            .write_pixels(&info, &data.data(), row_bytes, IVector::new(dx as i32, dy as i32));
+        let _ = self.surface.canvas().write_pixels(
+            &info,
+            &data.data(),
+            row_bytes,
+            IVector::new(dx as i32, dy as i32),
+        );
     }
 }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/shadows.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/shadows.rs
index e97021048..0240903d1 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/shadows.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/shadows.rs
@@ -6,6 +6,7 @@ use crate::common::context::Context;
 
 impl Context {
     pub fn set_shadow_blur(&mut self, blur: c_float) {
+        // TODO ?
         self.state.shadow_blur = blur;
     }
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/svg.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/svg.rs
deleted file mode 100644
index 4c7e8d768..000000000
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/svg.rs
+++ /dev/null
@@ -1,331 +0,0 @@
-#[repr(C)]
-pub struct SVGCanvasNative {
-    pub(crate) surface: Surface,
-    pub(crate) context: Option<Context>,
-}
-
-
-pub(crate) fn draw_svg_image(svg_canvas_native_ptr: c_longlong, svg: *const c_char) -> c_longlong {
-    if svg_canvas_native_ptr == 0 {
-        return 0;
-    }
-    let mut svg_canvas_native: Box<SVGCanvasNative> =
-        unsafe { Box::from_raw(svg_canvas_native_ptr as *mut _) };
-    let svg_surface = &mut svg_canvas_native.surface;
-    let canvas = svg_surface.canvas();
-    let mut rect = Rect::new_empty();
-    let mut svg_canvas = Canvas::new(rect.clone(), None);
-    if !svg.is_null() {
-        let svg_string = unsafe { CStr::from_ptr(svg as _) };
-        let string = svg_string.to_str().unwrap_or("");
-        if !string.is_empty() {
-            let mut reader = Reader::from_str(string);
-            let mut buf = Vec::new();
-            loop {
-                match reader.read_event(&mut buf) {
-                    Ok(Event::Start(ref e)) => match e.name() {
-                        b"svg" => {
-                            let attributes = e.attributes().map(|a| a.unwrap()).collect::<Vec<_>>();
-                            for attribute in attributes.iter() {
-                                let key = String::from_utf8_lossy(attribute.key).to_string();
-                                let val = attribute.unescape_and_decode_value(&reader).unwrap();
-                                match key.as_str() {
-                                    "width" => {
-                                        &rect.set_wh(val.parse::<f32>().unwrap(), rect.height());
-                                    }
-                                    "height" => {
-                                        &rect.set_wh(rect.width(), val.parse::<f32>().unwrap());
-                                    }
-                                    _ => {}
-                                }
-                            }
-                            svg_canvas = Canvas::new(rect.clone(), None);
-                        }
-                        b"circle" => {
-                            let attributes = e.attributes().map(|a| a.unwrap()).collect::<Vec<_>>();
-                            let mut path = Path::new();
-                            let mut fill_paint = Paint::default();
-                            fill_paint.set_anti_alias(true);
-                            fill_paint.set_style(Style::Fill);
-                            let mut stroke_paint = Paint::default();
-                            stroke_paint.set_anti_alias(true);
-                            stroke_paint.set_style(Style::Stroke);
-                            let mut point = Point::new(0.0, 0.0);
-                            let mut radius = 0f32;
-                            for attribute in attributes.iter() {
-                                let key = String::from_utf8_lossy(attribute.key).to_string();
-                                let val = attribute.unescape_and_decode_value(&reader).unwrap();
-                                match key.as_str() {
-                                    "cx" => {
-                                        point.x = val.parse::<f32>().unwrap();
-                                    }
-                                    "cy" => {
-                                        point.y = val.parse::<f32>().unwrap();
-                                    }
-                                    "r" => {
-                                        radius = val.parse::<f32>().unwrap();
-                                    }
-                                    "stroke" => {
-                                        &stroke_paint
-                                            .set_color(ColorParser::from_str(val.as_str()));
-                                    }
-                                    "stroke-width" => {
-                                        &stroke_paint.set_stroke_width(val.parse::<f32>().unwrap());
-                                    }
-                                    "fill" => {
-                                        &fill_paint.set_color(ColorParser::from_str(val.as_str()));
-                                    }
-                                    _ => {}
-                                }
-                            }
-                            path.add_circle(point, radius, None);
-                            &svg_canvas.draw_path(&path, &fill_paint);
-                            &svg_canvas.draw_path(&path, &stroke_paint);
-                        }
-                        b"text" => {}
-                        _ => {}
-                    },
-                    Ok(Event::Empty(ref e)) => match e.name() {
-                        b"circle" => {
-                            let attributes = e.attributes().map(|a| a.unwrap()).collect::<Vec<_>>();
-                            let mut path = Path::new();
-                            let mut fill_paint = Paint::default();
-                            fill_paint.set_anti_alias(true);
-                            fill_paint.set_anti_alias(true);
-                            fill_paint.set_style(Style::Fill);
-                            let mut stroke_paint = Paint::default();
-                            stroke_paint.set_anti_alias(true);
-                            stroke_paint.set_style(Style::Stroke);
-                            let mut point = Point::new(0.0, 0.0);
-                            let mut radius = 0f32;
-                            for attribute in attributes.iter() {
-                                let key = String::from_utf8_lossy(attribute.key).to_string();
-                                let val = attribute.unescape_and_decode_value(&reader).unwrap();
-                                match key.as_str() {
-                                    "cx" => {
-                                        point.x = val.parse::<f32>().unwrap();
-                                    }
-                                    "cy" => {
-                                        point.y = val.parse::<f32>().unwrap();
-                                    }
-                                    "r" => {
-                                        radius = val.parse::<f32>().unwrap();
-                                    }
-                                    "stroke" => {
-                                        &stroke_paint
-                                            .set_color(ColorParser::from_str(val.as_str()));
-                                    }
-                                    "stroke-width" => {
-                                        &stroke_paint.set_stroke_width(val.parse::<f32>().unwrap());
-                                    }
-                                    "fill" => {
-                                        &fill_paint.set_color(ColorParser::from_str(val.as_str()));
-                                    }
-                                    _ => {}
-                                }
-                            }
-                            path.add_circle(point, radius, None);
-                            &canvas.draw_path(&path, &fill_paint);
-                            &canvas.draw_path(&path, &stroke_paint);
-                        }
-                        b"rect" => {
-                            let attributes = e.attributes().map(|a| a.unwrap()).collect::<Vec<_>>();
-                            let mut path = Path::new();
-                            let mut fill_paint = Paint::default();
-                            fill_paint.set_anti_alias(true);
-                            fill_paint.set_style(Style::Fill);
-                            let mut stroke_paint = Paint::default();
-                            stroke_paint.set_anti_alias(true);
-                            stroke_paint.set_style(Style::Stroke);
-                            let mut rect = Rect::new_empty();
-                            for attribute in attributes.iter() {
-                                let key = String::from_utf8_lossy(attribute.key).to_string();
-                                let val = attribute.unescape_and_decode_value(&reader).unwrap();
-                                match key.as_str() {
-                                    "width" => {
-                                        rect.right = val.parse::<f32>().unwrap();
-                                    }
-                                    "height" => {
-                                        rect.bottom = val.parse::<f32>().unwrap();
-                                    }
-                                    "style" => {
-                                        let mut styles = StyleParser::from_str(val.as_ref());
-                                        for style in styles.iter() {
-                                            match style.0 {
-                                                "width" => {
-                                                    rect.right = style.1.parse::<f32>().unwrap();
-                                                }
-                                                "height" => {
-                                                    rect.bottom = style.1.parse::<f32>().unwrap();
-                                                }
-                                                "stroke" => {
-                                                    &stroke_paint
-                                                        .set_color(ColorParser::from_str(style.1));
-                                                }
-                                                "stroke-width" => {
-                                                    &stroke_paint.set_stroke_width(
-                                                        style.1.parse::<f32>().unwrap(),
-                                                    );
-                                                }
-                                                "fill" => {
-                                                    &fill_paint
-                                                        .set_color(ColorParser::from_str(style.1));
-                                                }
-                                                "stroke-opacity" => {
-                                                    &stroke_paint.set_alpha(
-                                                        (style.1.parse::<f32>().unwrap_or(1.0)
-                                                            * 255.0)
-                                                            as u8,
-                                                    );
-                                                }
-                                                "fill-opacity" => {
-                                                    &fill_paint.set_alpha(
-                                                        (style.1.parse::<f32>().unwrap_or(1.0)
-                                                            * 255.0)
-                                                            as u8,
-                                                    );
-                                                }
-                                                _ => {}
-                                            }
-                                        }
-                                    }
-                                    "stroke" => {
-                                        &stroke_paint
-                                            .set_color(ColorParser::from_str(val.as_str()));
-                                    }
-                                    "stroke-width" => {
-                                        &stroke_paint.set_stroke_width(val.parse::<f32>().unwrap());
-                                    }
-                                    "fill" => {
-                                        &fill_paint.set_color(ColorParser::from_str(val.as_str()));
-                                    }
-                                    "stroke-opacity" => {
-                                        &stroke_paint.set_alpha(val.parse::<u8>().unwrap_or(255));
-                                    }
-                                    "fill-opacity" => {
-                                        &fill_paint.set_alpha(val.parse::<u8>().unwrap_or(255));
-                                    }
-                                    _ => {}
-                                }
-                            }
-                            path.add_rect(rect, None);
-                            &canvas.draw_path(&path, &fill_paint);
-                            &canvas.draw_path(&path, &stroke_paint);
-                        }
-                        b"path" => {
-                            let attributes = e.attributes().map(|a| a.unwrap()).collect::<Vec<_>>();
-                            let mut path = Path::new();
-                            let mut fill_paint = Paint::default();
-                            fill_paint.set_anti_alias(true);
-                            fill_paint.set_style(Style::Fill);
-                            let mut stroke_paint = Paint::default();
-                            stroke_paint.set_anti_alias(true);
-                            stroke_paint.set_style(Style::Stroke);
-                            let mut fill = false;
-                            let mut stroke = false;
-                            for attribute in attributes.iter() {
-                                let key = String::from_utf8_lossy(attribute.key).to_string();
-                                let val = attribute.unescape_and_decode_value(&reader).unwrap();
-                                match key.as_str() {
-                                    "d" => path = from_svg(val.as_str()).unwrap_or(Path::new()),
-                                    "stroke" => {
-                                        let value = val.as_str();
-                                        stroke = !value.eq("none");
-                                        &stroke_paint.set_color(ColorParser::from_str(value));
-                                    }
-                                    "stroke-width" => {
-                                        &stroke_paint.set_stroke_width(val.parse::<f32>().unwrap());
-                                    }
-                                    "fill" => {
-                                        let value = val.as_str();
-                                        fill = !value.eq("none");
-                                        &fill_paint.set_color(ColorParser::from_str(value));
-                                    }
-                                    _ => {}
-                                }
-                            }
-                            if fill {
-                                &canvas.draw_path(&path, &fill_paint);
-                            }
-
-                            if stroke {
-                                &canvas.draw_path(&path, &stroke_paint);
-                            }
-                        }
-                        _ => {}
-                    },
-                    Ok(Event::Text(e)) => {
-                        /* let font_native_type_face = Typeface::from_name("sans-serif", font_native_style).unwrap_or(Typeface::default());
-                        let font = Font::from_typeface(&font_native_type_face, 10.0);
-                        let blob = TextBlob::from_str(e.unescape_and_decode(&reader).unwrap(), &font);
-                        let mut paint = Paint::default();
-                        let mut point = Point::new(0.0, 0.0);
-                        &canvas.draw_text_blob(&blob.unwrap(), &point, &paint);*/
-                    }
-                    Ok(Event::End(ref e)) => {}
-                    Ok(Event::Eof) => break,
-                    Err(e) => panic!("Error at position {}: {:?}", reader.buffer_position(), e),
-                    _ => (), //
-                }
-                buf.clear();
-            }
-        }
-
-        canvas.flush();
-    }
-    Box::into_raw(svg_canvas_native) as *mut _ as i64
-}
-
-pub(crate) struct StyleParser {}
-
-impl StyleParser {
-    pub fn from_str(style: &str) -> Vec<(&str, &str)> {
-        let mut values: Vec<(_, _)> = Vec::new();
-        let mut styles: Vec<&str> = style.split(";").collect();
-        for style in styles.iter() {
-            let value = *style;
-            let key_value: Vec<_> = value.split(":").collect();
-            let default = "";
-            let k = key_value.get(0).unwrap_or(&default).to_owned();
-            let v = key_value.get(1).unwrap_or(&default).to_owned();
-            values.push((k, v));
-        }
-        values
-    }
-}
-
-pub(crate) struct ColorParser {}
-
-impl ColorParser {
-    pub fn is_color(value: &str) -> bool {
-        value.starts_with("#") || value.starts_with("rgb") || value.starts_with("hsl")
-    }
-    pub fn from_str(color: &str) -> Color {
-        let mut value = color.to_lowercase();
-        if value.starts_with("#") {
-            Color::BLACK
-        } else if value.starts_with("rgb") {
-            value = value.replace("rgba(", "");
-            value = value.replace("rgb(", "");
-            value = value.replace(")", "");
-            let mut rgb_rgba: Vec<_> = value.split(",").collect();
-            let default = "255";
-            let mut r = rgb_rgba.get(0).unwrap_or(&default).parse().unwrap_or(255);
-            let mut g = rgb_rgba.get(1).unwrap_or(&default).parse().unwrap_or(255);
-            let mut b = rgb_rgba.get(2).unwrap_or(&default).parse().unwrap_or(255);
-            let mut a = rgb_rgba.get(3).unwrap_or(&default).parse().unwrap_or(255);
-
-            Color::from_argb(a, r, g, b)
-        } else if value.starts_with("hsl") {
-            Color::BLACK
-        } else {
-            match value.as_str() {
-                "red" => Color::RED,
-                "blue" => Color::BLUE,
-                "green" => Color::GREEN,
-                "pink" => Color::from_rgb(255, 192, 203),
-                _ => Color::BLACK,
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_decoder.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_decoder.rs
index 5a8d261b9..f5e63b197 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_decoder.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_decoder.rs
@@ -1,4 +1,4 @@
-use std::ffi::{CStr, CString};
+use std::ffi::{ CString};
 
 use encoding_rs::UTF_8;
 
@@ -14,17 +14,6 @@ impl TextDecoder {
         Self { decoder }
     }
 
-    // fn handle_slice(&self, res: Vec<u8>) -> &'static str {
-    //     unsafe {
-    //         let mut utf8_src = res.as_slice();
-    //         let nul_range_end = utf8_src
-    //             .iter()
-    //             .position(|&c| c == b'\0')
-    //             .unwrap_or(utf8_src.len()); // default to length if no `\0` present
-    //         let data = &utf8_src[0..nul_range_end];
-    //         std::str::from_utf8_unchecked(data)
-    //     }
-    // }
 
     pub fn decode(&mut self, data: *const u8, len: usize) -> CString {
         let txt = unsafe { std::slice::from_raw_parts(data, len) };
@@ -36,7 +25,6 @@ impl TextDecoder {
             .position(|&c| c == b'\0')
             .unwrap_or(utf8_src.len()); // default to length if no `\0` present
         let data = &utf8_src[0..nul_range_end];
-        // let c_str = unsafe { CStr::from_bytes_with_nul_unchecked(data) };
         let str = unsafe { std::str::from_utf8_unchecked(data) };
         CString::new(str).unwrap()
     }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_styles/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_styles/mod.rs
index 272847afc..d0f880d4f 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_styles/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/text_styles/mod.rs
@@ -1,9 +1,9 @@
+use crate::common::context::drawing_text::typography::parse_font;
 use crate::{
-    common::context::Context,
     common::context::text_styles::text_align::TextAlign,
-    common::context::text_styles::text_baseline::TextBaseLine, common::context::text_styles::text_direction::TextDirection,
+    common::context::text_styles::text_baseline::TextBaseLine,
+    common::context::text_styles::text_direction::TextDirection, common::context::Context,
 };
-use crate::common::context::drawing_text::typography::parse_font;
 
 pub mod text_align;
 pub mod text_baseline;
@@ -20,7 +20,7 @@ impl Context {
 
     pub fn set_font(&mut self, font: &str) {
         if let Ok(font) = parse_font(font, self.device) {
-            self.state.font.font_details = font.0;
+            self.state.font.font_details = font.0.into();
         }
     }
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/transformations.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/transformations.rs
index b64e376d4..15c3e478c 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/transformations.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/context/transformations.rs
@@ -32,14 +32,13 @@ impl Context {
         f: c_float,
     ) {
         let affine = [a, b, c, d, e, f];
-        let transform = Matrix::from_affine(&affine);
+        let mut transform = Matrix::from_affine(&affine);
         self.surface.canvas().concat(&transform);
     }
 
     pub fn transform_with_matrix(&mut self, matrix: &Matrix) {
         let mut current = self.surface.canvas().local_to_device_as_3x3();
         current.pre_concat(matrix);
-        // self.surface.canvas().concat(matrix);
         let m = M44::from(&current);
         self.surface.canvas().set_matrix(&m);
     }
@@ -54,13 +53,14 @@ impl Context {
         f: c_float,
     ) {
         let affine = [a, b, c, d, e, f];
-        let matrix = Matrix::from_affine(&affine);
+        let mut matrix = Matrix::from_affine(&affine);
         let m44 = M44::from(matrix);
         self.surface.canvas().set_matrix(&m44);
     }
 
     pub fn set_transform_matrix(&mut self, matrix: &Matrix) {
         self.surface.canvas().reset_matrix();
+        let mut matrix = matrix.clone();
         let m44 = M44::from(matrix);
         self.surface.canvas().set_matrix(&m44);
     }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/image_bitmap.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/image_bitmap.rs
index 3748ccae8..5c930703a 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/image_bitmap.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/image_bitmap.rs
@@ -234,7 +234,7 @@ pub(crate) fn create_image_bitmap(
                     bytes.as_mut_slice(),
                     (out_width * 4.) as usize,
                 );
-                image.scale_pixels(
+                let _ = image.scale_pixels(
                     &pixel_map,
                     ImageBitmapResizeQuality::from(resize_quality).to_quality(),
                     None,
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/mod.rs
index a33f63f10..048f1cecb 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/mod.rs
@@ -1,9 +1,6 @@
 use std::os::raw::c_int;
 
-use skia_safe::{
-    AlphaType, ColorType, EncodedImageFormat, ImageInfo, IPoint, ISize, SamplingOptions, Size,
-    Surface,
-};
+use skia_safe::{AlphaType, ColorType, EncodedImageFormat, ImageInfo, IPoint, ISize, SamplingOptions, Surface, Point};
 use skia_safe::image::CachingHint;
 
 use crate::common::context::Context;
@@ -13,6 +10,7 @@ pub mod ffi;
 pub(crate) mod svg;
 pub(crate) mod utils;
 pub mod image_bitmap;
+pub mod prelude;
 
 pub(crate) fn to_data_url(context: &mut Context, format: &str, quality: c_int) -> String {
     let surface = &mut context.surface;
@@ -62,7 +60,7 @@ pub(crate) fn to_data(context: &mut Context) -> Vec<u8> {
     let mut info = ImageInfo::new(
         ISize::new(width, height),
         ColorType::RGBA8888,
-        AlphaType::Premul,
+        AlphaType::Unpremul,
         None,
     );
     let row_bytes = info.width() * 4;
@@ -92,7 +90,7 @@ pub(crate) fn flush_custom_surface(context: *mut Context, width: i32, height: i3
             let dst_canvas = dst_surface.canvas();
             context.surface.draw(
                 dst_canvas,
-                Size::new(0.0, 0.0),
+                Point::new(0., 0.),
                 SamplingOptions::from_filter_quality(skia_safe::FilterQuality::High, None),
                 None,
             );
@@ -135,7 +133,7 @@ pub(crate) fn snapshot_canvas_raw(context: *mut Context) -> Vec<u8> {
         let mut dst_canvas = dst_surface.canvas();
         surface.draw(
             dst_canvas,
-            Size::new(0.0, 0.0),
+            Point::new(0., 0.),
             SamplingOptions::from_filter_quality(skia_safe::FilterQuality::High, None),
             None,
         );
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/prelude.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/prelude.rs
new file mode 100644
index 000000000..d79e976ce
--- /dev/null
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/prelude.rs
@@ -0,0 +1,19 @@
+use skia_safe::{Rect};
+
+pub trait ScaleUtils {
+    fn scale(&mut self, x: f32, y: f32);
+    fn from_scale(rect: skia_safe::Rect, x: f32, y: f32) -> Self;
+}
+
+impl ScaleUtils for skia_safe::Rect {
+    fn scale(&mut self, x: f32, y: f32) {
+        self.left *= x;
+        self.right *= x;
+        self.top *= y;
+        self.bottom *= y;
+    }
+
+    fn from_scale(rect: skia_safe::Rect, x: f32, y: f32) -> Self {
+        Rect::from_xywh(rect.left * x, rect.top * y, rect.right * x, rect.bottom * y)
+    }
+}
\ No newline at end of file
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/attribute_names.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/attribute_names.rs
index cd530c3a7..803735ffd 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/attribute_names.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/attribute_names.rs
@@ -4,15 +4,15 @@ use std::str::FromStr;
 use phf::phf_map;
 use roxmltree::Node;
 
-use crate::common::{context::drawing_paths::fill_rule, svg::elements::element_names::ElementName};
 use crate::common::svg::elements::parser::StyleMap;
 use crate::common::svg::elements::prelude::*;
 use crate::common::svg::enums::preserve_aspect_ratio::{
     AlignMeetOrSlice, AspectRatioAlign, AspectRatioMeetOrSlice,
 };
-use crate::common::svg::error::Error;
+
 use crate::common::svg::units::length::Length;
 use crate::common::svg::view_box::ViewBox;
+use crate::common::{svg::elements::element_names::ElementName};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum Attribute {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/gradients/radial.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/gradients/radial.rs
index cbf397d12..42e48a70d 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/gradients/radial.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/gradients/radial.rs
@@ -6,12 +6,12 @@ use skia_safe::{Color, Matrix};
 use crate::common::svg::attribute_names::{Attribute, NodeExt};
 use crate::common::svg::elements::element_names::ElementName;
 use crate::common::svg::elements::gradients::utils::handle_stop;
-use crate::common::svg::elements::parser::parse_transform;
+
 use crate::common::svg::elements::reference_element::ReferenceElement;
 use crate::common::svg::enums::spread_method::SpreadMethod;
 use crate::common::svg::units::length::{Length, LengthUnit};
 use crate::common::svg::units::Units;
-use crate::common::utils::color::parse_color;
+
 
 #[derive(Clone, Debug)]
 pub struct RadialGradient {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/renderer.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/renderer.rs
index f543f282a..e1905107a 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/renderer.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/renderer.rs
@@ -565,14 +565,14 @@ pub fn get_handle_mask(value: &str, root: Node) -> Option<Mask> {
     None
 }
 
-pub fn set_mask(
+pub fn set_mask<'a>(
     mask: &Mask,
     context: &mut Context,
     view_box: ViewBox,
     bounding_box: BoundingBox,
     root_element: Node,
     style: &StyleMap,
-) -> Option<(Context, skia_safe::Image, skia_safe::Rect)> {
+) -> Option<(Context<'a>, skia_safe::Image, skia_safe::Rect)> {
     if let Some(mask) = mask.create_mask(context, view_box, bounding_box, root_element) {
         let density = context.device.density;
         let alpha = context.device.alpha;
@@ -1004,7 +1004,6 @@ pub fn handle_render_child(
     let height = context.surface.height() as f32;
     let node = child;
     let tag = node.tag_name().name();
-    log::debug!("rendering tag {}", tag);
     if node.is_element() {
         match ElementName::from_str(tag) {
             None => {}
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/circle.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/circle.rs
index 0866e5ef3..f704c9f71 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/circle.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/circle.rs
@@ -1,21 +1,21 @@
 use std::collections::HashMap;
 use std::f32::consts::PI;
 
-use roxmltree::{Document, Node};
+use roxmltree::{Node};
 
 use crate::common::context::{Context, Device};
-use crate::common::context::compositing::composite_operation_type::CompositeOperationType;
-use crate::common::context::fill_and_stroke_styles::paint::PaintStyle;
-use crate::common::context::fill_and_stroke_styles::pattern::Repetition;
-use crate::common::context::paths::path::Path;
+
+
+
+
 use crate::common::svg::attribute_names::Attribute;
 use crate::common::svg::bounding_box::BoundingBox;
 use crate::common::svg::elements::parser::{Parser, StyleMap};
 use crate::common::svg::elements::renderer::{
-    handle_mask, handle_style_data, render_mask, Renderer, set_filters, set_mask,
+    handle_style_data, render_mask, Renderer, set_filters, set_mask,
 };
-use crate::common::svg::elements::svg::{create_context, Svg};
-use crate::common::svg::prelude::ColorConversation;
+
+
 use crate::common::svg::units::length::{convert_length, Length};
 use crate::common::svg::units::Units;
 use crate::common::svg::view_box::ViewBox;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/ellipse.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/ellipse.rs
index 0e0860b1f..05d3f5292 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/ellipse.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/ellipse.rs
@@ -1,19 +1,19 @@
 use std::collections::HashMap;
 use std::f32::consts::PI;
 
-use roxmltree::{Document, Node};
+use roxmltree::{Node};
 use skia_safe::{RCHandle, Rect};
 
 use crate::common::context::{Context, Device};
 use crate::common::svg::attribute_names::Attribute;
 use crate::common::svg::bounding_box::BoundingBox;
-use crate::common::svg::elements::mask::Mask;
+
 use crate::common::svg::elements::parser::{Parser, StyleMap};
 use crate::common::svg::elements::renderer::{
-    handle_mask, handle_style_data, render_mask, Renderer, set_filters, set_mask,
+    handle_style_data, render_mask, Renderer, set_filters, set_mask,
 };
-use crate::common::svg::elements::svg::{create_context, Svg};
-use crate::common::svg::prelude::ColorConversation;
+
+
 use crate::common::svg::units::length::{convert_length, Length};
 use crate::common::svg::units::Units;
 use crate::common::svg::view_box::ViewBox;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/line.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/line.rs
index 81e7fa486..074ef9603 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/line.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/line.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use roxmltree::{Document, Node};
+use roxmltree::{Node};
 use skia_safe::{Point, RCHandle, Rect};
 
 use crate::common::context::{Context, Device};
@@ -8,14 +8,14 @@ use crate::common::context::paths::path::Path;
 use crate::common::svg::attribute_names::Attribute;
 use crate::common::svg::bounding_box::BoundingBox;
 use crate::common::svg::elements::marker::{Marker, MarkerPosition};
-use crate::common::svg::elements::mask::Mask;
+
 use crate::common::svg::elements::parser::{Parser, StyleMap};
 use crate::common::svg::elements::reference_element::ReferenceElement;
 use crate::common::svg::elements::renderer::{
-    handle_mask, handle_style_data, render_mask, Renderer, set_filters, set_mask,
+    handle_style_data, render_mask, Renderer, set_filters, set_mask,
 };
-use crate::common::svg::elements::svg::{create_context, Svg};
-use crate::common::svg::prelude::ColorConversation;
+
+
 use crate::common::svg::units::length::{convert_length, Length};
 use crate::common::svg::units::Units;
 use crate::common::svg::view_box::ViewBox;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/path.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/path.rs
index 09dc1c356..4a1210f67 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/path.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/path.rs
@@ -1,17 +1,16 @@
 use std::collections::HashMap;
 
-use roxmltree::{Document, Node};
+use roxmltree::{ Node};
 
 use crate::common::context::{Context, Device};
 use crate::common::svg::attribute_names::Attribute;
 use crate::common::svg::bounding_box::BoundingBox;
-use crate::common::svg::elements::mask::Mask;
+
 use crate::common::svg::elements::parser::{Parser, StyleMap};
 use crate::common::svg::elements::renderer::{
-    handle_mask, handle_style_data, render_mask, Renderer, set_filters, set_mask,
+     handle_style_data, render_mask, Renderer, set_filters, set_mask,
 };
-use crate::common::svg::elements::svg::{create_context, Svg};
-use crate::common::svg::prelude::ColorConversation;
+
 use crate::common::svg::view_box::ViewBox;
 
 #[derive(Clone, Debug)]
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/polyshape.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/polyshape.rs
index a22d64a4c..cd28b34bf 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/polyshape.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/polyshape.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use roxmltree::{Document, Node};
+use roxmltree::{Node};
 
 use crate::common::context::{Context, Device};
 use crate::common::context::paths::path::Path;
@@ -13,7 +13,7 @@ use crate::common::svg::elements::reference_element::ReferenceElement;
 use crate::common::svg::elements::renderer::{
     handle_style_data, render_mask, Renderer, set_filters, set_mask,
 };
-use crate::common::svg::elements::svg::Svg;
+
 use crate::common::svg::view_box::ViewBox;
 
 #[derive(Clone, Debug)]
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/rect.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/rect.rs
index ff99ae890..735623957 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/rect.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/shapes/rect.rs
@@ -1,27 +1,27 @@
 use std::collections::HashMap;
-use std::str::FromStr;
 
-use roxmltree::{Document, Node};
+
+use roxmltree::{Node};
 
 use crate::common::context::{Context, Device};
-use crate::common::context::drawing_paths::fill_rule::FillRule;
-use crate::common::svg::attribute_names::{Attribute, NodeExt};
+
+use crate::common::svg::attribute_names::{Attribute};
 use crate::common::svg::bounding_box::BoundingBox;
-use crate::common::svg::elements::{clip_path::ClipPath, element_names::ElementName};
-use crate::common::svg::elements::filter::filter::Filter;
-use crate::common::svg::elements::filter::filter_element::FilterElement;
-use crate::common::svg::elements::filter::filter_in::FilterIn;
-use crate::common::svg::elements::gradients::linear::LinearGradient;
-use crate::common::svg::elements::gradients::radial::RadialGradient;
-use crate::common::svg::elements::parser::{parse_transform, Parser, StyleMap};
-use crate::common::svg::elements::reference_element::ReferenceElement;
+
+
+
+
+
+
+use crate::common::svg::elements::parser::{Parser, StyleMap};
+
 use crate::common::svg::elements::renderer::{
-    handle_clip, handle_color, handle_filter, handle_style, handle_style_data, render_mask,
+    handle_style_data, render_mask,
     Renderer, set_filters, set_mask,
 };
-use crate::common::svg::elements::svg::Svg;
-use crate::common::svg::enums::display::Display;
-use crate::common::svg::enums::visibility::Visibility;
+
+
+
 use crate::common::svg::units::length::{convert_length, Length};
 use crate::common::svg::units::Units;
 use crate::common::svg::view_box::ViewBox;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/svg.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/svg.rs
index d5c7aaccb..a0aac603b 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/svg.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/svg.rs
@@ -1,14 +1,13 @@
-
-use roxmltree::{Node};
+use roxmltree::Node;
 use skia_safe::{Color, ISize, Point, SamplingOptions, Surface, Vector};
 
-use crate::common::context::{Context, Device, State};
 use crate::common::context::paths::path::Path;
 use crate::common::context::text_styles::text_direction::TextDirection;
+use crate::common::context::{Context, Device, State};
 use crate::common::svg::attribute_names::{Attribute, NodeExt};
 use crate::common::svg::elements::element_names::ElementName;
-use crate::common::svg::elements::renderer::{handle_render_children};
-use crate::common::svg::enums::preserve_aspect_ratio::{AlignMeetOrSlice, view_box_to_transform};
+use crate::common::svg::elements::renderer::handle_render_children;
+use crate::common::svg::enums::preserve_aspect_ratio::{view_box_to_transform, AlignMeetOrSlice};
 use crate::common::svg::units::length::{convert_length, Length, LengthUnit};
 use crate::common::svg::units::Units;
 use crate::common::svg::view_box::ViewBox;
@@ -19,13 +18,13 @@ pub struct Svg<'a> {
     width: Length,
     height: Length,
     view_box: Option<ViewBox>,
-    context: Context,
+    context: Context<'a>,
     root_element: Node<'a, 'a>,
     preserve_aspect_ratio: AlignMeetOrSlice,
     needs_render: bool,
 }
 
-pub fn create_context(
+pub fn create_context<'a>(
     width: f32,
     height: f32,
     density: f32,
@@ -33,8 +32,7 @@ pub fn create_context(
     font_color: i32,
     ppi: f32,
     direction: TextDirection,
-) -> Context {
-    // let density = 1.0;
+) -> Context<'a> {
     let device = Device {
         width,
         height,
@@ -45,17 +43,20 @@ pub fn create_context(
         ppi,
     };
 
-    log::debug!("create ctx");
     let mut context = Context {
-        surface: Surface::new_raster_n32_premul(ISize::new(width as i32, height as i32)).unwrap(),
+        surface: Surface::new_raster_n32_premul(ISize::new(
+            (width * density) as i32,
+            (height * density) as i32,
+        ))
+        .unwrap(),
         path: Path::default(),
         state: State::from_device(device, direction),
         state_stack: vec![],
         font_color: Color::new(font_color as u32),
         device,
     };
-    log::debug!("done ctx");
-    context.set_miter_limit(4.0);
+
+    context.set_miter_limit(4.0 * density);
 
     context
 }
@@ -177,20 +178,21 @@ impl<'a> Svg<'a> {
                 &max_view_box,
             );
 
-            let mut context =
-                create_context(width, height, density, alpha, font_color, ppi, direction);
-
+            let mut context;
             let preserve_aspect_ratio = node.get_preserve_aspect_ratio();
 
             let mut vb = ViewBox::new(x, y, width, height);
             if let Some(view_box) = node.get_view_box() {
-                vb.x_set(view_box.x() * density);
-                vb.y_set(view_box.y() * density);
-                vb.width_set(view_box.width() * density);
-                vb.height_set(view_box.height() * density);
-
+                vb.x_set(view_box.x());
+                vb.y_set(view_box.y());
+                vb.width_set(view_box.width());
+                vb.height_set(view_box.height());
                 let mat = view_box_to_transform(&vb, preserve_aspect_ratio, max_width, max_height);
-                context.transform_with_matrix(&mat);
+                context = create_context(width, height, density, alpha, font_color, ppi, direction);
+
+                // context.transform_with_matrix(&mat);
+            } else {
+                context = create_context(width, height, density, alpha, font_color, ppi, direction);
             }
 
             let mut svg = Svg {
@@ -233,7 +235,7 @@ impl<'a> Svg<'a> {
         &self.context
     }
 
-    pub fn context_mut(&mut self) -> &mut Context {
+    pub fn context_mut(&mut self) -> &'a mut Context {
         &mut self.context
     }
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/symbol.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/symbol.rs
index c28a4f6b1..e65ef02bd 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/symbol.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/symbol.rs
@@ -127,7 +127,6 @@ impl Symbol {
         }
 
 
-        log::debug!("symbol_ctx");
         let preserve_aspect_ratio = node.get_preserve_aspect_ratio();
 
         let mut vb = ViewBox::new(x, y, width, height);
@@ -149,18 +148,14 @@ impl Symbol {
             symbol_ctx.translate(0.0, -1.0);
         }
 
-        log::debug!("before");
         for child in node.children().into_iter() {
             if child.is_element() {
-                log::debug!("rendering symbol {:?}", child.tag_name().name());
                 handle_render_child(&mut symbol_ctx, child, root_element, None, None)
             }
         }
 
         let ss = symbol_ctx.surface.image_snapshot();
-
-        log::debug!("image");
-
+        
         context.draw_image_with_points(&ss, 0.0, 0.0)
     }
 }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/use_element.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/use_element.rs
index 460fc4c30..e7ade7335 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/use_element.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/elements/use_element.rs
@@ -105,10 +105,8 @@ impl Renderer for Use {
             );
 
             if node.tag_name().name() == ElementName::Symbol.to_str() {
-                log::debug!("from_id");
                 Symbol::from_id(context, view_box, node, root_element);
             } else {
-                log::debug!("handle_render_child");
                 handle_render_child(
                     context,
                     node,
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/mod.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/mod.rs
index d2d9644a3..f96175c0f 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/mod.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/mod.rs
@@ -1,21 +1,21 @@
 use std::io::{Read, Seek, SeekFrom};
-use skia_safe::{
-    AlphaType, Color, ColorType, ImageFilter, ImageInfo, ISize, Paint, Point, Rect, Surface, Vector,
-};
-use skia_safe::paint::Style;
+// use skia_safe::{
+//     AlphaType, Color, ColorType, ImageFilter, ImageInfo, ISize, Paint, Point, Rect, Surface, Vector,
+// };
+// use skia_safe::paint::Style;
 
 use crate::common::context::{Context};
-mod attribute_names;
-mod bounding_box;
-mod elements;
-mod enums;
-mod error;
-mod prelude;
-mod units;
-mod view_box;
-use crate::common::svg::prelude::*;
+// mod attribute_names;
+// mod bounding_box;
+// mod elements;
+// mod enums;
+// mod error;
+// mod prelude;
+// mod units;
+// mod view_box;
+//use crate::common::svg::prelude::*;
 
-use self::elements::{element_names::ElementName, svg::Svg};
+//use self::elements::{element_names::ElementName, svg::Svg};
 
 pub(crate) fn draw_svg_from_path(context: &mut Context, path: &str) {
     let file = std::fs::File::open(path);
@@ -27,18 +27,19 @@ pub(crate) fn draw_svg_from_path(context: &mut Context, path: &str) {
             match result {
                 Ok(_) => {
                     let _ = reader.seek(SeekFrom::Start(0));
-                    // TODO check bytes to verify it's an svg
-
-                    let mut svg = Vec::new();
-                    match reader.read_to_end(&mut svg) {
-                        Ok(_) => {
-                            let svg = std::string::String::from_utf8_lossy(&svg);
-                            draw_svg(context, &svg);
+                    match skia_safe::svg::SvgDom::read(reader) {
+                        Ok(svg) => {
+                            let device = context.device;
+                            let canvas = context.surface.canvas();
+                            //canvas.scale((device.density, device.density));
+                            svg.render(canvas)
                         }
                         Err(e) => {
                             println!("svg read to string error: {}", e);
                         }
                     }
+                    // TODO check bytes to verify it's an svg
+
                 }
                 Err(e) => {
                     println!("svg file read error: {}", e);
@@ -52,7 +53,19 @@ pub(crate) fn draw_svg_from_path(context: &mut Context, path: &str) {
 }
 
 pub(crate) fn draw_svg(context: &mut Context, svg: &str) {
-    let mut svg = String::from(svg);
+    match skia_safe::svg::SvgDom::from_bytes(svg.as_bytes()) {
+        Ok(svg) => {
+            let device = context.device;
+            let canvas = context.surface.canvas();
+           // canvas.scale((device.density, device.density));
+            svg.render(canvas)
+        }
+        Err(e) => {
+            log::debug!("svg read to string error: {}", e);
+        }
+    }
+
+    /*
     if !svg.contains(r#"xmlns:xlink="http://www.w3.org/1999/xlink""#) {
         svg = svg.replace(
             "<svg ",
@@ -85,5 +98,5 @@ pub(crate) fn draw_svg(context: &mut Context, svg: &str) {
         Err(error) => {
             log::debug!("document parse error: {}", error);
         }
-    }
+    } */
 }
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/prelude.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/prelude.rs
index 64845bc2e..8e7ceab3e 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/prelude.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/prelude.rs
@@ -1,10 +1,10 @@
 use skia_safe::{Rect, Size};
 
-use crate::common::svg::attribute_names::NodeExt;
+
 use crate::common::svg::enums::preserve_aspect_ratio::{
     AlignMeetOrSlice, AspectRatioAlign, AspectRatioMeetOrSlice,
 };
-use crate::common::svg::error;
+
 use crate::common::svg::view_box::ViewBox;
 
 pub trait ColorConversation {
@@ -57,12 +57,10 @@ impl SizeUtils for skia_safe::Size {
 
         if aspect.align() == AspectRatioAlign::None {
             s
+        } else if aspect.meet_or_slice() == AspectRatioMeetOrSlice::Slice {
+            self.expand_to(s)
         } else {
-            if aspect.meet_or_slice() == AspectRatioMeetOrSlice::Slice {
-                self.expand_to(s)
-            } else {
-                self.scale_to(s)
-            }
+            self.scale_to(s)
         }
     }
 
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/units/length.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/units/length.rs
index 242f5d3f3..f03b420c4 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/units/length.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/units/length.rs
@@ -95,7 +95,7 @@ pub fn convert_length(
     let value = length.value;
     let dpi = device.ppi;
     match length.unit {
-        LengthUnit::None | LengthUnit::Px => value * device.density,
+        LengthUnit::None | LengthUnit::Px => value,
         LengthUnit::Pt => value * dpi / 72.0,
         LengthUnit::Pc => value * dpi / 6.0,
         LengthUnit::Em => value * 10.0, //(need to get parent font size)
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/view_box.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/view_box.rs
index 49eb0fd6d..3a3053035 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/view_box.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/svg/view_box.rs
@@ -1,4 +1,4 @@
-use std::iter::FromIterator;
+
 use std::str::FromStr;
 
 use crate::common::context::Context;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/dimensions.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/dimensions.rs
index 455ddbe44..120c155ac 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/dimensions.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/dimensions.rs
@@ -9,18 +9,18 @@ const SIZE_PICAS: f32 = SIZE_POINT * 12.0;
 
 pub(crate) fn parse_size(value: &str, device: Device) -> f32 {
     if value.contains("px") {
-        return value.replace("px", "").parse::<f32>().unwrap_or(0.0) * device.density;
+        return value.replace("px", "").parse::<f32>().unwrap_or(0.0);
     } else if value.contains("cm") {
-        let cm = (device.density * 96.0) / 2.54;
+        let cm = 96. / 2.54;
         return value.replace("cm", "").parse::<f32>().unwrap_or(0.0) * cm;
     } else if value.contains("in") {
-        let inch = device.density * 96.0;
+        let inch = 96.;
         return value.replace("in", "").parse::<f32>().unwrap_or(0.0) * inch;
     } else if value.contains("pt") {
-        let pt = (device.density * 96.0) * (1.0 / 72.0);
+        let pt = 96. * (1.0 / 72.0);
         return value.replace("pt", "").parse::<f32>().unwrap_or(0.0) * pt;
     } else if value.contains("pc") {
-        let pc = ((device.density * 96.0) * (1.0 / 72.0)) * 12.0;
+        let pc = (96. * (1.0 / 72.0)) * 12.0;
         return value.replace("pt", "").parse::<f32>().unwrap_or(0.0) * pc;
     } else if value.contains("vh") {
         let vh = value.replace("vh", "").parse::<f32>().unwrap_or(0.0) / 100.0;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/geometry.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/geometry.rs
index be59bc165..0c365ca29 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/geometry.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/geometry.rs
@@ -1,6 +1,6 @@
 use std::f32::consts::PI;
 
-use skia_safe::{Paint, Point, Rect, Size};
+use skia_safe::{Paint, Point, Size};
 use skia_safe::paint::{Cap, Join};
 
 pub fn almost_equal(a: f32, b: f32) -> bool {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/image.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/image.rs
index 8f8da0d05..bc18a3659 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/image.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/common/utils/image.rs
@@ -1,6 +1,6 @@
 use std::os::raw::c_int;
 
-use skia_safe::{AlphaType, ColorSpace, ColorType, Data, Image, ImageInfo, ISize, RCHandle};
+use skia_safe::{AlphaType, ColorType, Data, Image, ImageInfo, ISize};
 
 pub(crate) fn to_image(
     image_array: *const u8,
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/ios/context.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/ios/context.rs
index 7f97570ed..3097fa98d 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/ios/context.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/ios/context.rs
@@ -1,22 +1,18 @@
-use std::borrow::Cow;
 use std::ffi::{CStr, CString};
 use std::os::raw::{c_char, c_float, c_int, c_longlong, c_uint};
-use std::panic::catch_unwind;
-use std::ptr::null;
-use std::str::{Utf8Error, FromStr};
-use std::sync::{Arc, Mutex};
+use std::str::{FromStr};
 
-use skia_safe::{AlphaType, Color, ColorType, EncodedImageFormat, ImageInfo, IPoint, ISize, M44, PixelGeometry, Rect, Surface};
 use skia_safe::gpu::gl::Interface;
 use skia_safe::image::CachingHint;
+use skia_safe::{
+    AlphaType, Color, ColorType, EncodedImageFormat, IPoint, ISize, ImageInfo, PixelGeometry, Rect,
+    Surface, M44,
+};
 
-use crate::common::context::{Context, Device, State};
 use crate::common::context::compositing::composite_operation_type::CompositeOperationType;
 use crate::common::context::drawing_paths::fill_rule::FillRule;
-use crate::common::context::drawing_text::text_metrics::TextMetrics;
-use crate::common::context::fill_and_stroke_styles::gradient::Gradient;
 use crate::common::context::fill_and_stroke_styles::paint::PaintStyle;
-use crate::common::context::fill_and_stroke_styles::pattern::{Pattern, Repetition};
+use crate::common::context::fill_and_stroke_styles::pattern::{ Repetition};
 use crate::common::context::image_asset::ImageAsset;
 use crate::common::context::image_smoothing::ImageSmoothingQuality;
 use crate::common::context::line_styles::line_cap::LineCap;
@@ -27,6 +23,7 @@ use crate::common::context::pixel_manipulation::image_data::ImageData;
 use crate::common::context::text_styles::text_align::TextAlign;
 use crate::common::context::text_styles::text_baseline::TextBaseLine;
 use crate::common::context::text_styles::text_direction::TextDirection;
+use crate::common::context::{Context, Device, State};
 use crate::common::ffi::f32_array::F32Array;
 use crate::common::ffi::paint_style_value::{PaintStyleValue, PaintStyleValueType};
 use crate::common::ffi::u8_array::U8Array;
@@ -75,7 +72,6 @@ pub extern "C" fn context_init_context(
     ppi: c_float,
     direction: TextDirection,
 ) -> c_longlong {
-    let density = 1.0;
     let mut device = Device {
         width,
         height,
@@ -100,8 +96,10 @@ pub extern "C" fn context_init_context(
         8,
         frame_buffer,
     );
-    let surface_props =
-        skia_safe::SurfaceProps::new(skia_safe::SurfacePropsFlags::default(), PixelGeometry::Unknown);
+    let surface_props = skia_safe::SurfaceProps::new(
+        skia_safe::SurfacePropsFlags::default(),
+        PixelGeometry::Unknown,
+    );
     let mut color_type = ColorType::RGBA8888;
     if !alpha {
         color_type = ColorType::RGB565;
@@ -125,7 +123,6 @@ pub extern "C" fn context_init_context(
     })) as c_longlong
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_init_context_with_custom_surface(
     width: c_float,
@@ -136,7 +133,6 @@ pub extern "C" fn context_init_context_with_custom_surface(
     ppi: c_float,
     direction: TextDirection,
 ) -> c_longlong {
-    // let density = 1.0;
     let mut device = Device {
         width,
         height,
@@ -149,16 +145,12 @@ pub extern "C" fn context_init_context_with_custom_surface(
     let info = ImageInfo::new(
         ISize::new(width as i32, height as i32),
         ColorType::RGBA8888,
-        AlphaType::Premul,
+        AlphaType::Unpremul,
         None,
     );
 
     Box::into_raw(Box::new(Context {
-        surface: Surface::new_raster(
-            &info,
-            None,
-            None,
-        ).unwrap(),
+        surface: Surface::new_raster(&info, None, None).unwrap(),
         path: Path::default(),
         state: State::from_device(device, direction),
         state_stack: vec![],
@@ -195,15 +187,11 @@ pub extern "C" fn context_resize_custom_surface(
         let info = ImageInfo::new(
             ISize::new(width as i32, height as i32),
             ColorType::RGBA8888,
-            AlphaType::Premul,
+            AlphaType::Unpremul,
             None,
         );
 
-        if let Some(surface) = Surface::new_raster(
-            &info,
-            None,
-            None,
-        ) {
+        if let Some(surface) = Surface::new_raster(&info, None, None) {
             context.surface = surface;
             context.device = device;
             context.path = Path::default();
@@ -212,7 +200,6 @@ pub extern "C" fn context_resize_custom_surface(
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_resize_surface(
     context: c_longlong,
@@ -224,7 +211,6 @@ pub extern "C" fn context_resize_surface(
     alpha: bool,
     ppi: c_float,
 ) {
-    let density = 1.0;
     unsafe {
         if context == 0 {
             return;
@@ -261,8 +247,10 @@ pub extern "C" fn context_resize_surface(
             8,
             frame_buffer,
         );
-        let surface_props =
-            skia_safe::SurfaceProps::new(skia_safe::SurfacePropsFlags::default(), PixelGeometry::Unknown);
+        let surface_props = skia_safe::SurfaceProps::new(
+            skia_safe::SurfacePropsFlags::default(),
+            PixelGeometry::Unknown,
+        );
         let mut color_type = ColorType::RGBA8888;
 
         if !alpha {
@@ -302,8 +290,8 @@ pub extern "C" fn context_data_url(
             format.as_ref(),
             (quality * 100 as f32) as i32,
         ))
-            .unwrap()
-            .into_raw()
+        .unwrap()
+        .into_raw()
     }
 }
 
@@ -355,9 +343,7 @@ pub extern "C" fn context_snapshot_canvas(context: c_longlong) -> *mut U8Array {
             data: ptr.as_mut_ptr(),
         };
         Box::into_raw(ptr);
-        Box::into_raw(
-            Box::new(raw)
-        )
+        Box::into_raw(Box::new(raw))
     }
 }
 
@@ -373,9 +359,14 @@ pub extern "C" fn context_flush(context: c_longlong) {
     }
 }
 
-
 #[no_mangle]
-pub extern "C" fn context_custom_with_buffer_flush(context: c_longlong, buf: *mut u8, buf_size: usize, width: f32, height: f32) {
+pub extern "C" fn context_custom_with_buffer_flush(
+    context: c_longlong,
+    buf: *mut u8,
+    buf_size: usize,
+    width: f32,
+    height: f32,
+) {
     unsafe {
         if context == 0 || buf.is_null() || buf_size == 0 {
             return;
@@ -383,15 +374,13 @@ pub extern "C" fn context_custom_with_buffer_flush(context: c_longlong, buf: *mu
         let info = ImageInfo::new(
             ISize::new(width as i32, height as i32),
             ColorType::RGBA8888,
-            AlphaType::Premul,
+            AlphaType::Unpremul,
             None,
         );
         let context: *mut Context = context as _;
         let context = &mut *context;
         let image_data = std::slice::from_raw_parts_mut(buf, buf_size);
-        let mut surface = Surface::new_raster_direct(
-            &info, image_data, None, None,
-        ).unwrap();
+        let mut surface = Surface::new_raster_direct(&info, image_data, None, None).unwrap();
         let canvas = surface.canvas();
         let mut paint = skia_safe::Paint::default();
         paint.set_anti_alias(true);
@@ -450,15 +439,17 @@ pub extern "C" fn context_get_fill_style(context: c_longlong) -> *mut PaintStyle
         let context = &mut *context;
         let fill_style = context.fill_style().clone();
         let result = match fill_style {
-            PaintStyle::Color(_) => PaintStyleValue::new(fill_style, PaintStyleValueType::PaintStyleValueTypeColor),
-            PaintStyle::Gradient(_) => PaintStyleValue::new(fill_style, PaintStyleValueType::PaintStyleValueTypeGradient),
-            PaintStyle::Pattern(_) => PaintStyleValue::new(fill_style, PaintStyleValueType::PaintStyleValueTypePattern)
+            PaintStyle::Color(_) => {
+                PaintStyleValue::new(fill_style, PaintStyleValueType::PaintStyleValueTypeColor)
+            }
+            PaintStyle::Gradient(_) => {
+                PaintStyleValue::new(fill_style, PaintStyleValueType::PaintStyleValueTypeGradient)
+            }
+            PaintStyle::Pattern(_) => {
+                PaintStyleValue::new(fill_style, PaintStyleValueType::PaintStyleValueTypePattern)
+            }
         };
-        Box::into_raw(
-            Box::new(
-                result
-            )
-        )
+        Box::into_raw(Box::new(result))
     }
 }
 
@@ -556,10 +547,7 @@ pub extern "C" fn context_get_global_composite_operation(
 }
 
 #[no_mangle]
-pub extern "C" fn context_set_image_smoothing_enabled(
-    context: c_longlong,
-    enabled: bool,
-) {
+pub extern "C" fn context_set_image_smoothing_enabled(context: c_longlong, enabled: bool) {
     unsafe {
         if context == 0 {
             return;
@@ -595,7 +583,9 @@ pub extern "C" fn context_set_image_smoothing_quality(
 }
 
 #[no_mangle]
-pub extern "C" fn context_get_image_smoothing_quality(context: c_longlong) -> ImageSmoothingQuality {
+pub extern "C" fn context_get_image_smoothing_quality(
+    context: c_longlong,
+) -> ImageSmoothingQuality {
     unsafe {
         let context: *const Context = context as _;
         let context = &*context;
@@ -751,7 +741,12 @@ pub extern "C" fn context_set_shadow_color_string(context: c_longlong, color: *c
         let context = &mut *context;
         let color = CStr::from_ptr(color).to_string_lossy();
         if let Ok(color) = css_color_parser::Color::from_str(color.as_ref()) {
-            context.set_shadow_color(skia_safe::Color::from_argb((color.a * 255.0) as u8, color.r, color.g, color.b))
+            context.set_shadow_color(skia_safe::Color::from_argb(
+                (color.a * 255.0) as u8,
+                color.r,
+                color.g,
+                color.b,
+            ))
         }
     }
 }
@@ -829,15 +824,19 @@ pub extern "C" fn context_get_stroke_style(context: c_longlong) -> *mut PaintSty
         let context: *mut Context = context as _;
         let context = &mut *context;
         let stroke_style = context.stroke_style().clone();
-        Box::into_raw(
-            Box::new(
-                match stroke_style {
-                    PaintStyle::Color(_) => PaintStyleValue::new(stroke_style, PaintStyleValueType::PaintStyleValueTypeColor),
-                    PaintStyle::Gradient(_) => PaintStyleValue::new(stroke_style, PaintStyleValueType::PaintStyleValueTypeGradient),
-                    PaintStyle::Pattern(_) => PaintStyleValue::new(stroke_style, PaintStyleValueType::PaintStyleValueTypePattern)
-                }
-            )
-        )
+        Box::into_raw(Box::new(match stroke_style {
+            PaintStyle::Color(_) => {
+                PaintStyleValue::new(stroke_style, PaintStyleValueType::PaintStyleValueTypeColor)
+            }
+            PaintStyle::Gradient(_) => PaintStyleValue::new(
+                stroke_style,
+                PaintStyleValueType::PaintStyleValueTypeGradient,
+            ),
+            PaintStyle::Pattern(_) => PaintStyleValue::new(
+                stroke_style,
+                PaintStyleValueType::PaintStyleValueTypePattern,
+            ),
+        }))
     }
 }
 
@@ -1009,7 +1008,6 @@ pub extern "C" fn context_close_path(context: c_longlong) {
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_create_image_data(width: c_int, height: c_int) -> c_longlong {
     unsafe { Box::into_raw(Box::new(Context::create_image_data(width, height))) as c_longlong }
@@ -1029,9 +1027,9 @@ pub extern "C" fn context_create_linear_gradient(
         }
         let context: *mut Context = context as _;
         let context = &mut *context;
-        Box::into_raw(Box::new(
-            PaintStyle::Gradient(context.create_linear_gradient(x0, y0, x1, y1))
-        )) as c_longlong
+        Box::into_raw(Box::new(PaintStyle::Gradient(
+            context.create_linear_gradient(x0, y0, x1, y1),
+        ))) as c_longlong
     }
 }
 
@@ -1051,9 +1049,9 @@ pub extern "C" fn context_create_pattern(
         let context: *mut Context = context as _;
         let context = &mut *context;
         if let Some(image) = to_image(image_data, image_len, width, height) {
-            return Box::into_raw(Box::new(
-                PaintStyle::Pattern(context.create_pattern(image, repetition))
-            )) as c_longlong;
+            return Box::into_raw(Box::new(PaintStyle::Pattern(
+                context.create_pattern(image, repetition),
+            ))) as c_longlong;
         }
         0
     }
@@ -1074,10 +1072,14 @@ pub extern "C" fn context_create_pattern_asset(
         let asset: *mut ImageAsset = asset as _;
         let asset = &mut *asset;
         let bytes = asset.rgba_internal_bytes();
-        if let Some(image) = from_image_slice(bytes.as_slice(), asset.width() as i32, asset.height() as i32) {
-            return Box::into_raw(Box::new(
-                PaintStyle::Pattern(context.create_pattern(image, repetition))
-            )) as c_longlong;
+        if let Some(image) = from_image_slice(
+            bytes.as_slice(),
+            asset.width() as i32,
+            asset.height() as i32,
+        ) {
+            return Box::into_raw(Box::new(PaintStyle::Pattern(
+                context.create_pattern(image, repetition),
+            ))) as c_longlong;
         }
         0
     }
@@ -1097,7 +1099,9 @@ pub extern "C" fn context_create_pattern_encoded(
         let context: *mut Context = context as _;
         let context = &mut *context;
         if let Some(image) = to_image_encoded(image_data, image_len) {
-            return Box::into_raw(Box::new(PaintStyle::Pattern(context.create_pattern(image, repetition)))) as c_longlong;
+            return Box::into_raw(Box::new(PaintStyle::Pattern(
+                context.create_pattern(image, repetition),
+            ))) as c_longlong;
         }
         0
     }
@@ -1119,9 +1123,9 @@ pub extern "C" fn context_create_radial_gradient(
         }
         let context: *mut Context = context as _;
         let context = &mut *context;
-        Box::into_raw(Box::new(
-            PaintStyle::Gradient(context.create_radial_gradient(x0, y0, r0, x1, y1, r1))
-        )) as c_longlong
+        Box::into_raw(Box::new(PaintStyle::Gradient(
+            context.create_radial_gradient(x0, y0, r0, x1, y1, r1),
+        ))) as c_longlong
     }
 }
 
@@ -1136,13 +1140,11 @@ pub extern "C" fn context_draw_image_dx_dy(
     dy: c_float,
 ) {
     context_draw_image(
-        context, image_data, image_len, width,
-        height, 0.0, 0.0, width, height,
-        dx, dy, width, height,
+        context, image_data, image_len, width, height, 0.0, 0.0, width, height, dx, dy, width,
+        height,
     );
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_draw_image_dx_dy_dw_dh(
     context: c_longlong,
@@ -1156,14 +1158,11 @@ pub extern "C" fn context_draw_image_dx_dy_dw_dh(
     d_height: c_float,
 ) {
     context_draw_image(
-        context, image_data, image_len,
-        width, height,
-        0.0, 0.0, width, height,
-        dx, dy, d_width, d_height,
+        context, image_data, image_len, width, height, 0.0, 0.0, width, height, dx, dy, d_width,
+        d_height,
     )
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_draw_image(
     context: c_longlong,
@@ -1196,7 +1195,6 @@ pub extern "C" fn context_draw_image(
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_draw_image_encoded_dx_dy(
     context: c_longlong,
@@ -1223,7 +1221,6 @@ pub extern "C" fn context_draw_image_encoded_dx_dy(
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_draw_image_encoded_dx_dy_dw_dh(
     context: c_longlong,
@@ -1252,7 +1249,6 @@ pub extern "C" fn context_draw_image_encoded_dx_dy_dw_dh(
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_draw_image_encoded(
     context: c_longlong,
@@ -1283,7 +1279,6 @@ pub extern "C" fn context_draw_image_encoded(
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_draw_image_dx_dy_asset(
     context: c_longlong,
@@ -1302,13 +1297,11 @@ pub extern "C" fn context_draw_image_dx_dy_asset(
         let width = asset.width() as f32;
         let height = asset.height() as f32;
         context_draw_image_asset(
-            ctx_ptr, asset_ptr, 0.0, 0.0, width, height,
-            dx, dy, width, height,
+            ctx_ptr, asset_ptr, 0.0, 0.0, width, height, dx, dy, width, height,
         );
     }
 }
 
-
 #[no_mangle]
 pub extern "C" fn context_draw_image_dx_dy_dw_dh_asset(
     context: c_longlong,
@@ -1329,8 +1322,7 @@ pub extern "C" fn context_draw_image_dx_dy_dw_dh_asset(
         let width = asset.width() as f32;
         let height = asset.height() as f32;
         context_draw_image_asset(
-            ctx_ptr, asset_ptr, 0.0, 0.0, width, height,
-            dx, dy, d_width, d_height,
+            ctx_ptr, asset_ptr, 0.0, 0.0, width, height, dx, dy, d_width, d_height,
         );
     }
 }
@@ -1357,7 +1349,11 @@ pub extern "C" fn context_draw_image_asset(
         let asset: *mut ImageAsset = asset as _;
         let asset = &mut *asset;
         let bytes = asset.rgba_internal_bytes();
-        if let Some(image) = from_image_slice(bytes.as_slice(), asset.width() as i32, asset.height() as i32) {
+        if let Some(image) = from_image_slice(
+            bytes.as_slice(),
+            asset.width() as i32,
+            asset.height() as i32,
+        ) {
             context.draw_image(
                 &image,
                 Rect::from_xywh(sx, sy, s_width, s_height),
@@ -1707,7 +1703,11 @@ pub extern "C" fn context_scale(context: c_longlong, x: c_float, y: c_float) {
 }
 
 #[no_mangle]
-pub extern "C" fn context_set_line_dash(context: c_longlong, data: *const c_float, data_length: usize) {
+pub extern "C" fn context_set_line_dash(
+    context: c_longlong,
+    data: *const c_float,
+    data_length: usize,
+) {
     unsafe {
         if context == 0 {
             return;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/ios/gl.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/ios/gl.rs
index 102e2f4c7..ba4ac2a27 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/ios/gl.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/ios/gl.rs
@@ -1,9 +1,7 @@
-use std::mem::MaybeUninit;
 use std::os::raw::{c_int, c_longlong, c_uint, c_void};
-use std::ptr::null_mut;
 
 use crate::common::context::image_asset::ImageAsset;
-use crate::common::ffi::u8_array::{destroy_u8_array, U8Array};
+use crate::common::ffi::u8_array::{destroy_u8_array};
 
 const RGBA: u32 = 0x1908;
 const RGBA_INTEGER: u32 = 0x8D99;
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/ios/svg.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/ios/svg.rs
index 4bddcd71d..fc0450f3e 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/ios/svg.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/ios/svg.rs
@@ -27,4 +27,4 @@ pub extern "C" fn svg_draw_from_path(context: c_longlong, path: *const i8) {
             crate::common::svg::draw_svg_from_path(context, path.as_ref());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/lib.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/lib.rs
index d9e224fc0..97149ab23 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/lib.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/lib.rs
@@ -3,7 +3,6 @@ pub mod common;
 
 
 #[cfg(target_os = "ios")]
-#[macro_use]
 extern crate objc;
 
 #[cfg(target_os = "android")]
diff --git a/packages/canvas/src-native/canvas-native/gl-bindings/Cargo.toml b/packages/canvas/src-native/canvas-native/gl-bindings/Cargo.toml
index f05ba4ca1..925eed5b8 100644
--- a/packages/canvas/src-native/canvas-native/gl-bindings/Cargo.toml
+++ b/packages/canvas/src-native/canvas-native/gl-bindings/Cargo.toml
@@ -9,14 +9,14 @@ build="build.rs"
 rustc-wrapper = "sccache"
 
 [build-dependencies]
-bindgen = "0.55.1"
-cmake = "0.1.44"
-cc = "1.0.56"
+bindgen = "0.58.1"
+cmake = "0.1.45"
+cc = "1.0.68"
 
 [dependencies]
 
 
 [target.'cfg(target_os="ios")'.dependencies]
-cocoa = { version = "0.20"}
-objc = { version = "0.2.4"}
+cocoa = { version = "0.24"}
+objc = { version = "0.2.7"}
 block = "0.1.6"
diff --git a/packages/canvas/src-native/canvas-native/gl-bindings/build.rs b/packages/canvas/src-native/canvas-native/gl-bindings/build.rs
index 49b5a79ca..173b293a6 100644
--- a/packages/canvas/src-native/canvas-native/gl-bindings/build.rs
+++ b/packages/canvas/src-native/canvas-native/gl-bindings/build.rs
@@ -4,8 +4,8 @@ use std::fmt::{Display, Formatter};
 
 use bindgen;
 
-const _IOS_SRC_BINDINGS_RS: &str = "src/ios_bindings.rs";
-const _ANDROID_SRC_BINDINGS_RS: &str = "src/android_bindings.rs";
+const _IOS_SRC_BINDINGS_RS: &str = "src/bindings.rs";
+const _ANDROID_SRC_BINDINGS_RS: &str = "src/bindings.rs";
 
 #[derive(Clone, Debug)]
 pub struct Target {
@@ -113,7 +113,7 @@ fn main() {
 
             let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());
             bindings
-                .write_to_file(out_path.join("android_bindings.rs"))
+                .write_to_file(out_path.join("bindings.rs"))
                 .expect("Couldn't write bindings!");
 
             // fs::copy(out_path.join("android_bindings.rs"), ANDROID_SRC_BINDINGS_RS).expect("Couldn't copy bindings!");;;
@@ -199,19 +199,12 @@ fn build(sdk_path: Option<&str>, target: &str) {
     }
     if target.contains("apple-ios") {
         // builder = builder.clang_args(&["-x", "objective-c", "-fblocks"]);
-        builder = builder.clang_args(&["-x", "objective-c", "-fblocks"]);
-        builder = builder.objc_extern_crate(true);
-        builder = builder.block_extern_crate(true);
-        builder = builder.generate_block(true);
-        //builder = builder.rustfmt_bindings(true);
-
-        // time.h as has a variable called timezone that conflicts with some of the objective-c
-        // calls from NSCalendar.h in the Foundation framework. This removes that one variable.
-        builder = builder.blacklist_item("timezone");
-        // https://github.com/rust-lang/rust-bindgen/issues/1705
-        builder = builder.blacklist_item("IUIStepper");
-        builder = builder.blacklist_function("dividerImageForLeftSegmentState_rightSegmentState_");
-        builder = builder.blacklist_item("objc_object");
+        builder = 
+        builder.clang_args(&["-x","objective-c", "-fblocks"])
+        .objc_extern_crate(true)
+        .block_extern_crate(true)
+        .allowlist_function("gl.*")
+        .allowlist_type("GL_.*")
     }
 
     let meta_header: Vec<_> = headers
@@ -228,8 +221,6 @@ fn build(sdk_path: Option<&str>, target: &str) {
 
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
     bindings
-        .write_to_file(out_path.join("ios_bindings.rs"))
+        .write_to_file(out_path.join("bindings.rs"))
         .expect("Couldn't write bindings!");
-
-    // fs::copy(out_path.join("ios_bindings.rs"), IOS_SRC_BINDINGS_RS).expect("Couldn't copy bindings!");;
 }
\ No newline at end of file
diff --git a/packages/canvas/src-native/canvas-native/gl-bindings/src/lib.rs b/packages/canvas/src-native/canvas-native/gl-bindings/src/lib.rs
index 327b59356..34fc333ba 100644
--- a/packages/canvas/src-native/canvas-native/gl-bindings/src/lib.rs
+++ b/packages/canvas/src-native/canvas-native/gl-bindings/src/lib.rs
@@ -7,14 +7,14 @@
 #[cfg(target_os = "android")]
 #[cfg(target_os = "android")]
 #[allow(non_snake_case)]
-include!(concat!(env!("OUT_DIR"), "/android_bindings.rs"));
+include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
 // #[cfg(target_os = "ios")]
 // #[macro_use]
 // extern crate objc;
 
 #[cfg(target_os = "ios")]
-include!(concat!(env!("OUT_DIR"), "/ios_bindings.rs"));
+include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
 //
 // #[cfg(target_os = "android")]
diff --git a/packages/canvas/typings/android.d.ts b/packages/canvas/typings/android.d.ts
index bae65bb22..54f030e88 100644
--- a/packages/canvas/typings/android.d.ts
+++ b/packages/canvas/typings/android.d.ts
@@ -335,6 +335,8 @@ declare module org {
 				public static ONE_S_IN_NS: number;
 				public static TAG: string;
 				public static Companion: org.nativescript.canvas.TNSCanvas.Companion;
+				public static layoutView(param0: number, param1: number, param2: org.nativescript.canvas.TNSCanvas): void;
+				public setIgnorePixelScaling(param0: boolean): void;
 				public setCpuHandler(param0: globalAndroid.os.Handler): void;
 				public getCpuHandlerThread(): globalAndroid.os.HandlerThread;
 				public setWebGL$canvas_release(param0: boolean): void;
diff --git a/tools/demo/canvas-three/index.ts b/tools/demo/canvas-three/index.ts
index 04332e24f..09156e543 100644
--- a/tools/demo/canvas-three/index.ts
+++ b/tools/demo/canvas-three/index.ts
@@ -48,14 +48,14 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 		//this.threeCrate(this.canvas);
 		//this.skinningAndMorphing(this.canvas);
 		//this.nearestNeighbour(this.canvas);
-		this.threeOcean(this.canvas);
+		//this.threeOcean(this.canvas);
 		//this.threeCube(this.canvas);
 		//this.threeCar(this.canvas);
 		//this.threeKeyframes(this.canvas);
 		//this.geoTextShapes(this.canvas);
 		//this.webGLHelpers(this.canvas);
 		//this.fbxLoader(this.canvas);
-		//this.gtlfLoader(this.canvas);
+		this.gtlfLoader(this.canvas);
 		//this.rayCasting(this.canvas);
 		//this.ThreeDS(this.canvas);
 		//this.ThreeMF(this.canvas);
diff --git a/tools/demo/canvas/index.ts b/tools/demo/canvas/index.ts
index abe6e265b..5c1739e6b 100644
--- a/tools/demo/canvas/index.ts
+++ b/tools/demo/canvas/index.ts
@@ -4,12 +4,12 @@ import Chart from 'chart.js';
 
 let Matter;
 import { Canvas, ImageAsset } from '@nativescript/canvas';
-import {flappyBird, arc, arcTo, cancelParticlesColor, cancelParticlesLarge, cancelRain, cancelRainbowOctopus, cancelSwarm, clip, cloth, colorRain, createLinearGradient, createRadialGradient, ellipse, fillPath, fillRule, filterBlur, imageBlock, imageSmoothingEnabled, imageSmoothingQuality, isPointInStrokeTouch, lineWidth, march, multiStrokeStyle, particlesColor, particlesLarge, patternWithCanvas, rainbowOctopus, scale, shadowBlur, shadowColor, swarm, textAlign, touchParticles } from './canvas2d';
+import { flappyBird, arc, arcTo, cancelParticlesColor, cancelParticlesLarge, cancelRain, cancelRainbowOctopus, cancelSwarm, clip, cloth, colorRain, createLinearGradient, createRadialGradient, ellipse, fillPath, fillRule, filterBlur, imageBlock, imageSmoothingEnabled, imageSmoothingQuality, isPointInStrokeTouch, lineWidth, march, multiStrokeStyle, particlesColor, particlesLarge, patternWithCanvas, rainbowOctopus, scale, shadowBlur, shadowColor, swarm, textAlign, touchParticles } from './canvas2d';
 
 declare var NSData, interop, NSString, malloc, TNSCanvas;
 //const CanvasWorker = require('nativescript-worker-loader!./canvas.worker.js');
 import Vex from 'vexflow';
-import { handleVideo,cancelInteractiveCube, cancelMain, cubeRotation, cubeRotationRotation, drawElements, drawModes, imageFilter, interactiveCube, main, textures } from './webgl';
+import { handleVideo, cancelInteractiveCube, cancelMain, cubeRotation, cubeRotationRotation, drawElements, drawModes, imageFilter, interactiveCube, main, textures } from './webgl';
 import { cancelEnvironmentMap, cancelFog, draw_image_space, draw_instanced, environmentMap, fog } from './webgl2';
 declare var com, java;
 let zen3d;
@@ -20,6 +20,7 @@ export class DemoSharedCanvas extends DemoSharedBase {
 	private svg2: Svg.Svg;
 	private svg3: Svg.Svg;
 	private svg4: Svg.Svg;
+
 	canvasLoaded(args) {
 		this.canvas = args.object;
 		console.log('canvas ready');
@@ -41,8 +42,7 @@ export class DemoSharedCanvas extends DemoSharedBase {
 	drawTransformMatrixSvg() {
 		this.set(
 			'src',
-			`
-			<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+			`<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
 		<rect x="10" y="10" width="30" height="20" fill="green" />
 
 		<!--
@@ -174,16 +174,16 @@ export class DemoSharedCanvas extends DemoSharedBase {
 	drawSvg(args: Svg.Svg, id) {
 		switch (id) {
 			case '1':
-				this.set('src1','https://upload.wikimedia.org/wikipedia/commons/8/85/Australian_Census_2011_demographic_map_-_Australia_by_SLA_-_BCP_field_0001_Total_Persons_Males.svg');
+				this.set('src1', 'https://upload.wikimedia.org/wikipedia/commons/8/85/Australian_Census_2011_demographic_map_-_Australia_by_SLA_-_BCP_field_0001_Total_Persons_Males.svg');
 				break;
 			case '2':
-				this.set('src2','https://upload.wikimedia.org/wikipedia/commons/4/4c/The_Hague%2C_Netherlands%2C_the_old_city_center.svg');
+				this.set('src2', 'https://upload.wikimedia.org/wikipedia/commons/4/4c/The_Hague%2C_Netherlands%2C_the_old_city_center.svg');
 				break;
 			case '3':
 				this.set('src3', 'https://upload.wikimedia.org/wikipedia/commons/7/7c/Map_of_the_world_by_the_US_Gov_as_of_2016_no_legend.svg');
 				break;
 			case '4':
-				this.set('src4', 'https://upload.wikimedia.org/wikipedia/commons/a/a0/Plan_des_Forts_de_Lyon_premi%C3%A8re_ceinture_-_OSM.svg');
+				this.set('src4', 'https://upload.wikimedia.org/wikipedia/commons/9/9d/The_Rhodopes_on_The_Paths_Of_Orpheus_And_Eurydice_Project_Map.svg');
 				break;
 		}
 		//this.drawTransformSkewY();
@@ -314,9 +314,29 @@ export class DemoSharedCanvas extends DemoSharedBase {
 		*/
 	}
 
+	draw() {
+
+
+		// const ctx = this.canvas.getContext('2d');
+		// ctx.font = '50px serif';
+		// ctx.fillText('Hello world', 50, 90);
+
+
+		const ctx = this.canvas.getContext('2d');
+
+// Moved square
+ctx.translate(110, 30);
+ctx.fillStyle = 'red';
+ctx.fillRect(0, 0, 80, 80);
+
+// Reset current transformation matrix to the identity matrix
+ctx.setTransform(1, 0, 0, 1, 0, 0);
+
+// Unmoved square
+ctx.fillStyle = 'gray';
+ctx.fillRect(0, 0, 80, 80);
 
 
-	draw() {
 		//filterBlur(this.canvas);
 		//handleVideo(this.canvas);
 		// const worker = new CanvasWorker();
@@ -380,7 +400,7 @@ export class DemoSharedCanvas extends DemoSharedBase {
 		//imageBlock(this.canvas);
 		//scale(this.canvas);
 		//pattern(this.canvas);
-		 //patternWithCanvas(this.canvas);
+		//patternWithCanvas(this.canvas);
 		//isPointInStrokeTouch(this.canvas);
 		//createLinearGradient(this.canvas);
 		//createRadialGradient(this.canvas);
@@ -390,7 +410,7 @@ export class DemoSharedCanvas extends DemoSharedBase {
 		// ctx.fillStyle = 'blue';
 		// ctx.fillRect(0,0,400,400)
 		//ellipse(this.canvas);
-		// drawPatternWithCanvas(this.canvas);
+		//this.drawPatternWithCanvas(this.canvas);
 		//this.clock(this.canvas);
 		//this.solar(this.canvas);
 		//console.log('ready ??');
@@ -424,13 +444,13 @@ export class DemoSharedCanvas extends DemoSharedBase {
 		// canvas.nativeView.handleInvalidationManually = true;
 		//  setTimeout(() => {
 		//draw_instanced(this.canvas);
-		 //draw_image_space(this.canvas);
+		//draw_image_space(this.canvas);
 		//fog(this.canvas);
 		//environmentMap(this.canvas);
 		//cubeRotationRotation(this.canvas);
 		//main(this.canvas);
 		// imageFilter(this.canvas);
-		 interactiveCube(this.canvas);
+		// interactiveCube(this.canvas);
 		//textures(this.canvas);
 		//drawElements(this.canvas)
 		//drawModes(this.canvas,'triangles')
@@ -505,6 +525,21 @@ export class DemoSharedCanvas extends DemoSharedBase {
 	gridLoaded(args) {
 		const grid = args.object;
 		this.removeClipping(grid);
+
+		// d3 example
+		/*
+		const d3 = require('d3');
+		const svg = d3.create('svg')
+		.attr("viewBox", [0, 0, 975, 610])
+		.attr("stroke-linejoin", "round")
+		.attr("stroke-linecap", "round");
+		svg.append('circle').attr('cx', 2).attr('cy', 2).attr('r', 40).style('fill', 'blue');
+		svg.append('circle').attr('cx', 140).attr('cy', 70).attr('r', 40).style('fill', 'red');
+		svg.append('circle').attr('cx', 300).attr('cy', 100).attr('r', 40).style('fill', 'green');
+
+		grid.addChild(svg['_groups'][0][0].nativeElement);
+
+		*/
 	}
 
 	svgLoaded(args) {
@@ -1242,7 +1277,7 @@ export class DemoSharedCanvas extends DemoSharedBase {
 		const scale = Screen.mainScreen.scale;
 		// Give the pattern a background color and draw an arc
 		patternContext.fillStyle = '#fec';
-		patternContext.fillRect(0, 0, patternCanvas.width, patternCanvas.height);
+		patternContext.fillRect(0, 0, patternCanvas.width * scale, patternCanvas.height * scale);
 		patternContext.arc(0, 0, 50 * scale, 0, 0.5 * Math.PI);
 		patternContext.stroke();
 
@@ -1483,7 +1518,7 @@ export class DemoSharedCanvas extends DemoSharedBase {
 			console.log('solar error:', e);
 		}
 		var ctx = canvas.getContext('2d');
-		ctx.scale(3,3);
+		//ctx.scale(3, 3);
 
 		function init() {
 			window.requestAnimationFrame(draw);
diff --git a/tools/scripts/android-build.sh b/tools/scripts/android-build.sh
index 28ae48fac..fe5dfdadf 100644
--- a/tools/scripts/android-build.sh
+++ b/tools/scripts/android-build.sh
@@ -28,7 +28,7 @@ LIBCPLUSPLUS_SHARED_ARMEABI_V7A="$ANDROID_ARMEABI_V7A_NDK_DIR/sysroot/usr/lib/ar
 LIBCPLUSPLUS_SHARED_x86="$ANDROID_x86_NDK_DIR/sysroot/usr/lib/i686-linux-android/$LIBCPLUSPLUS_NAME"
 LIBCPLUSPLUS_SHARED_x86_64="$ANDROID_x86_64_NDK_DIR/sysroot/usr/lib/x86_64-linux-android/$LIBCPLUSPLUS_NAME"
 LIBCPLUSPLUS_SHARED_AARCH_64="$ANDROID_AARCH_64_NDK_DIR/sysroot/usr/lib/aarch64-linux-android/$LIBCPLUSPLUS_NAME"
-CARGO_FLAGS=""
+CARGO_FLAGS="-C target-cpu=native"
 for arg in "$@"
 do
     if [[ "$arg" == "--help" ]] || [[ "$arg" == "-h" ]]
@@ -42,7 +42,7 @@ do
     ANDROID_x86_OUTPUT="$ANDROID_x86_OUTPUT_DIR/release/$OUTPUT_LIB_NAME"
     ANDROID_AARCH_64_OUTPUT="$ANDROID_AARCH_64_OUTPUT_DIR/release/$OUTPUT_LIB_NAME"
     ANDROID_x86_64_OUTPUT="$ANDROID_x86_64_OUTPUT_DIR/release/$OUTPUT_LIB_NAME"
-    export RUSTFLAGS='-C link-arg=-s'
+    CARGO_FLAGS="$CARGO_FLAGS -C link-arg=-s"
     continue
     fi
 done
@@ -76,10 +76,12 @@ fi
 
 export PATH=$PATH:/"$ANDROID_AARCH_64_NDK_DIR/bin":"$ANDROID_x86_64_NDK_DIR/bin":"$ANDROID_ARMEABI_V7A_NDK_DIR/bin":"$ANDROID_x86_NDK_DIR/bin"
 
+export RUSTFLAGS="$CARGO_FLAGS"
+
 cd "$NATIVE_SRC"
 
 # Build arm
-cargo build --target armv7-linux-androideabi -vv $BUILD_FLAG $CARGO_FLAGS
+cargo build --target armv7-linux-androideabi  $BUILD_FLAG -vv
 
 if [[ -f "$ANDROID_ARMEABI_V7A_DIR/$OUTPUT_LIB_NAME" ]];then
 rm "$ANDROID_ARMEABI_V7A_DIR/$OUTPUT_LIB_NAME"
@@ -94,7 +96,7 @@ ln -s "$LIBCPLUSPLUS_SHARED_ARMEABI_V7A" "$ANDROID_ARMEABI_V7A_DIR/$LIBCPLUSPLUS
 
 
 # Build arm64
-cargo build --target aarch64-linux-android -vv $BUILD_FLAG $CARGO_FLAGS
+cargo build --target aarch64-linux-android  $BUILD_FLAG -vv
 
 if [[ -f "$ANDROID_AARCH_64_DIR/$OUTPUT_LIB_NAME" ]];then
 rm "$ANDROID_AARCH_64_DIR/$OUTPUT_LIB_NAME"
@@ -111,7 +113,7 @@ ln -s "$LIBCPLUSPLUS_SHARED_AARCH_64" "$ANDROID_AARCH_64_DIR/$LIBCPLUSPLUS_NAME"
 
 # Build x86
 
-cargo build --target i686-linux-android -vv $BUILD_FLAG $CARGO_FLAGS
+cargo build --target i686-linux-android $BUILD_FLAG -vv
 
 if [[ -f "$ANDROID_x86_DIR/$OUTPUT_LIB_NAME" ]];then
 rm "$ANDROID_x86_DIR/$OUTPUT_LIB_NAME"
@@ -128,7 +130,7 @@ ln -s "$LIBCPLUSPLUS_SHARED_x86" "$ANDROID_x86_DIR/$LIBCPLUSPLUS_NAME"
 
 # Build x86_64
 
-cargo build --target x86_64-linux-android -vv $BUILD_FLAG $CARGO_FLAGS
+cargo build --target x86_64-linux-android  $BUILD_FLAG -vv
 
 if [[ -f "$ANDROID_x86_64_DIR/$OUTPUT_LIB_NAME" ]];then
 rm "$ANDROID_x86_64_DIR/$OUTPUT_LIB_NAME"