diff --git a/dist/rexjigsaw.js b/dist/rexjigsaw.js
index 76c3f7332f..764efeedd5 100644
--- a/dist/rexjigsaw.js
+++ b/dist/rexjigsaw.js
@@ -607,50 +607,50 @@
   var RAD180 = DegToRad(180);
   var RAD270 = DegToRad(270);
   var RAD360 = DegToRad(360);
-  var DrawPieceMask = function DrawPieceMask(graphics, width, height, indent, edgeMode) {
+  var DrawPieceMask = function DrawPieceMask(graphics, width, height, edgeWidth, edgeHeight, edgeMode) {
     var centerX = width / 2,
       centerY = height / 2;
     graphics.clear();
     graphics.beginPath();
-    graphics.moveTo(indent, indent);
+    graphics.moveTo(edgeWidth, edgeHeight);
     switch (edgeMode.top) {
       case 1:
-        graphics.lineTo(centerX - indent, indent);
-        graphics.arc(centerX, indent, indent, RAD180, RAD360, false);
+        graphics.lineTo(centerX - edgeHeight, edgeHeight);
+        graphics.arc(centerX, edgeHeight, edgeHeight, RAD180, RAD360, false);
         break;
       case 2:
-        graphics.lineTo(centerX - indent, indent);
-        graphics.arc(centerX, indent, indent, RAD180, RAD360, true);
+        graphics.lineTo(centerX - edgeHeight, edgeHeight);
+        graphics.arc(centerX, edgeHeight, edgeHeight, RAD180, RAD360, true);
         break;
     }
-    graphics.lineTo(width - indent, indent);
+    graphics.lineTo(width - edgeWidth, edgeHeight);
     switch (edgeMode.right) {
       case 1:
-        graphics.arc(width - indent, centerY, indent, RAD270, RAD90, false);
+        graphics.arc(width - edgeWidth, centerY, edgeWidth, RAD270, RAD90, false);
         break;
       case 2:
-        graphics.arc(width - indent, centerY, indent, RAD270, RAD90, true);
+        graphics.arc(width - edgeWidth, centerY, edgeWidth, RAD270, RAD90, true);
         break;
     }
-    graphics.lineTo(width - indent, height - indent);
+    graphics.lineTo(width - edgeWidth, height - edgeHeight);
     switch (edgeMode.bottom) {
       case 1:
-        graphics.arc(centerX, height - indent, indent, RAD0, RAD180, false);
+        graphics.arc(centerX, height - edgeHeight, edgeHeight, RAD0, RAD180, false);
         break;
       case 2:
-        graphics.arc(centerX, height - indent, indent, RAD0, RAD180, true);
+        graphics.arc(centerX, height - edgeHeight, edgeHeight, RAD0, RAD180, true);
         break;
     }
-    graphics.lineTo(indent, height - indent);
+    graphics.lineTo(edgeWidth, height - edgeHeight);
     switch (edgeMode.left) {
       case 1:
-        graphics.arc(indent, centerY, indent, RAD90, RAD270, false);
+        graphics.arc(edgeWidth, centerY, edgeWidth, RAD90, RAD270, false);
         break;
       case 2:
-        graphics.arc(indent, centerY, indent, RAD90, RAD270, true);
+        graphics.arc(edgeWidth, centerY, edgeWidth, RAD90, RAD270, true);
         break;
     }
-    graphics.lineTo(indent, indent);
+    graphics.lineTo(edgeWidth, edgeHeight);
     graphics.closePath();
     graphics.fillPath();
   };
@@ -662,15 +662,20 @@
       var _this;
       var width = _ref.width,
         height = _ref.height,
-        indent = _ref.indent,
+        edgeWidth = _ref.edgeWidth,
+        edgeHeight = _ref.edgeHeight,
         key = _ref.key;
       _classCallCheck(this, JigsawPiece);
       _this = _super.call(this, scene, 0, 0, width, height);
       _this.setBaseKey(key);
-      if (indent === undefined) {
-        indent = Math.min(width, height) / 7;
+      if (edgeWidth === undefined) {
+        edgeWidth = width / 7;
       }
-      _this.indent = indent;
+      _this.edgeWidth = edgeWidth;
+      if (edgeHeight === undefined) {
+        edgeHeight = height / 7;
+      }
+      _this.edgeHeight = edgeHeight;
       var maskGraphics = scene.make.graphics({
         add: false
       });
@@ -722,7 +727,7 @@
           originY: 0
         });
         this.camera.setScroll(0, 0);
