diff --git a/src/ChartJS/widgets/Core.js b/src/ChartJS/widgets/Core.js
index 90e6316..b36f517 100644
--- a/src/ChartJS/widgets/Core.js
+++ b/src/ChartJS/widgets/Core.js
@@ -28,20 +28,20 @@ define([
     "dojo/text!ChartJS/templates/chartjs.html",
     "dojo/text!ChartJS/templates/tooltip.html"
 
-], function (
+], function(
 
-       // Mixins
-       declare, _WidgetBase, _TemplatedMixin,
+    // Mixins
+    declare, _WidgetBase, _TemplatedMixin,
 
-        // Client API and DOJO functions
-        dom, dojoDom, domQuery, domProp, domGeom, domClass, domAttr, domStyle, win, domConstruct, dojoArray, lang, html, ready,
+    // Client API and DOJO functions
+    dom, dojoDom, domQuery, domProp, domGeom, domClass, domAttr, domStyle, win, domConstruct, dojoArray, lang, html, ready,
 
-        // External libraries
-        _charts,
+    // External libraries
+    _charts,
 
-        // Templates
-        _chartJSTemplate,
-        _chartJSTooltipTemplate) {
+    // Templates
+    _chartJSTemplate,
+    _chartJSTooltipTemplate) {
 
     "use strict";
 
@@ -77,7 +77,7 @@ define([
 
         _tooltipNode: null,
 
-        startup: function () {
+        startup: function() {
             logger.debug(this.id + ".startup");
 
             var domNode = null;
@@ -112,12 +112,12 @@ define([
             //     domConstruct.place(this._tooltipNode, win.body());
             // }
 
-            this.connect(this.mxform, "resize", lang.hitch(this, function () {
+            this.connect(this.mxform, "resize", lang.hitch(this, function() {
                 this._resize();
             }));
         },
 
-        datasetAdd: function (dataset, datapoints) {
+        datasetAdd: function(dataset, datapoints) {
             logger.debug(this.id + ".datasetAdd");
             var set = {
                 dataset: dataset,
@@ -138,7 +138,7 @@ define([
             }
         },
 
-        update: function (obj, callback) {
+        update: function(obj, callback) {
             logger.debug(this.id + ".update");
             this._mxObj = obj;
 
@@ -164,14 +164,14 @@ define([
             this._executeCallback(callback, "update");
         },
 
-        _loadData: function () {
+        _loadData: function() {
             logger.debug(this.id + "._loadData");
             this._data = {
                 object: this._mxObj,
                 datasets: []
             };
 
-            this._executeMicroflow(this.datasourcemf, lang.hitch(this, function (objs) {
+            this._executeMicroflow(this.datasourcemf, lang.hitch(this, function(objs) {
                 if (objs && objs.length > 0) {
                     var obj = objs[0], // Chart object is always only one.
                         j = null,
@@ -190,7 +190,7 @@ define([
                     // Retrieve datasets
                     mx.data.get({
                         guids: guids,
-                        callback: lang.hitch(this, function (datasets) {
+                        callback: lang.hitch(this, function(datasets) {
                             var set = {};
 
                             this._datasetCounter = datasets.length;
@@ -221,7 +221,7 @@ define([
 
         },
 
-        _loadDataSingleSet: function () {
+        _loadDataSingleSet: function() {
             logger.debug(this.id + "._loadDataSingleSet");
             this._executeMicroflow(this.datasourcemf, lang.hitch(this, function(objs) {
                 if (objs && objs.length > 0) {
@@ -256,7 +256,7 @@ define([
             }), this._mxObj);
         },
 
-        uninitialize: function () {
+        uninitialize: function() {
             logger.debug(this.id + ".uninitialize");
 
             //console.log(this._data);
@@ -291,7 +291,7 @@ define([
 
                 if (this._data.object && this._data.object.getGuid) {
                     if (this.onDestroyMf) {
-                        this._executeMicroflow(this.onDestroyMf, lang.hitch(this, function () {
+                        this._executeMicroflow(this.onDestroyMf, lang.hitch(this, function() {
                             logger.debug(this.id + ".uninitialize release obj " + this._data.object.getGuid());
                             mx.data.release(this._data.object);
                         }), this._data.object);
@@ -303,7 +303,7 @@ define([
             }
         },
 
-        customTooltip: function (tooltip) {
+        customTooltip: function(tooltip) {
             logger.debug(this.id + ".customTooltip");
             // Tooltip Element
             var tooltipEl = domQuery("#chartjsTooltip")[0],
@@ -332,7 +332,7 @@ define([
                     location: "content",
                     context: contextObj,
                     domNode: tooltipElContent,
-                    callback: function (form) {
+                    callback: function(form) {
                         var whatEver = null;
                     }
                 }, this);
@@ -359,7 +359,7 @@ define([
 
         },
 
-        _createCtx: function () {
+        _createCtx: function() {
             logger.debug(this.id + "._createCtx");
             var position = domGeom.position(this.domNode.parentElement, false);
             domAttr.set(this.canvasNode, "id", "canvasid_" + this.id);
@@ -386,26 +386,26 @@ define([
 
         },
 
-        _processData: function () {
+        _processData: function() {
             // STUB
             console.error("_processData: This is placeholder function that should be overwritten by the implementing widget.");
         },
 
-        _createChart: function (data) {
+        _createChart: function(data) {
             // STUB
             console.error("_createChart: This is placeholder function that should be overwritten by the implementing widget.", data);
         },
 
-        _onClickChart: function (evt) {
+        _onClickChart: function(evt) {
             logger.debug(this.id + "._onClickChart");
             var elements = this._chart.getElementAtEvent(evt);
             if (elements.length) {
                 var el = elements[0],
-                datasetIndex = el._datasetIndex,
-                pointIndex = el._index,
-                dataset =  this._data.datasets[datasetIndex],
-                datasetObject = dataset ? dataset.dataset : null,
-                dataPointObject = dataset && dataset.points ? dataset.points[pointIndex] : null;
+                    datasetIndex = el._datasetIndex,
+                    pointIndex = el._index,
+                    dataset = this._data.datasets[datasetIndex],
+                    datasetObject = dataset ? dataset.dataset : null,
+                    dataPointObject = dataset && dataset.points ? dataset.points[pointIndex] : null;
 
                 if (this.onclickDataSetMf && datasetObject) {
                     if (this._chartType === "pie" || this._chartType === "doughnut" || this._chartType === "polarArea") {
@@ -426,7 +426,7 @@ define([
             }
         },
 
-        _createLegend: function (isSingleSeries) {
+        _createLegend: function(isSingleSeries) {
             logger.debug(this.id + "._createLegend");
             var listNodes = null,
                 k = null;
@@ -444,7 +444,7 @@ define([
             }
         },
 
-        _legendCallback: function (chart) {
+        _legendCallback: function(chart) {
             logger.debug(this.id + "._legendCallback");
             var text = [];
             text.push("<ul class=\"" + chart.id + "-legend chart-legend\">");
@@ -478,7 +478,7 @@ define([
             return text.join("");
         },
 
-        _onClickLegend: function (idx, isSingleSeries) {
+        _onClickLegend: function(idx, isSingleSeries) {
             logger.debug(this.id + "._onClickLegend", idx, isSingleSeries);
             var activeSet = null,
                 activeSetLegend = null,
@@ -512,17 +512,15 @@ define([
             }
         },
 
-        _createDataSets: function (data) {
+        _createDataSets: function(data) {
             logger.debug(this.id + "._createDataSets");
             var _chartData = {
                 labels: [],
-                datasets: [
-                    {
-                        data: [],
-                        backgroundColor: [],
-                        hoverBackgroundColor: []
-                    }
-                ]
+                datasets: [{
+                    data: [],
+                    backgroundColor: [],
+                    hoverBackgroundColor: []
+                }]
             };
 
             for (var j = 0; j < data.length; j++) {
@@ -535,9 +533,9 @@ define([
             return _chartData;
         },
 
-        _sortArrayObj: function (values) {
+        _sortArrayObj: function(values) {
             logger.debug(this.id + "._sortArrayObj");
-            return values.sort(lang.hitch(this, function (a, b) {
+            return values.sort(lang.hitch(this, function(a, b) {
                 var aa = +(a.sorting),
                     bb = +(b.sorting);
                 if (aa > bb) {
@@ -551,7 +549,7 @@ define([
             }));
         },
 
-        _isNumber: function (n, attr) {
+        _isNumber: function(n, attr) {
             // Fix for older MX versions who do not have the .isNumeric method
             if (typeof n.isNumeric === "function") {
                 return n.isNumeric(attr);
@@ -559,9 +557,9 @@ define([
             return n.isNumber(attr);
         },
 
-        _sortArrayMx: function (values, sortAttr) {
+        _sortArrayMx: function(values, sortAttr) {
             logger.debug(this.id + "._sortArrayMx");
-            return values.sort(lang.hitch(this, function (a, b) {
+            return values.sort(lang.hitch(this, function(a, b) {
                 var aa = +(a.get(sortAttr)),
                     bb = +(b.get(sortAttr));
                 //if the attribute is numeric
@@ -578,18 +576,18 @@ define([
             }));
         },
 
-        _addChartClass: function (className) {
+        _addChartClass: function(className) {
             logger.debug(this.id + "._addChartClass");
             domClass.remove(this.domNode, className);
             domClass.add(this.domNode, className);
         },
 
-        _resize: function () {
+        _resize: function() {
             logger.debug(this.id + "._resize");
             var position = domGeom.position(this.domNode.parentElement, false);
 
             clearTimeout(this._resizeTimer);
-            this._resizeTimer = setTimeout(lang.hitch(this, function (){
+            this._resizeTimer = setTimeout(lang.hitch(this, function() {
                 //Only resize when chart is set to responsive and width and height of parent element > 0
                 if (this._chart && this.responsive && position.w > 0 && position.h > 0) {
                     this._chart.resize();
@@ -597,7 +595,7 @@ define([
             }), 50);
         },
 
-        _hexToRgb: function (hex, alpha) {
+        _hexToRgb: function(hex, alpha) {
             //logger.debug(this.id + "._hexToRgb", hex, alpha);
             if (hex !== null) {
                 var regex = null,
@@ -607,7 +605,7 @@ define([
                 // From Stackoverflow here: http://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
                 // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
                 shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
-                hex = hex.replace(shorthandRegex, function (m, r, g, b) {
+                hex = hex.replace(shorthandRegex, function(m, r, g, b) {
                     return r + r + g + g + b + b;
                 });
 
@@ -626,7 +624,7 @@ define([
             return "rgba(220,220,220," + alpha + ")";
         },
 
-        _chartOptions: function (options) {
+        _chartOptions: function(options) {
             logger.debug(this.id + "._chartOptions");
             // returns default chart options, mixed with specific options for a chart
 
@@ -637,17 +635,17 @@ define([
                     fontFamily: this._font,
                     fontSize: this.titleSize
                 },
-                responsive : this.responsive,
-                responsiveAnimationDuration : (this.responsiveAnimationDuration > 0 ? this.responsiveAnimationDuration : 0),
-                tooltips : {
-                    enabled : this.showTooltips
+                responsive: this.responsive,
+                responsiveAnimationDuration: (this.responsiveAnimationDuration > 0 ? this.responsiveAnimationDuration : 0),
+                tooltips: {
+                    enabled: this.showTooltips
                 },
                 legend: {
-                    display : this.showLegend,
-                    labels : { fontFamily : this._font }
+                    display: this.showLegend,
+                    labels: { fontFamily: this._font }
                 },
-                maintainAspectRatio : this.maintainAspectRatio,
-                showTooltips : this.showTooltips,
+                maintainAspectRatio: this.maintainAspectRatio,
+                showTooltips: this.showTooltips,
                 animation: this.chartAnimation ? ({
                     duration: this.chartAnimation ? this.animationDuration : 0,
                     easing: this.animationEasing
@@ -657,7 +655,7 @@ define([
             return lang.mixin(lang.clone(defaultOptions), options);
         },
 
-        _executeMicroflow: function (mf, callback, obj) {
+        _executeMicroflow: function(mf, callback, obj) {
             logger.debug(this.id + "._executeMicroflow " + mf);
             var _params = {
                 applyto: "selection",
@@ -675,12 +673,12 @@ define([
 
             var mfAction = {
                 params: _params,
-                callback: lang.hitch(this, function (obj) {
+                callback: lang.hitch(this, function(obj) {
                     if (typeof callback === "function") {
                         callback(obj);
                     }
                 }),
-                error: lang.hitch(this, function (error) {
+                error: lang.hitch(this, function(error) {
                     console.log(this.id + "._executeMicroflow error: " + error.description);
                 })
             };
@@ -696,31 +694,43 @@ define([
             mx.data.action(mfAction, this);
         },
 
-        _executeCallback: function (cb, from) {
+        _executeCallback: function(cb, from) {
             logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
             if (cb && typeof cb === "function") {
                 cb();
             }
         },
 
-        _animationComplete: function () {
+        _animationComplete: function() {
             logger.debug(this.id + "._animationComplete");
-			if(this.base64Attr) {
-				var ctx = this.canvasNode.getContext('2d');
-				var imgData=ctx.getImageData(0,0,this.canvasNode.width,this.canvasNode.height);
-				var data=imgData.data;
-				for(var i=0;i<data.length;i+=4){
-					if(data[i+3]<255){
-						data[i]=255;
-						data[i+1]=255;
-						data[i+2]=255;
-						data[i+3]=255;
-					}
-				}
-				ctx.putImageData(imgData,0,0);
-				this._mxObj.set(this.base64Attr, this.canvasNode.toDataURL("image/jpeg"));
-			}
-            // Use this.canvasNode.toDataURL() to get an image
+            if (this.base64Attr) {
+                var ctx = this.canvasNode.getContext('2d');
+                var imgData = ctx.getImageData(0, 0, this.canvasNode.width, this.canvasNode.height);
+                var data = imgData.data;
+                // if the charttype is a donut, we have to fix up some translucency issues.
+                if (this._chartType === "doughnut") {
+                    for (var i = 0; i < data.length; i += 4) {
+                        if (data[i + 3] < 255) {
+                            data[i] = 255;
+                            data[i + 1] = 255;
+                            data[i + 2] = 255;
+                            data[i + 3] = 255;
+                        }
+                    }
+                    ctx.putImageData(imgData, 0, 0);
+                }
+                this._mxObj.set(this.base64Attr, this._getBase64StringFromCanvasNode());
+
+            }
+        },
+
+        /**
+         * Get Base64 String From Canvas Node
+         * --
+         * @returns {String} - the base64 string of whatever's in the canvasnode
+         */
+        _getBase64StringFromCanvasNode: function() {
+            return this.canvasNode.toDataURL(this._chartType === "doughnut" ? "image/jpeg" : "image/png");
         }
 
     });
diff --git a/src/ChartJS/widgets/LineChart/LineChart.xml b/src/ChartJS/widgets/LineChart/LineChart.xml
index f6571f3..9b348e6 100644
--- a/src/ChartJS/widgets/LineChart/LineChart.xml
+++ b/src/ChartJS/widgets/LineChart/LineChart.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<widget id="ChartJS.widgets.LineChart.widget.LineChart" needsEntityContext="true" xmlns="http://www.mendix.com/widget/1.0/">
+<widget id="ChartJS.widgets.LineChart.widget.LineChart" needsEntityContext="true" 
+    xmlns="http://www.mendix.com/widget/1.0/">
     <name>ChartJS - Line Chart</name>
     <description>.</description>
-
-    <icon>
-        iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAFRklEQVR42u3csUqtVxSF0QNK7A56q1uIgljFVKmtU6Y5ksoq75LHy+OEVCHRi31g4tXFmmPARNu9/fdXejgAAAAAAAAAAAAAAAAAAPA/np+fz0+n09emvZ75s+8dRnh4ePjx5ce/TXs7MyAAUEwAoJgAQDEBgGICAMUEAIoJABQTACgmAFBMAKCYAEAxAYBiAgDFBACKCQAUEwAoJgBQTACgmABAMQGAYgIAxQQAigkAFBMAKCYAUEwAoJgAQDEBgGICAMUEAIoJABQTACgmAFBMAKCYAEAxAYBiAgDFBACKCQAUEwAoJgBQTACgmABAMQGAYgIAxQQAigkAFBMAKCYAUEwAoJgAQDEBgGICAMUEAIoJABQTACgmAFBMAKCYAEAxAYBiAsAKV1dXPx2Px99adnl5+ct73JsAsML5+fkfhwEf10ft7Ozsz/e4NwFgBQHICAArCEBGAFhBADICwAoCkBEAVhCAjACwggBkBIAVBCAjAKwgABkBYAUByAgAKwhARgBYQQAyAsAKApARAFYQgIwAsIIAZASAFQQgIwCsIAAZAWAFAcgIACsIQEYAWEEAMgLACgKQEQBWEICMALCCAGQEgBUEICMArCAAGQFgBQHICAArCEBGAFhBADICwAoCkBEAVhCAjACwggBkBIAVBCAjAKwgABkBYAUByAgAKwhARgBYQQAyAsAKApARAFYQgIwAsIIAZASAFQQgIwCsIAAZAWAFAcgIACsIQEYAWEEAMgLACgKQEQBWEICMALCCAGQEgBUEICMArCAAGQFgBQHICAArCEBGAFhBADICwAoCkBGA3M3Nza/X19e/t+z29vbn97i370IAMgKQe/sbfPp5Pmpvb2wmAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGCQ+/v7L3d3d/cte3H9Hvf2+Pj4w2ef5aP3euZ3+uauP/ssH/zNffncVw4AAAAAAAAAAAAAAAAAAAB8d8fj8a+Li4u/zaxrr2//8PLLP4cB/+rIzD52396+AJh1TgDMiicAZsUTALPiCYBZ8QTArHgCYFY8ATArngCYFU8AzIonAGbFEwCz4gmAWfEEwKx4AmBWPAEwK54AmBVPAMyKJwBmxRMAs+IJgFnxBMCseAJgVjwBMCueAJgVTwDMivft7T89PX09nU5mVrbXt38AAAAAAAAAAAAAAAAAAIb7D5VqMu+N+RwAAAAAAElFTkSuQmCC
-    </icon>
-
+    <icon>        iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAFRklEQVR42u3csUqtVxSF0QNK7A56q1uIgljFVKmtU6Y5ksoq75LHy+OEVCHRi31g4tXFmmPARNu9/fdXejgAAAAAAAAAAAAAAAAAAPA/np+fz0+n09emvZ75s+8dRnh4ePjx5ce/TXs7MyAAUEwAoJgAQDEBgGICAMUEAIoJABQTACgmAFBMAKCYAEAxAYBiAgDFBACKCQAUEwAoJgBQTACgmABAMQGAYgIAxQQAigkAFBMAKCYAUEwAoJgAQDEBgGICAMUEAIoJABQTACgmAFBMAKCYAEAxAYBiAgDFBACKCQAUEwAoJgBQTACgmABAMQGAYgIAxQQAigkAFBMAKCYAUEwAoJgAQDEBgGICAMUEAIoJABQTACgmAFBMAKCYAEAxAYBiAsAKV1dXPx2Px99adnl5+ct73JsAsML5+fkfhwEf10ft7Ozsz/e4NwFgBQHICAArCEBGAFhBADICwAoCkBEAVhCAjACwggBkBIAVBCAjAKwgABkBYAUByAgAKwhARgBYQQAyAsAKApARAFYQgIwAsIIAZASAFQQgIwCsIAAZAWAFAcgIACsIQEYAWEEAMgLACgKQEQBWEICMALCCAGQEgBUEICMArCAAGQFgBQHICAArCEBGAFhBADICwAoCkBEAVhCAjACwggBkBIAVBCAjAKwgABkBYAUByAgAKwhARgBYQQAyAsAKApARAFYQgIwAsIIAZASAFQQgIwCsIAAZAWAFAcgIACsIQEYAWEEAMgLACgKQEQBWEICMALCCAGQEgBUEICMArCAAGQFgBQHICAArCEBGAFhBADICwAoCkBGA3M3Nza/X19e/t+z29vbn97i370IAMgKQe/sbfPp5Pmpvb2wmAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGAQAcgIQE4ABhGAjADkBGCQ+/v7L3d3d/cte3H9Hvf2+Pj4w2ef5aP3euZ3+uauP/ssH/zNffncVw4AAAAAAAAAAAAAAAAAAAB8d8fj8a+Li4u/zaxrr2//8PLLP4cB/+rIzD52396+AJh1TgDMiicAZsUTALPiCYBZ8QTArHgCYFY8ATArngCYFU8AzIonAGbFEwCz4gmAWfEEwKx4AmBWPAEwK54AmBVPAMyKJwBmxRMAs+IJgFnxBMCseAJgVjwBMCueAJgVTwDMivft7T89PX09nU5mVrbXt38AAAAAAAAAAAAAAAAAAIb7D5VqMu+N+RwAAAAAAElFTkSuQmCC    </icon>
     <properties>
         <!-- Appearance -->
         <property key="maxYValue" type="string" required="false" defaultValue="">
@@ -126,15 +123,7 @@
             <returnType type="Object" entityProperty="sourceentity"></returnType>
         </property>
         <!--Placeholder-->
-        <!--<property key="sourceTrigger" type="attribute" entityProperty="sourceentity" allowNonPersistableEntities="true" required="false">
-            <caption>Attribute to trigger</caption>
-            <category>Data Set</category>
-            <description>Attribute to trigger the microflow.</description>
-            <attributeTypes>
-                <attributeType name="Enum"/>
-                <attributeType name="String"/>
-            </attributeTypes>
-        </property>-->
+        <!--<property key="sourceTrigger" type="attribute" entityProperty="sourceentity" allowNonPersistableEntities="true" required="false"><caption>Attribute to trigger</caption><category>Data Set</category><description>Attribute to trigger the microflow.</description><attributeTypes><attributeType name="Enum"/><attributeType name="String"/></attributeTypes></property>-->
         <!-- Data Set -->
         <property key="datasetentity" type="entity" required="true" allowNonPersistableEntities="true" entityProperty="sourceentity" isPath="yes" pathType="referenceSet">
             <caption>Data Set Entity</caption>
@@ -252,6 +241,14 @@
             <description>Number of decimals to round the value on the Y-axis. Disable it by setting it to '-1'</description>
         </property>
         <!-- Behavior -->
+        <property key="base64Attr" type="attribute" required="false">
+            <caption>Base 64 Attribute</caption>
+            <category>Behavior</category>
+            <description>The attribute to store the base64 encoding of the chart when rendered.</description>
+            <attributeTypes>
+                <attributeType name="String"/>
+            </attributeTypes>
+        </property>
         <property key="onclickmf" type="microflow" required="false">
             <caption>On Click Microflow</caption>
             <category>Behavior</category>
@@ -346,11 +343,7 @@
             <category>Settings</category>
             <description>Determines whether to draw tooltips on the canvas or not.</description>
         </property>
-        <!--<property key="tooltipForm" type="form" required="false">
-            <caption>Tooltip form</caption>
-            <category>Settings</category>
-            <description>.</description>
-        </property>-->
+        <!--<property key="tooltipForm" type="form" required="false"><caption>Tooltip form</caption><category>Settings</category><description>.</description></property>-->
         <property key="maintainAspectRatio" type="boolean" required="true" defaultValue="true">
             <caption>Maintain aspect ratio</caption>
             <category>Settings</category>
diff --git a/test/[Test] ChartJS.mpr b/test/[Test] ChartJS.mpr
index 3ef5170..b5713e9 100644
Binary files a/test/[Test] ChartJS.mpr and b/test/[Test] ChartJS.mpr differ
diff --git a/test/widgets/ChartJS.mpk b/test/widgets/ChartJS.mpk
index aaec63b..90ac1ea 100644
Binary files a/test/widgets/ChartJS.mpk and b/test/widgets/ChartJS.mpk differ