diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
index b7b7a7e..cabe8e2 100644
--- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
+++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
@@ -55,7 +55,7 @@
         if (graphics.canvasTintDirty !== graphics.dirty
             || graphics._prevTint !== graphics.tint)
         {
-        //    this.updateGraphicsTint(graphics);
+            this.updateGraphicsTint(graphics);
         }
 
         renderer.setBlendMode(graphics.blendMode);
@@ -69,8 +69,8 @@
             const fillStyle = data.fillStyle;
             const lineStyle = data.lineStyle;
 
-            const fillColor = fillStyle.color;// data._fillTint;
-            const lineColor = lineStyle.color;// data._lineTint;
+            const fillColor = data._fillTint;
+            const lineColor = data._lineTint;
 
             context.lineWidth = lineStyle.width;
 
@@ -298,13 +298,14 @@
         const tintR = ((graphics.tint >> 16) & 0xFF) / 255;
         const tintG = ((graphics.tint >> 8) & 0xFF) / 255;
         const tintB = (graphics.tint & 0xFF) / 255;
+        const graphicsData = graphics.geometry.graphicsData;
 
-        for (let i = 0; i < graphics.graphicsData.length; ++i)
+        for (let i = 0; i < graphicsData.length; ++i)
         {
-            const data = graphics.graphicsData[i];
+            const data = graphicsData[i];
 
-            const fillColor = data.fillColor | 0;
-            const lineColor = data.lineColor | 0;
+            const fillColor = data.fillStyle.color | 0;
+            const lineColor = data.lineStyle.color | 0;
 
             // super inline, cos optimization :)
             data._fillTint = (

diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
index b7b7a7e..cabe8e2 100644
--- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
+++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
@@ -55,7 +55,7 @@
         if (graphics.canvasTintDirty !== graphics.dirty
             || graphics._prevTint !== graphics.tint)
         {
-        //    this.updateGraphicsTint(graphics);
+            this.updateGraphicsTint(graphics);
         }
 
         renderer.setBlendMode(graphics.blendMode);
@@ -69,8 +69,8 @@
             const fillStyle = data.fillStyle;
             const lineStyle = data.lineStyle;
 
-            const fillColor = fillStyle.color;// data._fillTint;
-            const lineColor = lineStyle.color;// data._lineTint;
+            const fillColor = data._fillTint;
+            const lineColor = data._lineTint;
 
             context.lineWidth = lineStyle.width;
 
@@ -298,13 +298,14 @@
         const tintR = ((graphics.tint >> 16) & 0xFF) / 255;
         const tintG = ((graphics.tint >> 8) & 0xFF) / 255;
         const tintB = (graphics.tint & 0xFF) / 255;
+        const graphicsData = graphics.geometry.graphicsData;
 
-        for (let i = 0; i < graphics.graphicsData.length; ++i)
+        for (let i = 0; i < graphicsData.length; ++i)
         {
-            const data = graphics.graphicsData[i];
+            const data = graphicsData[i];
 
-            const fillColor = data.fillColor | 0;
-            const lineColor = data.lineColor | 0;
+            const fillColor = data.fillStyle.color | 0;
+            const lineColor = data.lineStyle.color | 0;
 
             // super inline, cos optimization :)
             data._fillTint = (
diff --git a/packages/canvas/canvas-mesh/src/NineSlicePlane.js b/packages/canvas/canvas-mesh/src/NineSlicePlane.js
index d5ce07f..dccfd79 100644
--- a/packages/canvas/canvas-mesh/src/NineSlicePlane.js
+++ b/packages/canvas/canvas-mesh/src/NineSlicePlane.js
@@ -39,7 +39,7 @@
     const transform = this.worldTransform;
     const res = renderer.resolution;
     const isTinted = this.tint !== 0xFFFFFF;
-    const texture = this._texture;
+    const texture = this.texture;
 
     // Work out tinting
     if (isTinted)

diff --git a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
index b7b7a7e..cabe8e2 100644
--- a/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
+++ b/packages/canvas/canvas-graphics/src/CanvasGraphicsRenderer.js
@@ -55,7 +55,7 @@
         if (graphics.canvasTintDirty !== graphics.dirty
             || graphics._prevTint !== graphics.tint)
         {
-        //    this.updateGraphicsTint(graphics);
+            this.updateGraphicsTint(graphics);
         }
 
         renderer.setBlendMode(graphics.blendMode);
@@ -69,8 +69,8 @@
             const fillStyle = data.fillStyle;
             const lineStyle = data.lineStyle;
 
-            const fillColor = fillStyle.color;// data._fillTint;
-            const lineColor = lineStyle.color;// data._lineTint;
+            const fillColor = data._fillTint;
+            const lineColor = data._lineTint;
 
             context.lineWidth = lineStyle.width;
 
@@ -298,13 +298,14 @@
         const tintR = ((graphics.tint >> 16) & 0xFF) / 255;
         const tintG = ((graphics.tint >> 8) & 0xFF) / 255;
         const tintB = (graphics.tint & 0xFF) / 255;
+        const graphicsData = graphics.geometry.graphicsData;
 
-        for (let i = 0; i < graphics.graphicsData.length; ++i)
+        for (let i = 0; i < graphicsData.length; ++i)
         {
-            const data = graphics.graphicsData[i];
+            const data = graphicsData[i];
 
-            const fillColor = data.fillColor | 0;
-            const lineColor = data.lineColor | 0;
+            const fillColor = data.fillStyle.color | 0;
+            const lineColor = data.lineStyle.color | 0;
 
             // super inline, cos optimization :)
             data._fillTint = (
diff --git a/packages/canvas/canvas-mesh/src/NineSlicePlane.js b/packages/canvas/canvas-mesh/src/NineSlicePlane.js
index d5ce07f..dccfd79 100644
--- a/packages/canvas/canvas-mesh/src/NineSlicePlane.js
+++ b/packages/canvas/canvas-mesh/src/NineSlicePlane.js
@@ -39,7 +39,7 @@
     const transform = this.worldTransform;
     const res = renderer.resolution;
     const isTinted = this.tint !== 0xFFFFFF;
-    const texture = this._texture;
+    const texture = this.texture;
 
     // Work out tinting
     if (isTinted)
diff --git a/packages/canvas/canvas-renderer/src/CanvasTinter.js b/packages/canvas/canvas-renderer/src/CanvasTinter.js
index 6ea164b..7abf0f3 100644
--- a/packages/canvas/canvas-renderer/src/CanvasTinter.js
+++ b/packages/canvas/canvas-renderer/src/CanvasTinter.js
@@ -21,7 +21,7 @@
      */
     getTintedCanvas: (sprite, color) =>
     {
-        const texture = sprite._texture;
+        const texture = sprite.texture;
 
         color = CanvasTinter.roundColor(color);