-        drawMaskCallback(this.maskGraphics, this.width, this.height, this.indent, edgeMode);
+        drawMaskCallback(this.maskGraphics, this.width, this.height, this.edgeWidth, this.edgeHeight, edgeMode);
         return this;
       }
     }]);
@@ -737,7 +742,8 @@
       targetKey = _ref.targetKey,
       columns = _ref.columns,
       rows = _ref.rows,
-      overlap = _ref.overlap,
+      edgeWidth = _ref.edgeWidth,
+      edgeHeight = _ref.edgeHeight,
       edges = _ref.edges,
       drawMaskCallback = _ref.drawMaskCallback,
       _ref$getFrameNameCall = _ref.getFrameNameCallback,
@@ -746,14 +752,17 @@
     var baseFrame = textureManager.getFrame(baseKey, '__BASE');
     var baseFrameWidth = baseFrame.cutWidth,
       baseFrameHeight = baseFrame.height;
-    if (overlap === undefined) {
-      overlap = Math.min(baseFrameWidth / columns, baseFrameHeight / rows) / 7;
+    if (edgeWidth === undefined) {
+      edgeWidth = baseFrameWidth / columns / 7;
+    }
+    if (edgeHeight === undefined) {
+      edgeHeight = baseFrameHeight / rows / 7;
     }
     if (edges === undefined) {
       edges = RandomPieceEdges(columns, rows);
     }
-    var frameWidth = (baseFrameWidth + (columns - 1) * overlap) / columns;
-    var frameHeight = (baseFrameHeight + (rows - 1) * overlap) / rows;
+    var frameWidth = (baseFrameWidth - edgeWidth * (columns - 1)) / columns + 2 * edgeWidth;
+    var frameHeight = (baseFrameHeight - edgeHeight * (rows - 1)) / rows + 2 * edgeHeight;
     var frameManager = new FrameManager(scene, {
       key: targetKey,
       width: frameWidth * columns,
@@ -766,11 +775,12 @@
     var sample = new JigsawPiece(scene, {
       width: frameWidth,
       height: frameHeight,
-      indent: overlap,
+      indentX: edgeWidth,
+      indentY: edgeHeight,
       key: baseKey
     });
-    var startX = -overlap,
-      startY = -overlap;
+    var startX = -edgeWidth,
+      startY = -edgeHeight;
     var scrollX = startX,
       scrollY = startY;
     for (var r = 0; r < rows; r++) {
@@ -782,10 +792,10 @@
           drawMaskCallback: drawMaskCallback
         });
         frameManager.paste(getFrameNameCallback(c, r), sample);
-        scrollX += frameWidth - overlap;
+        scrollX += frameWidth - edgeWidth;
       }
       scrollX = startX;
-      scrollY += frameHeight - overlap;
+      scrollY += frameHeight - edgeHeight;
     }
     sample.destroy();
     frameManager.destroy();
@@ -796,7 +806,8 @@
       rows: rows,
       frameWidth: frameWidth,
       frameHeight: frameHeight,
-      overlap: overlap,
+      edgeWidth: edgeWidth,
+      edgeHeight: edgeHeight,
       getFrameNameCallback: getFrameNameCallback
     };
   };
