10.7.8 release

2019-06-19 13:22:26 +02:00 · 2019-06-19 13:22:26 +02:00 · 86ce3459e2
commit 86ce3459e2
parent ccf758de7d
105 changed files with 5094 additions and 1915 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+19-JUN-2019: 10.7.8
+
+- Fixes double click handling with pen and touch on Windows
+- Fixes ignored transparent background in viewer
+- Adds optional custom labels for IC pins
+- Uses mxGraph 4.0.1 beta 8
+- Fixes UI inconsistencies
+
 12-JUN-2019: 10.7.7

 - Adds validation of color picker input to fix XSS vulnerability
--- a/2
+++ b/2
@ -1 +1 @@
-10.7.7
+10.7.8
--- a/etc/docker/README.md
+++ b/etc/docker/README.md
@ -9,3 +9,5 @@ docker run -d -p 8888:8080 draw
 ```
 Now the app will be accessible at `http://localhost:8888/draw/?local=1` (the local URL parameter disables
 the cloud integrations as those require some keys to be changed).
+
+We recommend using [this external Docker draw.io project](https://github.com/fjudith/docker-draw.io), it is somewhat more advanced and better maintained.
--- a/etc/mxgraph/mxClient.js
+++ b/etc/mxgraph/mxClient.js
@ -108,9 +108,10 @@ EDGESTYLE_ELBOW:"elbowEdgeStyle",EDGESTYLE_ENTITY_RELATION:"entityRelationEdgeSt
 function mxEventObject(a){this.name=a;this.properties=[];for(var b=1;b<arguments.length;b+=2)null!=arguments[b+1]&&(this.properties[arguments[b]]=arguments[b+1])}mxEventObject.prototype.name=null;mxEventObject.prototype.properties=null;mxEventObject.prototype.consumed=!1;mxEventObject.prototype.getName=function(){return this.name};mxEventObject.prototype.getProperties=function(){return this.properties};mxEventObject.prototype.getProperty=function(a){return this.properties[a]};
 mxEventObject.prototype.isConsumed=function(){return this.consumed};mxEventObject.prototype.consume=function(){this.consumed=!0};function mxMouseEvent(a,b){this.evt=a;this.sourceState=this.state=b}mxMouseEvent.prototype.consumed=!1;mxMouseEvent.prototype.evt=null;mxMouseEvent.prototype.graphX=null;mxMouseEvent.prototype.graphY=null;mxMouseEvent.prototype.state=null;mxMouseEvent.prototype.sourceState=null;mxMouseEvent.prototype.getEvent=function(){return this.evt};
 mxMouseEvent.prototype.getSource=function(){return mxEvent.getSource(this.evt)};mxMouseEvent.prototype.isSource=function(a){return null!=a?mxUtils.isAncestorNode(a.node,this.getSource()):!1};mxMouseEvent.prototype.getX=function(){return mxEvent.getClientX(this.getEvent())};mxMouseEvent.prototype.getY=function(){return mxEvent.getClientY(this.getEvent())};mxMouseEvent.prototype.getGraphX=function(){return this.graphX};mxMouseEvent.prototype.getGraphY=function(){return this.graphY};
-mxMouseEvent.prototype.getState=function(){return this.state};mxMouseEvent.prototype.getCell=function(){var a=this.getState();return null!=a?a.cell:null};mxMouseEvent.prototype.isPopupTrigger=function(){return mxEvent.isPopupTrigger(this.getEvent())};mxMouseEvent.prototype.isConsumed=function(){return this.consumed};mxMouseEvent.prototype.consume=function(a){(null!=a?a:1)&&this.evt.preventDefault&&this.evt.preventDefault();mxClient.IS_IE&&(this.evt.returnValue=!0);this.consumed=!0};
-function mxEventSource(a){this.setEventSource(a)}mxEventSource.prototype.eventListeners=null;mxEventSource.prototype.eventsEnabled=!0;mxEventSource.prototype.eventSource=null;mxEventSource.prototype.isEventsEnabled=function(){return this.eventsEnabled};mxEventSource.prototype.setEventsEnabled=function(a){this.eventsEnabled=a};mxEventSource.prototype.getEventSource=function(){return this.eventSource};mxEventSource.prototype.setEventSource=function(a){this.eventSource=a};
-mxEventSource.prototype.addListener=function(a,b){null==this.eventListeners&&(this.eventListeners=[]);this.eventListeners.push(a);this.eventListeners.push(b)};mxEventSource.prototype.removeListener=function(a){if(null!=this.eventListeners)for(var b=0;b<this.eventListeners.length;)this.eventListeners[b+1]==a?this.eventListeners.splice(b,2):b+=2};
+mxMouseEvent.prototype.getState=function(){return this.state};mxMouseEvent.prototype.getCell=function(){var a=this.getState();return null!=a?a.cell:null};mxMouseEvent.prototype.isPopupTrigger=function(){return mxEvent.isPopupTrigger(this.getEvent())};mxMouseEvent.prototype.isConsumed=function(){return this.consumed};
+mxMouseEvent.prototype.consume=function(a){(a=null!=a?a:mxEvent.isMouseEvent(this.evt))&&this.evt.preventDefault&&this.evt.preventDefault();mxClient.IS_IE&&(this.evt.returnValue=!0);this.consumed=!0};function mxEventSource(a){this.setEventSource(a)}mxEventSource.prototype.eventListeners=null;mxEventSource.prototype.eventsEnabled=!0;mxEventSource.prototype.eventSource=null;mxEventSource.prototype.isEventsEnabled=function(){return this.eventsEnabled};
+mxEventSource.prototype.setEventsEnabled=function(a){this.eventsEnabled=a};mxEventSource.prototype.getEventSource=function(){return this.eventSource};mxEventSource.prototype.setEventSource=function(a){this.eventSource=a};mxEventSource.prototype.addListener=function(a,b){null==this.eventListeners&&(this.eventListeners=[]);this.eventListeners.push(a);this.eventListeners.push(b)};
+mxEventSource.prototype.removeListener=function(a){if(null!=this.eventListeners)for(var b=0;b<this.eventListeners.length;)this.eventListeners[b+1]==a?this.eventListeners.splice(b,2):b+=2};
 mxEventSource.prototype.fireEvent=function(a,b){if(null!=this.eventListeners&&this.isEventsEnabled()){null==a&&(a=new mxEventObject);null==b&&(b=this.getEventSource());null==b&&(b=this);for(var c=[b,a],d=0;d<this.eventListeners.length;d+=2){var e=this.eventListeners[d];null!=e&&e!=a.getName()||this.eventListeners[d+1].apply(this,c)}}};
 var mxEvent={addListener:function(){return window.addEventListener?function(a,b,c){a.addEventListener(b,c,!1);null==a.mxListenerList&&(a.mxListenerList=[]);a.mxListenerList.push({name:b,f:c})}:function(a,b,c){a.attachEvent("on"+b,c);null==a.mxListenerList&&(a.mxListenerList=[]);a.mxListenerList.push({name:b,f:c})}}(),removeListener:function(){var a=function(a,c,d){if(null!=a.mxListenerList){c=a.mxListenerList.length;for(var b=0;b<c;b++)if(a.mxListenerList[b].f==d){a.mxListenerList.splice(b,1);break}0==
 a.mxListenerList.length&&(a.mxListenerList=null)}};return window.removeEventListener?function(b,c,d){b.removeEventListener(c,d,!1);a(b,c,d)}:function(b,c,d){b.detachEvent("on"+c,d);a(b,c,d)}}(),removeAllListeners:function(a){var b=a.mxListenerList;if(null!=b)for(;0<b.length;){var c=b[0];mxEvent.removeListener(a,c.name,c.f)}},addGestureListeners:function(a,b,c,d){null!=b&&mxEvent.addListener(a,mxClient.IS_POINTER?"pointerdown":"mousedown",b);null!=c&&mxEvent.addListener(a,mxClient.IS_POINTER?"pointermove":
@ -322,16 +323,16 @@ m.setAttribute("visibility","hidden"),m.setAttribute("pointer-events","fill"),m.
 mxSvgCanvas2D.prototype.convertHtml=function(a){if(this.useDomParser){var b=(new DOMParser).parseFromString(a,"text/html");null!=b&&(a=(new XMLSerializer).serializeToString(b.body),"<body"==a.substring(0,5)&&(a=a.substring(a.indexOf(">",5)+1)),"</body>"==a.substring(a.length-7,a.length)&&(a=a.substring(0,a.length-7)))}else{if(null!=document.implementation&&null!=document.implementation.createDocument){var b=document.implementation.createDocument("http://www.w3.org/1999/xhtml","html",null),c=b.createElement("body");
 b.documentElement.appendChild(c);var d=document.createElement("div");d.innerHTML=a;for(a=d.firstChild;null!=a;)d=a.nextSibling,c.appendChild(b.adoptNode(a)),a=d;return c.innerHTML}b=document.createElement("textarea");b.innerHTML=a.replace(/&amp;/g,"&amp;amp;").replace(/&#60;/g,"&amp;lt;").replace(/&#62;/g,"&amp;gt;").replace(/&lt;/g,"&amp;lt;").replace(/&gt;/g,"&amp;gt;").replace(/</g,"&lt;").replace(/>/g,"&gt;");a=b.value.replace(/&/g,"&amp;").replace(/&amp;lt;/g,"&lt;").replace(/&amp;gt;/g,"&gt;").replace(/&amp;amp;/g,
 "&amp;").replace(/<br>/g,"<br />").replace(/<hr>/g,"<hr />").replace(/(<img[^>]+)>/gm,"$1 />")}return a};
-mxSvgCanvas2D.prototype.createDiv=function(a,b,c,d,e){c=this.state;d="display:inline-block;font-size:"+c.fontSize+"px;font-family:"+c.fontFamily+";color:"+c.fontColor+";line-height:"+(mxConstants.ABSOLUTE_LINE_HEIGHT?c.fontSize*mxConstants.LINE_HEIGHT+"px":mxConstants.LINE_HEIGHT*this.lineHeightCorrection)+";"+d;(c.fontStyle&mxConstants.FONT_BOLD)==mxConstants.FONT_BOLD&&(d+="font-weight:bold;");(c.fontStyle&mxConstants.FONT_ITALIC)==mxConstants.FONT_ITALIC&&(d+="font-style:italic;");(c.fontStyle&
-mxConstants.FONT_UNDERLINE)==mxConstants.FONT_UNDERLINE&&(d+="text-decoration:underline;");b==mxConstants.ALIGN_CENTER?d+="text-align:center;":b==mxConstants.ALIGN_RIGHT&&(d+="text-align:right;");b="";null!=c.fontBackgroundColor&&(b+="background-color:"+c.fontBackgroundColor+";");null!=c.fontBorderColor&&(b+="border:1px solid "+c.fontBorderColor+";");mxUtils.isNode(a)||(a=this.convertHtml(a),"fill"!=e&&"width"!=e?a='<div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;'+
-b+'">'+a+"</div>":d+=b);if(!mxClient.IS_IE&&document.createElementNS)return e=document.createElementNS("http://www.w3.org/1999/xhtml","div"),e.setAttribute("style",d),mxUtils.isNode(a)?this.root.ownerDocument!=document?e.appendChild(a.cloneNode(!0)):e.appendChild(a):e.innerHTML=a,e;mxUtils.isNode(a)&&this.root.ownerDocument!=document&&(a=a.outerHTML);return mxUtils.parseXml('<div xmlns="http://www.w3.org/1999/xhtml" style="'+d+'">'+a+"</div>").documentElement};
+mxSvgCanvas2D.prototype.createDiv=function(a,b,c,d,e,f){c=this.state;d="display:inline-block;font-size:"+c.fontSize+"px;font-family:"+c.fontFamily+";color:"+c.fontColor+";line-height:"+(mxConstants.ABSOLUTE_LINE_HEIGHT?c.fontSize*mxConstants.LINE_HEIGHT+"px":mxConstants.LINE_HEIGHT*this.lineHeightCorrection)+";"+d;(c.fontStyle&mxConstants.FONT_BOLD)==mxConstants.FONT_BOLD&&(d+="font-weight:bold;");(c.fontStyle&mxConstants.FONT_ITALIC)==mxConstants.FONT_ITALIC&&(d+="font-style:italic;");(c.fontStyle&
+mxConstants.FONT_UNDERLINE)==mxConstants.FONT_UNDERLINE&&(d+="text-decoration:underline;");b==mxConstants.ALIGN_CENTER?d+="text-align:center;":b==mxConstants.ALIGN_RIGHT&&(d+="text-align:right;");b="";null!=c.fontBackgroundColor&&(b+="background-color:"+c.fontBackgroundColor+";");null!=c.fontBorderColor&&(b+="border:1px solid "+c.fontBorderColor+";");mxUtils.isNode(a)||(a=this.convertHtml(a),"fill"!=e&&"width"!=e?(null!=f&&(b+="white-space:"+f+";"),a='<div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;'+
+b+'">'+a+"</div>"):d+=b);if(!mxClient.IS_IE&&document.createElementNS)return e=document.createElementNS("http://www.w3.org/1999/xhtml","div"),e.setAttribute("style",d),mxUtils.isNode(a)?this.root.ownerDocument!=document?e.appendChild(a.cloneNode(!0)):e.appendChild(a):e.innerHTML=a,e;mxUtils.isNode(a)&&this.root.ownerDocument!=document&&(a=a.outerHTML);return mxUtils.parseXml('<div xmlns="http://www.w3.org/1999/xhtml" style="'+d+'">'+a+"</div>").documentElement};
 mxSvgCanvas2D.prototype.invalidateCachedOffsetSize=function(a){delete a.firstChild.mxCachedOffsetWidth;delete a.firstChild.mxCachedFinalOffsetWidth;delete a.firstChild.mxCachedFinalOffsetHeight};
 mxSvgCanvas2D.prototype.updateText=function(a,b,c,d,e,f,g,k,l,m,n){if(null!=n&&null!=n.firstChild&&null!=n.firstChild.firstChild&&null!=n.firstChild.firstChild.firstChild){n=n.firstChild;var p=n.firstChild,q=p.firstChild;m=null!=m?m:0;var r=this.state;a+=r.dx;b+=r.dy;l?(q.style.maxHeight=Math.round(d)+"px",q.style.maxWidth=Math.round(c)+"px"):"fill"==k?(q.style.width=Math.round(c+1)+"px",q.style.height=Math.round(d+1)+"px"):"width"==k&&(q.style.width=Math.round(c+1)+"px",0<d&&(q.style.maxHeight=Math.round(d)+
 "px"));g&&0<c&&(q.style.width=Math.round(c+1)+"px");var t,u=q;null!=u.firstChild&&"DIV"==u.firstChild.nodeName&&(u=u.firstChild);var y=null!=n.mxCachedOffsetWidth?n.mxCachedOffsetWidth:u.offsetWidth;t=y+0;g&&"fill"!=k&&(l&&(t=Math.min(t,c)),q.style.width=Math.round(t+1)+"px");t=null!=n.mxCachedFinalOffsetWidth?n.mxCachedFinalOffsetWidth:u.offsetWidth;g=null!=n.mxCachedFinalOffsetHeight?n.mxCachedFinalOffsetHeight:u.offsetHeight;this.cacheOffsetSize&&(n.mxCachedOffsetWidth=y,n.mxCachedFinalOffsetWidth=
 t,n.mxCachedFinalOffsetHeight=g);t+=0;g-=2;l&&(g=Math.min(g,d),t=Math.min(t,c));"width"==k?d=g:"fill"!=k&&(c=t,d=g);g=l=0;e==mxConstants.ALIGN_CENTER?l-=c/2:e==mxConstants.ALIGN_RIGHT&&(l-=c);a+=l;f==mxConstants.ALIGN_MIDDLE?g-=d/2:f==mxConstants.ALIGN_BOTTOM&&(g-=d);"fill"!=k&&mxClient.IS_FF&&mxClient.IS_WIN&&(g-=2);b+=g;e=1!=r.scale?"scale("+r.scale+")":"";0!=r.rotation&&this.rotateHtml?(e+="rotate("+r.rotation+","+c/2+","+d/2+")",b=this.rotatePoint((a+c/2)*r.scale,(b+d/2)*r.scale,r.rotation,r.rotationCx,
 r.rotationCy),a=b.x-c*r.scale/2,b=b.y-d*r.scale/2):(a*=r.scale,b*=r.scale);0!=m&&(e+="rotate("+m+","+-l+","+-g+")");n.setAttribute("transform","translate("+Math.round(a)+","+Math.round(b)+")"+e);p.setAttribute("width",Math.round(Math.max(1,c)));p.setAttribute("height",Math.round(Math.max(1,d)))}};
 mxSvgCanvas2D.prototype.text=function(a,b,c,d,e,f,g,k,l,m,n,p,q){if(this.textEnabled&&null!=e){p=null!=p?p:0;var r=this.state;a+=r.dx;b+=r.dy;if(this.foEnabled&&"html"==l){var t="vertical-align:top;";n?t+="overflow:hidden;max-height:"+Math.round(d)+"px;max-width:"+Math.round(c)+"px;":"fill"==m?t+="width:"+Math.round(c+1)+"px;height:"+Math.round(d+1)+"px;overflow:hidden;":"width"==m&&(t+="width:"+Math.round(c+1)+"px;",0<d&&(t+="max-height:"+Math.round(d)+"px;overflow:hidden;"));var t=k&&0<c?t+("width:"+
-Math.round(c+1)+"px;white-space:normal;word-wrap:"+mxConstants.WORD_WRAP+";"):t+"white-space:nowrap;",u=this.createElement("g");1>r.alpha&&u.setAttribute("opacity",r.alpha);var y=this.createElement("foreignObject");y.setAttribute("style","overflow:visible;");y.setAttribute("pointer-events","all");t=this.createDiv(e,f,g,t,m);if(null!=t){null!=q&&t.setAttribute("dir",q);u.appendChild(y);this.root.appendChild(u);var x,A;q=x=2;if(!mxClient.IS_IE||9!=document.documentMode&&mxClient.IS_SVG){this.root.ownerDocument!=
+Math.round(c+1)+"px;white-space:normal;word-wrap:"+mxConstants.WORD_WRAP+";"):t+"white-space:nowrap;",u=this.createElement("g");1>r.alpha&&u.setAttribute("opacity",r.alpha);var y=this.createElement("foreignObject");y.setAttribute("style","overflow:visible;");y.setAttribute("pointer-events","all");t=this.createDiv(e,f,g,t,m,k&&0<c?"normal":null);if(null!=t){null!=q&&t.setAttribute("dir",q);u.appendChild(y);this.root.appendChild(u);var x,A;q=x=2;if(!mxClient.IS_IE||9!=document.documentMode&&mxClient.IS_SVG){this.root.ownerDocument!=
 document?(t.style.visibility="hidden",document.body.appendChild(t)):y.appendChild(t);var z=t;null!=z.firstChild&&"DIV"==z.firstChild.nodeName&&(z=z.firstChild,k&&"break-word"==t.style.wordWrap&&(z.style.width="100%"));v=z.offsetWidth;0==v&&t.parentNode==y&&(t.style.visibility="hidden",document.body.appendChild(t),v=z.offsetWidth);this.cacheOffsetSize&&(u.mxCachedOffsetWidth=v);!n&&k&&0<c&&this.root.ownerDocument!=document&&"fill"!=m&&"width"!=m&&(B=t.style.whiteSpace,t.style.whiteSpace="nowrap",v<
 z.offsetWidth&&(t.style.whiteSpace=B));x=v+x-1;k&&"fill"!=m&&"width"!=m&&(n&&(x=Math.min(x,c)),t.style.width=x+"px");x=z.offsetWidth;A=z.offsetHeight;this.cacheOffsetSize&&(u.mxCachedFinalOffsetWidth=x,u.mxCachedFinalOffsetHeight=A);A-=q;t.parentNode!=y&&(y.appendChild(t),t.style.visibility="")}else{z=document.createElement("div");z.style.cssText=t.getAttribute("style");z.style.display=mxClient.IS_QUIRKS?"inline":"inline-block";z.style.position="absolute";z.style.visibility="hidden";A=document.createElement("div");
 A.style.display=mxClient.IS_QUIRKS?"inline":"inline-block";A.style.wordWrap=mxConstants.WORD_WRAP;A.innerHTML=mxUtils.isNode(e)?e.outerHTML:e;z.appendChild(A);document.body.appendChild(z);8!=document.documentMode&&9!=document.documentMode&&null!=r.fontBorderColor&&(x+=2,q+=2);if(k&&0<c){var v=A.offsetWidth;padDx=0;if(!n&&k&&0<c&&this.root.ownerDocument!=document&&"fill"!=m){var B=z.style.whiteSpace;A.style.whiteSpace="nowrap";v<A.offsetWidth&&(z.style.whiteSpace=B)}n&&(v=Math.min(v,c));z.style.width=
@ -632,7 +633,7 @@ mxParallelEdgeLayout.prototype.constructor=mxParallelEdgeLayout;mxParallelEdgeLa
 mxParallelEdgeLayout.prototype.findParallels=function(a){for(var b=this.graph.getModel(),c=[],d=b.getChildCount(a),e=0;e<d;e++){var f=b.getChildAt(a,e);if(!this.isEdgeIgnored(f)){var g=this.getEdgeId(f);null!=g&&(null==c[g]&&(c[g]=[]),c[g].push(f))}}return c};mxParallelEdgeLayout.prototype.getEdgeId=function(a){var b=this.graph.getView(),c=b.getVisibleTerminal(a,!0);a=b.getVisibleTerminal(a,!1);return null!=c&&null!=a?(c=mxObjectIdentity.get(c),a=mxObjectIdentity.get(a),c>a?a+"-"+c:c+"-"+a):null};
 mxParallelEdgeLayout.prototype.layout=function(a){var b=a[0],c=this.graph.getView(),d=this.graph.getModel(),e=d.getGeometry(c.getVisibleTerminal(b,!0)),d=d.getGeometry(c.getVisibleTerminal(b,!1));if(e==d)for(var b=e.x+e.width+this.spacing,c=e.y+e.height/2,f=0;f<a.length;f++)this.route(a[f],b,c),b+=this.spacing;else if(null!=e&&null!=d){var b=e.x+e.width/2,c=e.y+e.height/2,f=d.x+d.width/2-b,g=d.y+d.height/2-c,d=Math.sqrt(f*f+g*g);if(0<d)for(e=g*this.spacing/d,d=f*this.spacing/d,b=b+f/2+e*(a.length-
 1)/2,c=c+g/2-d*(a.length-1)/2,f=0;f<a.length;f++)this.route(a[f],b,c),b-=e,c+=d}};mxParallelEdgeLayout.prototype.route=function(a,b,c){this.graph.isCellMovable(a)&&this.setEdgePoints(a,[new mxPoint(b,c)])};function mxCompositeLayout(a,b,c){mxGraphLayout.call(this,a);this.layouts=b;this.master=c}mxCompositeLayout.prototype=new mxGraphLayout;mxCompositeLayout.prototype.constructor=mxCompositeLayout;mxCompositeLayout.prototype.layouts=null;mxCompositeLayout.prototype.master=null;
-mxCompositeLayout.prototype.moveCell=function(a,b,c){null!=this.master?this.master.move.apply(this.master,arguments):this.layouts[0].move.apply(this.layouts[0],arguments)};mxCompositeLayout.prototype.execute=function(a){var b=this.graph.getModel();b.beginUpdate();try{for(var c=0;c<this.layouts.length;c++)this.layouts[c].execute.apply(this.layouts[c],arguments)}finally{b.endUpdate()}};function mxEdgeLabelLayout(a,b){mxGraphLayout.call(this,a)}mxEdgeLabelLayout.prototype=new mxGraphLayout;
+mxCompositeLayout.prototype.moveCell=function(a,b,c){null!=this.master?this.master.moveCell.apply(this.master,arguments):this.layouts[0].moveCell.apply(this.layouts[0],arguments)};mxCompositeLayout.prototype.execute=function(a){var b=this.graph.getModel();b.beginUpdate();try{for(var c=0;c<this.layouts.length;c++)this.layouts[c].execute.apply(this.layouts[c],arguments)}finally{b.endUpdate()}};function mxEdgeLabelLayout(a,b){mxGraphLayout.call(this,a)}mxEdgeLabelLayout.prototype=new mxGraphLayout;
 mxEdgeLabelLayout.prototype.constructor=mxEdgeLabelLayout;mxEdgeLabelLayout.prototype.execute=function(a){for(var b=this.graph.view,c=this.graph.getModel(),d=[],e=[],f=c.getChildCount(a),g=0;g<f;g++){var k=c.getChildAt(a,g),l=b.getState(k);null!=l&&(this.isVertexIgnored(k)?this.isEdgeIgnored(k)||d.push(l):e.push(l))}this.placeLabels(e,d)};
 mxEdgeLabelLayout.prototype.placeLabels=function(a,b){var c=this.graph.getModel();c.beginUpdate();try{for(var d=0;d<b.length;d++){var e=b[d];if(null!=e&&null!=e.text&&null!=e.text.boundingBox)for(var f=0;f<a.length;f++){var g=a[f];null!=g&&this.avoid(e,g)}}}finally{c.endUpdate()}};
 mxEdgeLabelLayout.prototype.avoid=function(a,b){var c=this.graph.getModel(),d=a.text.boundingBox;if(mxUtils.intersects(d,b)){var e=-d.y-d.height+b.y,f=-d.y+b.y+b.height,e=Math.abs(e)<Math.abs(f)?e:f,f=-d.x-d.width+b.x,d=-d.x+b.x+b.width,d=Math.abs(f)<Math.abs(d)?f:d;Math.abs(d)<Math.abs(e)?e=0:d=0;f=c.getGeometry(a.cell);null!=f&&(f=f.clone(),null!=f.offset?(f.offset.x+=d,f.offset.y+=e):f.offset=new mxPoint(d,e),c.setGeometry(a.cell,f))}};
@ -942,7 +943,7 @@ function(d){this.isShapeEvent(a,d)&&b.fireMouseEvent(mxEvent.MOUSE_MOVE,new mxMo
 mxCellRenderer.prototype.redrawLabel=function(a,b){var c=a.view.graph,d=this.getLabelValue(a),e=c.isWrapping(a.cell),f=c.isLabelClipped(a.cell),g=a.view.graph.isHtmlLabel(a.cell)||null!=d&&mxUtils.isNode(d)?mxConstants.DIALECT_STRICTHTML:a.view.graph.dialect,k=a.style[mxConstants.STYLE_OVERFLOW]||"visible";null==a.text||a.text.wrap==e&&a.text.clipped==f&&a.text.overflow==k&&a.text.dialect==g||(a.text.destroy(),a.text=null);null==a.text&&null!=d&&(mxUtils.isNode(d)||0<d.length)?this.createLabel(a,
 d):null==a.text||null!=d&&0!=d.length||(a.text.destroy(),a.text=null);if(null!=a.text){b&&(null!=a.text.lastValue&&this.isTextShapeInvalid(a,a.text)&&(a.text.lastValue=null),a.text.resetStyles(),a.text.apply(a),a.text.valign=c.getVerticalAlign(a));var c=this.getLabelBounds(a),l=this.getTextScale(a);if(b||a.text.value!=d||a.text.isWrapping!=e||a.text.overflow!=k||a.text.isClipping!=f||a.text.scale!=l||a.text.dialect!=g||!a.text.bounds.equals(c))0!=a.text.bounds.width&&null!=a.unscaledWidth&&0!=Math.round(a.text.bounds.width/
 a.text.scale*l-c.width)&&(a.unscaledWidth=null),a.text.dialect=g,a.text.value=d,a.text.bounds=c,a.text.scale=l,a.text.wrap=e,a.text.clipped=f,a.text.overflow=k,d=a.text.node.style.visibility,this.redrawLabelShape(a.text),a.text.node.style.visibility=d}};
-mxCellRenderer.prototype.isTextShapeInvalid=function(a,b){function c(c,e,f){return result="spacingTop"==e||"spacingRight"==e||"spacingBottom"==e||"spacingLeft"==e?parseFloat(b[c])-parseFloat(b.spacing)!=(a.style[e]||f):b[c]!=(a.style[e]||f)}return c("fontStyle",mxConstants.STYLE_FONTSTYLE,mxConstants.DEFAULT_FONTSTYLE)||c("family",mxConstants.STYLE_FONTFAMILY,mxConstants.DEFAULT_FONTFAMILY)||c("size",mxConstants.STYLE_FONTSIZE,mxConstants.DEFAULT_FONTSIZE)||c("color",mxConstants.STYLE_FONTCOLOR,"black")||
+mxCellRenderer.prototype.isTextShapeInvalid=function(a,b){function c(c,e,f){return"spacingTop"==e||"spacingRight"==e||"spacingBottom"==e||"spacingLeft"==e?parseFloat(b[c])-parseFloat(b.spacing)!=(a.style[e]||f):b[c]!=(a.style[e]||f)}return c("fontStyle",mxConstants.STYLE_FONTSTYLE,mxConstants.DEFAULT_FONTSTYLE)||c("family",mxConstants.STYLE_FONTFAMILY,mxConstants.DEFAULT_FONTFAMILY)||c("size",mxConstants.STYLE_FONTSIZE,mxConstants.DEFAULT_FONTSIZE)||c("color",mxConstants.STYLE_FONTCOLOR,"black")||
 c("align",mxConstants.STYLE_ALIGN,"")||c("valign",mxConstants.STYLE_VERTICAL_ALIGN,"")||c("spacing",mxConstants.STYLE_SPACING,2)||c("spacingTop",mxConstants.STYLE_SPACING_TOP,0)||c("spacingRight",mxConstants.STYLE_SPACING_RIGHT,0)||c("spacingBottom",mxConstants.STYLE_SPACING_BOTTOM,0)||c("spacingLeft",mxConstants.STYLE_SPACING_LEFT,0)||c("horizontal",mxConstants.STYLE_HORIZONTAL,!0)||c("background",mxConstants.STYLE_LABEL_BACKGROUNDCOLOR)||c("border",mxConstants.STYLE_LABEL_BORDERCOLOR)||c("opacity",
 mxConstants.STYLE_TEXT_OPACITY,100)||c("textDirection",mxConstants.STYLE_TEXT_DIRECTION,mxConstants.DEFAULT_TEXT_DIRECTION)};mxCellRenderer.prototype.redrawLabelShape=function(a){a.redraw()};mxCellRenderer.prototype.getTextScale=function(a){return a.view.scale};
 mxCellRenderer.prototype.getLabelBounds=function(a){var b=a.view.graph,c=a.view.scale,d=b.getModel().isEdge(a.cell),e=new mxRectangle(a.absoluteOffset.x,a.absoluteOffset.y);if(d){var f=a.text.getSpacing();e.x+=f.x*c;e.y+=f.y*c;b=b.getCellGeometry(a.cell);null!=b&&(e.width=Math.max(0,b.width*c),e.height=Math.max(0,b.height*c))}else a.text.isPaintBoundsInverted()&&(b=e.x,e.x=e.y,e.y=b),e.x+=a.x,e.y+=a.y,e.width=Math.max(1,a.width),e.height=Math.max(1,a.height),b=mxUtils.getValue(a.style,mxConstants.STYLE_STROKECOLOR,
@ -1463,7 +1464,7 @@ mxConnectionHandler.prototype.getTargetPerimeterPoint=function(a,b){var c=null,d
 mxConnectionHandler.prototype.getSourcePerimeterPoint=function(a,b,c){c=null;var d=a.view,e=d.getPerimeterFunction(a),f=new mxPoint(a.getCenterX(),a.getCenterY());if(null!=e){var g=mxUtils.getValue(a.style,mxConstants.STYLE_ROTATION,0),k=Math.PI/180*-g;0!=g&&(b=mxUtils.getRotatedPoint(new mxPoint(b.x,b.y),Math.cos(k),Math.sin(k),f));a=e(d.getPerimeterBounds(a),a,b,!1);null!=a&&(0!=g&&(a=mxUtils.getRotatedPoint(new mxPoint(a.x,a.y),Math.cos(-k),Math.sin(-k),f)),c=a)}else c=f;return c};
 mxConnectionHandler.prototype.updateIcons=function(a,b,c){};mxConnectionHandler.prototype.isStopEvent=function(a){return null!=a.getState()};
 mxConnectionHandler.prototype.addWaypointForEvent=function(a){var b=mxUtils.convertPoint(this.graph.container,a.getX(),a.getY()),c=Math.abs(b.x-this.first.x),b=Math.abs(b.y-this.first.y);if(null!=this.waypoints||1<this.mouseDownCounter&&(c>this.graph.tolerance||b>this.graph.tolerance))null==this.waypoints&&(this.waypoints=[]),c=this.graph.view.scale,b=new mxPoint(this.graph.snap(a.getGraphX()/c)*c,this.graph.snap(a.getGraphY()/c)*c),this.waypoints.push(b)};
-mxConnectionHandler.prototype.checkConstraints=function(a,b){return null==a||null==b||null==a.point||null==b.point||!a.point.equals(b.point)||a.perimeter!=b.perimeter};
+mxConnectionHandler.prototype.checkConstraints=function(a,b){return null==a||null==b||null==a.point||null==b.point||!a.point.equals(b.point)||a.dx!=b.dx||a.dy!=b.dy||a.perimeter!=b.perimeter};
 mxConnectionHandler.prototype.mouseUp=function(a,b){if(!b.isConsumed()&&this.isConnecting()){if(this.waypointsEnabled&&!this.isStopEvent(b)){this.addWaypointForEvent(b);b.consume();return}var c=this.sourceConstraint,d=this.constraintHandler.currentConstraint,e=null!=this.previous?this.previous.cell:null,f=null;null!=this.constraintHandler.currentConstraint&&null!=this.constraintHandler.currentFocus&&(f=this.constraintHandler.currentFocus.cell);null==f&&null!=this.currentState&&(f=this.currentState.cell);
 null!=this.error||null!=e&&null!=f&&e==f&&!this.checkConstraints(c,d)?(null!=this.previous&&null!=this.marker.validState&&this.previous.cell==this.marker.validState.cell&&this.graph.selectCellForEvent(this.marker.source,b.getEvent()),null!=this.error&&0<this.error.length&&this.graph.validationAlert(this.error)):this.connect(e,f,b.getEvent(),b.getCell());this.destroyIcons();b.consume()}null!=this.first&&this.reset()};
 mxConnectionHandler.prototype.reset=function(){null!=this.shape&&(this.shape.destroy(),this.shape=null);null!=this.cursor&&null!=this.graph.container&&(this.graph.container.style.cursor="");this.destroyIcons();this.marker.reset();this.constraintHandler.reset();this.sourceConstraint=this.error=this.previous=this.edgeState=this.currentPoint=this.originalPoint=null;this.mouseDownCounter=0;this.first=null;this.fireEvent(new mxEventObject(mxEvent.RESET))};
--- a/src/main/java/com/mxgraph/online/SaveServlet.java
+++ b/src/main/java/com/mxgraph/online/SaveServlet.java
@ -187,7 +187,7 @@ public class SaveServlet extends HttpServlet
 								"attachment; filename=\"" + filename
 										+ "\"; filename*=UTF-8''" + filename);
 					}
-					else if (mime.equals("image/svg+xml"))
+					else if (mime != null && mime.equals("image/svg+xml"))
 					{
 						response.setContentType("image/svg+xml");
 					}
--- a/src/main/webapp/cache.manifest
+++ b/src/main/webapp/cache.manifest
@ -1,7 +1,7 @@
 CACHE MANIFEST

 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 06/12/2019 11:04 am
+# 06/19/2019 01:14 PM

 app.html
 index.html?offline=1
--- a/src/main/webapp/images/sidebar-ibm.png
+++ b/src/main/webapp/images/sidebar-ibm.png
--- a/src/main/webapp/img/lib/ibm/devops/collaborative_development.svg
+++ b/src/main/webapp/img/lib/ibm/devops/collaborative_development.svg
@ -1,26 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 60.2 60.2" style="enable-background:new 0 0 60.2 60.2;" xml:space="preserve">
-<style type="text/css">
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 60.2 60.2"
+   style="enable-background:new 0 0 60.2 60.2;"
+   xml:space="preserve"
+   sodipodi:docname="collaborative_development.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata3438"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs3436" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview3434"
+   showgrid="false"
+   inkscape:zoom="11.088186"
+   inkscape:cx="13.854599"
+   inkscape:cy="31.18792"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<style
+   type="text/css"
+   id="style3416">
 	.st0{fill:#F37738;}
 	.st1{fill:#FFFFFF;}
 </style>
-<title>INDIVIDUAL ICONS</title>
-<g id="Layer_2">
-	<circle class="st0" cx="30.1" cy="30.1" r="30.1"/>
+<title
+   id="title3418">INDIVIDUAL ICONS</title>
+<g
+   id="Layer_2">
+	<circle
+   class="st0"
+   cx="30.1"
+   cy="30.1"
+   r="30.1"
+   id="circle3420" />
 </g>
-<path class="st1" d="M19.9,37.1c3.5,0,6.3-2.8,6.3-6.3c0-3.5-2.8-6.3-6.3-6.3c-3.5,0-6.3,2.8-6.3,6.3S16.4,37.1,19.9,37.1
-	C19.9,37.1,19.9,37.1,19.9,37.1z M19.9,25.7c2.8,0,5.1,2.2,5.1,5s-2.2,5.1-5,5.1c-2.8,0-5.1-2.2-5.1-5c0,0,0,0,0,0
-	C14.9,28,17.2,25.7,19.9,25.7z"/>
-<path class="st1" d="M33.9,30.8c0,3.5,2.8,6.3,6.3,6.3s6.3-2.8,6.3-6.3s-2.8-6.3-6.3-6.3S33.9,27.3,33.9,30.8
-	C33.9,30.8,33.9,30.8,33.9,30.8z M40.2,25.7c2.8,0,5.1,2.3,5.1,5.1s-2.3,5.1-5.1,5.1c-2.8,0-5.1-2.3-5.1-5.1
-	C35.2,28,37.4,25.7,40.2,25.7z"/>
-<path class="st1" d="M36.4,16.8c0-3.5-2.9-6.3-6.4-6.3c-3.5,0-6.3,2.9-6.3,6.4c0,3.5,2.8,6.3,6.3,6.3C33.6,23.2,36.4,20.4,36.4,16.8
-	C36.4,16.9,36.4,16.9,36.4,16.8z M30.1,21.9c-2.8,0-5.1-2.3-5.1-5.1s2.3-5.1,5.1-5.1c2.8,0,5.1,2.3,5.1,5.1
-	C35.2,19.6,32.9,21.9,30.1,21.9L30.1,21.9z"/>
-<path class="st1" d="M25,39.6H14.9c-1.4,0-2.5,1.1-2.6,2.5c0,0,0,0,0,0.1V46h15.2v-3.8C27.6,40.8,26.5,39.7,25,39.6
-	C25.1,39.6,25.1,39.6,25,39.6z"/>
-<path class="st1" d="M45.3,39.6H35.2c-1.4,0-2.5,1.1-2.5,2.5c0,0,0,0,0,0V46h15.2v-3.8C47.8,40.8,46.7,39.7,45.3,39.6
-	C45.3,39.6,45.3,39.6,45.3,39.6z"/>
-</svg>
+
+
+
+
+<path
+   id="path3431"
+   d="M 45.3,39.6 H 35.2 c -1.4,0 -2.5,1.1 -2.5,2.5 0,0 0,0 0,0 V 46 h 15.2 v -3.8 c -0.1,-1.4 -1.2,-2.5 -2.6,-2.6 0,0 0,0 0,0 z M 25,39.6 H 14.9 c -1.4,0 -2.5,1.1 -2.6,2.5 0,0 0,0 0,0.1 V 46 h 15.2 v -3.8 c 0.1,-1.4 -1,-2.5 -2.5,-2.6 0.1,0 0.1,0 0,0 z M 36.4,16.8 c 0,-3.5 -2.9,-6.3 -6.4,-6.3 -3.5,0 -6.3,2.9 -6.3,6.4 0,3.5 2.8,6.3 6.3,6.3 3.6,0 6.4,-2.8 6.4,-6.4 0,0.1 0,0.1 0,0 z m -6.3,5.1 c -2.8,0 -5.1,-2.3 -5.1,-5.1 0,-2.8 2.3,-5.1 5.1,-5.1 2.8,0 5.1,2.3 5.1,5.1 0,2.8 -2.3,5.1 -5.1,5.1 z m 3.8,8.9 c 0,3.5 2.8,6.3 6.3,6.3 3.5,0 6.3,-2.8 6.3,-6.3 0,-3.5 -2.8,-6.3 -6.3,-6.3 -3.5,0 -6.3,2.8 -6.3,6.3 0,0 0,0 0,0 z m 6.3,-5.1 c 2.8,0 5.1,2.3 5.1,5.1 0,2.8 -2.3,5.1 -5.1,5.1 -2.8,0 -5.1,-2.3 -5.1,-5.1 0.1,-2.8 2.3,-5.1 5.1,-5.1 z M 19.9,37.1 c 3.5,0 6.3,-2.8 6.3,-6.3 0,-3.5 -2.8,-6.3 -6.3,-6.3 -3.5,0 -6.3,2.8 -6.3,6.3 0,3.5 2.8,6.3 6.3,6.3 0,0 0,0 0,0 z m 0,-11.4 c 2.8,0 5.1,2.2 5.1,5 0,2.8 -2.2,5.1 -5,5.1 -2.8,0 -5.1,-2.2 -5.1,-5 0,0 0,0 0,0 0,-2.8 2.3,-5.1 5,-5.1 z"
+   style="fill:#ffffff" />
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/ClassicInfrastructureTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/ClassicInfrastructureTag.svg
@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.42876mm"
+   height="196.42876mm"
+   viewBox="0 0 196.42876 196.42876"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Classic_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="452.51077"
+     inkscape:cy="276.12034"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-7.5486803,-50.007427)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.32322836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect4609"
+       width="196.39772"
+       height="39.314404"
+       x="7.5797105"
+       y="128.56459" />
+    <path
+       id="rect4609-6"
+       style="opacity:1;vector-effect:none;fill:#b40017;fill-opacity:1;stroke:none;stroke-width:1.32322836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       d="M 7.5797105,50.007427 H 203.97743 V 89.321831 H 7.5797105 Z m 0,157.114353 H 203.97743 v 39.3144 H 7.5797105 Z" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/CloudTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/CloudTag.svg
@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.42876mm"
+   height="196.42876mm"
+   viewBox="0 0 196.42876 196.42876"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Cloud_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="426.48853"
+     inkscape:cy="241.25326"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-7.5486803,-50.007427)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#4c7bb4;fill-opacity:0.9748744;stroke:none;stroke-width:1.28708541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect1368"
+       width="196.42876"
+       height="196.42876"
+       x="7.5486803"
+       y="50.007427"
+       rx="8.3668938"
+       ry="8.3668938" />
+    <path
+       id="path1382"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 182.79688,112.16016 -20.1211,14.38476 2.9082,4.06836 20.11914,-14.38672 z m -32.3125,-33.507816 -11.96485,22.103516 4.39649,2.37891 11.96679,-22.101567 z M 106.29102,66.457031 v 25.707031 h 5 V 66.457031 Z m -38.371098,11.408203 -4.435547,2.306641 12.738281,24.480465 4.435547,-2.30664 z M 35.875,112.25781 33,116.34961 l 20.945312,14.71875 2.875,-4.0918 z m 75.92773,-7.01758 c -9.44965,-0.59116 -18.673152,1.86766 -26.640621,6.25196 l -0.02734,0.0137 -0.02734,0.0156 c -12.65574,7.38395 -20.178625,17.98786 -24.1875,29.48633 -4.008875,11.49848 -4.59347,23.88199 -3.691406,35.23828 l 4.984375,-0.39648 c -0.865486,-10.8958 -0.261435,-22.61579 3.427734,-33.19727 3.687553,-10.57684 10.367783,-20.02509 21.972656,-26.80078 14.504682,-7.96533 32.672322,-9.08879 48.884772,5.1875 l 3.30468,-3.7539 c -8.8741,-7.81432 -18.55034,-11.45376 -28,-12.04493 z m 37.49805,26.54102 c -18.03395,0 -30.34247,12.51793 -35.59375,21.24414 l 4.28516,2.57813 c 4.54814,-7.5578 15.62574,-18.82227 31.30859,-18.82227 8.32818,0 16.40459,4.80201 22.46875,12.59766 6.06416,7.79564 9.99414,18.49733 9.99414,29.69336 0,10.80856 -4.31459,20.84965 -10.33008,28.12695 -6.01548,7.2773 -13.71276,11.61133 -19.86523,11.61133 H 62.933594 c -7.56211,0 -14.401362,-4.69948 -19.408203,-11.00586 -5.006842,-6.30638 -7.953125,-14.20863 -7.953125,-19.09571 0,-14.24036 4.85913,-21.96501 13.734375,-31.98046 l -3.742188,-3.31641 c -9.154682,10.33079 -14.992187,19.8553 -14.992187,35.29687 0,6.71151 3.404791,15.11088 9.037109,22.20508 5.632318,7.0942 13.722728,12.89649 23.324219,12.89649 h 88.634766 c 8.36788,0 17.01685,-5.31809 23.71875,-13.42578 6.7019,-8.1077 11.47656,-19.18336 11.47656,-31.3125 0,-12.35653 -4.27042,-24.05237 -11.04687,-32.76368 -6.77645,-8.7113 -16.18105,-14.52734 -26.41602,-14.52734 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/Enterprise2.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/Enterprise2.svg
@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="166.89571mm"
+   height="132.54375mm"
+   viewBox="0 0 166.89571 132.54375"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Enterprise2.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="36.243853"
+     inkscape:cy="32.893106"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-22.369279,-82.421456)">
+    <path
+       id="path3121-65-4-2-0"
+       style="opacity:1;fill:#2c6dad;fill-opacity:1;stroke:none;stroke-width:1.32291663;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 51.242639,145.75006 h 10.69078 V 133.5893 h -10.69078 z m 0,21.2794 h 10.69078 V 154.8687 h -10.69078 z m 0,21.2794 h 10.69078 V 176.1481 h -10.69078 z m -21.70138,-42.55881 h 10.69079 v -12.16076 h -10.69079 z m 0,21.2794 h 10.69079 v -12.16076 h -10.69079 z m 0,21.2794 h 10.69079 v -12.16076 h -10.69079 z m -7.17198,26.65635 v -87.37519 h 47.01246 v 87.37519 h -18.77568 v -19.10978 h -9.52149 V 214.9652 Z M 171.12588,124.47066 h 10.69078 V 112.3099 h -10.69078 z m 0,21.2794 h 10.69078 V 133.5893 h -10.69078 z m 0,21.2794 h 10.69078 V 154.8687 h -10.69078 z m 0,21.2794 h 10.69078 V 176.1481 H 171.12588 Z M 149.4245,124.47065 h 10.69079 V 112.30989 H 149.4245 Z m 0,21.2794 h 10.69079 V 133.58929 H 149.4245 Z m 0,21.2794 h 10.69079 V 154.86869 H 149.4245 Z m 0,21.2794 h 10.69079 V 176.14809 H 149.4245 Z m -7.17198,26.65635 V 105.94118 h 47.01246 V 214.9652 H 170.4893 v -19.10978 h -9.52149 V 214.9652 Z M 121.89418,103.19128 h 10.69078 V 91.030507 h -10.69078 z m 0,21.27938 h 10.69078 V 112.3099 h -10.69078 z m 0,21.27939 h 10.69078 v -12.16076 h -10.69078 z m 0,21.27941 h 10.69078 v -12.16077 h -10.69078 z m 0,21.2794 h 10.69078 V 176.14809 H 121.89418 Z M 100.1928,103.19128 h 10.69078 V 91.030505 H 100.1928 Z m 0,21.27938 h 10.69078 V 112.3099 H 100.1928 Z m 0,21.2794 h 10.69078 V 133.5893 H 100.1928 Z m 0,21.2794 h 10.69078 V 154.8687 H 100.1928 Z m 0,21.2794 h 10.69078 V 176.1481 H 100.1928 Z M 78.491427,103.19127 H 89.182209 V 91.030509 H 78.491427 Z m 0,21.27938 H 89.182209 V 112.30989 H 78.491427 Z m 0,21.2794 H 89.182209 V 133.58929 H 78.491427 Z m 10e-7,21.2794 H 89.18221 V 154.86869 H 78.491428 Z m -10e-7,21.2794 H 89.182209 V 176.14809 H 78.491427 Z M 71.319443,214.9652 V 82.421456 H 140.248 V 214.9652 h -23.72017 v -19.10978 h -8.88671 v 19.10978 h -3.00678 v -19.10978 h -9.521482 v 19.10978 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/EnterpriseTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/EnterpriseTag.svg
@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.42876mm"
+   height="196.42876mm"
+   viewBox="0 0 196.42876 196.42876"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Enterprise_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="-164.32003"
+     inkscape:cy="109.41215"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-7.5486803,-50.007427)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#4c7bb4;fill-opacity:1;stroke:none;stroke-width:1.28708541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect1368"
+       width="196.42876"
+       height="196.42876"
+       x="7.5486803"
+       y="50.007427"
+       rx="8.3668938"
+       ry="8.3668938" />
+    <path
+       id="path3121-65-4-2-0"
+       style="opacity:1;fill:#ffffff;stroke:none;stroke-width:1.32291663;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 51.242639,145.75006 h 10.69078 V 133.5893 h -10.69078 z m 0,21.2794 h 10.69078 V 154.8687 h -10.69078 z m 0,21.2794 h 10.69078 V 176.1481 h -10.69078 z m -21.70138,-42.55881 h 10.69079 v -12.16076 h -10.69079 z m 0,21.2794 h 10.69079 v -12.16076 h -10.69079 z m 0,21.2794 h 10.69079 v -12.16076 h -10.69079 z m -7.17198,26.65635 v -87.37519 h 47.01246 v 87.37519 h -18.77568 v -19.10978 h -9.52149 V 214.9652 Z M 171.12588,124.47066 h 10.69078 V 112.3099 h -10.69078 z m 0,21.2794 h 10.69078 V 133.5893 h -10.69078 z m 0,21.2794 h 10.69078 V 154.8687 h -10.69078 z m 0,21.2794 h 10.69078 V 176.1481 H 171.12588 Z M 149.4245,124.47065 h 10.69079 V 112.30989 H 149.4245 Z m 0,21.2794 h 10.69079 V 133.58929 H 149.4245 Z m 0,21.2794 h 10.69079 V 154.86869 H 149.4245 Z m 0,21.2794 h 10.69079 V 176.14809 H 149.4245 Z m -7.17198,26.65635 V 105.94118 h 47.01246 V 214.9652 H 170.4893 v -19.10978 h -9.52149 V 214.9652 Z M 121.89418,103.19128 h 10.69078 V 91.030507 h -10.69078 z m 0,21.27938 h 10.69078 V 112.3099 h -10.69078 z m 0,21.27939 h 10.69078 v -12.16076 h -10.69078 z m 0,21.27941 h 10.69078 v -12.16077 h -10.69078 z m 0,21.2794 h 10.69078 V 176.14809 H 121.89418 Z M 100.1928,103.19128 h 10.69078 V 91.030505 H 100.1928 Z m 0,21.27938 h 10.69078 V 112.3099 H 100.1928 Z m 0,21.2794 h 10.69078 V 133.5893 H 100.1928 Z m 0,21.2794 h 10.69078 V 154.8687 H 100.1928 Z m 0,21.2794 h 10.69078 V 176.1481 H 100.1928 Z M 78.491427,103.19127 H 89.182209 V 91.030509 H 78.491427 Z m 0,21.27938 H 89.182209 V 112.30989 H 78.491427 Z m 0,21.2794 H 89.182209 V 133.58929 H 78.491427 Z m 10e-7,21.2794 H 89.18221 V 154.86869 H 78.491428 Z m -10e-7,21.2794 H 89.182209 V 176.14809 H 78.491427 Z M 71.319443,214.9652 V 82.421456 H 140.248 V 214.9652 h -23.72017 v -19.10978 h -8.88671 v 19.10978 h -3.00678 v -19.10978 h -9.521482 v 19.10978 z" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/ImageService.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/ImageService.svg
--- a/src/main/webapp/img/lib/ibm/vpc/InternetServices2.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/InternetServices2.svg
@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   id="svg903"
+   sodipodi:docname="InternetServices2.svg"
+   style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
+   version="1.1"
+   width="1.0416666in"
+   xml:space="preserve"
+   preserveAspectRatio="xMidYMid meet"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   viewBox="0 0 74.99995 74.999941"
+   height="1.0416666in"
+   class="st2"><metadata
+   id="metadata1210"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs1208" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview1206"
+   showgrid="false"
+   inkscape:zoom="4.3350002"
+   inkscape:cx="28.300253"
+   inkscape:cy="52.762648"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg903" />     
+    <circle
+   fill="#e2002f"
+   r="37.499973"
+   cx="37.499973"
+   cy="37.499973"
+   id="circle1201"
+   style="fill:#92c24b;fill-opacity:1;opacity:1" />               
+    <path
+   style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.54126549;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+   d="m 32.063668,11.572258 c -8.036826,0 -14.300875,5.950401 -15.664797,12.546758 -7.2786092,1.292187 -12.3046357,7.906265 -12.3046357,14.079736 0,9.403294 7.2685307,15.605673 15.7858577,15.605673 h 0.0028 l 19.036219,-0.07742 c 1.893687,0.94483 3.911847,1.4457 5.851775,1.4457 4.944629,0 8.966468,-1.793852 11.669768,-4.636938 0.404369,-0.42528 0.775527,-0.875167 1.120522,-1.34153 l 0.360369,0.233677 a 5.2315876,5.2315876 0 0 0 -0.449054,2.112946 5.2315876,5.2315876 0 0 0 5.230984,5.230983 5.2315876,5.2315876 0 0 0 5.232391,-5.230983 5.2315876,5.2315876 0 0 0 -5.232391,-5.232392 5.2315876,5.2315876 0 0 0 -3.705045,1.544238 l -0.418085,-0.271684 c 1.27951,-2.314715 1.94543,-4.955593 1.94543,-7.664884 0,-3.608083 -1.262959,-6.672683 -3.177161,-9.037382 l 1.514677,-1.013538 a 5.2315876,5.2315876 0 0 0 3.545977,1.395023 5.2315876,5.2315876 0 0 0 5.23239,-5.230984 5.2315876,5.2315876 0 0 0 -5.23239,-5.232391 5.2315876,5.2315876 0 0 0 -5.230984,5.232391 5.2315876,5.2315876 0 0 0 0.539146,2.307207 l -1.669523,1.1163 C 53.800745,27.328093 50.995142,26.10732 48.178926,25.484477 47.182449,16.707263 39.399437,11.572258 32.063668,11.572258 Z m 0,3.540345 c 6.021289,0 12.516158,4.165431 12.757913,11.785197 l 0.04645,1.497784 1.485115,0.199893 c 2.296199,0.31071 4.722353,1.311184 6.64853,2.895622 l -5.325299,3.562869 a 5.2315876,5.2315876 0 0 0 -3.724753,-1.559723 5.2315876,5.2315876 0 0 0 -5.230984,5.230984 5.2315876,5.2315876 0 0 0 5.230984,5.23239 5.2315876,5.2315876 0 0 0 3.48263,-1.335899 l 7.153891,4.642568 c -0.222599,0.288374 -0.460296,0.565511 -0.712292,0.830539 -2.025259,2.129983 -4.995454,3.536122 -9.104953,3.536122 -4.142573,0 -9.859062,-3.748685 -10.842043,-10.335275 l -3.502338,0.523661 c 0.504638,3.381393 1.959345,6.206462 3.910568,8.384214 l -14.456997,0.06194 c -6.891533,0 -12.2441045,-4.410058 -12.2441045,-12.066735 0,-4.60727 4.8122675,-10.768844 11.3403665,-10.768844 5.853054,0 9.636384,3.748416 11.037713,7.380529 l 3.305261,-1.276777 c -1.787799,-4.633687 -6.452881,-9.139559 -13.209781,-9.599052 1.422564,-4.514524 6.108396,-8.822005 11.95412,-8.822005 z m 22.34148,17.735511 c 1.574949,1.809546 2.580299,4.124515 2.580299,7.068021 0,2.0601 -0.479165,4.023401 -1.37813,5.736346 l -7.003268,-4.542623 a 5.2315876,5.2315876 0 0 0 0.579969,-2.384629 5.2315876,5.2315876 0 0 0 -0.442015,-2.089016 z"
+   id="path1309"
+   inkscape:connector-curvature="0" /></svg>
--- a/src/main/webapp/img/lib/ibm/vpc/LoadBalancerListener.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/LoadBalancerListener.svg
--- a/src/main/webapp/img/lib/ibm/vpc/LoadBalancerPool.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/LoadBalancerPool.svg
--- a/src/main/webapp/img/lib/ibm/vpc/ObjectStorage.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/ObjectStorage.svg
@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generated by Microsoft Visio, SVG Export BareMetalServer.svg Page-1 -->
+
+<svg
+   xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1.0416666in"
+   height="1.0416666in"
+   viewBox="0 0 74.99995 74.999981"
+   xml:space="preserve"
+   class="st2"
+   version="1.1"
+   id="svg1220"
+   sodipodi:docname="ObjectStorage.svg"
+   style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata1226"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs1224">
+		
+		
+		
+	
+			
+			
+			
+			
+		
+				
+				
+				
+			
+					<defs
+   id="defs1171">
+						<path
+   id="mfid20"
+   d="m 639960,101770 c 146430,135680 146430,355690 0,491360 -146390,135720 -383760,135720 -530150,0 -146426,-135670 -146426,-355680 0,-491360 146390,-135707 383760,-135707 530150,0 z"
+   inkscape:connector-curvature="0" />
+					</defs>
+					
+				
+						
+						
+						
+						
+					
+							
+						
+							
+						
+							
+						
+							
+						</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview1222"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="5.6568542"
+   inkscape:cx="47.946162"
+   inkscape:cy="40.413132"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg1220" />
+	<v:documentProperties
+   v:langID="1033"
+   v:viewMarkup="false" />
+
+	<style
+   type="text/css"
+   id="style1162">
+	<![CDATA[
+		.st1 {fill:none;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.75}
+		.st2 {fill:none;fill-rule:evenodd;font-size:12px;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
+	]]>
+	</style><circle
+   style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:#90c34b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:square;stroke-miterlimit:3;opacity:1"
+   r="37.499981"
+   cx="37.499981"
+   cy="37.499981"
+   id="circle1396" />
+
+	
+<path
+   id="path203"
+   style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0.74999964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 60.843722,56.953095 V 24.304674 L 42.93748,15.070302 49.00779,11.976553 67.371063,21.35155 V 53.695285 Z M 37.714941,34.24619 21.855114,26.040713 39.838044,16.808698 55.638243,24.915713 Z M 39.15375,55.881146 V 36.679668 L 58.01323,26.765609 V 46.180381 Z M 18.738617,47.029329 V 27.688404 l 17.347071,8.88545 v 19.45076 z M 7.6289027,41.343728 V 21.328112 L 37.406233,5.9531192 45.749979,10.312492 15.773431,25.82811 v 19.640616 z m 0,12.304682 V 44.554664 L 37.642963,59.960649 58.01323,49.335912 V 58.40622 L 37.42967,68.882777 Z"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccc" /></svg>
--- a/src/main/webapp/img/lib/ibm/vpc/PublicTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/PublicTag.svg
@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.42876mm"
+   height="196.42876mm"
+   viewBox="0 0 196.42876 196.42876"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Public_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="-164.32003"
+     inkscape:cy="109.41215"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-7.5486803,-50.007427)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#4c7bb4;fill-opacity:1;stroke:none;stroke-width:1.28708541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect1368"
+       width="196.42876"
+       height="196.42876"
+       x="7.5486803"
+       y="50.007427"
+       rx="8.3668938"
+       ry="8.3668938" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3431"
+       d="m 163.59595,191.40588 h -38.42844 c -5.32672,0 -9.51199,4.18526 -9.51199,9.51203 0,0 0,0 0,0 v 14.83878 h 57.83292 v -14.45828 c -0.3805,-5.32677 -4.56577,-9.51202 -9.89249,-9.89253 0,0 0,0 0,0 z m -77.237358,0 H 47.93014 c -5.326709,0 -9.511991,4.18526 -9.892461,9.51203 0,0 0,0 0,0.38108 v 14.45826 h 57.832904 v -14.45826 c 0.380505,-5.32677 -3.804792,-9.51203 -9.511991,-9.89253 0.380505,0 0.380505,0 0,0 z m 43.374688,-86.74937 c 0,-13.316765 -11.03392,-23.970148 -24.35072,-23.970148 -13.316769,0 -23.970216,11.033887 -23.970216,24.350658 0,13.31676 10.653447,23.97029 23.970216,23.97029 13.69727,0 24.35072,-10.65353 24.35072,-24.3508 0,0.38108 0,0.38108 0,0 z m -23.97023,19.40454 c -10.653433,0 -19.404458,-8.751 -19.404458,-19.40454 0,-10.653383 8.751025,-19.404392 19.404458,-19.404392 10.65343,0 19.40446,8.751009 19.40446,19.404392 0,10.65354 -8.75103,19.40454 -19.40446,19.40454 z m 14.45822,33.86267 c 0,13.31676 10.65344,23.97015 23.97022,23.97015 13.3168,0 23.97022,-10.65339 23.97022,-23.97015 0,-13.31677 -10.65342,-23.97029 -23.97022,-23.97029 -13.31678,0 -23.97022,10.65352 -23.97022,23.97029 0,0 0,0 0,0 z m 23.97022,-19.40454 c 10.65344,0 19.40446,8.75116 19.40446,19.40454 0,10.65338 -8.75102,19.4044 -19.40446,19.4044 -10.65342,0 -19.40446,-8.75102 -19.40446,-19.4044 0.3805,-10.65338 8.75104,-19.40454 19.40446,-19.40454 z m -77.237359,43.37469 c 13.316775,0 23.970222,-10.65339 23.970222,-23.97015 0,-13.31677 -10.653447,-23.97029 -23.970222,-23.97029 -13.316792,0 -23.970221,10.65352 -23.970221,23.97029 0,13.31676 10.653429,23.97015 23.970221,23.97015 0,0 0,0 0,0 z m 0,-43.37469 c 10.653421,0 19.404461,8.37066 19.404461,19.02404 0,10.65338 -8.370561,19.40453 -19.02399,19.40453 -10.653428,0 -19.404462,-8.37065 -19.404462,-19.02403 0,0 0,0 0,0 0,-10.65338 8.751034,-19.40454 19.023991,-19.40454 z"
+       style="fill:#ffffff;stroke-width:3.80479693" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/RegionTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/RegionTag.svg
@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.42876mm"
+   height="196.42876mm"
+   viewBox="0 0 196.42876 196.42876"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Region_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="376.08002"
+     inkscape:cy="279.64655"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-7.5486803,-50.007427)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#168733;fill-opacity:1;stroke:none;stroke-width:1.28708541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect1368"
+       width="196.42876"
+       height="196.42876"
+       x="7.5486803"
+       y="50.007427"
+       rx="8.3668938"
+       ry="8.3668938" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:34.01574707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 174.41992 76.691406 L 174.41992 640.97852 L 208.43555 640.97852 L 208.43555 374.41797 L 620.00586 374.41797 L 484.20117 236.99023 L 621.42969 104.68359 L 208.43555 104.68359 L 208.43555 76.691406 L 174.41992 76.691406 z M 208.43555 138.69922 L 537.14453 138.69922 L 435.79688 236.39844 L 538.56836 340.40234 L 208.43555 340.40234 L 208.43555 138.69922 z "
+       transform="matrix(0.26458333,0,0,0.26458333,7.5486803,50.007427)"
+       id="path2163" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/Rules.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/Rules.svg
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   id="svg903"
+   sodipodi:docname="Rules.svg"
+   style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
+   version="1.1"
+   width="1.0416666in"
+   xml:space="preserve"
+   preserveAspectRatio="xMidYMid meet"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   viewBox="0 0 74.99995 74.999941"
+   height="1.0416666in"
+   class="st2"><metadata
+   id="metadata1210"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs1208" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview1206"
+   showgrid="false"
+   inkscape:zoom="4.3350002"
+   inkscape:cx="-8.9819516"
+   inkscape:cy="37.570164"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg903" />     
+    <circle
+   fill="#e2002f"
+   r="37.499973"
+   cx="37.499973"
+   cy="37.499973"
+   id="circle1201"
+   style="fill:#92c24b;fill-opacity:1" />               
+    <path
+   fill="#ffffff"
+   d="m 27.682102,43.556497 c -2.793488,0 -5.161955,1.962769 -5.806637,4.570309 h -6.146479 v          2.833006 h 6.146479 c 0.645366,2.607012 3.013828,4.570309 5.806637,4.570309 2.79276,0 5.162265,-1.963365          5.808101,-4.570309 H 60.885691 V 48.126806 H 33.491668 c -0.645023,-2.60765 -3.016,-4.570309 -5.809566,-4.570309          z m 0,4.250973 c 0.983398,0 1.735839,0.750975 1.735839,1.734374 0,0.983398 -0.752441,1.737303 -1.735839,1.737303          -0.983399,0 -1.734373,-0.753905 -1.734373,-1.737303 0,-0.983399 0.750974,-1.734374 1.734373,-1.734374 z M          49.048297,31.411055 c -2.792808,0 -5.16127,1.962253 -5.806637,4.568844 H 15.728986 v 2.835936 H 43.24166 c          0.645673,2.606167 3.014132,4.567379 5.806637,4.567379 2.792456,0 5.161958,-1.96128 5.808101,-4.567379 h 6.029293          v -2.835936 h -6.029293 c -0.645837,-2.606522 -3.015342,-4.568844 -5.808101,-4.568844 z m 0,4.252438 c          0.983398,0 1.735839,0.750976 1.735839,1.734374 0,0.983398 -0.752441,1.734374 -1.735839,1.734374 -0.983398,0          -1.734374,-0.750976 -1.734374,-1.734374 0,-0.983398 0.750976,-1.734374 1.734374,-1.734374 z M 27.682102,19.26415          c -2.793488,0 -5.161955,1.96277 -5.806637,4.570309 h -6.146479 v 2.833006 h 6.146479 c 0.645366,2.607013          3.013828,4.570309 5.806637,4.570309 2.792759,0 5.162264,-1.963365 5.808101,-4.570309 H 60.885691 V 23.834459 H          33.491667 C 32.846645,21.226809 30.475668,19.26415 27.682102,19.26415 Z m 0,4.250974 c 0.983398,0          1.735838,0.750975 1.735838,1.734373 0,0.983398 -0.75244,1.737304 -1.735838,1.737304 -0.983399,0          -1.734374,-0.753906 -1.734374,-1.737304 0,-0.983398 0.750975,-1.734373 1.734374,-1.734373 z"
+   id="path1203" /></svg>
--- a/src/main/webapp/img/lib/ibm/vpc/SubnetTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/SubnetTag.svg
@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="141.62221mm"
+   height="192.92336mm"
+   viewBox="0 0 141.62221 192.92336"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Subnet_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="249.84363"
+     inkscape:cy="414.58905"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-34.494965,-51.906654)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#168733;fill-opacity:1;stroke:none;stroke-width:0.9279694;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect1368"
+       width="141.62221"
+       height="141.62221"
+       x="34.494965"
+       y="51.906654"
+       rx="6.0324059"
+       ry="6.0324059" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="70.62429"
+       y="229.33093"
+       id="text2291"><tspan
+         sodipodi:role="line"
+         id="tspan2289"
+         x="70.62429"
+         y="249.30698"
+         style="font-size:22.57777786px;stroke-width:0.26458332" /></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:25.39999962px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="89.065887"
+       y="234.14178"
+       id="text2295"><tspan
+         sodipodi:role="line"
+         id="tspan2293"
+         x="89.065887"
+         y="256.61484"
+         style="font-size:25.39999962px;stroke-width:0.26458332" /></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:25.39999962px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="49.242725"
+       y="244.03075"
+       id="text2299"><tspan
+         sodipodi:role="line"
+         id="tspan2297"
+         x="49.242725"
+         y="244.03075"
+         style="font-size:56.44444275px;stroke-width:0.26458332">ACL</tspan></text>
+    <path
+       id="path3013"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.50189018;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 74.939688,115.91675 h 6.213702 v -13.87654 c 0,-16.316287 11.929425,-25.996505 25.03041,-25.996505 12.76508,0 24.50346,10.189894 24.50346,26.391675 v 13.48137 h 6.03805 v 49.4021 H 74.939688 Z m 14.271742,0 h 33.19823 v -13.56912 c 0,-11.461397 -8.31325,-18.09216 -16.75286,-18.09216 -7.969307,0 -16.44537,7.044639 -16.44537,16.9504 z m 34.44887,7.45686 a 2.7512203,2.7512203 0 0 0 -1.86735,0.88356 L 101.9919,145.18058 90.639457,133.45564 a 2.7526886,2.7526886 0 1 0 -3.954486,3.83029 l 15.349909,15.85134 23.75547,-25.09756 a 2.7512203,2.7512203 0 0 0 -2.13005,-4.6661 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/VPCTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/VPCTag.svg
@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.42876mm"
+   height="196.42876mm"
+   viewBox="0 0 196.42876 196.42876"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="VPC_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="336.33391"
+     inkscape:cy="360.80692"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-7.5486803,-50.007427)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#4c7bb4;fill-opacity:0.9748744;stroke:none;stroke-width:1.28708541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect1368"
+       width="196.42876"
+       height="196.42876"
+       x="7.5486803"
+       y="50.007427"
+       rx="8.3668938"
+       ry="8.3668938" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:18.89763832;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 373.19922 62.171875 L 373.19922 159.33203 L 392.09766 159.33203 L 392.09766 62.171875 L 373.19922 62.171875 z M 228.17383 105.28906 L 211.41016 114.00781 L 259.55469 206.53125 L 276.32031 197.81445 L 228.17383 105.28906 z M 540.22852 108.26367 L 495.00781 191.80469 L 511.625 200.79688 L 556.85352 117.26367 L 540.22852 108.26367 z M 384.01172 208.42578 C 351.82105 208.32586 320.63195 217.36572 293.3418 232.38281 L 293.23828 232.43555 L 293.13477 232.49414 C 245.30205 260.40198 216.8704 300.48067 201.71875 343.93945 C 186.5671 387.39828 184.35625 434.20164 187.76562 477.12305 L 206.60547 475.625 C 203.33434 434.44402 205.61723 390.14729 219.56055 350.1543 C 233.49776 310.17884 258.74453 274.46828 302.60547 248.85938 C 357.42631 218.75419 426.09179 214.50917 487.36719 268.4668 L 499.85742 254.27734 C 466.31752 224.74291 429.7465 210.98825 394.03125 208.75391 C 390.68295 208.54444 387.34179 208.43612 384.01172 208.42578 z M 662.35547 234.9082 L 586.30664 289.27539 L 597.29883 304.65234 L 673.33984 250.27734 L 662.35547 234.9082 z M 107.06055 235.27734 L 96.193359 250.74219 L 175.35742 306.37109 L 186.22266 290.90625 L 107.06055 235.27734 z M 390.08594 304.08008 C 348.8476 304.08008 311.29688 334.54915 311.29688 385.9082 L 311.29688 429.58789 L 291.73828 429.58789 L 291.73828 585.09375 L 486.22266 585.09375 L 486.22266 429.58789 L 467.21484 429.58789 L 467.21484 387.15234 C 467.21484 374.45516 464.92361 362.93337 460.86328 352.78516 C 480.87976 338.59 506.14542 327.96484 535.75586 327.96484 C 567.23245 327.96484 597.75807 346.11425 620.67773 375.57812 C 643.59739 405.04196 658.45117 445.48898 658.45117 487.80469 C 658.45117 528.65594 642.14391 566.60657 619.4082 594.11133 C 596.67253 621.61608 567.5796 637.99609 544.32617 637.99609 L 209.32812 637.99609 C 180.74692 637.99609 154.8981 620.23357 135.97461 596.39844 C 117.05111 572.5633 105.91602 542.69742 105.91602 524.22656 C 105.91602 470.40473 124.28194 441.20914 157.82617 403.35547 L 143.68164 390.82031 C 109.08127 429.86582 87.017578 465.86472 87.017578 524.22656 C 87.017578 549.5929 99.886327 581.33767 121.17383 608.15039 C 142.46133 634.96312 173.03903 656.89453 209.32812 656.89453 L 544.32617 656.89453 C 575.9528 656.89453 608.64264 636.79363 633.97266 606.15039 C 659.30267 575.50712 677.34766 533.64711 677.34766 487.80469 C 677.34766 441.10284 661.20748 396.89729 635.5957 363.97266 C 609.98392 331.04806 574.43921 309.06641 535.75586 309.06641 C 502.317 309.06641 474.10183 320.46524 451.67383 335.96094 C 437.17778 315.66525 414.22158 304.08008 390.08594 304.08008 z M 388.42578 329.92773 C 404.86309 329.92773 421.14166 337.92722 431.16992 352.56641 C 418.14214 364.84609 408.08946 377.95834 401.22852 389.35938 L 417.42383 399.10352 C 422.57673 390.54076 429.96334 380.72039 439.35547 371.16406 C 440.52539 376.01987 441.16016 381.2636 441.16016 386.87695 L 441.16016 429.58789 L 336.66016 429.58789 L 336.66016 383.2832 C 336.66016 352.10259 363.34057 329.92773 388.42578 329.92773 z M 445.96875 453.05469 A 8.6600935 8.6600935 0 0 1 451.80078 467.74805 L 377.02539 546.74805 L 328.70898 496.85352 A 8.6647117 8.6647117 0 1 1 341.15625 484.79688 L 376.89062 521.70312 L 439.21875 455.8418 A 8.6600935 8.6600935 0 0 1 445.09766 453.06055 A 8.6600935 8.6600935 0 0 1 445.96875 453.05469 z "
+       transform="matrix(0.26458333,0,0,0.26458333,7.5486803,50.007427)"
+       id="path1382" />
+  </g>
+</svg>
--- a/src/main/webapp/img/lib/ibm/vpc/VPNConnection.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/VPNConnection.svg
--- a/src/main/webapp/img/lib/ibm/vpc/VPNGateway.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/VPNGateway.svg
--- a/src/main/webapp/img/lib/ibm/vpc/VPNPolicy.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/VPNPolicy.svg
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   contentScriptType="text/ecmascript"
+   zoomAndPan="magnify"
+   contentStyleType="text/css"
+   id="svg903"
+   sodipodi:docname="VPNPolicy.svg"
+   style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
+   version="1.1"
+   width="1.0416666in"
+   xml:space="preserve"
+   preserveAspectRatio="xMidYMid meet"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   viewBox="0 0 74.99995 74.999941"
+   height="1.0416666in"
+   class="st2"><metadata
+   id="metadata1210"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs1208" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview1206"
+   showgrid="false"
+   inkscape:zoom="4.3350002"
+   inkscape:cx="31.801069"
+   inkscape:cy="46.903352"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg903" />     
+    <circle
+   fill="#e2002f"
+   r="37.499973"
+   cx="37.499973"
+   cy="37.499973"
+   id="circle1201"
+   style="fill:#92c24b;fill-opacity:1;opacity:1" />               
+    <path
+   id="path1262"
+   style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.4173218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+   d="m 17.474609,44.900391 v 1.417968 h 19.50586 V 44.900391 Z M 13.458968,34.71389 H 61.245627 V 52.768127 H 13.458968 Z m 0.06117,-10.84897 H 61.46497 v 6.253707 H 13.520136 Z M 8.7871094,18.587891 V 19.4375 57.367188 H 65.677734 V 18.587891 Z m 1.7011716,1.701171 H 63.978516 V 55.667969 H 10.488281 Z" /></svg>
--- a/src/main/webapp/img/lib/ibm/vpc/ZoneTag.svg
+++ b/src/main/webapp/img/lib/ibm/vpc/ZoneTag.svg
@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.42876mm"
+   height="196.42876mm"
+   viewBox="0 0 196.42876 196.42876"
+   version="1.1"
+   id="svg1355"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Zone_tag.svg">
+  <defs
+     id="defs1349" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="86.359732"
+     inkscape:cy="420.30225"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-7.5486803,-50.007427)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#168733;fill-opacity:1;stroke:none;stroke-width:1.28708541;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:17.00787544;stroke-opacity:1;paint-order:normal"
+       id="rect1368"
+       width="196.42876"
+       height="196.42876"
+       x="7.5486803"
+       y="50.007427"
+       rx="8.3668938"
+       ry="8.3668938" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:30.23622131;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 226.66797 92.289062 L 226.66797 107.4082 L 226.66797 163.24609 L 93.701172 163.24609 L 93.701172 178.36523 L 93.701172 594.19727 L 226.66797 594.19727 L 226.66797 626.8125 L 492.26172 626.8125 L 492.26172 594.19727 L 624.88672 594.19727 L 624.88672 163.24609 L 492.26172 163.24609 L 492.26172 92.289062 L 226.66797 92.289062 z M 256.9043 122.52539 L 462.02539 122.52539 L 462.02539 596.57617 L 256.9043 596.57617 L 256.9043 122.52539 z M 427.3457 162.02734 L 289.21484 162.67578 L 289.35547 192.91211 L 427.48633 192.25586 L 427.3457 162.02734 z M 123.9375 193.48242 L 226.66797 193.48242 L 226.66797 233.10547 L 156.24805 233.63281 L 156.38867 263.86914 L 226.66797 263.33789 L 226.66797 297.02148 L 156.43359 296.20117 L 156.21094 326.4375 L 226.66797 327.25977 L 226.66797 365.63672 L 156.26367 366.02734 L 156.37305 396.26367 L 226.66797 395.875 L 226.66797 563.96094 L 123.9375 563.96094 L 123.9375 193.48242 z M 492.26172 193.48242 L 594.65039 193.48242 L 594.65039 563.96094 L 492.26172 563.96094 L 492.26172 396.16602 L 560.0957 395.7832 L 559.99414 365.54688 L 492.26172 365.92773 L 492.26172 326.64648 L 559.93359 327.44922 L 560.15625 297.21289 L 492.26172 296.4082 L 492.26172 263.73438 L 560.11133 263.21289 L 559.9707 232.98242 L 492.26172 233.49805 L 492.26172 193.48242 z M 289.40039 225.24414 L 289.17969 255.48047 L 427.30859 256.49219 L 427.5293 226.25586 L 289.40039 225.24414 z M 427.36719 294.58984 L 289.23047 295.07031 L 289.3418 325.30664 L 427.4707 324.82617 L 427.36719 294.58984 z "
+       transform="matrix(0.26458333,0,0,0.26458333,7.5486803,50.007427)"
+       id="path2189" />
+  </g>
+</svg>
--- a/src/main/webapp/js/app.min.js
+++ b/src/main/webapp/js/app.min.js
--- a/src/main/webapp/js/diagramly/App.js
+++ b/src/main/webapp/js/diagramly/App.js
@ -3369,9 +3369,7 @@ App.prototype.saveFile = function(forceDialog, success)
 			{
 				this.hideDialog();
 			}), mxResources.get('saveAs'), mxResources.get('download'), null, null, allowTab,
-				(this.isOffline()) ? null :
-				'https://desk.draw.io/support/solutions/articles/16000042485',
-				true, rowLimit, null, null, null, this.editor.fileExtensions);
+				null, true, rowLimit, null, null, null, this.editor.fileExtensions);
 			
 			this.showDialog(dlg.container, 460, (serviceCount > rowLimit) ? 390 : 270, true, true);
 			dlg.init();
--- a/src/main/webapp/js/diagramly/Dialogs.js
+++ b/src/main/webapp/js/diagramly/Dialogs.js
@ -3354,6 +3354,17 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 	btns.style.left = '40px';
 	btns.style.bottom = '24px';
 	btns.style.right = '40px';
+	
+	if (!compact && !editorUi.isOffline() && showName && callback == null && !createOnly)
+	{
+		var helpBtn = mxUtils.button(mxResources.get('help'), function()
+		{
+			editorUi.openLink('https://support.draw.io/display/DO/Creating+and+Opening+Files');
+		});
+		
+		helpBtn.className = 'geBtn';	
+		btns.appendChild(helpBtn);
+	}

 	var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
 	{
@ -3371,17 +3382,6 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 	{
 		btns.appendChild(cancelBtn);
 	}
-	
-	if (!compact && !editorUi.isOffline() && showName && callback == null && !createOnly)
-	{
-		var helpBtn = mxUtils.button(mxResources.get('help'), function()
-		{
-			editorUi.openLink('https://support.draw.io/display/DO/Creating+and+Opening+Files');
-		});
-		
-		helpBtn.className = 'geBtn';	
-		btns.appendChild(helpBtn);
-	}

 	if (!compact && urlParams['embed'] != '1' && !createOnly)
 	{
@ -3461,7 +3461,10 @@ var CreateDialog = function(editorUi, title, createFn, cancelFn, dlgTitle, btnLa
 	overrideExtension = (overrideExtension != null) ? overrideExtension : true;
 	allowBrowser = (allowBrowser != null) ? allowBrowser : true;
 	rowLimit = (rowLimit != null) ? rowLimit : 4;
+
 	var div = document.createElement('div');
+	div.style.whiteSpace = 'nowrap';
+	
 	var showButtons = true;
 	
 	if (cancelFn == null)
@ -3482,6 +3485,7 @@ var CreateDialog = function(editorUi, title, createFn, cancelFn, dlgTitle, btnLa
 	nameInput.style.width = '280px';
 	nameInput.style.marginLeft = '10px';
 	nameInput.style.marginBottom = '20px';
+	nameInput.style.maxWidth = '70%';
 		
 	this.init = function()
 	{
@ -3857,7 +3861,7 @@ var CreateDialog = function(editorUi, title, createFn, cancelFn, dlgTitle, btnLa
 	{
 		btns.appendChild(cancelBtn);
 	}
-	
+
 	function create(mode)
 	{
 		var title = nameInput.value;
@ -4662,6 +4666,20 @@ var LinkDialog = function(editorUi, initialValue, btnLabel, fn, showPages)
 	btns.style.marginTop = '20px';
 	btns.style.textAlign = 'right';
 	
+	var helpBtn = mxUtils.button(mxResources.get('help'), function()
+	{
+		editorUi.openLink('https://desk.draw.io/solution/articles/16000080137');
+	});
+
+	helpBtn.style.verticalAlign = 'middle';
+	helpBtn.className = 'geBtn';
+	btns.appendChild(helpBtn);
+
+	if (editorUi.isOffline() && !mxClient.IS_CHROMEAPP)
+	{
+		helpBtn.style.display = 'none';
+	}
+	
 	var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
 	{
 		editorUi.hideDialog();
@ -4674,20 +4692,6 @@ var LinkDialog = function(editorUi, initialValue, btnLabel, fn, showPages)
 		btns.appendChild(cancelBtn);
 	}
 	
-	var helpBtn = mxUtils.button(mxResources.get('help'), function()
-	{
-		editorUi.openLink('https://desk.draw.io/solution/articles/16000080137');
-	});
-	helpBtn.style.verticalAlign = 'middle';
-	helpBtn.className = 'geBtn';
-	
-	btns.appendChild(helpBtn);
-
-	if (editorUi.isOffline() && !mxClient.IS_CHROMEAPP)
-	{
-		helpBtn.style.display = 'none';
-	}
-	
 	LinkDialog.selectedDocs = null;
 	
 	LinkDialog.filePicked = function(data)
@ -7191,12 +7195,14 @@ var PluginsDialog = function(editorUi)
 		editorUi.showDialog(dlg.container, 300, 80, true, true);
 		dlg.init();
 	});
+	
 	addBtn.className = 'geBtn';
 	
 	var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
 	{
 		editorUi.hideDialog();
 	});
+	
 	cancelBtn.className = 'geBtn';
 	
 	var applyBtn = mxUtils.button(mxResources.get('apply'), function()
@ -7206,8 +7212,14 @@ var PluginsDialog = function(editorUi)
 		editorUi.hideDialog();
 		editorUi.alert(mxResources.get('restartForChangeRequired'));
 	});
+	
 	applyBtn.className = 'geBtn gePrimaryBtn';

+	var buttons = document.createElement('div');
+	buttons.style.marginTop = '14px';
+	buttons.style.textAlign = 'right';
+
+
 	var helpBtn = mxUtils.button(mxResources.get('help'), function()
 	{
 		editorUi.openLink('https://desk.draw.io/support/solutions/articles/16000056430');
@ -7220,20 +7232,16 @@ var PluginsDialog = function(editorUi)
 		helpBtn.style.display = 'none';
 	}
 	
-	var buttons = document.createElement('div');
-	buttons.style.marginTop = '14px';
-	buttons.style.textAlign = 'right';
-
+	buttons.appendChild(helpBtn);
+	
 	if (editorUi.editor.cancelFirst)
 	{
 		buttons.appendChild(cancelBtn);
-		buttons.appendChild(helpBtn);
 		buttons.appendChild(addBtn);
 		buttons.appendChild(applyBtn);
 	}
 	else
 	{
-		buttons.appendChild(helpBtn);
 		buttons.appendChild(addBtn);
 		buttons.appendChild(applyBtn);
 		buttons.appendChild(cancelBtn);
@ -8584,17 +8592,6 @@ var EditShapeDialog = function(editorUi, cell, title, w, h)
 	td.style.whiteSpace = 'nowrap';
 	td.setAttribute('align', 'right');
 	
-	var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
-	{
-		editorUi.hideDialog();
-	});
-	cancelBtn.className = 'geBtn';
-	
-	if (editorUi.editor.cancelFirst)
-	{
-		td.appendChild(cancelBtn);
-	}
-	
 	if (!editorUi.isOffline())
 	{
 		var helpBtn = mxUtils.button(mxResources.get('help'), function()
@ -8606,6 +8603,17 @@ var EditShapeDialog = function(editorUi, cell, title, w, h)
 		td.appendChild(helpBtn);
 	}
 	
+	var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
+	{
+		editorUi.hideDialog();
+	});
+	cancelBtn.className = 'geBtn';
+	
+	if (editorUi.editor.cancelFirst)
+	{
+		td.appendChild(cancelBtn);
+	}
+
 	var updateShape = function(targetGraph, targetCell, hide)
 	{
 		var newValue = nameInput.value;
@ -8709,7 +8717,18 @@ var CustomDialog = function(editorUi, content, okFn, cancelFn, okButtonText, hel
 	{
 		btns.appendChild(buttonsContent);
 	}
-
+	
+	if (!editorUi.isOffline() && helpLink != null)
+	{
+		var helpBtn = mxUtils.button(mxResources.get('help'), function()
+		{
+			editorUi.openLink(helpLink);
+		});
+		
+		helpBtn.className = 'geBtn';
+		btns.appendChild(helpBtn);
+	}
+	
 	var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
 	{
 		editorUi.hideDialog();
@ -8719,6 +8738,7 @@ var CustomDialog = function(editorUi, content, okFn, cancelFn, okButtonText, hel
 			cancelFn();
 		}
 	});
+	
 	cancelBtn.className = 'geBtn';
 	
 	if (hideCancel)
@ -8726,23 +8746,11 @@ var CustomDialog = function(editorUi, content, okFn, cancelFn, okButtonText, hel
 		cancelBtn.style.display = 'none';
 	}
 	
-	
 	if (editorUi.editor.cancelFirst)
 	{
 		btns.appendChild(cancelBtn);
 	}
-	
-	if (!editorUi.isOffline() && helpLink != null)
-	{
-		var helpBtn = mxUtils.button(mxResources.get('help'), function()
-		{
-			editorUi.openLink(helpLink);
-		});
-		
-		helpBtn.className = 'geBtn';	
-		btns.appendChild(helpBtn);
-	}
-	
+
 	var okBtn = mxUtils.button(okButtonText || mxResources.get('ok'), function()
 	{
 		editorUi.hideDialog();
--- a/src/main/webapp/js/diagramly/Editor.js
+++ b/src/main/webapp/js/diagramly/Editor.js
@ -4900,116 +4900,6 @@
 	
 })();

-/**
- * 
- */
-var ErrorDialog = function(editorUi, title, message, buttonText, fn, retry, buttonText2, fn2, hide, buttonText3, fn3)
-{
-	hide = (hide != null) ? hide : true;
-	
-	var div = document.createElement('div');
-	div.style.textAlign = 'center';
-
-	if (title != null)
-	{
-		var hd = document.createElement('div');
-		hd.style.padding = '0px';
-		hd.style.margin = '0px';
-		hd.style.fontSize = '18px';
-		hd.style.paddingBottom = '16px';
-		hd.style.marginBottom = '10px';
-		hd.style.borderBottom = '1px solid #c0c0c0';
-		hd.style.color = 'gray';
-		hd.style.whiteSpace = 'nowrap';
-		hd.style.textOverflow = 'ellipsis';
-		hd.style.overflow = 'hidden';
-		mxUtils.write(hd, title);
-		hd.setAttribute('title', title);
-		div.appendChild(hd);
-	}
-
-	var p2 = document.createElement('div');
-	p2.style.lineHeight = '1.2em';
-	p2.style.padding = '6px';
-	p2.innerHTML = message;
-	div.appendChild(p2);
-	
-	var btns = document.createElement('div');
-	btns.style.marginTop = '12px';
-	btns.style.textAlign = 'center';
-	
-	if (retry != null)
-	{
-		var retryBtn = mxUtils.button(mxResources.get('tryAgain'), function()
-		{
-			editorUi.hideDialog();
-			retry();
-		});
-		retryBtn.className = 'geBtn';
-		btns.appendChild(retryBtn);
-		
-		btns.style.textAlign = 'center';
-	}
-	
-	if (buttonText3 != null)
-	{
-		var btn3 = mxUtils.button(buttonText3, function()
-		{
-			if (fn3 != null)
-			{
-				fn3();
-			}
-		});
-		
-		btn3.className = 'geBtn';
-		btns.appendChild(btn3);
-	}
-	
-	var btn = mxUtils.button(buttonText, function()
-	{
-		if (hide)
-		{
-			editorUi.hideDialog();
-		}
-		
-		if (fn != null)
-		{
-			fn();
-		}
-	});
-	
-	btn.className = 'geBtn';
-	btns.appendChild(btn);
-
-	if (buttonText2 != null)
-	{
-		var mainBtn = mxUtils.button(buttonText2, function()
-		{
-			if (hide)
-			{
-				editorUi.hideDialog();
-			}
-			
-			if (fn2 != null)
-			{
-				fn2();
-			}
-		});
-		
-		mainBtn.className = 'geBtn gePrimaryBtn';
-		btns.appendChild(mainBtn);
-	}
-
-	this.init = function()
-	{
-		btn.focus();
-	};
-	
-	div.appendChild(btns);
-
-	this.container = div;
-};
-
 // Extends codec for ChangePageSetup
 (function()
 {
--- a/src/main/webapp/js/diagramly/EditorUi.js
+++ b/src/main/webapp/js/diagramly/EditorUi.js
@ -3648,23 +3648,7 @@
 			fn();
 		}
 	};
-	
-	/**
-	 * Translates this point by the given vector.
-	 * 
-	 * @param {number} dx X-coordinate of the translation.
-	 * @param {number} dy Y-coordinate of the translation.
-	 */
-	EditorUi.prototype.showError = function(title, msg, btn, fn, retry, btn2, fn2, btn3, fn3, w, h, hide, onClose)
-	{
-		var height = (msg != null && msg.length > 120) ? 180 : 150;
-		var dlg = new ErrorDialog(this, title, msg, btn || mxResources.get('ok'),
-			fn, retry, btn2, fn2, hide, btn3, fn3);
-		this.showDialog(dlg.container, w || 340, h || ((msg != null && msg.length > 120) ?
-			180 : 150), true, false, onClose);
-		dlg.init();
-	};
-	
+
 	/**
 	 * Translates this point by the given vector.
 	 * 
@ -6752,8 +6736,6 @@
 	 */
 	EditorUi.prototype.convertLucidChart = function(data, success, error)
 	{
-		console.log(data);
-		
 		var delayed = mxUtils.bind(this, function()
 		{
 			this.loadingExtensions = false;
@ -7068,7 +7050,9 @@
 	 */
 	EditorUi.prototype.isLucidChartData = function(data)
 	{
-		return data != null && data.substring(0, 26) == '{"state":"{\\"Properties\\":';
+		return data != null && (data.substring(0, 26) ==
+			'{"state":"{\\"Properties\\":' ||
+			data.substring(0, 14) == '{"Properties":');
 	};

 	/**
--- a/src/main/webapp/js/diagramly/ElectronApp.js
+++ b/src/main/webapp/js/diagramly/ElectronApp.js
@ -412,21 +412,30 @@ FeedbackDialog.feedbackUrl = 'https://log.draw.io/email';
 	{
 		var paths = argsObj.args;
 		
-		// If a file is passed 
-		if (paths !== undefined && paths[0] != null)
+		// If a file is passed
+		if (paths !== undefined && paths[0] != null && this.spinner.spin(document.body, mxResources.get('loading')))
 		{
 			var path = paths[0];
+			this.hideDialog();
 			
-			var success = mxUtils.bind(this, function(fileEntry, data, stat)
+			var success = mxUtils.bind(this, function(fileEntry, data, stat, name)
 			{
-				var file = new LocalFile(this, data, '');
-				file.fileObject = fileEntry;
-				file.stat = stat;
-				this.fileLoaded(file);
+				this.spinner.stop();
+				
+				if (data != null)
+				{
+					var file = new LocalFile(this, data, name || '');
+					file.fileObject = fileEntry;
+					file.stat = stat;
+					
+					this.fileLoaded(file);
+				}
 			});
 			
 			var error = mxUtils.bind(this, function(e)
 			{
+				this.spinner.stop();
+				
 				if (e.code === 'ENOENT')
 				{
 					var title = path.replace(/^.*[\\\/]/, '');
@ -642,10 +651,12 @@ FeedbackDialog.feedbackUrl = 'https://log.draw.io/email';
 			    			{
 			    				this.handleError(e, mxResources.get('errorLoadingFile'));
 			    			}
+							
+							fn();
 						}
 						else
 						{
-							this.openLocalFile(xml, name);
+							fn(null, xml, null, name);
 						}
 					}), null, name);
 					
--- a/src/main/webapp/js/diagramly/Extensions.js
+++ b/src/main/webapp/js/diagramly/Extensions.js
@ -4201,13 +4201,11 @@ LucidImporter = {};
 		// Extracts and sorts all pages
 		var pages = [];

-		if (state.state != null)
+		function addPages(obj)
 		{
-			state = JSON.parse(state.state);
-			
-			for (var id in state.Pages)
+			for (var id in obj.Pages)
 			{
-				pages.push(state.Pages[id]);
+				pages.push(obj.Pages[id]);
 			}
 			
 			pages.sort(function(a, b)
@ -4225,6 +4223,15 @@ LucidImporter = {};
 			    	return 0;
 			    }
 			});
+		};
+		
+		if (state.state != null)
+		{
+			addPages(JSON.parse(state.state));
+		}
+		else if (state.Pages != null)
+		{
+			addPages(state);
 		}
 		else
 		{
--- a/src/main/webapp/js/diagramly/GraphViewer.js
+++ b/src/main/webapp/js/diagramly/GraphViewer.js
@ -115,6 +115,7 @@ GraphViewer.prototype.init = function(container, xmlNode, graphConfig)
 			var render = mxUtils.bind(this, function()
 			{
 				this.graph = new Graph(container);
+				this.graph.defaultPageBackgroundColor = 'transparent';
 				this.graph.transparentBackground = false;
 				
 				if (this.graphConfig.move)
@ -1434,7 +1435,7 @@ GraphViewer.prototype.showLocalLightbox = function()
 	
 	// Workaround for lost reference with same ID
 	Graph.prototype.shadowId = 'dropShadow';
-	
+
 	// Disables refresh
 	ui.refresh = function() {};
 	
--- a/src/main/webapp/js/diagramly/Minimal.js
+++ b/src/main/webapp/js/diagramly/Minimal.js
@ -392,7 +392,7 @@ EditorUi.initMinimalTheme = function()
 		if (this.userElement != null)
 		{
 			var elt = this.userElement;
-    		elt.style.cssText = 'display:inline-block;position:relative;margin-right:4px;cursor:pointer;';
+    		elt.style.cssText = 'position:relative;margin-right:4px;cursor:pointer;display:' + elt.style.display;
    		elt.className = 'geToolbarButton';
    		elt.innerHTML = '';
 			elt.style.backgroundImage = 'url(' + Editor.userImage + ')';
@ -403,6 +403,11 @@ EditorUi.initMinimalTheme = function()
        	elt.style.width = '24px';
        	elt.style.cssFloat = 'right';
        	elt.setAttribute('title', mxResources.get('changeUser'));
+        	
+        	if (elt.style.display != 'none')
+        	{
+        		elt.style.display = 'inline-block';
+        	}
 		}
    };
    
--- a/src/main/webapp/js/diagramly/sidebar/Sidebar-AWS4.js
+++ b/src/main/webapp/js/diagramly/sidebar/Sidebar-AWS4.js
@ -31,8 +31,8 @@
 		this.addAWS4ComputePalette(s, w, h, w2, gn, sb);
 		this.addAWS4CustomerEngagementPalette(s, w, h, w2, gn, sb);
 		this.addAWS4DatabasePalette(s, w, h, w2, gn, sb);
-		this.addAWS4DesktopAppStreamingPalette(s, w, h, w2, gn, sb);
 		this.addAWS4DeveloperToolsPalette(s, w, h, w2, gn, sb);
+		this.addAWS4EndUserComputingPalette(s, w, h, w2, gn, sb);
 		this.addAWS4GameTechPalette(s, w, h, w2, gn, sb);
 		this.addAWS4InternetOfThingsPalette(s, w, h, w2, gn, sb);
 		this.addAWS4MachineLearningPalette(s, w, h, w2, gn, sb);
@ -85,8 +85,6 @@
 		[
 			 this.createVertexTemplateEntry(n3 + 'resourceIcon;resIcon=' + gn + '.marketplace;',
 					 s * 78, s * 78, '', 'Marketplace', null, null, this.getTagsForStencil(gn, 'marketplace', dt).join(' ')),
-			 this.createVertexTemplateEntry(n + 'aws_cloud;',
-					 s * 78, s * 78, '', 'AWS Cloud', null, null, this.getTagsForStencil(gn, 'cloud', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'client;',
 					 s * 78, s * 76, '', 'Client', null, null, this.getTagsForStencil(gn, 'client', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'corporate_data_center;',
@ -100,7 +98,7 @@
 			 this.createVertexTemplateEntry(n + 'internet;',
 					 s * 78, s * 48, '', 'Internet', null, null, this.getTagsForStencil(gn, 'internet', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'internet_alt1;',
-					 s * 78, s * 75, '', 'Internet', null, null, this.getTagsForStencil(gn, 'internet', dt).join(' ')),
+					 s * 78, s * 48, '', 'Internet', null, null, this.getTagsForStencil(gn, 'internet', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'internet_alt2;',
 					 s * 78, s * 78, '', 'Internet Gateway', null, null, this.getTagsForStencil(gn, 'internet gateway', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'mobile_client;',
@ -121,12 +119,10 @@
 					 s * 78, s * 78, '', 'User', null, null, this.getTagsForStencil(gn, 'user', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'users;',
 					 s * 78, s * 78, '', 'Users', null, null, this.getTagsForStencil(gn, 'users', dt).join(' ')),
-			 this.createVertexTemplateEntry(n2 + 'external_toolkit;',
+			 this.createVertexTemplateEntry(n + 'external_toolkit;',
 					 s * 68, s * 78, '', 'Toolkit', null, null, this.getTagsForStencil(gn, 'external toolkit', dt).join(' ')),
-			 this.createVertexTemplateEntry(n2 + 'external_sdk;',
-					 s * 68, s * 78, '', 'SDK', null, null, this.getTagsForStencil(gn, 'external sdk software development kit', dt).join(' ')),
-			 this.createVertexTemplateEntry(n + 'virtual_private_cloud;',
-					 s * 78, s * 48, '', 'Virtual Private Cloud', null, null, this.getTagsForStencil(gn, 'virtual private cloud vpc', dt).join(' '))
+			 this.createVertexTemplateEntry(n + 'external_sdk;',
+					 s * 68, s * 78, '', 'SDK', null, null, this.getTagsForStencil(gn, 'external sdk software development kit', dt).join(' '))
 		]);
 	};

@ -237,7 +233,7 @@
 			 this.createVertexTemplateEntry(n + 'search_documents;',
 					 s * 68, s * 78, '', 'Search Documents', null, null, this.getTagsForStencil(gn, 'search documents', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'cluster;',
-					 s * 78, s * 78, '', 'EMR Cluster', null, null, this.getTagsForStencil(gn, 'emr cluster', dt).join(' ')),
+					 s * 78, s * 78, '', 'HDFS Cluster', null, null, this.getTagsForStencil(gn, 'hdfs cluster', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'emr_engine;',
 					 s * 78, s * 59, '', 'EMR Engine', null, null, this.getTagsForStencil(gn, 'emr engine', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'emr_engine_mapr_m3;',
@ -247,15 +243,15 @@
 			 this.createVertexTemplateEntry(n + 'emr_engine_mapr_m7;',
 					 s * 78, s * 59, '', 'EMR Engine MapR M7', null, null, this.getTagsForStencil(gn, 'emr engine mapr m7', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'hdfs_cluster;',
-					 s * 78, s * 78, '', 'HDFS Cluster', null, null, this.getTagsForStencil(gn, 'hdfs cluster', dt).join(' ')),
+					 s * 78, s * 78, '', 'Cluster', null, null, this.getTagsForStencil(gn, 'cluster', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'dense_compute_node;',
 					 s * 78, s * 78, '', 'Dense Compute Node', null, null, this.getTagsForStencil(gn, 'dense compute node', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'dense_storage_node;',
 					 s * 78, s * 78, '', 'Dense Storage Node', null, null, this.getTagsForStencil(gn, 'dense storage node', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'glue_crawlers;',
-					 s * 78, s * 78, '', 'Glue Crawlers', null, null, this.getTagsForStencil(gn, 'glue crawlers', dt).join(' ')),
+					 s * 78, s * 78, '', 'Crawler', null, null, this.getTagsForStencil(gn, 'crawler', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'glue_data_catalog;',
-					 s * 72, s * 78, '', 'Glue Data Catalog', null, null, this.getTagsForStencil(gn, 'glue data catalog', dt).join(' '))
+					 s * 72, s * 78, '', 'Data Catalog', null, null, this.getTagsForStencil(gn, 'data catalog', dt).join(' '))
 		]);
 	};

@ -340,7 +336,7 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.managed_blockchain;',
 					 w2, w2, '', 'Managed Blockchain', null, null, this.getTagsForStencil(gn, 'managed blockchain', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.quantum_ledger_database;',
-					 w2, w2, '', 'Quantum Ledger Database', null, null, this.getTagsForStencil(gn, 'quantum ledger database', dt).join(' ')),
+					 w2, w2, '', 'Quantum Ledger Database (QLDB)', null, null, this.getTagsForStencil(gn, 'quantum ledger database', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.blockchain;',
 					 w2, w2, '', 'Blockchain', null, null, this.getTagsForStencil(gn, 'blockchain', dt).join(' '))
 		]);
@ -352,14 +348,12 @@
 		var n2 = 'outlineConnect=0;fontColor=#232F3E;gradientColor=#F54749;gradientDirection=north;fillColor=#C7131F;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;' + mxConstants.STYLE_SHAPE + "=mxgraph.aws4.";
 		var dt = 'aws amazon web service business applications';
 		
-		this.addPaletteFunctions('aws4Business Applications', 'AWS / Applications', false,
+		this.addPaletteFunctions('aws4Business Applications', 'AWS / Business Applications', false,
 		[
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.alexa_for_business;',
 					 w2, w2, '', 'Alexa for Business', null, null, this.getTagsForStencil(gn, 'alexa for business', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.chime;',
 					 w2, w2, '', 'Chime', null, null, this.getTagsForStencil(gn, 'chime', dt).join(' ')),
-			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workdocs;',
-					 w2, w2, '', 'WorkDocs', null, null, this.getTagsForStencil(gn, 'workdocs', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workmail;',
 					 w2, w2, '', 'WorkMail', null, null, this.getTagsForStencil(gn, 'workmail', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.business_application;',
@ -435,7 +429,7 @@
 			 this.createVertexTemplateEntry(n + 'x1_instance2;',
 					 s * 48, s * 48, '', 'X1 Instance', null, null, this.getTagsForStencil(gn, 'x1', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'z1d_instance;',
-					 s * 48, s * 48, '', 'Z1d Instance', null, null, this.getTagsForStencil(gn, 'z1d', dt).join(' '))
+					 s * 48, s * 48, '', 'z1d Instance', null, null, this.getTagsForStencil(gn, 'z1d', dt).join(' '))
 		]);
 	};

@ -489,21 +483,21 @@
 			 this.createVertexTemplateEntry(n + 'registry;',
 					 s * 78, s * 78, '', 'Registry', null, null, this.getTagsForStencil(gn, 'registry', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'container_1;',
-					 s * 78, s * 50, '', 'ECS Container', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
+					 s * 78, s * 50, '', 'Container', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'container_2;',
-					 s * 78, s * 50, '', 'ECS Container', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
+					 s * 78, s * 50, '', 'Container', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'container_3;',
-					 s * 78, s * 50, '', 'ECS Container', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
+					 s * 78, s * 50, '', 'Container', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'container_registry_image;',
 					 s * 78, s * 78, '', 'Image', null, null, this.getTagsForStencil(gn, 'image', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'ecs_service;',
-					 s * 64, s * 78, '', 'ECS Service', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
+					 s * 64, s * 78, '', 'Service', null, null, this.getTagsForStencil(gn, 'ecs elastic container service', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'ecs_task;',
-					 s * 59, s * 78, '', 'ECS Task', null, null, this.getTagsForStencil(gn, 'ecs elastic container service task', dt).join(' ')),
+					 s * 59, s * 78, '', 'Task', null, null, this.getTagsForStencil(gn, 'ecs elastic container service task', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'application;',
-					 s * 50, s * 78, '', 'Elastic Beanstalk Application', null, null, this.getTagsForStencil(gn, 'elastic beanstalk application', dt).join(' ')),
+					 s * 50, s * 78, '', 'Application', null, null, this.getTagsForStencil(gn, 'elastic beanstalk application', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'deployment;',
-					 s * 78, s * 74, '', 'Elastic Beanstalk Deployment', null, null, this.getTagsForStencil(gn, 'elastic beanstalk deployment', dt).join(' ')),
+					 s * 78, s * 74, '', 'Deployment', null, null, this.getTagsForStencil(gn, 'elastic beanstalk deployment', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'lambda_function;',
 					 s * 78, s * 78, '', 'Lambda Function', null, null, this.getTagsForStencil(gn, 'lambda function', dt).join(' '))
 		]);
@ -527,7 +521,7 @@
 					 w2, w2, '', 'Customer Engagement', null, null, this.getTagsForStencil(gn, 'customer engagement', dt).join(' ')),
 					 
 			 this.createVertexTemplateEntry(n + 'email;',
-					 s * 78, s * 69, '', 'Simple Email Service', null, null, this.getTagsForStencil(gn, 'simple email service ses', dt).join(' '))
+					 s * 78, s * 69, '', 'Email', null, null, this.getTagsForStencil(gn, 'email', dt).join(' '))
 		]);
 	};

@ -542,7 +536,7 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.aurora;',
 					 w2, w2, '', 'Aurora', null, null, this.getTagsForStencil(gn, 'aurora', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.documentdb_with_mongodb_compatibility;',
-					 w2, w2, '', 'DocumentDB with MongoDB Compatibility', null, null, this.getTagsForStencil(gn, 'documentdb with mongodb compatibility', dt).join(' ')),
+					 w2, w2, '', 'DocumentDB (with MongoDB Compatibility)', null, null, this.getTagsForStencil(gn, 'documentdb with mongodb compatibility', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.dynamodb;',
 					 w2, w2, '', 'DynamoDB', null, null, this.getTagsForStencil(gn, 'dynamodb', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.elasticache;',
@ -565,19 +559,19 @@
 					 w2, w2, '', 'Database', null, null, this.getTagsForStencil(gn, 'database', dt).join(' ')),
 					 
 			 this.createVertexTemplateEntry(n + 'attribute;',
-					 s * 78, s * 78, '', 'DynamoDB Attribute', null, null, this.getTagsForStencil(gn, 'dynamodb dynamo db database attribute', dt).join(' ')),
+					 s * 78, s * 78, '', 'Attribute', null, null, this.getTagsForStencil(gn, 'dynamodb dynamo db database attribute', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'attributes;',
-					 s * 78, s * 78, '', 'DynamoDB Attributes', null, null, this.getTagsForStencil(gn, 'dynamodb dynamo db database attributes', dt).join(' ')),
+					 s * 78, s * 78, '', 'Attributes', null, null, this.getTagsForStencil(gn, 'dynamodb dynamo db database attributes', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'global_secondary_index;',
-					 s * 78, s * 78, '', 'DynamoDB Global Secondary Index', null, null, this.getTagsForStencil(gn, 'global secondary index', dt).join(' ')),
+					 s * 78, s * 78, '', 'Global Secondary Index', null, null, this.getTagsForStencil(gn, 'global secondary index', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'item;',
-					 s * 78, s * 78, '', 'DynamoDB Item', null, null, this.getTagsForStencil(gn, 'item', dt).join(' ')),
+					 s * 78, s * 78, '', 'Item', null, null, this.getTagsForStencil(gn, 'item', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'items;',
-					 s * 78, s * 78, '', 'DynamoDB Items', null, null, this.getTagsForStencil(gn, 'items', dt).join(' ')),
+					 s * 78, s * 78, '', 'Items', null, null, this.getTagsForStencil(gn, 'items', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'table;',
-					 s * 78, s * 78, '', 'DynamoDB Table', null, null, this.getTagsForStencil(gn, 'table', dt).join(' ')),
+					 s * 78, s * 78, '', 'Table', null, null, this.getTagsForStencil(gn, 'table', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'cache_node;',
-					 s * 78, s * 78, '', 'ElastiCache Cache Node', null, null, this.getTagsForStencil(gn, 'elasticache elastic cache node', dt).join(' ')),
+					 s * 78, s * 78, '', 'Cache Node', null, null, this.getTagsForStencil(gn, 'elasticache elastic cache node', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'elasticache_for_memcached;',
 					 s * 78, s * 69, '', 'ElastiCache for Memcached', null, null, this.getTagsForStencil(gn, 'elasticache for memcached', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'elasticache_for_redis;',
@ -591,20 +585,24 @@
 		]);
 	};

-	Sidebar.prototype.addAWS4DesktopAppStreamingPalette = function(s, w, h, w2, gn, sb)
+	Sidebar.prototype.addAWS4EndUserComputingPalette = function(s, w, h, w2, gn, sb)
 	{
 		var n = 'outlineConnect=0;fontColor=#232F3E;gradientColor=none;fillColor=#116D5B;strokeColor=none;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;' + mxConstants.STYLE_SHAPE + "=mxgraph.aws4.";
 		var n2 = 'outlineConnect=0;fontColor=#232F3E;gradientColor=#4AB29A;gradientDirection=north;fillColor=#116D5B;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;' + mxConstants.STYLE_SHAPE + "=mxgraph.aws4.";
 		var dt = 'aws amazon web service db database';
 		
-		this.addPaletteFunctions('aws4Desktop App Streaming', 'AWS / Desktop & App Streaming', false,
+		this.addPaletteFunctions('aws4End User Computing', 'AWS / End User Computing', false,
 		[
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.appstream_20;',
 					 w2, w2, '', 'Appstream 2.0', null, null, this.getTagsForStencil(gn, 'appstream', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workspaces;',
 					 w2, w2, '', 'Workspaces', null, null, this.getTagsForStencil(gn, 'workspaces', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.worklink;',
+					 w2, w2, '', 'WorkLink', null, null, this.getTagsForStencil(gn, 'worklink', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workdocs;',
+					 w2, w2, '', 'WorkDocs', null, null, this.getTagsForStencil(gn, 'workdocs', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.desktop_and_app_streaming;',
-					 w2, w2, '', 'Desktop and App Streaming', null, null, this.getTagsForStencil(gn, 'desktop and app streaming', dt).join(' '))
+					 w2, w2, '', 'End User Computing', null, null, this.getTagsForStencil(gn, 'desktop and app streaming', dt).join(' '))
 		]);
 	};

@ -681,18 +679,24 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.greengrass;',
 					 w2, w2, '', 'Greengrass', null, null, this.getTagsForStencil(gn, 'greengrass', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.iot_sitewise;',
-					 w2, w2, '', 'Sitewise', null, null, this.getTagsForStencil(gn, 'sitewise', dt).join(' ')),
+					 w2, w2, '', 'SiteWise', null, null, this.getTagsForStencil(gn, 'sitewise', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.iot_things_graph;',
 					 w2, w2, '', 'Graph', null, null, this.getTagsForStencil(gn, 'graph', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.internet_of_things;',
 					 w2, w2, '', 'Internet of Things', null, null, this.getTagsForStencil(gn, '', dt).join(' ')),
 					 
 			 this.createVertexTemplateEntry(n + 'iot_analytics_channel;',
-					 s * 65, s * 78, '', 'Analytics Channel', null, null, this.getTagsForStencil(gn, 'analytics channel', dt).join(' ')),
+					 s * 65, s * 78, '', 'Channel', null, null, this.getTagsForStencil(gn, 'analytics channel', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'data_set;',
+					 s * 63, s * 78, '', 'Data Set', null, null, this.getTagsForStencil(gn, 'data set', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'iot_analytics_data_store;',
-					 s * 54, s * 78, '', 'Analytics Data Store', null, null, this.getTagsForStencil(gn, 'analytics data store', dt).join(' ')),
+					 s * 54, s * 78, '', 'Data Store', null, null, this.getTagsForStencil(gn, 'analytics data store', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'iot_analytics_pipeline;',
-					 s * 78, s * 42, '', 'Analytics Pipeline', null, null, this.getTagsForStencil(gn, 'analytics pipeline', dt).join(' ')),
+					 s * 78, s * 42, '', 'Pipeline', null, null, this.getTagsForStencil(gn, 'analytics pipeline', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'notebook;',
+					 s * 68, s * 78, '', 'Notebook', null, null, this.getTagsForStencil(gn, 'notebook', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'connector;',
+					 s * 78, s * 29, '', 'Connector', null, null, this.getTagsForStencil(gn, 'notebook', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'action;',
 					 s * 78, s * 78, '', 'Action', null, null, this.getTagsForStencil(gn, 'action', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'actuator;',
@ -714,7 +718,7 @@
 			 this.createVertexTemplateEntry(n + 'cart;',
 					 s * 78, s * 78, '', 'Cart', null, null, this.getTagsForStencil(gn, 'cart', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'certificate_manager;',
-					 s * 59, s * 78, '', 'Certificate Manager', null, null, this.getTagsForStencil(gn, 'certificate manager', dt).join(' ')),
+					 s * 59, s * 78, '', 'Certificate', null, null, this.getTagsForStencil(gn, 'certificate manager', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'coffee_pot;',
 					 s * 78, s * 78, '', 'Coffee Pot', null, null, this.getTagsForStencil(gn, 'coffee pot', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'desired_state;',
@ -824,13 +828,19 @@
 					 w2, w2, '', 'Machine Learning', null, null, this.getTagsForStencil(gn, 'machine learning', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.tensorflow_on_aws;',
 					 w2, w2, '', 'TensorFlow on AWS', null, null, this.getTagsForStencil(gn, 'tensorflow on aws', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.deep_learning_containers;',
+					 w2, w2, '', 'Deep Learning Containers', null, null, this.getTagsForStencil(gn, 'deep learning containers', dt).join(' ')),
 					 
+			 this.createVertexTemplateEntry(n + 'rekognition_image;',
+					 s * 77, s * 78, '', 'Rekognition image', null, null, this.getTagsForStencil(gn, 'rekognition image', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'rekognition_video;',
+					 s * 77, s * 78, '', 'Rekognition video', null, null, this.getTagsForStencil(gn, 'rekognition video', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'sagemaker_model;',
-					 s * 78, s * 78, '', 'SageMaker Model', null, null, this.getTagsForStencil(gn, 'sagemaker model', dt).join(' ')),
+					 s * 78, s * 78, '', 'Model', null, null, this.getTagsForStencil(gn, 'sagemaker model', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'sagemaker_notebook;',
-					 s * 68, s * 78, '', 'SageMaker Notebook', null, null, this.getTagsForStencil(gn, 'sagemaker notebook', dt).join(' ')),
+					 s * 68, s * 78, '', 'Notebook', null, null, this.getTagsForStencil(gn, 'sagemaker notebook', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'sagemaker_train;',
-					 s * 78, s * 65, '', 'SageMaker Train', null, null, this.getTagsForStencil(gn, 'sagemaker train', dt).join(' '))
+					 s * 78, s * 65, '', 'Train', null, null, this.getTagsForStencil(gn, 'sagemaker train', dt).join(' '))
 		]);
 	};

@ -845,13 +855,13 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.cloudwatch;',
 					 w2, w2, '', 'CloudWatch', null, null, this.getTagsForStencil(gn, 'cloudwatch', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.autoscaling;',
-					 w2, w2, '', 'Auto-Scaling', null, null, this.getTagsForStencil(gn, 'autoscaling', dt).join(' ')),
+					 w2, w2, '', 'Auto Scaling', null, null, this.getTagsForStencil(gn, 'auto scaling', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.cloudformation;',
 					 w2, w2, '', 'CloudFormation', null, null, this.getTagsForStencil(gn, 'cloudformation', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.cloudtrail;',
 					 w2, w2, '', 'CloudTrail', null, null, this.getTagsForStencil(gn, 'cloudtrail', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.command_line_interface;',
-					 w2, w2, '', 'Command-Line Interface', null, null, this.getTagsForStencil(gn, 'command line interface', dt).join(' ')),
+					 w2, w2, '', 'Command Line Interface', null, null, this.getTagsForStencil(gn, 'command line interface', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.config;',
 					 w2, w2, '', 'Config', null, null, this.getTagsForStencil(gn, 'config', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.license_manager;',
@ -871,70 +881,70 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.trusted_advisor;',
 					 w2, w2, '', 'Trusted Advisor', null, null, this.getTagsForStencil(gn, 'trusted advisor', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.well_architected_tool;',
-					 w2, w2, '', 'Well Architected Tool', null, null, this.getTagsForStencil(gn, 'well architected tool', dt).join(' ')),
+					 w2, w2, '', 'Well-Architected Tool', null, null, this.getTagsForStencil(gn, 'well architected tool', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.control_tower;',
 					 w2, w2, '', 'Control Tower', null, null, this.getTagsForStencil(gn, 'control tower', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.management_and_governance;',
 					 w2, w2, '', 'Management and Governance', null, null, this.getTagsForStencil(gn, 'management and governance', dt).join(' ')),
 					 
 			 this.createVertexTemplateEntry(n + 'alarm;',
-					 s * 78, s * 78, '', 'CloudWatch Alarm', null, null, this.getTagsForStencil(gn, 'cloudwatch alarm', dt).join(' ')),
+					 s * 78, s * 78, '', 'Alarm', null, null, this.getTagsForStencil(gn, 'cloudwatch alarm', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'event_event_based;',
-					 s * 78, s * 78, '', 'CloudWatch Event Event-Based', null, null, this.getTagsForStencil(gn, 'cloudwatch event based', dt).join(' ')),
+					 s * 78, s * 78, '', 'Event (Event-Based)', null, null, this.getTagsForStencil(gn, 'cloudwatch event based', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'event_time_based;',
-					 s * 78, s * 78, '', 'CloudWatch Event Time-Based', null, null, this.getTagsForStencil(gn, 'cloudwatch event time based', dt).join(' ')),
+					 s * 78, s * 78, '', 'Event (Time-Based)', null, null, this.getTagsForStencil(gn, 'cloudwatch event time based', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'rule_2;',
-					 s * 78, s * 76, '', 'CloudWatch Rule', null, null, this.getTagsForStencil(gn, 'cloudwatch rule', dt).join(' ')),
+					 s * 78, s * 76, '', 'Rule', null, null, this.getTagsForStencil(gn, 'cloudwatch rule', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'change_set;',
-					 s * 65, s * 78, '', 'CloudFormation Change Set', null, null, this.getTagsForStencil(gn, 'cloudformation change set', dt).join(' ')),
+					 s * 65, s * 78, '', 'Change Set', null, null, this.getTagsForStencil(gn, 'cloudformation change set', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'stack;',
-					 s * 78, s * 76, '', 'CloudFormation Stack', null, null, this.getTagsForStencil(gn, 'cloudformation stack', dt).join(' ')),
+					 s * 78, s * 76, '', 'Stack', null, null, this.getTagsForStencil(gn, 'cloudformation stack', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'template;',
-					 s * 65, s * 78, '', 'CloudFormation Template', null, null, this.getTagsForStencil(gn, 'cloudformation template', dt).join(' ')),
+					 s * 65, s * 78, '', 'Template', null, null, this.getTagsForStencil(gn, 'cloudformation template', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'opsworks_apps;',
-					 s * 78, s * 78, '', 'OpsWorks Apps', null, null, this.getTagsForStencil(gn, 'opsworks apps applications', dt).join(' ')),
+					 s * 78, s * 78, '', 'Apps', null, null, this.getTagsForStencil(gn, 'opsworks apps applications', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'deployments;',
-					 s * 65, s * 78, '', 'OpsWorks Deployments', null, null, this.getTagsForStencil(gn, 'opsworks deployments', dt).join(' ')),
+					 s * 65, s * 78, '', 'Deployments', null, null, this.getTagsForStencil(gn, 'opsworks deployments', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'instances_2;',
-					 s * 78, s * 78, '', 'OpsWorks Instances', null, null, this.getTagsForStencil(gn, 'opsworks instances', dt).join(' ')),
+					 s * 78, s * 78, '', 'Instances', null, null, this.getTagsForStencil(gn, 'opsworks instances', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'layers;',
-					 s * 78, s * 78, '', 'OpsWorks Layers', null, null, this.getTagsForStencil(gn, 'opsworks layers', dt).join(' ')),
+					 s * 78, s * 78, '', 'Layers', null, null, this.getTagsForStencil(gn, 'opsworks layers', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'monitoring;',
-					 s * 78, s * 58, '', 'OpsWorks Monitoring', null, null, this.getTagsForStencil(gn, 'opsworks monitoring', dt).join(' ')),
+					 s * 78, s * 58, '', 'Monitoring', null, null, this.getTagsForStencil(gn, 'opsworks monitoring', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'opsworks_permissions;',
-					 s * 54, s * 78, '', 'OpsWorks Permissions', null, null, this.getTagsForStencil(gn, 'opsworks permissions', dt).join(' ')),
+					 s * 54, s * 78, '', 'Permissions', null, null, this.getTagsForStencil(gn, 'opsworks permissions', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'resources;',
-					 s * 68, s * 78, '', 'OpsWorks Resources', null, null, this.getTagsForStencil(gn, 'opsworks resources', dt).join(' ')),
+					 s * 68, s * 78, '', 'Resources', null, null, this.getTagsForStencil(gn, 'opsworks resources', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'stack2;',
 					 s * 78, s * 78, '', 'Stack', null, null, this.getTagsForStencil(gn, 'stack', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'shield_shield_advanced;',
 					 s * 70, s * 78, '', 'Shield Advanced', null, null, this.getTagsForStencil(gn, 'shield advanced', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'automation;',
-					 s * 78, s * 78, '', 'Systems Manager Automation', null, null, this.getTagsForStencil(gn, 'systems manager automation', dt).join(' ')),
+					 s * 78, s * 78, '', 'Automation', null, null, this.getTagsForStencil(gn, 'systems manager automation', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'documents;',
-					 s * 64, s * 78, '', 'Systems Manager Documents', null, null, this.getTagsForStencil(gn, 'systems manager documents', dt).join(' ')),
+					 s * 64, s * 78, '', 'Documents', null, null, this.getTagsForStencil(gn, 'systems manager documents', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'inventory;',
-					 s * 78, s * 78, '', 'Systems Manager Inventory', null, null, this.getTagsForStencil(gn, 'systems manager inventory', dt).join(' ')),
+					 s * 78, s * 78, '', 'Inventory', null, null, this.getTagsForStencil(gn, 'systems manager inventory', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'maintenance_windows;',
-					 s * 78, s * 78, '', 'Systems Manager Maintenance Windows', null, null, this.getTagsForStencil(gn, 'systems manager maintenance windows', dt).join(' ')),
+					 s * 78, s * 78, '', 'Maintenance Windows', null, null, this.getTagsForStencil(gn, 'systems manager maintenance windows', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'parameter_store;',
-					 s * 75, s * 78, '', 'Systems Manager Parameter Store', null, null, this.getTagsForStencil(gn, 'systems manager parameter store', dt).join(' ')),
+					 s * 75, s * 78, '', 'Parameter Store', null, null, this.getTagsForStencil(gn, 'systems manager parameter store', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'patch_manager;',
-					 s * 78, s * 78, '', 'Systems Manager Patch Manager', null, null, this.getTagsForStencil(gn, 'systems manager patch manager', dt).join(' ')),
+					 s * 78, s * 78, '', 'Patch Manager', null, null, this.getTagsForStencil(gn, 'systems manager patch manager', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'run_command;',
-					 s * 78, s * 55, '', 'Systems Manager Run Command', null, null, this.getTagsForStencil(gn, 'systems manager run command', dt).join(' ')),
+					 s * 78, s * 55, '', 'Run Command', null, null, this.getTagsForStencil(gn, 'systems manager run command', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'state_manager;',
-					 s * 78, s * 78, '', 'Systems Manager State Manager', null, null, this.getTagsForStencil(gn, 'systems manager state', dt).join(' ')),
+					 s * 78, s * 78, '', 'State Manager', null, null, this.getTagsForStencil(gn, 'systems manager state', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'checklist;',
-					 s * 66, s * 78, '', 'Trusted Advisor Checklist', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist', dt).join(' ')),
+					 s * 66, s * 78, '', 'Checklist', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'checklist_cost;',
-					 s * 78, s * 78, '', 'Trusted Advisor Checklist Cost', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist cost', dt).join(' ')),
+					 s * 78, s * 78, '', 'Checklist Cost', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist cost', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'checklist_fault_tolerant;',
-					 s * 78, s * 77, '', 'Trusted Advisor Checklist Fault Tolerant', null, null, this.getTagsForStencil(gn, 'trusted advisor fault tolerant', dt).join(' ')),
+					 s * 78, s * 77, '', 'Checklist Fault Tolerant', null, null, this.getTagsForStencil(gn, 'trusted advisor fault tolerant', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'checklist_performance;',
-					 s * 78, s * 78, '', 'Trusted Advisor Checklist Performance', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist performance', dt).join(' ')),
+					 s * 78, s * 78, '', 'Checklist Performance', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist performance', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'checklist_security;',
-					 s * 78, s * 78, '', 'Trusted Advisor Checklist Security', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist security', dt).join(' '))
+					 s * 78, s * 78, '', 'Checklist Security', null, null, this.getTagsForStencil(gn, 'trusted advisor checklist security', dt).join(' '))
 		]);
 	};

@ -994,7 +1004,10 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.transfer_for_sftp;',
 					 w2, w2, '', 'Transfer for SFTP', null, null, this.getTagsForStencil(gn, 'transfer for sftp', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.migration_and_transfer;',
-					 w2, w2, '', 'Migration and Transfer', null, null, this.getTagsForStencil(gn, 'migration and transfer', dt).join(' '))
+					 w2, w2, '', 'Migration and Transfer', null, null, this.getTagsForStencil(gn, 'migration and transfer', dt).join(' ')),
+					 
+			 this.createVertexTemplateEntry(n + 'agent2;',
+					 s * 78, s * 78, '', 'Agent', null, null, this.getTagsForStencil(gn, 'agent', dt).join(' '))
 		]);
 	};

@ -1017,7 +1030,10 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.device_farm;',
 					 w2, w2, '', 'Device Farm', null, null, this.getTagsForStencil(gn, 'device farm', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.mobile;',
-					 w2, w2, '', 'Mobile', null, null, this.getTagsForStencil(gn, 'mobile', dt).join(' '))
+					 w2, w2, '', 'Mobile', null, null, this.getTagsForStencil(gn, 'mobile', dt).join(' ')),
+					 
+			 this.createVertexTemplateEntry(n + 'endpoint;',
+					 s * 78, s * 78, '', 'Endpoint', null, null, this.getTagsForStencil(gn, 'endpoint', dt).join(' '))
 		]);
 	};

@ -1043,6 +1059,10 @@
 					 w2, w2, '', 'App Mesh', null, null, this.getTagsForStencil(gn, 'app application mesh', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.client_vpn;',
 					 w2, w2, '', 'Client VPN', null, null, this.getTagsForStencil(gn, 'client vpn virtual private network', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.site_to_site_vpn;',
+					 w2, w2, '', 'Site-to-Site VPN', null, null, this.getTagsForStencil(gn, 'site to site s2s vpn virtual private network', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.elastic_load_balancing;',
+					 w2, w2, '', 'Elastic Load Balancing', null, null, this.getTagsForStencil(gn, 'elastic load balancing', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.cloud_map;',
 					 w2, w2, '', 'Cloud Map', null, null, this.getTagsForStencil(gn, 'cloud map', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.direct_connect;',
@ -1054,6 +1074,8 @@
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.networking_and_content_delivery;',
 					 w2, w2, '', 'Networking and Content Delivery', null, null, this.getTagsForStencil(gn, 'networking and content delivery', dt).join(' ')),
 					 
+			 this.createVertexTemplateEntry(n + 'endpoint;',
+					 s * 78, s * 78, '', 'Endpoint', null, null, this.getTagsForStencil(gn, 'endpoint', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'download_distribution;',
 					 s * 78, s * 78, '', 'Download Distribution', null, null, this.getTagsForStencil(gn, 'download distribution', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'edge_location;',
@ -1061,33 +1083,39 @@
 			 this.createVertexTemplateEntry(n + 'streaming_distribution;',
 					 s * 78, s * 78, '', 'Streaming Distribution', null, null, this.getTagsForStencil(gn, 'streaming distribution', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'hosted_zone;',
-					 s * 78, s * 77, '', 'Route 53 Hosted Zone', null, null, this.getTagsForStencil(gn, 'hosted zone', dt).join(' ')),
+					 s * 78, s * 77, '', 'Hosted Zone', null, null, this.getTagsForStencil(gn, 'hosted zone', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'route_table;',
-					 s * 78, s * 76, '', 'Route 53 Route Table', null, null, this.getTagsForStencil(gn, 'route table', dt).join(' ')),
+					 s * 78, s * 76, '', 'Route Table', null, null, this.getTagsForStencil(gn, 'route table', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'customer_gateway;',
-					 s * 78, s * 78, '', 'VPC Customer Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud customer gateway', dt).join(' ')),
+					 s * 78, s * 78, '', 'Router', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud customer gateway', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'elastic_network_adapter;',
-					 s * 78, s * 78, '', 'VPC Elastic Network Adapter', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud elastic network adapter', dt).join(' ')),
+					 s * 78, s * 78, '', 'Elastic Network Adapter', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud elastic network adapter', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'elastic_network_interface;',
-					 s * 78, s * 78, '', 'VPC Elastic Network Interface', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud elastic network interface', dt).join(' ')),
+					 s * 78, s * 78, '', 'Elastic Network Interface', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud elastic network interface', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'endpoints;',
-					 s * 78, s * 78, '', 'VPC Endpoints', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud endpoints', dt).join(' ')),
+					 s * 78, s * 78, '', 'Endpoints', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud endpoints', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'flow_logs;',
-					 s * 78, s * 78, '', 'VPC Flow Logs', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud flow logs', dt).join(' ')),
+					 s * 78, s * 78, '', 'Flow Logs', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud flow logs', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'internet_gateway;',
-					 s * 78, s * 78, '', 'VPC Internet Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud internet gateway', dt).join(' ')),
+					 s * 78, s * 78, '', 'Internet Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud internet gateway', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'nat_gateway;',
-					 s * 78, s * 78, '', 'VPC NAT Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud nat gateway', dt).join(' ')),
+					 s * 78, s * 78, '', 'NAT Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud nat gateway', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'network_access_control_list;',
-					 s * 78, s * 78, '', 'VPC Network Access Control List', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud network access control list', dt).join(' ')),
+					 s * 78, s * 78, '', 'Network Access Control List', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud network access control list', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'peering;',
-					 s * 78, s * 78, '', 'VPC Peering', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud network peering', dt).join(' ')),
+					 s * 78, s * 78, '', 'Peering', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud network peering', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'application_load_balancer;',
+					 s * 78, s * 78, '', 'Application Load Balancer', null, null, this.getTagsForStencil(gn, 'application load balancer', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'classic_load_balancer;',
+					 s * 78, s * 78, '', 'Classic Load Balancer', null, null, this.getTagsForStencil(gn, 'classic load balancer', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'network_load_balancer;',
+					 s * 78, s * 78, '', 'Network Load Balancer', null, null, this.getTagsForStencil(gn, 'network load balancer', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'router;',
-					 s * 78, s * 78, '', 'VPC Router', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud network router', dt).join(' ')),
+					 s * 78, s * 78, '', 'Customer Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud network router', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'vpn_connection;',
-					 s * 70, s * 78, '', 'VPC VPN Connection', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud vpn network connection', dt).join(' ')),
+					 s * 70, s * 78, '', 'VPN Connection', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud vpn network connection', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'vpn_gateway;',
-					 s * 78, s * 78, '', 'VPC VPN Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud vpn network gateway', dt).join(' '))
+					 s * 78, s * 78, '', 'VPN Gateway', null, null, this.getTagsForStencil(gn, 'vpc virtual private cloud vpn network gateway', dt).join(' '))
 		]);
 	};

@ -1101,6 +1129,8 @@
 		[
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.robotics;',
 					 w2, w2, '', 'Robotics', null, null, this.getTagsForStencil(gn, 'robotics', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.robomaker;',
+					 w2, w2, '', 'RoboMaker', null, null, this.getTagsForStencil(gn, 'robomaker', dt).join(' ')),
 					 
 			 this.createVertexTemplateEntry(n + 'simulation;',
 					 s * 78, s * 64, '', 'Simulation', null, null, this.getTagsForStencil(gn, 'simulation', dt).join(' ')),
@ -1109,7 +1139,7 @@
 			 this.createVertexTemplateEntry(n + 'development_environment;',
 					 s * 78, s * 71, '', 'Development Environment', null, null, this.getTagsForStencil(gn, 'development environment', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'cloud_extension_ros;',
-					 s * 78, s * 78, '', 'Cloud Extension ROS', null, null, this.getTagsForStencil(gn, 'cloud extension ros', dt).join(' '))
+					 s * 78, s * 78, '', 'Cloud Extensions ROS', null, null, this.getTagsForStencil(gn, 'cloud extension ros', dt).join(' '))
 		]);
 	};
 	
@ -1122,7 +1152,9 @@
 		this.addPaletteFunctions('aws4Satellite', 'AWS / Satellite', false,
 		[
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.satellite;',
-					 w2, w2, '', 'Satellite', null, null, this.getTagsForStencil(gn, 'satellite', dt).join(' '))
+					 w2, w2, '', 'Satellite', null, null, this.getTagsForStencil(gn, 'satellite', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.ground_station;',
+					 w2, w2, '', 'Ground Station', null, null, this.getTagsForStencil(gn, 'ground station', dt).join(' '))
 		]);
 	};
 	
@ -1178,25 +1210,25 @@
 			 this.createVertexTemplateEntry(n + 'certificate_manager_2;',
 					 s * 78, s * 72, '', 'Certificate Manager', null, null, this.getTagsForStencil(gn, 'certificate manager', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'addon;',
-					 s * 78, s * 40, '', 'Identity and Access Management - IAM Add-on', null, null, this.getTagsForStencil(gn, 'identity and access management iam addon add on', dt).join(' ')),
+					 s * 78, s * 40, '', 'Add-on', null, null, this.getTagsForStencil(gn, 'identity and access management iam addon add on', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'sts;',
-					 s * 78, s * 50, '', 'Identity and Access Management - IAM AWS STS', null, null, this.getTagsForStencil(gn, 'identity and access management iam sts', dt).join(' ')),
+					 s * 78, s * 50, '', 'STS', null, null, this.getTagsForStencil(gn, 'identity and access management iam sts', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'sts_alternate;',
-					 s * 62, s * 78, '', 'Identity and Access Management - IAM AWS STS', null, null, this.getTagsForStencil(gn, 'identity and access management iam sts', dt).join(' ')),
+					 s * 62, s * 78, '', 'STS', null, null, this.getTagsForStencil(gn, 'identity and access management iam sts', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'data_encryption_key;',
-					 s * 62, s * 78, '', 'Identity and Access Management - IAM Data Encryption Key', null, null, this.getTagsForStencil(gn, 'identity and access management iam data encryption key', dt).join(' ')),
+					 s * 62, s * 78, '', 'Data Encryption Key', null, null, this.getTagsForStencil(gn, 'identity and access management iam data encryption key', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'encrypted_data;',
-					 s * 62, s * 78, '', 'Identity and Access Management - IAM Encrypted Data', null, null, this.getTagsForStencil(gn, 'identity and access management iam encrypted data', dt).join(' ')),
+					 s * 62, s * 78, '', 'Encrypted Data', null, null, this.getTagsForStencil(gn, 'identity and access management iam encrypted data', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'long_term_security_credential;',
-					 s * 78, s * 69, '', 'Identity and Access Management - IAM Long Term Security Credential', null, null, this.getTagsForStencil(gn, 'identity and access management iam long term security credential', dt).join(' ')),
+					 s * 78, s * 69, '', 'Long Term Security Credential', null, null, this.getTagsForStencil(gn, 'identity and access management iam long term security credential', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'mfa_token;',
-					 s * 78, s * 78, '', 'Identity and Access Management - IAM MFA Token', null, null, this.getTagsForStencil(gn, 'identity and access management iam mfa token', dt).join(' ')),
+					 s * 78, s * 78, '', 'MFA Token', null, null, this.getTagsForStencil(gn, 'identity and access management iam mfa token', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'permissions;',
-					 s * 62, s * 78, '', 'Identity and Access Management - IAM Permissions', null, null, this.getTagsForStencil(gn, 'identity and access management iam permissions', dt).join(' ')),
+					 s * 62, s * 78, '', 'Permissions', null, null, this.getTagsForStencil(gn, 'identity and access management iam permissions', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'role;',
-					 s * 78, s * 44, '', 'Identity and Access Management - IAM Role', null, null, this.getTagsForStencil(gn, 'identity and access management iam role', dt).join(' ')),
+					 s * 78, s * 44, '', 'Role', null, null, this.getTagsForStencil(gn, 'identity and access management iam role', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'temporary_security_credential;',
-					 s * 77, s * 78, '', 'Identity and Access Management - IAM Temporary Security Credential', null, null, this.getTagsForStencil(gn, 'identity and access management iam temporary security credential', dt).join(' ')),
+					 s * 77, s * 78, '', 'Temporary Security Credential', null, null, this.getTagsForStencil(gn, 'identity and access management iam temporary security credential', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'organizations_account;',
 					 s * 74, s * 78, '', 'Organizations Account', null, null, this.getTagsForStencil(gn, 'organizations account', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'organizations_organizational_unit;',
@ -1204,7 +1236,7 @@
 			 this.createVertexTemplateEntry(n + 'shield_shield_advanced;',
 					 s * 70, s * 78, '', 'Shield Advanced', null, null, this.getTagsForStencil(gn, 'shield advanced', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'filtering_rule;',
-					 s * 78, s * 78, '', 'WAF Filtering Rule', null, null, this.getTagsForStencil(gn, 'filtering rule', dt).join(' '))
+					 s * 78, s * 78, '', 'Filtering Rule', null, null, this.getTagsForStencil(gn, 'filtering rule', dt).join(' '))
 		]);
 	};

@ -1247,24 +1279,26 @@
 					 s * 56, s * 78, '', 'Snapshot', null, null, this.getTagsForStencil(gn, 'snapshot', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'volume;',
 					 s * 62, s * 78, '', 'Volume', null, null, this.getTagsForStencil(gn, 'volume', dt).join(' ')),
+			 this.createVertexTemplateEntry(n + 'file_system;',
+					 s * 78, s * 73, '', 'File System', null, null, this.getTagsForStencil(gn, 'file system', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'archive;',
-					 s * 63, s * 78, '', 'S3 Glacier Archive', null, null, this.getTagsForStencil(gn, 's3 simple storage service glacier archive', dt).join(' ')),
+					 s * 63, s * 78, '', 'Vault', null, null, this.getTagsForStencil(gn, 's3 simple storage service glacier archive', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'vault;',
-					 s * 62, s * 78, '', 'S3 Glacier Vault', null, null, this.getTagsForStencil(gn, 's3 simple storage service glacier vault', dt).join(' ')),
+					 s * 62, s * 78, '', 'Archive', null, null, this.getTagsForStencil(gn, 's3 simple storage service glacier vault', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'bucket;',
-					 s * 75, s * 78, '', 'S3 Bucket', null, null, this.getTagsForStencil(gn, 's3 simple storage service bucket', dt).join(' ')),
+					 s * 75, s * 78, '', 'Bucket', null, null, this.getTagsForStencil(gn, 's3 simple storage service bucket', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'bucket_with_objects;',
-					 s * 75, s * 78, '', 'S3 Bucket with Objects', null, null, this.getTagsForStencil(gn, 's3 simple storage service bucket with objects', dt).join(' ')),
+					 s * 75, s * 78, '', 'Bucket with Objects', null, null, this.getTagsForStencil(gn, 's3 simple storage service bucket with objects', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'object;',
-					 s * 78, s * 78, '', 'S3 Object', null, null, this.getTagsForStencil(gn, 's3 simple storage service object', dt).join(' ')),
+					 s * 78, s * 78, '', 'Object', null, null, this.getTagsForStencil(gn, 's3 simple storage service object', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'import_export;',
 					 s * 78, s * 61, '', 'Snowball Import Export', null, null, this.getTagsForStencil(gn, 'snowball import export', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'cached_volume;',
-					 s * 62, s * 78, '', 'Storage Gateway Cached Volume', null, null, this.getTagsForStencil(gn, 'storage gateway cached volume', dt).join(' ')),
+					 s * 62, s * 78, '', 'Cached Volume', null, null, this.getTagsForStencil(gn, 'storage gateway cached volume', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'non_cached_volume;',
-					 s * 62, s * 78, '', 'Starge Gateway Non-Cached Volume', null, null, this.getTagsForStencil(gn, 'storage gateway non cached volume', dt).join(' ')),
+					 s * 62, s * 78, '', 'Non-Cached Volume', null, null, this.getTagsForStencil(gn, 'storage gateway non cached volume', dt).join(' ')),
 			 this.createVertexTemplateEntry(n + 'virtual_tape_library;',
-					 s * 62, s * 78, '', 'Starge Gateway Virtual Tape Library', null, null, this.getTagsForStencil(gn, 'storage gateway virtual tape library vtl', dt).join(' '))
+					 s * 62, s * 78, '', 'Virtual Tape Library', null, null, this.getTagsForStencil(gn, 'storage gateway virtual tape library vtl', dt).join(' '))
 		]);
 	};
 })();
--- a/src/main/webapp/js/diagramly/sidebar/Sidebar-Electrical.js
+++ b/src/main/webapp/js/diagramly/sidebar/Sidebar-Electrical.js
@ -91,9 +91,12 @@
 			this.createVertexTemplateEntry(meiecl + 'nor;', 66, 80, '', 'NOR (IEC)', null, null, this.getTagsForStencil(gnmeiecl, 'nor', dtmeiecl).join(' ')),
 			this.createVertexTemplateEntry(meiecl + 'not;', 66, 80, '', 'NOT (IEC)', null, null, this.getTagsForStencil(gnmeiecl, 'xor', dtmeiecl).join(' ')),
 			this.createVertexTemplateEntry(meiecl + 'xor;', 60, 80, '', 'XOR (IEC)', null, null, this.getTagsForStencil(gnmeiecl, 'xor', dtmeiecl).join(' ')),
-			this.createVertexTemplateEntry('shadow=0;dashed=0;align=center;fillColor=#ffffff;html=1;strokeWidth=1;shape=mxgraph.electrical.logic_gates.dual_inline_ic;', 
+			this.createVertexTemplateEntry(
+					'shadow=0;dashed=0;align=center;fillColor=#ffffff;html=1;strokeWidth=1;shape=mxgraph.electrical.logic_gates.dual_inline_ic;labelNames=a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t;', 
 					100, 200, 'IC', 'Dual In-Line IC', null, null, this.getTagsForStencil(gnmel, 'dual inline in line ic integrated circuit', dtmel).join(' ')),
-			this.createVertexTemplateEntry('shadow=0;dashed=0;align=center;fillColor=#ffffff;html=1;strokeWidth=1;shape=mxgraph.electrical.logic_gates.qfp_ic;', 
+			this.createVertexTemplateEntry(
+					'shadow=0;dashed=0;align=center;fillColor=#ffffff;html=1;strokeWidth=1;shape=mxgraph.electrical.logic_gates.qfp_ic;' + 
+					'labelNames=a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,a1,b1,c1,d1,e1,f1,g1,h1,i1,j1,k1,l1,m1,n1;', 
 					200, 200, 'IC', 'Quad Flat Package IC', null, null, this.getTagsForStencil(gnmel, 'quad flat package qfp ic integrated circuit', dtmel).join(' '))
 		]);

--- a/src/main/webapp/js/diagramly/sidebar/Sidebar-IBM.js
+++ b/src/main/webapp/js/diagramly/sidebar/Sidebar-IBM.js
@ -499,99 +499,168 @@
 		var gn = 'vpc virtual private cloud ';
 		
 		var fns = [
-			 this.createVertexTemplateEntry(s + 'ACLrules.svg;',
-					 d, d, '', 'ACL Rules', false, null, this.getTagsForStencil(gn, 'acl rules', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'BareMEtalServer.svg;',
+			 this.createVertexTemplateEntry(s + 'Instance.svg;',
+					 d, d, '', 'Instance', false, null, this.getTagsForStencil(gn, 'instance', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'LoadBalancer.svg;',
+					 d, d, '', 'Load Balancer', false, null, this.getTagsForStencil(gn, 'load balancer', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'BareMetalServer.svg;',
 					 d, d, '', 'Bare Metal Server', false, null, this.getTagsForStencil(gn, 'bare metal server', dt).join(' ')),
 			 this.createVertexTemplateEntry(s + 'BlockStorage.svg;',
 					 d, d, '', 'Block Storage', false, null, this.getTagsForStencil(gn, 'block storage', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Bridge.svg;',
-					 d, d, '', 'Bridge', false, null, this.getTagsForStencil(gn, 'bridge', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'DirectLink.svg;',
-					 d, d, '', 'Direct Link', false, null, this.getTagsForStencil(gn, 'direct link', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Enterprise.svg;',
-					 d, d, '', 'Enterprise', false, null, this.getTagsForStencil(gn, 'enterprise', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Firewall.svg;',
-					 d, d, '', 'Firewall', false, null, this.getTagsForStencil(gn, 'firewall', dt).join(' ')),
 			 this.createVertexTemplateEntry(s + 'FloatingIP.svg;',
 					 d, d, '', 'Floating IP', false, null, this.getTagsForStencil(gn, 'floating ip internet protocol', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'GatewayAppliance.svg;',
-					 d, d, '', 'Gateway Appliance', false, null, this.getTagsForStencil(gn, 'gateway appliance', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Image.svg;',
-					 d, d, '', 'Image', false, null, this.getTagsForStencil(gn, 'image', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Instance.svg;',
-					 d, d, '', 'Instance', false, null, this.getTagsForStencil(gn, 'instance', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Internet.svg;',
-					 d, d, '', 'Internet', false, null, this.getTagsForStencil(gn, 'internet', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'InternetServices.svg;',
-					 d, d, '', 'Internet Services', false, null, this.getTagsForStencil(gn, 'internet services', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Key.svg;',
-					 d, d, '', 'Key', false, null, this.getTagsForStencil(gn, 'key', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'LoadBalancer.svg;',
-					 d, d, '', 'Load Balancer', false, null, this.getTagsForStencil(gn, 'load balancer', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'Marketplace.svg;',
-					 d, d, '', 'Marketplace', false, null, this.getTagsForStencil(gn, 'marketplace', dt).join(' ')),
 			 this.createVertexTemplateEntry(s + 'PublicGateway.svg;',
 					 d, d, '', 'Public Gateway', false, null, this.getTagsForStencil(gn, 'public gateway', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'ObjectStorage.svg;',
+					 d, d, '', 'Object Storage', false, null, this.getTagsForStencil(gn, 'object storage', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'VPNConnection.svg;',
+					 d, d, '', 'VPN Connection', false, null, this.getTagsForStencil(gn, 'connection', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'VPNGateway.svg;',
+					 d, d, '', 'VPN Gateway', false, null, this.getTagsForStencil(gn, 'gateway', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'DirectLink.svg;',
+					 d, d, '', 'Direct Link', false, null, this.getTagsForStencil(gn, 'direct link', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'ImageService.svg;',
+					 d, d, '', 'Image Service', false, null, this.getTagsForStencil(gn, 'image service', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'LoadBalancerPool.svg;',
+					 d, d, '', 'Load Balancer Pool', false, null, this.getTagsForStencil(gn, 'load balancer pool', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'LoadBalancerListener.svg;',
+					 d, d, '', 'Load Balancer Listener', false, null, this.getTagsForStencil(gn, 'load balancer listener', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'Rules.svg;',
+					 d, d, '', 'Rules', false, null, this.getTagsForStencil(gn, 'load balancer listener', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'Key.svg;',
+					 d, d, '', 'Key', false, null, this.getTagsForStencil(gn, 'key', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'VPNPolicy.svg;',
+					 d, d, '', 'VPN Policy', false, null, this.getTagsForStencil(gn, 'policy', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'InternetServices2.svg;',
+					 d, d, '', 'Internet Services', false, null, this.getTagsForStencil(gn, 'internet services', dt).join(' ')),
 			 this.createVertexTemplateEntry(s + 'Router.svg;',
 					 d, d, '', 'Router', false, null, this.getTagsForStencil(gn, 'router', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'SecurityGroupRules.svg;',
-					 d, d, '', 'Security Group Rules', false, null, this.getTagsForStencil(gn, 'security group rules', dt).join(' ')),
-			 this.createVertexTemplateEntry(s + 'VPN.svg;',
-					 d, d, '', 'VPN', false, null, this.getTagsForStencil(gn, 'vpn virtual private network', dt).join(' ')),
-			 this.createVertexTemplateEntry('swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;dashed=0;strokeWidth=2;',
-					 200, 200, 'CLOUD UNIVERSE', 'Cloud Universe', true, null, this.getTagsForStencil(gn, '', dt).join(' ')),
-  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=none;endFill=0;rounded=0;strokeColor=#EEBC25;strokeWidth=2;', 
-  		 			 d, d, '', 'Data Connector', null, dt + 'data connector'),
-  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=classicThin;endFill=1;rounded=0;strokeColor=#0076BE;strokeWidth=2;', 
-  		 			 d, d, '', 'Directional Private Connector', null, dt + 'directional private connector'),
-  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=classicThin;endFill=1;rounded=0;strokeColor=#FD0000;strokeWidth=2;', 
-  		 			 d, d, '', 'Directional Public Connector', null, dt + 'directional public connector'),
+			 this.createVertexTemplateEntry(s + 'Bridge.svg;',
+					 d, d, '', 'Bridge', false, null, this.getTagsForStencil(gn, 'bridge', dt).join(' ')),
+					 
 			 this.addEntry(dt + 'ibm cloud', function()
 			 {
-				var bg1 = new mxCell('IBM CLOUD', new mxGeometry(0, 11, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;spacingTop=5;dashed=0;strokeWidth=2;');
+				var bg1 = new mxCell('IBM Cloud', new mxGeometry(0, 0, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;spacingTop=1;dashed=0;strokeWidth=1;');
 				bg1.vertex = true;
-				var bg2 = new mxCell('', new mxGeometry(20, -11, 30, 22), s + 'IBMCloud.svg;part=1;');
+				var bg2 = new mxCell('', new mxGeometry(0, 0, 30, 30), s + 'CloudTag.svg;part=1;');
 				bg2.vertex = true;
 			    bg1.insert(bg2);
 			    
-			   	return sb.createVertexTemplateFromCells([bg1], 200, 211, 'IBM Cloud');
+			   	return sb.createVertexTemplateFromCells([bg1], 200, 200, 'IBM Cloud');
 			 }),
-			 this.createVertexTemplateEntry('swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;dashed=0;strokeWidth=2;',
-					 200, 200, 'OTHER NETWORK', 'Cloud Universe', true, null, this.getTagsForStencil(gn, '', dt).join(' ')),
-  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=classicThin;endFill=1;rounded=0;strokeColor=#0076BE;strokeWidth=2;startArrow=classicThin;startFill=1;', 
-  		 			 d, d, '', 'Private Connector', null, dt + 'directional private connector'),
-  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=classicThin;endFill=1;rounded=0;strokeColor=#FD0000;strokeWidth=2;startArrow=classicThin;startFill=1;', 
-  		 			 d, d, '', 'Public Connector', null, dt + 'directional private connector'),
-			 this.createVertexTemplateEntry('swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;dashed=1;strokeWidth=2;',
-					 200, 200, 'REGION', 'Region', true, null, this.getTagsForStencil(gn, '', dt).join(' ')),
+					 
+			 this.addEntry(dt + '', function()
+			 {
+				var bg1 = new mxCell('VPC', new mxGeometry(0, 0, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;spacingTop=1;dashed=0;strokeWidth=1;');
+				bg1.vertex = true;
+				var bg2 = new mxCell('', new mxGeometry(0, 0, 30, 30), s + 'VPCTag.svg;part=1;');
+				bg2.vertex = true;
+			    bg1.insert(bg2);
+			    
+			   	return sb.createVertexTemplateFromCells([bg1], 200, 200, 'VPC');
+			 }),
+					 
+			 this.addEntry(dt + '', function()
+			 {
+				var bg1 = new mxCell('Region', new mxGeometry(0, 0, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=0;strokeColor=#00882B;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;dashed=1;strokeWidth=1;container=1;dashPattern=1 1;');
+				bg1.vertex = true;
+				var bg2 = new mxCell('', new mxGeometry(0, 0, 30, 30), s + 'RegionTag.svg;part=1;');
+				bg2.vertex = true;
+			    bg1.insert(bg2);
+			    
+			   	return sb.createVertexTemplateFromCells([bg1], 200, 200, 'Region');
+			 }),
+					 
+			 this.addEntry(dt + '', function()
+			 {
+				var bg1 = new mxCell('Zone', new mxGeometry(0, 0, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=0;strokeColor=#00882B;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;dashed=1;strokeWidth=1;container=1;');
+				bg1.vertex = true;
+				var bg2 = new mxCell('', new mxGeometry(0, 0, 30, 30), s + 'ZoneTag.svg;part=1;');
+				bg2.vertex = true;
+			    bg1.insert(bg2);
+			    
+			   	return sb.createVertexTemplateFromCells([bg1], 200, 200, 'Zone');
+			 }),
+					 
+			 this.addEntry(dt + '', function()
+			 {
+				var bg1 = new mxCell('Subnet', new mxGeometry(0, 0, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#2A8838;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;spacingTop=1;dashed=0;strokeWidth=1;');
+				bg1.vertex = true;
+				var bg2 = new mxCell('', new mxGeometry(0, 0, 30, 40), s + 'SubnetTag.svg;part=1;');
+				bg2.vertex = true;
+			    bg1.insert(bg2);
+			    
+			   	return sb.createVertexTemplateFromCells([bg1], 200, 200, 'Subnet');
+			 }),
+					 
 			 this.createVertexTemplateEntry(
-					 'rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=20;strokeColor=#FD0000;fillColor=none;fontColor=#417CB9;verticalAlign=top;align=center;spacingLeft=5;dashed=1;dashPattern=5 2;labelPosition=center;verticalLabelPosition=bottom;strokeWidth=2;',
-					 200, 200, 'SECURITY GROUP', 'Security Group', true, null, this.getTagsForStencil(gn, '', dt).join(' ')),
-			 this.createVertexTemplateEntry('swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;dashed=0;strokeWidth=2;',
-					 200, 200, 'SERVICES', 'Services', true, null, this.getTagsForStencil(gn, '', dt).join(' ')),
-			 this.addEntry(dt + 'subnet', function()
+					 'rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=0;strokeColor=#FD0000;fillColor=none;fontColor=#000000;verticalAlign=top;align=center;spacingLeft=5;dashed=1;dashPattern=5 2;labelPosition=center;verticalLabelPosition=bottom;strokeWidth=2;',
+					 200, 200, 'Security Group', 'Security Group', true, null, this.getTagsForStencil(gn, '', dt).join(' ')),
+
+			 this.addEntry(dt + '', function()
 			 {
-				var bg1 = new mxCell('SUBNET', new mxGeometry(0, 11, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#FD0000;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;spacingTop=8;dashed=0;strokeWidth=2;');
+				var bg1 = new mxCell('Classic Infrastructure', new mxGeometry(0, 0, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=0;strokeColor=#4376BB;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;dashed=0;strokeWidth=1;container=1;');
 				bg1.vertex = true;
-				var bg2 = new mxCell('', new mxGeometry(20, -11, 19, 26), s + 'Subnet.svg;part=1;');
-				bg2.vertex = true;
-				bg1.insert(bg2);
-			    
-			   	return sb.createVertexTemplateFromCells([bg1], 200, 211, 'Subnet');
-			 }),
-			 this.addEntry(dt + 'virtual private cloud', function()
-			 {
-				var bg1 = new mxCell('VIRTUAL PRIVATE CLOUD', new mxGeometry(0, 11, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;spacingTop=5;dashed=0;strokeWidth=2;');
-				bg1.vertex = true;
-				var bg2 = new mxCell('', new mxGeometry(20, -11, 30, 22), s + 'VirtualPrivateCloud.svg;part=1;');
+				var bg2 = new mxCell('', new mxGeometry(0, 0, 30, 30), s + 'ClassicInfrastructureTag.svg;part=1;');
 				bg2.vertex = true;
 			    bg1.insert(bg2);
 			    
-			   	return sb.createVertexTemplateFromCells([bg1], 200, 211, 'Virtual Private Cloud');
+			   	return sb.createVertexTemplateFromCells([bg1], 200, 200, 'Classic Infrastructure');
 			 }),
-			 this.createVertexTemplateEntry('swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=1;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fillColor=none;fontColor=#417CB9;verticalAlign=top;align=left;spacingLeft=5;dashed=1;strokeWidth=2;',
-					 200, 200, 'ZONE', 'Zone', true, null, this.getTagsForStencil(gn, '', dt).join(' '))
+					 
+			 this.createVertexTemplateEntry('swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=0;strokeColor=#4376BB;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;dashed=0;strokeWidth=1;container=1;',
+					 200, 200, 'Other Group', 'Other Group', true, null, this.getTagsForStencil(gn, '', dt).join(' ')),
+
+			 this.addEntry(dt + '', function()
+			 {
+				var bg1 = new mxCell('', new mxGeometry(0, 0, 320, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=0;strokeColor=#4376BB;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=5;dashed=0;strokeWidth=1;container=1;');
+				bg1.vertex = true;
+				var bg2 = new mxCell('Public', new mxGeometry(15, 0, 30, 30), 'aspect=fixed;perimeter=ellipsePerimeter;html=1;align=center;shadow=0;dashed=0;fontColor=#000000;labelBackgroundColor=none;fontSize=12;spacingTop=-5;image;image=img/lib/ibm/vpc/PublicTag.svg;part=1;');
+				bg2.vertex = true;
+			    bg1.insert(bg2);
+				var bg3 = new mxCell('Enterprise', new mxGeometry(275, 0, 30, 30), 'aspect=fixed;perimeter=ellipsePerimeter;html=1;align=center;shadow=0;dashed=0;fontColor=#000000;labelBackgroundColor=none;fontSize=12;spacingTop=-5;image;image=img/lib/ibm/vpc/EnterpriseTag.svg;part=1;');
+				bg3.vertex = true;
+			    bg1.insert(bg3);
+			    
+				var bg4 = new mxCell('IBM Cloud', new mxGeometry(60, 0, 200, 200), 'swimlane;fontStyle=0;horizontal=1;collapsible=0;startSize=28;swimlaneLine=0;swimlaneFillColor=none;fillColor=none;rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=12;strokeColor=#417CB9;fontColor=#000000;verticalAlign=top;align=left;spacingLeft=30;spacingTop=1;dashed=0;strokeWidth=1;');
+				bg4.vertex = true;
+			    bg1.insert(bg4);
+				var bg5 = new mxCell('', new mxGeometry(0, 0, 30, 30), s + 'CloudTag.svg;part=1;');
+				bg5.vertex = true;
+			    bg4.insert(bg5);
+			    
+			   	return sb.createVertexTemplateFromCells([bg1], 320, 200, 'Cloud Universe');
+			 }),
+					 
+
+			 this.createVertexTemplateEntry(s + 'CloudTag.svg;',
+					 d * 0.5, d * 0.5, '', 'IBM Cloud tag', false, null, this.getTagsForStencil(gn, 'cloud tag ibm', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'VPCTag.svg;',
+					 d * 0.5, d * 0.5, '', 'VPC tag', false, null, this.getTagsForStencil(gn, 'tag', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'RegionTag.svg;',
+					 d * 0.5, d * 0.5, '', 'Region tag', false, null, this.getTagsForStencil(gn, 'region tag', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'ZoneTag.svg;',
+					 d * 0.5, d * 0.5, '', 'Zone tag', false, null, this.getTagsForStencil(gn, 'zone tag', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'SubnetTag.svg;',
+					 d * 0.37, d * 0.5, '', 'Subnet tag', false, null, this.getTagsForStencil(gn, 'subnet tag', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'EnterpriseTag.svg;',
+					 d * 0.5, d * 0.5, '', 'Enterprise tag', false, null, this.getTagsForStencil(gn, 'enterprise tag', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'PublicTag.svg;',
+					 d * 0.5, d * 0.5, '', 'Public tag', false, null, this.getTagsForStencil(gn, 'public tag', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'ClassicInfrastructureTag.svg;',
+					 d * 0.5, d * 0.5, '', 'Classic Infrastructure tag', false, null, this.getTagsForStencil(gn, 'classic tag', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'Internet.svg;',
+					 d, d, '', 'Internet', false, null, this.getTagsForStencil(gn, 'internet', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'Enterprise.svg;',
+					 d, d, '', 'Data Center', false, null, this.getTagsForStencil(gn, 'dat acenter', dt).join(' ')),
+			 this.createVertexTemplateEntry(s + 'Enterprise2.svg;',
+					 d, d * 0.8, '', 'Enterprise', false, null, this.getTagsForStencil(gn, 'enterprise', dt).join(' ')),
+  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=classicThin;endFill=1;rounded=0;strokeColor=#000000;strokeWidth=1;startArrow=classicThin;startFill=1;', 
+  		 			 d, d, '', 'Bidirectional Connector', null, dt + 'bidirectional connector'),
+  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=classicThin;endFill=1;rounded=0;strokeColor=#000000;strokeWidth=1;', 
+  		 			 d, d, '', 'Directional Connector', null, dt + 'directional connector'),
+  		 	 this.createEdgeTemplateEntry('edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=none;endFill=0;rounded=0;strokeColor=#000000;strokeWidth=1;', 
+  		 			 d, d, '', 'Nondirectional Connector', null, dt + 'nondirectional connector')
 		];
 			   	
   		this.addPalette('ibmVPC', 'IBM / VPC', false, mxUtils.bind(this, function(content)
--- a/src/main/webapp/js/diagramly/sidebar/Sidebar.js
+++ b/src/main/webapp/js/diagramly/sidebar/Sidebar.js
@ -74,7 +74,7 @@
 	
 	Sidebar.prototype.aws4 = ['Arrows', 'General Resources', 'Illustrations', 'Groups', 'Analytics', 'Application Integration', 'AR VR', 'Cost Management', 'Blockchain', 
 							  'Business Applications', 'EC2 Instance Types', 'Compute', 'Customer Engagement',
-							  'Database', 'Desktop App Streaming', 'Developer Tools', 'Game Tech', 'Internet of Things', 'IoT Things', 'IoT Resources', 'Machine Learning', 'Management Governance',
+							  'Database', 'End User Computing', 'Developer Tools', 'Game Tech', 'Internet of Things', 'IoT Things', 'IoT Resources', 'Machine Learning', 'Management Governance',
 							  'Media Services', 'Migration Transfer', 'Mobile', 'Network Content Delivery', 'Robotics', 'Satellite', 'Security Identity Compliance', 'Storage'];

 	Sidebar.prototype.office = ['Clouds', 'Communications', 'Concepts', 'Databases', 'Devices', 'Security', 'Servers', 'Services', 'Sites', 'Users'];
--- a/src/main/webapp/js/extensions.min.js
+++ b/src/main/webapp/js/extensions.min.js
--- a/src/main/webapp/js/mxgraph/Dialogs.js
+++ b/src/main/webapp/js/mxgraph/Dialogs.js
@ -204,10 +204,9 @@ var ColorDialog = function(editorUi, color, apply, cancelFn)
 	var applyBtn = mxUtils.button(mxResources.get('apply'), function()
 	{
 		var color = input.value;
-		// https://stackoverflow.com/questions/8027423/how-to-check-if-a-string-is-a-valid-hex-color-representation/8027444
-		var colorValid  = /(^#?[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(color);
 		
-		if (colorValid)
+		// Blocks any non-alphabetic chars in colors
+		if (/(^#?[a-zA-Z0-9]*$)/.test(color))
 		{
 			ColorDialog.addRecentColor(color, 12);
 			
@ -216,10 +215,13 @@ var ColorDialog = function(editorUi, color, apply, cancelFn)
 				color = '#' + color;
 			}

-			applyFunction(color);			
+			applyFunction(color);
+			editorUi.hideDialog();
+		}
+		else
+		{
+			editorUi.handleError({message: mxResources.get('invalidInput')});	
 		}
-
-		editorUi.hideDialog();
 	});
 	applyBtn.className = 'geBtn gePrimaryBtn';
 	buttons.appendChild(applyBtn);
--- a/src/main/webapp/js/mxgraph/Editor.js
+++ b/src/main/webapp/js/mxgraph/Editor.js
@ -986,6 +986,116 @@ Dialog.prototype.close = function(cancel, isEsc)
 	this.container.parentNode.removeChild(this.container);
 };

+/**
+ * 
+ */
+var ErrorDialog = function(editorUi, title, message, buttonText, fn, retry, buttonText2, fn2, hide, buttonText3, fn3)
+{
+	hide = (hide != null) ? hide : true;
+	
+	var div = document.createElement('div');
+	div.style.textAlign = 'center';
+
+	if (title != null)
+	{
+		var hd = document.createElement('div');
+		hd.style.padding = '0px';
+		hd.style.margin = '0px';
+		hd.style.fontSize = '18px';
+		hd.style.paddingBottom = '16px';
+		hd.style.marginBottom = '10px';
+		hd.style.borderBottom = '1px solid #c0c0c0';
+		hd.style.color = 'gray';
+		hd.style.whiteSpace = 'nowrap';
+		hd.style.textOverflow = 'ellipsis';
+		hd.style.overflow = 'hidden';
+		mxUtils.write(hd, title);
+		hd.setAttribute('title', title);
+		div.appendChild(hd);
+	}
+
+	var p2 = document.createElement('div');
+	p2.style.lineHeight = '1.2em';
+	p2.style.padding = '6px';
+	p2.innerHTML = message;
+	div.appendChild(p2);
+	
+	var btns = document.createElement('div');
+	btns.style.marginTop = '12px';
+	btns.style.textAlign = 'center';
+	
+	if (retry != null)
+	{
+		var retryBtn = mxUtils.button(mxResources.get('tryAgain'), function()
+		{
+			editorUi.hideDialog();
+			retry();
+		});
+		retryBtn.className = 'geBtn';
+		btns.appendChild(retryBtn);
+		
+		btns.style.textAlign = 'center';
+	}
+	
+	if (buttonText3 != null)
+	{
+		var btn3 = mxUtils.button(buttonText3, function()
+		{
+			if (fn3 != null)
+			{
+				fn3();
+			}
+		});
+		
+		btn3.className = 'geBtn';
+		btns.appendChild(btn3);
+	}
+	
+	var btn = mxUtils.button(buttonText, function()
+	{
+		if (hide)
+		{
+			editorUi.hideDialog();
+		}
+		
+		if (fn != null)
+		{
+			fn();
+		}
+	});
+	
+	btn.className = 'geBtn';
+	btns.appendChild(btn);
+
+	if (buttonText2 != null)
+	{
+		var mainBtn = mxUtils.button(buttonText2, function()
+		{
+			if (hide)
+			{
+				editorUi.hideDialog();
+			}
+			
+			if (fn2 != null)
+			{
+				fn2();
+			}
+		});
+		
+		mainBtn.className = 'geBtn gePrimaryBtn';
+		btns.appendChild(mainBtn);
+	}
+
+	this.init = function()
+	{
+		btn.focus();
+	};
+	
+	div.appendChild(btns);
+
+	this.container = div;
+};
+
 /**
 * Constructs a new print dialog.
 */
--- a/src/main/webapp/js/mxgraph/EditorUi.js
+++ b/src/main/webapp/js/mxgraph/EditorUi.js
@ -3352,6 +3352,52 @@ EditorUi.prototype.addSplitHandler = function(elt, horizontal, dx, onChange)
 	});	
 };

+/**
+ * Translates this point by the given vector.
+ * 
+ * @param {number} dx X-coordinate of the translation.
+ * @param {number} dy Y-coordinate of the translation.
+ */
+EditorUi.prototype.handleError = function(resp, title, fn, invokeFnOnClose, notFoundMessage)
+{
+	var e = (resp != null && resp.error != null) ? resp.error : resp;
+
+	if (e != null || title != null)
+	{
+		var msg = mxUtils.htmlEntities(mxResources.get('unknownError'));
+		var btn = mxResources.get('ok');
+		title = (title != null) ? title : mxResources.get('error');
+		
+		if (e != null && e.message != null)
+		{
+			msg = mxUtils.htmlEntities(e.message);
+		}
+
+		this.showError(title, msg, btn, fn, null, null, null, null, null,
+			null, null, null, (invokeFnOnClose) ? fn : null);
+	}
+	else if (fn != null)
+	{
+		fn();
+	}
+};
+
+/**
+ * Translates this point by the given vector.
+ * 
+ * @param {number} dx X-coordinate of the translation.
+ * @param {number} dy Y-coordinate of the translation.
+ */
+EditorUi.prototype.showError = function(title, msg, btn, fn, retry, btn2, fn2, btn3, fn3, w, h, hide, onClose)
+{
+	var height = (msg != null && msg.length > 120) ? 180 : 150;
+	var dlg = new ErrorDialog(this, title, msg, btn || mxResources.get('ok'),
+		fn, retry, btn2, fn2, hide, btn3, fn3);
+	this.showDialog(dlg.container, w || 340, h || ((msg != null && msg.length > 120) ?
+		180 : 150), true, false, onClose);
+	dlg.init();
+};
+
 /**
 * Displays a print dialog.
 */
--- a/src/main/webapp/js/mxgraph/Format.js
+++ b/src/main/webapp/js/mxgraph/Format.js
@ -1034,9 +1034,8 @@ BaseFormatPanel.prototype.createColorOption = function(label, getColorFn, setCol
 	mxUtils.write(span, label);
 	div.appendChild(span);
 	
-	var applying = false;
 	var value = getColorFn();
-
+	var applying = false;
 	var btn = null;

 	var apply = function(color, disableUpdate, forceUpdate)
@ -1044,9 +1043,11 @@ BaseFormatPanel.prototype.createColorOption = function(label, getColorFn, setCol
 		if (!applying)
 		{
 			applying = true;
+			color = (/(^#?[a-zA-Z0-9]*$)/.test(color)) ? color : defaultColor;
 			btn.innerHTML = '<div style="width:' + ((mxClient.IS_QUIRKS) ? '30' : '36') +
 				'px;height:12px;margin:3px;border:1px solid black;background-color:' +
-				((color != null && color != mxConstants.NONE) ? color : defaultColor) + ';"></div>';
+				mxUtils.htmlEntities((color != null && color != mxConstants.NONE) ?
+				color : defaultColor) + ';"></div>';
 			
 			// Fine-tuning in Firefox, quirks mode and IE8 standards
 			if (mxClient.IS_QUIRKS || document.documentMode == 8)
--- a/src/main/webapp/js/shapes.min.js
+++ b/src/main/webapp/js/shapes.min.js
@ -2088,22 +2088,28 @@ mxShapeElectricalLogicGate.prototype.getConstraints=function(a){var d=[new mxCon
 mxShapeElectricalBuffer.prototype.customProperties=[{name:"negating",dispName:"Negating",type:"bool",defVal:0}];
 mxShapeElectricalBuffer.prototype.paintVertexShape=function(a,d,e,b,c){a.translate(d,e);a.begin();a.moveTo(0,.5*c);a.lineTo(.2*b,.5*c);a.moveTo(.8*b,.5*c);a.lineTo(b,.5*c);a.stroke();a.begin();a.moveTo(.2*b,0);a.lineTo(.8*b,.5*c);a.lineTo(.2*b,c);a.close();a.fillAndStroke();"1"==mxUtils.getValue(this.style,"negating","0")&&(d=Math.min(.04*b,.07*c),a.begin(),a.ellipse(.8*b,.5*c-.5*d,d,d),a.fillAndStroke())};mxCellRenderer.registerShape(mxShapeElectricalBuffer.prototype.cst.SHAPE_BUFFER2,mxShapeElectricalBuffer);
 mxShapeElectricalBuffer.prototype.constraints=[new mxConnectionConstraint(new mxPoint(0,.5),!0),new mxConnectionConstraint(new mxPoint(1,.5),!0)];function mxShapeElectricalDualInLineIC(a,d,e,b){mxShape.call(this);this.bounds=a;this.fill=d;this.stroke=e;this.strokewidth=null!=b?b:1}mxUtils.extend(mxShapeElectricalDualInLineIC,mxShape);mxShapeElectricalDualInLineIC.prototype.cst={SHAPE_DUAL_INLINE_IC:"mxgraph.electrical.logic_gates.dual_inline_ic"};
-mxShapeElectricalDualInLineIC.prototype.customProperties=[{name:"pinStyle",dispName:"Pin Style",type:"enum",defVal:"line",enumList:[{val:"line",dispName:"Line"},{val:"square",dispName:"Square"}]},{name:"startPin",dispName:"Starting Pin",type:"enum",defVal:"n",enumList:[{val:"n",dispName:"N"},{val:"e",dispName:"E"},{val:"s",dispName:"S"},{val:"w",dispName:"W"}]},{name:"pinSpacing",dispName:"Pin Spacing",type:"float",min:1,defVal:20}];
-mxShapeElectricalDualInLineIC.prototype.paintVertexShape=function(a,d,e,b,c){a.translate(d,e);d=mxUtils.getValue(this.style,"fontColor","#000000");a.setFontColor(d);d=mxUtils.getValue(this.style,"startPin","n");a.begin();"n"==d||"s"==d?a.rect(10,0,b-20,c):a.rect(0,10,b,c-20);a.fillAndStroke();e=parseFloat(mxUtils.getValue(this.style,"pinSpacing","20"));var f=mxUtils.getValue(this.style,"pinStyle","line"),g=parseFloat(mxUtils.getValue(this.style,"fontSize","12")),h="n"==d||"s"==d?parseInt(c/e):parseInt(b/
-e);if("line"==f){a.setFontSize(.8*g);f=1;g=.5*e;a.begin();if("n"==d||"s"==d)for(;f*e<=c;){a.moveTo(0,g);a.lineTo(10,g);a.moveTo(b-10,g);a.lineTo(b,g);var k="n"==d?f:h+f;a.text(20,g,0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);k="n"==d?2*h-f+1:h-f+1;a.text(b-20,g,0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);g+=e;f++}else for(;f*e<=b;)a.moveTo(g,0),a.lineTo(g,10),a.moveTo(g,c-10),a.lineTo(g,c),k="e"==d?h-f+1:2*h-f+1,a.text(g,20,
-0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),k="e"==d?h+f:f,a.text(g,c-20,0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),g+=e,f++;a.stroke()}else if(a.setFontSize(.5*g),f=1,g=.5*e,"n"==d||"s"==d)for(;f*e<=c;)a.begin(),a.rect(0,g-.25*e,10,.5*e),a.fillAndStroke(),a.begin(),a.rect(b-10,g-.25*e,10,.5*e),a.fillAndStroke(),k="n"==d?f:h+f,a.text(5,g+1,0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),k="n"==
-d?2*h-f+1:h-f+1,a.text(b-5,g+1,0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),g+=e,f++;else for(;f*e<=b;)a.begin(),a.rect(g-.25*e,0,.5*e,10),a.fillAndStroke(),a.begin(),a.rect(g-.25*e,c-10,.5*e,10),a.fillAndStroke(),k="e"==d?h-f+1:2*h-f+1,a.text(g,5,0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),k="e"==d?h+f:f,a.text(g,c-5,0,0,k.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),g+=e,f++;a.setShadow(!1);a.begin();
-switch(d){case "e":40<c&&(a.moveTo(b,.5*c-10),a.arcTo(12,12,0,0,0,b,.5*c+10));break;case "s":40<b&&(a.moveTo(.5*b-10,c),a.arcTo(12,12,0,0,1,.5*b+10,c));break;case "w":40<c&&(a.moveTo(0,.5*c-10),a.arcTo(12,12,0,0,1,0,.5*c+10));break;default:40<b&&(a.moveTo(.5*b-10,0),a.arcTo(12,12,0,0,0,.5*b+10,0))}a.stroke()};mxCellRenderer.registerShape(mxShapeElectricalDualInLineIC.prototype.cst.SHAPE_DUAL_INLINE_IC,mxShapeElectricalDualInLineIC);
+mxShapeElectricalDualInLineIC.prototype.customProperties=[{name:"pinStyle",dispName:"Pin Style",type:"enum",defVal:"line",enumList:[{val:"line",dispName:"Line"},{val:"square",dispName:"Square"}]},{name:"startPin",dispName:"Starting Pin",type:"enum",defVal:"n",enumList:[{val:"n",dispName:"N"},{val:"e",dispName:"E"},{val:"s",dispName:"S"},{val:"w",dispName:"W"}]},{name:"pinSpacing",dispName:"Pin Spacing",type:"float",min:1,defVal:20},{name:"pinLabelType",dispName:"Pin Label Type",type:"enum",defVal:"gen",
+enumList:[{val:"gen",dispName:"Generated"},{val:"cust",dispName:"Custom"}]},{name:"labelCount",dispName:"Number of Labels",type:"int",defVal:20,dependentProps:["labelNames"]},{name:"labelNames",dispName:"Label Names",type:"staticArr",subType:"string",sizeProperty:"labelCount",subDefVal:"a"}];
+mxShapeElectricalDualInLineIC.prototype.paintVertexShape=function(a,d,e,b,c){a.translate(d,e);d=mxUtils.getValue(this.style,"fontColor","#000000");a.setFontColor(d);d=mxUtils.getValue(this.style,"startPin","n");e=mxUtils.getValue(this.style,"pinLabelType","gen");var f=mxUtils.getValue(this.style,"labelNames","").toString().split(",");a.begin();"n"==d||"s"==d?a.rect(10,0,b-20,c):a.rect(0,10,b,c-20);a.fillAndStroke();var g=parseFloat(mxUtils.getValue(this.style,"pinSpacing","20")),h=mxUtils.getValue(this.style,
+"pinStyle","line"),k=parseFloat(mxUtils.getValue(this.style,"fontSize","12")),l="n"==d||"s"==d?parseInt(c/g):parseInt(b/g);if("line"==h){a.setFontSize(.8*k);h=1;k=.5*g;a.begin();if("n"==d||"s"==d)for(;h*g<=c;){a.moveTo(0,k);a.lineTo(10,k);a.moveTo(b-10,k);a.lineTo(b,k);var m="n"==d?h:l+h;"gen"==e?a.text(20,k,0,0,m.toString(),mxConstants.ALIGN_LEFT,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(20,k,0,0,f[m-1].toString(),mxConstants.ALIGN_LEFT,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);m=
+"n"==d?2*l-h+1:l-h+1;"gen"==e?a.text(b-20,k,0,0,m.toString(),mxConstants.ALIGN_RIGHT,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(b-20,k,0,0,f[m-1].toString(),mxConstants.ALIGN_RIGHT,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);k+=g;h++}else for(;h*g<=b;)a.moveTo(k,0),a.lineTo(k,10),a.moveTo(k,c-10),a.lineTo(k,c),m="e"==d?l-h+1:2*l-h+1,"gen"==e?a.text(k,20,0,0,m.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(k,20,0,0,f[m-1].toString(),mxConstants.ALIGN_CENTER,
+mxConstants.ALIGN_MIDDLE,0,null,0,0,0),m="e"==d?l+h:h,"gen"==e?a.text(k,c-20,0,0,m.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(k,c-20,0,0,f[m-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),k+=g,h++;a.stroke()}else if(a.setFontSize(.5*k),h=1,k=.5*g,"n"==d||"s"==d)for(;h*g<=c;)a.begin(),a.rect(0,k-.25*g,10,.5*g),a.fillAndStroke(),a.begin(),a.rect(b-10,k-.25*g,10,.5*g),a.fillAndStroke(),m="n"==d?h:l+h,"gen"==e?a.text(5,
+k+1,0,0,m.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(5,k+1,0,0,f[m-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),m="n"==d?2*l-h+1:l-h+1,"gen"==e?a.text(b-5,k+1,0,0,m.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(b-5,k+1,0,0,f[m-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),k+=g,h++;else for(;h*g<=b;)a.begin(),a.rect(k-.25*g,0,.5*g,10),
+a.fillAndStroke(),a.begin(),a.rect(k-.25*g,c-10,.5*g,10),a.fillAndStroke(),m="e"==d?l-h+1:2*l-h+1,"gen"==e?a.text(k,5,0,0,m.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(k,5,0,0,f[m-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0),m="e"==d?l+h:h,"gen"==e?a.text(k,c-5,0,0,m.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):m-1<f.length&&a.text(k,c-5,0,0,f[m-1].toString(),mxConstants.ALIGN_CENTER,
+mxConstants.ALIGN_MIDDLE,0,null,0,0,0),k+=g,h++;a.setShadow(!1);a.begin();switch(d){case "e":40<c&&(a.moveTo(b,.5*c-10),a.arcTo(12,12,0,0,0,b,.5*c+10));break;case "s":40<b&&(a.moveTo(.5*b-10,c),a.arcTo(12,12,0,0,1,.5*b+10,c));break;case "w":40<c&&(a.moveTo(0,.5*c-10),a.arcTo(12,12,0,0,1,0,.5*c+10));break;default:40<b&&(a.moveTo(.5*b-10,0),a.arcTo(12,12,0,0,0,.5*b+10,0))}a.stroke()};mxCellRenderer.registerShape(mxShapeElectricalDualInLineIC.prototype.cst.SHAPE_DUAL_INLINE_IC,mxShapeElectricalDualInLineIC);
 mxShapeElectricalDualInLineIC.prototype.getConstraints=function(a,d,e){a=[];var b=parseFloat(mxUtils.getValue(this.style,"pinSpacing","20")),c=mxUtils.getValue(this.style,"startPin","n"),f=1,g=.5*b;parseInt(e/b);if("n"==c||"s"==c)for(;f*b<=e;)a.push(new mxConnectionConstraint(new mxPoint(0,0),!1,null,0,g)),a.push(new mxConnectionConstraint(new mxPoint(1,0),!1,null,0,g)),g+=b,f++;else for(;f*b<=d;)a.push(new mxConnectionConstraint(new mxPoint(0,0),!1,null,g,0)),a.push(new mxConnectionConstraint(new mxPoint(0,
 1),!1,null,g,0)),g+=b,f++;return a};function mxShapeElectricalQFPIC(a,d,e,b){mxShape.call(this);this.bounds=a;this.fill=d;this.stroke=e;this.strokewidth=null!=b?b:1}mxUtils.extend(mxShapeElectricalQFPIC,mxShape);mxShapeElectricalQFPIC.prototype.cst={SHAPE_QFP_IC:"mxgraph.electrical.logic_gates.qfp_ic"};
-mxShapeElectricalQFPIC.prototype.customProperties=[{name:"pinStyle",dispName:"Pin Style",type:"enum",defVal:"line",enumList:[{val:"line",dispName:"Line"},{val:"square",dispName:"Square"}]},{name:"startPin",dispName:"Starting Pin",type:"enum",defVal:"sw",enumList:[{val:"sw",dispName:"SW"},{val:"nw",dispName:"NW"},{val:"ne",dispName:"NE"},{val:"se",dispName:"SE"}]},{name:"pinSpacing",dispName:"Pin Spacing",type:"float",min:1,defVal:20}];
-mxShapeElectricalQFPIC.prototype.paintVertexShape=function(a,d,e,b,c){a.translate(d,e);a.begin();a.moveTo(15,10);a.lineTo(b-15,10);a.lineTo(b-10,15);a.lineTo(b-10,c-15);a.lineTo(b-15,c-10);a.lineTo(15,c-10);a.lineTo(10,c-15);a.lineTo(10,15);a.close();a.fillAndStroke();d=parseFloat(mxUtils.getValue(this.style,"pinSpacing","20"));var f=mxUtils.getValue(this.style,"pinStyle","line"),g=parseFloat(mxUtils.getValue(this.style,"fontSize","12"));e=mxUtils.getValue(this.style,"fontColor","#000000");a.setFontColor(e);
-e=mxUtils.getValue(this.style,"startPin","sw");if("line"==f){a.setFontSize(.8*g);f=1;g=.5*d+20;a.begin();for(var h=parseInt((c-d-40)/d)+1,k=parseInt((b-d-40)/d)+1;g<=c-.5*d-20;){a.moveTo(0,g);a.lineTo(10,g);a.moveTo(b-10,g);a.lineTo(b,g);switch(e){case "nw":var l=f;break;case "ne":l=k+f;break;case "se":l=h+k+f;break;default:l=h+2*k+f}a.text(20,g,0,0,l.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(e){case "nw":l=k+2*h-f+1;break;case "ne":l=2*k+2*h-f+1;break;case "se":l=
-h-f+1;break;default:l=k+h-f+1}a.text(b-20,g,0,0,l.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);g+=d;f++}f=1;for(g=.5*d+20;g<=b-.5*d-20;){a.moveTo(g,0);a.lineTo(g,10);a.moveTo(g,c-10);a.lineTo(g,c);switch(e){case "nw":l=h+f;break;case "ne":l=h+k+f;break;case "se":l=2*h+k+f;break;default:l=f}a.text(g,c-20,0,0,l.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(e){case "nw":l=2*k+2*h-f+1;break;case "ne":l=k-f+1;break;case "se":l=k+h-f+1;break;
-default:l=2*k+h-f+1}a.text(g,20,0,0,l.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);g+=d;f++}a.stroke()}else{a.setFontSize(.5*g);f=1;g=.5*d+20;h=parseInt((c-d-40)/d)+1;for(k=parseInt((b-d-40)/d)+1;g<=c-.5*d-20;){a.begin();a.rect(0,g-.25*d,10,.5*d);a.fillAndStroke();a.begin();a.rect(b-10,g-.25*d,10,.5*d);a.fillAndStroke();switch(e){case "nw":l=f;break;case "ne":l=k+f;break;case "se":l=h+k+f;break;default:l=h+2*k+f}a.text(5,g+1,0,0,l.toString(),mxConstants.ALIGN_CENTER,
-mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(e){case "nw":l=k+2*h-f+1;break;case "ne":l=2*k+2*h-f+1;break;case "se":l=h-f+1;break;default:l=k+h-f+1}a.text(b-5,g+1,0,0,l.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);g+=d;f++}f=1;for(g=.5*d+20;g<=b-.5*d-20;){a.begin();a.rect(g-.25*d,0,.5*d,10);a.fillAndStroke();a.begin();a.rect(g-.25*d,c-10,.5*d,10);a.fillAndStroke();switch(e){case "nw":l=h+f;break;case "ne":l=h+k+f;break;case "se":l=2*h+k+f;break;default:l=f}a.text(g,
-c-4,0,0,l.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(e){case "nw":l=2*k+2*h-f+1;break;case "ne":l=k-f+1;break;case "se":l=k+h-f+1;break;default:l=2*k+h-f+1}a.text(g,6,0,0,l.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);g+=d;f++}}a.setShadow(!1);if(40<b){a.setFillColor(mxUtils.getValue(this.style,"strokeColor","#000000"));a.begin();switch(e){case "nw":a.ellipse(15,15,10,10);break;case "ne":a.ellipse(b-25,15,10,10);break;case "se":a.ellipse(b-
-25,c-25,10,10);break;default:a.ellipse(15,c-25,10,10)}a.fillAndStroke()}};mxCellRenderer.registerShape(mxShapeElectricalQFPIC.prototype.cst.SHAPE_QFP_IC,mxShapeElectricalQFPIC);
+mxShapeElectricalQFPIC.prototype.customProperties=[{name:"pinStyle",dispName:"Pin Style",type:"enum",defVal:"line",enumList:[{val:"line",dispName:"Line"},{val:"square",dispName:"Square"}]},{name:"startPin",dispName:"Starting Pin",type:"enum",defVal:"sw",enumList:[{val:"sw",dispName:"SW"},{val:"nw",dispName:"NW"},{val:"ne",dispName:"NE"},{val:"se",dispName:"SE"}]},{name:"pinSpacing",dispName:"Pin Spacing",type:"float",min:1,defVal:20},{name:"pinLabelType",dispName:"Pin Label Type",type:"enum",defVal:"gen",
+enumList:[{val:"gen",dispName:"Generated"},{val:"cust",dispName:"Custom"}]},{name:"labelCount",dispName:"Number of Labels",type:"int",defVal:40,dependentProps:["labelNames"]},{name:"labelNames",dispName:"Label Names",type:"staticArr",subType:"string",sizeProperty:"labelCount",subDefVal:"a"}];
+mxShapeElectricalQFPIC.prototype.paintVertexShape=function(a,d,e,b,c){a.translate(d,e);a.begin();a.moveTo(15,10);a.lineTo(b-15,10);a.lineTo(b-10,15);a.lineTo(b-10,c-15);a.lineTo(b-15,c-10);a.lineTo(15,c-10);a.lineTo(10,c-15);a.lineTo(10,15);a.close();a.fillAndStroke();d=parseFloat(mxUtils.getValue(this.style,"pinSpacing","20"));var f=mxUtils.getValue(this.style,"pinStyle","line");e=mxUtils.getValue(this.style,"pinLabelType","gen");var g=mxUtils.getValue(this.style,"labelNames","").toString().split(","),
+h=parseFloat(mxUtils.getValue(this.style,"fontSize","12")),k=mxUtils.getValue(this.style,"fontColor","#000000");a.setFontColor(k);k=mxUtils.getValue(this.style,"startPin","sw");if("line"==f){a.setFontSize(.8*h);f=1;h=.5*d+20;a.begin();for(var l=parseInt((c-d-40)/d)+1,m=parseInt((b-d-40)/d)+1;h<=c-.5*d-20;){a.moveTo(0,h);a.lineTo(10,h);a.moveTo(b-10,h);a.lineTo(b,h);switch(k){case "nw":var n=f;break;case "ne":n=m+f;break;case "se":n=l+m+f;break;default:n=l+2*m+f}"gen"==e?a.text(20,h,0,0,n.toString(),
+mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):n-1<g.length&&a.text(20,h,0,0,g[n-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(k){case "nw":n=m+2*l-f+1;break;case "ne":n=2*m+2*l-f+1;break;case "se":n=l-f+1;break;default:n=m+l-f+1}"gen"==e?a.text(b-20,h,0,0,n.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):n-1<g.length&&a.text(b-20,h,0,0,g[n-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,
+0);h+=d;f++}f=1;for(h=.5*d+20;h<=b-.5*d-20;){a.moveTo(h,0);a.lineTo(h,10);a.moveTo(h,c-10);a.lineTo(h,c);switch(k){case "nw":n=l+f;break;case "ne":n=l+m+f;break;case "se":n=2*l+m+f;break;default:n=f}"gen"==e?a.text(h,c-20,0,0,n.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):n-1<g.length&&a.text(h,c-20,0,0,g[n-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(k){case "nw":n=2*m+2*l-f+1;break;case "ne":n=m-f+1;break;case "se":n=m+l-f+1;
+break;default:n=2*m+l-f+1}"gen"==e?a.text(h,20,0,0,n.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):n-1<g.length&&a.text(h,20,0,0,g[n-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);h+=d;f++}a.stroke()}else{a.setFontSize(.5*h);f=1;h=.5*d+20;l=parseInt((c-d-40)/d)+1;for(m=parseInt((b-d-40)/d)+1;h<=c-.5*d-20;){a.begin();a.rect(0,h-.25*d,10,.5*d);a.fillAndStroke();a.begin();a.rect(b-10,h-.25*d,10,.5*d);a.fillAndStroke();switch(k){case "nw":n=
+f;break;case "ne":n=m+f;break;case "se":n=l+m+f;break;default:n=l+2*m+f}"gen"==e?a.text(5,h+1,0,0,n.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):n-1<g.length&&a.text(5,h+1,0,0,g[n-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(k){case "nw":n=m+2*l-f+1;break;case "ne":n=2*m+2*l-f+1;break;case "se":n=l-f+1;break;default:n=m+l-f+1}"gen"==e?a.text(b-5,h+1,0,0,n.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):
+n-1<g.length&&a.text(b-5,h+1,0,0,g[n-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);h+=d;f++}f=1;for(h=.5*d+20;h<=b-.5*d-20;){a.begin();a.rect(h-.25*d,0,.5*d,10);a.fillAndStroke();a.begin();a.rect(h-.25*d,c-10,.5*d,10);a.fillAndStroke();switch(k){case "nw":n=l+f;break;case "ne":n=l+m+f;break;case "se":n=2*l+m+f;break;default:n=f}"gen"==e?a.text(h,c-4,0,0,n.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):n-1<g.length&&a.text(h,c-4,0,0,g[n-1].toString(),
+mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);switch(k){case "nw":n=2*m+2*l-f+1;break;case "ne":n=m-f+1;break;case "se":n=m+l-f+1;break;default:n=2*m+l-f+1}"gen"==e?a.text(h,6,0,0,n.toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0):n-1<g.length&&a.text(h,6,0,0,g[n-1].toString(),mxConstants.ALIGN_CENTER,mxConstants.ALIGN_MIDDLE,0,null,0,0,0);h+=d;f++}}a.setShadow(!1);if(40<b){a.setFillColor(mxUtils.getValue(this.style,"strokeColor","#000000"));a.begin();switch(k){case "nw":a.ellipse(15,
+15,10,10);break;case "ne":a.ellipse(b-25,15,10,10);break;case "se":a.ellipse(b-25,c-25,10,10);break;default:a.ellipse(15,c-25,10,10)}a.fillAndStroke()}};mxCellRenderer.registerShape(mxShapeElectricalQFPIC.prototype.cst.SHAPE_QFP_IC,mxShapeElectricalQFPIC);
 mxShapeElectricalQFPIC.prototype.getConstraints=function(a,d,e){a=[];var b=parseFloat(mxUtils.getValue(this.style,"pinSpacing","20")),c=.5*b+20;for(parseInt(e/b);c<=e-.5*b-20;)a.push(new mxConnectionConstraint(new mxPoint(0,0),!1,null,0,c)),a.push(new mxConnectionConstraint(new mxPoint(1,0),!1,null,0,c)),c+=b;for(c=.5*b+20;c<=d-.5*b-20;)a.push(new mxConnectionConstraint(new mxPoint(0,0),!1,null,c,0)),a.push(new mxConnectionConstraint(new mxPoint(0,1),!1,null,c,0)),c+=b;return a};
 function mxShapeElectricalMux(a,d,e,b){mxShape.call(this);this.bounds=a;this.fill=d;this.stroke=e;this.strokewidth=null!=b?b:1}mxUtils.extend(mxShapeElectricalMux,mxShape);mxShapeElectricalMux.prototype.cst={SHAPE_MUX:"mxgraph.electrical.abstract.mux2"};
 mxShapeElectricalMux.prototype.customProperties=[{name:"operation",dispName:"Operation",type:"enum",defVal:"mux",enumList:[{val:"mux",dispName:"Mux"},{val:"demux",dispName:"Demux"}]},{name:"selectorPins",dispName:"Selector Pins",type:"int",min:1,max:8,defVal:1}];
--- a/src/main/webapp/js/stencils.min.js
+++ b/src/main/webapp/js/stencils.min.js
--- a/src/main/webapp/js/viewer.min.js
+++ b/src/main/webapp/js/viewer.min.js
--- a/src/main/webapp/resources/dia.txt
+++ b/src/main/webapp/resources/dia.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_am.txt
+++ b/src/main/webapp/resources/dia_am.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_ar.txt
+++ b/src/main/webapp/resources/dia_ar.txt
@ -388,6 +388,7 @@ insertText=‫إضافة نص‬
 inserting=‫إضافة‬
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=‫اسم غير صالح‬
 invalidOrMissingFile=‫ملف غير صالح أو غير موجود‬
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_bg.txt
+++ b/src/main/webapp/resources/dia_bg.txt
@ -388,6 +388,7 @@ insertText=Вмъкване на текст
 inserting=Вмъкване 
 invalidFilename=Диаграмата не трябва да съдържа следните символи: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Вашият лиценз не е валиден. Моля вижте тук <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Невалидно име
 invalidOrMissingFile=Невалиден или липсващ файл
 invalidPublicUrl=Невалиден публичен URL
--- a/src/main/webapp/resources/dia_bn.txt
+++ b/src/main/webapp/resources/dia_bn.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_bs.txt
+++ b/src/main/webapp/resources/dia_bs.txt
@ -388,6 +388,7 @@ insertText=Umetni tekst
 inserting=Umetanje
 invalidFilename=Imena dijagrama ne smiju sadržavati sljedeće znakove: \ / | : ; { < & + ? = "
 invalidLicenseSeeThisPage=Vaša licenca nije validna, molimo pogledajte ovo <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Netačan naziv
 invalidOrMissingFile=Neispravan ili nepostojeći fajl
 invalidPublicUrl=Neispravan javni URL
--- a/src/main/webapp/resources/dia_ca.txt
+++ b/src/main/webapp/resources/dia_ca.txt
@ -388,6 +388,7 @@ insertText=Afegeix text
 inserting=Afegint
 invalidFilename=Els noms dels diagrames no poden contenir els següents caràcters: \ / | : ; { < & + ? = "
 invalidLicenseSeeThisPage=La teva llicència no és vàlida, si us plau mira això <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nom invàlid
 invalidOrMissingFile=Fitxer  no vàlid o desconegut
 invalidPublicUrl=URL públic no vàlid
--- a/src/main/webapp/resources/dia_cs.txt
+++ b/src/main/webapp/resources/dia_cs.txt
@ -388,6 +388,7 @@ insertText=Vložit text
 inserting=Vkládání
 invalidFilename=Jména diagramů nesmí obsahovat tyto znaky: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Vaše licence je neplatná, podívejte se prosím na tuto <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">stránku</a>.
+invalidInput=Invalid input
 invalidName=Neplatný název
 invalidOrMissingFile=Neplatný nebo chybějící soubor
 invalidPublicUrl=neplatné veřejné URL
--- a/src/main/webapp/resources/dia_da.txt
+++ b/src/main/webapp/resources/dia_da.txt
@ -388,6 +388,7 @@ insertText=Indsæt tekst
 inserting=Indsætter
 invalidFilename=Diagramnavn må ikke indeholde de følgende tegn: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Din licens er ugyldig, se venligst <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">side</a>.
+invalidInput=Invalid input
 invalidName=Ugyldigt navn
 invalidOrMissingFile=Ugyldig eller manglende fil
 invalidPublicUrl=Ugyldig offentlig URL
--- a/src/main/webapp/resources/dia_de.txt
+++ b/src/main/webapp/resources/dia_de.txt
@ -388,6 +388,7 @@ insertText=Text einfügen
 inserting=Wird eingefügt
 invalidFilename=Diagramm Namen dürfen keine der folgenden Zeichen enthalten\ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Ihre Lizenz ist ungültig, bitte besuchen Sie diese <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">Seite</a>.
+invalidInput=Ungültige Eingabe
 invalidName=Ungültiger Name
 invalidOrMissingFile=Ungültige oder fehlende Datei
 invalidPublicUrl=Ungültige öffentliche URL
--- a/src/main/webapp/resources/dia_el.txt
+++ b/src/main/webapp/resources/dia_el.txt
@ -388,6 +388,7 @@ insertText=Εισαγωγή κειμένου
 inserting=Εισάγοντας
 invalidFilename=Το όνομα του διαγράμματος δεν πρέπει να περιέχει τους παρακάτω χρακτήρες: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Η άδεια χρήσης σας δεν είναι έγκυρη, παρακαλώ δείτε αυτό  <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Μη έγκυρο όνομα
 invalidOrMissingFile=Μη έγκυρο ή ανύπαρκτο αρχείο
 invalidPublicUrl=Μη έγκυρο δημόσιο URL
--- a/src/main/webapp/resources/dia_eo.txt
+++ b/src/main/webapp/resources/dia_eo.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_es.txt
+++ b/src/main/webapp/resources/dia_es.txt
@ -388,6 +388,7 @@ insertText=Insertar texto
 inserting=Insertando
 invalidFilename=Los nombres de los diagramas no deben contener los siguientes caracteres: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Su licencia es inválida, por favor vea esta <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">página</a>.
+invalidInput=Invalid input
 invalidName=Nombre inválido
 invalidOrMissingFile=Archivo inválido o no encontrado
 invalidPublicUrl=URL pública inválida
--- a/src/main/webapp/resources/dia_et.txt
+++ b/src/main/webapp/resources/dia_et.txt
@ -388,6 +388,7 @@ insertText=Sisesta tekst
 inserting=Sisestamine
 invalidFilename=Diagrammi nimed ei tohi sisaldada järgnevaid tähemärke:  \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Sinu litsents on kehtete, palun vaata seda <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">lehte</a>.
+invalidInput=Invalid input
 invalidName=Kehtetu nimi
 invalidOrMissingFile=Kehtetu või puuduv fail
 invalidPublicUrl=Kehtetu avalik URL
--- a/src/main/webapp/resources/dia_fa.txt
+++ b/src/main/webapp/resources/dia_fa.txt
@ -388,6 +388,7 @@ insertText=‫وارد کردن متن‬
 inserting=‫وارد کردن‬
 invalidFilename=‫نامهای نمودارها نباید شامل کاراکترهای زیر باشد:  \ / | : ; { } < > & + ? = "‬
 invalidLicenseSeeThisPage=‫مجوز شما نامعتبر است. لطفا این بخش را ببینید <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">صفحه</a>.‬
+invalidInput=Invalid input
 invalidName=‫نام نامعتبر‬
 invalidOrMissingFile=‫فایل یا غیرمعتبر است یا وجود ندارد‬
 invalidPublicUrl=‫URL عمومی غیرمعتبر است‬
--- a/src/main/webapp/resources/dia_fi.txt
+++ b/src/main/webapp/resources/dia_fi.txt
@ -388,6 +388,7 @@ insertText=Lisää tekstiä
 inserting=Lisätään
 invalidFilename=Kaavioiden nimet eivät saa sisältää seuraavia merkkejä : \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Lisenssi on virheellinen, ole hyvä ja katso tämä <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Virheellinen nimi
 invalidOrMissingFile=Epäkelvollinen tai puuttuva tiedosto
 invalidPublicUrl=Epäkelvollinen julkinen URL
--- a/src/main/webapp/resources/dia_fil.txt
+++ b/src/main/webapp/resources/dia_fil.txt
@ -388,6 +388,7 @@ insertText=Magsingit ng teksto
 inserting=Nagsisingit
 invalidFilename=Ang pangalan ng mga Dayagram ay hindi maaaring magtaglay ng sumusunod na mga simbolo: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Ang iyong lisensya ay di wasto. Pki-tingnan ito <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Di wastong pangalan
 invalidOrMissingFile=Di wasto o nawawalang File
 invalidPublicUrl=Di wastong pampublikong File
--- a/src/main/webapp/resources/dia_fr.txt
+++ b/src/main/webapp/resources/dia_fr.txt
@ -388,6 +388,7 @@ insertText=Insérer du texte
 inserting=Insertion
 invalidFilename=Le nom des diagrammes ne doit pas contenir les caractères suivants : \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Votre licence n'est pas valide, veuillez vous rendre sur la page suivante <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nom invalide
 invalidOrMissingFile=Fichier invalide ou manquant
 invalidPublicUrl=URL public invalide
--- a/src/main/webapp/resources/dia_gu.txt
+++ b/src/main/webapp/resources/dia_gu.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_he.txt
+++ b/src/main/webapp/resources/dia_he.txt
@ -388,6 +388,7 @@ insertText=‫הוספת טקסט‬
 inserting=‫מוסיף‬
 invalidFilename=‫שם הדיאגרמה אינו יכול לכלול את התווים הבאים:  \ / | : ; { } < > & + ? = "‬
 invalidLicenseSeeThisPage=‫הרשיון שלך אינו תקף. בדוק ב <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>‬
+invalidInput=Invalid input
 invalidName=‫שם לא תקין‬
 invalidOrMissingFile=‫קובץ חסר או לא תקין‬
 invalidPublicUrl=‫כתובת URL ציבורית לא תקינה‬
--- a/src/main/webapp/resources/dia_hi.txt
+++ b/src/main/webapp/resources/dia_hi.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_hr.txt
+++ b/src/main/webapp/resources/dia_hr.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_hu.txt
+++ b/src/main/webapp/resources/dia_hu.txt
@ -388,6 +388,7 @@ insertText=Szöveget beszúr
 inserting=Beszúrás
 invalidFilename=A diagram nem tartalmazhatja a következő betűket: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Az engedélye érvénytelen, kérjük tekintse meg ezt <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Érvénytelen név
 invalidOrMissingFile=Érvénytelen vagy hiányzó fájl
 invalidPublicUrl=Érvénytelen nyilvános URL
--- a/src/main/webapp/resources/dia_i18n.txt
+++ b/src/main/webapp/resources/dia_i18n.txt
@ -388,6 +388,7 @@ insertText=insertText
 inserting=inserting
 invalidFilename=invalidFilename
 invalidLicenseSeeThisPage=invalidLicenseSeeThisPage
+invalidInput=invalidInput
 invalidName=invalidName
 invalidOrMissingFile=invalidOrMissingFile
 invalidPublicUrl=invalidPublicUrl
--- a/src/main/webapp/resources/dia_id.txt
+++ b/src/main/webapp/resources/dia_id.txt
@ -388,6 +388,7 @@ insertText=Sisipkan Teks
 inserting=Menyisipkan
 invalidFilename=Nama diagram tidak boleh mengandung karakter berikut: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Lisensi Anda tidak valid, harap baca tautan ini <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nama tidak valid
 invalidOrMissingFile=Berkas tidak valid atau hilang
 invalidPublicUrl=URL publik tidak valid
--- a/src/main/webapp/resources/dia_it.txt
+++ b/src/main/webapp/resources/dia_it.txt
@ -388,6 +388,7 @@ insertText=Inserisci testo
 inserting=Inserimento in corso
 invalidFilename=Il nome del diagramma non può contenere i seguenti caratteri:  \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=La tua licenza è invalida. Perfavore leggi questo <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nome non valido
 invalidOrMissingFile=File mancante o non valido
 invalidPublicUrl=URL pubblico invalido
--- a/src/main/webapp/resources/dia_ja.txt
+++ b/src/main/webapp/resources/dia_ja.txt
@ -388,6 +388,7 @@ insertText=テキスト
 inserting=挿入中
 invalidFilename=ダイアグラム名に次の文字を含めることはできません。 \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=あなたの免許証が有効ではない、これを参照してください<a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=無効な名前です
 invalidOrMissingFile=無効または不明なファイル
 invalidPublicUrl=無効なパブリック URL
--- a/src/main/webapp/resources/dia_kn.txt
+++ b/src/main/webapp/resources/dia_kn.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_ko.txt
+++ b/src/main/webapp/resources/dia_ko.txt
@ -388,6 +388,7 @@ insertText=텍스트 삽입
 inserting=삽입중
 invalidFilename=다이어그램 이름에 다음 문자들은 사용될 수 없습니다. \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=라이선스가 유효하지 않습니다. <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">페이지</a>를 확인해 주시기 바랍니다.
+invalidInput=Invalid input
 invalidName=유효하지 않은 이름
 invalidOrMissingFile=유효하지 않거나 분실된 파일
 invalidPublicUrl=유효하지 않은 공개 URL
--- a/src/main/webapp/resources/dia_lt.txt
+++ b/src/main/webapp/resources/dia_lt.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_lv.txt
+++ b/src/main/webapp/resources/dia_lv.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_ml.txt
+++ b/src/main/webapp/resources/dia_ml.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_mr.txt
+++ b/src/main/webapp/resources/dia_mr.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_ms.txt
+++ b/src/main/webapp/resources/dia_ms.txt
@ -388,6 +388,7 @@ insertText=Masukkan Teks
 inserting=Memasukkan
 invalidFilename=Nama gambarajah tidak boleh mengandungi aksara yang berikut: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Lesen anda tidak sah, sila lihat ini <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nama tidak sah
 invalidOrMissingFile=Fail tidak sah atau hilang
 invalidPublicUrl=URL umum tidak sah
--- a/src/main/webapp/resources/dia_nl.txt
+++ b/src/main/webapp/resources/dia_nl.txt
@ -388,6 +388,7 @@ insertText=Tekst invoegen
 inserting=Invoegen
 invalidFilename=Een Diagramnaam mag niet de volgende tekens bevatten: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Uw licentie is ongeldig, bekijk deze <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">pagina</a>.
+invalidInput=Invalid input
 invalidName=Ongeldige naam
 invalidOrMissingFile=Ongeldig of ontbrekend bestand
 invalidPublicUrl=Ongeldige publieke URL
--- a/src/main/webapp/resources/dia_no.txt
+++ b/src/main/webapp/resources/dia_no.txt
@ -388,6 +388,7 @@ insertText=Legg til tekst
 inserting=Legger til
 invalidFilename=Diagrammet kan ikke inneholde de følgende tegnene: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Du har en ugyldig lisens, vennligst se her <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>
+invalidInput=Invalid input
 invalidName=Ugyldig navn
 invalidOrMissingFile=Ugyldig eller manglende fil
 invalidPublicUrl=Ugyldig offentlig URL
--- a/src/main/webapp/resources/dia_pl.txt
+++ b/src/main/webapp/resources/dia_pl.txt
@ -388,6 +388,7 @@ insertText=Wstaw tekst
 inserting=Wstawianie
 invalidFilename=Nazwy diagramów nie mogą zawierać następujących znaków: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Twoja licencja jest nieważna, sprawdź <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nieprawidłowa nazwa
 invalidOrMissingFile=Nieprawidłowy lub brakujący plik
 invalidPublicUrl=Nieprawidłowe publiczne hiperłącze
--- a/src/main/webapp/resources/dia_pt-br.txt
+++ b/src/main/webapp/resources/dia_pt-br.txt
@ -388,6 +388,7 @@ insertText=Inserir texto
 inserting=Inserindo
 invalidFilename=Nomes de diagramas não podem conter os seguintes caracteres: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Sua licença é inválida, por favor veja <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nome inválido
 invalidOrMissingFile=Arquivo inválido ou em falta
 invalidPublicUrl=URL pública inválida
--- a/src/main/webapp/resources/dia_pt.txt
+++ b/src/main/webapp/resources/dia_pt.txt
@ -388,6 +388,7 @@ insertText=Inserir texto
 inserting=A inserir
 invalidFilename=Nomes de diagramas não podem conter os seguintes caracteres:\ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=A sua carta não é válida, por favor veja <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nome inválido
 invalidOrMissingFile=Ficheiro inválido ou em falta
 invalidPublicUrl=URL pública inválida
--- a/src/main/webapp/resources/dia_ro.txt
+++ b/src/main/webapp/resources/dia_ro.txt
@ -388,6 +388,7 @@ insertText=Inserează text
 inserting=Se inserează
 invalidFilename=Numele diagramelor nu pot să contină următoarele caractere: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Licența dumneavoastră este invalida, vedeți <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Nume invalid
 invalidOrMissingFile=Fișier invalid sau inexistent
 invalidPublicUrl=URL public invalid
--- a/src/main/webapp/resources/dia_ru.txt
+++ b/src/main/webapp/resources/dia_ru.txt
@ -388,6 +388,7 @@ insertText=Добавить текст
 inserting=Вставка
 invalidFilename=Название диаграммы не может содержать следующие символы: \ / | : ; { < & + ? = "
 invalidLicenseSeeThisPage=Ваша лицензия недействительна. Пожалуйста, посетите эту<a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">страницу</a>.
+invalidInput=Invalid input
 invalidName=Некорректное имя
 invalidOrMissingFile=Файл поврежден или отсутствует
 invalidPublicUrl=Некорректная ссылка
--- a/src/main/webapp/resources/dia_sk.txt
+++ b/src/main/webapp/resources/dia_sk.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_sl.txt
+++ b/src/main/webapp/resources/dia_sl.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_sr.txt
+++ b/src/main/webapp/resources/dia_sr.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Umetanje
 invalidFilename=Imena dijagrama ne smeju sadržati sledeće znake : \ / | : ; { < & + ? =
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Neispravno ime
 invalidOrMissingFile=Neispravan ili nepostojeći dokument
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_sv.txt
+++ b/src/main/webapp/resources/dia_sv.txt
@ -388,6 +388,7 @@ insertText=Infoga text
 inserting=Infogar
 invalidFilename=Diagrammet får inte innehålla följande tecken: \ / | : ; { } < > & + ? = 
 invalidLicenseSeeThisPage=Din licens är ogiltig, vänligen se <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>
+invalidInput=Invalid input
 invalidName=Ogiltigt namn 
 invalidOrMissingFile=Ogiltigt eller saknad fil
 invalidPublicUrl=Ogiltigt publik URL
--- a/src/main/webapp/resources/dia_sw.txt
+++ b/src/main/webapp/resources/dia_sw.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_ta.txt
+++ b/src/main/webapp/resources/dia_ta.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_te.txt
+++ b/src/main/webapp/resources/dia_te.txt
@ -388,6 +388,7 @@ insertText=Insert Text
 inserting=Inserting
 invalidFilename=Diagram names must not contain the following characters: \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Your license is invalid, please see this <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Invalid name
 invalidOrMissingFile=Invalid or missing file
 invalidPublicUrl=Invalid public URL
--- a/src/main/webapp/resources/dia_th.txt
+++ b/src/main/webapp/resources/dia_th.txt
@ -388,6 +388,7 @@ insertText=แทรกข้อความ
 inserting=การแทรก
 invalidFilename=ชื่อแผนภาพจะต้องไม่มีเครื่องหมายเหล่านี้  \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=ใบอนุญาตของคุณไม่ถูกต้อง  โปรดดู <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=ชื่อที่ใช้ไม่ได้
 invalidOrMissingFile=ไฟล์ไม่ถูกต้องหรือไฟล์สูญหาย
 invalidPublicUrl=URL สาธารณะไม่ถูกต้อง
--- a/src/main/webapp/resources/dia_tr.txt
+++ b/src/main/webapp/resources/dia_tr.txt
@ -388,6 +388,7 @@ insertText=Metin ekle
 inserting=Ekleniyor
 invalidFilename=Diyagram adları şu karakterleri içermelidir : \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Lisansınız geçersiz, lütfen <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a> a bakınız
+invalidInput=Invalid input
 invalidName=Geçersiz isim
 invalidOrMissingFile=Geçersiz veya olmayan dosya
 invalidPublicUrl=Geçersiz herkese açık URL
--- a/src/main/webapp/resources/dia_uk.txt
+++ b/src/main/webapp/resources/dia_uk.txt
@ -388,6 +388,7 @@ insertText=Вставити текст
 inserting=Вставляю
 invalidFilename=Назва діаграма не повинна мати наступні символи:  \ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=Ваша ліцензія недійсна, будь ласка,прочитайте це <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">page</a>.
+invalidInput=Invalid input
 invalidName=Недійсне ім'я
 invalidOrMissingFile=Файл недійсний або відсутній
 invalidPublicUrl=Недійсний публічний URL
--- a/src/main/webapp/resources/dia_vi.txt
+++ b/src/main/webapp/resources/dia_vi.txt
@ -388,6 +388,7 @@ insertText=Chèn văn bản
 inserting=Đang chèn
 invalidFilename=Tên biểu đồ không được chứa những kí tự sau: \ / | : ' { } < > & + ? = "
 invalidLicenseSeeThisPage=Giấy phép của bạn không hợp lệ, vui lòng xem tại <a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">trang này</a>.
+invalidInput=Invalid input
 invalidName=Tên không hợp lệ
 invalidOrMissingFile=Tập tin bị thiếu hoặc không hợp lệ
 invalidPublicUrl=Đường dẫn không hợp lệ
--- a/src/main/webapp/resources/dia_zh-tw.txt
+++ b/src/main/webapp/resources/dia_zh-tw.txt
@ -388,6 +388,7 @@ insertText=插入文字
 inserting=正在插入
 invalidFilename=圖表名稱不得包含以下字符：\ / | : ; { } < > & + ? = "
 invalidLicenseSeeThisPage=您的許可無效，請參閱此<a target="_blank" href="https://support.draw.io/display/DFCS/Licensing+your+draw.io+plugin">頁面</a>。
+invalidInput=Invalid input
 invalidName=無效名稱
 invalidOrMissingFile=無效或遺失的檔案
 invalidPublicUrl=無效的公開URL
--- a/Show more
+++ b/Show more
 @ -1 +1 @@
 .7.7
 .7.8