13.10.0 releasev13.10.0

11 files changed, 675 insertions, 276 deletions

diff --git a/ChangeLog b/ChangeLog
index 19240943..15277757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+18-NOV-2020: 13.10.0
+
+- Internal release for Github actions testing
+- Conf Cloud: Viewer settings direct from the viewer
+- Conf Cloud: Adds custom libraries to more shapes dialog
+
 15-NOV-2020: 13.9.9
 
 - Improves Lucidchart import
diff --git a/README.md b/README.md
index 995e21f7..7631c5ca 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ The source code in this repo is licensed under the Apache v2.
 Development
 -----------
 
+Note: We cannot accept non-trivial PRs for legal reasons. We need to retain copyright over the entire codebase.
+
 A development guide is being started on the GitHub project wiki. There is a [draw.io](http://stackoverflow.com/questions/tagged/draw.io) tag on Stack Overflow currently, please make sure any questions adhere to their guidelines for questions.
 
 The [mxGraph documentation](https://jgraph.github.io/mxgraph/) provides a lot of the docs for the bottom part of the stack. There is an [mxgraph tag on SO](http://stackoverflow.com/questions/tagged/mxgraph).
diff --git a/VERSION b/VERSION
index 6183674b..04f98b43 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.9
\ No newline at end of file
+13.10.0
\ No newline at end of file
diff --git a/src/main/webapp/js/app.min.js b/src/main/webapp/js/app.min.js
index 96ec95e2..a0e64832 100644
--- a/src/main/webapp/js/app.min.js
+++ b/src/main/webapp/js/app.min.js
@@ -10089,7 +10089,7 @@ g=mxUtils.button(mxResources.get("cancel"),function(){a.hideDialog()});g.classNa
 (this.page.viewState.pageFormat=this.format),null!=this.mathEnabled&&(this.page.viewState.mathEnabled=this.mathEnabled),null!=this.shadowVisible&&(this.page.viewState.shadowVisible=this.shadowVisible)):(H.apply(this,arguments),null!=this.mathEnabled&&this.mathEnabled!=this.ui.isMathEnabled()&&(this.ui.setMathEnabled(this.mathEnabled),this.mathEnabled=!this.mathEnabled),null!=this.shadowVisible&&this.shadowVisible!=this.ui.editor.graph.shadowVisible&&(this.ui.editor.graph.setShadowVisible(this.shadowVisible),
 this.shadowVisible=!this.shadowVisible))};Editor.prototype.useCanvasForExport=!1;try{var J=document.createElement("canvas"),I=new Image;I.onload=function(){try{J.getContext("2d").drawImage(I,0,0);var a=J.toDataURL("image/png");Editor.prototype.useCanvasForExport=null!=a&&6<a.length}catch(M){}};I.src="data:image/svg+xml;base64,"+btoa(unescape(encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1px" height="1px" version="1.1"><foreignObject pointer-events="all" width="1" height="1"><div xmlns="http://www.w3.org/1999/xhtml"></div></foreignObject></svg>')))}catch(K){}})();
 (function(){var a=new mxObjectCodec(new ChangePageSetup,["ui","previousColor","previousImage","previousFormat"]);a.beforeDecode=function(a,c,b){b.ui=a.ui;return c};a.afterDecode=function(a,c,b){b.previousColor=b.color;b.previousImage=b.image;b.previousFormat=b.format;null!=b.foldingEnabled&&(b.foldingEnabled=!b.foldingEnabled);null!=b.mathEnabled&&(b.mathEnabled=!b.mathEnabled);null!=b.shadowVisible&&(b.shadowVisible=!b.shadowVisible);return b};mxCodecRegistry.register(a)})();
-(function(){var a=new mxObjectCodec(new ChangeGridColor,["ui"]);a.beforeDecode=function(a,c,b){b.ui=a.ui;return c};mxCodecRegistry.register(a)})();(function(){EditorUi.VERSION="13.9.9";EditorUi.compactUi="atlas"!=uiTheme;mxGraphView.prototype.defaultDarkGridColor="#6e6e6e";"dark"==uiTheme&&(mxGraphView.prototype.gridColor=mxGraphView.prototype.defaultDarkGridColor);EditorUi.enableLogging="1"!=urlParams.stealth&&(/.*\.draw\.io$/.test(window.location.hostname)||/.*\.diagrams\.net$/.test(window.location.hostname))&&"support.draw.io"!=window.location.hostname;EditorUi.drawHost=window.DRAWIO_BASE_URL;EditorUi.lightboxHost=window.DRAWIO_LIGHTBOX_URL;
+(function(){var a=new mxObjectCodec(new ChangeGridColor,["ui"]);a.beforeDecode=function(a,c,b){b.ui=a.ui;return c};mxCodecRegistry.register(a)})();(function(){EditorUi.VERSION="13.10.0";EditorUi.compactUi="atlas"!=uiTheme;mxGraphView.prototype.defaultDarkGridColor="#6e6e6e";"dark"==uiTheme&&(mxGraphView.prototype.gridColor=mxGraphView.prototype.defaultDarkGridColor);EditorUi.enableLogging="1"!=urlParams.stealth&&(/.*\.draw\.io$/.test(window.location.hostname)||/.*\.diagrams\.net$/.test(window.location.hostname))&&"support.draw.io"!=window.location.hostname;EditorUi.drawHost=window.DRAWIO_BASE_URL;EditorUi.lightboxHost=window.DRAWIO_LIGHTBOX_URL;
 EditorUi.lastErrorMessage=null;EditorUi.ignoredAnonymizedChars="\n\t`~!@#$%^&*()_+{}|:\"<>?-=[];'./,\n\t";EditorUi.templateFile=TEMPLATE_PATH+"/index.xml";EditorUi.cacheUrl="1"==urlParams.dev?"/cache":window.REALTIME_URL;null==EditorUi.cacheUrl&&"undefined"!==typeof DrawioFile&&(DrawioFile.SYNC="none");Editor.cacheTimeout=1E4;EditorUi.enablePlantUml=EditorUi.enableLogging;EditorUi.isElectronApp=null!=window&&null!=window.process&&null!=window.process.versions&&null!=window.process.versions.electron;
 EditorUi.enableDrafts=!mxClient.IS_CHROMEAPP&&!EditorUi.isElectronApp&&isLocalStorage&&"0"!=urlParams.drafts;EditorUi.scratchpadHelpLink="https://desk.draw.io/support/solutions/articles/16000042367";EditorUi.defaultMermaidConfig={theme:"neutral",arrowMarkerAbsolute:!1,flowchart:{htmlLabels:!1},sequence:{diagramMarginX:50,diagramMarginY:10,actorMargin:50,width:150,height:65,boxMargin:10,boxTextMargin:5,noteMargin:10,messageMargin:35,mirrorActors:!0,bottomMarginAdj:1,useMaxWidth:!0,rightAngles:!1,showSequenceNumbers:!1},
 gantt:{titleTopMargin:25,barHeight:20,barGap:4,topPadding:50,leftPadding:75,gridLineStartPadding:35,fontSize:11,fontFamily:'"Open-Sans", "sans-serif"',numberSectionStyles:4,axisFormat:"%Y-%m-%d"}};EditorUi.logError=function(a,b,c,d,f,g,l){g=null!=g?g:0<=a.indexOf("NetworkError")||0<=a.indexOf("SecurityError")||0<=a.indexOf("NS_ERROR_FAILURE")||0<=a.indexOf("out of memory")?"CONFIG":"SEVERE";if(EditorUi.enableLogging&&"1"!=urlParams.dev)try{if(a!=EditorUi.lastErrorMessage&&(null==a||null==b||-1==a.indexOf("Script error")&&
diff --git a/src/main/webapp/js/diagramly/Extensions.js b/src/main/webapp/js/diagramly/Extensions.js
index 72f41254..5cf19ef0 100644
--- a/src/main/webapp/js/diagramly/Extensions.js
+++ b/src/main/webapp/js/diagramly/Extensions.js
@@ -9,6 +9,7 @@ LucidImporter = {};
 {
 	// Global import transformation
 	var defaultFontSize = '11';
+	var defaultLucidFont = 'Liberation Sans';
 	var scale = 0.6;
 	var dx = 0;
 	var dy = 0;
@@ -86,13 +87,13 @@ LucidImporter = {};
 			'PreparationBlock': 'shape=hexagon;perimeter=hexagonPerimeter2',
 			'DataBlock': 'shape=parallelogram;perimeter=parallelogramPerimeter;anchorPointDirection=0',
 			'DataBlockNew': 'shape=parallelogram;perimeter=parallelogramPerimeter;anchorPointDirection=0',
-			'DatabaseBlock': 'shape=cylinder;size=0.1;anchorPointDirection=0;boundedLbl=1;',
-			'DirectAccessStorageBlock': 'shape=cylinder;direction=south;size=0.1;anchorPointDirection=0;boundedLbl=1;',
+			'DatabaseBlock': 'shape=cylinder3;size=10;anchorPointDirection=0;boundedLbl=1;',
+			'DirectAccessStorageBlock': 'shape=cylinder3;direction=south;size=10;anchorPointDirection=0;boundedLbl=1;',
 			'InternalStorageBlock': 'shape=internalStorage;dx=10;dy=10',
 			'PaperTapeBlock': 'shape=tape;size=0.2',
 			'ManualOperationBlockNew': 'shape=trapezoid;perimeter=trapezoidPerimeter;anchorPointDirection=0;flipV=1',
 			'DelayBlock': 'shape=delay',
-			'StoredDataBlock': 'shape=dataStorage',
+			'StoredDataBlock': 'shape=cylinder3;boundedLbl=1;size=15;lid=0;direction=south;',
 			'MergeBlock': 'triangle;direction=south;anchorPointDirection=0',
 			'ConnectorBlock': 'ellipse',
 			'OrBlock': s + 'flowchart.summing_function',
@@ -114,11 +115,11 @@ LucidImporter = {};
 			'BraceBlockRotated': cs,
 			'BracketBlockRotated': cs,
 //Geometric shapes
-			'IsoscelesTriangleBlock': 'triangle;direction=north;anchorPointDirection=0',
+			'IsoscelesTriangleBlock': 'shape=mxgraph.basic.acute_triangle;dx=0.5;anchorPointDirection=0',
 			'RightTriangleBlock': s + 'basic.orthogonal_triangle',
 			'PentagonBlock': s + 'basic.pentagon',
 			'HexagonBlock': 'shape=hexagon;perimeter=hexagonPerimeter2',
-			'OctagonBlock': s + 'basic.octagon',
+			'OctagonBlock': s + 'basic.octagon2;dx=15;',
 			'CrossBlock': 'shape=cross;size=0.6',
 			'CloudBlock': 'ellipse;shape=cloud',
 			'HeartBlock': s + 'basic.heart',
@@ -219,7 +220,7 @@ LucidImporter = {};
 			'MindMapDiamondBlock' : 'shape=rhombus',
 			'MindMapPentagonBlock' : s + 'basic.pentagon',
 			'MindMapHexagonBlock' : 'shape=hexagon;perimeter=hexagonPerimeter2',
-			'MindMapOctagonBlock' : s + 'basic.octagon',
+			'MindMapOctagonBlock' : s + 'basic.octagon2;dx=10;',
 			'MindMapCrossBlock' : s + 'basic.cross2;dx=20',
 //Entity Relationship
 			'ERDEntityBlock' : cs,
@@ -230,7 +231,8 @@ LucidImporter = {};
 			'UMLClassBlock': cs,
 			'UMLActiveClassBlock': 'shape=process',
 			'UMLMultiplicityBlock' : cs,
-			'UMLPackageBlock': 'shape=folder;tabPosition=left',
+//			'UMLPackageBlock': 'shape=folder;tabPosition=left',
+			'UMLPackageBlock': '',
 			'UMLConstraintBlock' : cs,
 			'UMLNoteBlock': 'shape=note;size=15',
 			'UMLNoteBlockV2': 'shape=note;size=15',
@@ -310,7 +312,7 @@ LucidImporter = {};
 			'DFDExternalEntityBlock2' : '',
 			'YDMDFDProcessBlock' : 'ellipse',
 			'YDMDFDDataStoreBlock' : 'shape=partialRectangle;right=0;left=0',
-			'GSDFDProcessBlock' : 'shape=swimlane;rounded=1;arcSize=10',
+			'GSDFDProcessBlock' : cs,
 			'GSDFDProcessBlock2' : 'rounded=1;arcSize=10;',
 			'GSDFDDataStoreBlock' : cs,
 			'GSDFDDataStoreBlock2' : 'shape=partialRectangle;right=0',
@@ -334,8 +336,8 @@ LucidImporter = {};
 //Shipments
 			'VSMExternalShipmentAirplaneBlock' : s + 'lean_mapping.airplane_7',
 			'VSMExternalShipmentForkliftBlock' : s + 'lean_mapping.move_by_forklift',
-			'VSMExternalShipmentTruckBlock' : s + 'lean_mapping.truck_shipment',
-			'VSMExternalShipmentBoatBlock' : s + 'lean_mapping.boat_shipment',
+			'VSMExternalShipmentTruckBlock' : s + 'lean_mapping.truck_shipment;align=left;',
+			'VSMExternalShipmentBoatBlock' : s + 'lean_mapping.boat_shipment;verticalAlign=bottom;',
 //Information
 			'VSMProductionControlBlock' : cs,
 			'VSMOtherInformationBlock' : '',
@@ -1649,62 +1651,62 @@ LucidImporter = {};
 			'Cisco_cisco_workstation' : s + 'cisco.computers_and_peripherals.workstation;' + c,
 			'Cisco_cisco_www_server' : s + 'cisco.servers.www_server;' + c,
 //Computers and Monitors
-			'NET_PC' : s + 'networks.pc;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Virtual-PC' : s + 'networks.virtual_pc;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Terminal' : s + 'networks.terminal;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_DataPipe' : s + 'networks.bus;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_SlateDevice' : s + 'networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff', 
-			'NET_TabletDevice' : s + 'networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Laptop' : s + 'networks.laptop;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_PDA' : s + 'networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_CRTMonitor' : s + 'networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_LCDMonitor' : s + 'networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_PC' : s + 'networks.pc;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Virtual-PC' : s + 'networks.virtual_pc;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Terminal' : s + 'networks.terminal;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_DataPipe' : s + 'networks.bus;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_SlateDevice' : s + 'networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;', 
+			'NET_TabletDevice' : s + 'networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Laptop' : s + 'networks.laptop;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_PDA' : s + 'networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_CRTMonitor' : s + 'networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_LCDMonitor' : s + 'networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //Detailed Network Diagrams
 //			'NET_ABSwitch' NA
 //			'NET_Repeater' NA
 //			'NET_DiagnosticDevice' NA
 //			'NET_CardReader' NA
 //			'NET_PatchPanel' NA
-			'NET_RadioTower' : s + 'networks.radio_tower;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_RadioTower' : s + 'networks.radio_tower;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_BiometricReader' NA
-			'NET_ExternalHardDrive' : s + 'networks.external_storage;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_ExternalHardDrive' : s + 'networks.external_storage;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_WebService' NA
 //			'NET_FiberOptic' NA
-			'NET_SatelliteDish' : s + 'networks.satellite_dish;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Satellite' : s + 'networks.satellite;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_SatelliteDish' : s + 'networks.satellite_dish;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Satellite' : s + 'networks.satellite;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_VoIPPhone' NA
 //			'NET_PBX' NA
 //			'NET_MLPS' NA
 //Basic Network Shapes
-			'NET_WirelessAccessPoint' : s + 'networks.radio_tower;fillColor=#29AAE1;strokeColor=#29AAE1',
+			'NET_WirelessAccessPoint' : s + 'networks.radio_tower;fillColor=#29AAE1;strokeColor=#29AAE1;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 			'NET_RingNetwork' : cs,
 			'NET_Ethernet' : cs,
-			'NET_Server' : s + 'networks.server;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_Server' : s + 'networks.server;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_ExternalMediaDrive' NA
-			'NET_Mainframe' : s + 'networks.mainframe;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Router' : s + 'networks.wireless_hub;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Switch' : s + 'networks.switch;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Firewall' : s + 'networks.firewall;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_User' : s + 'networks.user_male;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_CommLink' : s + 'networks.comm_link_edge;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_SuperComputer' : s + 'networks.supercomputer;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_VirtualServer' : s + 'networks.virtual_server;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Printer' : s + 'networks.printer;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_Mainframe' : s + 'networks.mainframe;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Router' : s + 'networks.wireless_hub;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Switch' : s + 'networks.switch;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Firewall' : s + 'networks.firewall;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_User' : s + 'networks.user_male;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_CommLink' : s + 'networks.comm_link_edge;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_SuperComputer' : s + 'networks.supercomputer;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_VirtualServer' : s + 'networks.virtual_server;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Printer' : s + 'networks.printer;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_Plotter' NA
-			'NET_Scanner' : s + 'networks.scanner;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Copier' : s + 'networks.copier;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_Scanner' : s + 'networks.scanner;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Copier' : s + 'networks.copier;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_FaxMachine' NA
-			'NET_MultiFunctionMachine' : s + 'networks.copier;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Projector' : s + 'networks.video_projector;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_ProjectorScreen' : s + 'networks.video_projector_screen;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Bridge' : s + 'networks.router;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Hub' : s + 'networks.hub;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Modem' : s + 'networks.modem;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_Telephone' : s + 'signs.tech.telephone_5;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_CellPhone' : s + 'networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff',
-			'NET_SmartPhone' : s + 'networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_MultiFunctionMachine' : s + 'networks.copier;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Projector' : s + 'networks.video_projector;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_ProjectorScreen' : s + 'networks.video_projector_screen;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Bridge' : s + 'networks.router;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Hub' : s + 'networks.hub;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Modem' : s + 'networks.modem;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_Telephone' : s + 'signs.tech.telephone_5;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_CellPhone' : s + 'networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
+			'NET_SmartPhone' : s + 'networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_VideoPhone' NA
-			'NET_Camera' : s + 'signs.tech.camera_2;fillColor=#29AAE1;strokeColor=#ffffff',
+			'NET_Camera' : s + 'signs.tech.camera_2;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;',
 //			'NET_VideoCamera' NA
 //Server Racks
 			'RackServerRack' : s + 'rackGeneral.container;container=1;collapsible=0;childLayout=rack;marginLeft=9;marginRight=9;marginTop=21;marginBottom=22;textColor=#000000;numDisp=off',
@@ -1791,26 +1793,37 @@ LucidImporter = {};
 			'EE_Lightbulb' : s + 'electrical.miscellaneous.light_bulb',
 			'EE_IntegratedCircuit' : 'shape=mxgraph.electrical.logic_gates.dual_inline_ic',
 //Power Sources
-			'EE_AcSource' : s + 'electrical.signal_sources.ac_source;strokeWidth=1',
-			'EE_VoltageSource' : s + 'electrical.signal_sources.dc_source_3',
-			'EE_CurrentSource' : s + 'electrical.signal_sources.dc_source_2;direction=north',
-			'EE_ControlledCurrentSource' : s + 'electrical.signal_sources.dependent_source_2;direction=west',
-			'EE_ControlledVoltageSource' : s + 'electrical.signal_sources.dependent_source_3',
+			'EE_AcSource' : s + 'electrical.signal_sources.ac_source;strokeWidth=1;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;',
+			'EE_VoltageSource' : s + 'electrical.signal_sources.dc_source_3;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;',
+			'EE_CurrentSource' : s + 'electrical.signal_sources.dc_source_2;direction=north;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;',
+			'EE_ControlledCurrentSource' : s + 'electrical.signal_sources.dependent_source_2;direction=west;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;',
+			'EE_ControlledVoltageSource' : s + 'electrical.signal_sources.dependent_source_3;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;',
 			'EE_DcSource1' : s + 'electrical.miscellaneous.monocell_battery;flipH=1;verticalLabelPosition=bottom;verticalAlign=top',
 			'EE_DcSource2' : s + 'electrical.miscellaneous.multicell_battery;flipH=1;verticalLabelPosition=bottom;verticalAlign=top',
 			'EE_Vss' : s + 'electrical.signal_sources.vss2;verticalLabelPosition=top;verticalAlign=bottom;fontSize=24',
 			'EE_Vdd' : s + 'electrical.signal_sources.vdd;verticalLabelPosition=bottom;verticalAlign=top',
 //Transistors
+			
 			'EE_BJT_NPN1' : s + 'electrical.transistors.pnp_transistor_1',
+			'EE_BJT_NPN1_V2' : s + 'electrical.transistors.npn_transistor_1;',
 			'EE_BJT_PNP1' : s + 'electrical.transistors.npn_transistor_1',
+			'EE_BJT_PNP1_V2' : s + 'electrical.transistors.pnp_transistor_1',
 			'EE_JFET_P' : s + 'electrical.transistors.p-channel_jfet_1;flipV=1',
+			'EE_JFET_P_V2' : s + 'electrical.transistors.p-channel_jfet_1;flipV=1',
 			'EE_JFET_N' : s + 'electrical.transistors.n-channel_jfet_1',
+			'EE_JFET_N_V2' : s + 'electrical.transistors.n-channel_jfet_1',
 			'EE_MOSFET_P1' : s + 'electrical.mosfets1.mosfet_ic_p;flipV=1',
+			'EE_MOSFET_P1_V2' : s + 'electrical.mosfets1.mosfet_ic_p;flipV=1',
 			'EE_MOSFET_P2' : s + 'electrical.mosfets1.mosfet_p_no_bulk',
+			'EE_MOSFET_P2_V2' : s + 'electrical.mosfets1.mosfet_p_no_bulk',
 			'EE_MOSFET_P3' : s + 'electrical.mosfets1.p-channel_mosfet_1;flipV=1',
+			'EE_MOSFET_P3_V2' : s + 'electrical.mosfets1.p-channel_mosfet_1;flipV=1',
 			'EE_MOSFET_N1' : s + 'electrical.mosfets1.mosfet_ic_n',
+			'EE_MOSFET_N1_V2' : s + 'electrical.mosfets1.mosfet_ic_n',
 			'EE_MOSFET_N2' : s + 'electrical.mosfets1.mosfet_n_no_bulk',
+			'EE_MOSFET_N2_V2' : s + 'electrical.mosfets1.mosfet_n_no_bulk',
 			'EE_MOSFET_N3' : s + 'electrical.mosfets1.n-channel_mosfet_1',
+			'EE_MOSFET_N3_V2' : s + 'electrical.mosfets1.n-channel_mosfet_1',
 //Relays
 //			'EE_SPST' NA
 //			'EE_SPDT' NA
@@ -2046,6 +2059,20 @@ LucidImporter = {};
 			'GCPIconGenericBlock' : gcpIcon + 'placeholder',
 			'GCPIconPredictionAPIBlock' : gcpIcon + 'prediction_api',
 			//'GCPGoogleCloudPlatformLockupBlock' : gcpIcon + 'gcp_google_cloud_platform_lockup',
+			'GCPAutoScalingModifier' : 'shape=mxgraph.gcp2.modifiers_autoscaling;fillColor=#757575;strokeColor=none;',
+			'GCPCustomVirtualMachineModifier' : 'shape=mxgraph.gcp2.modifiers_custom_virtual_machine;fillColor=#757575;strokeColor=none;',
+			'GCPHighCPUMachineModifier' : 'shape=mxgraph.gcp2.modifiers_high_cpu_machine;fillColor=#757575;strokeColor=none;',
+			'GCPHighMemoryMachineModifier' : 'shape=mxgraph.gcp2.modifiers_high_memory_machine;fillColor=#757575;strokeColor=none;',
+			'GCPPreemptableVSModifier' : 'shape=mxgraph.gcp2.modifiers_preemptable_vm;fillColor=#757575;strokeColor=none;',
+			'GCPSharedCoreMachineF1Modifier' : 'shape=mxgraph.gcp2.modifiers_shared_core_machine_f1;fillColor=#757575;strokeColor=none;',
+			'GCPSharedCoreMachineG1Modifier' : 'shape=mxgraph.gcp2.modifiers_shared_core_machine_g1;fillColor=#757575;strokeColor=none;',
+			'GCPStandardMachineModifier' : 'shape=mxgraph.gcp2.modifiers_standard_machine;fillColor=#757575;strokeColor=none;',
+			'GCPStorageModifier' : 'shape=mxgraph.gcp2.modifiers_storage;fillColor=#757575;strokeColor=none;',
+			'GCPAppEngineProductCard' : cs,
+			'GCPCloudDataflowProductCard' : cs,
+			'GCPCloudDataprocProductCard' : cs,
+			'GCPComputeEngineProductCard' : cs,
+			'GCPContainerEngineProductCard' : cs,
 			
 //Kubernetes Icons
 			'CronjobLabeledKub19' : kupIcon + 'cronjob',
@@ -2345,7 +2372,7 @@ LucidImporter = {};
 			'PEClarifierBlock' : s + 'pid.vessels.bunker_(conical_bottom);verticalLabelPosition=bottom;verticalAlign=top',
 			'PETankBlock' : s + 'pid.vessels.tank_(conical_roof);verticalLabelPosition=bottom;verticalAlign=top',
 			'PETrayColumnBlock' : s + 'pid2misc.column;columnType=tray;verticalLabelPosition=bottom;verticalAlign=top',
-			'PEReactionVesselBlock' : s + 'pid.vessels.reactor',
+			'PEReactionVesselBlock' : s + 'pid.vessels.reactor;verticalLabelPosition=bottom;verticalAlign=top',
 			'PEBin' : s + 'pid.vessels.tank_(conical_bottom)',
 			'PEDomeRoofTank' : s + 'pid.vessels.tank_(dished_roof)',
 			'PEConeRoofTank' : s + 'pid.vessels.tank_(conical_roof)',
@@ -2371,7 +2398,7 @@ LucidImporter = {};
 			'PEShellAndTubeHeat2Block' : s + 'pid.heat_exchangers.shell_and_tube_heat_exchanger_2;verticalLabelPosition=bottom;verticalAlign=top',
 			'PEShellAndTubeHeat3Block' : s + 'pid.heat_exchangers.shell_and_tube_heat_exchanger_1;direction=north;verticalLabelPosition=bottom;verticalAlign=top',
 			'PESinglePassHeatBlock' : s + 'pid.heat_exchangers.single_pass_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top',
-			'PEHeaterBlock' : s + 'pid.heat_exchangers.heater',
+			'PEHeaterBlock' : s + 'pid.heat_exchangers.heater;verticalLabelPosition=bottom;verticalAlign=top',
 //Pumps
 			'PEEjectorInjectorBlock' : s + 'pid.fittings.injector;verticalLabelPosition=bottom;verticalAlign=top',
 			'PECompressorTurbineBlock' : cs,
@@ -2578,7 +2605,8 @@ LucidImporter = {};
 			'UI2BrowserBlock' : cs,
 			'UI2WindowBlock' : cs, 
 			'UI2DialogBlock' : cs,
-			'UI2AreaBlock' : '',
+			'UI2AreaBlock' : 'rounded=1;arcSize=3',
+			'UIAreaBlock' : 'rounded=1;arcSize=3;fillColor=none',
 			'UI2ElementBlock' : '',
 			'UI2AccordionBlock' : cs,
 			'UI2TabBarContainerBlock' : cs,
@@ -2848,17 +2876,17 @@ LucidImporter = {};
 			'AmazonConnect2017' : 'shape=mxgraph.aws3.connect;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top',
 			
 // AWS 17 - Containers			
-//			'AutoScalingGroup2017' : '',
-//			'AvailabilityZone2017' : '',
-//			'Region2017' : '',
+			'AutoScalingGroup2017' : 'rounded=1;arcSize=10;dashed=1;dashPattern=8 3 1 3;verticalAlign=bottom',
+			'AvailabilityZone2017' : 'rounded=1;arcSize=10;dashed=1;dashPattern=8 4;verticalAlign=bottom',
+			'Region2017' : 'rounded=1;arcSize=10;dashed=1;dashPattern=1 1;verticalAlign=bottom',
 			'SecurityGroup2017' : 'verticalAlign=bottom',
-//			'ElasticBeanStalkContainer2017' : '',
-//			'EC2InstanceContents2017' : '',
-//			'VPCSubnet2017' : '',
-//			'ServerContents2017' : '',
-//			'VirtualPrivateCloudContainer2017' : '',
-//			'AWSCloudContainer2017' : '',
-//			'CorporateDataCenterContainer2017' : '',
+			'ElasticBeanStalkContainer2017' : cs,
+			'EC2InstanceContents2017' : cs,
+			'VPCSubnet2017' : cs,
+			'ServerContents2017' : 'rounded=1;arcSize=10;dashed=0;fillColor=#DBDBDB;gradientColor=none;verticalAlign=bottom',
+			'VirtualPrivateCloudContainer2017' : cs,
+			'AWSCloudContainer2017' : cs,
+			'CorporateDataCenterContainer2017' : cs,
 			
 // AWS 17 - Database			
 			'AmazonDynamoDB2017' : 'shape=mxgraph.aws3.dynamo_db;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top',
@@ -3116,6 +3144,7 @@ LucidImporter = {};
 			'volume2017' : 'shape=mxgraph.aws3.volume;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top',
 			
 // AWS 19 Analytics			
+			
 			'AnalyticsAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.analytics;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top',
 			'AmazonAthenaAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.athena;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff',
 			'AmazonCloudSearchAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cloudsearch;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff',
@@ -3207,7 +3236,15 @@ LucidImporter = {};
 			'AWSElasticBeanstalk_ApplicationAWS19' : 'shape=mxgraph.aws4.application;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none',
 			'AWSElasticBeanstalk_DeploymentAWS19' : 'shape=mxgraph.aws4.deployment;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none',
 			'AWSLambda_LambdaFunctionAWS19' : 'shape=mxgraph.aws4.lambda_function;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none',
-
+			'AWSThinkboxDeadlineAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_deadline;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;',
+			'AWSThinkboxDraftAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_draft;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;',
+			'AWSThinkboxFrostAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_frost;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;',
+			'AWSThinkboxKrakatoaAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_krakatoa;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;',
+			'AWSThinkboxSequoiaAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_sequoia;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;',
+			'AWSThinkboxStokeAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_stoke;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;',
+			'AWSThinkboxXMeshAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_xmesh;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;',
+			
+			
 // AWS 19 - Cost Management		
 			'AWSCostManagementAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cost_management;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top',
 			'AWSBudgetsAWS19' : 'shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.budgets;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff',
@@ -3714,8 +3751,8 @@ LucidImporter = {};
 			'GCPInputPhone' : cs,
 			'GCPInputBlank' : cs,
 
-// Site Map			
-//			'SMPage' : s + 'rect',
+// Site Map	
+			'SMPage' : cs,
 			'SMHome' : s + 'sitemap.home;strokeColor=#000000;fillColor=#E6E6E6',
 			'SMGallery' : s + 'sitemap.gallery;strokeColor=#000000;fillColor=#E6E6E6',
 			'SMShopping' : s + 'sitemap.shopping;strokeColor=#000000;fillColor=#E6E6E6',
@@ -3765,7 +3802,7 @@ LucidImporter = {};
 			'ExtShapeServerBlock': ss + 'citrix.tower_server;verticalLabelPosition=bottom;verticalAlign=top',
 			'ExtShapeCloudBlock': ss + 'citrix.cloud;verticalLabelPosition=bottom;verticalAlign=top',
 			'ExtShapeUserBlock': ss + 'aws3d.end_user;verticalLabelPosition=bottom;verticalAlign=top;fillColor=#073763',
-			'ExtShapeWorkstationLCDBlock': ss + 'veeam.3d.workstation;verticalLabelPosition=bottom;verticalAlign=top',
+			'ExtShapeWorkstationLCDBlock': ss + 'veeam.3d.workstation;verticalLabelPosition=bottom;verticalAlign=top'
 	};
 	
 	// actual code start
@@ -3773,7 +3810,7 @@ LucidImporter = {};
 	function convertTxt2Html(txt, srcM, props)
 	{
 		var blockStyles = {'a': true, 'il': true, 'ir': true, 'mt': true, 'mb': true, 'p': true, 't': true, 'l': true};
-		var nonBlockStyles = {'lk': true, 's': true, 'c': true, 'b': true, 'fc': true, 'i': true, 'u': true, 'k': true};
+		var nonBlockStyles = {'lk': true, 's': true, 'c': true, 'b': true, 'fc': true, 'i': true, 'u': true, 'k': true, 'f': true};
 
 		srcM.sort(function(a, b)
 		{
@@ -4044,6 +4081,22 @@ LucidImporter = {};
 				str += 'font-style: italic;';
 			}
 			
+			var fontFamily = null;
+			
+			if (styles['f'])
+			{
+				fontFamily = styles['f'].v;
+			}
+			else if (props.Font)
+			{
+				fontFamily = props.Font;
+			}
+			
+			if (fontFamily && fontFamily != defaultLucidFont)
+			{
+				str += 'font-family: ' + fontFamily + ';';
+			}
+			
 			var td = [];
 
 			if (styles['u'] && styles['u'].v)
@@ -4382,6 +4435,7 @@ LucidImporter = {};
 	{
 		var style = 'whiteSpace=wrap;' + (noLblStyle? 'overflow=block;html=1;fontSize=' + defaultFontSize + ';' : 
 				getFontSize(properties) +
+				getFontFamily(properties) +
 				getFontColor(properties) + 
 				getFontStyle(properties) +
 				getTextAlignment(properties) + 
@@ -4410,7 +4464,8 @@ LucidImporter = {};
 		  (noLblStyle? (hasStyle(style, 'overflow')? '' : 'overflow=block;') + 
 			(hasStyle(style, 'html')? '' : 'html=1;') + 'fontSize=' + defaultFontSize + ';' 
 			:
-			addStyle(mxConstants.STYLE_FONTSIZE, style, properties, action, cell) +		
+			addStyle(mxConstants.STYLE_FONTSIZE, style, properties, action, cell) +	
+			addStyle(mxConstants.STYLE_FONTFAMILY, style, properties, action, cell) +		
 			addStyle(mxConstants.STYLE_FONTCOLOR, style, properties, action, cell) +			
 			addStyle(mxConstants.STYLE_FONTSTYLE, style, properties, action, cell) +		
 			addStyle(mxConstants.STYLE_ALIGN, style, properties, action, cell) +		
@@ -4444,7 +4499,10 @@ LucidImporter = {};
 			{
 				case mxConstants.STYLE_FONTSIZE :
 					return getFontSize(properties);
-					
+				
+				case mxConstants.STYLE_FONTFAMILY :
+					return getFontFamily(properties);
+				
 				case mxConstants.STYLE_FONTCOLOR :
 					return getFontColor(properties);
 					
@@ -4551,7 +4609,32 @@ LucidImporter = {};
 		
 		return '';
 	}
+	
+	function getFontFamily(properties)
+	{
+		var m = getTextM(properties);
+		var fontFamily;
 		
+		if (m != null)
+		{
+			for (var i = 0; i < m.length; i++)
+			{
+				if (m[i].n == 'f' && m[i].v)
+				{
+					fontFamily = m[i].v;
+					break;
+				}
+			}
+		}
+		
+		if (!fontFamily && properties.Font)
+		{
+			fontFamily = properties.Font;
+		}
+		
+		return fontFamily && fontFamily != defaultLucidFont ?'fontFamily=' + fontFamily + ';' : '';
+	};
+	
 	function getLink(m)
 	{
 		if (m != null)
@@ -5718,6 +5801,9 @@ LucidImporter = {};
 			
 			var group = new mxCell('', new mxGeometry(), 'group;dropTarget=0;');
 			group.vertex = true;
+			//Store z-order to use it in groups
+			group.zOrder = obj.ZOrder;
+
 			var minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
 			var members = obj.Members, memberCells = [];
 			
@@ -5741,7 +5827,7 @@ LucidImporter = {};
 				var ai = a.zOrder;
 				var bi = b.zOrder;
 				
-				return (ai != null && bi != null) ? ai - bi : 0;
+				return (ai != null && bi != null) ? (ai > bi? 1 : (ai < bi? -1 : 0)) : 0; //ZOrder can be negative
 			});
 			
 			for (var i = 0; i < memberCells.length; i++)
@@ -5934,7 +6020,7 @@ LucidImporter = {};
 				var ai = (a.Properties != null) ? a.Properties.ZOrder : a.ZOrder;
 				var bi = (b.Properties != null) ? b.Properties.ZOrder : b.ZOrder;
 				
-				return (ai != null && bi != null) ? ai - bi : 0;
+				return (ai != null && bi != null) ? (ai > bi? 1 : (ai < bi? -1 : 0)) : 0; //ZOrder can be negative
 			});
 			
 			function addLine(obj, p)
@@ -6385,6 +6471,32 @@ LucidImporter = {};
     	v.insert(icon1);
 	};
 	
+	function addGCP2ExpandedProductCard(icon, scaleX, scaleY, w, h, v, p, a)
+	{
+		if (icon != 'transparent')
+		{
+			var s = mxConstants.STYLE_SHAPE + '=mxgraph.gcp.';
+		}
+		else
+		{
+			var s = mxConstants.STYLE_SHAPE + '=';
+		}
+
+		v.style = 'rounded=1;absoluteArcSize=1;arcSize=2;verticalAlign=bottom;fillColor=#ffffff;strokeColor=#dddddd;whiteSpace=wrap;';
+		v.style += addAllStyles(v.style, p, a, v);
+		
+		v.value = convertText(p);
+    	v.vertex = true;
+	    var icon1 = new mxCell(null, new mxGeometry(0.5, 0, w * 0.7 * scaleX, w * 0.7 * scaleY), 
+	    		s + icon + ';part=1;dashed=0;connectable=0;html=1;strokeColor=none;shadow=0;'); 
+
+	    icon1.geometry.relative = true;
+	    icon1.geometry.offset = new mxPoint(- scaleX * w * 0.35, 10 + (1 - scaleY) * w * 0.35);
+    	icon1.vertex = true;
+    	icon1.style += addAllStyles(icon1.style, p, a, icon1, isLastLblHTML);
+    	v.insert(icon1);
+	};
+	
 	function hasStyle(style, key)
 	{
 		if (style != null && key != null)
@@ -6815,6 +6927,19 @@ LucidImporter = {};
 					v.insert(content);
 				}
 				break;
+			case 'GSDFDProcessBlock' : 
+				var startSize = Math.round(p.nameHeight * scale);
+				v.style = 'shape=swimlane;html=1;rounded=1;arcSize=10;collapsible=0;startSize=' + startSize;
+				v.value = convertText(p.Number, true);
+				v.style += addAllStyles(v.style, p, a, v, isLastLblHTML);
+				v.style += getFillColor(p, a).replace('fillColor', 'swimlaneFillColor');
+				
+				var content = new mxCell('', new mxGeometry(0, startSize, w, h - startSize), 'rounded=1;arcSize=10;strokeColor=none;fillColor=none');
+				content.value = convertText(p.Text, true);
+				content.style += addAllStyles(content.style, p, a, content, isLastLblHTML);
+				content.vertex = true;
+				v.insert(content);
+				break;
 			case 'AndroidDevice' :
 				if (p.AndroidDeviceName != null)
 				{
@@ -8134,11 +8259,12 @@ LucidImporter = {};
 				break;
 				
 			case 'SMPage' :
+			//TODO Link icon (p.Url != "")
 				if (p.Group)
 				{
 					v.style += 'strokeColor=none;fillColor=none;'
 						
-					var item1 = new mxCell('', new mxGeometry(0, 0, w * 0.9, h * 0.9), 'part=1;');
+					var item1 = new mxCell('', new mxGeometry(0, 0, w * 0.9, h * 0.9), 'rounded=1;arcSize=3;part=1;');
 					item1.vertex = true;
 					v.insert(item1);
 					
@@ -8148,7 +8274,7 @@ LucidImporter = {};
 						getShadow(p) +
 						getStrokeWidth(p); 
 
-					var item2 = new mxCell('', new mxGeometry(w * 0.1, h * 0.1, w * 0.9, h * 0.9), 'part=1;');
+					var item2 = new mxCell('', new mxGeometry(w * 0.1, h * 0.1, w * 0.9, h * 0.9), 'rounded=1;arcSize=3;part=1;');
 					item2.vertex = true;
 					v.insert(item2);
 					
@@ -8162,15 +8288,17 @@ LucidImporter = {};
 					
 					if (p.Future)
 					{
-						item1.style += 'dashed=1;';
-						item2.style += 'dashed=1;';
+						item1.style += 'dashed=1;fixDash=1;';
+						item2.style += 'dashed=1;fixDash=1;';
 					}
 				}
 				else
 				{
+					v.style += 'rounded=1;arcSize=3;';
+					
 					if (p.Future)
 					{
-						v.style += 'dashed=1;';
+						v.style += 'dashed=1;fixDash=1;';
 					}
 					
 					v.value = convertText(p.Text);
@@ -8403,7 +8531,7 @@ LucidImporter = {};
 							getLabelStyle(p.Text, isLastLblHTML);
 						break
 					case 3:
-						v.style += 'shape=ext;dashed=1;dashPattern=2 1;' +
+						v.style += 'shape=ext;dashed=1;dashPattern=2 5;' +
 							getLabelStyle(p.Text, isLastLblHTML);
 						break
 					case 4:
@@ -11285,6 +11413,8 @@ LucidImporter = {};
 				break;
 				
 			case 'UI2TableBlock' :
+				//TODO Add this (probably a table support in general)
+				LucidImporter.hasUnknownShapes = true;
 				break;
 			case 'UI2ButtonBarBlock' :
 				v.style += addAllStyles(v.style, p, a, v);
@@ -12210,6 +12340,22 @@ LucidImporter = {};
 			case 'GCPInputBlank' :
 				addGCP2UserDeviceCard('transparent', 1, 1, w, h, v, p, a);
 				break;
+// no corresponding icons, only with shadows							
+//			case 'GCPAppEngineProductCard' :
+//				addGCP2ExpandedProductCard('compute.app_engine', 1, 1, w, h, v, p, a);
+//				break;
+//			case 'GCPCloudDataflowProductCard' :
+//				addGCP2ExpandedProductCard('cloud_dataflow', 1, 1, w, h, v, p, a);
+//				break;
+//			case 'GCPCloudDataprocProductCard' :
+//				addGCP2ExpandedProductCard('cloud_dataproc', 1, 1, w, h, v, p, a);
+//				break;
+//			case 'GCPComputeEngineProductCard' :
+//				addGCP2ExpandedProductCard('compute_engine', 1, 1, w, h, v, p, a);
+//				break;
+//			case 'GCPContainerEngineProductCard' :
+//				addGCP2ExpandedProductCard('compute_engine', 1, 1, w, h, v, p, a);
+//				break;
 			case 'PresentationFrameBlock' :
 				if (p.ZOrder == 0) //These are hidden
 				{
@@ -12525,6 +12671,57 @@ LucidImporter = {};
 				v.value = convertText(p);
 				v.style += addAllStyles(v.style, p, a, v, isLastLblHTML);
 			break;
+			case 'VPCSubnet2017':
+			case 'VirtualPrivateCloudContainer2017':
+			case 'ElasticBeanStalkContainer2017':
+			case 'EC2InstanceContents2017':
+			case 'AWSCloudContainer2017':
+			case 'CorporateDataCenterContainer2017':
+				//all use the same code, just icon is different
+				var iconStyle, iconW, iconH;
+				
+				switch(cls)
+				{
+					case 'VPCSubnet2017':
+						iconStyle = 'shape=mxgraph.aws3.permissions;fillColor=#D9A741;';
+						iconW = 30;
+						iconH = 35;
+					break;
+					case 'VirtualPrivateCloudContainer2017':
+						iconStyle = 'shape=mxgraph.aws3.virtual_private_cloud;fillColor=#F58536;';
+						iconW = 52;
+						iconH = 36;
+					break;
+					case 'ElasticBeanStalkContainer2017':
+						iconStyle = 'shape=mxgraph.aws3.elastic_beanstalk;fillColor=#F58536;';
+						iconW = 30;
+						iconH = 41;
+					break;
+					case 'EC2InstanceContents2017':
+						iconStyle = 'shape=mxgraph.aws3.instance;fillColor=#F58536;';
+						iconW = 40;
+						iconH = 41;
+					break;
+					case 'AWSCloudContainer2017':
+						iconStyle = 'shape=mxgraph.aws3.cloud;fillColor=#F58536;';
+						iconW = 52;
+						iconH = 36;
+					break;
+					case 'CorporateDataCenterContainer2017':
+						iconStyle = 'shape=mxgraph.aws3.corporate_data_center;fillColor=#7D7C7C;';
+						iconW = 30;
+						iconH = 42;
+					break;
+				}
+				v.style = 'rounded=1;arcSize=10;dashed=0;verticalAlign=bottom;';
+				v.value = convertText(p);
+				v.style += addAllStyles(v.style, p, a, v, isLastLblHTML);
+				v.geometry.y += 20;
+				v.geometry.height -= 20;
+				var icon = new mxCell('', new mxGeometry(20, -20, iconW, iconH), iconStyle);
+				icon.vertex = true;
+				v.insert(icon);
+			break;
 		}
 
 		if (v.style && v.style.indexOf('html') < 0)
diff --git a/src/main/webapp/js/diagramly/Init.js b/src/main/webapp/js/diagramly/Init.js
index 36294305..fc87b9a8 100644
--- a/src/main/webapp/js/diagramly/Init.js
+++ b/src/main/webapp/js/diagramly/Init.js
@@ -172,6 +172,18 @@ if (window.mxLanguages == null)
 	}
 }
 
+// Uses lightbox mode on viewer domain
+if (window.location.hostname == DRAWIO_LIGHTBOX_URL.substring(DRAWIO_LIGHTBOX_URL.indexOf('//') + 2))
+{
+	urlParams['lightbox'] = '1';
+}	
+
+// Lightbox enables chromeless mode
+if (urlParams['lightbox'] == '1')
+{
+	urlParams['chrome'] = '0';
+}
+
 /**
  * Returns the global UI setting before runngin static draw.io code
  */
@@ -180,27 +192,23 @@ window.uiTheme = window.uiTheme || (function()
 	var ui = urlParams['ui'];
 
 	// Known issue: No JSON object at this point in quirks in IE8
-	if (ui == null && typeof JSON !== 'undefined')
+	if (ui == null && isLocalStorage && typeof JSON !== 'undefined' && urlParams['lightbox'] != '1')
 	{
-		// Cannot use mxSettings here
-		if (isLocalStorage) 
+		try
 		{
-			try
-			{
-				var value = localStorage.getItem('.drawio-config');
-				
-				if (value != null)
-				{
-					ui = JSON.parse(value).ui || null;
-				}
-			}
-			catch (e)
+			var value = localStorage.getItem('.drawio-config');
+			
+			if (value != null)
 			{
-				// cookies are disabled, attempts to use local storage will cause
-				// a DOM error at a minimum on Chrome
-				isLocalStorage = false;
+				ui = JSON.parse(value).ui || null;
 			}
 		}
+		catch (e)
+		{
+			// cookies are disabled, attempts to use local storage will cause
+			// a DOM error at a minimum on Chrome
+			isLocalStorage = false;
+		}
 	}
 	
 	// Uses minimal theme on small screens
@@ -361,18 +369,6 @@ if (window.location.hostname == 'embed.diagrams.net')
 	urlParams['embed'] = '1';
 }	
 
-// Uses lightbox mode on viewer domain
-if (window.location.hostname == DRAWIO_LIGHTBOX_URL.substring(DRAWIO_LIGHTBOX_URL.indexOf('//') + 2))
-{
-	urlParams['lightbox'] = '1';
-}	
-
-// Lightbox enables chromeless mode
-if (urlParams['lightbox'] == '1')
-{
-	urlParams['chrome'] = '0';
-}
-
 // Fallback for cases where the hash property is not available
 if ((window.location.hash == null || window.location.hash.length <= 1) &&
 	urlParams['open'] != null)
diff --git a/src/main/webapp/js/extensions.min.js b/src/main/webapp/js/extensions.min.js
index 1ee784e9..ef4d72f3 100644
--- a/src/main/webapp/js/extensions.min.js
+++ b/src/main/webapp/js/extensions.min.js
@@ -133,7 +133,7 @@ q=new mxCell("",new mxGeometry(.1*t,0,.9*t,.9*r),"part=1;");q.vertex=!0;v.insert
 S(g,e,v);g.Rotatio=null;var ab=c(v.style,g,e,v,y);-1==ab.indexOf(mxConstants.STYLE_STROKEWIDTH)&&(ab=mxConstants.STYLE_STROKEWIDTH+"=1;"+ab);v.style="group;dropTarget=0;"+ub;var $c=.8*t,Be=t-$c,Yb=new mxCell("",new mxGeometry(.2,0,$c,r),"shape=ellipse;"+ab);Yb.vertex=!0;Yb.geometry.relative=!0;v.insert(Yb);ia=new mxCell("",new mxGeometry(0,.5,Be,1),"line;"+ab);ia.geometry.relative=!0;ia.vertex=!0;v.insert(ia);break;case "UMLComponentBoxBlock":case "UMLComponentBoxBlockV2":v.value=h(g);v.style="html=1;dropTarget=0;"+
 c(v.style,g,e,v,y);var Na=new mxCell("",new mxGeometry(1,0,15,15),"shape=component;jettyWidth=8;jettyHeight=4;");Na.geometry.relative=!0;Na.geometry.offset=new mxPoint(-20,5);Na.vertex=!0;v.insert(Na);break;case "UMLAssemblyConnectorBlock":case "UMLAssemblyConnectorBlockV2":ub=S(g,e,v);g.Rotatio=null;ab=c(v.style,g,e,v,y);-1==ab.indexOf(mxConstants.STYLE_STROKEWIDTH)&&(ab=mxConstants.STYLE_STROKEWIDTH+"=1;"+ab);v.style="group;dropTarget=0;"+ub;var Wd=.225*t,Xd=.1*t,$c=t-Wd-Xd,Yb=new mxCell("",new mxGeometry(.225,
 0,$c,r),"shape=providedRequiredInterface;verticalLabelPosition=bottom;"+ab);Yb.vertex=!0;Yb.geometry.relative=!0;v.insert(Yb);Ka=new mxCell("",new mxGeometry(0,.5,Wd,1),"line;"+ab);Ka.geometry.relative=!0;Ka.vertex=!0;v.insert(Ka);La=new mxCell("",new mxGeometry(.9,.5,Xd,1),"line;"+ab);La.geometry.relative=!0;La.vertex=!0;v.insert(La);break;case "BPMNActivity":v.value=h(g.Text);switch(g.bpmnActivityType){case 1:v.style+=m(g.Text,y);break;case 2:v.style+="shape=ext;double=1;"+m(g.Text,y);break;case 3:v.style+=
-"shape=ext;dashed=1;dashPattern=2 1;"+m(g.Text,y);break;case 4:v.style+="shape=ext;strokeWidth=2;"+m(g.Text,y)}if(0!=g.bpmnTaskType){switch(g.bpmnTaskType){case 1:q=new mxCell("",new mxGeometry(0,0,19,12),"shape=message;");q.geometry.offset=new mxPoint(4,7);break;case 2:q=new mxCell("",new mxGeometry(0,0,19,12),"shape=message;");q.geometry.offset=new mxPoint(4,7);break;case 3:q=new mxCell("",new mxGeometry(0,0,15,15),"shape=mxgraph.bpmn.user_task;");q.geometry.offset=new mxPoint(4,5);break;case 4:q=
+"shape=ext;dashed=1;dashPattern=2 5;"+m(g.Text,y);break;case 4:v.style+="shape=ext;strokeWidth=2;"+m(g.Text,y)}if(0!=g.bpmnTaskType){switch(g.bpmnTaskType){case 1:q=new mxCell("",new mxGeometry(0,0,19,12),"shape=message;");q.geometry.offset=new mxPoint(4,7);break;case 2:q=new mxCell("",new mxGeometry(0,0,19,12),"shape=message;");q.geometry.offset=new mxPoint(4,7);break;case 3:q=new mxCell("",new mxGeometry(0,0,15,15),"shape=mxgraph.bpmn.user_task;");q.geometry.offset=new mxPoint(4,5);break;case 4:q=
 new mxCell("",new mxGeometry(0,0,15,10),"shape=mxgraph.bpmn.manual_task;");q.geometry.offset=new mxPoint(4,7);break;case 5:q=new mxCell("",new mxGeometry(0,0,18,13),"shape=mxgraph.bpmn.business_rule_task;");q.geometry.offset=new mxPoint(4,7);break;case 6:q=new mxCell("",new mxGeometry(0,0,15,15),"shape=mxgraph.bpmn.service_task;");q.geometry.offset=new mxPoint(4,5);break;case 7:q=new mxCell("",new mxGeometry(0,0,15,15),"shape=mxgraph.bpmn.script_task;"),q.geometry.offset=new mxPoint(4,5)}if(1==g.bpmnTaskType){var Zb=
 N(g,e),H=C(g,e),H=H.replace("strokeColor","fillColor"),Zb=Zb.replace("fillColor","strokeColor");""==H&&(H="fillColor=#000000;");""==Zb&&(Zb="strokeColor=#ffffff;");q.style+=Zb+H+"part=1;"}else q.style+=N(g,e)+C(g,e)+"part=1;";q.geometry.relative=!0;q.vertex=!0;v.insert(q)}var Lc=0;0!=g.bpmnActivityMarker1&&Lc++;0!=g.bpmnActivityMarker2&&Lc++;var Oa=0;1==Lc?Oa=-7.5:2==Lc&&(Oa=-19);if(0!=g.bpmnActivityMarker1){switch(g.bpmnActivityMarker1){case 1:q=new mxCell("",new mxGeometry(.5,1,15,15),"shape=plus;part=1;");
 q.geometry.offset=new mxPoint(Oa,-20);q.style+=N(g,e)+C(g,e);break;case 2:q=new mxCell("",new mxGeometry(.5,1,15,15),"shape=mxgraph.bpmn.loop;part=1;");q.geometry.offset=new mxPoint(Oa,-20);q.style+=N(g,e)+C(g,e);break;case 3:q=new mxCell("",new mxGeometry(.5,1,15,15),"shape=parallelMarker;part=1;");q.geometry.offset=new mxPoint(Oa,-20);q.style+=N(g,e)+C(g,e);break;case 4:q=new mxCell("",new mxGeometry(.5,1,15,15),"shape=parallelMarker;direction=south;part=1;");q.geometry.offset=new mxPoint(Oa,-20);
@@ -292,24 +292,24 @@ if(0!=d&&a.value){var k=a.geometry.width,n=a.geometry.height,c=k,f=n,x=0,e=0;if(
 var Jb=0,Kb=0,y=!1,nd=["AEUSBBlock","AGSCutandpasteBlock","iOSDeviceiPadLandscape","iOSDeviceiPadProLandscape"],od=["fpDoor"],Sb={None:"none;",Arrow:"block;endFill=1;","Hollow Arrow":"block;endFill=0;","Open Arrow":"open;","CFN ERD Zero Or More Arrow":"ERzeroToMany;startSize=10;","CFN ERD One Or More Arrow":"ERoneToMany;startSize=10;","CFN ERD Many Arrow":"ERmany;startSize=10;","CFN ERD Exactly One Arrow":"ERmandOne;startSize=10;","CFN ERD Zero Or One Arrow":"ERzeroToOne;startSize=10;","CFN ERD One Arrow":"ERone;startSize=16;",
 Generalization:"block;endFill=0;startSize=12;","Big Open Arrow":"open;startSize=10;",Asynch1:"openAsync;flipH=1;startSize=10;",Asynch2:"openAsync;startSize=10;",Aggregation:"diamond;endFill=0;startSize=16;",Composition:"diamond;endFill=1;startSize=16;",BlockEnd:"none;endFill=1;startSize=16;",Measure:"ERone;startSize=10;"},Ib={DefaultTextBlockNew:"strokeColor=none;fillColor=none",DefaultTextBlock:"strokeColor=none;fillColor=none",DefaultSquareBlock:"",RectangleBlock:"",DefaultNoteBlock:"shape=note;size=15",
 DefaultNoteBlockV2:"shape=note;size=15",HotspotBlock:"strokeColor=none;fillColor=none",ImageSearchBlock2:"shape=image",UserImage2Block:"shape=image",ProcessBlock:"",DecisionBlock:"rhombus",TerminatorBlock:"rounded=1;arcSize=50",PredefinedProcessBlock:"shape=process",DocumentBlock:"shape=document;boundedLbl=1",MultiDocumentBlock:"shape=mxgraph.flowchart.multi-document",ManualInputBlock:"shape=manualInput;size=15",PreparationBlock:"shape=hexagon;perimeter=hexagonPerimeter2",DataBlock:"shape=parallelogram;perimeter=parallelogramPerimeter;anchorPointDirection=0",
-DataBlockNew:"shape=parallelogram;perimeter=parallelogramPerimeter;anchorPointDirection=0",DatabaseBlock:"shape=cylinder;size=0.1;anchorPointDirection=0;boundedLbl=1;",DirectAccessStorageBlock:"shape=cylinder;direction=south;size=0.1;anchorPointDirection=0;boundedLbl=1;",InternalStorageBlock:"shape=internalStorage;dx=10;dy=10",PaperTapeBlock:"shape=tape;size=0.2",ManualOperationBlockNew:"shape=trapezoid;perimeter=trapezoidPerimeter;anchorPointDirection=0;flipV=1",DelayBlock:"shape=delay",StoredDataBlock:"shape=dataStorage",
+DataBlockNew:"shape=parallelogram;perimeter=parallelogramPerimeter;anchorPointDirection=0",DatabaseBlock:"shape=cylinder3;size=10;anchorPointDirection=0;boundedLbl=1;",DirectAccessStorageBlock:"shape=cylinder3;direction=south;size=10;anchorPointDirection=0;boundedLbl=1;",InternalStorageBlock:"shape=internalStorage;dx=10;dy=10",PaperTapeBlock:"shape=tape;size=0.2",ManualOperationBlockNew:"shape=trapezoid;perimeter=trapezoidPerimeter;anchorPointDirection=0;flipV=1",DelayBlock:"shape=delay",StoredDataBlock:"shape=cylinder3;boundedLbl=1;size=15;lid=0;direction=south;",
 MergeBlock:"triangle;direction=south;anchorPointDirection=0",ConnectorBlock:"ellipse",OrBlock:"shape=mxgraph.flowchart.summing_function",SummingJunctionBlock:"shape=mxgraph.flowchart.or",DisplayBlock:"shape=display",OffPageLinkBlock:"shape=offPageConnector",BraceNoteBlock:"mxCompositeShape",NoteBlock:"mxCompositeShape",AdvancedSwimLaneBlock:"mxCompositeShape",AdvancedSwimLaneBlockRotated:"mxCompositeShape",RectangleContainerBlock:"container=1;collapsible=0",DiamondContainerBlock:"shape=rhombus;container=1;collapsible=0",
-RoundedRectangleContainerBlock:"container=1;rounded=1;absoluteArcSize=1;arcSize=24;collapsible=0",CircleContainerBlock:"ellipse;container=1;collapsible=0",PillContainerBlock:"shape=mxgraph.flowchart.terminator;container=1;collapsible=0",BraceBlock:"mxCompositeShape",BracketBlock:"mxCompositeShape",BraceBlockRotated:"mxCompositeShape",BracketBlockRotated:"mxCompositeShape",IsoscelesTriangleBlock:"triangle;direction=north;anchorPointDirection=0",RightTriangleBlock:"shape=mxgraph.basic.orthogonal_triangle",
-PentagonBlock:"shape=mxgraph.basic.pentagon",HexagonBlock:"shape=hexagon;perimeter=hexagonPerimeter2",OctagonBlock:"shape=mxgraph.basic.octagon",CrossBlock:"shape=cross;size=0.6",CloudBlock:"ellipse;shape=cloud",HeartBlock:"shape=mxgraph.basic.heart",RightArrowBlock:"mxCompositeShape",DoubleArrowBlock:"mxCompositeShape",CalloutBlock:"shape=mxgraph.basic.rectangular_callout",ShapeCircleBlock:"ellipse",ShapePolyStarBlock:"shape=mxgraph.basic.star",ShapeDiamondBlock:"rhombus",UI2HotspotBlock:"opacity=50;strokeColor=none",
+RoundedRectangleContainerBlock:"container=1;rounded=1;absoluteArcSize=1;arcSize=24;collapsible=0",CircleContainerBlock:"ellipse;container=1;collapsible=0",PillContainerBlock:"shape=mxgraph.flowchart.terminator;container=1;collapsible=0",BraceBlock:"mxCompositeShape",BracketBlock:"mxCompositeShape",BraceBlockRotated:"mxCompositeShape",BracketBlockRotated:"mxCompositeShape",IsoscelesTriangleBlock:"shape=mxgraph.basic.acute_triangle;dx=0.5;anchorPointDirection=0",RightTriangleBlock:"shape=mxgraph.basic.orthogonal_triangle",
+PentagonBlock:"shape=mxgraph.basic.pentagon",HexagonBlock:"shape=hexagon;perimeter=hexagonPerimeter2",OctagonBlock:"shape=mxgraph.basic.octagon2;dx=15;",CrossBlock:"shape=cross;size=0.6",CloudBlock:"ellipse;shape=cloud",HeartBlock:"shape=mxgraph.basic.heart",RightArrowBlock:"mxCompositeShape",DoubleArrowBlock:"mxCompositeShape",CalloutBlock:"shape=mxgraph.basic.rectangular_callout",ShapeCircleBlock:"ellipse",ShapePolyStarBlock:"shape=mxgraph.basic.star",ShapeDiamondBlock:"rhombus",UI2HotspotBlock:"opacity=50;strokeColor=none",
 AndroidDevice:"mxCompositeShape",AndroidAlertDialog:"mxCompositeShape",AndroidDateDialog:"mxCompositeShape",AndroidTimeDialog:"mxCompositeShape",AndroidListItems:"mxCompositeShape",AndroidTabs:"mxCompositeShape",AndroidProgressBar:"mxCompositeShape",AndroidImageBlock:"mxCompositeShape",AndroidTextBlock:"mxCompositeShape",AndroidActionBar:"mxCompositeShape",AndroidButton:"mxCompositeShape",AndroidTextBox:"mxCompositeShape",AndroidRadioButton:"mxCompositeShape",AndroidCheckBox:"mxCompositeShape",AndroidToggle:"mxCompositeShape",
 AndroidSlider:"mxCompositeShape",AndroidIconCheck:"shape=mxgraph.ios7.misc.check",AndroidIconCancel:"shape=mxgraph.atlassian.x",AndroidIconCollapse:"shape=mxgraph.ios7.misc.up",AndroidIconExpand:"shape=mxgraph.ios7.misc.down",AndroidIconNext:"shape=mxgraph.ios7.misc.right",AndroidIconPrevious:"shape=mxgraph.ios7.misc.left",AndroidIconRefresh:NaN,AndroidIconInformation:"shape=mxgraph.ios7.icons.info",AndroidIconSearch:"shape=mxgraph.ios7.icons.looking_glass",AndroidIconSettings:"shape=mxgraph.ios7.icons.volume;direction=south",
 AndroidIconTrash:"shape=mxgraph.ios7.icons.trashcan",AndroidIconEmail:"shape=mxgraph.mockup.misc.mail2",AndroidIconNew:"shape=mxgraph.ios7.misc.flagged",iOSDeviceiPhoneSE:"shape=mxgraph.ios7.misc.iphone",iOSDeviceiPhone6s:"shape=mxgraph.ios7.misc.iphone",iOSDeviceiPhone6sPlus:"shape=mxgraph.ios7.misc.iphone",iOSDeviceiPadPortrait:"shape=mxgraph.ios7.misc.ipad7inch",iOSDeviceiPadLandscape:"shape=mxgraph.ios7.misc.ipad7inch",iOSDeviceiPadProPortrait:"shape=mxgraph.ios7.misc.ipad7inch",iOSDeviceiPadProLandscape:"shape=mxgraph.ios7.misc.ipad10inch",
 iOSButton:"fillColor=none;strokeColor=none;",iOSSegmentedControl:"mxCompositeShape",iOSStepper:"shape=mxgraph.ios7.misc.adjust",iOSToggle:"shape=mxgraph.ios7ui.onOffButton;buttonState=on;strokeColor2=#aaaaaa;fillColor2=#ffffff",iOSSlider:"mxCompositeShape",iOSProgressBar:"mxCompositeShape",iOSPageControls:"mxCompositeShape",iOSStatusBar:"mxCompositeShape",iOSSearchBar:"mxCompositeShape",iOSNavBar:"mxCompositeShape",iOSTabs:"mxCompositeShape",iOSUniversalKeyboard:"shape=mxgraph.ios.iKeybLett",iOSDatePicker:"mxCompositeShape",
 iOSTimePicker:"mxCompositeShape",iOSCountdownPicker:"mxCompositeShape",iOSBasicCell:"mxCompositeShape",iOSSubtitleCell:"mxCompositeShape",iOSRightDetailCell:"mxCompositeShape",iOSLeftDetailCell:"mxCompositeShape",iOSTableGroupedSectionBreak:"mxCompositeShape",iOSTablePlainHeaderFooter:"mxCompositeShape",MindMapBlock:"",MindMapStadiumBlock:"arcSize=50",MindMapCloud:"shape=cloud",MindMapCircle:"ellipse",MindMapIsoscelesTriangleBlock:"shape=triangle;direction=north",MindMapDiamondBlock:"shape=rhombus",
-MindMapPentagonBlock:"shape=mxgraph.basic.pentagon",MindMapHexagonBlock:"shape=hexagon;perimeter=hexagonPerimeter2",MindMapOctagonBlock:"shape=mxgraph.basic.octagon",MindMapCrossBlock:"shape=mxgraph.basic.cross2;dx=20",ERDEntityBlock:"mxCompositeShape",ERDEntityBlock2:"mxCompositeShape",ERDEntityBlock3:"mxCompositeShape",ERDEntityBlock4:"mxCompositeShape",UMLClassBlock:"mxCompositeShape",UMLActiveClassBlock:"shape=process",UMLMultiplicityBlock:"mxCompositeShape",UMLPackageBlock:"shape=folder;tabPosition=left",
-UMLConstraintBlock:"mxCompositeShape",UMLNoteBlock:"shape=note;size=15",UMLNoteBlockV2:"shape=note;size=15",UMLTextBlock:"mxCompositeShape",UMLActorBlock:"shape=umlActor;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;whiteSpace=nowrap",UMLUseCaseBlock:"ellipse",UMLCircleContainerBlock:"ellipse;container=1",UMLRectangleContainerBlock:"container=1",UMLOptionLoopBlock:"shape=mxgraph.sysml.package2;xSize=90;overflow=fill",UMLAlternativeBlock2:"shape=mxgraph.sysml.package2;xSize=90;overflow=fill",
-UMLStartBlock:"ellipse;fillColor=#000000",UMLStateBlock:"mxCompositeShape",UMLDecisionBlock:"shape=rhombus;",UMLHForkJoinBlock:"fillColor=#000000",UMLVForkJoinBlock:"fillColor=#000000",UMLFlowFinalBlock:"shape=mxgraph.flowchart.or",UMLHistoryStateBlock:"ellipse",UMLEndBlock:"shape=mxgraph.bpmn.shape;outline=end;symbol=terminate;strokeColor=#000000;fillColor=#ffffff",UMLObjectBlock:"",UMLSendSignalBlock:"shape=mxgraph.sysml.sendSigAct",UMLReceiveSignalBlock:"shape=mxgraph.sysml.accEvent;flipH=1",UMLAcceptTimeEventActionBlock:"shape=mxgraph.sysml.timeEvent",
+MindMapPentagonBlock:"shape=mxgraph.basic.pentagon",MindMapHexagonBlock:"shape=hexagon;perimeter=hexagonPerimeter2",MindMapOctagonBlock:"shape=mxgraph.basic.octagon2;dx=10;",MindMapCrossBlock:"shape=mxgraph.basic.cross2;dx=20",ERDEntityBlock:"mxCompositeShape",ERDEntityBlock2:"mxCompositeShape",ERDEntityBlock3:"mxCompositeShape",ERDEntityBlock4:"mxCompositeShape",UMLClassBlock:"mxCompositeShape",UMLActiveClassBlock:"shape=process",UMLMultiplicityBlock:"mxCompositeShape",UMLPackageBlock:"",UMLConstraintBlock:"mxCompositeShape",
+UMLNoteBlock:"shape=note;size=15",UMLNoteBlockV2:"shape=note;size=15",UMLTextBlock:"mxCompositeShape",UMLActorBlock:"shape=umlActor;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;whiteSpace=nowrap",UMLUseCaseBlock:"ellipse",UMLCircleContainerBlock:"ellipse;container=1",UMLRectangleContainerBlock:"container=1",UMLOptionLoopBlock:"shape=mxgraph.sysml.package2;xSize=90;overflow=fill",UMLAlternativeBlock2:"shape=mxgraph.sysml.package2;xSize=90;overflow=fill",UMLStartBlock:"ellipse;fillColor=#000000",
+UMLStateBlock:"mxCompositeShape",UMLDecisionBlock:"shape=rhombus;",UMLHForkJoinBlock:"fillColor=#000000",UMLVForkJoinBlock:"fillColor=#000000",UMLFlowFinalBlock:"shape=mxgraph.flowchart.or",UMLHistoryStateBlock:"ellipse",UMLEndBlock:"shape=mxgraph.bpmn.shape;outline=end;symbol=terminate;strokeColor=#000000;fillColor=#ffffff",UMLObjectBlock:"",UMLSendSignalBlock:"shape=mxgraph.sysml.sendSigAct",UMLReceiveSignalBlock:"shape=mxgraph.sysml.accEvent;flipH=1",UMLAcceptTimeEventActionBlock:"shape=mxgraph.sysml.timeEvent",
 UMLOffPageLinkBlock:"shape=mxgraph.sysml.sendSigAct;direction=south",UMLMultiLanePoolBlock:"mxCompositeShape",UMLMultiLanePoolRotatedBlock:"mxCompositeShape",UMLMultidimensionalSwimlane:"mxCompositeShape",UMLActivationBlock:"",UMLDeletionBlock:"shape=mxgraph.sysml.x;strokeWidth=4",UMLSeqEntityBlock:"shape=mxgraph.electrical.radio.microphone_1;direction=north",UMLComponentBlock:"shape=component;align=left;spacingLeft=36",UMLComponentBlockV2:"shape=component;align=left;spacingLeft=36",UMLNodeBlock:"shape=cube;size=12;flipH=1;verticalAlign=top;align=left;spacingTop=10;spacingLeft=5",
 UMLNodeBlockV2:"shape=cube;size=12;flipH=1;verticalAlign=top;align=left;spacingTop=10;spacingLeft=5",UMLComponentInterfaceBlock:"ellipse",UMLComponentInterfaceBlockV2:"ellipse",UMLComponentBoxBlock:"mxCompositeShape",UMLComponentBoxBlockV2:"mxCompositeShape",UMLAssemblyConnectorBlock:"mxCompositeShape",UMLAssemblyConnectorBlockV2:"mxCompositeShape",UMLProvidedInterfaceBlock:"mxCompositeShape",UMLProvidedInterfaceBlockV2:"mxCompositeShape",UMLRequiredInterfaceBlock:"shape=requires;direction=north",
 UMLRequiredInterfaceBlockV2:"shape=requires;direction=north",UMLSwimLaneBlockV2:"mxCompositeShape",UMLSwimLaneBlock:"swimlane;startSize=25;container=1;collapsible=0;dropTarget=0;fontStyle=0",UMLEntityBlock:"",UMLWeakEntityBlock:"shape=ext;double=1",UMLAttributeBlock:"ellipse",UMLMultivaluedAttributeBlock:"shape=doubleEllipse",UMLRelationshipBlock:"shape=rhombus",UMLWeakRelationshipBlock:"shape=rhombus;double=1",BPMNActivity:"mxCompositeShape",BPMNEvent:"mxCompositeShape",BPMNChoreography:"mxCompositeShape",
 BPMNConversation:"mxCompositeShape",BPMNGateway:"mxCompositeShape",BPMNData:"mxCompositeShape",BPMNDataStore:"shape=datastore",BPMNAdvancedPoolBlock:"mxCompositeShape",BPMNAdvancedPoolBlockRotated:"mxCompositeShape",BPMNBlackPool:"mxCompositeShape",BPMNTextAnnotation:"mxCompositeShape",DFDExternalEntityBlock:"mxCompositeShape",DFDExternalEntityBlock2:"",YDMDFDProcessBlock:"ellipse",YDMDFDDataStoreBlock:"shape=partialRectangle;right=0;left=0",GSDFDProcessBlock:"shape=swimlane;rounded=1;arcSize=10",
 GSDFDProcessBlock2:"rounded=1;arcSize=10;",GSDFDDataStoreBlock:"mxCompositeShape",GSDFDDataStoreBlock2:"shape=partialRectangle;right=0",OrgBlock:"",DefaultTableBlock:"mxCompositeShape",VSMCustomerSupplierBlock:"shape=mxgraph.lean_mapping.outside_sources",VSMDedicatedProcessBlock:"mxCompositeShape",VSMSharedProcessBlock:"mxCompositeShape",VSMWorkcellBlock:"mxCompositeShape",VSMDatacellBlock:"mxCompositeShape",VSMInventoryBlock:"mxCompositeShape",VSMSupermarketBlock:"mxCompositeShape",VSMPhysicalPullBlock:"shape=mxgraph.lean_mapping.physical_pull;direction=south",
-VSMFIFOLaneBlock:"mxCompositeShape",VSMSafetyBufferStockBlock:"mxCompositeShape",VSMExternalShipmentAirplaneBlock:"shape=mxgraph.lean_mapping.airplane_7",VSMExternalShipmentForkliftBlock:"shape=mxgraph.lean_mapping.move_by_forklift",VSMExternalShipmentTruckBlock:"shape=mxgraph.lean_mapping.truck_shipment",VSMExternalShipmentBoatBlock:"shape=mxgraph.lean_mapping.boat_shipment",VSMProductionControlBlock:"mxCompositeShape",VSMOtherInformationBlock:"",VSMSequencedPullBallBlock:"shape=mxgraph.lean_mapping.sequenced_pull_ball",
+VSMFIFOLaneBlock:"mxCompositeShape",VSMSafetyBufferStockBlock:"mxCompositeShape",VSMExternalShipmentAirplaneBlock:"shape=mxgraph.lean_mapping.airplane_7",VSMExternalShipmentForkliftBlock:"shape=mxgraph.lean_mapping.move_by_forklift",VSMExternalShipmentTruckBlock:"shape=mxgraph.lean_mapping.truck_shipment;align=left;",VSMExternalShipmentBoatBlock:"shape=mxgraph.lean_mapping.boat_shipment;verticalAlign=bottom;",VSMProductionControlBlock:"mxCompositeShape",VSMOtherInformationBlock:"",VSMSequencedPullBallBlock:"shape=mxgraph.lean_mapping.sequenced_pull_ball",
 VSMMRPERPBlock:"shape=mxgraph.lean_mapping.mrp_erp;whiteSpace=wrap",VSMLoadLevelingBlock:"shape=mxgraph.lean_mapping.load_leveling",VSMGoSeeBlock:"shape=mxgraph.lean_mapping.go_see_production_scheduling;flipH=1",VSMGoSeeProductionBlock:"mxCompositeShape",VSMVerbalInfoBlock:"shape=mxgraph.lean_mapping.verbal",VSMKaizenBurstBlock:"shape=mxgraph.lean_mapping.kaizen_lightening_burst",VSMOperatorBlock:"shape=mxgraph.lean_mapping.operator;flipV=1",VSMTimelineBlock:"mxCompositeShape",VSMQualityProblemBlock:"shape=mxgraph.lean_mapping.quality_problem",
 VSMProductionKanbanSingleBlock:"shape=card;size=18;flipH=1;",VSMProductionKanbanBatchBlock:"mxCompositeShape",VSMWithdrawalKanbanBlock:"shape=mxgraph.lean_mapping.withdrawal_kanban",VSMSignalKanbanBlock:"shape=triangle;direction=south;anchorPointDirection=0",VSMKanbanPostBlock:"shape=mxgraph.lean_mapping.kanban_post",VSMShipmentArrow:"shape=singleArrow;arrowWidth=0.5;arrowSize=0.13",VSMPushArrow:"shape=mxgraph.lean_mapping.push_arrow",AWSElasticComputeCloudBlock2:"mxCompositeShape",AWSInstanceBlock2:"strokeColor=none;shape=mxgraph.aws3.instance",
 AWSInstancesBlock2:"strokeColor=none;shape=mxgraph.aws3.instances;verticalLabelPosition=bottom;align=center;verticalAlign=top",AWSAMIBlock2:"strokeColor=none;shape=mxgraph.aws3.ami;verticalLabelPosition=bottom;align=center;verticalAlign=top",AWSDBonInstanceBlock2:"strokeColor=none;shape=mxgraph.aws3.db_on_instance;verticalLabelPosition=bottom;align=center;verticalAlign=top",AWSInstanceCloudWatchBlock2:"strokeColor=none;shape=mxgraph.aws3.instance_with_cloudwatch;verticalLabelPosition=bottom;align=center;verticalAlign=top",
@@ -590,13 +590,18 @@ Cisco_cisco_voice_atm_switch:"shape=mxgraph.cisco.switches.voice_atm_switch;fill
 Cisco_cisco_vpn_gateway:"shape=mxgraph.cisco.hubs_and_gateways.vpn_gateway;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_VSS:"shape=mxgraph.cisco.misc.vss;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wae:"shape=mxgraph.cisco.misc.wae;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wavelength_router:"shape=mxgraph.cisco.routers.wavelength_router;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_web_browser:"shape=mxgraph.cisco.computers_and_peripherals.web_browser;fillColor=#036897;strokeColor=#ffffff",
 Cisco_cisco_web_cluster:"shape=mxgraph.cisco.storage.web_cluster;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wi_fi_tag:"shape=mxgraph.cisco.wireless.wi-fi_tag;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wireless_bridge:"shape=mxgraph.cisco.wireless.wireless_bridge;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wireless_location_appliance:"shape=mxgraph.cisco.wireless.wireless_location_appliance;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wireless:"shape=mxgraph.cisco.wireless.wireless;fillColor=#036897;strokeColor=#ffffff",
 Cisco_cisco_wireless_transport:"shape=mxgraph.cisco.wireless.wireless_transport;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wism:"shape=mxgraph.cisco.misc.wism;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_wlan_controller:"shape=mxgraph.cisco.wireless.wlan_controller;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_workgroup_director:"shape=mxgraph.cisco.directors.workgroup_director;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_workgroup_switch:"shape=mxgraph.cisco.switches.workgroup_switch;fillColor=#036897;strokeColor=#ffffff",
-Cisco_cisco_workstation:"shape=mxgraph.cisco.computers_and_peripherals.workstation;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_www_server:"shape=mxgraph.cisco.servers.www_server;fillColor=#036897;strokeColor=#ffffff",NET_PC:"shape=mxgraph.networks.pc;fillColor=#29AAE1;strokeColor=#ffffff","NET_Virtual-PC":"shape=mxgraph.networks.virtual_pc;fillColor=#29AAE1;strokeColor=#ffffff",NET_Terminal:"shape=mxgraph.networks.terminal;fillColor=#29AAE1;strokeColor=#ffffff",NET_DataPipe:"shape=mxgraph.networks.bus;fillColor=#29AAE1;strokeColor=#ffffff",
-NET_SlateDevice:"shape=mxgraph.networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff",NET_TabletDevice:"shape=mxgraph.networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff",NET_Laptop:"shape=mxgraph.networks.laptop;fillColor=#29AAE1;strokeColor=#ffffff",NET_PDA:"shape=mxgraph.networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff",NET_CRTMonitor:"shape=mxgraph.networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff",NET_LCDMonitor:"shape=mxgraph.networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff",
-NET_RadioTower:"shape=mxgraph.networks.radio_tower;fillColor=#29AAE1;strokeColor=#ffffff",NET_ExternalHardDrive:"shape=mxgraph.networks.external_storage;fillColor=#29AAE1;strokeColor=#ffffff",NET_SatelliteDish:"shape=mxgraph.networks.satellite_dish;fillColor=#29AAE1;strokeColor=#ffffff",NET_Satellite:"shape=mxgraph.networks.satellite;fillColor=#29AAE1;strokeColor=#ffffff",NET_WirelessAccessPoint:"shape=mxgraph.networks.radio_tower;fillColor=#29AAE1;strokeColor=#29AAE1",NET_RingNetwork:"mxCompositeShape",
-NET_Ethernet:"mxCompositeShape",NET_Server:"shape=mxgraph.networks.server;fillColor=#29AAE1;strokeColor=#ffffff",NET_Mainframe:"shape=mxgraph.networks.mainframe;fillColor=#29AAE1;strokeColor=#ffffff",NET_Router:"shape=mxgraph.networks.wireless_hub;fillColor=#29AAE1;strokeColor=#ffffff",NET_Switch:"shape=mxgraph.networks.switch;fillColor=#29AAE1;strokeColor=#ffffff",NET_Firewall:"shape=mxgraph.networks.firewall;fillColor=#29AAE1;strokeColor=#ffffff",NET_User:"shape=mxgraph.networks.user_male;fillColor=#29AAE1;strokeColor=#ffffff",
-NET_CommLink:"shape=mxgraph.networks.comm_link_edge;fillColor=#29AAE1;strokeColor=#ffffff",NET_SuperComputer:"shape=mxgraph.networks.supercomputer;fillColor=#29AAE1;strokeColor=#ffffff",NET_VirtualServer:"shape=mxgraph.networks.virtual_server;fillColor=#29AAE1;strokeColor=#ffffff",NET_Printer:"shape=mxgraph.networks.printer;fillColor=#29AAE1;strokeColor=#ffffff",NET_Scanner:"shape=mxgraph.networks.scanner;fillColor=#29AAE1;strokeColor=#ffffff",NET_Copier:"shape=mxgraph.networks.copier;fillColor=#29AAE1;strokeColor=#ffffff",
-NET_MultiFunctionMachine:"shape=mxgraph.networks.copier;fillColor=#29AAE1;strokeColor=#ffffff",NET_Projector:"shape=mxgraph.networks.video_projector;fillColor=#29AAE1;strokeColor=#ffffff",NET_ProjectorScreen:"shape=mxgraph.networks.video_projector_screen;fillColor=#29AAE1;strokeColor=#ffffff",NET_Bridge:"shape=mxgraph.networks.router;fillColor=#29AAE1;strokeColor=#ffffff",NET_Hub:"shape=mxgraph.networks.hub;fillColor=#29AAE1;strokeColor=#ffffff",NET_Modem:"shape=mxgraph.networks.modem;fillColor=#29AAE1;strokeColor=#ffffff",
-NET_Telephone:"shape=mxgraph.signs.tech.telephone_5;fillColor=#29AAE1;strokeColor=#ffffff",NET_CellPhone:"shape=mxgraph.networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff",NET_SmartPhone:"shape=mxgraph.networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff",NET_Camera:"shape=mxgraph.signs.tech.camera_2;fillColor=#29AAE1;strokeColor=#ffffff",RackServerRack:"shape=mxgraph.rackGeneral.container;container=1;collapsible=0;childLayout=rack;marginLeft=9;marginRight=9;marginTop=21;marginBottom=22;textColor=#000000;numDisp=off",
+Cisco_cisco_workstation:"shape=mxgraph.cisco.computers_and_peripherals.workstation;fillColor=#036897;strokeColor=#ffffff",Cisco_cisco_www_server:"shape=mxgraph.cisco.servers.www_server;fillColor=#036897;strokeColor=#ffffff",NET_PC:"shape=mxgraph.networks.pc;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;","NET_Virtual-PC":"shape=mxgraph.networks.virtual_pc;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Terminal:"shape=mxgraph.networks.terminal;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_DataPipe:"shape=mxgraph.networks.bus;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_SlateDevice:"shape=mxgraph.networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_TabletDevice:"shape=mxgraph.networks.tablet;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Laptop:"shape=mxgraph.networks.laptop;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_PDA:"shape=mxgraph.networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_CRTMonitor:"shape=mxgraph.networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_LCDMonitor:"shape=mxgraph.networks.monitor;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_RadioTower:"shape=mxgraph.networks.radio_tower;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_ExternalHardDrive:"shape=mxgraph.networks.external_storage;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_SatelliteDish:"shape=mxgraph.networks.satellite_dish;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Satellite:"shape=mxgraph.networks.satellite;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_WirelessAccessPoint:"shape=mxgraph.networks.radio_tower;fillColor=#29AAE1;strokeColor=#29AAE1;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_RingNetwork:"mxCompositeShape",NET_Ethernet:"mxCompositeShape",NET_Server:"shape=mxgraph.networks.server;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Mainframe:"shape=mxgraph.networks.mainframe;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Router:"shape=mxgraph.networks.wireless_hub;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Switch:"shape=mxgraph.networks.switch;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Firewall:"shape=mxgraph.networks.firewall;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_User:"shape=mxgraph.networks.user_male;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_CommLink:"shape=mxgraph.networks.comm_link_edge;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_SuperComputer:"shape=mxgraph.networks.supercomputer;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_VirtualServer:"shape=mxgraph.networks.virtual_server;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Printer:"shape=mxgraph.networks.printer;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Scanner:"shape=mxgraph.networks.scanner;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Copier:"shape=mxgraph.networks.copier;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_MultiFunctionMachine:"shape=mxgraph.networks.copier;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Projector:"shape=mxgraph.networks.video_projector;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_ProjectorScreen:"shape=mxgraph.networks.video_projector_screen;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Bridge:"shape=mxgraph.networks.router;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_Hub:"shape=mxgraph.networks.hub;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Modem:"shape=mxgraph.networks.modem;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Telephone:"shape=mxgraph.signs.tech.telephone_5;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_CellPhone:"shape=mxgraph.networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",
+NET_SmartPhone:"shape=mxgraph.networks.mobile;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",NET_Camera:"shape=mxgraph.signs.tech.camera_2;fillColor=#29AAE1;strokeColor=#ffffff;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;",RackServerRack:"shape=mxgraph.rackGeneral.container;container=1;collapsible=0;childLayout=rack;marginLeft=9;marginRight=9;marginTop=21;marginBottom=22;textColor=#000000;numDisp=off",
 RackBlank:"shape=mxgraph.rackGeneral.plate;strokeColor=#666666;labelPosition=left;align=right;spacingRight=15;fillColor=#e8e8e8",RackRaidArray:"shape=mxgraph.rack.cisco.cisco_carrier_packet_transport_50;labelPosition=left;align=right;spacingRight=15",RackServer:"shape=mxgraph.rack.oracle.sunfire_x4100;labelPosition=left;align=right;spacingRight=15",RackEthernetSwitch:"shape=mxgraph.rack.cisco.cisco_nexus_3016_switch;labelPosition=left;align=right;spacingRight=15",RackPatchPanel:"shape=mxgraph.rack.general.cat5e_rack_mount_patch_panel_24_ports;strokeColor=#666666;labelPosition=left;align=right;spacingRight=15",
 RackRouter:"shape=mxgraph.rack.cisco.cisco_asr_1001_router;labelPosition=left;align=right;spacingRight=15",RackMonitor:"shape=mxgraph.rack.ibm.ibm_1u_flat_panel_console_kit;labelPosition=left;align=right;spacingRight=15",RackKeyboard:"shape=mxgraph.rack.cisco.cisco_1905_serial_integrated_services_router;labelPosition=left;align=right;spacingRight=15",RackPowerStrip:"shape=mxgraph.rack.dell.power_strip;labelPosition=left;align=right;spacingRight=15",RackPowerSupply:"shape=mxgraph.rack.cisco.cisco_web_security_appliance_s170;labelPosition=left;align=right;spacingRight=15",
 RackBridge:"shape=mxgraph.rack.cisco.cisco_nexus_5548p_switch;labelPosition=left;align=right;spacingRight=15",RackTapeDrive:"shape=mxgraph.rack.ibm.ibm_1754_local_console_manager;labelPosition=left;align=right;spacingRight=15",Image_network_server:"image;image=img/lib/clip_art/computers/Server_Tower_128x128.png;flipH=1",Image_network_server_file:"image;image=img/lib/clip_art/computers/Server_128x128.png",Image_network_server_net:"image;image=img/lib/clip_art/networking/Print_Server_128x128.png",Image_network_server_net_large:"image;image=img/lib/clip_art/computers/Server_128x128.png",
@@ -606,98 +611,103 @@ Image_electronics_lcd:"image;image=img/lib/clip_art/computers/Monitor_128x128.pn
 Image_electronics_drive_usb:"image;image=img/lib/clip_art/computers/Harddrive_128x128.png;flipH=1",Image_electronics_modem_external:"image;image=img/lib/clip_art/networking/Modem_128x128.png;flipH=1",Image_electronics_lcd_wide:"image;image=img/lib/clip_art/computers/Monitor_128x128.png",EE_Amplifier:"shape=mxgraph.electrical.abstract.amplifier",EE_OpAmp:"mxCompositeShape",EE_ControlledAmp:"shape=mxgraph.electrical.abstract.controlled_amplifier",EE_Multiplexer:"shape=mxgraph.electrical.abstract.mux2",
 EE_Demultiplexer:"shape=mxgraph.electrical.abstract.mux2;operation=demux",EE_Capacitor1:"shape=mxgraph.electrical.capacitors.capacitor_1",EE_Capacitor2:"shape=mxgraph.electrical.capacitors.capacitor_3",EE_Diode:"shape=mxgraph.electrical.diodes.diode",EE_Resistor:"shape=mxgraph.electrical.resistors.resistor_2",EE_VarResistor:"shape=mxgraph.electrical.resistors.variable_resistor_2",EE_Potentiometer:"shape=mxgraph.electrical.resistors.potentiometer_2",EE_ProtGround:"shape=mxgraph.electrical.signal_sources.protective_earth",
 EE_SignalGround:"shape=mxgraph.electrical.signal_sources.signal_ground",EE_Transformer:"shape=mxgraph.electrical.inductors.transformer_1",EE_Inductor:"shape=mxgraph.electrical.inductors.inductor_3","EE_Variable Inductor":"shape=mxgraph.electrical.inductors.variable_inductor",EE_TwoWaySwitch:"shape=mxgraph.electrical.electro-mechanical.2-way_switch",EE_OnOffSwitch:"shape=mxgraph.electrical.electro-mechanical.simple_switch",EE_Loudspeaker:"shape=mxgraph.electrical.electro-mechanical.loudspeaker",EE_Motor:"shape=mxgraph.electrical.electro-mechanical.motor_1",
-EE_LED1:"shape=mxgraph.electrical.opto_electronics.led_2",EE_Lightbulb:"shape=mxgraph.electrical.miscellaneous.light_bulb",EE_IntegratedCircuit:"shape=mxgraph.electrical.logic_gates.dual_inline_ic",EE_AcSource:"shape=mxgraph.electrical.signal_sources.ac_source;strokeWidth=1",EE_VoltageSource:"shape=mxgraph.electrical.signal_sources.dc_source_3",EE_CurrentSource:"shape=mxgraph.electrical.signal_sources.dc_source_2;direction=north",EE_ControlledCurrentSource:"shape=mxgraph.electrical.signal_sources.dependent_source_2;direction=west",
-EE_ControlledVoltageSource:"shape=mxgraph.electrical.signal_sources.dependent_source_3",EE_DcSource1:"shape=mxgraph.electrical.miscellaneous.monocell_battery;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",EE_DcSource2:"shape=mxgraph.electrical.miscellaneous.multicell_battery;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",EE_Vss:"shape=mxgraph.electrical.signal_sources.vss2;verticalLabelPosition=top;verticalAlign=bottom;fontSize=24",EE_Vdd:"shape=mxgraph.electrical.signal_sources.vdd;verticalLabelPosition=bottom;verticalAlign=top",
-EE_BJT_NPN1:"shape=mxgraph.electrical.transistors.pnp_transistor_1",EE_BJT_PNP1:"shape=mxgraph.electrical.transistors.npn_transistor_1",EE_JFET_P:"shape=mxgraph.electrical.transistors.p-channel_jfet_1;flipV=1",EE_JFET_N:"shape=mxgraph.electrical.transistors.n-channel_jfet_1",EE_MOSFET_P1:"shape=mxgraph.electrical.mosfets1.mosfet_ic_p;flipV=1",EE_MOSFET_P2:"shape=mxgraph.electrical.mosfets1.mosfet_p_no_bulk",EE_MOSFET_P3:"shape=mxgraph.electrical.mosfets1.p-channel_mosfet_1;flipV=1",EE_MOSFET_N1:"shape=mxgraph.electrical.mosfets1.mosfet_ic_n",
-EE_MOSFET_N2:"shape=mxgraph.electrical.mosfets1.mosfet_n_no_bulk",EE_MOSFET_N3:"shape=mxgraph.electrical.mosfets1.n-channel_mosfet_1",EE_AND:"shape=mxgraph.electrical.logic_gates.and",EE_OR:"shape=mxgraph.electrical.logic_gates.or",EE_Inverter:"shape=mxgraph.electrical.logic_gates.inverter",EE_NAND:"shape=mxgraph.electrical.logic_gates.nand",EE_NOR:"shape=mxgraph.electrical.logic_gates.nor",EE_XOR:"shape=mxgraph.electrical.logic_gates.xor",EE_NXOR:"shape=mxgraph.electrical.logic_gates.xnor",EE_DTypeRSFlipFlop:"shape=mxgraph.electrical.logic_gates.d_type_rs_flip-flop",
-EE_DTypeFlipFlop:"shape=mxgraph.electrical.logic_gates.d_type_flip-flop",EE_DTypeFlipFlopWithClear:"shape=mxgraph.electrical.logic_gates.d_type_flip-flop_with_clear",EE_RSLatch:"shape=mxgraph.electrical.logic_gates.rs_latch",EE_SyncRSLatch:"shape=mxgraph.electrical.logic_gates.synchronous_rs_latch",EE_TTypeFlipFlop:"shape=mxgraph.electrical.logic_gates.t_type_flip-flop",EE_Plus:"shape=mxgraph.ios7.misc.flagged",EE_Negative:"shape=line",EE_InverterContact:"ellipse",EE_Voltmeter:"shape=mxgraph.electrical.instruments.voltmeter",
-EE_Ammeter:"shape=mxgraph.electrical.instruments.ampermeter",EE_SineWave:"shape=mxgraph.electrical.waveforms.sine_wave",EE_Sawtooth:"shape=mxgraph.electrical.waveforms.sawtooth",EE_SquareWave:"shape=mxgraph.electrical.waveforms.square_wave",EIChannelBlock:"shape=mxgraph.eip.messageChannel;verticalLabelPosition=bottom;verticalAlign=top",EIMessageChannelBlock:"mxCompositeShape",EIMessageBlock:"mxCompositeShape",EIMessageRouterBlock:"shape=mxgraph.eip.content_based_router;verticalLabelPosition=bottom;verticalAlign=top",
-EIMessageTranslatorBlock:"shape=mxgraph.eip.message_translator;verticalLabelPosition=bottom;verticalAlign=top",EIMessageEndpointBlock:"mxCompositeShape",EIPublishSubscribeChannelBlock:"mxCompositeShape",EIDatatypeChannelBlock:"mxCompositeShape",EIInvalidMessageChannelBlock:"mxCompositeShape",EIDeadLetterChannelBlock:"mxCompositeShape",EIGuaranteedDeliveryBlock:"mxCompositeShape",EIChannelAdapterBlock:"mxCompositeShape",EIMessagingBridgeBlock:"shape=mxgraph.eip.messaging_bridge;verticalLabelPosition=bottom;verticalAlign=top",
-EIMessageBusBlock:"mxCompositeShape",EICommandMessageBlock:"mxCompositeShape",EIDocumentMessageBlock:"mxCompositeShape",EIEventMessageBlock:"mxCompositeShape",EIRequestReplyBlock:"mxCompositeShape",EIReturnAddressBlock:"mxCompositeShape",EICorrelationIDBlock:"mxCompositeShape",EIMessageSequenceBlock:"mxCompositeShape",EIMessageExpirationBlock:"mxCompositeShape",EIContentBasedRouterBlock:"shape=mxgraph.eip.content_based_router;verticalLabelPosition=bottom;verticalAlign=top",EIMessageFilterBlock:"shape=mxgraph.eip.message_filter;verticalLabelPosition=bottom;verticalAlign=top",
-EIDynamicRouterBlock:"shape=mxgraph.eip.dynamic_router;verticalLabelPosition=bottom;verticalAlign=top",EIRecipientListBlock:"shape=mxgraph.eip.recipient_list;verticalLabelPosition=bottom;verticalAlign=top",EISplitterBlock:"shape=mxgraph.eip.splitter;verticalLabelPosition=bottom;verticalAlign=top",EIAggregatorBlock:"shape=mxgraph.eip.aggregator;verticalLabelPosition=bottom;verticalAlign=top",EIResequencerBlock:"shape=mxgraph.eip.resequencer;verticalLabelPosition=bottom;verticalAlign=top",EIComposedMessageBlock:"shape=mxgraph.eip.composed_message_processor;verticalLabelPosition=bottom;verticalAlign=top",
-EIRoutingSlipBlock:"shape=mxgraph.eip.routing_slip;verticalLabelPosition=bottom;verticalAlign=top",EIProcessManagerBlock:"shape=mxgraph.eip.process_manager;verticalLabelPosition=bottom;verticalAlign=top",EIMessageBrokerBlock:"mxCompositeShape",EIEnvelopeWrapperBlock:"shape=mxgraph.eip.envelope_wrapper;verticalLabelPosition=bottom;verticalAlign=top",EIContentEnricherBlock:"shape=mxgraph.eip.content_enricher;verticalLabelPosition=bottom;verticalAlign=top",EIContentFilterBlock:"shape=mxgraph.eip.content_filter;verticalLabelPosition=bottom;verticalAlign=top",
-EIClaimCheckBlock:"shape=mxgraph.eip.claim_check;verticalLabelPosition=bottom;verticalAlign=top",EINormalizerBlock:"shape=mxgraph.eip.normalizer;verticalLabelPosition=bottom;verticalAlign=top",EIMessagingGatewayBlock:"shape=mxgraph.eip.messaging_gateway;verticalLabelPosition=bottom;verticalAlign=top",EITransactionalClientBlock:"shape=mxgraph.eip.transactional_client;verticalLabelPosition=bottom;verticalAlign=top",EIPollingConsumerBlock:"shape=mxgraph.eip.polling_consumer;verticalLabelPosition=bottom;verticalAlign=top",
-EIEventDrivenConsumerBlock:"shape=mxgraph.eip.event_driven_consumer;verticalLabelPosition=bottom;verticalAlign=top",EICompetingConsumersBlock:"shape=mxgraph.eip.competing_consumers;verticalLabelPosition=bottom;verticalAlign=top",EIMessageDispatcherBlock:"shape=mxgraph.eip.message_dispatcher;verticalLabelPosition=bottom;verticalAlign=top",EISelectiveConsumerBlock:"shape=mxgraph.eip.selective_consumer;verticalLabelPosition=bottom;verticalAlign=top",EIDurableSubscriberBlock:"mxCompositeShape",EIServiceActivatorBlock:"shape=mxgraph.eip.service_activator;verticalLabelPosition=bottom;verticalAlign=top",
-EIControlBusBlock:"mxCompositeShape",EIDetourBlock:"shape=mxgraph.eip.detour;verticalLabelPosition=bottom;verticalAlign=top",EIWireTapBlock:"shape=mxgraph.eip.wire_tap;verticalLabelPosition=bottom;verticalAlign=top",EIMessageHistoryBlock:"mxCompositeShape",EIMessageStoreBlock:"shape=mxgraph.eip.message_store;verticalLabelPosition=bottom;verticalAlign=top",EISmartProxyBlock:"shape=mxgraph.eip.smart_proxy;verticalLabelPosition=bottom;verticalAlign=top",EITestMessageBlock:"shape=mxgraph.eip.test_message;verticalLabelPosition=bottom;verticalAlign=top",
-EIChannelPurgerBlock:"shape=mxgraph.eip.channel_purger;verticalLabelPosition=bottom;verticalAlign=top",GCPIconComputeEngineBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.compute_engine",GCPIconAppEngineBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.app_engine",GCPIconContainerEngineBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_engine",GCPIconContainerRegistryBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_registry",
-GCPIconCloudFunctionsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_functions",GCPIconCloudStorageBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_storage",GCPIconCloudSQLBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_sql",GCPIconCloudBigtableBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_bigtable",
-GCPIconCloudDatastoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datastore",GCPIconPersistentDiskBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.persistent_disk",GCPIconCloudVirtualNetworkBlock:"strokeColor=none;shape=mxgraph.gcp.networking.cloud_virtual_network;verticalLabelPosition=bottom;verticalAlign=top",GCPIconCloudLoadBalancingBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_load_balancing",
-GCPIconCloudCDNBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_cdn",GCPIconCloudInterconnectBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dedicated_interconnect",GCPIconCloudInterconnectBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dedicated_interconnect",GCPIconCloudDNSBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dns",
-GCPIconBigQueryBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.bigquery",GCPIconCloudDataflowBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataflow",GCPIconCloudDataprocBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataproc",GCPIconCloudDatalabBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datalab",
-GCPIconCloudPubSubBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_pubsub",GCPIconGenomicsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.genomics",GCPIconCloudMachineLearningServicesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_machine_learning",GCPIconCloudMachineLearningServicesBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_machine_learning",
-GCPIconVisionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vision_api",GCPIconVisionAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vision_api",GCPIconSpeechAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_speech_api",GCPIconSpeechAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_speech_api",
-GCPIconNaturalLanguageAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_natural_language_api",GCPIconNaturalLanguageAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_natural_language_api",GCPIconTranslateAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_translation_api",GCPIconTranslateAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_translation_api",
-GCPIconStackdriverOverviewBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.stackdriver",GCPIconStackdriverOverviewBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.stackdriver",GCPIconMonitoringBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconLoggingBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.logging",
-GCPIconErrorReportingBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.error_reporting",GCPIconTraceBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.trace",GCPIconDebuggerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.debugger",GCPIconDeploymentManagerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",
-GCPIconDeploymentManagerBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconCloudEndpointsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_endpoints",GCPIconCloudToolsForPowerShellBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",GCPIconCloudToolsForVisualStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",
-GCPIconCloudIAMBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iam",GCPIconGCPLogoBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconGCPLogoBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconBlankBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.blue_hexagon",GCPIconBlankBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.blue_hexagon",
-GCPIconAPIAnalyticsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.api_analytics",GCPIconApigeeAPIPlatformBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.apigee_api_platform",GCPIconApigeeSenseBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.apigee_sense",GCPIconAPIMonetizationBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.api_monetization",
-GCPIconCloudEndpointsBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_endpoints",GCPIconDeveloperPortalBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.developer_portal",GCPIconBigQueryBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.bigquery",GCPIconCloudComposerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_composer",
-GCPIconCloudDataflowBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataflow",GCPIconCloudDatalabBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datalab",GCPIconCloudDataprepBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataprep",GCPIconCloudDataprocBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataproc",
-GCPIconCloudPubSubBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_pubsub",GCPIconDataStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.data_studio",GCPIconGenomicsBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.genomics",GCPIconAdvancedSolutionsLabBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.advanced_solutions_lab",
-GCPIconCloudAutoMLBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_automl",GCPIconCloudNaturalLanguageAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_natural_language_api",GCPIconCloudJobsAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_jobs_api",GCPIconCloudTPUBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tpu",
-GCPIconCloudMachineLearningBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_machine_learning",GCPIconCloudVisionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vision_api",GCPIconCloudTranslationAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_translation_api",GCPIconDialogflowEnterpriseEditionBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dialogflow_enterprise_edition",
-GCPIconCloudSpeechAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_speech_api",GCPIconCloudTexttoSpeechBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_text_to_speech",GCPIconCloudVideoIntelligenceAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_video_intelligence_api",GCPIconAppEngineBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.app_engine",
-GCPIconCloudToolsforVisualStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",GCPIconCloudDeploymentManagerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconCloudFunctionsBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_functions",GCPIconContainerBuilderBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_builder",
-GCPIconCloudSDKBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconCloudSourceRepositoriesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconContainerRegistryBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_registry",GCPIconCloudTestLabBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",
-GCPIconGPUBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.gpu",GCPIconContainerEngineBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_engine",GCPIconTransferApplianceBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.transfer_appliance",GCPIconCloudToolsforPowerShellBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",
-GCPIconCloudToolsforIntelliJBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconCloudToolsforAndroidStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconGooglePluginforEclipseBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconContainerOptimizedOSBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_optimized_os",
-GCPIconComputeEngineBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.compute_engine",GCPIconBeyondCorpBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.beyondcorp",GCPIconCloudIAMBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iam",GCPIconCloudResourceManagerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iam",
-GCPIconCloudSecurityCommandCenterBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_security_command_center",GCPIconCloudSecurityScannerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_security_scanner",GCPIconDataLossPreventionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.data_loss_prevention_api",GCPIconIdentityAwareProxyBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.identity_aware_proxy",
-GCPIconKeyManagementServiceBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.key_management_service",GCPIconSecurityKeyEnforcementBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.security_key_enforcement",GCPIconCloudIoTCoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iot_core",GCPIconCloudAPIsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_apis",
-GCPIconCloudBillingAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconCloudConsoleBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconCloudDeploymentManagerBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconCloudMobileAppBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",
-GCPIconCloudShellBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconDebuggerBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.debugger",GCPIconErrorReportingBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.error_reporting",GCPIconLoggingBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.logging",
-GCPIconMonitoringBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconStackdriverBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.stackdriver",GCPIconTraceBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.trace",GCPIconCloudArmorBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_armor",
-GCPIconCloudCDNBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_cdn",GCPIconCloudDNSBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dns",GCPIconCloudExternalIPAddressesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_external_ip_addresses",GCPIconCloudFirewallRulesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_firewall_rules",
-GCPIconCloudLoadBalancingBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_load_balancing",GCPIconCloudNetworkBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_network",GCPIconCloudRouterBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_router",GCPIconCloudRoutesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_routes",
-GCPIconCloudVPNBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vpn",GCPIconDedicatedInterconnectBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dedicated_interconnect",GCPIconPartnerInterconnectBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.partner_interconnect",GCPIconPremiumNetworkTierBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.premium_network_tier",
-GCPIconStandardNetworkTierBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.standard_network_tier",GCPIconVirtualPrivateCloudBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.virtual_private_cloud",GCPIconCloudBigtableBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_bigtable",GCPIconCloudDatastoreBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datastore",
-GCPIconCloudFilestoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_filestore",GCPIconCloudMemorystoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_memorystore",GCPIconCloudSpannerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_spanner",GCPIconCloudSQLBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_sql",
-GCPIconCloudStorageBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_storage",GCPIconPersistentDiskBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.persistent_disk",GCPIconGoogleCloudPlatformBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.google_cloud_platform",GCPIconBlueHexagonBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.blue_hexagon",
-GCPIconGenericBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconPredictionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.prediction_api",CronjobLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cronjob",CronjobKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cronjob",
-DeployLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=deploy",DeployKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=deploy",DsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ds",DsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ds",
-JobLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=job",JobKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=job",PodLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pod",PodKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pod",
-RsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rs",RsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rs",StsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sts",StsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sts",
-PvLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pv",PvKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pv",PvcLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pvc",PvcKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pvc",
-ScLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sc",ScKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sc",VolLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=vol",VolKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=vol",
-EpLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ep",EpKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ep",IngLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ing",IngKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ing",
-NetpolLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=netpol",NetpolKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=netpol",SvcLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=svc",SvcKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=svc",
-CrdLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crd",CrdKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crd",CroleLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_role",CroleKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_role",
-GroupLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=group",GroupKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=group",RbLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rb",RbKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rb",
-RoleLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=role",RoleKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=role",SaLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sa",SaKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sa",
-UserLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=user",UserKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=user",CmResourceLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cm",CmKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cm",
-SecretLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=secret",SecretKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=secret",HpaLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=hpa",HpaKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=hpa",
-LimitsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=limits",LimitsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=limits",QuotaLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=quota",QuotaKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=quota",
-CrbLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crb",CrbKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crb",LogoKub19:"aspect=fixed;html=1;align=center;image;image=img/lib/mscae/Kubernetes.svg",NsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ns",NsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ns",
-PspLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=psp",PspKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=psp",EtcdLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=etcd",EtcdKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=etcd",
-MasterLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=master",MasterKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=master",NodeLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=node",NodeKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=node",
-ApiLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=api",CcmLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_c_m",CmLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_m",KproxyLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=node",
-KubeletLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=kubelet",SchedLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sched",Equation:"mxCompositeShape",fpWall:"",fpWindow:"shape=mxgraph.floorplan.window",fpOpening:"shape=rect",fpDoor:"mxCompositeShape",fpDoubleDoor:"mxCompositeShape",fpStairs:"shape=mxgraph.floorplan.stairs;direction=north",fpStairsDirectional:"shape=mxgraph.floorplan.stairs;direction=north;verticalAlign=bottom",
-fpDeskLongSegment:"",fpDeskShortSegment:"",fpDeskLargeCornerSegment:"shape=mxgraph.floorplan.desk_corner",fpCubiclePanel:"shape=mxgraph.floorplan.wall;wallThickness=3",fpCubicleWorkstation:"shape=mxgraph.floorplan.wallU;wallThickness=3",fpCubicleCorner5x5:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleCorner6x6:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleCorner8x8:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleCorner8x6:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",
-fpCubicleCornerOpen6x4:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleDouble14x8:"shape=mxgraph.floorplan.wallU;wallThickness=3",fpCubicleEnclosed11x9:"shape=mxgraph.floorplan.wallU;wallThickness=3",fpTableConferenceOval:"ellipse",fpTableConferenceBoat:"",fpTableConferenceRectangle:"",fpTableDiningRound:"ellipse",fpTableDiningSquare:"",fpChairOffice:"shape=mxgraph.floorplan.office_chair",fpChairExecutive:"shape=mxgraph.floorplan.office_chair",fpChairLobby:"shape=mxgraph.floorplan.office_chair",
-fpChairDining:"shape=mxgraph.floorplan.chair",fpChairBarstool:"ellipse",fpCabinetBasic:"",fpCabinetDoubleWide:"",fpCabinetDoubleWithShelves:"",fpCabinetShelvesBasic:"",fpCabinetShelvesDouble:"",fpCabinetBasicWithShelves:"",fpCabinetsAboveDeskShelves:"",fpRestroomToiletPrivate:"shape=mxgraph.floorplan.toilet",fpRestroomToiletPublic:"shape=mxgraph.floorplan.toilet",fpRestroomLights:"mxCompositeShape",fpRestroomSinks:"mxCompositeShape",fpRestroomBathtub:"shape=mxgraph.floorplan.bathtub;direction=south",
-fpRestroomShower:"shape=mxgraph.floorplan.shower;flipH=1",fpRestroomPedastalSink:"shape=mxgraph.floorplan.sink_1",fpRestroomCountertop:"",fpRestroomMirror:"shape=line;strokeWidth=3",fpRestroomStalls:"mxCompositeShape",fpBedDouble:"shape=mxgraph.floorplan.bed_double",fpBedSingle:"shape=mxgraph.floorplan.bed_single",fpBedQueen:"shape=mxgraph.floorplan.bed_double",fpBedKing:"shape=mxgraph.floorplan.bed_double",fpBedDoubleWithTrundle:"shape=mxgraph.floorplan.bed_double",fpBedBunk:"shape=mxgraph.floorplan.bed_double",
-fpBedBassinet:"shape=mxgraph.pid.fittings.compensator",fpApplianceWasher:"",fpApplianceDryer:"",fpApplianceWaterHeater:"ellipse",fpApplianceStoveOven:"shape=mxgraph.floorplan.range_1",fpStoveOvenSixBurner:"shape=mxgraph.floorplan.range_2",fpApplianceDishwasher:"",fpKitchenSink:"shape=mxgraph.floorplan.sink_2",fpKitchenDoubleSink:"shape=mxgraph.floorplan.sink_double",fpKitchenCountertop:"",fpKitchenCountertopCorner:"shape=mxgraph.floorplan.desk_corner",fpCouchLoveSeat:"shape=mxgraph.floorplan.couch",
-fpCouchSofa:"shape=mxgraph.floorplan.couch",fpCouchOttoman:"",fpMiscDesktopComputer:"shape=mxgraph.floorplan.workstation",fpMiscLaptopComputer:"shape=mxgraph.floorplan.laptop",fpComputerMonitor:"shape=mxgraph.floorplan.flat_tv",fpCRTTelevision:"shape=mxgraph.floorplan.flat_tv",fpMiscIndoorPlant:"shape=mxgraph.floorplan.plant",fpPiano:"shape=mxgraph.floorplan.piano",PEAxialCompressor:"shape=mxgraph.pid.compressors.centrifugal_compressor_-_turbine_driven;verticalLabelPosition=bottom;verticalAlign=top",
-PECentrifugalCompressor:"shape=mxgraph.pid.compressors.centrifugal_compressor;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalCompressor2:"shape=mxgraph.pid.compressors.centrifugal_compressor_-_turbine_driven;verticalLabelPosition=bottom;verticalAlign=top",PEReciprocationCompressor:"shape=mxgraph.pid.compressors.reciprocating_compressor;verticalLabelPosition=bottom;verticalAlign=top",PERotaryCompressorBlock:"shape=mxgraph.pid.compressors.rotary_compressor;verticalLabelPosition=bottom;verticalAlign=top",
-PERotaryCompressor2Block:"shape=mxgraph.pid.compressors.compressor_and_silencers;verticalLabelPosition=bottom;verticalAlign=top",PEConveyorBlock:"shape=mxgraph.pid2misc.conveyor;verticalLabelPosition=bottom;verticalAlign=top",PEElevator1Block:"shape=mxgraph.pid.misc.bucket_elevator;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",PEAgitatorMixerBlock:"shape=mxgraph.pid.agitators.agitator_(propeller);verticalLabelPosition=bottom;verticalAlign=top",PEDrumBlock:"shape=mxgraph.pid.vessels.drum_or_condenser;verticalLabelPosition=bottom;verticalAlign=top",
-PETankEquipmentBlock:"shape=mxgraph.pid.vessels.tank;verticalLabelPosition=bottom;verticalAlign=top",PEMixingReactorBlock:"shape=mxgraph.pid.vessels.mixing_reactor;verticalLabelPosition=bottom;verticalAlign=top",PEPlateTowerBlock:"shape=mxgraph.pid2misc.column;columnType=baffle;verticalLabelPosition=bottom;verticalAlign=top",PEPackedTowerBlock:"shape=mxgraph.pid2misc.column;columnType=fixed;verticalLabelPosition=bottom;verticalAlign=top",PEFurnaceBlock:"shape=mxgraph.pid.vessels.furnace;verticalLabelPosition=bottom;verticalAlign=top",
-PEOneToMany:"mxCompositeShape",PEMultilines:"mxCompositeShape",PEMidArrow:"shape=triangle;anchorPointDirection=0",PEButtWeld:"shape=mxgraph.sysml.x",PETopToTop:"shape=mxgraph.pid.vessels.container,_tank,_cistern",PENuclear:"shape=mxgraph.electrical.waveforms.sine_wave",PEMechanicalLink:"ellipse",PESolderedSolvent:"ellipse",PEDoubleContainment:"shape=hexagon;perimeter=hexagonPerimeter2",PEFlange:"shape=mxgraph.pid.piping.double_flange",PEFlange2:"shape=mxgraph.pid.piping.flange_in;flipH=1",PEEndCap:"shape=mxgraph.pid.piping.cap",
-PEEndCap2:"shape=mxgraph.pid.vessels.container,_tank,_cistern;direction=north",PEBreather:"shape=mxgraph.pid.piping.breather",PEElectronicallyInsulated:"shape=mxgraph.pid.piping.double_flange",PEReducer:"shape=mxgraph.pid.piping.concentric_reducer",PEInlineMixer:"shape=mxgraph.pid.piping.in-line_mixer",PEFlameArrester:"shape=mxgraph.pid.piping.flame_arrestor",PEDetonationArrester:"shape=mxgraph.pid.piping.detonation_arrestor",PETriangleSeparator:"shape=triangle;direction=west;anchorPointDirection=0",
-PETundish:"shape=mxgraph.ios7.misc.left",PEOpenVent:"shape=mxgraph.pid.vessels.vent_(bent)",PERemovableSpool:"shape=mxgraph.pid.piping.removable_spool",PEYTypeStrainer:"shape=mxgraph.pid.piping.y-type_strainer",PEDiverterValve:"shape=mxgraph.pid.piping.diverter_valve",PEPulsationDampener:"shape=mxgraph.pid.piping.pulsation_dampener",PEDuplexStrainer:"shape=mxgraph.pid.piping.duplex_strainer",PEBasketStrainer:"shape=mxgraph.pid.piping.basket_strainer",PEVentSilencer:"shape=mxgraph.pid.piping.vent_silencer",
-PEInlineSilencer:"shape=mxgraph.pid.piping.in-line_silencer",PESteamTrap:"shape=mxgraph.pid.piping.steam_trap",PEDesuperheater:"shape=mxgraph.pid.piping.desuper_heater",PEEjectorOrEductor:"shape=mxgraph.pid.fittings.injector",PEExhaustHead:"shape=mxgraph.pid.piping.exhaust_head",PERotaryValve:"shape=mxgraph.pid.piping.rotary_valve",PEExpansionJoint:"shape=mxgraph.pid.piping.expansion_joint",PEVesselBlock:"mxCompositeShape",PEOpenTankBlock:"shape=mxgraph.pid.vessels.container,_tank,_cistern;verticalLabelPosition=bottom;verticalAlign=top",
-PEOpenTopTank:"shape=mxgraph.pid.vessels.container,_tank,_cistern;verticalLabelPosition=bottom;verticalAlign=top",PEClosedTankBlock:"mxCompositeShape",PEStorageSphereBlock:"shape=mxgraph.pid.vessels.storage_sphere;verticalLabelPosition=bottom;verticalAlign=top",PEColumnBlock:"mxCompositeShape",PEBagBlock:"shape=mxgraph.pid.vessels.bag;verticalLabelPosition=bottom;verticalAlign=top",PEGasCylinderBlock:"shape=mxgraph.pid.vessels.gas_bottle;verticalLabelPosition=bottom;verticalAlign=top",PEGasHolderBlock:"shape=mxgraph.pid.vessels.gas_holder;verticalLabelPosition=bottom;verticalAlign=top",
-PEClarifierBlock:"shape=mxgraph.pid.vessels.bunker_(conical_bottom);verticalLabelPosition=bottom;verticalAlign=top",PETankBlock:"shape=mxgraph.pid.vessels.tank_(conical_roof);verticalLabelPosition=bottom;verticalAlign=top",PETrayColumnBlock:"shape=mxgraph.pid2misc.column;columnType=tray;verticalLabelPosition=bottom;verticalAlign=top",PEReactionVesselBlock:"shape=mxgraph.pid.vessels.reactor",PEBin:"shape=mxgraph.pid.vessels.tank_(conical_bottom)",PEDomeRoofTank:"shape=mxgraph.pid.vessels.tank_(dished_roof)",
-PEConeRoofTank:"shape=mxgraph.pid.vessels.tank_(conical_roof)",PEBoilerBlock:"shape=mxgraph.pid.misc.boiler_(dome);verticalLabelPosition=bottom;verticalAlign=top",PEEquipmentBoilerBlock:"shape=mxgraph.pid.misc.boiler_(dome);verticalLabelPosition=bottom;verticalAlign=top",PEReboilerBlock:"shape=mxgraph.pid.heat_exchangers.reboiler;verticalLabelPosition=bottom;verticalAlign=top",PECondenserBlock:"shape=mxgraph.pid.heat_exchangers.heat_exchanger_(straight_tubes);verticalLabelPosition=bottom;verticalAlign=top",
-PEEquipmentCondenserBlock:"shape=mxgraph.pid.heat_exchangers.condenser;verticalLabelPosition=bottom;verticalAlign=top",PECoolingTowerBlock:"shape=mxgraph.pid.misc.cooling_tower;verticalLabelPosition=bottom;verticalAlign=top",PEHeatExchangerBlock:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_1;verticalLabelPosition=bottom;verticalAlign=top",PEHairpinExchangerBlock:"shape=mxgraph.pid.heat_exchangers.hairpin_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEPlateAndFrameHeatExchangerBlock:"shape=mxgraph.pid.heat_exchangers.plate_and_frame_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",
-PESpiralHeatExchanger:"shape=mxgraph.pid.heat_exchangers.spiral_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEUTubeHeatExchangerBlock:"shape=mxgraph.pid.heat_exchangers.u-tube_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEDoublePipeHeatBlock:"shape=mxgraph.pid.heat_exchangers.double_pipe_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEShellAndTubeHeat1Block:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_1;verticalLabelPosition=bottom;verticalAlign=top",
-PEShellAndTubeHeat2Block:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_2;verticalLabelPosition=bottom;verticalAlign=top",PEShellAndTubeHeat3Block:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_1;direction=north;verticalLabelPosition=bottom;verticalAlign=top",PESinglePassHeatBlock:"shape=mxgraph.pid.heat_exchangers.single_pass_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEHeaterBlock:"shape=mxgraph.pid.heat_exchangers.heater",PEEjectorInjectorBlock:"shape=mxgraph.pid.fittings.injector;verticalLabelPosition=bottom;verticalAlign=top",
-PECompressorTurbineBlock:"mxCompositeShape",PEMotorDrivenTurbineBlock:"mxCompositeShape",PECentrifugalPumpBlock:"shape=mxgraph.pid.pumps.gas_blower;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalPump:"shape=mxgraph.pid.pumps.centrifugal_pump_1;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalPump2:"shape=mxgraph.pid.pumps.centrifugal_pump_2;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalPump3:"shape=mxgraph.pid.pumps.centrifugal_pump_1;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",
-PEGearPumpBlock:"shape=mxgraph.pid.pumps.gear_pump;verticalLabelPosition=bottom;verticalAlign=top",PEHorizontalPump:"shape=mxgraph.pid.pumps.horizontal_pump;verticalLabelPosition=bottom;verticalAlign=top",PEProgressiveCavityPump:"shape=mxgraph.pid.pumps.cavity_pump;flipH=1;flipV=1;verticalLabelPosition=bottom;verticalAlign=top",PEScrewPump:"shape=mxgraph.pid.pumps.screw_pump;verticalLabelPosition=bottom;verticalAlign=top",PEScrewPump2:"shape=mxgraph.pid.pumps.screw_pump_2;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",
-PESumpPump:"shape=mxgraph.pid.pumps.sump_pump;verticalLabelPosition=bottom;verticalAlign=top",PEVacuumPump:"shape=mxgraph.pid.pumps.vacuum_pump;verticalLabelPosition=bottom;verticalAlign=top",PEVerticalPump:"shape=mxgraph.pid.pumps.vertical_pump;verticalLabelPosition=bottom;verticalAlign=top",PEVerticalPump2:"shape=mxgraph.pid.pumps.vertical_pump;verticalLabelPosition=bottom;verticalAlign=top",PEIndicatorBlock:"mxCompositeShape",PEIndicator2Block:"mxCompositeShape",PEIndicator3Block:"shape=mxgraph.pid2inst.discInst;mounting=field",
-PEIndicator4Block:"shape=mxgraph.pid2inst.indicator;mounting=field;indType=inst",PESharedIndicatorBlock:"mxCompositeShape",PESharedIndicator2Block:"mxCompositeShape",PEComputerIndicatorBlock:"mxCompositeShape",PEProgrammableIndicatorBlock:"mxCompositeShape",PEGateValveBlock:"mxCompositeShape",PEGlobeValveBlock:"mxCompositeShape",PEControlValveBlock:"shape=mxgraph.pid2valves.valve;valveType=gate;actuator=diaph;verticalLabelPosition=bottom;verticalAlign=top",PENeedleValveBlock:"shape=mxgraph.pid2valves.valve;valveType=needle;verticalLabelPosition=bottom;verticalAlign=top",
-PEButterflyValve2Block:"shape=mxgraph.pid2valves.valve;flipH=1;valveType=butterfly;verticalLabelPosition=bottom;verticalAlign=top",PEBallValveBlock:"shape=mxgraph.pid2valves.valve;valveType=ball;verticalLabelPosition=bottom;verticalAlign=top",PEDiaphragmBlock:"shape=mxgraph.pid2valves.valve;valveType=ball;verticalLabelPosition=bottom;verticalAlign=top",PEPlugValveBlock:"shape=mxgraph.pid2valves.valve;valveType=ball;verticalLabelPosition=bottom;verticalAlign=top",PECheckValveBlock:"shape=mxgraph.pid2valves.valve;valveType=check;verticalLabelPosition=bottom;verticalAlign=top",
-PECheckValve2Block:"shape=mxgraph.pid2valves.valve;valveType=check;verticalLabelPosition=bottom;verticalAlign=top",PEAngleValveBlock:"mxCompositeShape",PEAngleGlobeValveBlock:"mxCompositeShape",PEPoweredValveBlock:"mxCompositeShape",PEFloatOperatedValveBlock:"shape=mxgraph.pid2valves.valve;valveType=gate;actuator=singActing;verticalLabelPosition=bottom;verticalAlign=top",PENeedleValve2Block:"shape=mxgraph.pid2valves.valve;valveType=needle;verticalLabelPosition=bottom;verticalAlign=top",PEThreeWayValveBlock:"shape=mxgraph.pid2valves.valve;valveType=threeWay;actuator=none;verticalLabelPosition=bottom;verticalAlign=top",
+EE_LED1:"shape=mxgraph.electrical.opto_electronics.led_2",EE_Lightbulb:"shape=mxgraph.electrical.miscellaneous.light_bulb",EE_IntegratedCircuit:"shape=mxgraph.electrical.logic_gates.dual_inline_ic",EE_AcSource:"shape=mxgraph.electrical.signal_sources.ac_source;strokeWidth=1;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;",EE_VoltageSource:"shape=mxgraph.electrical.signal_sources.dc_source_3;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;",
+EE_CurrentSource:"shape=mxgraph.electrical.signal_sources.dc_source_2;direction=north;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;",EE_ControlledCurrentSource:"shape=mxgraph.electrical.signal_sources.dependent_source_2;direction=west;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;",EE_ControlledVoltageSource:"shape=mxgraph.electrical.signal_sources.dependent_source_3;verticalLabelPosition=middle;align=left;verticalAlign=top;labelPosition=right;",
+EE_DcSource1:"shape=mxgraph.electrical.miscellaneous.monocell_battery;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",EE_DcSource2:"shape=mxgraph.electrical.miscellaneous.multicell_battery;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",EE_Vss:"shape=mxgraph.electrical.signal_sources.vss2;verticalLabelPosition=top;verticalAlign=bottom;fontSize=24",EE_Vdd:"shape=mxgraph.electrical.signal_sources.vdd;verticalLabelPosition=bottom;verticalAlign=top",EE_BJT_NPN1:"shape=mxgraph.electrical.transistors.pnp_transistor_1",
+EE_BJT_NPN1_V2:"shape=mxgraph.electrical.transistors.npn_transistor_1;",EE_BJT_PNP1:"shape=mxgraph.electrical.transistors.npn_transistor_1",EE_BJT_PNP1_V2:"shape=mxgraph.electrical.transistors.pnp_transistor_1",EE_JFET_P:"shape=mxgraph.electrical.transistors.p-channel_jfet_1;flipV=1",EE_JFET_P_V2:"shape=mxgraph.electrical.transistors.p-channel_jfet_1;flipV=1",EE_JFET_N:"shape=mxgraph.electrical.transistors.n-channel_jfet_1",EE_JFET_N_V2:"shape=mxgraph.electrical.transistors.n-channel_jfet_1",EE_MOSFET_P1:"shape=mxgraph.electrical.mosfets1.mosfet_ic_p;flipV=1",
+EE_MOSFET_P1_V2:"shape=mxgraph.electrical.mosfets1.mosfet_ic_p;flipV=1",EE_MOSFET_P2:"shape=mxgraph.electrical.mosfets1.mosfet_p_no_bulk",EE_MOSFET_P2_V2:"shape=mxgraph.electrical.mosfets1.mosfet_p_no_bulk",EE_MOSFET_P3:"shape=mxgraph.electrical.mosfets1.p-channel_mosfet_1;flipV=1",EE_MOSFET_P3_V2:"shape=mxgraph.electrical.mosfets1.p-channel_mosfet_1;flipV=1",EE_MOSFET_N1:"shape=mxgraph.electrical.mosfets1.mosfet_ic_n",EE_MOSFET_N1_V2:"shape=mxgraph.electrical.mosfets1.mosfet_ic_n",EE_MOSFET_N2:"shape=mxgraph.electrical.mosfets1.mosfet_n_no_bulk",
+EE_MOSFET_N2_V2:"shape=mxgraph.electrical.mosfets1.mosfet_n_no_bulk",EE_MOSFET_N3:"shape=mxgraph.electrical.mosfets1.n-channel_mosfet_1",EE_MOSFET_N3_V2:"shape=mxgraph.electrical.mosfets1.n-channel_mosfet_1",EE_AND:"shape=mxgraph.electrical.logic_gates.and",EE_OR:"shape=mxgraph.electrical.logic_gates.or",EE_Inverter:"shape=mxgraph.electrical.logic_gates.inverter",EE_NAND:"shape=mxgraph.electrical.logic_gates.nand",EE_NOR:"shape=mxgraph.electrical.logic_gates.nor",EE_XOR:"shape=mxgraph.electrical.logic_gates.xor",
+EE_NXOR:"shape=mxgraph.electrical.logic_gates.xnor",EE_DTypeRSFlipFlop:"shape=mxgraph.electrical.logic_gates.d_type_rs_flip-flop",EE_DTypeFlipFlop:"shape=mxgraph.electrical.logic_gates.d_type_flip-flop",EE_DTypeFlipFlopWithClear:"shape=mxgraph.electrical.logic_gates.d_type_flip-flop_with_clear",EE_RSLatch:"shape=mxgraph.electrical.logic_gates.rs_latch",EE_SyncRSLatch:"shape=mxgraph.electrical.logic_gates.synchronous_rs_latch",EE_TTypeFlipFlop:"shape=mxgraph.electrical.logic_gates.t_type_flip-flop",
+EE_Plus:"shape=mxgraph.ios7.misc.flagged",EE_Negative:"shape=line",EE_InverterContact:"ellipse",EE_Voltmeter:"shape=mxgraph.electrical.instruments.voltmeter",EE_Ammeter:"shape=mxgraph.electrical.instruments.ampermeter",EE_SineWave:"shape=mxgraph.electrical.waveforms.sine_wave",EE_Sawtooth:"shape=mxgraph.electrical.waveforms.sawtooth",EE_SquareWave:"shape=mxgraph.electrical.waveforms.square_wave",EIChannelBlock:"shape=mxgraph.eip.messageChannel;verticalLabelPosition=bottom;verticalAlign=top",EIMessageChannelBlock:"mxCompositeShape",
+EIMessageBlock:"mxCompositeShape",EIMessageRouterBlock:"shape=mxgraph.eip.content_based_router;verticalLabelPosition=bottom;verticalAlign=top",EIMessageTranslatorBlock:"shape=mxgraph.eip.message_translator;verticalLabelPosition=bottom;verticalAlign=top",EIMessageEndpointBlock:"mxCompositeShape",EIPublishSubscribeChannelBlock:"mxCompositeShape",EIDatatypeChannelBlock:"mxCompositeShape",EIInvalidMessageChannelBlock:"mxCompositeShape",EIDeadLetterChannelBlock:"mxCompositeShape",EIGuaranteedDeliveryBlock:"mxCompositeShape",
+EIChannelAdapterBlock:"mxCompositeShape",EIMessagingBridgeBlock:"shape=mxgraph.eip.messaging_bridge;verticalLabelPosition=bottom;verticalAlign=top",EIMessageBusBlock:"mxCompositeShape",EICommandMessageBlock:"mxCompositeShape",EIDocumentMessageBlock:"mxCompositeShape",EIEventMessageBlock:"mxCompositeShape",EIRequestReplyBlock:"mxCompositeShape",EIReturnAddressBlock:"mxCompositeShape",EICorrelationIDBlock:"mxCompositeShape",EIMessageSequenceBlock:"mxCompositeShape",EIMessageExpirationBlock:"mxCompositeShape",
+EIContentBasedRouterBlock:"shape=mxgraph.eip.content_based_router;verticalLabelPosition=bottom;verticalAlign=top",EIMessageFilterBlock:"shape=mxgraph.eip.message_filter;verticalLabelPosition=bottom;verticalAlign=top",EIDynamicRouterBlock:"shape=mxgraph.eip.dynamic_router;verticalLabelPosition=bottom;verticalAlign=top",EIRecipientListBlock:"shape=mxgraph.eip.recipient_list;verticalLabelPosition=bottom;verticalAlign=top",EISplitterBlock:"shape=mxgraph.eip.splitter;verticalLabelPosition=bottom;verticalAlign=top",
+EIAggregatorBlock:"shape=mxgraph.eip.aggregator;verticalLabelPosition=bottom;verticalAlign=top",EIResequencerBlock:"shape=mxgraph.eip.resequencer;verticalLabelPosition=bottom;verticalAlign=top",EIComposedMessageBlock:"shape=mxgraph.eip.composed_message_processor;verticalLabelPosition=bottom;verticalAlign=top",EIRoutingSlipBlock:"shape=mxgraph.eip.routing_slip;verticalLabelPosition=bottom;verticalAlign=top",EIProcessManagerBlock:"shape=mxgraph.eip.process_manager;verticalLabelPosition=bottom;verticalAlign=top",
+EIMessageBrokerBlock:"mxCompositeShape",EIEnvelopeWrapperBlock:"shape=mxgraph.eip.envelope_wrapper;verticalLabelPosition=bottom;verticalAlign=top",EIContentEnricherBlock:"shape=mxgraph.eip.content_enricher;verticalLabelPosition=bottom;verticalAlign=top",EIContentFilterBlock:"shape=mxgraph.eip.content_filter;verticalLabelPosition=bottom;verticalAlign=top",EIClaimCheckBlock:"shape=mxgraph.eip.claim_check;verticalLabelPosition=bottom;verticalAlign=top",EINormalizerBlock:"shape=mxgraph.eip.normalizer;verticalLabelPosition=bottom;verticalAlign=top",
+EIMessagingGatewayBlock:"shape=mxgraph.eip.messaging_gateway;verticalLabelPosition=bottom;verticalAlign=top",EITransactionalClientBlock:"shape=mxgraph.eip.transactional_client;verticalLabelPosition=bottom;verticalAlign=top",EIPollingConsumerBlock:"shape=mxgraph.eip.polling_consumer;verticalLabelPosition=bottom;verticalAlign=top",EIEventDrivenConsumerBlock:"shape=mxgraph.eip.event_driven_consumer;verticalLabelPosition=bottom;verticalAlign=top",EICompetingConsumersBlock:"shape=mxgraph.eip.competing_consumers;verticalLabelPosition=bottom;verticalAlign=top",
+EIMessageDispatcherBlock:"shape=mxgraph.eip.message_dispatcher;verticalLabelPosition=bottom;verticalAlign=top",EISelectiveConsumerBlock:"shape=mxgraph.eip.selective_consumer;verticalLabelPosition=bottom;verticalAlign=top",EIDurableSubscriberBlock:"mxCompositeShape",EIServiceActivatorBlock:"shape=mxgraph.eip.service_activator;verticalLabelPosition=bottom;verticalAlign=top",EIControlBusBlock:"mxCompositeShape",EIDetourBlock:"shape=mxgraph.eip.detour;verticalLabelPosition=bottom;verticalAlign=top",EIWireTapBlock:"shape=mxgraph.eip.wire_tap;verticalLabelPosition=bottom;verticalAlign=top",
+EIMessageHistoryBlock:"mxCompositeShape",EIMessageStoreBlock:"shape=mxgraph.eip.message_store;verticalLabelPosition=bottom;verticalAlign=top",EISmartProxyBlock:"shape=mxgraph.eip.smart_proxy;verticalLabelPosition=bottom;verticalAlign=top",EITestMessageBlock:"shape=mxgraph.eip.test_message;verticalLabelPosition=bottom;verticalAlign=top",EIChannelPurgerBlock:"shape=mxgraph.eip.channel_purger;verticalLabelPosition=bottom;verticalAlign=top",GCPIconComputeEngineBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.compute_engine",
+GCPIconAppEngineBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.app_engine",GCPIconContainerEngineBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_engine",GCPIconContainerRegistryBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_registry",GCPIconCloudFunctionsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_functions",
+GCPIconCloudStorageBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_storage",GCPIconCloudSQLBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_sql",GCPIconCloudBigtableBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_bigtable",GCPIconCloudDatastoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datastore",
+GCPIconPersistentDiskBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.persistent_disk",GCPIconCloudVirtualNetworkBlock:"strokeColor=none;shape=mxgraph.gcp.networking.cloud_virtual_network;verticalLabelPosition=bottom;verticalAlign=top",GCPIconCloudLoadBalancingBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_load_balancing",GCPIconCloudCDNBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_cdn",
+GCPIconCloudInterconnectBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dedicated_interconnect",GCPIconCloudInterconnectBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dedicated_interconnect",GCPIconCloudDNSBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dns",GCPIconBigQueryBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.bigquery",
+GCPIconCloudDataflowBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataflow",GCPIconCloudDataprocBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataproc",GCPIconCloudDatalabBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datalab",GCPIconCloudPubSubBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_pubsub",
+GCPIconGenomicsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.genomics",GCPIconCloudMachineLearningServicesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_machine_learning",GCPIconCloudMachineLearningServicesBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_machine_learning",GCPIconVisionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vision_api",
+GCPIconVisionAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vision_api",GCPIconSpeechAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_speech_api",GCPIconSpeechAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_speech_api",GCPIconNaturalLanguageAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_natural_language_api",
+GCPIconNaturalLanguageAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_natural_language_api",GCPIconTranslateAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_translation_api",GCPIconTranslateAPIBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_translation_api",GCPIconStackdriverOverviewBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.stackdriver",
+GCPIconStackdriverOverviewBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.stackdriver",GCPIconMonitoringBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconLoggingBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.logging",GCPIconErrorReportingBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.error_reporting",
+GCPIconTraceBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.trace",GCPIconDebuggerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.debugger",GCPIconDeploymentManagerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconDeploymentManagerBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",
+GCPIconCloudEndpointsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_endpoints",GCPIconCloudToolsForPowerShellBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",GCPIconCloudToolsForVisualStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",GCPIconCloudIAMBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iam",
+GCPIconGCPLogoBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconGCPLogoBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconBlankBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.blue_hexagon",GCPIconBlankBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.blue_hexagon",GCPIconAPIAnalyticsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.api_analytics",
+GCPIconApigeeAPIPlatformBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.apigee_api_platform",GCPIconApigeeSenseBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.apigee_sense",GCPIconAPIMonetizationBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.api_monetization",GCPIconCloudEndpointsBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_endpoints",
+GCPIconDeveloperPortalBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.developer_portal",GCPIconBigQueryBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.bigquery",GCPIconCloudComposerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_composer",GCPIconCloudDataflowBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataflow",
+GCPIconCloudDatalabBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datalab",GCPIconCloudDataprepBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataprep",GCPIconCloudDataprocBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dataproc",GCPIconCloudPubSubBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_pubsub",
+GCPIconDataStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.data_studio",GCPIconGenomicsBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.genomics",GCPIconAdvancedSolutionsLabBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.advanced_solutions_lab",GCPIconCloudAutoMLBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_automl",
+GCPIconCloudNaturalLanguageAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_natural_language_api",GCPIconCloudJobsAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_jobs_api",GCPIconCloudTPUBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tpu",GCPIconCloudMachineLearningBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_machine_learning",
+GCPIconCloudVisionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vision_api",GCPIconCloudTranslationAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_translation_api",GCPIconDialogflowEnterpriseEditionBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dialogflow_enterprise_edition",GCPIconCloudSpeechAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_speech_api",
+GCPIconCloudTexttoSpeechBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_text_to_speech",GCPIconCloudVideoIntelligenceAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_video_intelligence_api",GCPIconAppEngineBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.app_engine",GCPIconCloudToolsforVisualStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",
+GCPIconCloudDeploymentManagerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconCloudFunctionsBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_functions",GCPIconContainerBuilderBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_builder",GCPIconCloudSDKBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",
+GCPIconCloudSourceRepositoriesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconContainerRegistryBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_registry",GCPIconCloudTestLabBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconGPUBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.gpu",
+GCPIconContainerEngineBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_engine",GCPIconTransferApplianceBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.transfer_appliance",GCPIconCloudToolsforPowerShellBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_tools_for_powershell",GCPIconCloudToolsforIntelliJBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",
+GCPIconCloudToolsforAndroidStudioBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconGooglePluginforEclipseBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconContainerOptimizedOSBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.container_optimized_os",GCPIconComputeEngineBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.compute_engine",
+GCPIconBeyondCorpBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.beyondcorp",GCPIconCloudIAMBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iam",GCPIconCloudResourceManagerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iam",GCPIconCloudSecurityCommandCenterBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_security_command_center",
+GCPIconCloudSecurityScannerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_security_scanner",GCPIconDataLossPreventionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.data_loss_prevention_api",GCPIconIdentityAwareProxyBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.identity_aware_proxy",GCPIconKeyManagementServiceBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.key_management_service",
+GCPIconSecurityKeyEnforcementBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.security_key_enforcement",GCPIconCloudIoTCoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_iot_core",GCPIconCloudAPIsBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_apis",GCPIconCloudBillingAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",
+GCPIconCloudConsoleBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconCloudDeploymentManagerBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",GCPIconCloudMobileAppBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconCloudShellBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",
+GCPIconDebuggerBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.debugger",GCPIconErrorReportingBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.error_reporting",GCPIconLoggingBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.logging",GCPIconMonitoringBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_deployment_manager",
+GCPIconStackdriverBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.stackdriver",GCPIconTraceBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.trace",GCPIconCloudArmorBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_armor",GCPIconCloudCDNBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_cdn",GCPIconCloudDNSBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_dns",
+GCPIconCloudExternalIPAddressesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_external_ip_addresses",GCPIconCloudFirewallRulesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_firewall_rules",GCPIconCloudLoadBalancingBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_load_balancing",GCPIconCloudNetworkBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_network",
+GCPIconCloudRouterBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_router",GCPIconCloudRoutesBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_routes",GCPIconCloudVPNBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_vpn",GCPIconDedicatedInterconnectBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.dedicated_interconnect",
+GCPIconPartnerInterconnectBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.partner_interconnect",GCPIconPremiumNetworkTierBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.premium_network_tier",GCPIconStandardNetworkTierBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.standard_network_tier",GCPIconVirtualPrivateCloudBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.virtual_private_cloud",
+GCPIconCloudBigtableBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_bigtable",GCPIconCloudDatastoreBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_datastore",GCPIconCloudFilestoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_filestore",GCPIconCloudMemorystoreBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_memorystore",
+GCPIconCloudSpannerBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_spanner",GCPIconCloudSQLBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_sql",GCPIconCloudStorageBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.cloud_storage",GCPIconPersistentDiskBlock2:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.persistent_disk",
+GCPIconGoogleCloudPlatformBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.google_cloud_platform",GCPIconBlueHexagonBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.blue_hexagon",GCPIconGenericBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.placeholder",GCPIconPredictionAPIBlock:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.gcp2.prediction_api",
+GCPAutoScalingModifier:"shape=mxgraph.gcp2.modifiers_autoscaling;fillColor=#757575;strokeColor=none;",GCPCustomVirtualMachineModifier:"shape=mxgraph.gcp2.modifiers_custom_virtual_machine;fillColor=#757575;strokeColor=none;",GCPHighCPUMachineModifier:"shape=mxgraph.gcp2.modifiers_high_cpu_machine;fillColor=#757575;strokeColor=none;",GCPHighMemoryMachineModifier:"shape=mxgraph.gcp2.modifiers_high_memory_machine;fillColor=#757575;strokeColor=none;",GCPPreemptableVSModifier:"shape=mxgraph.gcp2.modifiers_preemptable_vm;fillColor=#757575;strokeColor=none;",
+GCPSharedCoreMachineF1Modifier:"shape=mxgraph.gcp2.modifiers_shared_core_machine_f1;fillColor=#757575;strokeColor=none;",GCPSharedCoreMachineG1Modifier:"shape=mxgraph.gcp2.modifiers_shared_core_machine_g1;fillColor=#757575;strokeColor=none;",GCPStandardMachineModifier:"shape=mxgraph.gcp2.modifiers_standard_machine;fillColor=#757575;strokeColor=none;",GCPStorageModifier:"shape=mxgraph.gcp2.modifiers_storage;fillColor=#757575;strokeColor=none;",GCPAppEngineProductCard:"mxCompositeShape",GCPCloudDataflowProductCard:"mxCompositeShape",
+GCPCloudDataprocProductCard:"mxCompositeShape",GCPComputeEngineProductCard:"mxCompositeShape",GCPContainerEngineProductCard:"mxCompositeShape",CronjobLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cronjob",CronjobKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cronjob",DeployLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=deploy",
+DeployKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=deploy",DsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ds",DsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ds",JobLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=job",
+JobKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=job",PodLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pod",PodKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pod",RsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rs",
+RsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rs",StsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sts",StsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sts",PvLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pv",
+PvKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pv",PvcLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pvc",PvcKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=pvc",ScLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sc",
+ScKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sc",VolLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=vol",VolKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=vol",EpLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ep",
+EpKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ep",IngLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ing",IngKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ing",NetpolLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=netpol",
+NetpolKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=netpol",SvcLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=svc",SvcKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=svc",CrdLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crd",
+CrdKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crd",CroleLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_role",CroleKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_role",GroupLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=group",
+GroupKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=group",RbLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rb",RbKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=rb",RoleLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=role",
+RoleKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=role",SaLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sa",SaKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sa",UserLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=user",
+UserKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=user",CmResourceLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cm",CmKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=cm",SecretLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=secret",
+SecretKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=secret",HpaLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=hpa",HpaKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=hpa",LimitsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=limits",
+LimitsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=limits",QuotaLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=quota",QuotaKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=quota",CrbLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crb",
+CrbKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=crb",LogoKub19:"aspect=fixed;html=1;align=center;image;image=img/lib/mscae/Kubernetes.svg",NsLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ns",NsKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=ns",PspLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=psp",
+PspKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=psp",EtcdLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=etcd",EtcdKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=etcd",MasterLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=master",
+MasterKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=master",NodeLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=node",NodeKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=node",ApiLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=api",
+CcmLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_c_m",CmLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=c_m",KproxyLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=node",KubeletLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=kubelet",
+SchedLabeledKub19:"html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeColor=none;shape=mxgraph.kubernetes.icon;prIcon=sched",Equation:"mxCompositeShape",fpWall:"",fpWindow:"shape=mxgraph.floorplan.window",fpOpening:"shape=rect",fpDoor:"mxCompositeShape",fpDoubleDoor:"mxCompositeShape",fpStairs:"shape=mxgraph.floorplan.stairs;direction=north",fpStairsDirectional:"shape=mxgraph.floorplan.stairs;direction=north;verticalAlign=bottom",fpDeskLongSegment:"",fpDeskShortSegment:"",fpDeskLargeCornerSegment:"shape=mxgraph.floorplan.desk_corner",
+fpCubiclePanel:"shape=mxgraph.floorplan.wall;wallThickness=3",fpCubicleWorkstation:"shape=mxgraph.floorplan.wallU;wallThickness=3",fpCubicleCorner5x5:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleCorner6x6:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleCorner8x8:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleCorner8x6:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleCornerOpen6x4:"shape=mxgraph.floorplan.wallCorner;wallThickness=3",fpCubicleDouble14x8:"shape=mxgraph.floorplan.wallU;wallThickness=3",
+fpCubicleEnclosed11x9:"shape=mxgraph.floorplan.wallU;wallThickness=3",fpTableConferenceOval:"ellipse",fpTableConferenceBoat:"",fpTableConferenceRectangle:"",fpTableDiningRound:"ellipse",fpTableDiningSquare:"",fpChairOffice:"shape=mxgraph.floorplan.office_chair",fpChairExecutive:"shape=mxgraph.floorplan.office_chair",fpChairLobby:"shape=mxgraph.floorplan.office_chair",fpChairDining:"shape=mxgraph.floorplan.chair",fpChairBarstool:"ellipse",fpCabinetBasic:"",fpCabinetDoubleWide:"",fpCabinetDoubleWithShelves:"",
+fpCabinetShelvesBasic:"",fpCabinetShelvesDouble:"",fpCabinetBasicWithShelves:"",fpCabinetsAboveDeskShelves:"",fpRestroomToiletPrivate:"shape=mxgraph.floorplan.toilet",fpRestroomToiletPublic:"shape=mxgraph.floorplan.toilet",fpRestroomLights:"mxCompositeShape",fpRestroomSinks:"mxCompositeShape",fpRestroomBathtub:"shape=mxgraph.floorplan.bathtub;direction=south",fpRestroomShower:"shape=mxgraph.floorplan.shower;flipH=1",fpRestroomPedastalSink:"shape=mxgraph.floorplan.sink_1",fpRestroomCountertop:"",fpRestroomMirror:"shape=line;strokeWidth=3",
+fpRestroomStalls:"mxCompositeShape",fpBedDouble:"shape=mxgraph.floorplan.bed_double",fpBedSingle:"shape=mxgraph.floorplan.bed_single",fpBedQueen:"shape=mxgraph.floorplan.bed_double",fpBedKing:"shape=mxgraph.floorplan.bed_double",fpBedDoubleWithTrundle:"shape=mxgraph.floorplan.bed_double",fpBedBunk:"shape=mxgraph.floorplan.bed_double",fpBedBassinet:"shape=mxgraph.pid.fittings.compensator",fpApplianceWasher:"",fpApplianceDryer:"",fpApplianceWaterHeater:"ellipse",fpApplianceStoveOven:"shape=mxgraph.floorplan.range_1",
+fpStoveOvenSixBurner:"shape=mxgraph.floorplan.range_2",fpApplianceDishwasher:"",fpKitchenSink:"shape=mxgraph.floorplan.sink_2",fpKitchenDoubleSink:"shape=mxgraph.floorplan.sink_double",fpKitchenCountertop:"",fpKitchenCountertopCorner:"shape=mxgraph.floorplan.desk_corner",fpCouchLoveSeat:"shape=mxgraph.floorplan.couch",fpCouchSofa:"shape=mxgraph.floorplan.couch",fpCouchOttoman:"",fpMiscDesktopComputer:"shape=mxgraph.floorplan.workstation",fpMiscLaptopComputer:"shape=mxgraph.floorplan.laptop",fpComputerMonitor:"shape=mxgraph.floorplan.flat_tv",
+fpCRTTelevision:"shape=mxgraph.floorplan.flat_tv",fpMiscIndoorPlant:"shape=mxgraph.floorplan.plant",fpPiano:"shape=mxgraph.floorplan.piano",PEAxialCompressor:"shape=mxgraph.pid.compressors.centrifugal_compressor_-_turbine_driven;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalCompressor:"shape=mxgraph.pid.compressors.centrifugal_compressor;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalCompressor2:"shape=mxgraph.pid.compressors.centrifugal_compressor_-_turbine_driven;verticalLabelPosition=bottom;verticalAlign=top",
+PEReciprocationCompressor:"shape=mxgraph.pid.compressors.reciprocating_compressor;verticalLabelPosition=bottom;verticalAlign=top",PERotaryCompressorBlock:"shape=mxgraph.pid.compressors.rotary_compressor;verticalLabelPosition=bottom;verticalAlign=top",PERotaryCompressor2Block:"shape=mxgraph.pid.compressors.compressor_and_silencers;verticalLabelPosition=bottom;verticalAlign=top",PEConveyorBlock:"shape=mxgraph.pid2misc.conveyor;verticalLabelPosition=bottom;verticalAlign=top",PEElevator1Block:"shape=mxgraph.pid.misc.bucket_elevator;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",
+PEAgitatorMixerBlock:"shape=mxgraph.pid.agitators.agitator_(propeller);verticalLabelPosition=bottom;verticalAlign=top",PEDrumBlock:"shape=mxgraph.pid.vessels.drum_or_condenser;verticalLabelPosition=bottom;verticalAlign=top",PETankEquipmentBlock:"shape=mxgraph.pid.vessels.tank;verticalLabelPosition=bottom;verticalAlign=top",PEMixingReactorBlock:"shape=mxgraph.pid.vessels.mixing_reactor;verticalLabelPosition=bottom;verticalAlign=top",PEPlateTowerBlock:"shape=mxgraph.pid2misc.column;columnType=baffle;verticalLabelPosition=bottom;verticalAlign=top",
+PEPackedTowerBlock:"shape=mxgraph.pid2misc.column;columnType=fixed;verticalLabelPosition=bottom;verticalAlign=top",PEFurnaceBlock:"shape=mxgraph.pid.vessels.furnace;verticalLabelPosition=bottom;verticalAlign=top",PEOneToMany:"mxCompositeShape",PEMultilines:"mxCompositeShape",PEMidArrow:"shape=triangle;anchorPointDirection=0",PEButtWeld:"shape=mxgraph.sysml.x",PETopToTop:"shape=mxgraph.pid.vessels.container,_tank,_cistern",PENuclear:"shape=mxgraph.electrical.waveforms.sine_wave",PEMechanicalLink:"ellipse",
+PESolderedSolvent:"ellipse",PEDoubleContainment:"shape=hexagon;perimeter=hexagonPerimeter2",PEFlange:"shape=mxgraph.pid.piping.double_flange",PEFlange2:"shape=mxgraph.pid.piping.flange_in;flipH=1",PEEndCap:"shape=mxgraph.pid.piping.cap",PEEndCap2:"shape=mxgraph.pid.vessels.container,_tank,_cistern;direction=north",PEBreather:"shape=mxgraph.pid.piping.breather",PEElectronicallyInsulated:"shape=mxgraph.pid.piping.double_flange",PEReducer:"shape=mxgraph.pid.piping.concentric_reducer",PEInlineMixer:"shape=mxgraph.pid.piping.in-line_mixer",
+PEFlameArrester:"shape=mxgraph.pid.piping.flame_arrestor",PEDetonationArrester:"shape=mxgraph.pid.piping.detonation_arrestor",PETriangleSeparator:"shape=triangle;direction=west;anchorPointDirection=0",PETundish:"shape=mxgraph.ios7.misc.left",PEOpenVent:"shape=mxgraph.pid.vessels.vent_(bent)",PERemovableSpool:"shape=mxgraph.pid.piping.removable_spool",PEYTypeStrainer:"shape=mxgraph.pid.piping.y-type_strainer",PEDiverterValve:"shape=mxgraph.pid.piping.diverter_valve",PEPulsationDampener:"shape=mxgraph.pid.piping.pulsation_dampener",
+PEDuplexStrainer:"shape=mxgraph.pid.piping.duplex_strainer",PEBasketStrainer:"shape=mxgraph.pid.piping.basket_strainer",PEVentSilencer:"shape=mxgraph.pid.piping.vent_silencer",PEInlineSilencer:"shape=mxgraph.pid.piping.in-line_silencer",PESteamTrap:"shape=mxgraph.pid.piping.steam_trap",PEDesuperheater:"shape=mxgraph.pid.piping.desuper_heater",PEEjectorOrEductor:"shape=mxgraph.pid.fittings.injector",PEExhaustHead:"shape=mxgraph.pid.piping.exhaust_head",PERotaryValve:"shape=mxgraph.pid.piping.rotary_valve",
+PEExpansionJoint:"shape=mxgraph.pid.piping.expansion_joint",PEVesselBlock:"mxCompositeShape",PEOpenTankBlock:"shape=mxgraph.pid.vessels.container,_tank,_cistern;verticalLabelPosition=bottom;verticalAlign=top",PEOpenTopTank:"shape=mxgraph.pid.vessels.container,_tank,_cistern;verticalLabelPosition=bottom;verticalAlign=top",PEClosedTankBlock:"mxCompositeShape",PEStorageSphereBlock:"shape=mxgraph.pid.vessels.storage_sphere;verticalLabelPosition=bottom;verticalAlign=top",PEColumnBlock:"mxCompositeShape",
+PEBagBlock:"shape=mxgraph.pid.vessels.bag;verticalLabelPosition=bottom;verticalAlign=top",PEGasCylinderBlock:"shape=mxgraph.pid.vessels.gas_bottle;verticalLabelPosition=bottom;verticalAlign=top",PEGasHolderBlock:"shape=mxgraph.pid.vessels.gas_holder;verticalLabelPosition=bottom;verticalAlign=top",PEClarifierBlock:"shape=mxgraph.pid.vessels.bunker_(conical_bottom);verticalLabelPosition=bottom;verticalAlign=top",PETankBlock:"shape=mxgraph.pid.vessels.tank_(conical_roof);verticalLabelPosition=bottom;verticalAlign=top",
+PETrayColumnBlock:"shape=mxgraph.pid2misc.column;columnType=tray;verticalLabelPosition=bottom;verticalAlign=top",PEReactionVesselBlock:"shape=mxgraph.pid.vessels.reactor;verticalLabelPosition=bottom;verticalAlign=top",PEBin:"shape=mxgraph.pid.vessels.tank_(conical_bottom)",PEDomeRoofTank:"shape=mxgraph.pid.vessels.tank_(dished_roof)",PEConeRoofTank:"shape=mxgraph.pid.vessels.tank_(conical_roof)",PEBoilerBlock:"shape=mxgraph.pid.misc.boiler_(dome);verticalLabelPosition=bottom;verticalAlign=top",PEEquipmentBoilerBlock:"shape=mxgraph.pid.misc.boiler_(dome);verticalLabelPosition=bottom;verticalAlign=top",
+PEReboilerBlock:"shape=mxgraph.pid.heat_exchangers.reboiler;verticalLabelPosition=bottom;verticalAlign=top",PECondenserBlock:"shape=mxgraph.pid.heat_exchangers.heat_exchanger_(straight_tubes);verticalLabelPosition=bottom;verticalAlign=top",PEEquipmentCondenserBlock:"shape=mxgraph.pid.heat_exchangers.condenser;verticalLabelPosition=bottom;verticalAlign=top",PECoolingTowerBlock:"shape=mxgraph.pid.misc.cooling_tower;verticalLabelPosition=bottom;verticalAlign=top",PEHeatExchangerBlock:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_1;verticalLabelPosition=bottom;verticalAlign=top",
+PEHairpinExchangerBlock:"shape=mxgraph.pid.heat_exchangers.hairpin_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEPlateAndFrameHeatExchangerBlock:"shape=mxgraph.pid.heat_exchangers.plate_and_frame_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PESpiralHeatExchanger:"shape=mxgraph.pid.heat_exchangers.spiral_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEUTubeHeatExchangerBlock:"shape=mxgraph.pid.heat_exchangers.u-tube_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",
+PEDoublePipeHeatBlock:"shape=mxgraph.pid.heat_exchangers.double_pipe_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEShellAndTubeHeat1Block:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_1;verticalLabelPosition=bottom;verticalAlign=top",PEShellAndTubeHeat2Block:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_2;verticalLabelPosition=bottom;verticalAlign=top",PEShellAndTubeHeat3Block:"shape=mxgraph.pid.heat_exchangers.shell_and_tube_heat_exchanger_1;direction=north;verticalLabelPosition=bottom;verticalAlign=top",
+PESinglePassHeatBlock:"shape=mxgraph.pid.heat_exchangers.single_pass_heat_exchanger;verticalLabelPosition=bottom;verticalAlign=top",PEHeaterBlock:"shape=mxgraph.pid.heat_exchangers.heater;verticalLabelPosition=bottom;verticalAlign=top",PEEjectorInjectorBlock:"shape=mxgraph.pid.fittings.injector;verticalLabelPosition=bottom;verticalAlign=top",PECompressorTurbineBlock:"mxCompositeShape",PEMotorDrivenTurbineBlock:"mxCompositeShape",PECentrifugalPumpBlock:"shape=mxgraph.pid.pumps.gas_blower;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",
+PECentrifugalPump:"shape=mxgraph.pid.pumps.centrifugal_pump_1;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalPump2:"shape=mxgraph.pid.pumps.centrifugal_pump_2;verticalLabelPosition=bottom;verticalAlign=top",PECentrifugalPump3:"shape=mxgraph.pid.pumps.centrifugal_pump_1;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",PEGearPumpBlock:"shape=mxgraph.pid.pumps.gear_pump;verticalLabelPosition=bottom;verticalAlign=top",PEHorizontalPump:"shape=mxgraph.pid.pumps.horizontal_pump;verticalLabelPosition=bottom;verticalAlign=top",
+PEProgressiveCavityPump:"shape=mxgraph.pid.pumps.cavity_pump;flipH=1;flipV=1;verticalLabelPosition=bottom;verticalAlign=top",PEScrewPump:"shape=mxgraph.pid.pumps.screw_pump;verticalLabelPosition=bottom;verticalAlign=top",PEScrewPump2:"shape=mxgraph.pid.pumps.screw_pump_2;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",PESumpPump:"shape=mxgraph.pid.pumps.sump_pump;verticalLabelPosition=bottom;verticalAlign=top",PEVacuumPump:"shape=mxgraph.pid.pumps.vacuum_pump;verticalLabelPosition=bottom;verticalAlign=top",
+PEVerticalPump:"shape=mxgraph.pid.pumps.vertical_pump;verticalLabelPosition=bottom;verticalAlign=top",PEVerticalPump2:"shape=mxgraph.pid.pumps.vertical_pump;verticalLabelPosition=bottom;verticalAlign=top",PEIndicatorBlock:"mxCompositeShape",PEIndicator2Block:"mxCompositeShape",PEIndicator3Block:"shape=mxgraph.pid2inst.discInst;mounting=field",PEIndicator4Block:"shape=mxgraph.pid2inst.indicator;mounting=field;indType=inst",PESharedIndicatorBlock:"mxCompositeShape",PESharedIndicator2Block:"mxCompositeShape",
+PEComputerIndicatorBlock:"mxCompositeShape",PEProgrammableIndicatorBlock:"mxCompositeShape",PEGateValveBlock:"mxCompositeShape",PEGlobeValveBlock:"mxCompositeShape",PEControlValveBlock:"shape=mxgraph.pid2valves.valve;valveType=gate;actuator=diaph;verticalLabelPosition=bottom;verticalAlign=top",PENeedleValveBlock:"shape=mxgraph.pid2valves.valve;valveType=needle;verticalLabelPosition=bottom;verticalAlign=top",PEButterflyValve2Block:"shape=mxgraph.pid2valves.valve;flipH=1;valveType=butterfly;verticalLabelPosition=bottom;verticalAlign=top",
+PEBallValveBlock:"shape=mxgraph.pid2valves.valve;valveType=ball;verticalLabelPosition=bottom;verticalAlign=top",PEDiaphragmBlock:"shape=mxgraph.pid2valves.valve;valveType=ball;verticalLabelPosition=bottom;verticalAlign=top",PEPlugValveBlock:"shape=mxgraph.pid2valves.valve;valveType=ball;verticalLabelPosition=bottom;verticalAlign=top",PECheckValveBlock:"shape=mxgraph.pid2valves.valve;valveType=check;verticalLabelPosition=bottom;verticalAlign=top",PECheckValve2Block:"shape=mxgraph.pid2valves.valve;valveType=check;verticalLabelPosition=bottom;verticalAlign=top",
+PEAngleValveBlock:"mxCompositeShape",PEAngleGlobeValveBlock:"mxCompositeShape",PEPoweredValveBlock:"mxCompositeShape",PEFloatOperatedValveBlock:"shape=mxgraph.pid2valves.valve;valveType=gate;actuator=singActing;verticalLabelPosition=bottom;verticalAlign=top",PENeedleValve2Block:"shape=mxgraph.pid2valves.valve;valveType=needle;verticalLabelPosition=bottom;verticalAlign=top",PEThreeWayValveBlock:"shape=mxgraph.pid2valves.valve;valveType=threeWay;actuator=none;verticalLabelPosition=bottom;verticalAlign=top",
 PEBleederValveBlock:"shape=mxgraph.pid2valves.blockBleedValve;actuator=none;verticalLabelPosition=bottom;verticalAlign=top",PERotameterBlock:"shape=mxgraph.pid.flow_sensors.rotameter;flipH=1;verticalLabelPosition=bottom;verticalAlign=top",VennGradientColor1:"ellipse;fillOpacity=35",VennGradientColor2:"ellipse;fillOpacity=35",VennGradientColor3:"ellipse;fillOpacity=35",VennGradientColor4:"ellipse;fillOpacity=35",VennGradientColor5:"ellipse;fillOpacity=35",VennGradientColor6:"ellipse;fillOpacity=35",
 VennGradientColor7:"ellipse;fillOpacity=35",VennGradientColor8:"ellipse;fillOpacity=35",VennPlainColor1:"ellipse;fillOpacity=35",VennPlainColor2:"ellipse;fillOpacity=35",VennPlainColor3:"ellipse;fillOpacity=35",VennPlainColor4:"ellipse;fillOpacity=35",VennPlainColor5:"ellipse;fillOpacity=35",VennPlainColor6:"ellipse;fillOpacity=35",VennPlainColor7:"ellipse;fillOpacity=35",VennPlainColor8:"ellipse;fillOpacity=35",iOS7DeviceiPhone5Portrait:"shape=mxgraph.ios.iPhone;bgStyle=bgGreen",iOS7DeviceiPhone5Landscape:"shape=mxgraph.ios.iPhone;bgStyle=bgGreen",
 iOS7DeviceiPadPortrait:"shape=mxgraph.ios.iPad;bgStyle=bgGreen",iOS7DeviceiPadLandscape:"shape=mxgraph.ios.iPad;bgStyle=bgGreen",iOS7DeviceiPhone6Portrait:"shape=mxgraph.ios.iPhone;bgStyle=bgGreen",iOS7DeviceiPhone6Landscape:"shape=mxgraph.ios.iPhone;bgStyle=bgGreen",iOS7DeviceiPhone6PlusPortrait:"shape=mxgraph.ios.iPhone;bgStyle=bgGreen",iOS7DeviceiPhone6PlusLandscape:"shape=mxgraph.ios.iPhone;bgStyle=bgGreen",iOS7StatusBariPhone:"shape=mxgraph.ios7ui.appBar",iOS7TabsiPhone:"mxCompositeShape",iOS7iPhoneActionSheet:"mxCompositeShape",
@@ -825,12 +835,14 @@ AWSOutpostsAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.outposts;
 VMwareCloudOnAWSAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.vmware_cloud_on_aws;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonEC2_AMIAWS19:"shape=mxgraph.aws4.ami;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonEC2_AutoScalingAWS19:"shape=mxgraph.aws4.auto_scaling2;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonEC2ContainerRegistry_ImageAWS19:"shape=mxgraph.aws4.container_registry_image;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",
 AmazonEC2ContainerRegistry_RegistryAWS19:"shape=mxgraph.aws4.registry;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonEC2_ElasticIPAddressAWS19:"shape=mxgraph.aws4.elastic_ip_address;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonEC2_RescueAWS19:"shape=mxgraph.aws4.rescue;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonElasticContainerService_Container1AWS19:"shape=mxgraph.aws4.container_1;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",
 AmazonElasticContainerService_Container2AWS19:"shape=mxgraph.aws4.container_2;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonElasticContainerService_Container3AWS19:"shape=mxgraph.aws4.container_3;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonElasticContainerService_ServiceAWS19:"shape=mxgraph.aws4.ecs_service;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonElasticContainerService_TaskAWS19:"shape=mxgraph.aws4.ecs_task;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",
-AWSElasticBeanstalk_ApplicationAWS19:"shape=mxgraph.aws4.application;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AWSElasticBeanstalk_DeploymentAWS19:"shape=mxgraph.aws4.deployment;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AWSLambda_LambdaFunctionAWS19:"shape=mxgraph.aws4.lambda_function;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AWSCostManagementAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cost_management;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top",
-AWSBudgetsAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.budgets;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AWSCostandUsageReportAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cost_and_usage_report;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AWSCostExplorerAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cost_explorer;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
-ReservedInstanceReportingAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.reserved_instance_reporting;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",CustomerEngagementAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.customer_engagement;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top",AmazonConnectAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.connect;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
-AmazonPinpointAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.pinpoint;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonSimpleEmailServiceSESAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.simple_email_service;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonSimpleEmailServiceSES_EmailAWS19:"shape=mxgraph.aws4.email;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",DatabaseAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.database;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top",
-AmazonAuroraAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.aurora;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonDocumentDBwithMongoDBcompatibilityAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.documentdb_with_mongodb_compatibility;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonDynamoDBAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.dynamodb;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
-AmazonElastiCacheAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.elasticache;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonNeptuneAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.neptune;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonQuantumLedgerDatabase_QLDBAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.quantum_ledger_database;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
+AWSElasticBeanstalk_ApplicationAWS19:"shape=mxgraph.aws4.application;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AWSElasticBeanstalk_DeploymentAWS19:"shape=mxgraph.aws4.deployment;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AWSLambda_LambdaFunctionAWS19:"shape=mxgraph.aws4.lambda_function;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AWSThinkboxDeadlineAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_deadline;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;",
+AWSThinkboxDraftAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_draft;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;",AWSThinkboxFrostAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_frost;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;",AWSThinkboxKrakatoaAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_krakatoa;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;",
+AWSThinkboxSequoiaAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_sequoia;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;",AWSThinkboxStokeAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_stoke;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;",AWSThinkboxXMeshAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.thinkbox_xmesh;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff;",
+AWSCostManagementAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cost_management;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top",AWSBudgetsAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.budgets;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AWSCostandUsageReportAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cost_and_usage_report;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
+AWSCostExplorerAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.cost_explorer;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",ReservedInstanceReportingAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.reserved_instance_reporting;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",CustomerEngagementAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.customer_engagement;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top",
+AmazonConnectAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.connect;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonPinpointAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.pinpoint;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonSimpleEmailServiceSESAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.simple_email_service;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
+AmazonSimpleEmailServiceSES_EmailAWS19:"shape=mxgraph.aws4.email;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",DatabaseAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.database;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top",AmazonAuroraAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.aurora;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonDocumentDBwithMongoDBcompatibilityAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.documentdb_with_mongodb_compatibility;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
+AmazonDynamoDBAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.dynamodb;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonElastiCacheAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.elasticache;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonNeptuneAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.neptune;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonQuantumLedgerDatabase_QLDBAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.quantum_ledger_database;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
 AmazonRDSAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.rds;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonRDSonVMwareAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.rds_on_vmware;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonRedshift_blueAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.redshift;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonTimestreamAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.timestream;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",
 AWSDatabaseMigrationServiceAWS19:"shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.database_migration_service;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=#ffffff",AmazonDynamoDB_AttributeAWS19:"shape=mxgraph.aws4.attribute;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonDynamoDB_AttributesAWS19:"shape=mxgraph.aws4.attributes;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonDynamoDB_GlobalSecondaryIndexAWS19:"shape=mxgraph.aws4.global_secondary_index;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",
 AmazonDynamoDB_ItemAWS19:"shape=mxgraph.aws4.item;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonDynamoDB_ItemsAWS19:"shape=mxgraph.aws4.items;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonDynamoDB_TableAWS19:"shape=mxgraph.aws4.table;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",AmazonElastiCache_CacheNodeAWS19:"shape=mxgraph.aws4.cache_node;verticalLabelPosition=bottom;align=center;verticalAlign=top;strokeColor=none",
diff --git a/src/main/webapp/package.json b/src/main/webapp/package.json
index c63216bc..d7bad649 100644
--- a/src/main/webapp/package.json
+++ b/src/main/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draw.io",
-  "version": "13.7.8",
+  "version": "13.10.0",
   "description": "diagrams.net desktop",
   "main": "electron.js",
   "scripts": {
@@ -24,14 +24,14 @@
   "homepage": "https://github.com/jgraph/drawio",
   "dependencies": {
     "commander": "^6.1.0",
-    "electron-log": "^4.2.4",
-    "electron-updater": "^4.3.4",
+    "electron-log": "^4.3.0",
+    "electron-updater": "^4.3.5",
     "electron-progressbar": "1.2.0",
     "electron-store": "^6.0.1",
     "compression": "^1.7.4",
     "crc": "^3.8.0"
   },
   "devDependencies": {
-    "electron": "^10.1.3"
+    "electron": "^11.0.1"
   }
 }
diff --git a/src/main/webapp/plugins/cConf-1-4-8.js b/src/main/webapp/plugins/cConf-1-4-8.js
index 0a404647..7e2ece08 100644
--- a/src/main/webapp/plugins/cConf-1-4-8.js
+++ b/src/main/webapp/plugins/cConf-1-4-8.js
@@ -737,6 +737,187 @@ Draw.loadPlugin(function(ui)
 		});
 	});
 
+	//=============Custom Libraries in More Shapes ===================
+	function addImage(container, data, w, h, img) 
+	{
+		var ew = 100;
+		var eh = 100;
+		
+		var iw = w;
+		var ih = h;
+		
+		if (w > ui.maxImageSize || h > ui.maxImageSize)
+		{
+			var s = Math.min(1, Math.min(ui.maxImageSize / Math.max(1, w)), ui.maxImageSize / Math.max(1, h));
+			w *= s;
+			h *= s;
+		}
+		
+		if (iw > ih)
+		{
+			ih = Math.round(ih * ew / iw);
+			iw = ew;
+		}
+		else
+		{
+			iw = Math.round(iw * eh / ih);
+			ih = eh;
+		}
+		
+		var wrapper = document.createElement('div');
+		wrapper.setAttribute('draggable', 'true');
+		wrapper.style.display = 'inline-block';
+		wrapper.style.cursor = 'move';
+		
+		if (data != null)
+		{
+            var elt = document.createElement('img');
+            elt.setAttribute('src', data);
+			elt.style.width = iw + 'px';
+			elt.style.height = ih + 'px';
+			elt.style.margin = '10px';
+
+			elt.style.paddingBottom = Math.floor((eh - ih) / 2) + 'px';
+			elt.style.paddingLeft = Math.floor((ew - iw) / 2) + 'px';
+			
+			wrapper.appendChild(elt);
+		}
+		else if (img != null)
+		{
+			var cells = ui.stringToCells(Graph.decompress(img.xml));
+			
+			if (cells.length > 0)
+			{
+				ui.sidebar.createThumb(cells, ew, eh, wrapper, null, true, false);
+				
+				// Needs inline block on SVG for delete icon to appear on same line
+				wrapper.firstChild.style.display = 'inline-block';
+				wrapper.firstChild.style.cursor = '';
+			}
+		}
+		
+		container.appendChild(wrapper);
+	};
+	
+	var customLibraries = [];
+	
+	ui.actions.addAction('shapes...', mxUtils.bind(this, function()
+	{
+		ui.remoteInvoke('getCustomLibraries', null, null, function(libs)
+		{
+			customLibraries = libs;
+			
+			for(var i = 0; i < libs.length; i++) 
+			{
+				libs[i].imageCallback = mxUtils.bind(libs[i], function(preview) 
+				{
+					preview.innerHTML = '<img src="/images/spin.gif">';
+
+					ui.remoteInvoke('getFileContent', [this.downloadUrl], null, function(libContent)
+					{
+						try
+						{
+							preview.innerHTML = '';
+							doc = mxUtils.parseXml(libContent);
+							var images = JSON.parse(mxUtils.getTextContent(doc.documentElement));
+							
+							for(var i = 0; i < images.length; i++) 
+							{
+								addImage(preview, images[i].data, images[i].w, images[i].h, images[i]);
+							}
+						}
+						catch(e)
+						{
+							preview.innerHTML = mxResources.get('confAErrOccured');
+							console.log(e);
+						}
+					}, function(err)
+					{
+						preview.innerHTML = mxResources.get('errorLoadingFile');
+						console.log(err);
+					});
+				});
+			}
+			
+			var customLibsEntry = libs.length > 0? [{title : mxResources.get('customLib'), entries : libs}] : []; 
+			ui.showDialog(new MoreShapesDialog(ui, true, ui.sidebar.entries.concat(customLibsEntry)).container, 640, (isLocalStorage) ?
+					((mxClient.IS_IOS) ? 650 : 630) : 650, true, true);
+		}, function(err) 
+		{
+			console.log(err);
+			ui.showDialog(new MoreShapesDialog(ui, true, ui.sidebar.entries).container, 640, (isLocalStorage) ?
+					((mxClient.IS_IOS) ? 650 : 630) : 650, true, true);
+		});
+	}));
+
+    var showEntriesOld =  Sidebar.prototype.showEntries;
+	
+	Sidebar.prototype.showEntries = function(stc, remember, force) 
+	{
+		showEntriesOld.apply(this, arguments);
+		
+		if(stc == null)
+			return;
+		
+		var libIds = stc.split(';');
+		
+		for(var i = 0; i < customLibraries.length; i++) 
+		{
+			lib = customLibraries[i];
+			
+			if(mxUtils.indexOf(libIds, lib.id) != -1) 
+			{
+				ui.remoteInvoke('getFileContent', [lib.downloadUrl], null, mxUtils.bind(lib, function(libContent)
+				{
+					try
+					{
+						ui.loadLibrary(new RemoteLibrary(ui, libContent, this));
+					}
+					catch (e)
+					{
+						//Ignore 
+					}
+				}), function()
+				{
+					//Ignore
+				});
+			}
+			else 
+			{
+				ui.closeLibrary(new RemoteLibrary(ui, '', lib));
+			}
+		};
+	};
+
+    var isEntryVisibleOld = Sidebar.prototype.isEntryVisible;
+
+	Sidebar.prototype.isEntryVisible = function(key) 
+	{
+		var visible = isEntryVisibleOld.apply(this, arguments);
+		var cVisible = false;
+		
+		var customLibSelection = mxSettings.getCustomLibraries();
+		
+		for(var i = 0; i < customLibSelection.length; i++) 
+		{
+			try
+			{
+				var hash = customLibSelection[i];
+				
+				if (hash.charAt(0) == 'R')
+				{
+					if(JSON.parse(decodeURIComponent(hash.substr(1)))[0] == key)
+					{
+						cVisible = true;
+					}	
+				}
+			}
+			catch(e){} //ignore
+		}
+		
+		return visible || cVisible;
+	};
+
 	//=============Embed File with real-time collab support (based on remote invocation)
 	//Until app.min.js is propagated, this code is necessary
 	if (typeof EmbedFile === 'undefined')
diff --git a/src/main/webapp/service-worker.js b/src/main/webapp/service-worker.js
index 8d9aebce..fc4317e9 100644
--- a/src/main/webapp/service-worker.js
+++ b/src/main/webapp/service-worker.js
@@ -6,11 +6,11 @@ if (workbox)
 	workbox.precaching.precacheAndRoute([
   {
     "url": "js/app.min.js",
-    "revision": "afa164e29bb80736c99fd23950f8a47d"
+    "revision": "c041db82ed8abb8847879971aedae3c6"
   },
   {
     "url": "js/extensions.min.js",
-    "revision": "f784fd1367da48ff95ea153bd9c8006b"
+    "revision": "4c100ac03de2866a13012d391896fe8c"
   },
   {
     "url": "js/stencils.min.js",
@@ -102,11 +102,11 @@ if (workbox)
   },
   {
     "url": "plugins/cConf-1-4-8.js",
-    "revision": "4b7c6ea1cd878f501963a86b94d599d5"
+    "revision": "b437d1ab44bbe4999b3396abbd6fb7ab"
   },
   {
     "url": "connect/confluence/connectUtils-1-4-8.js",
-    "revision": "38448282f113992b1f346eb97ccc3542"
+    "revision": "09f7a64cb2e15aa5d10f4ebf8b78fa11"
   },
   {
     "url": "connect/new_common/cac.js",
@@ -126,7 +126,7 @@ if (workbox)
   },
   {
     "url": "connect/confluence/viewer.js",
-    "revision": "c6956490a00676ee14b35d0bd40bc913"
+    "revision": "002ca191edcb0ea140aae6969be98e87"
   },
   {
     "url": "connect/confluence/viewer-1-4-42.html",
diff --git a/src/main/webapp/yarn.lock b/src/main/webapp/yarn.lock
index 6311ec43..d9434bdd 100644
--- a/src/main/webapp/yarn.lock
+++ b/src/main/webapp/yarn.lock
@@ -31,9 +31,9 @@
     defer-to-connect "^1.0.1"
 
 "@types/node@^12.0.12":
-  version "12.12.64"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.64.tgz#e3b336dc4c6ba52c6b59e3bd69a100347c20b1c0"
-  integrity sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA==
+  version "12.19.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.5.tgz#9be3946136e818597c71c62d04240d0602c645d4"
+  integrity sha512-Wgdl27uw/jUYUFyajUGKSjDNGxmJrZi9sjeG6UJImgUtKbJoO9aldx+1XODN1EpNDX9DirvbvHHmTsNlb8GwMA==
 
 "@types/semver@^7.3.1":
   version "7.3.4"
@@ -49,9 +49,9 @@ accepts@~1.3.5:
     negotiator "0.6.2"
 
 ajv@^6.12.2:
-  version "6.12.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
-  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -71,19 +71,19 @@ at-least-node@^1.0.0:
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
 atomically@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.3.2.tgz#721156e5c4f03e768ab54f3e6c9dc550d4690761"
-  integrity sha512-MAiqx5ir1nOoMeG2vLXJnj4oFROJYB1hMqa2aAo6GQVIkPdkIcrq9W9SR0OaRtvEowO7Y2bsXqKFuDMTO4iOAQ==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe"
+  integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==
 
-base64-js@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 boolean@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.1.tgz#35ecf2b4a2ee191b0b44986f14eb5f052a5cbb4f"
-  integrity sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
+  integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -96,12 +96,12 @@ buffer-from@^1.0.0:
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer@^5.1.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
-  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
 
 builder-util-runtime@8.7.2:
   version "8.7.2"
@@ -137,9 +137,9 @@ clone-response@^1.0.2:
     mimic-response "^1.0.0"
 
 commander@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
-  integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
+  integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
 
 compressible@~2.0.16:
   version "2.0.18"
@@ -196,9 +196,9 @@ config-chain@^1.1.11:
     proto-list "~1.2.1"
 
 core-js@^3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
-  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
+  integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==
 
 core-util-is@~1.0.0:
   version "1.0.2"
@@ -269,10 +269,10 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
   integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
-electron-log@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.2.4.tgz#a13e42a9fc42ca2cc7d2603c3746352efa82112e"
-  integrity sha512-CXbDU+Iwi+TjKzugKZmTRIORIPe3uQRqgChUl19fkW/reFUn5WP7dt+cNGT3bkLV8xfPilpkPFv33HgtmLLewQ==
+electron-log@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.3.0.tgz#6e841a5c9af34ed3ca83e5a8a4156fdc39bed464"
+  integrity sha512-iuJjH/ZEJkDyCbuAMvvFxAjCMDLMXIQ5NqvppETGrbtf4b/007r5P36BSvexdy0UzwDNzDtIuEXLR34vRXWZrg==
 
 electron-progressbar@1.2.0:
   version "1.2.0"
@@ -289,7 +289,7 @@ electron-store@^6.0.1:
     conf "^7.1.2"
     type-fest "^0.16.0"
 
-electron-updater@^4.3.4:
+electron-updater@^4.3.5:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.5.tgz#4fb36f593a031c87ea07ee141c9f064d5deffb15"
   integrity sha512-5jjN7ebvfj1cLI0VZMdCnJk6aC4bP+dy7ryBf21vArR0JzpRVk0OZHA2QBD+H5rm6ZSeDYHOY6+8PrMEqJ4wlQ==
@@ -302,10 +302,10 @@ electron-updater@^4.3.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.2"
 
-electron@^10.1.3:
-  version "10.1.3"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.3.tgz#7e276e373bf30078bd4cb1184850a91268dc0e6c"
-  integrity sha512-CR8LrlG47MdAp317SQ3vGYa2o2cIMdMSMPYH46OVitFLk35dwE9fn3VqvhUIXhCHYcNWIAPzMhkVHpkoFdKWuw==
+electron@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.0.1.tgz#e71195ff9abfbcfa0f4bf49ec9064e5e0f3f928c"
+  integrity sha512-UefDvxeyTREL1FpC0BcXwzLjcYiQICFSZONbwarpoqTXQU5rzEguIegHPqg5AqwYH4FVYfEuigj/Vm94rtZOzg==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -472,10 +472,10 @@ http-cache-semantics@^4.0.0:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
@@ -533,11 +533,11 @@ jsonfile@^4.0.0:
     graceful-fs "^4.1.6"
 
 jsonfile@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
-  integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
-    universalify "^1.0.0"
+    universalify "^2.0.0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -907,6 +907,11 @@ universalify@^1.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
   integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 uri-js@^4.2.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"