diff --git a/dist/rexjigsaw.min.js b/dist/rexjigsaw.min.js
index 85e9e304f9..c8a8eca3eb 100644
--- a/dist/rexjigsaw.min.js
+++ b/dist/rexjigsaw.min.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).rexjigsaw=e();}(undefined,(function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}function e(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){for(var i=0;i<e.length;i++){var r=e[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,(n=r.key,a=void 0,"symbol"==typeof(a=function(t,e){if("object"!=typeof t||null===t)return t;var i=t[Symbol.toPrimitive];if(void 0!==i){var r=i.call(t,e||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return ("string"===e?String:Number)(t)}(n,"string"))?a:String(a)),r);}var n,a;}function r(t,e,r){return e&&i(t.prototype,e),r&&i(t,r),Object.defineProperty(t,"prototype",{writable:!1}),t}function n(t){return n=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},n(t)}function a(t,e){return a=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},a(t,e)}function o(t,e){if(e&&("object"==typeof e||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}function s(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return !1;if(Reflect.construct.sham)return !1;if("function"==typeof Proxy)return !0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return !1}}();return function(){var i,r=n(t);if(e){var a=n(this).constructor;i=Reflect.construct(r,arguments,a);}else i=r.apply(this,arguments);return o(this,i)}}function c(){return c="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,i){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=n(t)););return t}(t,e);if(r){var a=Object.getOwnPropertyDescriptor(r,e);return a.get?a.get.call(arguments.length<3?t:i):a.value}},c.apply(this,arguments)}var h,l,u=Phaser.Game,f=function(t){return t instanceof u},d=Phaser.Scene,v=function(t){return t instanceof d},m=function(e){return null==e||"object"!==t(e)?null:f(e)?e:f(e.game)?e.game:v(e)?e.sys.game:v(e.scene)?e.scene.sys.game:void 0},y=function(t,e,i,r,n){if(void 0===h){var a=(o=t.manager.game,m(o).textures.getFrame("__WHITE"));h=a.cutWidth,l=a.cutHeight;}var o;return t.stamp("__WHITE",void 0,e,i,{scaleX:r/h,scaleY:n/l,originX:0,originY:0,erase:!0}),t},g=function(t,e,i,r,n){var a=this.context;a.save(),a.translate(t,e),a.clearRect(0,0,i.width,i.height),n?r.call(n,this.canvas,a,i):r(this.canvas,a,i),a.restore();},p=function(t,e,i,r,n){var a=this.texture;y(a,t,e,i.width,i.height),a.camera.setScroll(-t,-e),n?r.call(n,a,i):r(a,i),a.camera.setScroll(0,0);},b={remove:function(t){var e=this.getFrameIndex(t);return -1===e||(this.addFrameName(e,void 0),this.texture.remove(t)),this},clear:function(){for(var t,e=this.frameNames.length;t<e;t++){var i=this.frameNames[t];void 0!==i&&(this.addFrameName(index,void 0),this.texture.remove(i));}return this}},w={draw:function(t,e,i){var r=this.getFrameIndex(t);if(-1===r&&(r=this.getFrameIndex(void 0)),-1===r)return console.warn("Does not have free space."),this;var n=this.getTopLeftPosition(r),a=n.x,o=n.y,s={width:this.cellWidth,height:this.cellHeight};return (this.useDynamicTexture?p:g).call(this,a,o,s,e,i),this.texture.add(t,0,a,o,s.width,s.height),this.addFrameName(r,t),this},paste:function(t,e){var i;if(this.useDynamicTexture){var r=function(t){return void 0!==t.displayWidth?t.displayWidth:t.width}(e),n=function(t){return void 0!==t.displayHeight?t.displayHeight:t.height}(e);c=r<=this.cellWidth&&n<=this.cellHeight?1:Math.max(r/this.cellWidth,n/this.cellHeight),i=function(t,i){var a=e.originX,o=e.originY,s=e.scaleX,h=e.scaleY;e.setOrigin(0,0).setScale(c,c),t.draw(e),e.setOrigin(a,o).setScale(s,h),i.width=r/c,i.height=n/c;};}else {var a=e.canvas;if(!a)return console.warn("Can't get canvas of game object."),this;var o,s;r=a.width,n=a.height;if(r<=this.cellWidth&&n<=this.cellHeight)o=r,s=n;else {var c=Math.max(r/this.cellWidth,n/this.cellHeight);o=r/c,s=n/c;}i=function(t,e,i){e.drawImage(a,0,0,o,s),i.width=o,i.height=s;};}return this.draw(t,i),this},addEmptyFrame:function(t,e,i){var r;return void 0===e&&(e=this.cellWidth),void 0===i&&(i=this.cellHeight),r=this.useDynamicTexture?function(t,r){r.width=e,r.height=i;}:function(t,r,n){n.width=e,n.height=i;},this.draw(t,r),this},addToBitmapFont:function(){var t=this.texture.key,e=this.bitmapFontCache.get(t);e||(e={data:{retroFont:!0,font:t,size:this.cellWidth,lineHeight:this.cellHeight,chars:{}},texture:t,frame:null},this.bitmapFontCache.add(t,e));for(var i=e.data.chars,r=this.frameNames,n=0,a=r.length;n<a;n++){var o=r[n];if(void 0!==o){var s=this.texture.get(o),c=s.cutX,h=s.cutY,l=s.cutWidth,u=s.cutHeight;i[o.charCodeAt(0)]={x:c,y:h,width:l,height:u,centerX:c+l/2,centerY:h+u/2,xOffset:0,yOffset:0,xAdvance:l,data:{},kerning:{},u0:s.u0,v0:s.v0,u1:s.u1,v1:s.v1};}}return this}};Object.assign(w,b);var x=Phaser.Utils.Objects.IsPlainObject,k=Phaser.Utils.Objects.GetValue,O=function(){function t(i,r,n,a,o,s,c,h){if(e(this,t),x(r)){var l=r;r=k(l,"key"),n=k(l,"width"),a=k(l,"height"),o=k(l,"cellWidth"),s=k(l,"cellHeight"),c=k(l,"fillColor"),h=k(l,"useDynamicTexture");}else "boolean"==typeof c&&(h=c,c=void 0);void 0===n&&(n=4096),void 0===a&&(a=4096),void 0===o&&(o=64),void 0===s&&(s=64),void 0===h&&(h=!1);var u=m(i);if(this.useDynamicTexture=h,this.texture=function(t,e,i,r,n){void 0===n&&(n=!1);var a=(t=m(t)).textures;return a.exists(e)&&a.remove(e),a[n?"addDynamicTexture":"createCanvas"](e,i,r)}(u,r,n,a,h),this.canvas=h?void 0:this.texture.getCanvas(),this.context=h?void 0:this.texture.getContext(),this.bitmapFontCache=u.cache.bitmapFont,void 0!==c)if(h)this.texture.fill(c);else {var f=this.context;f.fillStyle=c,f.fillRect(0,0,this.canvas.width,this.canvas.height);}this.key=r,this.width=n,this.height=a,this.cellWidth=o,this.cellHeight=s,this.columnCount=Math.floor(n/o),this.rowCount=Math.floor(a/s),this.totalCount=this.columnCount*this.rowCount,this.frameNames=Array(this.totalCount);for(var d=0,v=this.frameNames.length;d<v;d++)this.frameNames[d]=void 0;}return r(t,[{key:"destroy",value:function(){this.texture=void 0,this.canvas=void 0,this.context=void 0,this.frameNames=void 0,this.bitmapFontCache=void 0;}},{key:"getFrameIndex",value:function(t){return this.frameNames.indexOf(t)}},{key:"contains",value:function(t){return -1!==this.getFrameIndex(t)}},{key:"addFrameName",value:function(t,e){return this.frameNames[t]=e,this}},{key:"isFull",get:function(){return -1===this.getFrameIndex(void 0)}},{key:"getTopLeftPosition",value:function(t,e){void 0===e&&(e={});var i=t%this.columnCount,r=Math.floor(t/this.columnCount);return e.x=i*this.cellWidth,e.y=r*this.cellHeight,e}},{key:"updateTexture",value:function(){return this.useDynamicTexture||this.texture.refresh(),this}}]),t}();Object.assign(O.prototype,w);var T=Phaser.Math.DegToRad,P=T(0),j=T(90),C=T(180),F=T(270),H=T(360),W=function(t,e,i,r,n){var a=e/2,o=i/2;switch(t.clear(),t.beginPath(),t.moveTo(r,r),n.top){case 1:t.lineTo(a-r,r),t.arc(a,r,r,C,H,!1);break;case 2:t.lineTo(a-r,r),t.arc(a,r,r,C,H,!0);}switch(t.lineTo(e-r,r),n.right){case 1:t.arc(e-r,o,r,F,j,!1);break;case 2:t.arc(e-r,o,r,F,j,!0);}switch(t.lineTo(e-r,i-r),n.bottom){case 1:t.arc(a,i-r,r,P,C,!1);break;case 2:t.arc(a,i-r,r,P,C,!0);}switch(t.lineTo(r,i-r),n.left){case 1:t.arc(r,o,r,j,F,!1);break;case 2:t.arc(r,o,r,j,F,!0);}t.lineTo(r,r),t.closePath(),t.fillPath();},S=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&a(t,e);}(o,Phaser.GameObjects.RenderTexture);var i=s(o);function o(t,r){var n,a=r.width,s=r.height,c=r.indent,h=r.key;e(this,o),(n=i.call(this,t,0,0,a,s)).setBaseKey(h),void 0===c&&(c=Math.min(a,s)/7),n.indent=c;var l=t.make.graphics({add:!1});return n.setMask(l.createGeometryMask()),n.maskGraphics=l,n}return r(o,[{key:"destroy",value:function(t){this.scene&&!this.ignoreDestroy&&(c(n(o.prototype),"destroy",this).call(this,t),this.maskGraphics.destroy(),this.maskGraphics=void 0);}},{key:"setBaseKey",value:function(t){return this.baseKey=t,this}},{key:"drawPiece",value:function(t){var e=t.scrollX,i=t.scrollY,r=t.edgeMode,n=t.drawMaskCallback,a=void 0===n?W:n;return "string"==typeof r&&(r={right:(r=r.split("").map((function(t){return parseInt(t)})))[0],bottom:r[1],left:r[2],top:r[3]}),this.clear().fill(3355443),this.camera.setScroll(e,i),this.stamp(this.baseKey,void 0,0,0,{originX:0,originY:0}),this.camera.setScroll(0,0),a(this.maskGraphics,this.width,this.height,this.indent,r),this}}]),o}(),M=function(t,e){return "".concat(t,",").concat(e)};return {GenerateFrames:function(t,e){var i=e.baseKey,r=e.targetKey,n=e.columns,a=e.rows,o=e.overlap,s=e.edges,c=e.drawMaskCallback,h=e.getFrameNameCallback,l=void 0===h?M:h,u=t.sys.textures.getFrame(i,"__BASE"),f=u.cutWidth,d=u.height;void 0===o&&(o=Math.min(f/n,d/a)/7),void 0===s&&(s=function(t,e){for(var i,r,n,a,o=[],s=0;s<t;s++)o.push(new Array(e));for(var c=0;c<e;c++)for(s=0;s<t;s++)i=0===s?0:1===o[s-1][c].right?2:1,n=0===c?0:1===o[s][c-1].bottom?2:1,r=s===t-1?0:Math.random()>.5?2:1,a=c===e-1?0:Math.random()>.5?2:1,o[s][c]={left:i,right:r,top:n,bottom:a};return o}(n,a));for(var v=(f+(n-1)*o)/n,m=(d+(a-1)*o)/a,y=new O(t,{key:r,width:v*n,height:m*a,cellWidth:v,cellHeight:m,useDynamicTexture:!0,fillColor:8947848}),g=new S(t,{width:v,height:m,indent:o,key:i}),p=-o,b=p,w=-o,x=0;x<a;x++){for(var k=0;k<n;k++)g.drawPiece({scrollX:b,scrollY:w,edgeMode:s[k][x],drawMaskCallback:c}),y.paste(l(k,x),g),b+=v-o;b=p,w+=m-o;}return g.destroy(),y.destroy(),{baseKey:i,targetKey:r,columns:n,rows:a,frameWidth:v,frameHeight:m,overlap:o,getFrameNameCallback:l}}}}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).rexjigsaw=e();}(undefined,(function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}function e(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){for(var i=0;i<e.length;i++){var r=e[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,(n=r.key,a=void 0,"symbol"==typeof(a=function(t,e){if("object"!=typeof t||null===t)return t;var i=t[Symbol.toPrimitive];if(void 0!==i){var r=i.call(t,e||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return ("string"===e?String:Number)(t)}(n,"string"))?a:String(a)),r);}var n,a;}function r(t,e,r){return e&&i(t.prototype,e),r&&i(t,r),Object.defineProperty(t,"prototype",{writable:!1}),t}function n(t){return n=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},n(t)}function a(t,e){return a=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},a(t,e)}function o(t,e){if(e&&("object"==typeof e||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t)}function s(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return !1;if(Reflect.construct.sham)return !1;if("function"==typeof Proxy)return !0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return !1}}();return function(){var i,r=n(t);if(e){var a=n(this).constructor;i=Reflect.construct(r,arguments,a);}else i=r.apply(this,arguments);return o(this,i)}}function c(){return c="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(t,e,i){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=n(t)););return t}(t,e);if(r){var a=Object.getOwnPropertyDescriptor(r,e);return a.get?a.get.call(arguments.length<3?t:i):a.value}},c.apply(this,arguments)}var h,u,l=Phaser.Game,f=function(t){return t instanceof l},d=Phaser.Scene,v=function(t){return t instanceof d},g=function(e){return null==e||"object"!==t(e)?null:f(e)?e:f(e.game)?e.game:v(e)?e.sys.game:v(e.scene)?e.scene.sys.game:void 0},m=function(t,e,i,r,n){if(void 0===h){var a=(o=t.manager.game,g(o).textures.getFrame("__WHITE"));h=a.cutWidth,u=a.cutHeight;}var o;return t.stamp("__WHITE",void 0,e,i,{scaleX:r/h,scaleY:n/u,originX:0,originY:0,erase:!0}),t},y=function(t,e,i,r,n){var a=this.context;a.save(),a.translate(t,e),a.clearRect(0,0,i.width,i.height),n?r.call(n,this.canvas,a,i):r(this.canvas,a,i),a.restore();},p=function(t,e,i,r,n){var a=this.texture;m(a,t,e,i.width,i.height),a.camera.setScroll(-t,-e),n?r.call(n,a,i):r(a,i),a.camera.setScroll(0,0);},b={remove:function(t){var e=this.getFrameIndex(t);return -1===e||(this.addFrameName(e,void 0),this.texture.remove(t)),this},clear:function(){for(var t,e=this.frameNames.length;t<e;t++){var i=this.frameNames[t];void 0!==i&&(this.addFrameName(index,void 0),this.texture.remove(i));}return this}},w={draw:function(t,e,i){var r=this.getFrameIndex(t);if(-1===r&&(r=this.getFrameIndex(void 0)),-1===r)return console.warn("Does not have free space."),this;var n=this.getTopLeftPosition(r),a=n.x,o=n.y,s={width:this.cellWidth,height:this.cellHeight};return (this.useDynamicTexture?p:y).call(this,a,o,s,e,i),this.texture.add(t,0,a,o,s.width,s.height),this.addFrameName(r,t),this},paste:function(t,e){var i;if(this.useDynamicTexture){var r=function(t){return void 0!==t.displayWidth?t.displayWidth:t.width}(e),n=function(t){return void 0!==t.displayHeight?t.displayHeight:t.height}(e);c=r<=this.cellWidth&&n<=this.cellHeight?1:Math.max(r/this.cellWidth,n/this.cellHeight),i=function(t,i){var a=e.originX,o=e.originY,s=e.scaleX,h=e.scaleY;e.setOrigin(0,0).setScale(c,c),t.draw(e),e.setOrigin(a,o).setScale(s,h),i.width=r/c,i.height=n/c;};}else {var a=e.canvas;if(!a)return console.warn("Can't get canvas of game object."),this;var o,s;r=a.width,n=a.height;if(r<=this.cellWidth&&n<=this.cellHeight)o=r,s=n;else {var c=Math.max(r/this.cellWidth,n/this.cellHeight);o=r/c,s=n/c;}i=function(t,e,i){e.drawImage(a,0,0,o,s),i.width=o,i.height=s;};}return this.draw(t,i),this},addEmptyFrame:function(t,e,i){var r;return void 0===e&&(e=this.cellWidth),void 0===i&&(i=this.cellHeight),r=this.useDynamicTexture?function(t,r){r.width=e,r.height=i;}:function(t,r,n){n.width=e,n.height=i;},this.draw(t,r),this},addToBitmapFont:function(){var t=this.texture.key,e=this.bitmapFontCache.get(t);e||(e={data:{retroFont:!0,font:t,size:this.cellWidth,lineHeight:this.cellHeight,chars:{}},texture:t,frame:null},this.bitmapFontCache.add(t,e));for(var i=e.data.chars,r=this.frameNames,n=0,a=r.length;n<a;n++){var o=r[n];if(void 0!==o){var s=this.texture.get(o),c=s.cutX,h=s.cutY,u=s.cutWidth,l=s.cutHeight;i[o.charCodeAt(0)]={x:c,y:h,width:u,height:l,centerX:c+u/2,centerY:h+l/2,xOffset:0,yOffset:0,xAdvance:u,data:{},kerning:{},u0:s.u0,v0:s.v0,u1:s.u1,v1:s.v1};}}return this}};Object.assign(w,b);var x=Phaser.Utils.Objects.IsPlainObject,k=Phaser.Utils.Objects.GetValue,O=function(){function t(i,r,n,a,o,s,c,h){if(e(this,t),x(r)){var u=r;r=k(u,"key"),n=k(u,"width"),a=k(u,"height"),o=k(u,"cellWidth"),s=k(u,"cellHeight"),c=k(u,"fillColor"),h=k(u,"useDynamicTexture");}else "boolean"==typeof c&&(h=c,c=void 0);void 0===n&&(n=4096),void 0===a&&(a=4096),void 0===o&&(o=64),void 0===s&&(s=64),void 0===h&&(h=!1);var l=g(i);if(this.useDynamicTexture=h,this.texture=function(t,e,i,r,n){void 0===n&&(n=!1);var a=(t=g(t)).textures;return a.exists(e)&&a.remove(e),a[n?"addDynamicTexture":"createCanvas"](e,i,r)}(l,r,n,a,h),this.canvas=h?void 0:this.texture.getCanvas(),this.context=h?void 0:this.texture.getContext(),this.bitmapFontCache=l.cache.bitmapFont,void 0!==c)if(h)this.texture.fill(c);else {var f=this.context;f.fillStyle=c,f.fillRect(0,0,this.canvas.width,this.canvas.height);}this.key=r,this.width=n,this.height=a,this.cellWidth=o,this.cellHeight=s,this.columnCount=Math.floor(n/o),this.rowCount=Math.floor(a/s),this.totalCount=this.columnCount*this.rowCount,this.frameNames=Array(this.totalCount);for(var d=0,v=this.frameNames.length;d<v;d++)this.frameNames[d]=void 0;}return r(t,[{key:"destroy",value:function(){this.texture=void 0,this.canvas=void 0,this.context=void 0,this.frameNames=void 0,this.bitmapFontCache=void 0;}},{key:"getFrameIndex",value:function(t){return this.frameNames.indexOf(t)}},{key:"contains",value:function(t){return -1!==this.getFrameIndex(t)}},{key:"addFrameName",value:function(t,e){return this.frameNames[t]=e,this}},{key:"isFull",get:function(){return -1===this.getFrameIndex(void 0)}},{key:"getTopLeftPosition",value:function(t,e){void 0===e&&(e={});var i=t%this.columnCount,r=Math.floor(t/this.columnCount);return e.x=i*this.cellWidth,e.y=r*this.cellHeight,e}},{key:"updateTexture",value:function(){return this.useDynamicTexture||this.texture.refresh(),this}}]),t}();Object.assign(O.prototype,w);var T=Phaser.Math.DegToRad,P=T(0),j=T(90),C=T(180),F=T(270),H=T(360),W=function(t,e,i,r,n,a){var o=e/2,s=i/2;switch(t.clear(),t.beginPath(),t.moveTo(r,n),a.top){case 1:t.lineTo(o-n,n),t.arc(o,n,n,C,H,!1);break;case 2:t.lineTo(o-n,n),t.arc(o,n,n,C,H,!0);}switch(t.lineTo(e-r,n),a.right){case 1:t.arc(e-r,s,r,F,j,!1);break;case 2:t.arc(e-r,s,r,F,j,!0);}switch(t.lineTo(e-r,i-n),a.bottom){case 1:t.arc(o,i-n,n,P,C,!1);break;case 2:t.arc(o,i-n,n,P,C,!0);}switch(t.lineTo(r,i-n),a.left){case 1:t.arc(r,s,r,j,F,!1);break;case 2:t.arc(r,s,r,j,F,!0);}t.lineTo(r,n),t.closePath(),t.fillPath();},S=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),Object.defineProperty(t,"prototype",{writable:!1}),e&&a(t,e);}(o,Phaser.GameObjects.RenderTexture);var i=s(o);function o(t,r){var n,a=r.width,s=r.height,c=r.edgeWidth,h=r.edgeHeight,u=r.key;e(this,o),(n=i.call(this,t,0,0,a,s)).setBaseKey(u),void 0===c&&(c=a/7),n.edgeWidth=c,void 0===h&&(h=s/7),n.edgeHeight=h;var l=t.make.graphics({add:!1});return n.setMask(l.createGeometryMask()),n.maskGraphics=l,n}return r(o,[{key:"destroy",value:function(t){this.scene&&!this.ignoreDestroy&&(c(n(o.prototype),"destroy",this).call(this,t),this.maskGraphics.destroy(),this.maskGraphics=void 0);}},{key:"setBaseKey",value:function(t){return this.baseKey=t,this}},{key:"drawPiece",value:function(t){var e=t.scrollX,i=t.scrollY,r=t.edgeMode,n=t.drawMaskCallback,a=void 0===n?W:n;return "string"==typeof r&&(r={right:(r=r.split("").map((function(t){return parseInt(t)})))[0],bottom:r[1],left:r[2],top:r[3]}),this.clear().fill(3355443),this.camera.setScroll(e,i),this.stamp(this.baseKey,void 0,0,0,{originX:0,originY:0}),this.camera.setScroll(0,0),a(this.maskGraphics,this.width,this.height,this.edgeWidth,this.edgeHeight,r),this}}]),o}(),N=function(t,e){return "".concat(t,",").concat(e)};return {GenerateFrames:function(t,e){var i=e.baseKey,r=e.targetKey,n=e.columns,a=e.rows,o=e.edgeWidth,s=e.edgeHeight,c=e.edges,h=e.drawMaskCallback,u=e.getFrameNameCallback,l=void 0===u?N:u,f=t.sys.textures.getFrame(i,"__BASE"),d=f.cutWidth,v=f.height;void 0===o&&(o=d/n/7),void 0===s&&(s=v/a/7),void 0===c&&(c=function(t,e){for(var i,r,n,a,o=[],s=0;s<t;s++)o.push(new Array(e));for(var c=0;c<e;c++)for(s=0;s<t;s++)i=0===s?0:1===o[s-1][c].right?2:1,n=0===c?0:1===o[s][c-1].bottom?2:1,r=s===t-1?0:Math.random()>.5?2:1,a=c===e-1?0:Math.random()>.5?2:1,o[s][c]={left:i,right:r,top:n,bottom:a};return o}(n,a));for(var g=(d-o*(n-1))/n+2*o,m=(v-s*(a-1))/a+2*s,y=new O(t,{key:r,width:g*n,height:m*a,cellWidth:g,cellHeight:m,useDynamicTexture:!0,fillColor:8947848}),p=new S(t,{width:g,height:m,indentX:o,indentY:s,key:i}),b=-o,w=b,x=-s,k=0;k<a;k++){for(var T=0;T<n;T++)p.drawPiece({scrollX:w,scrollY:x,edgeMode:c[T][k],drawMaskCallback:h}),y.paste(l(T,k),p),w+=g-o;w=b,x+=m-s;}return p.destroy(),y.destroy(),{baseKey:i,targetKey:r,columns:n,rows:a,frameWidth:g,frameHeight:m,edgeWidth:o,edgeHeight:s,getFrameNameCallback:l}}}}));
diff --git a/templates/jigsaw/generateframes/GenerateFrames.js b/templates/jigsaw/generateframes/GenerateFrames.js
index 033c5ca03e..9432ff9074 100644
--- a/templates/jigsaw/generateframes/GenerateFrames.js
+++ b/templates/jigsaw/generateframes/GenerateFrames.js
@@ -33,8 +33,8 @@ var GenerateFrames = function (scene, {
         edges = RandomPieceEdges(columns, rows);
     }
 
-    var frameWidth = (baseFrameWidth + (columns - 1) * edgeWidth) / columns;
-    var frameHeight = (baseFrameHeight + (rows - 1) * edgeHeight) / rows;
+    var frameWidth = ((baseFrameWidth - (edgeWidth * (columns - 1))) / columns) + (2 * edgeWidth);
+    var frameHeight = ((baseFrameHeight - (edgeHeight * (rows - 1))) / rows) + (2 * edgeHeight);
 
     var frameManager = new FrameManager(scene, {
         key: targetKey,
diff --git a/templates/jigsaw/jigsawpiece/JigsawPiece.js b/templates/jigsaw/jigsawpiece/JigsawPiece.js
index 396f94881d..468723dadd 100644
--- a/templates/jigsaw/jigsawpiece/JigsawPiece.js
+++ b/templates/jigsaw/jigsawpiece/JigsawPiece.js
@@ -18,6 +18,7 @@ class JigsawPiece extends Phaser.GameObjects.RenderTexture {
             edgeWidth = width / 7;
         }
         this.edgeWidth = edgeWidth;
+
         if (edgeHeight === undefined) {
             edgeHeight = height / 7;
         }