diff --git a/packages/editor/cypress.config.ts b/packages/editor/cypress.config.ts
index 3a66321e..de410d15 100644
--- a/packages/editor/cypress.config.ts
+++ b/packages/editor/cypress.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
+  projectId: 'it9g7s',
   video: false,
   videoUploadOnPasses: false,
   includeShadowDom: true,
diff --git a/packages/editor/cypress/e2e/playground.cy.js b/packages/editor/cypress/e2e/playground.cy.js
deleted file mode 100644
index d8cd143b..00000000
--- a/packages/editor/cypress/e2e/playground.cy.js
+++ /dev/null
@@ -1,31 +0,0 @@
-context('Playground', () => {
-  it('viewmode page should match its snapshot', () => {
-    [
-      'welcome',
-      'sample1',
-      'sample2',
-      'sample3',
-      'sample4',
-      'sample5',
-      'sample6',
-      'complex',
-      'img-support',
-      'icon-sample',
-    ].forEach((mapId) => {
-      cy.visit(`/viewmode.html?id=${mapId}`);
-      cy.get('#mindmap-comp.ready').should('exist');
-      cy.matchImageSnapshot(`viewmode-${mapId}`);
-    });
-  });
-  it('the playground showcase.html page should match its snapshot', () => {
-    cy.visit('/showcase.html');
-    cy.getIframeBody().find('#mindmap-comp.ready').should('exist');
-    cy.matchImageSnapshot('container');
-  });
-  it('the playground editor.html page should match its snapshot', () => {
-    cy.visit('/editor.html');
-    cy.get('#mindmap-comp.ready').should('exist');
-    // TODO: why is the editor appearing twice in the snapshot?
-    cy.matchImageSnapshot('editor');
-  });
-});
diff --git a/packages/editor/cypress/e2e/relationship.cy.js b/packages/editor/cypress/e2e/relationship.cy.js
index a0deb93c..4f9e4daa 100644
--- a/packages/editor/cypress/e2e/relationship.cy.js
+++ b/packages/editor/cypress/e2e/relationship.cy.js
@@ -5,12 +5,20 @@ context('Relationship Topics', () => {
     cy.get('[test-id="30-11-relationship"]').click({ force: true });
   });
 
-  it('Change shape relationship', () => {
-    cy.get('[test-id="control-56"]').trigger('mousedown', { force: true });
-    cy.get('body').trigger('mousemove', { clientX: 500, clientY: 200 });
-    cy.get('body').trigger('mouseup');
-    cy.matchImageSnapshot('changeShapeRealtionship');
+  it('Add Relationship', () => {
+    cy.contains('Features').click();
+    cy.get(`[aria-label="Add Relationship"]`).click();
+    cy.contains('Try it Now!').click();
+ 
+    cy.get('[test-id="11-15-relationship"]').click({ force: true });
+    cy.matchImageSnapshot('addRelationship');
+  });
 
-    cy.get('[test-id="control-56"]').invoke('attr', 'cy').should('eq', '-131.75');
+  it('Delete Relationship', () => {
+    cy.get('[test-id="11-15-relationship"]').click({ force: true });
+    cy.get('body').type('{backspace}');
+
+    cy.get('[test-id="11-15-relationship"]').should('not.exist');
+    cy.matchImageSnapshot('delete relationship');
   });
 });
diff --git a/packages/editor/cypress/e2e/topicFontChange.cy.js b/packages/editor/cypress/e2e/topicFontChange.cy.js
index 029df1a1..591fc09c 100644
--- a/packages/editor/cypress/e2e/topicFontChange.cy.js
+++ b/packages/editor/cypress/e2e/topicFontChange.cy.js
@@ -14,54 +14,62 @@ context('Edit Topic', () => {
   });
 
   it('Change Font Size', () => {
-    cy.get('#fontSizeTip').click();
-    cy.get('.popover #small').click({ force: true });
 
-    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '8.0625');
+    // Go to the minimal size.
+    cy.get(`[aria-label="Font Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Smaller"]`).click();
+    cy.get(`[aria-label="Smaller"]`).click();
+
+
+    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '8.1');
     cy.matchImageSnapshot('changeFontSizeSmall');
 
-    cy.get('#fontSizeTip').click();
-    cy.get('.popover #normal').click({ force: true });
-
-    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '10.75');
+    cy.get(`[aria-label="Font Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Bigger"]`).click();
+    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '10.8');
     cy.matchImageSnapshot('changeFontSizeNormal');
 
-    cy.get('#fontSizeTip').click();
-    cy.get('.popover #large').click({ force: true });
-
-    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '13.4375');
+    cy.get(`[aria-label="Font Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Bigger"]`).click();
+    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '13.4');
     cy.matchImageSnapshot('changeFontSizeLarge');
 
-    cy.get('#fontSizeTip').click();
-    cy.get('.popover #huge').click({ force: true });
+    cy.get(`[aria-label="Font Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Bigger"]`).click();
 
-    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '20.15625');
+    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '20.2');
     cy.matchImageSnapshot('changeFontSizeHuge');
+
+    // Can not scale it more.
+    cy.get(`[aria-label="Bigger"]`).click();
+    cy.get('[test-id=1] > text').invoke('attr', 'font-size').should('eq', '20.2');
+    cy.matchImageSnapshot('changeFontSizeHuge');
+
   });
 
-  it('Change Font type', () => {
-    cy.get('#fontFamilyTip').click();
-    cy.get('[model="Times"]').click({ force: true });
+  // it('Change Font To Italic', () => {
+  //   cy.get(`[aria-label="Font Style"]`).trigger('mouseover');
+  //   cy.contains(`[data-test-id="FormactItalicIcon"]`).click();
 
-    cy.get('[test-id=1] > text').invoke('attr', 'font-family').should('eq', 'Times');
+  //   cy.get('[test-id=1] > text').invoke('attr', 'font-family').should('eq', 'Times');
+  //   cy.matchImageSnapshot('changeFontType');
+  // });
 
-    cy.matchImageSnapshot('changeFontType');
-  });
+  // it('Change Font Italic', () => {
+  //   cy.get(`[aria-label="Font Style"]`).trigger('mouseover');
+  //   cy.contains('[data-testid="FormatItalicIcon"]').click();
 
-  it('Change Font Italic', () => {
-    cy.get('#fontItalicTip').click();
+  //   cy.get('[test-id=1] > text').invoke('attr', 'font-style').should('eq', 'italic');
 
-    cy.get('[test-id=1] > text').invoke('attr', 'font-style').should('eq', 'italic');
+  //   cy.matchImageSnapshot('changeFontItalic');
+  // });
 
-    cy.matchImageSnapshot('changeFontItalic');
-  });
+  // it('Change Font color', () => {
+  //   cy.get('#fontColorTip').click();
+  //   cy.get('[title="RGB (153, 0, 255)"]').click({ force: true });
 
-  it('Change Font color', () => {
-    cy.get('#fontColorTip').click();
-    cy.get('[title="RGB (153, 0, 255)"]').click({ force: true });
+  //   cy.get('[test-id=1] > text').invoke('attr', 'fill').should('eq', 'rgb(153, 0, 255)');
 
-    cy.get('[test-id=1] > text').invoke('attr', 'fill').should('eq', 'rgb(153, 0, 255)');
-
-    cy.matchImageSnapshot('changeFontColor');
-  });
+  //   cy.matchImageSnapshot('changeFontColor');
+  // });
 });
diff --git a/packages/editor/cypress/e2e/topicManager.cy.js b/packages/editor/cypress/e2e/topicManager.cy.js
index d45e974c..15562a63 100644
--- a/packages/editor/cypress/e2e/topicManager.cy.js
+++ b/packages/editor/cypress/e2e/topicManager.cy.js
@@ -33,13 +33,19 @@ context('Node manager', () => {
   });
 
   it('undo changes', () => {
-    cy.get('#undoEditionTip').click();
+    cy.get('[data-testid="UndoOutlinedIcon"]').click();
 
     cy.get('[test-id=36] > text > tspan').should('exist');
 
     cy.matchImageSnapshot('undoChange');
   });
 
+  it('redo changes', () => {
+    cy.get('[data-testid="RedoOutlinedIcon"]').click();
+    cy.get('[test-id=36] > text > tspan').should('exist');
+    cy.matchImageSnapshot('redoChange');
+  });
+
   it('Save changes', () => {
     cy.contains('Mind Mapping rocks!!').click();
     cy.get('body').type('{ctrl}s');
diff --git a/packages/editor/cypress/e2e/topicShape.cy.js b/packages/editor/cypress/e2e/topicShape.cy.js
index 618e22c2..53ab2712 100644
--- a/packages/editor/cypress/e2e/topicShape.cy.js
+++ b/packages/editor/cypress/e2e/topicShape.cy.js
@@ -6,39 +6,42 @@ context('Change Topic shape', () => {
   });
 
   it('change to square shape', () => {
-    cy.get('#topicShapeTip').click();
-    cy.get('#rectagle').click({ force: true });
+    cy.get(`[aria-label="Topic Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Rectangle shape"]`).click();
 
-    cy.get('[test-id=11] > rect').eq(1).invoke('attr', 'rx').should('eq', '0');
+    cy.get('[test-id=11] > rect').eq(1).invoke('attr', 'rx').should('eq', '0.0');
 
     cy.matchImageSnapshot('changeToSquareShape');
   });
 
-  it('change to rounded rectagle', () => {
-    cy.get('#topicShapeTip').click();
-    // TODO: The parameter {force: true} was placed because it does not detect that the element is visible
-    cy.get('#rounded_rectagle').click({ force: true });
+  it('change to rounded rectangle', () => {
+    cy.contains('Mind Mapping').click();
 
-    cy.get('[test-id=11] > rect').eq(1).invoke('attr', 'rx').should('eq', '4.05');
+    cy.get(`[aria-label="Topic Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Rounded shape"]`).click();
 
-    cy.matchImageSnapshot('changeToRoundedRectagle');
+    cy.get('[test-id=6] > rect').eq(1).invoke('attr', 'rx').should('eq', '4.2');
+
+    cy.matchImageSnapshot('changeToRoundedRectangle');
   });
 
   it('change to line', () => {
-    cy.get('#topicShapeTip').click();
-    // TODO: The parameter {force: true} was placed because it does not detect that the element is visible
-    cy.get('#line').click({ force: true });
+    cy.contains('Try it Now!').click();
+    
+    cy.get(`[aria-label="Topic Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Line shape"]`).click();
 
     cy.matchImageSnapshot('changeToLine');
   });
 
-  it('change to elipse shape', () => {
-    cy.get('#topicShapeTip').click();
-    // TODO: The parameter {force: true} was placed because it does not detect that the element is visible
-    cy.get('#elipse').click({ force: true });
+  it('change to ellipse shape', () => {
+    cy.contains('Productivity').click();
 
-    cy.get('[test-id=11] > rect').eq(1).invoke('attr', 'rx').should('eq', '12.15');
+    cy.get(`[aria-label="Topic Style"]`).trigger('mouseover');
+    cy.get(`[aria-label="Ellipse shape"]`).click();
 
-    cy.matchImageSnapshot('changeToElipseShape');
+    cy.get('[test-id=2] > rect').eq(1).invoke('attr', 'rx').should('eq', '12.6');
+
+    cy.matchImageSnapshot('changeToEllipseShape');
   });
 });
diff --git a/packages/editor/cypress/snapshots/playground.test.js/container.snap.png b/packages/editor/cypress/snapshots/playground.test.js/container.snap.png
deleted file mode 100644
index 9f1ebc4d..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/container.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/editor.snap.png b/packages/editor/cypress/snapshots/playground.test.js/editor.snap.png
deleted file mode 100644
index b0b65038..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/editor.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-complex.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-complex.snap.png
deleted file mode 100644
index 849393df..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-complex.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-icon-sample.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-icon-sample.snap.png
deleted file mode 100644
index c5812db7..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-icon-sample.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-img-support.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-img-support.snap.png
deleted file mode 100644
index 77de8b0f..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-img-support.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample1.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample1.snap.png
deleted file mode 100644
index 8069012d..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample1.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample2.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample2.snap.png
deleted file mode 100644
index cca81e14..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample2.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample3.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample3.snap.png
deleted file mode 100644
index 9e39d25e..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample3.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample4.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample4.snap.png
deleted file mode 100644
index 5b18b272..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample4.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample5.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample5.snap.png
deleted file mode 100644
index f0fb0bb0..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample5.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample6.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample6.snap.png
deleted file mode 100644
index 2ba68358..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-sample6.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/playground.test.js/viewmode-welcome.snap.png b/packages/editor/cypress/snapshots/playground.test.js/viewmode-welcome.snap.png
deleted file mode 100644
index 6350ebae..00000000
Binary files a/packages/editor/cypress/snapshots/playground.test.js/viewmode-welcome.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/relationship.cy.js/addRelationship.snap.png b/packages/editor/cypress/snapshots/relationship.cy.js/addRelationship.snap.png
new file mode 100644
index 00000000..232d3d50
Binary files /dev/null and b/packages/editor/cypress/snapshots/relationship.cy.js/addRelationship.snap.png differ
diff --git a/packages/editor/cypress/snapshots/relationship.cy.js/changeShapeRealtionship.snap.png b/packages/editor/cypress/snapshots/relationship.cy.js/changeShapeRealtionship.snap.png
deleted file mode 100644
index fc59571f..00000000
Binary files a/packages/editor/cypress/snapshots/relationship.cy.js/changeShapeRealtionship.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/relationship.cy.js/delete relationship.snap.png b/packages/editor/cypress/snapshots/relationship.cy.js/delete relationship.snap.png
new file mode 100644
index 00000000..b96386fa
Binary files /dev/null and b/packages/editor/cypress/snapshots/relationship.cy.js/delete relationship.snap.png differ
diff --git a/packages/editor/cypress/snapshots/relationship.test.js/changeShapeRealtionship.snap.png b/packages/editor/cypress/snapshots/relationship.test.js/changeShapeRealtionship.snap.png
deleted file mode 100644
index e8f04dcb..00000000
Binary files a/packages/editor/cypress/snapshots/relationship.test.js/changeShapeRealtionship.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeHuge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeHuge.snap.png
new file mode 100644
index 00000000..05b3ab0c
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeHuge.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeLarge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeLarge.snap.png
new file mode 100644
index 00000000..e0ac7cd7
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeLarge.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeNormal.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeNormal.snap.png
new file mode 100644
index 00000000..0291dd98
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeNormal.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeSmall.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeSmall.snap.png
new file mode 100644
index 00000000..7e286516
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeFontSizeSmall.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeMainTopicText.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeMainTopicText.snap.png
index 61cf736c..d773673f 100644
Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeMainTopicText.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.js/changeMainTopicText.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontColor.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontColor.snap.png
deleted file mode 100644
index bd46a0c7..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontColor.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontItalic.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontItalic.snap.png
deleted file mode 100644
index 61878965..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontItalic.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeHuge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeHuge.snap.png
deleted file mode 100644
index b3f20e57..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeHuge.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeLarge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeLarge.snap.png
deleted file mode 100644
index 6093c856..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeLarge.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeNormal.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeNormal.snap.png
deleted file mode 100644
index 5d2c1ab1..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeNormal.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeSmall.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeSmall.snap.png
deleted file mode 100644
index 19454e12..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontSizeSmall.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontType.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontType.snap.png
deleted file mode 100644
index b3f20e57..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeFontType.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeMainTopicText.snap.png b/packages/editor/cypress/snapshots/topicFontChange.test.js/changeMainTopicText.snap.png
deleted file mode 100644
index ecf6ee6c..00000000
Binary files a/packages/editor/cypress/snapshots/topicFontChange.test.js/changeMainTopicText.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.js/addChildNodeSortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.js/addChildNodeSortcut.snap.png
index a2c6d5a1..499f94d3 100644
Binary files a/packages/editor/cypress/snapshots/topicManager.cy.js/addChildNodeSortcut.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.js/addChildNodeSortcut.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.js/deleteTopicShortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.js/deleteTopicShortcut.snap.png
index 8128316b..c5cb0c6d 100644
Binary files a/packages/editor/cypress/snapshots/topicManager.cy.js/deleteTopicShortcut.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.js/deleteTopicShortcut.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.js/editor-shortcut-edit.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.js/editor-shortcut-edit.snap.png
index aa6bfe26..6083385c 100644
Binary files a/packages/editor/cypress/snapshots/topicManager.cy.js/editor-shortcut-edit.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.js/editor-shortcut-edit.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.js/redoChange.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.js/redoChange.snap.png
new file mode 100644
index 00000000..c95f5dfc
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicManager.cy.js/redoChange.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.js/saveChagesShortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.js/saveChagesShortcut.snap.png
index 1a6a580e..6ae45ad8 100644
Binary files a/packages/editor/cypress/snapshots/topicManager.cy.js/saveChagesShortcut.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.js/saveChagesShortcut.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.cy.js/undoChange.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.js/undoChange.snap.png
new file mode 100644
index 00000000..e62f98bb
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicManager.cy.js/undoChange.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicManager.test.js/addChildNodeSortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.test.js/addChildNodeSortcut.snap.png
deleted file mode 100644
index 34e379d5..00000000
Binary files a/packages/editor/cypress/snapshots/topicManager.test.js/addChildNodeSortcut.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicManager.test.js/deleteTopicShortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.test.js/deleteTopicShortcut.snap.png
deleted file mode 100644
index 63798511..00000000
Binary files a/packages/editor/cypress/snapshots/topicManager.test.js/deleteTopicShortcut.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicManager.test.js/editor-shortcut-edit.snap.png b/packages/editor/cypress/snapshots/topicManager.test.js/editor-shortcut-edit.snap.png
deleted file mode 100644
index b8161ccb..00000000
Binary files a/packages/editor/cypress/snapshots/topicManager.test.js/editor-shortcut-edit.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicManager.test.js/saveChagesShortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.test.js/saveChagesShortcut.snap.png
deleted file mode 100644
index d6f29c5a..00000000
Binary files a/packages/editor/cypress/snapshots/topicManager.test.js/saveChagesShortcut.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicManager.test.js/undoChange.snap.png b/packages/editor/cypress/snapshots/topicManager.test.js/undoChange.snap.png
deleted file mode 100644
index c86635dd..00000000
Binary files a/packages/editor/cypress/snapshots/topicManager.test.js/undoChange.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.cy.js/moveDefaultPosition.snap.png b/packages/editor/cypress/snapshots/topicPosition.cy.js/moveDefaultPosition.snap.png
index 791da0f3..2a04948b 100644
Binary files a/packages/editor/cypress/snapshots/topicPosition.cy.js/moveDefaultPosition.snap.png and b/packages/editor/cypress/snapshots/topicPosition.cy.js/moveDefaultPosition.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.cy.js/movedownNode.snap.png b/packages/editor/cypress/snapshots/topicPosition.cy.js/movedownNode.snap.png
index 51ccc6b8..0dd72540 100644
Binary files a/packages/editor/cypress/snapshots/topicPosition.cy.js/movedownNode.snap.png and b/packages/editor/cypress/snapshots/topicPosition.cy.js/movedownNode.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.cy.js/moveleftNode.snap.png b/packages/editor/cypress/snapshots/topicPosition.cy.js/moveleftNode.snap.png
index e681d175..611420d7 100644
Binary files a/packages/editor/cypress/snapshots/topicPosition.cy.js/moveleftNode.snap.png and b/packages/editor/cypress/snapshots/topicPosition.cy.js/moveleftNode.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.cy.js/moveupNode.snap.png b/packages/editor/cypress/snapshots/topicPosition.cy.js/moveupNode.snap.png
index 08bf5507..4a930dfe 100644
Binary files a/packages/editor/cypress/snapshots/topicPosition.cy.js/moveupNode.snap.png and b/packages/editor/cypress/snapshots/topicPosition.cy.js/moveupNode.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.test.js/moveDefaultPosition.snap.png b/packages/editor/cypress/snapshots/topicPosition.test.js/moveDefaultPosition.snap.png
deleted file mode 100644
index 82c0b061..00000000
Binary files a/packages/editor/cypress/snapshots/topicPosition.test.js/moveDefaultPosition.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.test.js/movedownNode.snap.png b/packages/editor/cypress/snapshots/topicPosition.test.js/movedownNode.snap.png
deleted file mode 100644
index cc4dd671..00000000
Binary files a/packages/editor/cypress/snapshots/topicPosition.test.js/movedownNode.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.test.js/moveleftNode.snap.png b/packages/editor/cypress/snapshots/topicPosition.test.js/moveleftNode.snap.png
deleted file mode 100644
index a4cde1a1..00000000
Binary files a/packages/editor/cypress/snapshots/topicPosition.test.js/moveleftNode.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicPosition.test.js/moveupNode.snap.png b/packages/editor/cypress/snapshots/topicPosition.test.js/moveupNode.snap.png
deleted file mode 100644
index 1054b7f8..00000000
Binary files a/packages/editor/cypress/snapshots/topicPosition.test.js/moveupNode.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicShape.cy.js/changeToEllipseShape.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToEllipseShape.snap.png
new file mode 100644
index 00000000..d08c891d
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToEllipseShape.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicShape.cy.js/changeToLine.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToLine.snap.png
new file mode 100644
index 00000000..800551e2
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToLine.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicShape.cy.js/changeToRoundedRectangle.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToRoundedRectangle.snap.png
new file mode 100644
index 00000000..5940d893
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToRoundedRectangle.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicShape.cy.js/changeToSquareShape.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToSquareShape.snap.png
new file mode 100644
index 00000000..a5fb7c52
Binary files /dev/null and b/packages/editor/cypress/snapshots/topicShape.cy.js/changeToSquareShape.snap.png differ
diff --git a/packages/editor/cypress/snapshots/topicShape.test.js/changeToElipseShape.snap.png b/packages/editor/cypress/snapshots/topicShape.test.js/changeToElipseShape.snap.png
deleted file mode 100644
index 39cc85a3..00000000
Binary files a/packages/editor/cypress/snapshots/topicShape.test.js/changeToElipseShape.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicShape.test.js/changeToLine.snap.png b/packages/editor/cypress/snapshots/topicShape.test.js/changeToLine.snap.png
deleted file mode 100644
index 15ca03a8..00000000
Binary files a/packages/editor/cypress/snapshots/topicShape.test.js/changeToLine.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicShape.test.js/changeToRoundedRectagle.snap.png b/packages/editor/cypress/snapshots/topicShape.test.js/changeToRoundedRectagle.snap.png
deleted file mode 100644
index 114beb30..00000000
Binary files a/packages/editor/cypress/snapshots/topicShape.test.js/changeToRoundedRectagle.snap.png and /dev/null differ
diff --git a/packages/editor/cypress/snapshots/topicShape.test.js/changeToSquareShape.snap.png b/packages/editor/cypress/snapshots/topicShape.test.js/changeToSquareShape.snap.png
deleted file mode 100644
index a6617bae..00000000
Binary files a/packages/editor/cypress/snapshots/topicShape.test.js/changeToSquareShape.snap.png and /dev/null differ
diff --git a/packages/editor/lang/de.json b/packages/editor/lang/de.json
index c2826adc..be9abfc5 100644
--- a/packages/editor/lang/de.json
+++ b/packages/editor/lang/de.json
@@ -140,7 +140,7 @@
     "editor-panel.tooltip-topic-share-line": {
         "defaultMessage": "Linienform"
     },
-    "editor-panel.tooltip-topic-share-rectagle": {
+    "editor-panel.tooltip-topic-share-rectangle": {
         "defaultMessage": "Rechteckform"
     },
     "editor-panel.tooltip-topic-share-rounded": {
diff --git a/packages/editor/lang/en.json b/packages/editor/lang/en.json
index 72d1569d..bae131e0 100644
--- a/packages/editor/lang/en.json
+++ b/packages/editor/lang/en.json
@@ -95,8 +95,8 @@
   "editor-panel.tooltip-topic-share-line": {
     "defaultMessage": "Line shape"
   },
-  "editor-panel.tooltip-topic-share-rectagle": {
-    "defaultMessage": "Rectagle shape"
+  "editor-panel.tooltip-topic-share-rectangle": {
+    "defaultMessage": "Rectangle shape"
   },
   "editor-panel.tooltip-topic-share-rounded": {
     "defaultMessage": "Rounded shape"
diff --git a/packages/editor/lang/es.json b/packages/editor/lang/es.json
index 8ffe8c7c..862abed1 100644
--- a/packages/editor/lang/es.json
+++ b/packages/editor/lang/es.json
@@ -122,7 +122,7 @@
     "editor-panel.tooltip-topic-share-line": {
         "defaultMessage": "Forma de linea"
     },
-    "editor-panel.tooltip-topic-share-rectagle": {
+    "editor-panel.tooltip-topic-share-rectangle": {
         "defaultMessage": "Forma rectagular"
     },
     "editor-panel.tooltip-topic-share-rounded": {
diff --git a/packages/editor/lang/fr.json b/packages/editor/lang/fr.json
index 240275fa..e152efe2 100644
--- a/packages/editor/lang/fr.json
+++ b/packages/editor/lang/fr.json
@@ -122,7 +122,7 @@
     "editor-panel.tooltip-topic-share-line": {
         "defaultMessage": "Figura linea"
     },
-    "editor-panel.tooltip-topic-share-rectagle": {
+    "editor-panel.tooltip-topic-share-rectangle": {
         "defaultMessage": "Figura rectangulo"
     },
     "editor-panel.tooltip-topic-share-rounded": {
diff --git a/packages/editor/src/compiled-lang/de.json b/packages/editor/src/compiled-lang/de.json
index cd25a8e3..e1fc7c6c 100644
--- a/packages/editor/src/compiled-lang/de.json
+++ b/packages/editor/src/compiled-lang/de.json
@@ -197,7 +197,7 @@
       "value": "Linienform"
     }
   ],
-  "editor-panel.tooltip-topic-share-rectagle": [
+  "editor-panel.tooltip-topic-share-rectangle": [
     {
       "type": 0,
       "value": "Rechteckform"
diff --git a/packages/editor/src/compiled-lang/en.json b/packages/editor/src/compiled-lang/en.json
index 662633d8..f2961de0 100644
--- a/packages/editor/src/compiled-lang/en.json
+++ b/packages/editor/src/compiled-lang/en.json
@@ -191,10 +191,10 @@
       "value": "Line shape"
     }
   ],
-  "editor-panel.tooltip-topic-share-rectagle": [
+  "editor-panel.tooltip-topic-share-rectangle": [
     {
       "type": 0,
-      "value": "Rectagle shape"
+      "value": "Rectangle shape"
     }
   ],
   "editor-panel.tooltip-topic-share-rounded": [
diff --git a/packages/editor/src/compiled-lang/es.json b/packages/editor/src/compiled-lang/es.json
index 47253154..54a2365b 100644
--- a/packages/editor/src/compiled-lang/es.json
+++ b/packages/editor/src/compiled-lang/es.json
@@ -191,7 +191,7 @@
       "value": "Forma de linea"
     }
   ],
-  "editor-panel.tooltip-topic-share-rectagle": [
+  "editor-panel.tooltip-topic-share-rectangle": [
     {
       "type": 0,
       "value": "Forma rectagular"
diff --git a/packages/editor/src/compiled-lang/fr.json b/packages/editor/src/compiled-lang/fr.json
index f16eef75..b63193cc 100644
--- a/packages/editor/src/compiled-lang/fr.json
+++ b/packages/editor/src/compiled-lang/fr.json
@@ -191,7 +191,7 @@
       "value": "Figura linea"
     }
   ],
-  "editor-panel.tooltip-topic-share-rectagle": [
+  "editor-panel.tooltip-topic-share-rectangle": [
     {
       "type": 0,
       "value": "Figura rectangulo"
diff --git a/packages/editor/src/components/editor-toolbar/configBuilder.tsx b/packages/editor/src/components/editor-toolbar/configBuilder.tsx
index ed1ad2d0..e95b5a03 100644
--- a/packages/editor/src/components/editor-toolbar/configBuilder.tsx
+++ b/packages/editor/src/components/editor-toolbar/configBuilder.tsx
@@ -64,11 +64,11 @@ export function buildEditorPanelConfig(model: Editor): ActionConfig[] {
       {
         icon: <SquareOutlinedIcon />,
         tooltip: intl.formatMessage({
-          id: 'editor-panel.tooltip-topic-share-rectagle',
-          defaultMessage: 'Rectagle shape',
+          id: 'editor-panel.tooltip-topic-share-rectangle',
+          defaultMessage: 'Rectangle shape',
         }),
-        onClick: () => toolbarValueModelBuilder.getTopicShapeModel().setValue('rectagle'),
-        selected: () => toolbarValueModelBuilder.getTopicShapeModel().getValue() === 'rectagle',
+        onClick: () => toolbarValueModelBuilder.getTopicShapeModel().setValue('rectangle'),
+        selected: () => toolbarValueModelBuilder.getTopicShapeModel().getValue() === 'rectangle',
       },
       {
         icon: <CheckBoxOutlineBlankOutlinedIcon />,
@@ -76,9 +76,9 @@ export function buildEditorPanelConfig(model: Editor): ActionConfig[] {
           id: 'editor-panel.tooltip-topic-share-rounded',
           defaultMessage: 'Rounded shape',
         }),
-        onClick: () => toolbarValueModelBuilder.getTopicShapeModel().setValue('rounded rectagle'),
+        onClick: () => toolbarValueModelBuilder.getTopicShapeModel().setValue('rounded rectangle'),
         selected: () =>
-          toolbarValueModelBuilder.getTopicShapeModel().getValue() === 'rounded rectagle',
+          toolbarValueModelBuilder.getTopicShapeModel().getValue() === 'rounded rectangle',
       },
       {
         icon: <HorizontalRuleOutlinedIcon />,
diff --git a/packages/editor/src/components/toolbar/index.tsx b/packages/editor/src/components/toolbar/index.tsx
index 8d39f385..b96203f9 100644
--- a/packages/editor/src/components/toolbar/index.tsx
+++ b/packages/editor/src/components/toolbar/index.tsx
@@ -40,7 +40,7 @@ export const ToolbarButtonOption = (props: { configuration: ActionConfig }) => {
       arrow={true}
       enterDelay={700}
     >
-      <Box component="span" my="auto">
+      <Box component="span" my="auto" aria-label={props.configuration.tooltip || ''}>
         <IconButton
           onClick={props.configuration.onClick}
           disabled={props.configuration.disabled && props.configuration.disabled()}
diff --git a/packages/editor/test/playground/map-render/samples/complex.wxml b/packages/editor/test/playground/map-render/samples/complex.wxml
index c9e716e6..064e9cc2 100644
--- a/packages/editor/test/playground/map-render/samples/complex.wxml
+++ b/packages/editor/test/playground/map-render/samples/complex.wxml
@@ -92,7 +92,7 @@
             <note text="Assess%20and%20address%20reasons%20why%20talented%20people%20leave%20Freeform"/>
         </topic>
     </topic>
-    <topic position="726,413" text="Business Development Plan" shape="rounded rectagle" id="156"
+    <topic position="726,413" text="Business Development Plan" shape="rounded rectangle" id="156"
            fontStyle=";;#0d0826;;;" bgColor="#32e36a">
         <topic position="894,401" order="0" text="Goals" id="164">
             <topic position="975,422" order="0" text="Increase new clients" id="168">
@@ -113,26 +113,26 @@
             </topic>
         </topic>
     </topic>
-    <topic position="-621,395" text="Hosting NG Plan" shape="rounded rectagle" id="162" fontStyle=";;#0d0826;;;"
+    <topic position="-621,395" text="Hosting NG Plan" shape="rounded rectangle" id="162" fontStyle=";;#0d0826;;;"
            bgColor="#32e36a"/>
-    <topic position="-613,99" text="Freeform IT Plan" shape="rounded rectagle" id="163" bgColor="#52e380">
+    <topic position="-613,99" text="Freeform IT Plan" shape="rounded rectangle" id="163" bgColor="#52e380">
         <topic position="-753,68" order="0" text="Fragile" id="17" fontStyle=";;;bold;;"/>
         <topic position="-749,92" order="1" text="Tools" id="259"/>
         <topic position="-760,116" order="2" id="260"/>
     </topic>
-    <topic position="-548,-87" text="Project Teams" shape="rounded rectagle" shrink="true" id="9" bgColor="#52e380">
+    <topic position="-548,-87" text="Project Teams" shape="rounded rectangle" shrink="true" id="9" bgColor="#52e380">
         <topic position="-668,-142" order="0" text="Projects 1-3" id="13"/>
         <topic position="-668,-118" order="1" text="Projects 4-6" id="14"/>
         <topic position="-672,-94" order="2" text="Projects 7 &amp; 8" id="15"/>
         <topic position="-696,-70" order="3" text="General Work" id="12"/>
         <topic position="-686,-46" order="4" text="Learning Needs Plan" id="11"/>
     </topic>
-    <topic position="-532,-250" text="Restructure" shape="rounded rectagle" shrink="true" id="33" bgColor="#52e380">
+    <topic position="-532,-250" text="Restructure" shape="rounded rectangle" shrink="true" id="33" bgColor="#52e380">
         <topic position="-685,-282" order="0" text="Client Centric Process" id="216"/>
         <topic position="-692,-258" order="1" text="Freeform Project Process" id="217"/>
         <topic position="-693,-234" order="2" text="Supportive Systems Plan" id="218"/>
     </topic>
-    <topic position="-427,-329" text="Board and C Planning" shape="rounded rectagle" shrink="true" id="208"
+    <topic position="-427,-329" text="Board and C Planning" shape="rounded rectangle" shrink="true" id="208"
            bgColor="#52e380">
         <topic position="-614,-384" order="0" text="Mission Statements" id="23">
             <note text="In%20the%20absence%20of%20one%20clearly%20defined%20mission%20statement%2C%20we%20have%20reviewed%20various%20expressed%20mission%20statement%20as%20following%0A%0A%20%20%20%20Objects%20of%20Incorporation%20in%20Letters%20Patent%0A%20%20%20%20%20%20%20%20The%20objects%20of%20the%20Corporation%20are%3ATo%20provide%20solutions%20that%20facilitate%20the%20effective%20use%20of%20information%20technology%20in%20not-for-profit%2C%20non-governmental%2C%20and%20charitable%20organizations%20throughout%20Canada%2C%20to%20support%20and%20improve%20their%20mission%20delivery.%0A%20%20%20%202006%20Strategic%20Business%20Plan%20-%20Brand%20Positioning%0A%20%20%20%20%20%20%20%20We%20are%20a%20nonprofit%20dedicated%20to%20helping%20other%20nonprofits%20understand%20and%20employ%20technology%20appropriately%20and%20effectively%20to%20support%20their%20mission.%20Our%20mission%20is%20to%20provide%20flexible%20consulting%2C%20website%20development%2C%20and%20Internet%20hosting%20solutions%20that%20give%20you%20peace%20of%20mind%20and%20help%20you%20stay%20focused%20on%20your%20mission.%0A%20%20%20%20Freeform%20One%20Page%20%28Freeform%20Wiki%29%0A%20%20%20%20%20%20%20%20About%20Freeform%20Solutions%3A%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization.%20Our%20mission%20is%20help%20%28sic%29%20other%20not-for-profits%20organizations%20to%20build%20their%20capacity%20and%20increase%20their%20effectiveness.%0A%20%20%20%20Result%20of%20Google%20search%20for%20%u201CFreeform%20Solutions%20mission%u201D%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization.%20Our%20mission%20is%20to%20help%20other%20not-for-profits%20use%20technology%20to%20build%20their%20capacity%20and%20increase%20their%20effectiveness.%20%28www.freeformsolutions.ca/en/files/AboutFreeformSolutions.pdf%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20%28www.freeformsolutions.ca%29%20is%20a%20non%20profit%20organization.%20Our%20mission%20is%20to%20help%20other%20non-profit%20organizations%20to%20realize%20their%20missions%20through%20the%20appropriate%20deployment%20of%20information%20and%20knowledge%20management%20systems.www.freeformsolutions.ca/en/sites/default/.../virtual.volunteering.pdf%0A%20%20%20%20%20%20%20%20We%20are%20a%20not-for-profit%20organization%20%28NFP%29%20that%20helps%20other%20NFPs%20use%20IT%20to%20achieve%20their%20organizational%20goals%20and%20better%20serve%20their%20communities.%20Freeform%20Solutions%20is%20a%20nonprofit%20organization%20dedicated%20to%20helping%20other%20nonprofit%20organizations%20understand%20and%20employ%20technology%20appropriately%20and%20effectively%20to%20support%20their%20missions.%20Our%20mission%20is%20to%20provide%20flexible%20consulting%2C%20website%20development%2C%20and%20hosting%20solutions%20%20http%3A//socialinnovation.ca/community/organizations/freeform-solutions%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization%2C%20with%20a%20mission%20to%20help%20other%20not-for-profits%20use%20technology%20more%20effectively%20to%20meet%20their%20own%20missions.%20http%3A//timreview.ca/article/387%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20%u2013%20their%20mission%3A%20%u201Cwe%20help%20not-for-profit%20organisations%20use%20technology%20to%20build%20their%20capacity%20and%20increase%20their%20effectiveness.%20http%3A//www.warnerlaw.ca/links/community-organisations-and-local-businesses/%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization%20with%20a%20mission%20to%20help%20other%20not-for-profits%20use%20technology%20to%20meet%20their%20goals.%20http%3A//xoops.org/modules/news/article.php%3Fstoryid%3D3860%0A%20%20%20%20%20%20%20%20At%20Freeform%20Solutions%2C%20we%20have%20a%20mission%20to%20help%20not-for-profit%20and%20public%20sector%20organizations%20use%20technology%20more%20effectively.%20http%3A//osbrca.blogspot.ca/2010/07/development-commons-approach.html%0A%20%20%20%20Freeform%20Solutions%20Facebook%20Page%0A%20%20%20%20%20%20%20%20Mission%3A%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization%20%28NFP%29%20that%20helps%20other%20NFPs%20use%20IT%20to%20achieve%20their%20organizational%20goals%20and%20better%20serve%20their%20communities.%0A%20%20%20%20The%20current%20Freeform%20Solutions%20website%0A%20%20%20%20%20%20%20%20We%20started%20Freeform%20to%20help%20NFPs%20use%20IT%20to%20achieve%20their%20organizational%20goals%20and%20better%20serve%20their%20communities%20-%20to%20support%20and%20improve%20their%20mission%20delivery.%20Our%20mission%20is%20to%20strengthen%20the%20capacity%20of%20NFPs%20and%20the%20voluntary%20sector%2C%20and%20to%20help%20build%20a%20civil%20society."/>
@@ -173,7 +173,7 @@
             <icon id="time_calendar"/>
         </topic>
         <topic position="2514,-503" order="3" text="Have Heather create list benefits against Best Practice &amp; cost"
-               shape="rounded rectagle" id="132">
+               shape="rounded rectangle" id="132">
             <icon id="tick_tick"/>
         </topic>
         <topic position="2430,-479" order="4" text="Have Jason  review list" id="133">
@@ -190,7 +190,7 @@
             <note text="%20so%20that%20our%20efforts%20to%20excel%20are%20rewarded."/>
         </topic>
     </topic>
-    <topic position="607,-489" text="Community Outreach Plan" shape="rounded rectagle" id="248" fontStyle=";8;;bold;;"
+    <topic position="607,-489" text="Community Outreach Plan" shape="rounded rectangle" id="248" fontStyle=";8;;bold;;"
            bgColor="#51e898">
         <topic position="775,-545" order="0" text="Goals" id="285"/>
         <topic position="770,-521" order="1" text="CSI" id="249"/>
@@ -198,10 +198,10 @@
         <topic position="780,-473" order="3" text="CiviCRM" id="251"/>
         <topic position="774,-449" order="4" text="Other" id="252"/>
     </topic>
-    <topic position="469,-596" text="Backlog Plan" shape="rounded rectagle" id="215" fontStyle=";;;bold;;"
+    <topic position="469,-596" text="Backlog Plan" shape="rounded rectangle" id="215" fontStyle=";;;bold;;"
            bgColor="#2ee668">
         <link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit"/>
-        <topic position="645,-605" order="0" text="Go To Backlog Plan " shape="rectagle" id="286" bgColor="#e8da6d">
+        <topic position="645,-605" order="0" text="Go To Backlog Plan " shape="rectangle" id="286" bgColor="#e8da6d">
             <icon id="funy_glasses"/>
             <link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit"/>
         </topic>
@@ -233,7 +233,7 @@
         </topic>
     </topic>
     <topic position="2250,-634" text="3 Month Onboarding Process" shape="elipse" id="298" bgColor="#adddf0"/>
-    <topic position="558,-26" text="Human Resources Plan" shape="rounded rectagle" id="6" fontStyle=";;#0d0826;bold;;"
+    <topic position="558,-26" text="Human Resources Plan" shape="rounded rectangle" id="6" fontStyle=";;#0d0826;bold;;"
            bgColor="#32e36a">
         <topic position="694,-284" order="0" text="Related Org Objectives" id="287" fontStyle=";;;bold;;">
             <topic position="772,-321" order="0" text="1" id="288">
diff --git a/packages/editor/test/playground/map-render/samples/emptyNodes.wxml b/packages/editor/test/playground/map-render/samples/emptyNodes.wxml
index 9c08eb07..f428adfb 100644
--- a/packages/editor/test/playground/map-render/samples/emptyNodes.wxml
+++ b/packages/editor/test/playground/map-render/samples/emptyNodes.wxml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="tango" name="120724   ATG Business plan">
     <topic id="0" central="true" position="0,0" brColor="#808080"
-           bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectagle">
+           bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectangle">
         <text><![CDATA[]]></text>
         <note>
             <text><![CDATA[]]></text>
         </note>
         <topic id="1" position="200,0" order="0" brColor="#808080"
-               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectagle">
+               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectangle">
             <text><![CDATA[objectifs journée]]></text>
             <topic id="2" position="290,-50" order="0" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA["business plan" associatif ?]]></text>
             </topic>
             <topic id="3" position="290,-25" order="1" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[modèle / activités responsabilités]]></text>
             </topic>
             <topic id="4" position="290,0" order="2" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[articulations / LOG]]></text>
             </topic>
         </topic>
         <topic id="5" position="200,100" order="4" brColor="#808080"
-               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectagle">
+               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectangle">
             <text><![CDATA[SWOT]]></text>
             <topic id="6" position="290,50" order="0" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[]]></text>
                 <topic id="7" position="380,-375" order="0" shape="line">
                     <text><![CDATA[l'entreprise a aujourd'hui un potentiel important]]></text>
@@ -147,7 +147,7 @@
                 </topic>
             </topic>
             <topic id="46" position="290,75" order="1" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[Risques : cauchemars, dangers]]></text>
                 <topic id="47" position="380,-225" order="0" shape="line">
                     <text><![CDATA[disparition des forces vives, départ de membres actuels]]></text>
diff --git a/packages/editor/test/playground/map-render/samples/error-on-load.wxml b/packages/editor/test/playground/map-render/samples/error-on-load.wxml
index aad51a70..a46d1371 100644
--- a/packages/editor/test/playground/map-render/samples/error-on-load.wxml
+++ b/packages/editor/test/playground/map-render/samples/error-on-load.wxml
@@ -6,7 +6,7 @@
             <topic order="0" text="College Newspapers"/>
         </topic>
         <topic position="-203,-300" text="Third Party ">
-            <topic order="0" text="Thumbshot" shape="rectagle">
+            <topic order="0" text="Thumbshot" shape="rectangle">
                 <link url="thumbshots.org"/>
             </topic>
         </topic>
diff --git a/packages/editor/test/playground/map-render/samples/huge.wxml b/packages/editor/test/playground/map-render/samples/huge.wxml
index 1006e456..ff6ea0d7 100644
--- a/packages/editor/test/playground/map-render/samples/huge.wxml
+++ b/packages/editor/test/playground/map-render/samples/huge.wxml
@@ -1,5 +1,5 @@
 <map name="26254">
-    <topic central="true" text="I Care" shape="rectagle" brColor="#121110">
+    <topic central="true" text="I Care" shape="rectangle" brColor="#121110">
         <topic position="328,-700" text="veiligheid">
             <topic order="0" text="verkeer">
                 <note text="info%20vanuit%20de%20verschillende%20auto%27s%20verzamelen%20en%20voor%20verkeersleiding%20en%20informatie%20naar%20de%20bestuurders%20toe"/>
@@ -55,9 +55,9 @@
                 </topic>
             </topic>
         </topic>
-        <topic position="-457,-750" text="De markt" shape="rounded rectagle">
+        <topic position="-457,-750" text="De markt" shape="rounded rectangle">
             <note text="monitoring%20van%20de%20markt%20en%20hieruit%20algemene%20info%20verzamelen%20welke%20in%20onderzoeken%20gebruikt%20kan%20worden%0A-%20info%20over%20de%20levensloop%20%28kwaliteit%20van%20een%20merk%20observeren%29%0A-%20info%20over%20eigendom%0A-%20gps%20tracking%0AGekoppeld%20aan%20een%20infoplatform%20dat%20kan%20worden%20geraadpleegd%20door%20de%20consument%20om%20zo%20objectieve%20info%20te%20krijgen%20over%20producten%2C%20merken%2C...%0A"/>
-            <topic order="0" text="kleding" shape="rectagle">
+            <topic order="0" text="kleding" shape="rectangle">
                 <topic order="0" text="informatiebronnen per merk">
                     <topic order="0" text="slimme kledij"/>
                 </topic>
@@ -307,7 +307,7 @@
             <topic order="0" text="GS1-databar: meer infor opslaan"/>
         </topic>
     </topic>
-    <topic position="651,23" text="levensfasen" shape="rounded rectagle">
+    <topic position="651,23" text="levensfasen" shape="rounded rectangle">
         <topic order="0" text="kinderen en peuters" fontStyle=";;;bold;;">
             <topic order="0" text="kinderen steeds asocialer">
                 <topic order="0" text="sociale networking voor kinderen"/>
diff --git a/packages/editor/test/playground/map-render/samples/icon-sample.wxml b/packages/editor/test/playground/map-render/samples/icon-sample.wxml
index 166d2161..b984c102 100644
--- a/packages/editor/test/playground/map-render/samples/icon-sample.wxml
+++ b/packages/editor/test/playground/map-render/samples/icon-sample.wxml
@@ -45,10 +45,10 @@ Line 2]]></text>
                 <topic position="-404,111" order="1" text="Line" id="72" fontStyle=";;#525c61;;italic;">
                     <icon id="face_smile"/>
                 </topic>
-                <topic position="-404,142" order="2" text="Box" shape="rectagle" id="73" fontStyle=";;#525c61;;italic;">
+                <topic position="-404,142" order="2" text="Box" shape="rectangle" id="73" fontStyle=";;#525c61;;italic;">
                     <icon id="funy_angel"/>
                 </topic>
-                <topic position="-418,173" order="3" text="Round Box" shape="rounded rectagle" id="74" fontStyle=";;#525c61;;italic;">
+                <topic position="-418,173" order="3" text="Round Box" shape="rounded rectangle" id="74" fontStyle=";;#525c61;;italic;">
                     <icon id="face_wink"/>
                 </topic>
             </topic>
diff --git a/packages/editor/test/playground/map-render/samples/sample1.wxml b/packages/editor/test/playground/map-render/samples/sample1.wxml
index e957fa3d..8cb5aa99 100644
--- a/packages/editor/test/playground/map-render/samples/sample1.wxml
+++ b/packages/editor/test/playground/map-render/samples/sample1.wxml
@@ -1,67 +1,67 @@
 <map name="70866" version="tango">
-    <topic central="true" text="La computadora" shape="rounded rectagle" id="1" fontStyle="Verdana;15;#feffff;bold;;"
+    <topic central="true" text="La computadora" shape="rounded rectangle" id="1" fontStyle="Verdana;15;#feffff;bold;;"
            bgColor="#cc0000" brColor="#660000">
-        <topic position="220,0" order="0" shape="rounded rectagle" id="21" fontStyle=";10;#feffff;bold;;"
+        <topic position="220,0" order="0" shape="rounded rectangle" id="21" fontStyle=";10;#feffff;bold;;"
                bgColor="#a64d79" brColor="#4c1130">
             <text><![CDATA[Hardware
 (componentes físicos)]]></text>
-            <topic position="386,-29" order="0" shape="rounded rectagle" id="25" fontStyle=";8;#feffff;;;"
+            <topic position="386,-29" order="0" shape="rounded rectangle" id="25" fontStyle=";8;#feffff;;;"
                    bgColor="#c27ba0" brColor="#4c1130">
                 <text><![CDATA[Entrada de datos
 ]]></text>
-                <topic position="558,-34" order="0" shape="rounded rectagle" id="28" fontStyle=";8;#000000;;;"
+                <topic position="558,-34" order="0" shape="rounded rectangle" id="28" fontStyle=";8;#000000;;;"
                        bgColor="#ead1dc" brColor="#4c1130">
                     <text><![CDATA[ Ratón, Teclado, Joystick,
 Cámara digital, Micrófono, Escáner.]]></text>
                 </topic>
             </topic>
-            <topic position="383,0" order="1" text="Salida de datos" shape="rounded rectagle" id="29"
+            <topic position="383,0" order="1" text="Salida de datos" shape="rounded rectangle" id="29"
                    fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130">
-                <topic position="554,0" order="0" shape="rounded rectagle" id="30" fontStyle=";8;#000000;;;"
+                <topic position="554,0" order="0" shape="rounded rectangle" id="30" fontStyle=";8;#000000;;;"
                        bgColor="#ead1dc" brColor="#4c1130">
                     <text><![CDATA[Monitor, Impresora, Bocinas, Plóter.
 ]]></text>
                 </topic>
             </topic>
-            <topic position="387,40" order="2" text="Almacenamiento" shape="rounded rectagle" id="31"
+            <topic position="387,40" order="2" text="Almacenamiento" shape="rounded rectangle" id="31"
                    fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130">
-                <topic position="553,35" order="0" shape="rounded rectagle" id="32" fontStyle=";8;#000000;;;"
+                <topic position="553,35" order="0" shape="rounded rectangle" id="32" fontStyle=";8;#000000;;;"
                        bgColor="#ead1dc" brColor="#4c1130">
                     <text><![CDATA[Disquete, Disco compacto, DVD,
 BD, Disco duro, Memoria flash.]]></text>
                 </topic>
             </topic>
         </topic>
-        <topic position="-314,-72" order="1" shape="rectagle" id="59" fontStyle=";8;#000000;bold;;" bgColor="#bf9000"
+        <topic position="-314,-72" order="1" shape="rectangle" id="59" fontStyle=";8;#000000;bold;;" bgColor="#bf9000"
                brColor="#7f6000">
             <text><![CDATA[Software
 (Programas y datos con los que funciona la computadora)
 ]]></text>
-            <topic position="-664,-145" order="0" shape="rectagle" id="92" fontStyle=";8;#000000;normal;;"
+            <topic position="-664,-145" order="0" shape="rectangle" id="92" fontStyle=";8;#000000;normal;;"
                    bgColor="#f1c232" brColor="#7f6000">
                 <text><![CDATA[Software de Sistema:Permite el entendimiento
 entre el usuario y la maquina.]]></text>
-                <topic position="-883,-174" order="0" text="Microsoft Windows" shape="rectagle" id="101"
+                <topic position="-883,-174" order="0" text="Microsoft Windows" shape="rectangle" id="101"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-864,-145" order="1" text="GNU/LINUX" shape="rectagle" id="106"
+                <topic position="-864,-145" order="1" text="GNU/LINUX" shape="rectangle" id="106"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-846,-116" order="2" text="MAC " shape="rectagle" id="107" fontStyle=";8;#000000;;;"
+                <topic position="-846,-116" order="2" text="MAC " shape="rectangle" id="107" fontStyle=";8;#000000;;;"
                        bgColor="#ffd966" brColor="#7f6000"/>
             </topic>
-            <topic position="-667,-43" order="1" shape="rectagle" id="93" fontStyle=";8;#000000;;;" bgColor="#f1c232"
+            <topic position="-667,-43" order="1" shape="rectangle" id="93" fontStyle=";8;#000000;;;" bgColor="#f1c232"
                    brColor="#7f6000">
                 <text><![CDATA[Software de Aplicación: Permite hacer hojas de
 calculo navegar en internet, base de datos, etc.]]></text>
-                <topic position="-855,-87" order="0" text="Office" shape="rectagle" id="108" fontStyle=";8;#000000;;;"
+                <topic position="-855,-87" order="0" text="Office" shape="rectangle" id="108" fontStyle=";8;#000000;;;"
                        bgColor="#ffd966" brColor="#783f04"/>
-                <topic position="-869,-58" order="1" text="Libre Office" shape="rectagle" id="109"
+                <topic position="-869,-58" order="1" text="Libre Office" shape="rectangle" id="109"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-873,-29" order="2" text="Navegadores" shape="rectagle" id="110"
+                <topic position="-873,-29" order="2" text="Navegadores" shape="rectangle" id="110"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-851,0" order="3" text="Msn" shape="rectagle" id="111" fontStyle=";8;#000000;;;"
+                <topic position="-851,0" order="3" text="Msn" shape="rectangle" id="111" fontStyle=";8;#000000;;;"
                        bgColor="#ffd966" brColor="#783f04"/>
             </topic>
-            <topic position="-590,29" order="2" shape="rectagle" id="94" fontStyle=";8;#000000;;;" bgColor="#f1c232"
+            <topic position="-590,29" order="2" shape="rectangle" id="94" fontStyle=";8;#000000;;;" bgColor="#f1c232"
                    brColor="#7f6000">
                 <text><![CDATA[Software de Desarrollo
 ]]></text>
@@ -79,37 +79,37 @@ calculo navegar en internet, base de datos, etc.]]></text>
             <topic position="-368,174" order="4" text="Tablet PC" shape="elipse" id="13" fontStyle=";8;;bold;;"/>
         </topic>
     </topic>
-    <topic position="283,192" text="CPU y sus partes internas" shape="rounded rectagle" id="35"
+    <topic position="283,192" text="CPU y sus partes internas" shape="rounded rectangle" id="35"
            fontStyle=";10;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130">
-        <topic position="493,120" order="0" text="Ranuras de expansión o PCI" shape="rounded rectagle" id="36"
+        <topic position="493,120" order="0" text="Ranuras de expansión o PCI" shape="rounded rectangle" id="36"
                fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"/>
-        <topic position="458,149" order="1" shape="rounded rectagle" id="38" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="458,149" order="1" shape="rounded rectangle" id="38" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Memoria RAM
 ]]></text>
         </topic>
-        <topic position="466,178" order="2" shape="rounded rectagle" id="40" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="466,178" order="2" shape="rounded rectangle" id="40" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Unidades ópticas
 ]]></text>
         </topic>
-        <topic position="457,207" order="3" shape="rounded rectagle" id="41" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="457,207" order="3" shape="rounded rectangle" id="41" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Tarjeta Madre
 ]]></text>
         </topic>
-        <topic position="465,236" order="4" shape="rounded rectagle" id="42" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="465,236" order="4" shape="rounded rectangle" id="42" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Microprocesador
 ]]></text>
         </topic>
-        <topic position="450,265" order="5" shape="rounded rectagle" id="43" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="450,265" order="5" shape="rounded rectangle" id="43" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Disco Duro
 ]]></text>
         </topic>
     </topic>
-    <topic position="80,-215" shape="rounded rectagle" id="118" fontStyle=";10;#feffff;;;" bgColor="#cc0000"
+    <topic position="80,-215" shape="rounded rectangle" id="118" fontStyle=";10;#feffff;;;" bgColor="#cc0000"
            brColor="#660000">
         <text><![CDATA[Máquina electrónica que sirve para:  escribir,  dibujar,  pintar,
 escuchar música, ver videos, calcular, comunicarnos con otras personas, etc-]]></text>
diff --git a/packages/editor/test/playground/map-render/samples/sample3.wxml b/packages/editor/test/playground/map-render/samples/sample3.wxml
index a5a72ca4..d2e6821d 100644
--- a/packages/editor/test/playground/map-render/samples/sample3.wxml
+++ b/packages/editor/test/playground/map-render/samples/sample3.wxml
@@ -3,7 +3,7 @@
     <topic position="-260,107" text="Subscription Library" shape="elipse" id="3" fontStyle=";10;#ff0000;bold;;"/>
     <topic position="1,135" order="0" text="Clickview 24/7" shape="elipse" id="6" fontStyle=";10;#38761d;bold;;"/>
     <topic position="179,133" order="0" text="Clickview Exchange" shape="elipse" id="9" fontStyle=";10;#741b47;bold;;"/>
-    <topic position="1,65" order="1" text="Components/Services" shape="rectagle" id="2" fontStyle=";10;#0000ff;bold;;"/>
+    <topic position="1,65" order="1" text="Components/Services" shape="rectangle" id="2" fontStyle=";10;#0000ff;bold;;"/>
     <relationship srcTopicId="3" destTopicId="2" lineType="3" endArrow="true" startArrow="false"/>
     <relationship srcTopicId="6" destTopicId="2" lineType="3" endArrow="true" startArrow="false"/>
 </map>
\ No newline at end of file
diff --git a/packages/editor/test/playground/map-render/samples/sample4.wxml b/packages/editor/test/playground/map-render/samples/sample4.wxml
index 8053577a..c229f862 100644
--- a/packages/editor/test/playground/map-render/samples/sample4.wxml
+++ b/packages/editor/test/playground/map-render/samples/sample4.wxml
@@ -3,7 +3,7 @@
     <topic position="-260,107" text="Subscription Library" shape="elipse" id="3" fontStyle=";10;#ff0000;bold;;"/>
     <topic position="1,135" text="Clickview 24/7" shape="elipse" id="6" fontStyle=";10;#38761d;bold;;"/>
     <topic position="179,133" text="Clickview Exchange" shape="elipse" id="9" fontStyle=";10;#741b47;bold;;"/>
-    <topic position="1,65" text="Components/Services" shape="rectagle" id="2" fontStyle=";10;#0000ff;bold;;"/>
+    <topic position="1,65" text="Components/Services" shape="rectangle" id="2" fontStyle=";10;#0000ff;bold;;"/>
     <relationship srcTopicId="3" destTopicId="2" lineType="3" endArrow="true" startArrow="false"/>
     <relationship srcTopicId="6" destTopicId="2" lineType="3" srcCtrlPoint="-1,-12" destCtrlPoint="-30,25"
                   endArrow="true" startArrow="false"/>
diff --git a/packages/editor/test/playground/map-render/samples/sample5.wxml b/packages/editor/test/playground/map-render/samples/sample5.wxml
index 2fa22407..332204bd 100644
--- a/packages/editor/test/playground/map-render/samples/sample5.wxml
+++ b/packages/editor/test/playground/map-render/samples/sample5.wxml
@@ -44,7 +44,7 @@ Propias]]></text>
 * Beneficio de Operaciones]]></text>
             <note><![CDATA[El beneficio final sin todos los gastos.]]></note>
         </topic>
-        <topic position="158,17" order="4" text="Documentos" shape="rectagle" id="66">
+        <topic position="158,17" order="4" text="Documentos" shape="rectangle" id="66">
             <icon id="money_money"/>
             <topic position="316,-253" order="0" shrink="true" id="28">
                 <text><![CDATA[* Estado de Resultados
@@ -104,31 +104,31 @@ del importe]]></text>
                             <topic position="724,-219" order="0" text="Ciertos" id="31"/>
                             <topic position="731,-193" order="1" text="Estimados" id="34"/>
                         </topic>
-                        <topic position="658,-86" order="1" text="Por el momento de Cancelacion" shape="rounded rectagle" id="35" fontStyle=";;#444444;;;" brColor="#38761d">
-                            <topic position="794,-112" order="0" shape="rounded rectagle" id="36" fontStyle=";;#444444;;;" brColor="#38761d">
+                        <topic position="658,-86" order="1" text="Por el momento de Cancelacion" shape="rounded rectangle" id="35" fontStyle=";;#444444;;;" brColor="#38761d">
+                            <topic position="794,-112" order="0" shape="rounded rectangle" id="36" fontStyle=";;#444444;;;" brColor="#38761d">
                                 <text><![CDATA[* Circulantes
 * Corto Plazo]]></text>
-                                <topic position="904,-167" order="0" text="Dividendos a Pagar" shape="rounded rectagle" id="51" fontStyle=";;#444444;;;" brColor="#38761d"/>
-                                <topic position="965,-133" order="1" shape="rounded rectagle" id="47" fontStyle=";;#444444;;;" brColor="#38761d">
+                                <topic position="904,-167" order="0" text="Dividendos a Pagar" shape="rounded rectangle" id="51" fontStyle=";;#444444;;;" brColor="#38761d"/>
+                                <topic position="965,-133" order="1" shape="rounded rectangle" id="47" fontStyle=";;#444444;;;" brColor="#38761d">
                                     <text><![CDATA[Devengos: Costes por los cuales todavia no 
 se a emitido factura, pero se sabe que se va a 
 tener que pagar]]></text>
                                 </topic>
-                                <topic position="917,-99" order="2" text="Impuestos de Sociedades" shape="rounded rectagle" id="50" fontStyle=";;#444444;;;" brColor="#38761d"/>
-                                <topic position="921,-65" order="3" shape="rounded rectagle" id="46" fontStyle=";;#444444;;;" brColor="#38761d">
+                                <topic position="917,-99" order="2" text="Impuestos de Sociedades" shape="rounded rectangle" id="50" fontStyle=";;#444444;;;" brColor="#38761d"/>
+                                <topic position="921,-65" order="3" shape="rounded rectangle" id="46" fontStyle=";;#444444;;;" brColor="#38761d">
                                     <text><![CDATA[Acreedores Comerciales:
 Lo que le tengo que pagas 
 a proveedores]]></text>
                                 </topic>
                             </topic>
-                            <topic position="800,-18" order="1" shape="rounded rectagle" id="37" fontStyle=";;#444444;;;" brColor="#38761d">
+                            <topic position="800,-18" order="1" shape="rounded rectangle" id="37" fontStyle=";;#444444;;;" brColor="#38761d">
                                 <text><![CDATA[* Fijos
 * No Circulantes
 * Largo Plazo]]></text>
-                                <topic position="910,-31" order="0" text="Capital Social" shape="rounded rectagle" id="81" fontStyle=";;#444444;;;" brColor="#38761d">
+                                <topic position="910,-31" order="0" text="Capital Social" shape="rounded rectangle" id="81" fontStyle=";;#444444;;;" brColor="#38761d">
                                     <note><![CDATA[«Capital social», que representa los fondos propios correspondientes a las aportaciones realizadas por los socios.]]></note>
                                 </topic>
-                                <topic position="924,-5" order="1" text="Beneficio no distribuido" shape="rounded rectagle" id="82" fontStyle=";;#444444;;;" brColor="#38761d"/>
+                                <topic position="924,-5" order="1" text="Beneficio no distribuido" shape="rounded rectangle" id="82" fontStyle=";;#444444;;;" brColor="#38761d"/>
                             </topic>
                         </topic>
                     </topic>
diff --git a/packages/mindplot/src/components/model/INodeModel.ts b/packages/mindplot/src/components/model/INodeModel.ts
index 214ff9fd..4b5e3fac 100644
--- a/packages/mindplot/src/components/model/INodeModel.ts
+++ b/packages/mindplot/src/components/model/INodeModel.ts
@@ -365,8 +365,8 @@ abstract class INodeModel {
 }
 
 const TopicShape = {
-  RECTANGLE: 'rectagle',
-  ROUNDED_RECT: 'rounded rectagle',
+  RECTANGLE: 'rectangle',
+  ROUNDED_RECT: 'rounded rectangle',
   ELLIPSE: 'elipse',
   LINE: 'line',
   IMAGE: 'image',
diff --git a/packages/mindplot/src/components/persistence/XMLSerializerTango.ts b/packages/mindplot/src/components/persistence/XMLSerializerTango.ts
index ea734ce7..7813a977 100644
--- a/packages/mindplot/src/components/persistence/XMLSerializerTango.ts
+++ b/packages/mindplot/src/components/persistence/XMLSerializerTango.ts
@@ -320,8 +320,11 @@ class XMLSerializerTango implements XMLMindmapSerializer {
       }
     }
 
-    const shape = domElem.getAttribute('shape');
+    let shape = domElem.getAttribute('shape');
     if ($defined(shape)) {
+      // Fix typo on serialization....
+      shape = shape.replace('rectagle', 'rectangle');
+
       topic.setShapeType(shape);
 
       if (shape === TopicShape.IMAGE) {
diff --git a/packages/mindplot/test/unit/export/expected/bug2.wxml b/packages/mindplot/test/unit/export/expected/bug2.wxml
index 65ae6963..065220fd 100644
--- a/packages/mindplot/test/unit/export/expected/bug2.wxml
+++ b/packages/mindplot/test/unit/export/expected/bug2.wxml
@@ -1,4 +1,4 @@
-<map name="bug2" version="tango"><topic central="true" text="SaberMás" id="1"><topic position="271,-39" order="8" text="Utilización de medios de expresión artística, digitales y analógicos" id="5"/><topic position="-181,-17" order="5" text="Precio también limitado: 100-120?" id="9"/><topic position="132,165" order="14" text="Talleres temáticos" id="2"><topic position="242,57" order="0" text="Naturaleza" id="13"><topic position="362,57" order="0" text="Animales, Plantas, Piedras" id="17"/></topic><topic position="245,84" order="1" text="Arqueología" id="21"/><topic position="256,111" order="2" text="Culturas Antiguas" id="25"><topic position="378,111" order="0" text="Egipto, Grecia, China..." id="26"/></topic><topic position="236,138" order="3" text="Energía" id="18"/><topic position="248,165" order="4" text="Paleontología" id="38"/><topic position="244,192" order="5" text="Astronomía" id="16"/><topic position="245,219" order="6" text="Arquitectura" id="20"/><topic position="234,246" order="7" text="Cocina" id="11"/><topic position="234,273" order="8" text="Poesía" id="24"/></topic><topic position="-168,-49" order="3" text="Duración limitada: 5-6 semanas" id="6"/><topic position="-181,16" order="7" text="Niños y niñas que quieren saber más" id="7"/><topic position="-184,-81" order="1" text="Alternativa a otras actividades de ocio" id="8"/><topic position="255,-6" order="10" text="Uso de la tecnología durante todo el proceso de aprendizaje" id="23"/><topic position="336,-137" order="2" text="Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas " id="3"/><topic position="238,-105" order="4" text="Trabajo basado en la experimentación y en la investigación" id="4"/><topic position="-201,48" order="9" text="De 8 a 12 años, sin separación por edades" id="10"/><topic position="-146,81" order="11" text="Máximo 10/1 por taller" id="19"/><topic position="211,-72" order="6" text="Actividades centradas en el contexto cercano" id="37"/><topic position="303,27" order="12" text="Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)" id="22"/><topic position="206,-220" order="0" text="Complementamos el trabajo de la escuela" shape="rounded rectagle" id="27"><note><![CDATA[Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.
+<map name="bug2" version="tango"><topic central="true" text="SaberMás" id="1"><topic position="271,-39" order="8" text="Utilización de medios de expresión artística, digitales y analógicos" id="5"/><topic position="-181,-17" order="5" text="Precio también limitado: 100-120?" id="9"/><topic position="132,165" order="14" text="Talleres temáticos" id="2"><topic position="242,57" order="0" text="Naturaleza" id="13"><topic position="362,57" order="0" text="Animales, Plantas, Piedras" id="17"/></topic><topic position="245,84" order="1" text="Arqueología" id="21"/><topic position="256,111" order="2" text="Culturas Antiguas" id="25"><topic position="378,111" order="0" text="Egipto, Grecia, China..." id="26"/></topic><topic position="236,138" order="3" text="Energía" id="18"/><topic position="248,165" order="4" text="Paleontología" id="38"/><topic position="244,192" order="5" text="Astronomía" id="16"/><topic position="245,219" order="6" text="Arquitectura" id="20"/><topic position="234,246" order="7" text="Cocina" id="11"/><topic position="234,273" order="8" text="Poesía" id="24"/></topic><topic position="-168,-49" order="3" text="Duración limitada: 5-6 semanas" id="6"/><topic position="-181,16" order="7" text="Niños y niñas que quieren saber más" id="7"/><topic position="-184,-81" order="1" text="Alternativa a otras actividades de ocio" id="8"/><topic position="255,-6" order="10" text="Uso de la tecnología durante todo el proceso de aprendizaje" id="23"/><topic position="336,-137" order="2" text="Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas " id="3"/><topic position="238,-105" order="4" text="Trabajo basado en la experimentación y en la investigación" id="4"/><topic position="-201,48" order="9" text="De 8 a 12 años, sin separación por edades" id="10"/><topic position="-146,81" order="11" text="Máximo 10/1 por taller" id="19"/><topic position="211,-72" order="6" text="Actividades centradas en el contexto cercano" id="37"/><topic position="303,27" order="12" text="Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)" id="22"/><topic position="206,-220" order="0" text="Complementamos el trabajo de la escuela" shape="rounded rectangle" id="27"><note><![CDATA[Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.
 A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,
 ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.
 
diff --git a/packages/mindplot/test/unit/export/expected/bug3.wxml b/packages/mindplot/test/unit/export/expected/bug3.wxml
index 63377ec8..a6451661 100644
--- a/packages/mindplot/test/unit/export/expected/bug3.wxml
+++ b/packages/mindplot/test/unit/export/expected/bug3.wxml
@@ -1,11 +1,11 @@
-<map name="bug3" version="tango"><topic central="true" text="Indicator needs" id="1" fontStyle=";15;;;;"><topic position="221,-1937" order="0" text="Which new measures" shape="rounded rectagle" id="5" fontStyle=";10;;;;"><note><![CDATA[Identifying new measures or investments that should be implemented.]]></note><topic position="394,-1978" order="0" text="Landscape of measures" shape="rounded rectagle" id="56" bgColor="#feffff"><topic position="616,-1991" order="0" text="Diversity index of innovation support instruments in the region" id="45"><note><![CDATA[Number of different innovations policy instruments existing  in the region as a share of a total number representing a full typology of instruments]]></note></topic><topic position="550,-1964" order="1" text="Existing investments in measures" id="57"/></topic><topic position="414,-1910" order="1" text="What other regions do differently" shape="rounded rectagle" id="38" bgColor="#feffff"><topic position="574,-1937" order="0" text="Balance of measure index" id="46"/><topic position="597,-1910" order="1" text="Profile comparison with other regions" id="77"/><topic position="620,-1883" order="2" text="Number of specific types of measures per capita" id="112"/></topic></topic><topic position="-279,-545" order="1" text="How to design &amp; implement measures" shape="rounded rectagle" id="6" fontStyle=";10;;;;"><note><![CDATA[Understanding how to design the details of a particular measure and how to implement them.]]></note><topic position="-493,-775" order="0" text="Good practices" shape="rounded rectagle" id="41" bgColor="#feffff"/><topic position="-486,-531" order="1" text="Diagnostics" shape="rounded rectagle" id="80" bgColor="#feffff"><topic position="-621,-748" order="0" text="Internal business innovation factors" id="81"/><topic position="-621,-518" order="1" text="Return on investment to innovation" id="359"><topic position="-851,-717" order="0" id="360"><text><![CDATA[Firm's turnover from (new to firm)
+<map name="bug3" version="tango"><topic central="true" text="Indicator needs" id="1" fontStyle=";15;;;;"><topic position="221,-1937" order="0" text="Which new measures" shape="rounded rectangle" id="5" fontStyle=";10;;;;"><note><![CDATA[Identifying new measures or investments that should be implemented.]]></note><topic position="394,-1978" order="0" text="Landscape of measures" shape="rounded rectangle" id="56" bgColor="#feffff"><topic position="616,-1991" order="0" text="Diversity index of innovation support instruments in the region" id="45"><note><![CDATA[Number of different innovations policy instruments existing  in the region as a share of a total number representing a full typology of instruments]]></note></topic><topic position="550,-1964" order="1" text="Existing investments in measures" id="57"/></topic><topic position="414,-1910" order="1" text="What other regions do differently" shape="rounded rectangle" id="38" bgColor="#feffff"><topic position="574,-1937" order="0" text="Balance of measure index" id="46"/><topic position="597,-1910" order="1" text="Profile comparison with other regions" id="77"/><topic position="620,-1883" order="2" text="Number of specific types of measures per capita" id="112"/></topic></topic><topic position="-279,-545" order="1" text="How to design &amp; implement measures" shape="rounded rectangle" id="6" fontStyle=";10;;;;"><note><![CDATA[Understanding how to design the details of a particular measure and how to implement them.]]></note><topic position="-493,-775" order="0" text="Good practices" shape="rounded rectangle" id="41" bgColor="#feffff"/><topic position="-486,-531" order="1" text="Diagnostics" shape="rounded rectangle" id="80" bgColor="#feffff"><topic position="-621,-748" order="0" text="Internal business innovation factors" id="81"/><topic position="-621,-518" order="1" text="Return on investment to innovation" id="359"><topic position="-851,-717" order="0" id="360"><text><![CDATA[Firm's turnover from (new to firm)
  product innovation (as a pecentage of total turnover)]]></text><icon id="sign_warning"/></topic><topic position="-920,-682" order="1" id="361"><text><![CDATA[Increase in the probability to innovate linked to ICT use
  (in product innovation, process innovation, organisational innovaton, marketing innovation)]]></text></topic><topic position="-882,-647" order="2" id="362"><text><![CDATA[Scientific articles by type of collaboration (per capita)
  (international co-authoriship, domestic co-authoriship, single author)]]></text><icon id="sign_warning"/></topic><topic position="-876,-612" order="3" id="363"><text><![CDATA[Increase in a share of expenditures on technological
 innovations in the total amount of regional firms’ expenditures, %]]></text><icon id="sign_warning"/></topic><topic position="-877,-581" order="4" text="Increase in the number of innovative companies with in-house R&amp;D" id="364"><icon id="sign_warning"/></topic><topic position="-881,-554" order="5" text="Increase in th number of innovative companies without in-house R&amp;D" id="365"><icon id="sign_warning"/></topic><topic position="-842,-523" order="6" id="366"><text><![CDATA[Increase in th number of firms with
  international/national collaboration on innovation]]></text><icon id="sign_warning"/></topic><topic position="-849,-488" order="7" id="367"><text><![CDATA[Highly cited scientific articles (as a percentage of
 highly cited scientific article in the whole Federation)]]></text><icon id="sign_warning"/></topic><topic position="-852,-453" order="8" id="368"><text><![CDATA[Patents filed by public research organisations
-(as a percentafe of patent application filed under PCT)]]></text><icon id="sign_warning"/></topic><topic position="-805,-422" order="9" text="Number of international patents" id="369"><icon id="sign_warning"/></topic><topic position="-893,-395" order="10" text="Start-up activity (as a percentage of start-up activity in the whole Federation)" id="370"/><topic position="-861,-368" order="11" text="Number of innovative companies to the number of students " id="393"><icon id="sign_warning"/></topic><topic position="-867,-341" order="12" text="Number of innovative companies to the number of researchers  " id="394"><icon id="sign_warning"/></topic><topic position="-916,-314" order="13" text="Volume of license agreements to the volume of R&amp;D support from the regional budget " id="400"><icon id="sign_warning"/></topic></topic></topic></topic><topic position="255,-251" order="2" text="How much effort: where &amp; how" shape="rounded rectagle" id="2" fontStyle=";10;;;;"><note><![CDATA[Understanding the level of effort the region needs to take to compete on innovation and where to put this effort]]></note><topic position="454,-1762" order="0" text="The bottom-line" shape="rounded rectagle" id="3" bgColor="#feffff"><note><![CDATA[This is what policy makers care about in the end]]></note><topic position="547,-1843" order="0" text="Wages" id="15"><topic position="649,-1856" order="0" text="Dynamics of real wages" id="12"/><topic position="675,-1829" order="1" text="Average wage (compare to the Fed)" id="14"/></topic><topic position="558,-1789" order="1" text="Productivity" id="86"><topic position="665,-1802" order="0" text="Labor productivity" id="190"><icon id="sign_warning"/></topic><topic position="683,-1775" order="1" text="Labor productivity growth rate" id="191"/></topic><topic position="543,-1721" order="2" text="Jobs" id="87"><topic position="659,-1748" order="0" text="Share of high-productive jobs" id="13"><icon id="sign_warning"/></topic><topic position="657,-1721" order="1" text="Share of creative industries jobs" id="88"/><topic position="683,-1694" order="2" text="Uneployment rate of university graduates" id="336"><icon id="sign_warning"/></topic></topic><topic position="549,-1667" order="3" text="Income" id="89"><topic position="674,-1667" order="0" text="GRP per capita and its growth rate" id="11"/></topic></topic><topic position="452,-143" order="1" text="Influencing  factors" shape="rounded rectagle" id="8" bgColor="#feffff"><topic position="548,-1613" order="0" text="Economy" id="55"><topic position="644,-1640" order="0" text="Economic structure" id="166"/><topic position="701,-1613" order="1" text="Volume of manufacturing production per capita " id="395"/><topic position="742,-1586" order="2" text="Manufacturing value added per capita (non-natural resource-based)" id="396"/></topic><topic position="582,-1200" order="1" text="The enabling environment" id="9"><topic position="728,-1559" order="0" text="Ease of doing business" id="16"><note><![CDATA[WB]]></note><topic position="990,-1559" order="0" text="Level of administrative barriers (number and cost of administrative procedures) " id="412"><icon id="sign_warning"/></topic></topic><topic position="719,-1532" order="1" text="Competition index" id="18"><note><![CDATA[GCR]]></note></topic><topic position="695,-1349" order="2" text="Workforce" id="120"><topic position="804,-1505" order="0" text="Quality of education" id="19"><note><![CDATA[GCR]]></note><topic position="995,-1505" order="0" text="Inrease in the number of International students" id="337"><icon id="sign_warning"/></topic></topic><topic position="800,-1389" order="1" text="Quantity of education" id="121"><topic position="962,-1478" order="0" text="Participation in life-long learning" id="122"><note><![CDATA[per 100 population aged 25-64]]></note><icon id="sign_warning"/></topic><topic position="933,-1451" order="1" text="Increase in literarecy " id="333"><icon id="sign_warning"/></topic><topic position="959,-1420" order="2" id="188"><text><![CDATA[Amount of university and colleague
+(as a percentafe of patent application filed under PCT)]]></text><icon id="sign_warning"/></topic><topic position="-805,-422" order="9" text="Number of international patents" id="369"><icon id="sign_warning"/></topic><topic position="-893,-395" order="10" text="Start-up activity (as a percentage of start-up activity in the whole Federation)" id="370"/><topic position="-861,-368" order="11" text="Number of innovative companies to the number of students " id="393"><icon id="sign_warning"/></topic><topic position="-867,-341" order="12" text="Number of innovative companies to the number of researchers  " id="394"><icon id="sign_warning"/></topic><topic position="-916,-314" order="13" text="Volume of license agreements to the volume of R&amp;D support from the regional budget " id="400"><icon id="sign_warning"/></topic></topic></topic></topic><topic position="255,-251" order="2" text="How much effort: where &amp; how" shape="rounded rectangle" id="2" fontStyle=";10;;;;"><note><![CDATA[Understanding the level of effort the region needs to take to compete on innovation and where to put this effort]]></note><topic position="454,-1762" order="0" text="The bottom-line" shape="rounded rectangle" id="3" bgColor="#feffff"><note><![CDATA[This is what policy makers care about in the end]]></note><topic position="547,-1843" order="0" text="Wages" id="15"><topic position="649,-1856" order="0" text="Dynamics of real wages" id="12"/><topic position="675,-1829" order="1" text="Average wage (compare to the Fed)" id="14"/></topic><topic position="558,-1789" order="1" text="Productivity" id="86"><topic position="665,-1802" order="0" text="Labor productivity" id="190"><icon id="sign_warning"/></topic><topic position="683,-1775" order="1" text="Labor productivity growth rate" id="191"/></topic><topic position="543,-1721" order="2" text="Jobs" id="87"><topic position="659,-1748" order="0" text="Share of high-productive jobs" id="13"><icon id="sign_warning"/></topic><topic position="657,-1721" order="1" text="Share of creative industries jobs" id="88"/><topic position="683,-1694" order="2" text="Uneployment rate of university graduates" id="336"><icon id="sign_warning"/></topic></topic><topic position="549,-1667" order="3" text="Income" id="89"><topic position="674,-1667" order="0" text="GRP per capita and its growth rate" id="11"/></topic></topic><topic position="452,-143" order="1" text="Influencing  factors" shape="rounded rectangle" id="8" bgColor="#feffff"><topic position="548,-1613" order="0" text="Economy" id="55"><topic position="644,-1640" order="0" text="Economic structure" id="166"/><topic position="701,-1613" order="1" text="Volume of manufacturing production per capita " id="395"/><topic position="742,-1586" order="2" text="Manufacturing value added per capita (non-natural resource-based)" id="396"/></topic><topic position="582,-1200" order="1" text="The enabling environment" id="9"><topic position="728,-1559" order="0" text="Ease of doing business" id="16"><note><![CDATA[WB]]></note><topic position="990,-1559" order="0" text="Level of administrative barriers (number and cost of administrative procedures) " id="412"><icon id="sign_warning"/></topic></topic><topic position="719,-1532" order="1" text="Competition index" id="18"><note><![CDATA[GCR]]></note></topic><topic position="695,-1349" order="2" text="Workforce" id="120"><topic position="804,-1505" order="0" text="Quality of education" id="19"><note><![CDATA[GCR]]></note><topic position="995,-1505" order="0" text="Inrease in the number of International students" id="337"><icon id="sign_warning"/></topic></topic><topic position="800,-1389" order="1" text="Quantity of education" id="121"><topic position="962,-1478" order="0" text="Participation in life-long learning" id="122"><note><![CDATA[per 100 population aged 25-64]]></note><icon id="sign_warning"/></topic><topic position="933,-1451" order="1" text="Increase in literarecy " id="333"><icon id="sign_warning"/></topic><topic position="959,-1420" order="2" id="188"><text><![CDATA[Amount of university and colleague
 students per 10 thousands population]]></text></topic><topic position="986,-1385" order="3" id="276"><text><![CDATA[Share of employees with higher education in
 the total amount of population at the working age]]></text></topic><topic position="953,-1354" order="4" text="Increase in University students" id="332"><icon id="sign_warning"/></topic><topic position="996,-1327" order="5" text="Government expenditure on General University Funding" id="351"/><topic position="1001,-1300" order="6" text="Access to training, information, and consulting support " id="409"><icon id="sign_warning"/></topic></topic><topic position="822,-1233" order="2" text="Science &amp; engineering workforce" id="285"><topic position="1013,-1273" order="0" text="Availability of scientists and engineers" id="147"><note><![CDATA[GCR]]></note></topic><topic position="1037,-1246" order="1" text="Amount of researches per 10 thousands population" id="189"><icon id="sign_warning"/></topic><topic position="1050,-1219" order="2" text="Average wage of researches per average wage in the region" id="284"/><topic position="1066,-1192" order="3" text="Share of researchers in the total number of employees in the region" id="286"/></topic></topic><topic position="700,-1152" order="3" text="Government" id="132"><topic position="897,-1165" order="0" text="Total expenditure of general government as a percentage of GDP" id="134"/><topic position="870,-1138" order="1" text="Government expenditure on Economic Development" id="352"/></topic><topic position="710,-1030" order="4" text="Access to finance" id="342"><topic position="796,-1057" order="0" text="Deals" id="387"><topic position="981,-1111" order="0" text="Venture capital investments for start-ups as a percentage of GDP" id="345"/><topic position="980,-1084" order="1" text="Amounts of business angel, pre-seed, seed and venture financing" id="344"/><topic position="940,-1057" order="2" text="Amount of public co-funding of business R&amp;D" id="348"/><topic position="942,-1030" order="3" text="Number of startups received venture financing " id="385"/><topic position="957,-1003" order="4" text="Number of companies received equity investments " id="386"><icon id="sign_warning"/></topic></topic><topic position="803,-963" order="1" text="Available" id="388"><topic position="1000,-976" order="0" text="Amount of matching grants available in the region for business R&amp;D" id="347"/><topic position="917,-949" order="1" text="Number of Business Angels" id="346"/></topic></topic><topic position="682,-882" order="5" text="ICT" id="135"><topic position="751,-922" order="0" text="ICT use" id="17"><note><![CDATA[GCR]]></note></topic><topic position="775,-895" order="1" text="Broadband penetration " id="136"/><topic position="769,-868" order="2" text="Internet penetration" id="334"/><topic position="765,-841" order="3" text="Computer literacy " id="335"/></topic></topic><topic position="589,-109" order="2" text="Behavior of innovation actors" id="10"><topic position="726,-685" order="0" text="Access to markets" id="167"><topic position="810,-747" order="0" text="FDI" id="97"><topic position="880,-814" order="0" text="foreign JVs" id="96"/><topic position="990,-787" order="1" text="Inflow of foreign direct investments in high-technology industries" id="157"/><topic position="926,-760" order="2" text="Foreign direct investment jobs" id="158"><note><![CDATA[: the percentage of the workforce employed by foreign companies [%]. ]]></note></topic><topic position="977,-733" order="3" text="FDI as a share of regional non natural resource-based GRP " id="159"/><topic position="967,-706" order="4" text="Number of foreign subsidiaries operating in the region" id="160"/><topic position="936,-679" order="5" text="Share of foreign controlled enterprises" id="161"/></topic><topic position="818,-617" order="1" text="Exports" id="168"><topic position="979,-652" order="0" text="Export intensity in manufacturing and services" id="169"><note><![CDATA[: exports as a share of total output in manufacturing and services [%].]]></note><icon id="sign_warning"/></topic><topic position="986,-621" order="1" id="375"><text><![CDATA[ Share of high-technology export in the total volume
  of production of goods, works and services]]></text><icon id="sign_warning"/></topic><topic position="1006,-586" order="2" id="377"><text><![CDATA[Share of innovation production/serivces that goes for export,
@@ -25,15 +25,15 @@ per 1,000 researchers.[licenses/researcher] ]]></text></topic></topic><topic pos
 as a share of the institution's R&D budget]]></text></topic></topic><topic position="945,1019" order="2" text="Industry contracts" id="310"><topic position="1074,953" order="0" text="Industry revenue per staff " id="297"/><topic position="1144,988" order="1" id="305"><text><![CDATA[Foreign contracts: Number of contracts with foreign industria
 l companies at scientific and educational organizations
 per 1,000 researchers [contracts/researchers]]]></text></topic><topic position="1121,1023" order="2" text="Share of industry income from foreign companies" id="307"/><topic position="1119,1054" order="3" id="90"><text><![CDATA[Revenue raised from industry R&D as a fraction
-of total institutional budget (up to a cap)]]></text></topic><topic position="1160,1085" order="4" text="Difficulties faced by research organization in collaborating with SMEs" id="311"/></topic></topic></topic><topic position="700,1152" order="1" text="Private market" id="153"><topic position="876,1112" order="0" text="Number of innovation &amp; IP services organizations" id="154"><note><![CDATA[ (design firms, IP consultants, etc.)]]></note></topic><topic position="893,1139" order="1" text="Number of private innovation infrastructure organizations " id="155"><note><![CDATA[(e.g. accelerators, incubators)]]></note></topic><topic position="885,1166" order="2" text="Access to certification and licensing for specific activities " id="410"/><topic position="912,1193" order="3" text="Access to suppliers of equipment, production and engineering services " id="411"/></topic><topic position="720,1287" order="2" text="Innovation infrastructure" id="114"><topic position="835,1274" order="0" text="Investments" id="327"><topic position="992,1220" order="0" text="Public investment in innovation infrastructure" id="315"/><topic position="1028,1247" order="1" text="Increase of government investment in innovation infrastructure" id="328"/><topic position="1038,1274" order="2" text=" Number of Development institution projects performed in the region" id="339"/><topic position="1005,1301" order="3" text="Volume of seed investments by the regional budget " id="391"/><topic position="1009,1328" order="4" text="Volume of venture financing from the regional budget " id="392"/></topic><topic position="895,1355" order="1" text="Volume of state support per one company " id="413"/></topic></topic></topic></topic><topic position="-275,203" order="3" text="What to do about existing measures" shape="rounded rectagle" id="4" fontStyle=";10;;;;"><note><![CDATA[Understanding which measures should be strengthened, dropped or improved, and how.]]></note><topic position="-495,-48" order="0" text="Demand for measure" shape="rounded rectagle" id="42" bgColor="#feffff"><topic position="-625,-208" order="0" text="Quality of beneficiaries" id="50"><topic position="-832,-288" order="0" text="Growth rates of employment in supported innovative firms" id="292"/><topic position="-832,-261" order="1" text="Growth rates of employment in supported innovative firms" id="293"/><topic position="-778,-234" order="2" text="Role of IP for tenants/clients" id="323"><note><![CDATA[WIPO SURVEY OF INTELLECTUAL PROPERTY SERVICES OF
+of total institutional budget (up to a cap)]]></text></topic><topic position="1160,1085" order="4" text="Difficulties faced by research organization in collaborating with SMEs" id="311"/></topic></topic></topic><topic position="700,1152" order="1" text="Private market" id="153"><topic position="876,1112" order="0" text="Number of innovation &amp; IP services organizations" id="154"><note><![CDATA[ (design firms, IP consultants, etc.)]]></note></topic><topic position="893,1139" order="1" text="Number of private innovation infrastructure organizations " id="155"><note><![CDATA[(e.g. accelerators, incubators)]]></note></topic><topic position="885,1166" order="2" text="Access to certification and licensing for specific activities " id="410"/><topic position="912,1193" order="3" text="Access to suppliers of equipment, production and engineering services " id="411"/></topic><topic position="720,1287" order="2" text="Innovation infrastructure" id="114"><topic position="835,1274" order="0" text="Investments" id="327"><topic position="992,1220" order="0" text="Public investment in innovation infrastructure" id="315"/><topic position="1028,1247" order="1" text="Increase of government investment in innovation infrastructure" id="328"/><topic position="1038,1274" order="2" text=" Number of Development institution projects performed in the region" id="339"/><topic position="1005,1301" order="3" text="Volume of seed investments by the regional budget " id="391"/><topic position="1009,1328" order="4" text="Volume of venture financing from the regional budget " id="392"/></topic><topic position="895,1355" order="1" text="Volume of state support per one company " id="413"/></topic></topic></topic></topic><topic position="-275,203" order="3" text="What to do about existing measures" shape="rounded rectangle" id="4" fontStyle=";10;;;;"><note><![CDATA[Understanding which measures should be strengthened, dropped or improved, and how.]]></note><topic position="-495,-48" order="0" text="Demand for measure" shape="rounded rectangle" id="42" bgColor="#feffff"><topic position="-625,-208" order="0" text="Quality of beneficiaries" id="50"><topic position="-832,-288" order="0" text="Growth rates of employment in supported innovative firms" id="292"/><topic position="-832,-261" order="1" text="Growth rates of employment in supported innovative firms" id="293"/><topic position="-778,-234" order="2" text="Role of IP for tenants/clients" id="323"><note><![CDATA[WIPO SURVEY OF INTELLECTUAL PROPERTY SERVICES OF
 EUROPEAN TECHNOLOGY INCUBATORS]]></note></topic><topic position="-798,-207" order="3" text="Share of tenants with innovation activities" id="326"/><topic position="-824,-172" order="4" id="329"><text><![CDATA[Gazelle tenant: Share of tenants with
 annual revenue growth of more than 20%
  for each of the past four years or since formation [%]]]></text></topic><topic position="-812,-133" order="5" id="330"><text><![CDATA[Globalization of tenants: Median share of tenant
 revenues obtained from exports [%]]]></text></topic></topic><topic position="-626,-61" order="1" text="Number of beneficiaries" id="78"><topic position="-894,-102" order="0" text="Number of projects conducted by companies in cooperation with innovation infrastructure" id="383"/><topic position="-825,-75" order="1" text="Scope and intensity of use of services offered to firms" id="325"/><topic position="-910,-48" order="2" text="Number of companies supported by the infrastructure (training, information, consultations, etc.)" id="384"/><topic position="-934,-21" order="3" text="Increase in the number of business applying for public support programmes (regional, federal, international) " id="401"/></topic><topic position="-613,45" order="2" text="Degree of access" id="182"><topic position="-726,14" order="0" text="Level of awareness" id="52"><topic position="-900,10" order="0" id="181"><text><![CDATA[Perception (opinion poll) of business managers
  regarding public support programmes]]></text></topic></topic><topic position="-714,49" order="1" text="Transparency" id="53"><topic position="-908,45" order="0" id="175"><text><![CDATA[Perception of business managers in terms
  of level of transparency of support measures in the region]]></text><icon id="sign_warning"/></topic></topic><topic position="-814,80" order="2" id="183"><text><![CDATA[Description by regional business managers of the way the
-select and apply for regional and federal support schemes]]></text><icon id="sign_warning"/></topic></topic><topic position="-621,152" order="3" text="Number of applicants" id="176"><topic position="-857,111" order="0" text="Increase in the number of business applying for public support programmes" id="177"/><topic position="-826,138" order="1" text="Number of companies that know about a particular program" id="178"/><topic position="-850,165" order="2" text="Increase in the number of start-ups applying to receive VC investments" id="179"/><topic position="-853,192" order="3" text="Increase in the number of start-ups applying for a place in the incubators" id="180"/></topic></topic><topic position="-491,233" order="1" text="Inputs of measures" shape="rounded rectagle" id="109" bgColor="#feffff"><topic position="-606,219" order="0" text="Qualified staff" id="110"><note><![CDATA[JL: not sure how this would be measured]]></note></topic><topic position="-616,246" order="1" text="Budget per beneficiary" id="111"/></topic><topic position="-502,341" order="2" text="Performance of measure" shape="rounded rectagle" id="48" bgColor="#feffff"><topic position="-649,300" order="0" text="Implementation of measure" shape="line" id="47" bgColor="#feffff"><topic position="-790,273" order="0" text="Target vs. actual KPIs" id="106"/><topic position="-811,300" order="1" text="Intermediate outputs per budget" id="287"/><topic position="-794,327" order="2" text="Qualification of staff" id="372"><icon id="sign_warning"/></topic></topic><topic position="-630,381" order="1" text="Output of measure" id="58"><topic position="-740,354" order="0" text="Opinion surveys" id="101"><topic position="-862,354" order="0" text="Opinions of beneficiaries" id="102"/></topic><topic position="-734,395" order="1" text="Hard metrics" id="103"><topic position="-894,381" order="0" text="Output per headcount (e.g. staff, researchers)" id="289"/><topic position="-842,408" order="1" text="Productivity analysis" id="288"/></topic></topic></topic><topic position="-491,565" order="3" text="Impact of measure" shape="rounded rectagle" id="49" bgColor="#feffff"><topic position="-601,449" order="0" text="Opinion surveys" id="79"><topic position="-762,435" order="0" text="Perception of support impact (opinion polls)" id="294"/><topic position="-828,462" order="1" text="Perception of the activity of regional government by the regional companies " id="404"/></topic><topic position="-595,543" order="1" text="Hard metrics" id="104"><topic position="-764,489" order="0" text="Increase in number of small innovation enterprises " id="331"/><topic position="-842,516" order="1" text="Growth of the total volume of salary in the supported companies (excluding inflation) " id="402"><icon id="sign_warning"/></topic><topic position="-817,543" order="2" text="Growth of the volume of regional taxes paid by the supported companies " id="403"><icon id="sign_warning"/></topic><topic position="-783,570" order="3" text="Growth of the volume of export at the supported companies " id="405"/><topic position="-809,597" order="4" text="Number of new products/projects at the companies that received support " id="406"/></topic><topic position="-608,624" order="2" text="Impact assessment " id="290"/><topic position="-663,655" order="3" id="291"><text><![CDATA[Average leverage of 1rub (there would be
+select and apply for regional and federal support schemes]]></text><icon id="sign_warning"/></topic></topic><topic position="-621,152" order="3" text="Number of applicants" id="176"><topic position="-857,111" order="0" text="Increase in the number of business applying for public support programmes" id="177"/><topic position="-826,138" order="1" text="Number of companies that know about a particular program" id="178"/><topic position="-850,165" order="2" text="Increase in the number of start-ups applying to receive VC investments" id="179"/><topic position="-853,192" order="3" text="Increase in the number of start-ups applying for a place in the incubators" id="180"/></topic></topic><topic position="-491,233" order="1" text="Inputs of measures" shape="rounded rectangle" id="109" bgColor="#feffff"><topic position="-606,219" order="0" text="Qualified staff" id="110"><note><![CDATA[JL: not sure how this would be measured]]></note></topic><topic position="-616,246" order="1" text="Budget per beneficiary" id="111"/></topic><topic position="-502,341" order="2" text="Performance of measure" shape="rounded rectangle" id="48" bgColor="#feffff"><topic position="-649,300" order="0" text="Implementation of measure" shape="line" id="47" bgColor="#feffff"><topic position="-790,273" order="0" text="Target vs. actual KPIs" id="106"/><topic position="-811,300" order="1" text="Intermediate outputs per budget" id="287"/><topic position="-794,327" order="2" text="Qualification of staff" id="372"><icon id="sign_warning"/></topic></topic><topic position="-630,381" order="1" text="Output of measure" id="58"><topic position="-740,354" order="0" text="Opinion surveys" id="101"><topic position="-862,354" order="0" text="Opinions of beneficiaries" id="102"/></topic><topic position="-734,395" order="1" text="Hard metrics" id="103"><topic position="-894,381" order="0" text="Output per headcount (e.g. staff, researchers)" id="289"/><topic position="-842,408" order="1" text="Productivity analysis" id="288"/></topic></topic></topic><topic position="-491,565" order="3" text="Impact of measure" shape="rounded rectangle" id="49" bgColor="#feffff"><topic position="-601,449" order="0" text="Opinion surveys" id="79"><topic position="-762,435" order="0" text="Perception of support impact (opinion polls)" id="294"/><topic position="-828,462" order="1" text="Perception of the activity of regional government by the regional companies " id="404"/></topic><topic position="-595,543" order="1" text="Hard metrics" id="104"><topic position="-764,489" order="0" text="Increase in number of small innovation enterprises " id="331"/><topic position="-842,516" order="1" text="Growth of the total volume of salary in the supported companies (excluding inflation) " id="402"><icon id="sign_warning"/></topic><topic position="-817,543" order="2" text="Growth of the volume of regional taxes paid by the supported companies " id="403"><icon id="sign_warning"/></topic><topic position="-783,570" order="3" text="Growth of the volume of export at the supported companies " id="405"/><topic position="-809,597" order="4" text="Number of new products/projects at the companies that received support " id="406"/></topic><topic position="-608,624" order="2" text="Impact assessment " id="290"/><topic position="-663,655" order="3" id="291"><text><![CDATA[Average leverage of 1rub (there would be
 several programs with different leverage)]]></text><icon id="sign_warning"/></topic><topic position="-687,690" order="4" id="296"><text><![CDATA[Volume of attracted money per one ruble
-of regional budget expenditures on innovation projects]]></text><icon id="sign_warning"/></topic></topic></topic><topic position="288,1687" order="4" text="What investments in innovative projects" shape="rounded rectagle" id="7" fontStyle=";10;;;;"><note><![CDATA[Understanding what investments should be made in innovative projects.]]></note><topic position="518,1673" order="0" text="Competitive niches" shape="rounded rectagle" id="61" bgColor="#feffff"><topic position="632,1521" order="0" text="Clusters behavior" id="59"><topic position="750,1382" order="0" text="Cluster EU star rating" id="60"/><topic position="809,1409" order="1" text="Share of value added of cluster enterprises in GRP" id="318"/><topic position="843,1436" order="2" text="Share of cluster products in the relevant world market segment " id="320"><icon id="sign_warning"/></topic><topic position="803,1463" order="3" text="Share of export in cluster total volume of sales" id="321"/><topic position="830,1490" order="4" text="Growth of the volume of production in the cluster companies" id="379"/><topic position="830,1521" order="5" id="380"><text><![CDATA[Growth of the volume of production in the cluster companies
+of regional budget expenditures on innovation projects]]></text><icon id="sign_warning"/></topic></topic></topic><topic position="288,1687" order="4" text="What investments in innovative projects" shape="rounded rectangle" id="7" fontStyle=";10;;;;"><note><![CDATA[Understanding what investments should be made in innovative projects.]]></note><topic position="518,1673" order="0" text="Competitive niches" shape="rounded rectangle" id="61" bgColor="#feffff"><topic position="632,1521" order="0" text="Clusters behavior" id="59"><topic position="750,1382" order="0" text="Cluster EU star rating" id="60"/><topic position="809,1409" order="1" text="Share of value added of cluster enterprises in GRP" id="318"/><topic position="843,1436" order="2" text="Share of cluster products in the relevant world market segment " id="320"><icon id="sign_warning"/></topic><topic position="803,1463" order="3" text="Share of export in cluster total volume of sales" id="321"/><topic position="830,1490" order="4" text="Growth of the volume of production in the cluster companies" id="379"/><topic position="830,1521" order="5" id="380"><text><![CDATA[Growth of the volume of production in the cluster companies
  to the volume of state support for the cluster]]></text></topic><topic position="830,1552" order="6" text="Growth of the volume of innovation production in the cluster" id="381"/><topic position="887,1579" order="7" text="Share of export in cluster total volume of sales (by zones: US, EU, CIS, other countries) " id="407"/><topic position="741,1633" order="8" text="Internal behavior" id="408"><topic position="870,1606" order="0" text="Median wage in the cluster" id="319"/><topic position="904,1633" order="1" text="Growth of the volume of R&amp;D in the cluster" id="382"/><topic position="857,1660" order="2" text="Cluster collaboration" id="108"/></topic></topic><topic position="606,1700" order="1" text="R&amp;D" id="66"><topic position="678,1687" order="0" text="Patent map" id="65"/><topic position="689,1714" order="1" text="Publications map" id="371"/></topic><topic position="613,1795" order="2" text="Industry" id="67"><topic position="688,1741" order="0" text="FDI map" id="63"/><topic position="695,1768" order="1" text="Gazelle map" id="62"/><topic position="792,1795" order="2" text="Business R&amp;D expenditures as a share of revenues by sector" id="131"/><topic position="765,1822" order="3" text="Share of regional products in the world market" id="378"/><topic position="770,1849" order="4" text="Expenditure on innovation by firm size, by sector " id="414"/></topic><topic position="631,1920" order="3" text="Entrepreneurship" id="72"><topic position="730,1876" order="0" text="Startup map" id="73"/><topic position="755,1903" order="1" text="Venture investment map" id="74"/><topic position="794,1947" order="2" text="Attractiveness to public competitive funding" id="317"><topic position="1004,1930" order="0" text="Fed and regional seed fund investments" id="316"/><topic position="1023,1961" order="1" id="314"><text><![CDATA[FASIE projects: Number of projects supported
-by the FASIE per 1,000 workers [awards/worker] ]]></text></topic></topic></topic></topic><topic position="545,1992" order="1" text="Competitiveness support factors" shape="rounded rectagle" id="64" bgColor="#ffffff"><topic position="716,1992" order="0" text="Private investment in innovation" id="68"/></topic></topic><topic position="-214,749" order="5" text="How to improve image" shape="rounded rectagle" id="69" fontStyle=";10;;;;" bgColor="#e0e5ef"><topic position="-351,735" order="0" text="Rankings" shape="rounded rectagle" id="75" bgColor="#feffff"><topic position="-443,722" order="0" text="macro indicators" id="70"/><topic position="-441,749" order="1" text="meso-indicators" id="71"/></topic><topic position="-395,776" order="1" text="Innovation investment climate" shape="rounded rectagle" id="76" bgColor="#feffff"/></topic></topic><relationship srcTopicId="9" destTopicId="76" lineType="3" srcCtrlPoint="45,123" destCtrlPoint="229,42" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="114" lineType="3" srcCtrlPoint="-58,271" destCtrlPoint="-52,-241" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
+by the FASIE per 1,000 workers [awards/worker] ]]></text></topic></topic></topic></topic><topic position="545,1992" order="1" text="Competitiveness support factors" shape="rounded rectangle" id="64" bgColor="#ffffff"><topic position="716,1992" order="0" text="Private investment in innovation" id="68"/></topic></topic><topic position="-214,749" order="5" text="How to improve image" shape="rounded rectangle" id="69" fontStyle=";10;;;;" bgColor="#e0e5ef"><topic position="-351,735" order="0" text="Rankings" shape="rounded rectangle" id="75" bgColor="#feffff"><topic position="-443,722" order="0" text="macro indicators" id="70"/><topic position="-441,749" order="1" text="meso-indicators" id="71"/></topic><topic position="-395,776" order="1" text="Innovation investment climate" shape="rounded rectangle" id="76" bgColor="#feffff"/></topic></topic><relationship srcTopicId="9" destTopicId="76" lineType="3" srcCtrlPoint="45,123" destCtrlPoint="229,42" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="114" lineType="3" srcCtrlPoint="-58,271" destCtrlPoint="-52,-241" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/cdata-support.wxml b/packages/mindplot/test/unit/export/expected/cdata-support.wxml
index 0a4fa345..fe1172ed 100644
--- a/packages/mindplot/test/unit/export/expected/cdata-support.wxml
+++ b/packages/mindplot/test/unit/export/expected/cdata-support.wxml
@@ -1 +1 @@
-<map name="cdata-support" version="tango"><topic central="true" text="Observation" shape="rectagle" id="1"><note><![CDATA[Always ask ]]></note></topic><topic position="-4,-107" text="Data Analysis" id="29"><note><![CDATA[You always check your data to see if it is correct and then you check it and organize the data that you have to make sure that it is right ]]></note></topic><topic position="-143,-31" text="Organizing Data" id="30"><note><![CDATA[Organize your data when you are doing an experiment ]]></note></topic><topic position="181,-42" text="Questions" id="31"><note><![CDATA[Always ask your self a question when analysis the data it is a good idea to do.]]></note></topic><topic position="-6,46" text="Hypothesis" id="32"><note><![CDATA[You make your hypothesis when you are making your observation.]]></note></topic><topic position="-305,-50" text="Experiment" id="33"><note><![CDATA[Always analysis your data and keep it in order when you are doing an experiment.]]></note></topic><topic position="211,-151" text="Variable" id="34"><note><![CDATA[A major factor that can change the outcome in an experiment.]]></note></topic><topic position="327,-64" text="Independent Variable" id="35"><note><![CDATA[When you change it you the see affect or the aftermath of what happened ]]></note></topic><topic position="-304,14" text="Control Group" id="37"><note><![CDATA[A test That can be compared ]]></note></topic><topic position="323,98" text="Dependent Variable" id="36"><note><![CDATA[Changes the outcome of the other variables]]></note></topic><topic position="-28,141" text="Constant " id="40"><note><![CDATA[Doesnt Change at all maybe once and a while but never that often]]></note></topic><relationship srcTopicId="1" destTopicId="29" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="29" destTopicId="30" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="31" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="32" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="30" destTopicId="33" lineType="3" srcCtrlPoint="-53,0" destCtrlPoint="-20,0" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="29" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="29" destTopicId="31" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="35" lineType="3" srcCtrlPoint="191,-113" destCtrlPoint="-354,-98" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="37" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="34" lineType="3" srcCtrlPoint="-14,-117" destCtrlPoint="-218,-20" endArrow="false" startArrow="true"/><relationship srcTopicId="35" destTopicId="36" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="34" destTopicId="36" lineType="3" srcCtrlPoint="66,43" destCtrlPoint="199,-215" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="40" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
+<map name="cdata-support" version="tango"><topic central="true" text="Observation" shape="rectangle" id="1"><note><![CDATA[Always ask ]]></note></topic><topic position="-4,-107" text="Data Analysis" id="29"><note><![CDATA[You always check your data to see if it is correct and then you check it and organize the data that you have to make sure that it is right ]]></note></topic><topic position="-143,-31" text="Organizing Data" id="30"><note><![CDATA[Organize your data when you are doing an experiment ]]></note></topic><topic position="181,-42" text="Questions" id="31"><note><![CDATA[Always ask your self a question when analysis the data it is a good idea to do.]]></note></topic><topic position="-6,46" text="Hypothesis" id="32"><note><![CDATA[You make your hypothesis when you are making your observation.]]></note></topic><topic position="-305,-50" text="Experiment" id="33"><note><![CDATA[Always analysis your data and keep it in order when you are doing an experiment.]]></note></topic><topic position="211,-151" text="Variable" id="34"><note><![CDATA[A major factor that can change the outcome in an experiment.]]></note></topic><topic position="327,-64" text="Independent Variable" id="35"><note><![CDATA[When you change it you the see affect or the aftermath of what happened ]]></note></topic><topic position="-304,14" text="Control Group" id="37"><note><![CDATA[A test That can be compared ]]></note></topic><topic position="323,98" text="Dependent Variable" id="36"><note><![CDATA[Changes the outcome of the other variables]]></note></topic><topic position="-28,141" text="Constant " id="40"><note><![CDATA[Doesnt Change at all maybe once and a while but never that often]]></note></topic><relationship srcTopicId="1" destTopicId="29" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="29" destTopicId="30" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="31" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="32" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="30" destTopicId="33" lineType="3" srcCtrlPoint="-53,0" destCtrlPoint="-20,0" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="29" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="29" destTopicId="31" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="35" lineType="3" srcCtrlPoint="191,-113" destCtrlPoint="-354,-98" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="37" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="34" lineType="3" srcCtrlPoint="-14,-117" destCtrlPoint="-218,-20" endArrow="false" startArrow="true"/><relationship srcTopicId="35" destTopicId="36" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="34" destTopicId="36" lineType="3" srcCtrlPoint="66,43" destCtrlPoint="199,-215" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="40" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/complex.wxml b/packages/mindplot/test/unit/export/expected/complex.wxml
index 76b3603a..bd33c618 100644
--- a/packages/mindplot/test/unit/export/expected/complex.wxml
+++ b/packages/mindplot/test/unit/export/expected/complex.wxml
@@ -23,7 +23,7 @@ brought recently for "permissions to ask your references about you"
 in the online form so that we don't have to follow up with this
 later.
 
-Attached below a sample of such screening questions]]></note></topic><topic position="1614,-728" order="1" text="Strategy integrated with hiring plan" id="299"><note><![CDATA[Hiring plan should be comprehensive... not Agile or Iterative, in the sense that staff capacity and skill needs should be met within at least a six month plan.  If three Drupal developers are needed, the hiring should be done concurrently to minimize HR costs and time.]]></note></topic></topic><topic position="1477,-700" order="2" text="Strategic Priority 1b: Hiring" id="39"><note><![CDATA[2. Continue to practice our unique Freeform hiring process that balances fit with the Freeform culture and best talent ]]></note></topic><topic position="1487,-647" order="3" text="Strategic Priority 1c: Onboarding" id="41"><note><![CDATA[ ]]></note><topic position="1592,-674" order="0" text="3 Month Onboarding Process" shape="elipse" id="275" bgColor="#adddf0"/><topic position="1570,-650" order="1" text="Tools &amp; Guidelines" id="277"/><topic position="1552,-626" order="2" text="Mentoring" id="276"/></topic><topic position="1484,-569" order="4" text="Strategic Priority 1d: Incentives" id="43"><note><![CDATA[5. Explore incentives - monetary, benefits, fulfilment - needed to encourage top talent to work for and remain working for an NFP]]></note><topic position="1544,-596" order="0" text="Raises" id="274"/><topic position="1548,-572" order="1" text="Benefits" shape="elipse" id="270" bgColor="#adddf0"/><topic position="1577,-548" order="2" text="Rewards Message" id="45"><note><![CDATA[Create a total rewards message to encourage prospective and current employees to understand the full value of working for Freeform]]></note></topic></topic><topic position="1487,-518" order="5" text="Strategic Priority 1e: Offboarding" id="123"><note><![CDATA[Assess and address reasons why talented people leave Freeform]]></note></topic></topic><topic position="726,413" text="Business Development Plan" shape="rounded rectagle" id="156" fontStyle=";;#0d0826;;;" bgColor="#32e36a"><topic position="894,401" order="0" text="Goals" id="164"><topic position="975,422" order="0" text="Increase new clients" id="168"><topic position="1138,409" order="0" text="Academic Research" id="171"/><topic position="1118,433" order="1" id="177"/></topic><topic position="978,488" order="1" text="Support New Products" id="172"><topic position="1125,463" order="0" text="Formulize" id="179"/><topic position="1125,487" order="1" id="180"/><topic position="1125,511" order="2" id="181"/></topic><topic position="966,539" order="2" text="Support CiviCRM" id="255"/><topic position="976,602" order="3" text="Identify Opportunites" id="182"><topic position="1121,565" order="0" id="183"/><topic position="1121,589" order="1" id="184"/><topic position="1121,613" order="2" id="185"/><topic position="1121,637" order="3" id="186"/></topic></topic></topic><topic position="-621,395" text="Hosting NG Plan" shape="rounded rectagle" id="162" fontStyle=";;#0d0826;;;" bgColor="#32e36a"/><topic position="-613,99" text="Freeform IT Plan" shape="rounded rectagle" id="163" bgColor="#52e380"><topic position="-753,68" order="0" text="Fragile" id="17" fontStyle=";;;bold;;"/><topic position="-749,92" order="1" text="Tools" id="259"/><topic position="-760,116" order="2" id="260"/></topic><topic position="-548,-87" text="Project Teams" shape="rounded rectagle" shrink="true" id="9" bgColor="#52e380"><topic position="-668,-142" order="0" text="Projects 1-3" id="13"/><topic position="-668,-118" order="1" text="Projects 4-6" id="14"/><topic position="-672,-94" order="2" text="Projects 7 &amp; 8" id="15"/><topic position="-696,-70" order="3" text="General Work" id="12"/><topic position="-686,-46" order="4" text="Learning Needs Plan" id="11"/></topic><topic position="-532,-250" text="Restructure" shape="rounded rectagle" shrink="true" id="33" bgColor="#52e380"><topic position="-685,-282" order="0" text="Client Centric Process" id="216"/><topic position="-692,-258" order="1" text="Freeform Project Process" id="217"/><topic position="-693,-234" order="2" text="Supportive Systems Plan" id="218"/></topic><topic position="-427,-329" text="Board and C Planning" shape="rounded rectagle" shrink="true" id="208" bgColor="#52e380"><topic position="-614,-384" order="0" text="Mission Statements" id="23"><note><![CDATA[In the absence of one clearly defined mission statement, we have reviewed various expressed mission statement as following
+Attached below a sample of such screening questions]]></note></topic><topic position="1614,-728" order="1" text="Strategy integrated with hiring plan" id="299"><note><![CDATA[Hiring plan should be comprehensive... not Agile or Iterative, in the sense that staff capacity and skill needs should be met within at least a six month plan.  If three Drupal developers are needed, the hiring should be done concurrently to minimize HR costs and time.]]></note></topic></topic><topic position="1477,-700" order="2" text="Strategic Priority 1b: Hiring" id="39"><note><![CDATA[2. Continue to practice our unique Freeform hiring process that balances fit with the Freeform culture and best talent ]]></note></topic><topic position="1487,-647" order="3" text="Strategic Priority 1c: Onboarding" id="41"><note><![CDATA[ ]]></note><topic position="1592,-674" order="0" text="3 Month Onboarding Process" shape="elipse" id="275" bgColor="#adddf0"/><topic position="1570,-650" order="1" text="Tools &amp; Guidelines" id="277"/><topic position="1552,-626" order="2" text="Mentoring" id="276"/></topic><topic position="1484,-569" order="4" text="Strategic Priority 1d: Incentives" id="43"><note><![CDATA[5. Explore incentives - monetary, benefits, fulfilment - needed to encourage top talent to work for and remain working for an NFP]]></note><topic position="1544,-596" order="0" text="Raises" id="274"/><topic position="1548,-572" order="1" text="Benefits" shape="elipse" id="270" bgColor="#adddf0"/><topic position="1577,-548" order="2" text="Rewards Message" id="45"><note><![CDATA[Create a total rewards message to encourage prospective and current employees to understand the full value of working for Freeform]]></note></topic></topic><topic position="1487,-518" order="5" text="Strategic Priority 1e: Offboarding" id="123"><note><![CDATA[Assess and address reasons why talented people leave Freeform]]></note></topic></topic><topic position="726,413" text="Business Development Plan" shape="rounded rectangle" id="156" fontStyle=";;#0d0826;;;" bgColor="#32e36a"><topic position="894,401" order="0" text="Goals" id="164"><topic position="975,422" order="0" text="Increase new clients" id="168"><topic position="1138,409" order="0" text="Academic Research" id="171"/><topic position="1118,433" order="1" id="177"/></topic><topic position="978,488" order="1" text="Support New Products" id="172"><topic position="1125,463" order="0" text="Formulize" id="179"/><topic position="1125,487" order="1" id="180"/><topic position="1125,511" order="2" id="181"/></topic><topic position="966,539" order="2" text="Support CiviCRM" id="255"/><topic position="976,602" order="3" text="Identify Opportunites" id="182"><topic position="1121,565" order="0" id="183"/><topic position="1121,589" order="1" id="184"/><topic position="1121,613" order="2" id="185"/><topic position="1121,637" order="3" id="186"/></topic></topic></topic><topic position="-621,395" text="Hosting NG Plan" shape="rounded rectangle" id="162" fontStyle=";;#0d0826;;;" bgColor="#32e36a"/><topic position="-613,99" text="Freeform IT Plan" shape="rounded rectangle" id="163" bgColor="#52e380"><topic position="-753,68" order="0" text="Fragile" id="17" fontStyle=";;;bold;;"/><topic position="-749,92" order="1" text="Tools" id="259"/><topic position="-760,116" order="2" id="260"/></topic><topic position="-548,-87" text="Project Teams" shape="rounded rectangle" shrink="true" id="9" bgColor="#52e380"><topic position="-668,-142" order="0" text="Projects 1-3" id="13"/><topic position="-668,-118" order="1" text="Projects 4-6" id="14"/><topic position="-672,-94" order="2" text="Projects 7 &amp; 8" id="15"/><topic position="-696,-70" order="3" text="General Work" id="12"/><topic position="-686,-46" order="4" text="Learning Needs Plan" id="11"/></topic><topic position="-532,-250" text="Restructure" shape="rounded rectangle" shrink="true" id="33" bgColor="#52e380"><topic position="-685,-282" order="0" text="Client Centric Process" id="216"/><topic position="-692,-258" order="1" text="Freeform Project Process" id="217"/><topic position="-693,-234" order="2" text="Supportive Systems Plan" id="218"/></topic><topic position="-427,-329" text="Board and C Planning" shape="rounded rectangle" shrink="true" id="208" bgColor="#52e380"><topic position="-614,-384" order="0" text="Mission Statements" id="23"><note><![CDATA[In the absence of one clearly defined mission statement, we have reviewed various expressed mission statement as following
 
     Objects of Incorporation in Letters Patent
         The objects of the Corporation are:To provide solutions that facilitate the effective use of information technology in not-for-profit, non-governmental, and charitable organizations throughout Canada, to support and improve their mission delivery.
@@ -42,7 +42,7 @@ Attached below a sample of such screening questions]]></note></topic><topic posi
     Freeform Solutions Facebook Page
         Mission: Freeform Solutions is a not-for-profit organization (NFP) that helps other NFPs use IT to achieve their organizational goals and better serve their communities.
     The current Freeform Solutions website
-        We started Freeform to help NFPs use IT to achieve their organizational goals and better serve their communities - to support and improve their mission delivery. Our mission is to strengthen the capacity of NFPs and the voluntary sector, and to help build a civil society.]]></note></topic><topic position="-579,-360" order="1" text="Values" id="25"/><topic position="-594,-336" order="2" text="Bylaw Review" id="201"/><topic position="-581,-312" order="3" text="Policies" id="202"/><topic position="-592,-288" order="4" text="Business Plan" id="203"/></topic><topic position="1723,-35" text="Strategy 3: Safety and Wellness" id="91"><note><![CDATA[Strategy # 3: Promote the achievement of safety and wellness in our virtual employee community.]]></note><topic position="1995,-81" order="0" text="Strategic Priority 3a: H&amp;S Policies &amp; Practices" shrink="true" id="108"><note><![CDATA[Continuing improvement in Health and Safety policies and practices & compliance with OHSC legislation]]></note><topic position="1948,-83" order="0" id="198"/></topic><topic position="1984,-38" order="1" text="Strategic Priority 3b: Health Promotion" id="110"><note><![CDATA[Promoting safety, work-life balance, self-care, ergonomics and other factors for wellness and productivity in a virtual workplace environment]]></note><topic position="2003,-51" order="0" text="Health and Wellness Committee" id="195"><note><![CDATA[The Freeform H&S rep will lead a Health and Wellness Committee to  responsible for recognizing health and safety concerns and identifying solutions.]]></note></topic><topic position="1992,-27" order="1" text="Work-life Balance Initiative" id="197"><link url="http://hrcouncil.ca/hr-toolkit/workplaces-health-safety.cfm" urlType="url"/></topic></topic><topic position="1933,0" order="2" text="So that..." id="106"><icon id="object_rainbow"/><note><![CDATA[(So that... our employees remain well and safe, So that... they are highly competent and can work well in agile teams and feel fulfilled and self actualized... So that we can so the best work possible, for the least cost, in the shortest time for other NFPs, So that... NFPs can help those who need it.)]]></note></topic></topic><topic position="2267,-485" text="Benefits" shape="elipse" id="130" bgColor="#c2eaf0"><note><![CDATA[As Freeform Employees we will have benefits reviewed in light of our priorities and cost to Freeform]]></note><topic position="2419,-579" order="0" text="As Freeform Staff" id="144"><icon id="people_group"/></topic><topic position="2421,-553" order="1" text="Responsibility: HZ, JC" id="131"/><topic position="2403,-527" order="2" text="Release 3" id="141"><icon id="time_calendar"/></topic><topic position="2514,-503" order="3" text="Have Heather create list benefits against Best Practice &amp; cost" shape="rounded rectagle" id="132"><icon id="tick_tick"/></topic><topic position="2430,-479" order="4" text="Have Jason  review list" id="133"><icon id="tag_green"/></topic><topic position="2449,-455" order="5" text="Have JC &amp; HZ consult with staff" id="134"><icon id="tag_orange"/></topic><topic position="2453,-431" order="6" text="Have best benefits we can afford" id="140"><icon id="tag_red"/></topic><topic position="2408,-407" order="7" text="So that..." id="142"><icon id="object_rainbow"/><note><![CDATA[ so that our efforts to excel are rewarded.]]></note></topic></topic><topic position="607,-489" text="Community Outreach Plan" shape="rounded rectagle" id="248" fontStyle=";8;;bold;;" bgColor="#51e898"><topic position="775,-545" order="0" text="Goals" id="285"/><topic position="770,-521" order="1" text="CSI" id="249"/><topic position="802,-497" order="2" text="Drupal Community" id="250"/><topic position="780,-473" order="3" text="CiviCRM" id="251"/><topic position="774,-449" order="4" text="Other" id="252"/></topic><topic position="469,-596" text="Backlog Plan" shape="rounded rectagle" id="215" fontStyle=";;;bold;;" bgColor="#2ee668"><link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit" urlType="url"/><topic position="645,-605" order="0" text="Go To Backlog Plan " shape="rectagle" id="286" bgColor="#e8da6d"><icon id="funy_glasses"/><link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit" urlType="url"/></topic></topic><topic position="1460,394" text="Strategy Prospecting" id="167"><topic position="1617,372" order="0" id="170"/><topic position="1617,396" order="1" id="175"/><topic position="1617,420" order="2" id="176"/></topic><topic position="1459,314" text="Stategies:  Forecasting" id="166"><topic position="1620,292" order="0" id="169"/><topic position="1620,316" order="1" id="173"/><topic position="1620,340" order="2" id="174"/></topic><topic position="1461,480" text="Strategies Marketing" id="2" fontStyle=";;;normal;;"/><topic position="-460,698" id="267"/><topic position="1867,-359" text="Exit Interviews" shape="elipse" id="220" fontStyle=";6;;;;"><topic position="2010,-416" order="0" text="As Freeform" id="232"><icon id="people_group"/></topic><topic position="2022,-392" order="1" text="Responsiblity: HZ, KS" id="233"/><topic position="2001,-368" order="2" text="Release" id="234"><icon id="time_hourglass"/></topic><topic position="2100,-344" order="3" text="Have Heather write procedures for exit interview process" id="235"/><topic position="2006,-320" order="4" text="So that" id="236"><icon id="object_rainbow"/><note><![CDATA[We learn from our mistakes and missed opportunities in future with the goal of keeping the best talent.]]></note></topic></topic><topic position="2250,-634" text="3 Month Onboarding Process" shape="elipse" id="298" bgColor="#adddf0"/><topic position="558,-26" text="Human Resources Plan" shape="rounded rectagle" id="6" fontStyle=";;#0d0826;bold;;" bgColor="#32e36a"><topic position="694,-284" order="0" text="Related Org Objectives" id="287" fontStyle=";;;bold;;"><topic position="772,-321" order="0" text="1" id="288"><note><![CDATA[Attract, build and retain a motivated, agile, knowledgeable team of Top Talent that loves to “come” to work]]></note></topic><topic position="772,-297" order="1" text="2" id="289"><note><![CDATA[Maintain level of human resource capacity and skill to meet planned growth and client contractual commitments]]></note></topic><topic position="772,-273" order="2" text="3" id="290"><note><![CDATA[Conform to all legislated requirements]]></note></topic><topic position="772,-249" order="3" text="4" id="291"><note><![CDATA[Minimize and mitigate risk to the organization]]></note></topic></topic><topic position="695,-221" order="1" text="Related Documents" id="294" fontStyle=";;;bold;;"><note><![CDATA[MIssion, Values, Principles, Org Business Plan, Human Resources Policy Manual]]></note></topic><topic position="663,29" order="2" text="Goals" id="30" fontStyle=";;;bold;;"><topic position="844,-153" order="0" text="Goal:Staff=Optimal Bus. Growth" id="104"><icon id="sport_football"/><note><![CDATA[Human resource capacity will remain at a level to  meet planned growth growth objectives and client contractual commitments]]></note><topic position="1030,-193" order="0" text="So that..." id="124"><icon id="object_rainbow"/></topic><topic position="1062,-169" order="1" text="Related Strategic Priorities: " id="125"/><topic position="1090,-145" order="2" text="KPI: HR Level equals Planned Growth" id="126"><icon id="chart_bar"/></topic><topic position="1038,-118" order="3" text="Methodology" id="99"><note><![CDATA[Schedule of required HR capacity vs. actual HR capacity.  Variance + or - 1]]></note><topic position="1172,-119" order="0" text="Target" id="100"><note><![CDATA[= + or - 1]]></note></topic></topic></topic><topic position="835,-38" order="1" text="Goal: Increase Job Satisfaction" id="49"><icon id="sport_football"/><topic position="1016,-85" order="0" text="So That" id="59"><icon id="object_rainbow"/><note><![CDATA[    Establish better relationships.
+        We started Freeform to help NFPs use IT to achieve their organizational goals and better serve their communities - to support and improve their mission delivery. Our mission is to strengthen the capacity of NFPs and the voluntary sector, and to help build a civil society.]]></note></topic><topic position="-579,-360" order="1" text="Values" id="25"/><topic position="-594,-336" order="2" text="Bylaw Review" id="201"/><topic position="-581,-312" order="3" text="Policies" id="202"/><topic position="-592,-288" order="4" text="Business Plan" id="203"/></topic><topic position="1723,-35" text="Strategy 3: Safety and Wellness" id="91"><note><![CDATA[Strategy # 3: Promote the achievement of safety and wellness in our virtual employee community.]]></note><topic position="1995,-81" order="0" text="Strategic Priority 3a: H&amp;S Policies &amp; Practices" shrink="true" id="108"><note><![CDATA[Continuing improvement in Health and Safety policies and practices & compliance with OHSC legislation]]></note><topic position="1948,-83" order="0" id="198"/></topic><topic position="1984,-38" order="1" text="Strategic Priority 3b: Health Promotion" id="110"><note><![CDATA[Promoting safety, work-life balance, self-care, ergonomics and other factors for wellness and productivity in a virtual workplace environment]]></note><topic position="2003,-51" order="0" text="Health and Wellness Committee" id="195"><note><![CDATA[The Freeform H&S rep will lead a Health and Wellness Committee to  responsible for recognizing health and safety concerns and identifying solutions.]]></note></topic><topic position="1992,-27" order="1" text="Work-life Balance Initiative" id="197"><link url="http://hrcouncil.ca/hr-toolkit/workplaces-health-safety.cfm" urlType="url"/></topic></topic><topic position="1933,0" order="2" text="So that..." id="106"><icon id="object_rainbow"/><note><![CDATA[(So that... our employees remain well and safe, So that... they are highly competent and can work well in agile teams and feel fulfilled and self actualized... So that we can so the best work possible, for the least cost, in the shortest time for other NFPs, So that... NFPs can help those who need it.)]]></note></topic></topic><topic position="2267,-485" text="Benefits" shape="elipse" id="130" bgColor="#c2eaf0"><note><![CDATA[As Freeform Employees we will have benefits reviewed in light of our priorities and cost to Freeform]]></note><topic position="2419,-579" order="0" text="As Freeform Staff" id="144"><icon id="people_group"/></topic><topic position="2421,-553" order="1" text="Responsibility: HZ, JC" id="131"/><topic position="2403,-527" order="2" text="Release 3" id="141"><icon id="time_calendar"/></topic><topic position="2514,-503" order="3" text="Have Heather create list benefits against Best Practice &amp; cost" shape="rounded rectangle" id="132"><icon id="tick_tick"/></topic><topic position="2430,-479" order="4" text="Have Jason  review list" id="133"><icon id="tag_green"/></topic><topic position="2449,-455" order="5" text="Have JC &amp; HZ consult with staff" id="134"><icon id="tag_orange"/></topic><topic position="2453,-431" order="6" text="Have best benefits we can afford" id="140"><icon id="tag_red"/></topic><topic position="2408,-407" order="7" text="So that..." id="142"><icon id="object_rainbow"/><note><![CDATA[ so that our efforts to excel are rewarded.]]></note></topic></topic><topic position="607,-489" text="Community Outreach Plan" shape="rounded rectangle" id="248" fontStyle=";8;;bold;;" bgColor="#51e898"><topic position="775,-545" order="0" text="Goals" id="285"/><topic position="770,-521" order="1" text="CSI" id="249"/><topic position="802,-497" order="2" text="Drupal Community" id="250"/><topic position="780,-473" order="3" text="CiviCRM" id="251"/><topic position="774,-449" order="4" text="Other" id="252"/></topic><topic position="469,-596" text="Backlog Plan" shape="rounded rectangle" id="215" fontStyle=";;;bold;;" bgColor="#2ee668"><link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit" urlType="url"/><topic position="645,-605" order="0" text="Go To Backlog Plan " shape="rectangle" id="286" bgColor="#e8da6d"><icon id="funy_glasses"/><link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit" urlType="url"/></topic></topic><topic position="1460,394" text="Strategy Prospecting" id="167"><topic position="1617,372" order="0" id="170"/><topic position="1617,396" order="1" id="175"/><topic position="1617,420" order="2" id="176"/></topic><topic position="1459,314" text="Stategies:  Forecasting" id="166"><topic position="1620,292" order="0" id="169"/><topic position="1620,316" order="1" id="173"/><topic position="1620,340" order="2" id="174"/></topic><topic position="1461,480" text="Strategies Marketing" id="2" fontStyle=";;;normal;;"/><topic position="-460,698" id="267"/><topic position="1867,-359" text="Exit Interviews" shape="elipse" id="220" fontStyle=";6;;;;"><topic position="2010,-416" order="0" text="As Freeform" id="232"><icon id="people_group"/></topic><topic position="2022,-392" order="1" text="Responsiblity: HZ, KS" id="233"/><topic position="2001,-368" order="2" text="Release" id="234"><icon id="time_hourglass"/></topic><topic position="2100,-344" order="3" text="Have Heather write procedures for exit interview process" id="235"/><topic position="2006,-320" order="4" text="So that" id="236"><icon id="object_rainbow"/><note><![CDATA[We learn from our mistakes and missed opportunities in future with the goal of keeping the best talent.]]></note></topic></topic><topic position="2250,-634" text="3 Month Onboarding Process" shape="elipse" id="298" bgColor="#adddf0"/><topic position="558,-26" text="Human Resources Plan" shape="rounded rectangle" id="6" fontStyle=";;#0d0826;bold;;" bgColor="#32e36a"><topic position="694,-284" order="0" text="Related Org Objectives" id="287" fontStyle=";;;bold;;"><topic position="772,-321" order="0" text="1" id="288"><note><![CDATA[Attract, build and retain a motivated, agile, knowledgeable team of Top Talent that loves to “come” to work]]></note></topic><topic position="772,-297" order="1" text="2" id="289"><note><![CDATA[Maintain level of human resource capacity and skill to meet planned growth and client contractual commitments]]></note></topic><topic position="772,-273" order="2" text="3" id="290"><note><![CDATA[Conform to all legislated requirements]]></note></topic><topic position="772,-249" order="3" text="4" id="291"><note><![CDATA[Minimize and mitigate risk to the organization]]></note></topic></topic><topic position="695,-221" order="1" text="Related Documents" id="294" fontStyle=";;;bold;;"><note><![CDATA[MIssion, Values, Principles, Org Business Plan, Human Resources Policy Manual]]></note></topic><topic position="663,29" order="2" text="Goals" id="30" fontStyle=";;;bold;;"><topic position="844,-153" order="0" text="Goal:Staff=Optimal Bus. Growth" id="104"><icon id="sport_football"/><note><![CDATA[Human resource capacity will remain at a level to  meet planned growth growth objectives and client contractual commitments]]></note><topic position="1030,-193" order="0" text="So that..." id="124"><icon id="object_rainbow"/></topic><topic position="1062,-169" order="1" text="Related Strategic Priorities: " id="125"/><topic position="1090,-145" order="2" text="KPI: HR Level equals Planned Growth" id="126"><icon id="chart_bar"/></topic><topic position="1038,-118" order="3" text="Methodology" id="99"><note><![CDATA[Schedule of required HR capacity vs. actual HR capacity.  Variance + or - 1]]></note><topic position="1172,-119" order="0" text="Target" id="100"><note><![CDATA[= + or - 1]]></note></topic></topic></topic><topic position="835,-38" order="1" text="Goal: Increase Job Satisfaction" id="49"><icon id="sport_football"/><topic position="1016,-85" order="0" text="So That" id="59"><icon id="object_rainbow"/><note><![CDATA[    Establish better relationships.
     Identify with the new employer.
     Build a great attitude with the company.]]></note></topic><topic position="1043,-57" order="1" text="Related Strategic Priorities" shrink="true" id="86"><topic position="1199,-59" order="0" id="90"/></topic><topic position="1051,-26" order="2" text="KPI: Employee Satisfaction" id="50"><icon id="chart_bar"/><topic position="1214,-27" order="0" id="303"/></topic><topic position="1021,4" order="3" text="Methodology" id="128"><note><![CDATA[Percentage of improvement in employee reported job satisfaction based on survey vs previous year.  Base level to be established in first year. ]]></note><topic position="1155,3" order="0" text="Target" id="129"><note><![CDATA[Base level 1st  year]]></note></topic></topic></topic><topic position="834,77" order="2" text="Goal: Improve Performance" id="51"><icon id="sport_football"/><note><![CDATA[To increase knowledge, skills and experience of the Freeform staff relevant to organizational priorities.]]></note><topic position="1013,37" order="0" text="So That" id="60"><icon id="object_rainbow"/><note><![CDATA[    Clarify expectations.
     Understand values and priorities.
diff --git a/packages/mindplot/test/unit/export/expected/emptyNodes.wxml b/packages/mindplot/test/unit/export/expected/emptyNodes.wxml
index f912b839..923cb2e4 100644
--- a/packages/mindplot/test/unit/export/expected/emptyNodes.wxml
+++ b/packages/mindplot/test/unit/export/expected/emptyNodes.wxml
@@ -1 +1 @@
-<map name="emptyNodes" version="tango"><topic central="true" text="" shape="rounded rectagle" id="0" fontStyle="Arial;16;#0000cc;bold;;" bgColor="#ffcc33" brColor="#808080"><note><![CDATA[ ]]></note><topic position="200,0" order="0" text="objectifs journée" shape="rounded rectagle" id="1" fontStyle="Arial;16;#0000cc;bold;;" bgColor="#ffcc33" brColor="#808080"><topic position="290,-50" order="0" text="&quot;business plan&quot; associatif ?" shape="rounded rectagle" id="2" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"/><topic position="290,-25" order="1" text="modèle / activités responsabilités" shape="rounded rectagle" id="3" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"/><topic position="290,0" order="2" text="articulations / LOG" shape="rounded rectagle" id="4" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"/></topic><topic position="200,100" order="4" text="SWOT" shape="rounded rectagle" id="5" fontStyle="Arial;16;#0000cc;bold;;" bgColor="#ffcc33" brColor="#808080"><topic position="290,50" order="0" text="" shape="rounded rectagle" id="6" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"><topic position="380,-375" order="0" text="l'entreprise a aujourd'hui un potentiel important" shape="line" id="7"><topic position="470,-400" order="0" text="compétences professionnel" shape="line" id="8"/><topic position="470,-375" order="1" text="citoyen" shape="line" id="9"/><topic position="470,-350" order="2" text="forte chance de réussite" shape="line" id="10"/></topic><topic position="380,-350" order="1" text="apporter des idées et propsitions à des questions sociétales" shape="line" id="11"/><topic position="380,-325" order="2" text="notre manière d&quot;y répondre avec notamment les technlogies" shape="line" id="12"/><topic position="380,-300" order="3" text="l'opportunité et la demande sont fortes aujourd'hui, avec peu de &quot;concurrence&quot;" shape="line" id="13"/><topic position="380,-275" order="4" text="ensemble de ressources &quot;rares&quot;" shape="line" id="14"/><topic position="380,-250" order="5" text="capacités de recherche et innovation" shape="line" id="15"/><topic position="380,-225" order="6" text="motivation du groupe et sens partagé entre membres" shape="line" id="16"/><topic position="380,-200" order="7" text="professionnellement : expérience collective et partage d'outils en pratique" shape="line" id="17"/><topic position="380,-175" order="8" text="ouverture vers mode de vie attractif perso / pro" shape="line" id="18"/><topic position="380,-150" order="9" text="potentiel humain, humaniste et citoyen" shape="line" id="19"/><topic position="380,-125" order="10" text="assemblage entre atelier et outillage" shape="line" id="20"/><topic position="380,-100" order="11" text="capacité de réponder en local et en global" shape="line" id="21"/><topic position="380,-75" order="12" text="associatif : contxte de crise multimorphologique / positionne référence en réflexion et usages" shape="line" id="22"/><topic position="380,-50" order="13" text="réseau régional et mondial de l'économie de la ,connaisance" shape="line" id="23"/><topic position="380,-25" order="14" text="asso prend pied dans le monde de la recherche" shape="line" id="24"/><topic position="380,0" order="15" text="labo de l'innovation sociopolitique" shape="line" id="25"/><topic position="380,25" order="16" text="acteur valable avec pouvoirs et acteurs en place" shape="line" id="26"/><topic position="380,50" order="17" text="autonomie par prestations et services" shape="line" id="27"/><topic position="380,75" order="18" text="triptique" shape="line" id="28"><topic position="470,50" order="0" text="éthique de la discussion" shape="line" id="29"/><topic position="470,75" order="1" text="pari de la délégation" shape="line" id="30"/><topic position="470,100" order="2" text="art de la décision" shape="line" id="31"/></topic><topic position="380,100" order="19" text="réussir à caler leprojet en adéquation avec le contexte actuel" shape="line" id="32"/><topic position="380,125" order="20" text="assoc : grouper des personnes qui développent le concept" shape="line" id="33"/><topic position="380,150" order="21" text="traduire les belles pensées au niveau du citoyen" shape="line" id="34"><topic position="470,125" order="0" text="compréhension" shape="line" id="35"/><topic position="470,150" order="1" text="adhésion" shape="line" id="36"/></topic><topic position="380,175" order="22" text="ressources contributeurs réfréents" shape="line" id="37"/><topic position="380,200" order="23" text="reconnaissance et référence exemplaires" shape="line" id="38"/><topic position="380,225" order="24" text="financeements suffisants pour bien exister" shape="line" id="39"/><topic position="380,250" order="25" text="notre organisation est claire" shape="line" id="40"/><topic position="380,275" order="26" text="prendre des &quot;marchés émergent&quot;" shape="line" id="41"/><topic position="380,300" order="27" text="double stratup avec succes-story" shape="line" id="42"/><topic position="380,325" order="28" text="engageons une activité présentielle forte, conviviale et exemplaire" shape="line" id="43"/><topic position="380,350" order="29" text="attirer de nouveaux membres locomotives" shape="line" id="44"/><topic position="380,375" order="30" text="pratiquons en interne et externe une gouvernance explaire etune citoyennté de rêve" shape="line" id="45"/></topic><topic position="290,75" order="1" text="Risques : cauchemars, dangers" shape="rounded rectagle" id="46" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"><topic position="380,-225" order="0" text="disparition des forces vives, départ de membres actuels" shape="line" id="47"/><topic position="380,-200" order="1" text="opportunités atteignables mais difficile" shape="line" id="48"/><topic position="380,-175" order="2" text="difficultés de travailler ensemble dans la durée" shape="line" id="49"/><topic position="380,-150" order="3" text="risque de rater le train" shape="line" id="50"/><topic position="380,-125" order="4" text="sauter dans le dernier wagon et rester à la traîne" shape="line" id="51"/><topic position="380,-100" order="5" text="manquer de professionnalisme" shape="line" id="52"><topic position="470,-100" order="0" text="perte de crédibilité" shape="line" id="53"/></topic><topic position="380,-75" order="6" text="s'isoler entre nous et perdre le contact avec les autres acteurs" shape="line" id="54"/><topic position="380,-50" order="7" text="perdre la capacité de réponse au global" shape="line" id="55"/><topic position="380,-25" order="8" text="manque de concret, surdimension des reflexions" shape="line" id="56"/><topic position="380,0" order="9" text="manque d'utilité socioplolitique" shape="line" id="57"/><topic position="380,25" order="10" text="manque de nouveaux membres actifs, fidéliser" shape="line" id="58"/><topic position="380,50" order="11" text="faire du surplace et" shape="line" id="59"><topic position="470,25" order="0" text="manque innovation" shape="line" id="60"/><topic position="470,50" order="1" text="" shape="line" id="61"/></topic><topic position="380,75" order="12" text="ne pas vivre ce que nous affirmons" shape="line" id="62"><topic position="470,75" order="0" text="cohérence entre  langage gouvernance et la pratique" shape="line" id="63"/></topic><topic position="380,100" order="13" text="groupe de base insuffisant" shape="line" id="64"/><topic position="380,125" order="14" text="non attractifs / nouveaux" shape="line" id="65"><topic position="470,125" order="0" text="pas ennuyants" shape="line" id="66"/></topic><topic position="380,150" order="15" text="pas efficaces en com" shape="line" id="67"/><topic position="380,175" order="16" text="trop lent, rater l'opportunité actuelle" shape="line" id="68"/><topic position="380,200" order="17" text="débordés par &quot;concurrences&quot;" shape="line" id="69"/><topic position="380,225" order="18" text="départs de didier, micvhel, rené, corinne MCD etc" shape="line" id="70"/><topic position="380,250" order="19" text="conclits de personnes et schisme entre 2 groupes ennemis" shape="line" id="71"/><topic position="380,275" order="20" text="groupe amicale mais très merdique" shape="line" id="72"/><topic position="380,300" order="21" text="système autocratique despotique ou sectaire" shape="line" id="73"/><topic position="380,325" order="22" text="" shape="line" id="74"/></topic></topic></topic></map>
\ No newline at end of file
+<map name="emptyNodes" version="tango"><topic central="true" text="" shape="rounded rectangle" id="0" fontStyle="Arial;16;#0000cc;bold;;" bgColor="#ffcc33" brColor="#808080"><note><![CDATA[ ]]></note><topic position="200,0" order="0" text="objectifs journée" shape="rounded rectangle" id="1" fontStyle="Arial;16;#0000cc;bold;;" bgColor="#ffcc33" brColor="#808080"><topic position="290,-50" order="0" text="&quot;business plan&quot; associatif ?" shape="rounded rectangle" id="2" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"/><topic position="290,-25" order="1" text="modèle / activités responsabilités" shape="rounded rectangle" id="3" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"/><topic position="290,0" order="2" text="articulations / LOG" shape="rounded rectangle" id="4" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"/></topic><topic position="200,100" order="4" text="SWOT" shape="rounded rectangle" id="5" fontStyle="Arial;16;#0000cc;bold;;" bgColor="#ffcc33" brColor="#808080"><topic position="290,50" order="0" text="" shape="rounded rectangle" id="6" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"><topic position="380,-375" order="0" text="l'entreprise a aujourd'hui un potentiel important" shape="line" id="7"><topic position="470,-400" order="0" text="compétences professionnel" shape="line" id="8"/><topic position="470,-375" order="1" text="citoyen" shape="line" id="9"/><topic position="470,-350" order="2" text="forte chance de réussite" shape="line" id="10"/></topic><topic position="380,-350" order="1" text="apporter des idées et propsitions à des questions sociétales" shape="line" id="11"/><topic position="380,-325" order="2" text="notre manière d&quot;y répondre avec notamment les technlogies" shape="line" id="12"/><topic position="380,-300" order="3" text="l'opportunité et la demande sont fortes aujourd'hui, avec peu de &quot;concurrence&quot;" shape="line" id="13"/><topic position="380,-275" order="4" text="ensemble de ressources &quot;rares&quot;" shape="line" id="14"/><topic position="380,-250" order="5" text="capacités de recherche et innovation" shape="line" id="15"/><topic position="380,-225" order="6" text="motivation du groupe et sens partagé entre membres" shape="line" id="16"/><topic position="380,-200" order="7" text="professionnellement : expérience collective et partage d'outils en pratique" shape="line" id="17"/><topic position="380,-175" order="8" text="ouverture vers mode de vie attractif perso / pro" shape="line" id="18"/><topic position="380,-150" order="9" text="potentiel humain, humaniste et citoyen" shape="line" id="19"/><topic position="380,-125" order="10" text="assemblage entre atelier et outillage" shape="line" id="20"/><topic position="380,-100" order="11" text="capacité de réponder en local et en global" shape="line" id="21"/><topic position="380,-75" order="12" text="associatif : contxte de crise multimorphologique / positionne référence en réflexion et usages" shape="line" id="22"/><topic position="380,-50" order="13" text="réseau régional et mondial de l'économie de la ,connaisance" shape="line" id="23"/><topic position="380,-25" order="14" text="asso prend pied dans le monde de la recherche" shape="line" id="24"/><topic position="380,0" order="15" text="labo de l'innovation sociopolitique" shape="line" id="25"/><topic position="380,25" order="16" text="acteur valable avec pouvoirs et acteurs en place" shape="line" id="26"/><topic position="380,50" order="17" text="autonomie par prestations et services" shape="line" id="27"/><topic position="380,75" order="18" text="triptique" shape="line" id="28"><topic position="470,50" order="0" text="éthique de la discussion" shape="line" id="29"/><topic position="470,75" order="1" text="pari de la délégation" shape="line" id="30"/><topic position="470,100" order="2" text="art de la décision" shape="line" id="31"/></topic><topic position="380,100" order="19" text="réussir à caler leprojet en adéquation avec le contexte actuel" shape="line" id="32"/><topic position="380,125" order="20" text="assoc : grouper des personnes qui développent le concept" shape="line" id="33"/><topic position="380,150" order="21" text="traduire les belles pensées au niveau du citoyen" shape="line" id="34"><topic position="470,125" order="0" text="compréhension" shape="line" id="35"/><topic position="470,150" order="1" text="adhésion" shape="line" id="36"/></topic><topic position="380,175" order="22" text="ressources contributeurs réfréents" shape="line" id="37"/><topic position="380,200" order="23" text="reconnaissance et référence exemplaires" shape="line" id="38"/><topic position="380,225" order="24" text="financeements suffisants pour bien exister" shape="line" id="39"/><topic position="380,250" order="25" text="notre organisation est claire" shape="line" id="40"/><topic position="380,275" order="26" text="prendre des &quot;marchés émergent&quot;" shape="line" id="41"/><topic position="380,300" order="27" text="double stratup avec succes-story" shape="line" id="42"/><topic position="380,325" order="28" text="engageons une activité présentielle forte, conviviale et exemplaire" shape="line" id="43"/><topic position="380,350" order="29" text="attirer de nouveaux membres locomotives" shape="line" id="44"/><topic position="380,375" order="30" text="pratiquons en interne et externe une gouvernance explaire etune citoyennté de rêve" shape="line" id="45"/></topic><topic position="290,75" order="1" text="Risques : cauchemars, dangers" shape="rounded rectangle" id="46" fontStyle="Arial;14;#0000cc;bold;;" bgColor="#ffff33" brColor="#808080"><topic position="380,-225" order="0" text="disparition des forces vives, départ de membres actuels" shape="line" id="47"/><topic position="380,-200" order="1" text="opportunités atteignables mais difficile" shape="line" id="48"/><topic position="380,-175" order="2" text="difficultés de travailler ensemble dans la durée" shape="line" id="49"/><topic position="380,-150" order="3" text="risque de rater le train" shape="line" id="50"/><topic position="380,-125" order="4" text="sauter dans le dernier wagon et rester à la traîne" shape="line" id="51"/><topic position="380,-100" order="5" text="manquer de professionnalisme" shape="line" id="52"><topic position="470,-100" order="0" text="perte de crédibilité" shape="line" id="53"/></topic><topic position="380,-75" order="6" text="s'isoler entre nous et perdre le contact avec les autres acteurs" shape="line" id="54"/><topic position="380,-50" order="7" text="perdre la capacité de réponse au global" shape="line" id="55"/><topic position="380,-25" order="8" text="manque de concret, surdimension des reflexions" shape="line" id="56"/><topic position="380,0" order="9" text="manque d'utilité socioplolitique" shape="line" id="57"/><topic position="380,25" order="10" text="manque de nouveaux membres actifs, fidéliser" shape="line" id="58"/><topic position="380,50" order="11" text="faire du surplace et" shape="line" id="59"><topic position="470,25" order="0" text="manque innovation" shape="line" id="60"/><topic position="470,50" order="1" text="" shape="line" id="61"/></topic><topic position="380,75" order="12" text="ne pas vivre ce que nous affirmons" shape="line" id="62"><topic position="470,75" order="0" text="cohérence entre  langage gouvernance et la pratique" shape="line" id="63"/></topic><topic position="380,100" order="13" text="groupe de base insuffisant" shape="line" id="64"/><topic position="380,125" order="14" text="non attractifs / nouveaux" shape="line" id="65"><topic position="470,125" order="0" text="pas ennuyants" shape="line" id="66"/></topic><topic position="380,150" order="15" text="pas efficaces en com" shape="line" id="67"/><topic position="380,175" order="16" text="trop lent, rater l'opportunité actuelle" shape="line" id="68"/><topic position="380,200" order="17" text="débordés par &quot;concurrences&quot;" shape="line" id="69"/><topic position="380,225" order="18" text="départs de didier, micvhel, rené, corinne MCD etc" shape="line" id="70"/><topic position="380,250" order="19" text="conclits de personnes et schisme entre 2 groupes ennemis" shape="line" id="71"/><topic position="380,275" order="20" text="groupe amicale mais très merdique" shape="line" id="72"/><topic position="380,300" order="21" text="système autocratique despotique ou sectaire" shape="line" id="73"/><topic position="380,325" order="22" text="" shape="line" id="74"/></topic></topic></topic></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/enc.mm b/packages/mindplot/test/unit/export/expected/enc.mm
index 75ceef6b..7859f6c6 100644
--- a/packages/mindplot/test/unit/export/expected/enc.mm
+++ b/packages/mindplot/test/unit/export/expected/enc.mm
@@ -1,6 +1,6 @@
 <map version="1.0.1">
     <node ID="ID_1" TEXT="Artigos GF comentários interessantes">
-        <node ID="ID_5" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#cccccc" TEXT="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities">
+        <node ID="ID_5" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#cccccc" TEXT="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities">
             <edge COLOR="#cccccc"/>
             <node ID="ID_6" POSITION="left" STYLE="fork">
                 <richcontent TYPE="NODE">
@@ -84,7 +84,7 @@
                 </richcontent>
             </node>
         </node>
-        <node ID="ID_17" POSITION="right" STYLE="rectagle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Chazdon 2010. Biotropica. 42(1): 31–40">
+        <node ID="ID_17" POSITION="right" STYLE="rectangle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Chazdon 2010. Biotropica. 42(1): 31–40">
             <edge COLOR="#cccccc"/>
             <node ID="ID_24" POSITION="right" STYLE="fork" TEXT="Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis. "/>
             <node ID="ID_22" POSITION="right" STYLE="fork">
@@ -206,7 +206,7 @@
                 </richcontent>
             </node>
         </node>
-        <node ID="ID_2" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Poorter 1999. Functional Ecology. 13:396-410">
+        <node ID="ID_2" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Poorter 1999. Functional Ecology. 13:396-410">
             <edge COLOR="#cccccc"/>
             <node ID="ID_3" POSITION="left" STYLE="fork" TEXT="Espécies pioneiras crescem mais rápido do que as não pioneiras">
                 <node ID="ID_4" POSITION="left" STYLE="fork" TEXT="Tolerância a sombra está relacionada com persistência e não com crescimento"/>
diff --git a/packages/mindplot/test/unit/export/expected/enc.wxml b/packages/mindplot/test/unit/export/expected/enc.wxml
index 8194da80..0fa1fb27 100644
--- a/packages/mindplot/test/unit/export/expected/enc.wxml
+++ b/packages/mindplot/test/unit/export/expected/enc.wxml
@@ -1,4 +1,4 @@
-<map name="enc" version="tango"><topic central="true" text="Artigos GF comentários interessantes" id="1"><topic position="-466,16" order="3" text="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities" shape="rectagle" id="5" bgColor="#cccccc" brColor="#cccccc"><topic position="-1042,-163" order="0" id="6"><text><![CDATA[Therecent growth of large functional trait data
+<map name="enc" version="tango"><topic central="true" text="Artigos GF comentários interessantes" id="1"><topic position="-466,16" order="3" text="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities" shape="rectangle" id="5" bgColor="#cccccc" brColor="#cccccc"><topic position="-1042,-163" order="0" id="6"><text><![CDATA[Therecent growth of large functional trait data
 bases has been fuelled by standardized protocols forthe
 measurement of individual functional traits and intensive
 efforts to compile trait data(Cornelissen etal. 2003; Chave etal. 2009). Nonetheless, there remains no consensusfor
@@ -28,7 +28,7 @@ failed to accurately estimate the variance of trait values. This
 indicates that in situations where accurate estimation of plotlevel
 variance is desired, complete censuses are essential.]]></text><note><![CDATA[Isso significa que estudos de característica de história de vida compensam? Ver nos m&m.]]></note></topic><topic position="-915,219" order="7" id="15"><text><![CDATA[We suggest that, in these studies,
 the investment in complete sampling may be worthwhile
-for at least some traits.]]></text><note><![CDATA[Falar que isso corrobora nossa sugestão de utilizar poucas medidas, mas que elas sejam confiáveis.]]></note></topic></topic><topic position="297,0" order="0" text="Chazdon 2010. Biotropica. 42(1): 31–40" shape="rectagle" id="17" fontStyle=";;#000000;;;" bgColor="#cccccc" brColor="#cccccc"><topic position="2883,-437" order="0" text="Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis. " id="24"/><topic position="586,-383" order="1" id="22"><text><![CDATA[Here, we develop a new approach that links functional attributes
+for at least some traits.]]></text><note><![CDATA[Falar que isso corrobora nossa sugestão de utilizar poucas medidas, mas que elas sejam confiáveis.]]></note></topic></topic><topic position="297,0" order="0" text="Chazdon 2010. Biotropica. 42(1): 31–40" shape="rectangle" id="17" fontStyle=";;#000000;;;" bgColor="#cccccc" brColor="#cccccc"><topic position="2883,-437" order="0" text="Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis. " id="24"/><topic position="586,-383" order="1" id="22"><text><![CDATA[Here, we develop a new approach that links functional attributes
 of tree species with studies of forest recovery and regional
 land-use transitions (Chazdon et al. 2007). Grouping species according
 to their functional attributes or demographic rates provides
@@ -109,4 +109,4 @@ ZHANG, Z. D., R. G. ZANG, AND Y. D. QI. 2008. Spatiotemporal patterns and
 dynamics of species richness and abundance of woody plant functional
 groups in a tropical forest landscape of Hainan Island, South China.
 J. Integr. Plant Biol. 50: 547–558.
-]]></text></topic></topic><topic position="-313,-224" order="1" text="Poorter 1999. Functional Ecology. 13:396-410" shape="rectagle" id="2" fontStyle=";;#000000;;;" bgColor="#cccccc" brColor="#cccccc"><topic position="-619,-221" order="0" text="Espécies pioneiras crescem mais rápido do que as não pioneiras" id="3"><topic position="-980,-221" order="0" text="Tolerância a sombra está relacionada com persistência e não com crescimento" id="4"/></topic></topic></topic></map>
\ No newline at end of file
+]]></text></topic></topic><topic position="-313,-224" order="1" text="Poorter 1999. Functional Ecology. 13:396-410" shape="rectangle" id="2" fontStyle=";;#000000;;;" bgColor="#cccccc" brColor="#cccccc"><topic position="-619,-221" order="0" text="Espécies pioneiras crescem mais rápido do que as não pioneiras" id="3"><topic position="-980,-221" order="0" text="Tolerância a sombra está relacionada com persistência e não com crescimento" id="4"/></topic></topic></topic></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/huge.mm b/packages/mindplot/test/unit/export/expected/huge.mm
index 27753e70..6bc9673f 100644
--- a/packages/mindplot/test/unit/export/expected/huge.mm
+++ b/packages/mindplot/test/unit/export/expected/huge.mm
@@ -55,7 +55,7 @@
             <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="voeding">
                 <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="zie bij handelingen --&gt;winkelen"/>
             </node>
-            <node ID="ID_null" POSITION="left" STYLE="rectagle" TEXT="kleding">
+            <node ID="ID_null" POSITION="left" STYLE="rectangle" TEXT="kleding">
                 <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="stijlen">
                     <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="begeleiding bij het winkelen naar gelijkaardige kleding"/>
                 </node>
diff --git a/packages/mindplot/test/unit/export/expected/i18n.wxml b/packages/mindplot/test/unit/export/expected/i18n.wxml
index ba46f4c7..018630e4 100644
--- a/packages/mindplot/test/unit/export/expected/i18n.wxml
+++ b/packages/mindplot/test/unit/export/expected/i18n.wxml
@@ -1 +1 @@
-<map name="i18n" version="tango"><topic central="true" text="i18n" shape="rounded rectagle" id="0"><topic position="200,0" order="0" text="Este es un é con acento" shape="line" id="1"/><topic position="-200,0" order="0" text="Este es una ñ" shape="line" id="2"/><topic position="200,100" order="4" text="這是一個樣本 Japanise。" shape="line" id="3"/></topic></map>
\ No newline at end of file
+<map name="i18n" version="tango"><topic central="true" text="i18n" shape="rounded rectangle" id="0"><topic position="200,0" order="0" text="Este es un é con acento" shape="line" id="1"/><topic position="-200,0" order="0" text="Este es una ñ" shape="line" id="2"/><topic position="200,100" order="4" text="這是一個樣本 Japanise。" shape="line" id="3"/></topic></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/i18n2.wxml b/packages/mindplot/test/unit/export/expected/i18n2.wxml
index 29489ecd..2d3449df 100644
--- a/packages/mindplot/test/unit/export/expected/i18n2.wxml
+++ b/packages/mindplot/test/unit/export/expected/i18n2.wxml
@@ -1,2 +1,2 @@
-<map name="i18n2" version="tango"><topic central="true" text="أَبْجَدِيَّة عَرَبِيَّة" shape="rounded rectagle" id="0"><topic position="200,0" order="0" text="أَبْجَدِيَّة عَرَبِ" shape="line" id="1"><note><![CDATA[This is a not in languange أَبْجَدِيَّة عَرَبِ]]></note></topic><topic position="-200,0" order="0" shape="line" id="2"><text><![CDATA[Long text node: 
+<map name="i18n2" version="tango"><topic central="true" text="أَبْجَدِيَّة عَرَبِيَّة" shape="rounded rectangle" id="0"><topic position="200,0" order="0" text="أَبْجَدِيَّة عَرَبِ" shape="line" id="1"><note><![CDATA[This is a not in languange أَبْجَدِيَّة عَرَبِ]]></note></topic><topic position="-200,0" order="0" shape="line" id="2"><text><![CDATA[Long text node: 
  أَبْجَدِيَّة عَرَب]]></text></topic></topic></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/issue.mm b/packages/mindplot/test/unit/export/expected/issue.mm
index 1586b623..2717e210 100644
--- a/packages/mindplot/test/unit/export/expected/issue.mm
+++ b/packages/mindplot/test/unit/export/expected/issue.mm
@@ -75,7 +75,7 @@
                 </node>
             </node>
         </node>
-        <node ID="ID_59" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#bf9000" COLOR="#000000">
+        <node ID="ID_59" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#bf9000" COLOR="#000000">
             <richcontent TYPE="NODE">
                 <html xmlns="http://www.w3.org/1999/xhtml">
                     <head></head>
@@ -88,7 +88,7 @@
             </richcontent>
             <font SIZE="12" BOLD="true"/>
             <edge COLOR="#7f6000"/>
-            <node ID="ID_92" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
+            <node ID="ID_92" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
                 <richcontent TYPE="NODE">
                     <html xmlns="http://www.w3.org/1999/xhtml">
                         <head></head>
@@ -100,20 +100,20 @@
                 </richcontent>
                 <font SIZE="12" BOLD="true"/>
                 <edge COLOR="#7f6000"/>
-                <node ID="ID_101" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Microsoft Windows">
+                <node ID="ID_101" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Microsoft Windows">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_106" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="GNU/LINUX">
+                <node ID="ID_106" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="GNU/LINUX">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_107" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="MAC ">
+                <node ID="ID_107" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="MAC ">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
             </node>
-            <node ID="ID_93" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
+            <node ID="ID_93" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
                 <richcontent TYPE="NODE">
                     <html xmlns="http://www.w3.org/1999/xhtml">
                         <head></head>
@@ -125,24 +125,24 @@
                 </richcontent>
                 <font SIZE="12"/>
                 <edge COLOR="#7f6000"/>
-                <node ID="ID_108" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Office">
+                <node ID="ID_108" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Office">
                     <font SIZE="12"/>
                     <edge COLOR="#783f04"/>
                 </node>
-                <node ID="ID_109" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Libre Office">
+                <node ID="ID_109" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Libre Office">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_110" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Navegadores">
+                <node ID="ID_110" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Navegadores">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_111" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Msn">
+                <node ID="ID_111" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Msn">
                     <font SIZE="12"/>
                     <edge COLOR="#783f04"/>
                 </node>
             </node>
-            <node ID="ID_94" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
+            <node ID="ID_94" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
                 <richcontent TYPE="NODE">
                     <html xmlns="http://www.w3.org/1999/xhtml">
                         <head></head>
diff --git a/packages/mindplot/test/unit/export/expected/issue.wxml b/packages/mindplot/test/unit/export/expected/issue.wxml
index 60133dc8..15e23d69 100644
--- a/packages/mindplot/test/unit/export/expected/issue.wxml
+++ b/packages/mindplot/test/unit/export/expected/issue.wxml
@@ -1,18 +1,18 @@
-<map name="issue" version="tango"><topic central="true" text="La computadora" shape="rounded rectagle" id="1" fontStyle="Verdana;15;#feffff;bold;;" bgColor="#cc0000" brColor="#660000"><topic position="220,0" order="0" shape="rounded rectagle" id="21" fontStyle=";10;#feffff;bold;;" bgColor="#a64d79" brColor="#4c1130"><text><![CDATA[Hardware
-(componentes físicos)]]></text><topic position="386,-29" order="0" shape="rounded rectagle" id="25" fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><text><![CDATA[Entrada de datos
-]]></text><topic position="558,-34" order="0" shape="rounded rectagle" id="28" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[ Ratón, Teclado, Joystick,
-Cámara digital, Micrófono, Escáner.]]></text></topic></topic><topic position="383,0" order="1" text="Salida de datos" shape="rounded rectagle" id="29" fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><topic position="554,0" order="0" shape="rounded rectagle" id="30" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Monitor, Impresora, Bocinas, Plóter.
-]]></text></topic></topic><topic position="387,40" order="2" text="Almacenamiento" shape="rounded rectagle" id="31" fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><topic position="553,35" order="0" shape="rounded rectagle" id="32" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Disquete, Disco compacto, DVD,
-BD, Disco duro, Memoria flash.]]></text></topic></topic></topic><topic position="-314,-72" order="1" shape="rectagle" id="59" fontStyle=";8;#000000;bold;;" bgColor="#bf9000" brColor="#7f6000"><text><![CDATA[Software
+<map name="issue" version="tango"><topic central="true" text="La computadora" shape="rounded rectangle" id="1" fontStyle="Verdana;15;#feffff;bold;;" bgColor="#cc0000" brColor="#660000"><topic position="220,0" order="0" shape="rounded rectangle" id="21" fontStyle=";10;#feffff;bold;;" bgColor="#a64d79" brColor="#4c1130"><text><![CDATA[Hardware
+(componentes físicos)]]></text><topic position="386,-29" order="0" shape="rounded rectangle" id="25" fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><text><![CDATA[Entrada de datos
+]]></text><topic position="558,-34" order="0" shape="rounded rectangle" id="28" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[ Ratón, Teclado, Joystick,
+Cámara digital, Micrófono, Escáner.]]></text></topic></topic><topic position="383,0" order="1" text="Salida de datos" shape="rounded rectangle" id="29" fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><topic position="554,0" order="0" shape="rounded rectangle" id="30" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Monitor, Impresora, Bocinas, Plóter.
+]]></text></topic></topic><topic position="387,40" order="2" text="Almacenamiento" shape="rounded rectangle" id="31" fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><topic position="553,35" order="0" shape="rounded rectangle" id="32" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Disquete, Disco compacto, DVD,
+BD, Disco duro, Memoria flash.]]></text></topic></topic></topic><topic position="-314,-72" order="1" shape="rectangle" id="59" fontStyle=";8;#000000;bold;;" bgColor="#bf9000" brColor="#7f6000"><text><![CDATA[Software
 (Programas y datos con los que funciona la computadora)
-]]></text><topic position="-664,-145" order="0" shape="rectagle" id="92" fontStyle=";8;#000000;normal;;" bgColor="#f1c232" brColor="#7f6000"><text><![CDATA[Software de Sistema:Permite el entendimiento
-entre el usuario y la maquina.]]></text><topic position="-883,-174" order="0" text="Microsoft Windows" shape="rectagle" id="101" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-864,-145" order="1" text="GNU/LINUX" shape="rectagle" id="106" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-846,-116" order="2" text="MAC " shape="rectagle" id="107" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/></topic><topic position="-667,-43" order="1" shape="rectagle" id="93" fontStyle=";8;#000000;;;" bgColor="#f1c232" brColor="#7f6000"><text><![CDATA[Software de Aplicación: Permite hacer hojas de
-calculo navegar en internet, base de datos, etc.]]></text><topic position="-855,-87" order="0" text="Office" shape="rectagle" id="108" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#783f04"/><topic position="-869,-58" order="1" text="Libre Office" shape="rectagle" id="109" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-873,-29" order="2" text="Navegadores" shape="rectagle" id="110" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-851,0" order="3" text="Msn" shape="rectagle" id="111" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#783f04"/></topic><topic position="-590,29" order="2" shape="rectagle" id="94" fontStyle=";8;#000000;;;" bgColor="#f1c232" brColor="#7f6000"><text><![CDATA[Software de Desarrollo
+]]></text><topic position="-664,-145" order="0" shape="rectangle" id="92" fontStyle=";8;#000000;normal;;" bgColor="#f1c232" brColor="#7f6000"><text><![CDATA[Software de Sistema:Permite el entendimiento
+entre el usuario y la maquina.]]></text><topic position="-883,-174" order="0" text="Microsoft Windows" shape="rectangle" id="101" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-864,-145" order="1" text="GNU/LINUX" shape="rectangle" id="106" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-846,-116" order="2" text="MAC " shape="rectangle" id="107" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/></topic><topic position="-667,-43" order="1" shape="rectangle" id="93" fontStyle=";8;#000000;;;" bgColor="#f1c232" brColor="#7f6000"><text><![CDATA[Software de Aplicación: Permite hacer hojas de
+calculo navegar en internet, base de datos, etc.]]></text><topic position="-855,-87" order="0" text="Office" shape="rectangle" id="108" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#783f04"/><topic position="-869,-58" order="1" text="Libre Office" shape="rectangle" id="109" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-873,-29" order="2" text="Navegadores" shape="rectangle" id="110" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/><topic position="-851,0" order="3" text="Msn" shape="rectangle" id="111" fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#783f04"/></topic><topic position="-590,29" order="2" shape="rectangle" id="94" fontStyle=";8;#000000;;;" bgColor="#f1c232" brColor="#7f6000"><text><![CDATA[Software de Desarrollo
 ]]></text></topic></topic><topic position="-218,116" order="3" text="Tipos de computadora" shape="elipse" id="3" fontStyle=";10;;bold;;"><topic position="-476,58" order="0" text="Computadora personal de escritorio o Desktop" shape="elipse" id="8" fontStyle=";8;;bold;;"/><topic position="-352,87" order="1" shape="elipse" id="10" fontStyle=";8;;bold;;"><text><![CDATA[PDA
-]]></text></topic><topic position="-360,116" order="2" text="Laptop" shape="elipse" id="11" fontStyle=";8;;bold;;"/><topic position="-365,145" order="3" text="Servidor" shape="elipse" id="12" fontStyle=";8;;bold;;"/><topic position="-368,174" order="4" text="Tablet PC" shape="elipse" id="13" fontStyle=";8;;bold;;"/></topic></topic><topic position="283,192" text="CPU y sus partes internas" shape="rounded rectagle" id="35" fontStyle=";10;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><topic position="493,120" order="0" text="Ranuras de expansión o PCI" shape="rounded rectagle" id="36" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"/><topic position="458,149" order="1" shape="rounded rectagle" id="38" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Memoria RAM
-]]></text></topic><topic position="466,178" order="2" shape="rounded rectagle" id="40" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Unidades ópticas
-]]></text></topic><topic position="457,207" order="3" shape="rounded rectagle" id="41" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Tarjeta Madre
-]]></text></topic><topic position="465,236" order="4" shape="rounded rectagle" id="42" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Microprocesador
-]]></text></topic><topic position="450,265" order="5" shape="rounded rectagle" id="43" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Disco Duro
-]]></text></topic></topic><topic position="80,-215" shape="rounded rectagle" id="118" fontStyle=";10;#feffff;;;" bgColor="#cc0000" brColor="#660000"><text><![CDATA[Máquina electrónica que sirve para:  escribir,  dibujar,  pintar,
+]]></text></topic><topic position="-360,116" order="2" text="Laptop" shape="elipse" id="11" fontStyle=";8;;bold;;"/><topic position="-365,145" order="3" text="Servidor" shape="elipse" id="12" fontStyle=";8;;bold;;"/><topic position="-368,174" order="4" text="Tablet PC" shape="elipse" id="13" fontStyle=";8;;bold;;"/></topic></topic><topic position="283,192" text="CPU y sus partes internas" shape="rounded rectangle" id="35" fontStyle=";10;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130"><topic position="493,120" order="0" text="Ranuras de expansión o PCI" shape="rounded rectangle" id="36" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"/><topic position="458,149" order="1" shape="rounded rectangle" id="38" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Memoria RAM
+]]></text></topic><topic position="466,178" order="2" shape="rounded rectangle" id="40" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Unidades ópticas
+]]></text></topic><topic position="457,207" order="3" shape="rounded rectangle" id="41" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Tarjeta Madre
+]]></text></topic><topic position="465,236" order="4" shape="rounded rectangle" id="42" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Microprocesador
+]]></text></topic><topic position="450,265" order="5" shape="rounded rectangle" id="43" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Disco Duro
+]]></text></topic></topic><topic position="80,-215" shape="rounded rectangle" id="118" fontStyle=";10;#feffff;;;" bgColor="#cc0000" brColor="#660000"><text><![CDATA[Máquina electrónica que sirve para:  escribir,  dibujar,  pintar,
 escuchar música, ver videos, calcular, comunicarnos con otras personas, etc-]]></text></topic><relationship srcTopicId="35" destTopicId="21" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="118" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="118" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/npe.wxml b/packages/mindplot/test/unit/export/expected/npe.wxml
index 0daf4107..6d9c6bf4 100644
--- a/packages/mindplot/test/unit/export/expected/npe.wxml
+++ b/packages/mindplot/test/unit/export/expected/npe.wxml
@@ -1 +1 @@
-<map name="npe" version="tango"><topic central="true" text="NIF (NORMAS DE INFORMACIÓN FINANCIERA)" shape="rounded rectagle" id="1" fontStyle=";10;#741b47;bold;;" bgColor="#d5a6bd" brColor="#e69138"><icon id="object_pencil"/></topic><topic position="6,-284" text="NIF D" shape="rectagle" id="3" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Beneficios a los empleados,impuestos a la utilidad, arrendamientos y capitalización de resultado integral .]]></note><icon id="funy_glasses"/><topic position="211,-280" order="0" text=" Normas aplicables a problemas de determinación de resultados " id="19"/></topic><topic position="46,221" text=" CIRCULANTES" shape="rounded rectagle" id="7" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Tratamiento contable de los gastos de registro, colocación, unidades de inversión, aplicación supletoria etc.]]></note><icon id="object_phone"/><topic position="236,225" order="0" text="Adquisición temporal de acciones propias" id="22"/></topic><topic position="-143,148" text=" NIF A" shape="rectagle" id="6" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.youtube.com/watch?v=7YN-sOlkQp0" urlType="url"/><icon id="time_hourglass"/><topic position="-254,152" order="0" text=" Marco conceptual" id="20"/></topic><topic position="-150,-129" text=" NIF C" shape="rectagle" id="4" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="https://sites.google.com/site/contabilidadimcpnif/estructura-de-las-nif" urlType="url"/><icon id="funy_monkey"/><topic position="-366,-125" order="0" text="Normas aplicables a conceptos específicos de los estados financieros " shape="line" id="13"/></topic><topic position="183,-153" text="NIF E" shape="rectagle" id="2" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Agricultura y donativos recibidos u otorgados con propósitos no lucrativos.]]></note><icon id="soft_penguin"/><topic position="402,-149" order="0" text=" Normas aplicables alas actividades especializadas de distintos sectores" id="18"/></topic><topic position="326,127" text=" NIF B" shape="rectagle" id="5" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.contaduria.uady.mx/files/cuerpo-acad/caef/aief/resumen_NIF_marco_conceptual.pdf" urlType="url"/><icon id="object_house"/><topic position="521,131" order="0" text=" Normas aplicables a los estados financieros en su conjunto" id="21"/></topic><relationship srcTopicId="3" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="4" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="7" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="6" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="5" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="2" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="2" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
+<map name="npe" version="tango"><topic central="true" text="NIF (NORMAS DE INFORMACIÓN FINANCIERA)" shape="rounded rectangle" id="1" fontStyle=";10;#741b47;bold;;" bgColor="#d5a6bd" brColor="#e69138"><icon id="object_pencil"/></topic><topic position="6,-284" text="NIF D" shape="rectangle" id="3" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Beneficios a los empleados,impuestos a la utilidad, arrendamientos y capitalización de resultado integral .]]></note><icon id="funy_glasses"/><topic position="211,-280" order="0" text=" Normas aplicables a problemas de determinación de resultados " id="19"/></topic><topic position="46,221" text=" CIRCULANTES" shape="rounded rectangle" id="7" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Tratamiento contable de los gastos de registro, colocación, unidades de inversión, aplicación supletoria etc.]]></note><icon id="object_phone"/><topic position="236,225" order="0" text="Adquisición temporal de acciones propias" id="22"/></topic><topic position="-143,148" text=" NIF A" shape="rectangle" id="6" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.youtube.com/watch?v=7YN-sOlkQp0" urlType="url"/><icon id="time_hourglass"/><topic position="-254,152" order="0" text=" Marco conceptual" id="20"/></topic><topic position="-150,-129" text=" NIF C" shape="rectangle" id="4" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="https://sites.google.com/site/contabilidadimcpnif/estructura-de-las-nif" urlType="url"/><icon id="funy_monkey"/><topic position="-366,-125" order="0" text="Normas aplicables a conceptos específicos de los estados financieros " shape="line" id="13"/></topic><topic position="183,-153" text="NIF E" shape="rectangle" id="2" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Agricultura y donativos recibidos u otorgados con propósitos no lucrativos.]]></note><icon id="soft_penguin"/><topic position="402,-149" order="0" text=" Normas aplicables alas actividades especializadas de distintos sectores" id="18"/></topic><topic position="326,127" text=" NIF B" shape="rectangle" id="5" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.contaduria.uady.mx/files/cuerpo-acad/caef/aief/resumen_NIF_marco_conceptual.pdf" urlType="url"/><icon id="object_house"/><topic position="521,131" order="0" text=" Normas aplicables a los estados financieros en su conjunto" id="21"/></topic><relationship srcTopicId="3" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="4" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="7" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="6" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="5" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="2" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="2" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/process.wxml b/packages/mindplot/test/unit/export/expected/process.wxml
index 12af363d..c6a4f998 100644
--- a/packages/mindplot/test/unit/export/expected/process.wxml
+++ b/packages/mindplot/test/unit/export/expected/process.wxml
@@ -1 +1 @@
-<map name="process" version="tango"><topic central="true" text="California" shape="rounded rectagle" id="0"><topic position="-200,-200" order="7" text="Northern California" shape="line" id="1"><topic position="-290,-275" order="0" text="Oakland/Berkeley" shape="line" id="2"/><topic position="-290,-250" order="1" text="San Mateo" shape="line" id="3"/><topic position="-290,-225" order="2" text="Other North" shape="line" id="4"/><topic position="-290,-200" order="3" text="San Francisco" shape="line" id="5"/><topic position="-290,-175" order="4" text="Santa Clara" shape="line" id="6"/><topic position="-290,-150" order="5" text="Marin/Napa/Solano" shape="line" id="7"/></topic><topic position="-200,-100" order="3" text="Hawaii" shape="line" id="8"/><topic position="-200,0" order="0" text="Southern California" shape="line" id="9"><topic position="-290,-50" order="0" text="Los Angeles" shape="line" id="10"/><topic position="-290,-25" order="1" text="Anaheim/Santa Ana" shape="line" id="11"/><topic position="-290,0" order="2" text="Ventura" shape="line" id="12"/><topic position="-290,25" order="3" text="Other South" shape="line" id="13"/></topic><topic position="-200,100" order="4" text="Policy Bodies" shape="line" id="14"><topic position="-290,25" order="0" text="Advocacy" shape="line" id="15"><topic position="-380,0" order="0" text="AAO" shape="line" id="16"/><topic position="-380,25" order="1" text="ASCRS" shape="line" id="17"/><topic position="-380,50" order="2" text="EBAA" shape="line" id="18"/></topic><topic position="-290,50" order="1" text="Military" shape="line" id="19"/><topic position="-290,75" order="2" text="United Network for Organ Sharing" shape="line" id="20"/><topic position="-290,100" order="3" text="Kaiser Hospital System" shape="line" id="21"/><topic position="-290,125" order="4" text="University of California System" shape="line" id="22"/><topic position="-290,150" order="5" text="CMS" shape="line" id="23"><topic position="-380,125" order="0" text="Medicare Part A" shape="line" id="24"/><topic position="-380,150" order="1" text="Medicare Part B" shape="line" id="25"/></topic></topic><topic position="200,-100" order="3" text="Corneal Tissue OPS" shape="line" id="26"><topic position="290,-200" order="0" text="Transplant Bank International" shape="line" id="27"><topic position="380,-250" order="0" text="Orange County Eye and Transplant Bank" shape="line" id="28"/><topic position="380,-225" order="1" text="Northern California Transplant Bank" shape="rounded rectagle" id="29" bgColor="#00ffd5"><topic position="470,-225" order="0" text="In 2010, 2,500 referrals forwarded to OneLegacy" shape="line" id="30"/></topic><topic position="380,-200" order="2" text="Doheny Eye and Tissue Transplant Bank" shape="rounded rectagle" id="31" bgColor="#00ffd5"><link url="http://www.dohenyeyebank.org/" urlType="url"/></topic></topic><topic position="290,-175" order="1" text="OneLegacy" shape="rounded rectagle" id="32" bgColor="#00ffd5"><topic position="380,-200" order="0" text="In 2010, 11,828 referrals" shape="line" id="33"/></topic><topic position="290,-150" order="2" text="San Diego Eye Bank" shape="rounded rectagle" id="34" bgColor="#00ffd5"><topic position="380,-150" order="0" text="In 2010, 2,555 referrals" shape="line" id="35"/></topic><topic position="290,-125" order="3" text="California Transplant Donor Network" shape="line" id="36"/><topic position="290,-100" order="4" text="California Transplant Services" shape="line" id="37"><topic position="380,-100" order="0" text="In 2010, 0 referrals" shape="line" id="38"/></topic><topic position="290,-75" order="5" text="Lifesharing" shape="line" id="39"/><topic position="290,-50" order="6" text="DCI Donor Services" shape="line" id="40"><topic position="380,-50" order="0" text="Sierra Eye and Tissue Donor Services" shape="rounded rectagle" id="41" bgColor="#00ffd5"><topic position="470,-75" order="0" text="In 2010, 2.023 referrals" shape="line" id="42"/></topic></topic><topic position="290,-25" order="7" text="SightLife" shape="rounded rectagle" id="43" bgColor="#00ffd5"/></topic><topic position="-200,200" order="8" text="Tools" shape="line" id="44"><topic position="-290,175" order="0" text="Darthmouth Atlas of Health" shape="line" id="45"/><topic position="-290,200" order="1" text="HealthLandscape" shape="line" id="46"/></topic><topic position="200,0" order="0" text="QE Medicare" shape="line" id="47"/><topic position="200,100" order="4" text="CMS Data" shape="line" id="48"/><topic position="200,200" order="8" text="Ambulatory Payment Classification" shape="line" id="49"><topic position="290,150" order="0" text="CPT's which don't allow V2785" shape="line" id="50"><topic position="380,125" order="0" text="Ocular Reconstruction Transplant" shape="line" id="51"><topic position="470,100" order="0" text="65780 (amniotic membrane tranplant" shape="line" id="52"/><topic position="470,125" order="1" text="65781 (limbal stem cell allograft)" shape="line" id="53"/><topic position="470,150" order="2" text="65782 (limbal conjunctiva autograft)" shape="line" id="54"/></topic><topic position="380,150" order="1" text="Endothelial keratoplasty" shape="line" id="55"><topic position="470,150" order="0" text="65756" shape="line" id="56"/></topic><topic position="380,175" order="2" text="Epikeratoplasty" shape="line" id="57"><topic position="470,175" order="0" text="65767" shape="line" id="58"/></topic></topic><topic position="290,175" order="1" text="Anterior lamellar keratoplasty" shape="line" id="59"><topic position="380,175" order="0" text="65710" shape="line" id="60"/></topic><topic position="290,200" order="2" text="Processing, preserving, and transporting corneal tissue" shape="line" id="61"><topic position="380,175" order="0" text="V2785" shape="line" id="62"/><topic position="380,200" order="1" text="Laser incision in recepient" shape="line" id="63"><topic position="470,200" order="0" text="0290T" shape="line" id="64"/></topic></topic><topic position="290,225" order="3" text="Laser incision in donor" shape="line" id="65"><topic position="380,225" order="0" text="0289T" shape="line" id="66"/></topic><topic position="290,250" order="4" text="Penetrating keratoplasty" shape="line" id="67"><topic position="380,225" order="0" text="65730 (in other)" shape="line" id="68"/><topic position="380,250" order="1" text="65755 (in pseudoaphakia)" shape="line" id="69"/><topic position="380,275" order="2" text="65750 (in aphakia)" shape="line" id="70"/></topic></topic></topic><relationship srcTopicId="27" destTopicId="32" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="27" destTopicId="36" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
+<map name="process" version="tango"><topic central="true" text="California" shape="rounded rectangle" id="0"><topic position="-200,-200" order="7" text="Northern California" shape="line" id="1"><topic position="-290,-275" order="0" text="Oakland/Berkeley" shape="line" id="2"/><topic position="-290,-250" order="1" text="San Mateo" shape="line" id="3"/><topic position="-290,-225" order="2" text="Other North" shape="line" id="4"/><topic position="-290,-200" order="3" text="San Francisco" shape="line" id="5"/><topic position="-290,-175" order="4" text="Santa Clara" shape="line" id="6"/><topic position="-290,-150" order="5" text="Marin/Napa/Solano" shape="line" id="7"/></topic><topic position="-200,-100" order="3" text="Hawaii" shape="line" id="8"/><topic position="-200,0" order="0" text="Southern California" shape="line" id="9"><topic position="-290,-50" order="0" text="Los Angeles" shape="line" id="10"/><topic position="-290,-25" order="1" text="Anaheim/Santa Ana" shape="line" id="11"/><topic position="-290,0" order="2" text="Ventura" shape="line" id="12"/><topic position="-290,25" order="3" text="Other South" shape="line" id="13"/></topic><topic position="-200,100" order="4" text="Policy Bodies" shape="line" id="14"><topic position="-290,25" order="0" text="Advocacy" shape="line" id="15"><topic position="-380,0" order="0" text="AAO" shape="line" id="16"/><topic position="-380,25" order="1" text="ASCRS" shape="line" id="17"/><topic position="-380,50" order="2" text="EBAA" shape="line" id="18"/></topic><topic position="-290,50" order="1" text="Military" shape="line" id="19"/><topic position="-290,75" order="2" text="United Network for Organ Sharing" shape="line" id="20"/><topic position="-290,100" order="3" text="Kaiser Hospital System" shape="line" id="21"/><topic position="-290,125" order="4" text="University of California System" shape="line" id="22"/><topic position="-290,150" order="5" text="CMS" shape="line" id="23"><topic position="-380,125" order="0" text="Medicare Part A" shape="line" id="24"/><topic position="-380,150" order="1" text="Medicare Part B" shape="line" id="25"/></topic></topic><topic position="200,-100" order="3" text="Corneal Tissue OPS" shape="line" id="26"><topic position="290,-200" order="0" text="Transplant Bank International" shape="line" id="27"><topic position="380,-250" order="0" text="Orange County Eye and Transplant Bank" shape="line" id="28"/><topic position="380,-225" order="1" text="Northern California Transplant Bank" shape="rounded rectangle" id="29" bgColor="#00ffd5"><topic position="470,-225" order="0" text="In 2010, 2,500 referrals forwarded to OneLegacy" shape="line" id="30"/></topic><topic position="380,-200" order="2" text="Doheny Eye and Tissue Transplant Bank" shape="rounded rectangle" id="31" bgColor="#00ffd5"><link url="http://www.dohenyeyebank.org/" urlType="url"/></topic></topic><topic position="290,-175" order="1" text="OneLegacy" shape="rounded rectangle" id="32" bgColor="#00ffd5"><topic position="380,-200" order="0" text="In 2010, 11,828 referrals" shape="line" id="33"/></topic><topic position="290,-150" order="2" text="San Diego Eye Bank" shape="rounded rectangle" id="34" bgColor="#00ffd5"><topic position="380,-150" order="0" text="In 2010, 2,555 referrals" shape="line" id="35"/></topic><topic position="290,-125" order="3" text="California Transplant Donor Network" shape="line" id="36"/><topic position="290,-100" order="4" text="California Transplant Services" shape="line" id="37"><topic position="380,-100" order="0" text="In 2010, 0 referrals" shape="line" id="38"/></topic><topic position="290,-75" order="5" text="Lifesharing" shape="line" id="39"/><topic position="290,-50" order="6" text="DCI Donor Services" shape="line" id="40"><topic position="380,-50" order="0" text="Sierra Eye and Tissue Donor Services" shape="rounded rectangle" id="41" bgColor="#00ffd5"><topic position="470,-75" order="0" text="In 2010, 2.023 referrals" shape="line" id="42"/></topic></topic><topic position="290,-25" order="7" text="SightLife" shape="rounded rectangle" id="43" bgColor="#00ffd5"/></topic><topic position="-200,200" order="8" text="Tools" shape="line" id="44"><topic position="-290,175" order="0" text="Darthmouth Atlas of Health" shape="line" id="45"/><topic position="-290,200" order="1" text="HealthLandscape" shape="line" id="46"/></topic><topic position="200,0" order="0" text="QE Medicare" shape="line" id="47"/><topic position="200,100" order="4" text="CMS Data" shape="line" id="48"/><topic position="200,200" order="8" text="Ambulatory Payment Classification" shape="line" id="49"><topic position="290,150" order="0" text="CPT's which don't allow V2785" shape="line" id="50"><topic position="380,125" order="0" text="Ocular Reconstruction Transplant" shape="line" id="51"><topic position="470,100" order="0" text="65780 (amniotic membrane tranplant" shape="line" id="52"/><topic position="470,125" order="1" text="65781 (limbal stem cell allograft)" shape="line" id="53"/><topic position="470,150" order="2" text="65782 (limbal conjunctiva autograft)" shape="line" id="54"/></topic><topic position="380,150" order="1" text="Endothelial keratoplasty" shape="line" id="55"><topic position="470,150" order="0" text="65756" shape="line" id="56"/></topic><topic position="380,175" order="2" text="Epikeratoplasty" shape="line" id="57"><topic position="470,175" order="0" text="65767" shape="line" id="58"/></topic></topic><topic position="290,175" order="1" text="Anterior lamellar keratoplasty" shape="line" id="59"><topic position="380,175" order="0" text="65710" shape="line" id="60"/></topic><topic position="290,200" order="2" text="Processing, preserving, and transporting corneal tissue" shape="line" id="61"><topic position="380,175" order="0" text="V2785" shape="line" id="62"/><topic position="380,200" order="1" text="Laser incision in recepient" shape="line" id="63"><topic position="470,200" order="0" text="0290T" shape="line" id="64"/></topic></topic><topic position="290,225" order="3" text="Laser incision in donor" shape="line" id="65"><topic position="380,225" order="0" text="0289T" shape="line" id="66"/></topic><topic position="290,250" order="4" text="Penetrating keratoplasty" shape="line" id="67"><topic position="380,225" order="0" text="65730 (in other)" shape="line" id="68"/><topic position="380,250" order="1" text="65755 (in pseudoaphakia)" shape="line" id="69"/><topic position="380,275" order="2" text="65750 (in aphakia)" shape="line" id="70"/></topic></topic></topic><relationship srcTopicId="27" destTopicId="32" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="27" destTopicId="36" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/sample2.mm b/packages/mindplot/test/unit/export/expected/sample2.mm
index c2720bc7..d201fb56 100644
--- a/packages/mindplot/test/unit/export/expected/sample2.mm
+++ b/packages/mindplot/test/unit/export/expected/sample2.mm
@@ -10,7 +10,7 @@
             </html>
         </richcontent>
         <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Third Party ">
-            <node ID="ID_null" LINK="thumbshots.org" POSITION="left" STYLE="rectagle" TEXT="Thumbshot"/>
+            <node ID="ID_null" LINK="thumbshots.org" POSITION="left" STYLE="rectangle" TEXT="Thumbshot"/>
         </node>
         <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Newspapers">
             <node ID="ID_null" POSITION="left" STYLE="fork" TEXT="College Newspapers"/>
diff --git a/packages/mindplot/test/unit/export/input/bug2.wxml b/packages/mindplot/test/unit/export/input/bug2.wxml
index 713e55e2..2f170682 100644
--- a/packages/mindplot/test/unit/export/input/bug2.wxml
+++ b/packages/mindplot/test/unit/export/input/bug2.wxml
@@ -30,7 +30,7 @@
         <topic position="211,-72" order="6" text="Actividades centradas en el contexto cercano" id="37"/>
         <topic position="303,27" order="12"
                text="Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)" id="22"/>
-        <topic position="206,-220" order="0" text="Complementamos el trabajo de la escuela" shape="rounded rectagle"
+        <topic position="206,-220" order="0" text="Complementamos el trabajo de la escuela" shape="rounded rectangle"
                id="27">
             <note><![CDATA[Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.
 A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,
diff --git a/packages/mindplot/test/unit/export/input/bug3.wxml b/packages/mindplot/test/unit/export/input/bug3.wxml
index adaae233..d5e20341 100644
--- a/packages/mindplot/test/unit/export/input/bug3.wxml
+++ b/packages/mindplot/test/unit/export/input/bug3.wxml
@@ -1,11 +1,11 @@
-<map name="81701" version="tango"><topic central="true" text="Indicator needs" id="1" fontStyle=";15;;;;"><topic position="221,-1937" order="0" text="Which new measures" shape="rounded rectagle" id="5" fontStyle=";10;;;;"><note><![CDATA[Identifying new measures or investments that should be implemented.]]></note><topic position="394,-1978" order="0" text="Landscape of measures" shape="rounded rectagle" id="56" bgColor="#feffff"><topic position="616,-1991" order="0" text="Diversity index of innovation support instruments in the region" id="45"><note><![CDATA[Number of different innovations policy instruments existing  in the region as a share of a total number representing a full typology of instruments]]></note></topic><topic position="550,-1964" order="1" text="Existing investments in measures" id="57"/></topic><topic position="414,-1910" order="1" text="What other regions do differently" shape="rounded rectagle" id="38" bgColor="#feffff"><topic position="574,-1937" order="0" text="Balance of measure index" id="46"/><topic position="597,-1910" order="1" text="Profile comparison with other regions" id="77"/><topic position="620,-1883" order="2" text="Number of specific types of measures per capita" id="112"/></topic></topic><topic position="-279,-545" order="1" text="How to design &amp; implement measures" shape="rounded rectagle" id="6" fontStyle=";10;;;;"><note><![CDATA[Understanding how to design the details of a particular measure and how to implement them.]]></note><topic position="-493,-775" order="0" text="Good practices" shape="rounded rectagle" id="41" bgColor="#feffff"/><topic position="-486,-531" order="1" text="Diagnostics" shape="rounded rectagle" id="80" bgColor="#feffff"><topic position="-621,-748" order="0" text="Internal business innovation factors" id="81"/><topic position="-621,-518" order="1" text="Return on investment to innovation" id="359"><topic position="-851,-717" order="0" id="360"><text><![CDATA[Firm's turnover from (new to firm)
+<map name="81701" version="tango"><topic central="true" text="Indicator needs" id="1" fontStyle=";15;;;;"><topic position="221,-1937" order="0" text="Which new measures" shape="rounded rectangle" id="5" fontStyle=";10;;;;"><note><![CDATA[Identifying new measures or investments that should be implemented.]]></note><topic position="394,-1978" order="0" text="Landscape of measures" shape="rounded rectangle" id="56" bgColor="#feffff"><topic position="616,-1991" order="0" text="Diversity index of innovation support instruments in the region" id="45"><note><![CDATA[Number of different innovations policy instruments existing  in the region as a share of a total number representing a full typology of instruments]]></note></topic><topic position="550,-1964" order="1" text="Existing investments in measures" id="57"/></topic><topic position="414,-1910" order="1" text="What other regions do differently" shape="rounded rectangle" id="38" bgColor="#feffff"><topic position="574,-1937" order="0" text="Balance of measure index" id="46"/><topic position="597,-1910" order="1" text="Profile comparison with other regions" id="77"/><topic position="620,-1883" order="2" text="Number of specific types of measures per capita" id="112"/></topic></topic><topic position="-279,-545" order="1" text="How to design &amp; implement measures" shape="rounded rectangle" id="6" fontStyle=";10;;;;"><note><![CDATA[Understanding how to design the details of a particular measure and how to implement them.]]></note><topic position="-493,-775" order="0" text="Good practices" shape="rounded rectangle" id="41" bgColor="#feffff"/><topic position="-486,-531" order="1" text="Diagnostics" shape="rounded rectangle" id="80" bgColor="#feffff"><topic position="-621,-748" order="0" text="Internal business innovation factors" id="81"/><topic position="-621,-518" order="1" text="Return on investment to innovation" id="359"><topic position="-851,-717" order="0" id="360"><text><![CDATA[Firm's turnover from (new to firm)
  product innovation (as a pecentage of total turnover)]]></text><icon id="sign_warning"/></topic><topic position="-920,-682" order="1" id="361"><text><![CDATA[Increase in the probability to innovate linked to ICT use
  (in product innovation, process innovation, organisational innovaton, marketing innovation)]]></text></topic><topic position="-882,-647" order="2" id="362"><text><![CDATA[Scientific articles by type of collaboration (per capita)
  (international co-authoriship, domestic co-authoriship, single author)]]></text><icon id="sign_warning"/></topic><topic position="-876,-612" order="3" id="363"><text><![CDATA[Increase in a share of expenditures on technological
 innovations in the total amount of regional firms’ expenditures, %]]></text><icon id="sign_warning"/></topic><topic position="-877,-581" order="4" text="Increase in the number of innovative companies with in-house R&amp;D" id="364"><icon id="sign_warning"/></topic><topic position="-881,-554" order="5" text="Increase in th number of innovative companies without in-house R&amp;D" id="365"><icon id="sign_warning"/></topic><topic position="-842,-523" order="6" id="366"><text><![CDATA[Increase in th number of firms with
  international/national collaboration on innovation]]></text><icon id="sign_warning"/></topic><topic position="-849,-488" order="7" id="367"><text><![CDATA[Highly cited scientific articles (as a percentage of
 highly cited scientific article in the whole Federation)]]></text><icon id="sign_warning"/></topic><topic position="-852,-453" order="8" id="368"><text><![CDATA[Patents filed by public research organisations
-(as a percentafe of patent application filed under PCT)]]></text><icon id="sign_warning"/></topic><topic position="-805,-422" order="9" text="Number of international patents" id="369"><icon id="sign_warning"/></topic><topic position="-893,-395" order="10" text="Start-up activity (as a percentage of start-up activity in the whole Federation)" id="370"/><topic position="-861,-368" order="11" text="Number of innovative companies to the number of students " id="393"><icon id="sign_warning"/></topic><topic position="-867,-341" order="12" text="Number of innovative companies to the number of researchers  " id="394"><icon id="sign_warning"/></topic><topic position="-916,-314" order="13" text="Volume of license agreements to the volume of R&amp;D support from the regional budget " id="400"><icon id="sign_warning"/></topic></topic></topic></topic><topic position="255,-251" order="2" text="How much effort: where &amp; how" shape="rounded rectagle" id="2" fontStyle=";10;;;;"><note><![CDATA[Understanding the level of effort the region needs to take to compete on innovation and where to put this effort]]></note><topic position="454,-1762" order="0" text="The bottom-line" shape="rounded rectagle" id="3" bgColor="#feffff"><note><![CDATA[This is what policy makers care about in the end]]></note><topic position="547,-1843" order="0" text="Wages" id="15"><topic position="649,-1856" order="0" text="Dynamics of real wages" id="12"/><topic position="675,-1829" order="1" text="Average wage (compare to the Fed)" id="14"/></topic><topic position="558,-1789" order="1" text="Productivity" id="86"><topic position="665,-1802" order="0" text="Labor productivity" id="190"><icon id="sign_warning"/></topic><topic position="683,-1775" order="1" text="Labor productivity growth rate" id="191"/></topic><topic position="543,-1721" order="2" text="Jobs" id="87"><topic position="659,-1748" order="0" text="Share of high-productive jobs" id="13"><icon id="sign_warning"/></topic><topic position="657,-1721" order="1" text="Share of creative industries jobs" id="88"/><topic position="683,-1694" order="2" text="Uneployment rate of university graduates" id="336"><icon id="sign_warning"/></topic></topic><topic position="549,-1667" order="3" text="Income" id="89"><topic position="674,-1667" order="0" text="GRP per capita and its growth rate" id="11"/></topic></topic><topic position="452,-143" order="1" text="Influencing  factors" shape="rounded rectagle" id="8" bgColor="#feffff"><topic position="548,-1613" order="0" text="Economy" id="55"><topic position="644,-1640" order="0" text="Economic structure" id="166"/><topic position="701,-1613" order="1" text="Volume of manufacturing production per capita " id="395"/><topic position="742,-1586" order="2" text="Manufacturing value added per capita (non-natural resource-based)" id="396"/></topic><topic position="582,-1200" order="1" text="The enabling environment" id="9"><topic position="728,-1559" order="0" text="Ease of doing business" id="16"><note><![CDATA[WB]]></note><topic position="990,-1559" order="0" text="Level of administrative barriers (number and cost of administrative procedures) " id="412"><icon id="sign_warning"/></topic></topic><topic position="719,-1532" order="1" text="Competition index" id="18"><note><![CDATA[GCR]]></note></topic><topic position="695,-1349" order="2" text="Workforce" id="120"><topic position="804,-1505" order="0" text="Quality of education" id="19"><note><![CDATA[GCR]]></note><topic position="995,-1505" order="0" text="Inrease in the number of International students" id="337"><icon id="sign_warning"/></topic></topic><topic position="800,-1389" order="1" text="Quantity of education" id="121"><topic position="962,-1478" order="0" text="Participation in life-long learning" id="122"><note><![CDATA[per 100 population aged 25-64]]></note><icon id="sign_warning"/></topic><topic position="933,-1451" order="1" text="Increase in literarecy " id="333"><icon id="sign_warning"/></topic><topic position="959,-1420" order="2" id="188"><text><![CDATA[Amount of university and colleague
+(as a percentafe of patent application filed under PCT)]]></text><icon id="sign_warning"/></topic><topic position="-805,-422" order="9" text="Number of international patents" id="369"><icon id="sign_warning"/></topic><topic position="-893,-395" order="10" text="Start-up activity (as a percentage of start-up activity in the whole Federation)" id="370"/><topic position="-861,-368" order="11" text="Number of innovative companies to the number of students " id="393"><icon id="sign_warning"/></topic><topic position="-867,-341" order="12" text="Number of innovative companies to the number of researchers  " id="394"><icon id="sign_warning"/></topic><topic position="-916,-314" order="13" text="Volume of license agreements to the volume of R&amp;D support from the regional budget " id="400"><icon id="sign_warning"/></topic></topic></topic></topic><topic position="255,-251" order="2" text="How much effort: where &amp; how" shape="rounded rectangle" id="2" fontStyle=";10;;;;"><note><![CDATA[Understanding the level of effort the region needs to take to compete on innovation and where to put this effort]]></note><topic position="454,-1762" order="0" text="The bottom-line" shape="rounded rectangle" id="3" bgColor="#feffff"><note><![CDATA[This is what policy makers care about in the end]]></note><topic position="547,-1843" order="0" text="Wages" id="15"><topic position="649,-1856" order="0" text="Dynamics of real wages" id="12"/><topic position="675,-1829" order="1" text="Average wage (compare to the Fed)" id="14"/></topic><topic position="558,-1789" order="1" text="Productivity" id="86"><topic position="665,-1802" order="0" text="Labor productivity" id="190"><icon id="sign_warning"/></topic><topic position="683,-1775" order="1" text="Labor productivity growth rate" id="191"/></topic><topic position="543,-1721" order="2" text="Jobs" id="87"><topic position="659,-1748" order="0" text="Share of high-productive jobs" id="13"><icon id="sign_warning"/></topic><topic position="657,-1721" order="1" text="Share of creative industries jobs" id="88"/><topic position="683,-1694" order="2" text="Uneployment rate of university graduates" id="336"><icon id="sign_warning"/></topic></topic><topic position="549,-1667" order="3" text="Income" id="89"><topic position="674,-1667" order="0" text="GRP per capita and its growth rate" id="11"/></topic></topic><topic position="452,-143" order="1" text="Influencing  factors" shape="rounded rectangle" id="8" bgColor="#feffff"><topic position="548,-1613" order="0" text="Economy" id="55"><topic position="644,-1640" order="0" text="Economic structure" id="166"/><topic position="701,-1613" order="1" text="Volume of manufacturing production per capita " id="395"/><topic position="742,-1586" order="2" text="Manufacturing value added per capita (non-natural resource-based)" id="396"/></topic><topic position="582,-1200" order="1" text="The enabling environment" id="9"><topic position="728,-1559" order="0" text="Ease of doing business" id="16"><note><![CDATA[WB]]></note><topic position="990,-1559" order="0" text="Level of administrative barriers (number and cost of administrative procedures) " id="412"><icon id="sign_warning"/></topic></topic><topic position="719,-1532" order="1" text="Competition index" id="18"><note><![CDATA[GCR]]></note></topic><topic position="695,-1349" order="2" text="Workforce" id="120"><topic position="804,-1505" order="0" text="Quality of education" id="19"><note><![CDATA[GCR]]></note><topic position="995,-1505" order="0" text="Inrease in the number of International students" id="337"><icon id="sign_warning"/></topic></topic><topic position="800,-1389" order="1" text="Quantity of education" id="121"><topic position="962,-1478" order="0" text="Participation in life-long learning" id="122"><note><![CDATA[per 100 population aged 25-64]]></note><icon id="sign_warning"/></topic><topic position="933,-1451" order="1" text="Increase in literarecy " id="333"><icon id="sign_warning"/></topic><topic position="959,-1420" order="2" id="188"><text><![CDATA[Amount of university and colleague
 students per 10 thousands population]]></text></topic><topic position="986,-1385" order="3" id="276"><text><![CDATA[Share of employees with higher education in
 the total amount of population at the working age]]></text></topic><topic position="953,-1354" order="4" text="Increase in University students" id="332"><icon id="sign_warning"/></topic><topic position="996,-1327" order="5" text="Government expenditure on General University Funding" id="351"/><topic position="1001,-1300" order="6" text="Access to training, information, and consulting support " id="409"><icon id="sign_warning"/></topic></topic><topic position="822,-1233" order="2" text="Science &amp; engineering workforce" id="285"><topic position="1013,-1273" order="0" text="Availability of scientists and engineers" id="147"><note><![CDATA[GCR]]></note></topic><topic position="1037,-1246" order="1" text="Amount of researches per 10 thousands population" id="189"><icon id="sign_warning"/></topic><topic position="1050,-1219" order="2" text="Average wage of researches per average wage in the region" id="284"/><topic position="1066,-1192" order="3" text="Share of researchers in the total number of employees in the region" id="286"/></topic></topic><topic position="700,-1152" order="3" text="Government" id="132"><topic position="897,-1165" order="0" text="Total expenditure of general government as a percentage of GDP" id="134"/><topic position="870,-1138" order="1" text="Government expenditure on Economic Development" id="352"/></topic><topic position="710,-1030" order="4" text="Access to finance" id="342"><topic position="796,-1057" order="0" text="Deals" id="387"><topic position="981,-1111" order="0" text="Venture capital investments for start-ups as a percentage of GDP" id="345"/><topic position="980,-1084" order="1" text="Amounts of business angel, pre-seed, seed and venture financing" id="344"/><topic position="940,-1057" order="2" text="Amount of public co-funding of business R&amp;D" id="348"/><topic position="942,-1030" order="3" text="Number of startups received venture financing " id="385"/><topic position="957,-1003" order="4" text="Number of companies received equity investments " id="386"><icon id="sign_warning"/></topic></topic><topic position="803,-963" order="1" text="Available" id="388"><topic position="1000,-976" order="0" text="Amount of matching grants available in the region for business R&amp;D" id="347"/><topic position="917,-949" order="1" text="Number of Business Angels" id="346"/></topic></topic><topic position="682,-882" order="5" text="ICT" id="135"><topic position="751,-922" order="0" text="ICT use" id="17"><note><![CDATA[GCR]]></note></topic><topic position="775,-895" order="1" text="Broadband penetration " id="136"/><topic position="769,-868" order="2" text="Internet penetration" id="334"/><topic position="765,-841" order="3" text="Computer literacy " id="335"/></topic></topic><topic position="589,-109" order="2" text="Behavior of innovation actors" id="10"><topic position="726,-685" order="0" text="Access to markets" id="167"><topic position="810,-747" order="0" text="FDI" id="97"><topic position="880,-814" order="0" text="foreign JVs" id="96"/><topic position="990,-787" order="1" text="Inflow of foreign direct investments in high-technology industries" id="157"/><topic position="926,-760" order="2" text="Foreign direct investment jobs" id="158"><note><![CDATA[: the percentage of the workforce employed by foreign companies [%]. ]]></note></topic><topic position="977,-733" order="3" text="FDI as a share of regional non natural resource-based GRP " id="159"/><topic position="967,-706" order="4" text="Number of foreign subsidiaries operating in the region" id="160"/><topic position="936,-679" order="5" text="Share of foreign controlled enterprises" id="161"/></topic><topic position="818,-617" order="1" text="Exports" id="168"><topic position="979,-652" order="0" text="Export intensity in manufacturing and services" id="169"><note><![CDATA[: exports as a share of total output in manufacturing and services [%].]]></note><icon id="sign_warning"/></topic><topic position="986,-621" order="1" id="375"><text><![CDATA[ Share of high-technology export in the total volume
  of production of goods, works and services]]></text><icon id="sign_warning"/></topic><topic position="1006,-586" order="2" id="377"><text><![CDATA[Share of innovation production/serivces that goes for export,
@@ -25,15 +25,15 @@ per 1,000 researchers.[licenses/researcher] ]]></text></topic></topic><topic pos
 as a share of the institution's R&D budget]]></text></topic></topic><topic position="945,1019" order="2" text="Industry contracts" id="310"><topic position="1074,953" order="0" text="Industry revenue per staff " id="297"/><topic position="1144,988" order="1" id="305"><text><![CDATA[Foreign contracts: Number of contracts with foreign industria
 l companies at scientific and educational organizations
 per 1,000 researchers [contracts/researchers]]]></text></topic><topic position="1121,1023" order="2" text="Share of industry income from foreign companies" id="307"/><topic position="1119,1054" order="3" id="90"><text><![CDATA[Revenue raised from industry R&D as a fraction
-of total institutional budget (up to a cap)]]></text></topic><topic position="1160,1085" order="4" text="Difficulties faced by research organization in collaborating with SMEs" id="311"/></topic></topic></topic><topic position="700,1152" order="1" text="Private market" id="153"><topic position="876,1112" order="0" text="Number of innovation &amp; IP services organizations" id="154"><note><![CDATA[ (design firms, IP consultants, etc.)]]></note></topic><topic position="893,1139" order="1" text="Number of private innovation infrastructure organizations " id="155"><note><![CDATA[(e.g. accelerators, incubators)]]></note></topic><topic position="885,1166" order="2" text="Access to certification and licensing for specific activities " id="410"/><topic position="912,1193" order="3" text="Access to suppliers of equipment, production and engineering services " id="411"/></topic><topic position="720,1287" order="2" text="Innovation infrastructure" id="114"><topic position="835,1274" order="0" text="Investments" id="327"><topic position="992,1220" order="0" text="Public investment in innovation infrastructure" id="315"/><topic position="1028,1247" order="1" text="Increase of government investment in innovation infrastructure" id="328"/><topic position="1038,1274" order="2" text=" Number of Development institution projects performed in the region" id="339"/><topic position="1005,1301" order="3" text="Volume of seed investments by the regional budget " id="391"/><topic position="1009,1328" order="4" text="Volume of venture financing from the regional budget " id="392"/></topic><topic position="895,1355" order="1" text="Volume of state support per one company " id="413"/></topic></topic></topic></topic><topic position="-275,203" order="3" text="What to do about existing measures" shape="rounded rectagle" id="4" fontStyle=";10;;;;"><note><![CDATA[Understanding which measures should be strengthened, dropped or improved, and how.]]></note><topic position="-495,-48" order="0" text="Demand for measure" shape="rounded rectagle" id="42" bgColor="#feffff"><topic position="-625,-208" order="0" text="Quality of beneficiaries" id="50"><topic position="-832,-288" order="0" text="Growth rates of employment in supported innovative firms" id="292"/><topic position="-832,-261" order="1" text="Growth rates of employment in supported innovative firms" id="293"/><topic position="-778,-234" order="2" text="Role of IP for tenants/clients" id="323"><note><![CDATA[WIPO SURVEY OF INTELLECTUAL PROPERTY SERVICES OF
+of total institutional budget (up to a cap)]]></text></topic><topic position="1160,1085" order="4" text="Difficulties faced by research organization in collaborating with SMEs" id="311"/></topic></topic></topic><topic position="700,1152" order="1" text="Private market" id="153"><topic position="876,1112" order="0" text="Number of innovation &amp; IP services organizations" id="154"><note><![CDATA[ (design firms, IP consultants, etc.)]]></note></topic><topic position="893,1139" order="1" text="Number of private innovation infrastructure organizations " id="155"><note><![CDATA[(e.g. accelerators, incubators)]]></note></topic><topic position="885,1166" order="2" text="Access to certification and licensing for specific activities " id="410"/><topic position="912,1193" order="3" text="Access to suppliers of equipment, production and engineering services " id="411"/></topic><topic position="720,1287" order="2" text="Innovation infrastructure" id="114"><topic position="835,1274" order="0" text="Investments" id="327"><topic position="992,1220" order="0" text="Public investment in innovation infrastructure" id="315"/><topic position="1028,1247" order="1" text="Increase of government investment in innovation infrastructure" id="328"/><topic position="1038,1274" order="2" text=" Number of Development institution projects performed in the region" id="339"/><topic position="1005,1301" order="3" text="Volume of seed investments by the regional budget " id="391"/><topic position="1009,1328" order="4" text="Volume of venture financing from the regional budget " id="392"/></topic><topic position="895,1355" order="1" text="Volume of state support per one company " id="413"/></topic></topic></topic></topic><topic position="-275,203" order="3" text="What to do about existing measures" shape="rounded rectangle" id="4" fontStyle=";10;;;;"><note><![CDATA[Understanding which measures should be strengthened, dropped or improved, and how.]]></note><topic position="-495,-48" order="0" text="Demand for measure" shape="rounded rectangle" id="42" bgColor="#feffff"><topic position="-625,-208" order="0" text="Quality of beneficiaries" id="50"><topic position="-832,-288" order="0" text="Growth rates of employment in supported innovative firms" id="292"/><topic position="-832,-261" order="1" text="Growth rates of employment in supported innovative firms" id="293"/><topic position="-778,-234" order="2" text="Role of IP for tenants/clients" id="323"><note><![CDATA[WIPO SURVEY OF INTELLECTUAL PROPERTY SERVICES OF
 EUROPEAN TECHNOLOGY INCUBATORS]]></note></topic><topic position="-798,-207" order="3" text="Share of tenants with innovation activities" id="326"/><topic position="-824,-172" order="4" id="329"><text><![CDATA[Gazelle tenant: Share of tenants with
 annual revenue growth of more than 20%
  for each of the past four years or since formation [%]]]></text></topic><topic position="-812,-133" order="5" id="330"><text><![CDATA[Globalization of tenants: Median share of tenant
 revenues obtained from exports [%]]]></text></topic></topic><topic position="-626,-61" order="1" text="Number of beneficiaries" id="78"><topic position="-894,-102" order="0" text="Number of projects conducted by companies in cooperation with innovation infrastructure" id="383"/><topic position="-825,-75" order="1" text="Scope and intensity of use of services offered to firms" id="325"/><topic position="-910,-48" order="2" text="Number of companies supported by the infrastructure (training, information, consultations, etc.)" id="384"/><topic position="-934,-21" order="3" text="Increase in the number of business applying for public support programmes (regional, federal, international) " id="401"/></topic><topic position="-613,45" order="2" text="Degree of access" id="182"><topic position="-726,14" order="0" text="Level of awareness" id="52"><topic position="-900,10" order="0" id="181"><text><![CDATA[Perception (opinion poll) of business managers
  regarding public support programmes]]></text></topic></topic><topic position="-714,49" order="1" text="Transparency" id="53"><topic position="-908,45" order="0" id="175"><text><![CDATA[Perception of business managers in terms
  of level of transparency of support measures in the region]]></text><icon id="sign_warning"/></topic></topic><topic position="-814,80" order="2" id="183"><text><![CDATA[Description by regional business managers of the way the
-select and apply for regional and federal support schemes]]></text><icon id="sign_warning"/></topic></topic><topic position="-621,152" order="3" text="Number of applicants" id="176"><topic position="-857,111" order="0" text="Increase in the number of business applying for public support programmes" id="177"/><topic position="-826,138" order="1" text="Number of companies that know about a particular program" id="178"/><topic position="-850,165" order="2" text="Increase in the number of start-ups applying to receive VC investments" id="179"/><topic position="-853,192" order="3" text="Increase in the number of start-ups applying for a place in the incubators" id="180"/></topic></topic><topic position="-491,233" order="1" text="Inputs of measures" shape="rounded rectagle" id="109" bgColor="#feffff"><topic position="-606,219" order="0" text="Qualified staff" id="110"><note><![CDATA[JL: not sure how this would be measured]]></note></topic><topic position="-616,246" order="1" text="Budget per beneficiary" id="111"/></topic><topic position="-502,341" order="2" text="Performance of measure" shape="rounded rectagle" id="48" bgColor="#feffff"><topic position="-649,300" order="0" text="Implementation of measure" shape="line" id="47" bgColor="#feffff"><topic position="-790,273" order="0" text="Target vs. actual KPIs" id="106"/><topic position="-811,300" order="1" text="Intermediate outputs per budget" id="287"/><topic position="-794,327" order="2" text="Qualification of staff" id="372"><icon id="sign_warning"/></topic></topic><topic position="-630,381" order="1" text="Output of measure" id="58"><topic position="-740,354" order="0" text="Opinion surveys" id="101"><topic position="-862,354" order="0" text="Opinions of beneficiaries" id="102"/></topic><topic position="-734,395" order="1" text="Hard metrics" id="103"><topic position="-894,381" order="0" text="Output per headcount (e.g. staff, researchers)" id="289"/><topic position="-842,408" order="1" text="Productivity analysis" id="288"/></topic></topic></topic><topic position="-491,565" order="3" text="Impact of measure" shape="rounded rectagle" id="49" bgColor="#feffff"><topic position="-601,449" order="0" text="Opinion surveys" id="79"><topic position="-762,435" order="0" text="Perception of support impact (opinion polls)" id="294"/><topic position="-828,462" order="1" text="Perception of the activity of regional government by the regional companies " id="404"/></topic><topic position="-595,543" order="1" text="Hard metrics" id="104"><topic position="-764,489" order="0" text="Increase in number of small innovation enterprises " id="331"/><topic position="-842,516" order="1" text="Growth of the total volume of salary in the supported companies (excluding inflation) " id="402"><icon id="sign_warning"/></topic><topic position="-817,543" order="2" text="Growth of the volume of regional taxes paid by the supported companies " id="403"><icon id="sign_warning"/></topic><topic position="-783,570" order="3" text="Growth of the volume of export at the supported companies " id="405"/><topic position="-809,597" order="4" text="Number of new products/projects at the companies that received support " id="406"/></topic><topic position="-608,624" order="2" text="Impact assessment " id="290"/><topic position="-663,655" order="3" id="291"><text><![CDATA[Average leverage of 1rub (there would be
+select and apply for regional and federal support schemes]]></text><icon id="sign_warning"/></topic></topic><topic position="-621,152" order="3" text="Number of applicants" id="176"><topic position="-857,111" order="0" text="Increase in the number of business applying for public support programmes" id="177"/><topic position="-826,138" order="1" text="Number of companies that know about a particular program" id="178"/><topic position="-850,165" order="2" text="Increase in the number of start-ups applying to receive VC investments" id="179"/><topic position="-853,192" order="3" text="Increase in the number of start-ups applying for a place in the incubators" id="180"/></topic></topic><topic position="-491,233" order="1" text="Inputs of measures" shape="rounded rectangle" id="109" bgColor="#feffff"><topic position="-606,219" order="0" text="Qualified staff" id="110"><note><![CDATA[JL: not sure how this would be measured]]></note></topic><topic position="-616,246" order="1" text="Budget per beneficiary" id="111"/></topic><topic position="-502,341" order="2" text="Performance of measure" shape="rounded rectangle" id="48" bgColor="#feffff"><topic position="-649,300" order="0" text="Implementation of measure" shape="line" id="47" bgColor="#feffff"><topic position="-790,273" order="0" text="Target vs. actual KPIs" id="106"/><topic position="-811,300" order="1" text="Intermediate outputs per budget" id="287"/><topic position="-794,327" order="2" text="Qualification of staff" id="372"><icon id="sign_warning"/></topic></topic><topic position="-630,381" order="1" text="Output of measure" id="58"><topic position="-740,354" order="0" text="Opinion surveys" id="101"><topic position="-862,354" order="0" text="Opinions of beneficiaries" id="102"/></topic><topic position="-734,395" order="1" text="Hard metrics" id="103"><topic position="-894,381" order="0" text="Output per headcount (e.g. staff, researchers)" id="289"/><topic position="-842,408" order="1" text="Productivity analysis" id="288"/></topic></topic></topic><topic position="-491,565" order="3" text="Impact of measure" shape="rounded rectangle" id="49" bgColor="#feffff"><topic position="-601,449" order="0" text="Opinion surveys" id="79"><topic position="-762,435" order="0" text="Perception of support impact (opinion polls)" id="294"/><topic position="-828,462" order="1" text="Perception of the activity of regional government by the regional companies " id="404"/></topic><topic position="-595,543" order="1" text="Hard metrics" id="104"><topic position="-764,489" order="0" text="Increase in number of small innovation enterprises " id="331"/><topic position="-842,516" order="1" text="Growth of the total volume of salary in the supported companies (excluding inflation) " id="402"><icon id="sign_warning"/></topic><topic position="-817,543" order="2" text="Growth of the volume of regional taxes paid by the supported companies " id="403"><icon id="sign_warning"/></topic><topic position="-783,570" order="3" text="Growth of the volume of export at the supported companies " id="405"/><topic position="-809,597" order="4" text="Number of new products/projects at the companies that received support " id="406"/></topic><topic position="-608,624" order="2" text="Impact assessment " id="290"/><topic position="-663,655" order="3" id="291"><text><![CDATA[Average leverage of 1rub (there would be
 several programs with different leverage)]]></text><icon id="sign_warning"/></topic><topic position="-687,690" order="4" id="296"><text><![CDATA[Volume of attracted money per one ruble
-of regional budget expenditures on innovation projects]]></text><icon id="sign_warning"/></topic></topic></topic><topic position="288,1687" order="4" text="What investments in innovative projects" shape="rounded rectagle" id="7" fontStyle=";10;;;;"><note><![CDATA[Understanding what investments should be made in innovative projects.]]></note><topic position="518,1673" order="0" text="Competitive niches" shape="rounded rectagle" id="61" bgColor="#feffff"><topic position="632,1521" order="0" text="Clusters behavior" id="59"><topic position="750,1382" order="0" text="Cluster EU star rating" id="60"/><topic position="809,1409" order="1" text="Share of value added of cluster enterprises in GRP" id="318"/><topic position="843,1436" order="2" text="Share of cluster products in the relevant world market segment " id="320"><icon id="sign_warning"/></topic><topic position="803,1463" order="3" text="Share of export in cluster total volume of sales" id="321"/><topic position="830,1490" order="4" text="Growth of the volume of production in the cluster companies" id="379"/><topic position="830,1521" order="5" id="380"><text><![CDATA[Growth of the volume of production in the cluster companies
+of regional budget expenditures on innovation projects]]></text><icon id="sign_warning"/></topic></topic></topic><topic position="288,1687" order="4" text="What investments in innovative projects" shape="rounded rectangle" id="7" fontStyle=";10;;;;"><note><![CDATA[Understanding what investments should be made in innovative projects.]]></note><topic position="518,1673" order="0" text="Competitive niches" shape="rounded rectangle" id="61" bgColor="#feffff"><topic position="632,1521" order="0" text="Clusters behavior" id="59"><topic position="750,1382" order="0" text="Cluster EU star rating" id="60"/><topic position="809,1409" order="1" text="Share of value added of cluster enterprises in GRP" id="318"/><topic position="843,1436" order="2" text="Share of cluster products in the relevant world market segment " id="320"><icon id="sign_warning"/></topic><topic position="803,1463" order="3" text="Share of export in cluster total volume of sales" id="321"/><topic position="830,1490" order="4" text="Growth of the volume of production in the cluster companies" id="379"/><topic position="830,1521" order="5" id="380"><text><![CDATA[Growth of the volume of production in the cluster companies
  to the volume of state support for the cluster]]></text></topic><topic position="830,1552" order="6" text="Growth of the volume of innovation production in the cluster" id="381"/><topic position="887,1579" order="7" text="Share of export in cluster total volume of sales (by zones: US, EU, CIS, other countries) " id="407"/><topic position="741,1633" order="8" text="Internal behavior" id="408"><topic position="870,1606" order="0" text="Median wage in the cluster" id="319"/><topic position="904,1633" order="1" text="Growth of the volume of R&amp;D in the cluster" id="382"/><topic position="857,1660" order="2" text="Cluster collaboration" id="108"/></topic></topic><topic position="606,1700" order="1" text="R&amp;D" id="66"><topic position="678,1687" order="0" text="Patent map" id="65"/><topic position="689,1714" order="1" text="Publications map" id="371"/></topic><topic position="613,1795" order="2" text="Industry" id="67"><topic position="688,1741" order="0" text="FDI map" id="63"/><topic position="695,1768" order="1" text="Gazelle map" id="62"/><topic position="792,1795" order="2" text="Business R&amp;D expenditures as a share of revenues by sector" id="131"/><topic position="765,1822" order="3" text="Share of regional products in the world market" id="378"/><topic position="770,1849" order="4" text="Expenditure on innovation by firm size, by sector " id="414"/></topic><topic position="631,1920" order="3" text="Entrepreneurship" id="72"><topic position="730,1876" order="0" text="Startup map" id="73"/><topic position="755,1903" order="1" text="Venture investment map" id="74"/><topic position="794,1947" order="2" text="Attractiveness to public competitive funding" id="317"><topic position="1004,1930" order="0" text="Fed and regional seed fund investments" id="316"/><topic position="1023,1961" order="1" id="314"><text><![CDATA[FASIE projects: Number of projects supported
-by the FASIE per 1,000 workers [awards/worker] ]]></text></topic></topic></topic></topic><topic position="545,1992" order="1" text="Competitiveness support factors" shape="rounded rectagle" id="64" bgColor="#ffffff"><topic position="716,1992" order="0" text="Private investment in innovation" id="68"/></topic></topic><topic position="-214,749" order="5" text="How to improve image" shape="rounded rectagle" id="69" fontStyle=";10;;;;" bgColor="#e0e5ef"><topic position="-351,735" order="0" text="Rankings" shape="rounded rectagle" id="75" bgColor="#feffff"><topic position="-443,722" order="0" text="macro indicators" id="70"/><topic position="-441,749" order="1" text="meso-indicators" id="71"/></topic><topic position="-395,776" order="1" text="Innovation investment climate" shape="rounded rectagle" id="76" bgColor="#feffff"/></topic></topic><relationship srcTopicId="9" destTopicId="76" lineType="3" srcCtrlPoint="45,123" destCtrlPoint="229,42" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="114" lineType="3" srcCtrlPoint="-58,271" destCtrlPoint="-52,-241" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
+by the FASIE per 1,000 workers [awards/worker] ]]></text></topic></topic></topic></topic><topic position="545,1992" order="1" text="Competitiveness support factors" shape="rounded rectangle" id="64" bgColor="#ffffff"><topic position="716,1992" order="0" text="Private investment in innovation" id="68"/></topic></topic><topic position="-214,749" order="5" text="How to improve image" shape="rounded rectangle" id="69" fontStyle=";10;;;;" bgColor="#e0e5ef"><topic position="-351,735" order="0" text="Rankings" shape="rounded rectangle" id="75" bgColor="#feffff"><topic position="-443,722" order="0" text="macro indicators" id="70"/><topic position="-441,749" order="1" text="meso-indicators" id="71"/></topic><topic position="-395,776" order="1" text="Innovation investment climate" shape="rounded rectangle" id="76" bgColor="#feffff"/></topic></topic><relationship srcTopicId="9" destTopicId="76" lineType="3" srcCtrlPoint="45,123" destCtrlPoint="229,42" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="114" lineType="3" srcCtrlPoint="-58,271" destCtrlPoint="-52,-241" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/input/cdata-support.wxml b/packages/mindplot/test/unit/export/input/cdata-support.wxml
index 4d262220..934bb9e8 100644
--- a/packages/mindplot/test/unit/export/input/cdata-support.wxml
+++ b/packages/mindplot/test/unit/export/input/cdata-support.wxml
@@ -1,5 +1,5 @@
 <map name="71137" version="tango">
-    <topic central="true" text="Observation" shape="rectagle" id="1">
+    <topic central="true" text="Observation" shape="rectangle" id="1">
         <note><![CDATA[Always ask ]]></note>
     </topic>
     <topic position="-4,-107" text="Data Analysis" id="29">
diff --git a/packages/mindplot/test/unit/export/input/complex.wxml b/packages/mindplot/test/unit/export/input/complex.wxml
index c9e716e6..064e9cc2 100644
--- a/packages/mindplot/test/unit/export/input/complex.wxml
+++ b/packages/mindplot/test/unit/export/input/complex.wxml
@@ -92,7 +92,7 @@
             <note text="Assess%20and%20address%20reasons%20why%20talented%20people%20leave%20Freeform"/>
         </topic>
     </topic>
-    <topic position="726,413" text="Business Development Plan" shape="rounded rectagle" id="156"
+    <topic position="726,413" text="Business Development Plan" shape="rounded rectangle" id="156"
            fontStyle=";;#0d0826;;;" bgColor="#32e36a">
         <topic position="894,401" order="0" text="Goals" id="164">
             <topic position="975,422" order="0" text="Increase new clients" id="168">
@@ -113,26 +113,26 @@
             </topic>
         </topic>
     </topic>
-    <topic position="-621,395" text="Hosting NG Plan" shape="rounded rectagle" id="162" fontStyle=";;#0d0826;;;"
+    <topic position="-621,395" text="Hosting NG Plan" shape="rounded rectangle" id="162" fontStyle=";;#0d0826;;;"
            bgColor="#32e36a"/>
-    <topic position="-613,99" text="Freeform IT Plan" shape="rounded rectagle" id="163" bgColor="#52e380">
+    <topic position="-613,99" text="Freeform IT Plan" shape="rounded rectangle" id="163" bgColor="#52e380">
         <topic position="-753,68" order="0" text="Fragile" id="17" fontStyle=";;;bold;;"/>
         <topic position="-749,92" order="1" text="Tools" id="259"/>
         <topic position="-760,116" order="2" id="260"/>
     </topic>
-    <topic position="-548,-87" text="Project Teams" shape="rounded rectagle" shrink="true" id="9" bgColor="#52e380">
+    <topic position="-548,-87" text="Project Teams" shape="rounded rectangle" shrink="true" id="9" bgColor="#52e380">
         <topic position="-668,-142" order="0" text="Projects 1-3" id="13"/>
         <topic position="-668,-118" order="1" text="Projects 4-6" id="14"/>
         <topic position="-672,-94" order="2" text="Projects 7 &amp; 8" id="15"/>
         <topic position="-696,-70" order="3" text="General Work" id="12"/>
         <topic position="-686,-46" order="4" text="Learning Needs Plan" id="11"/>
     </topic>
-    <topic position="-532,-250" text="Restructure" shape="rounded rectagle" shrink="true" id="33" bgColor="#52e380">
+    <topic position="-532,-250" text="Restructure" shape="rounded rectangle" shrink="true" id="33" bgColor="#52e380">
         <topic position="-685,-282" order="0" text="Client Centric Process" id="216"/>
         <topic position="-692,-258" order="1" text="Freeform Project Process" id="217"/>
         <topic position="-693,-234" order="2" text="Supportive Systems Plan" id="218"/>
     </topic>
-    <topic position="-427,-329" text="Board and C Planning" shape="rounded rectagle" shrink="true" id="208"
+    <topic position="-427,-329" text="Board and C Planning" shape="rounded rectangle" shrink="true" id="208"
            bgColor="#52e380">
         <topic position="-614,-384" order="0" text="Mission Statements" id="23">
             <note text="In%20the%20absence%20of%20one%20clearly%20defined%20mission%20statement%2C%20we%20have%20reviewed%20various%20expressed%20mission%20statement%20as%20following%0A%0A%20%20%20%20Objects%20of%20Incorporation%20in%20Letters%20Patent%0A%20%20%20%20%20%20%20%20The%20objects%20of%20the%20Corporation%20are%3ATo%20provide%20solutions%20that%20facilitate%20the%20effective%20use%20of%20information%20technology%20in%20not-for-profit%2C%20non-governmental%2C%20and%20charitable%20organizations%20throughout%20Canada%2C%20to%20support%20and%20improve%20their%20mission%20delivery.%0A%20%20%20%202006%20Strategic%20Business%20Plan%20-%20Brand%20Positioning%0A%20%20%20%20%20%20%20%20We%20are%20a%20nonprofit%20dedicated%20to%20helping%20other%20nonprofits%20understand%20and%20employ%20technology%20appropriately%20and%20effectively%20to%20support%20their%20mission.%20Our%20mission%20is%20to%20provide%20flexible%20consulting%2C%20website%20development%2C%20and%20Internet%20hosting%20solutions%20that%20give%20you%20peace%20of%20mind%20and%20help%20you%20stay%20focused%20on%20your%20mission.%0A%20%20%20%20Freeform%20One%20Page%20%28Freeform%20Wiki%29%0A%20%20%20%20%20%20%20%20About%20Freeform%20Solutions%3A%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization.%20Our%20mission%20is%20help%20%28sic%29%20other%20not-for-profits%20organizations%20to%20build%20their%20capacity%20and%20increase%20their%20effectiveness.%0A%20%20%20%20Result%20of%20Google%20search%20for%20%u201CFreeform%20Solutions%20mission%u201D%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization.%20Our%20mission%20is%20to%20help%20other%20not-for-profits%20use%20technology%20to%20build%20their%20capacity%20and%20increase%20their%20effectiveness.%20%28www.freeformsolutions.ca/en/files/AboutFreeformSolutions.pdf%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20%28www.freeformsolutions.ca%29%20is%20a%20non%20profit%20organization.%20Our%20mission%20is%20to%20help%20other%20non-profit%20organizations%20to%20realize%20their%20missions%20through%20the%20appropriate%20deployment%20of%20information%20and%20knowledge%20management%20systems.www.freeformsolutions.ca/en/sites/default/.../virtual.volunteering.pdf%0A%20%20%20%20%20%20%20%20We%20are%20a%20not-for-profit%20organization%20%28NFP%29%20that%20helps%20other%20NFPs%20use%20IT%20to%20achieve%20their%20organizational%20goals%20and%20better%20serve%20their%20communities.%20Freeform%20Solutions%20is%20a%20nonprofit%20organization%20dedicated%20to%20helping%20other%20nonprofit%20organizations%20understand%20and%20employ%20technology%20appropriately%20and%20effectively%20to%20support%20their%20missions.%20Our%20mission%20is%20to%20provide%20flexible%20consulting%2C%20website%20development%2C%20and%20hosting%20solutions%20%20http%3A//socialinnovation.ca/community/organizations/freeform-solutions%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization%2C%20with%20a%20mission%20to%20help%20other%20not-for-profits%20use%20technology%20more%20effectively%20to%20meet%20their%20own%20missions.%20http%3A//timreview.ca/article/387%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20%u2013%20their%20mission%3A%20%u201Cwe%20help%20not-for-profit%20organisations%20use%20technology%20to%20build%20their%20capacity%20and%20increase%20their%20effectiveness.%20http%3A//www.warnerlaw.ca/links/community-organisations-and-local-businesses/%0A%20%20%20%20%20%20%20%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization%20with%20a%20mission%20to%20help%20other%20not-for-profits%20use%20technology%20to%20meet%20their%20goals.%20http%3A//xoops.org/modules/news/article.php%3Fstoryid%3D3860%0A%20%20%20%20%20%20%20%20At%20Freeform%20Solutions%2C%20we%20have%20a%20mission%20to%20help%20not-for-profit%20and%20public%20sector%20organizations%20use%20technology%20more%20effectively.%20http%3A//osbrca.blogspot.ca/2010/07/development-commons-approach.html%0A%20%20%20%20Freeform%20Solutions%20Facebook%20Page%0A%20%20%20%20%20%20%20%20Mission%3A%20Freeform%20Solutions%20is%20a%20not-for-profit%20organization%20%28NFP%29%20that%20helps%20other%20NFPs%20use%20IT%20to%20achieve%20their%20organizational%20goals%20and%20better%20serve%20their%20communities.%0A%20%20%20%20The%20current%20Freeform%20Solutions%20website%0A%20%20%20%20%20%20%20%20We%20started%20Freeform%20to%20help%20NFPs%20use%20IT%20to%20achieve%20their%20organizational%20goals%20and%20better%20serve%20their%20communities%20-%20to%20support%20and%20improve%20their%20mission%20delivery.%20Our%20mission%20is%20to%20strengthen%20the%20capacity%20of%20NFPs%20and%20the%20voluntary%20sector%2C%20and%20to%20help%20build%20a%20civil%20society."/>
@@ -173,7 +173,7 @@
             <icon id="time_calendar"/>
         </topic>
         <topic position="2514,-503" order="3" text="Have Heather create list benefits against Best Practice &amp; cost"
-               shape="rounded rectagle" id="132">
+               shape="rounded rectangle" id="132">
             <icon id="tick_tick"/>
         </topic>
         <topic position="2430,-479" order="4" text="Have Jason  review list" id="133">
@@ -190,7 +190,7 @@
             <note text="%20so%20that%20our%20efforts%20to%20excel%20are%20rewarded."/>
         </topic>
     </topic>
-    <topic position="607,-489" text="Community Outreach Plan" shape="rounded rectagle" id="248" fontStyle=";8;;bold;;"
+    <topic position="607,-489" text="Community Outreach Plan" shape="rounded rectangle" id="248" fontStyle=";8;;bold;;"
            bgColor="#51e898">
         <topic position="775,-545" order="0" text="Goals" id="285"/>
         <topic position="770,-521" order="1" text="CSI" id="249"/>
@@ -198,10 +198,10 @@
         <topic position="780,-473" order="3" text="CiviCRM" id="251"/>
         <topic position="774,-449" order="4" text="Other" id="252"/>
     </topic>
-    <topic position="469,-596" text="Backlog Plan" shape="rounded rectagle" id="215" fontStyle=";;;bold;;"
+    <topic position="469,-596" text="Backlog Plan" shape="rounded rectangle" id="215" fontStyle=";;;bold;;"
            bgColor="#2ee668">
         <link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit"/>
-        <topic position="645,-605" order="0" text="Go To Backlog Plan " shape="rectagle" id="286" bgColor="#e8da6d">
+        <topic position="645,-605" order="0" text="Go To Backlog Plan " shape="rectangle" id="286" bgColor="#e8da6d">
             <icon id="funy_glasses"/>
             <link url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit"/>
         </topic>
@@ -233,7 +233,7 @@
         </topic>
     </topic>
     <topic position="2250,-634" text="3 Month Onboarding Process" shape="elipse" id="298" bgColor="#adddf0"/>
-    <topic position="558,-26" text="Human Resources Plan" shape="rounded rectagle" id="6" fontStyle=";;#0d0826;bold;;"
+    <topic position="558,-26" text="Human Resources Plan" shape="rounded rectangle" id="6" fontStyle=";;#0d0826;bold;;"
            bgColor="#32e36a">
         <topic position="694,-284" order="0" text="Related Org Objectives" id="287" fontStyle=";;;bold;;">
             <topic position="772,-321" order="0" text="1" id="288">
diff --git a/packages/mindplot/test/unit/export/input/emptyNodes.wxml b/packages/mindplot/test/unit/export/input/emptyNodes.wxml
index 9c08eb07..f428adfb 100644
--- a/packages/mindplot/test/unit/export/input/emptyNodes.wxml
+++ b/packages/mindplot/test/unit/export/input/emptyNodes.wxml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="tango" name="120724   ATG Business plan">
     <topic id="0" central="true" position="0,0" brColor="#808080"
-           bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectagle">
+           bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectangle">
         <text><![CDATA[]]></text>
         <note>
             <text><![CDATA[]]></text>
         </note>
         <topic id="1" position="200,0" order="0" brColor="#808080"
-               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectagle">
+               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectangle">
             <text><![CDATA[objectifs journée]]></text>
             <topic id="2" position="290,-50" order="0" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA["business plan" associatif ?]]></text>
             </topic>
             <topic id="3" position="290,-25" order="1" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[modèle / activités responsabilités]]></text>
             </topic>
             <topic id="4" position="290,0" order="2" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[articulations / LOG]]></text>
             </topic>
         </topic>
         <topic id="5" position="200,100" order="4" brColor="#808080"
-               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectagle">
+               bgColor="#ffcc33" fontStyle="Arial;16;#0000cc;bold;;" shape="rounded rectangle">
             <text><![CDATA[SWOT]]></text>
             <topic id="6" position="290,50" order="0" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[]]></text>
                 <topic id="7" position="380,-375" order="0" shape="line">
                     <text><![CDATA[l'entreprise a aujourd'hui un potentiel important]]></text>
@@ -147,7 +147,7 @@
                 </topic>
             </topic>
             <topic id="46" position="290,75" order="1" brColor="#808080"
-                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectagle">
+                   bgColor="#ffff33" fontStyle="Arial;14;#0000cc;bold;;" shape="rounded rectangle">
                 <text><![CDATA[Risques : cauchemars, dangers]]></text>
                 <topic id="47" position="380,-225" order="0" shape="line">
                     <text><![CDATA[disparition des forces vives, départ de membres actuels]]></text>
diff --git a/packages/mindplot/test/unit/export/input/enc.wxml b/packages/mindplot/test/unit/export/input/enc.wxml
index 36358ae4..e67fe74a 100644
--- a/packages/mindplot/test/unit/export/input/enc.wxml
+++ b/packages/mindplot/test/unit/export/input/enc.wxml
@@ -2,7 +2,7 @@
     <topic central="true" text="Artigos GF comentários interessantes" id="1">
         <topic position="-466,16" order="3"
                text="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities"
-               shape="rectagle" id="5" bgColor="#cccccc" brColor="#cccccc">
+               shape="rectangle" id="5" bgColor="#cccccc" brColor="#cccccc">
             <topic position="-1042,-163" order="0" id="6">
                 <text><![CDATA[Therecent growth of large functional trait data
 bases has been fuelled by standardized protocols forthe
@@ -62,7 +62,7 @@ for at least some traits.]]></text>
                     <![CDATA[Falar que isso corrobora nossa sugestão de utilizar poucas medidas, mas que elas sejam confiáveis.]]></note>
             </topic>
         </topic>
-        <topic position="297,0" order="0" text="Chazdon 2010. Biotropica. 42(1): 31–40" shape="rectagle" id="17"
+        <topic position="297,0" order="0" text="Chazdon 2010. Biotropica. 42(1): 31–40" shape="rectangle" id="17"
                fontStyle=";;#000000;;;" bgColor="#cccccc" brColor="#cccccc">
             <topic position="586,-383" order="1" id="22">
                 <text><![CDATA[Here, we develop a new approach that links functional attributes
@@ -176,7 +176,7 @@ J. Integr. Plant Biol. 50: 547–558.
 ]]></text>
             </topic>
         </topic>
-        <topic position="-313,-224" order="1" text="Poorter 1999. Functional Ecology. 13:396-410" shape="rectagle"
+        <topic position="-313,-224" order="1" text="Poorter 1999. Functional Ecology. 13:396-410" shape="rectangle"
                id="2" fontStyle=";;#000000;;;" bgColor="#cccccc" brColor="#cccccc">
             <topic position="-619,-221" order="0" text="Espécies pioneiras crescem mais rápido do que as não pioneiras"
                    id="3">
diff --git a/packages/mindplot/test/unit/export/input/i18n.wxml b/packages/mindplot/test/unit/export/input/i18n.wxml
index 678c2c6c..fec9c8c0 100644
--- a/packages/mindplot/test/unit/export/input/i18n.wxml
+++ b/packages/mindplot/test/unit/export/input/i18n.wxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map name="basic" version="tango">
-    <topic central="true" id="0" position="0,0" shape="rounded rectagle">
+    <topic central="true" id="0" position="0,0" shape="rounded rectangle">
         <text><![CDATA[i18n]]></text>
         <topic id="1" order="0" position="200,0" shape="line">
             <text><![CDATA[Este es un é con acento]]></text>
diff --git a/packages/mindplot/test/unit/export/input/i18n2.wxml b/packages/mindplot/test/unit/export/input/i18n2.wxml
index 94ce5659..9746fc90 100644
--- a/packages/mindplot/test/unit/export/input/i18n2.wxml
+++ b/packages/mindplot/test/unit/export/input/i18n2.wxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map name="basic" version="tango">
-    <topic central="true" id="0" position="0,0" shape="rounded rectagle">
+    <topic central="true" id="0" position="0,0" shape="rounded rectangle">
         <text><![CDATA[أَبْجَدِيَّة عَرَبِيَّة]]></text>
         <topic id="1" order="0" position="200,0" shape="line">
             <text><![CDATA[أَبْجَدِيَّة عَرَبِ]]></text>
diff --git a/packages/mindplot/test/unit/export/input/issue.wxml b/packages/mindplot/test/unit/export/input/issue.wxml
index e957fa3d..8cb5aa99 100644
--- a/packages/mindplot/test/unit/export/input/issue.wxml
+++ b/packages/mindplot/test/unit/export/input/issue.wxml
@@ -1,67 +1,67 @@
 <map name="70866" version="tango">
-    <topic central="true" text="La computadora" shape="rounded rectagle" id="1" fontStyle="Verdana;15;#feffff;bold;;"
+    <topic central="true" text="La computadora" shape="rounded rectangle" id="1" fontStyle="Verdana;15;#feffff;bold;;"
            bgColor="#cc0000" brColor="#660000">
-        <topic position="220,0" order="0" shape="rounded rectagle" id="21" fontStyle=";10;#feffff;bold;;"
+        <topic position="220,0" order="0" shape="rounded rectangle" id="21" fontStyle=";10;#feffff;bold;;"
                bgColor="#a64d79" brColor="#4c1130">
             <text><![CDATA[Hardware
 (componentes físicos)]]></text>
-            <topic position="386,-29" order="0" shape="rounded rectagle" id="25" fontStyle=";8;#feffff;;;"
+            <topic position="386,-29" order="0" shape="rounded rectangle" id="25" fontStyle=";8;#feffff;;;"
                    bgColor="#c27ba0" brColor="#4c1130">
                 <text><![CDATA[Entrada de datos
 ]]></text>
-                <topic position="558,-34" order="0" shape="rounded rectagle" id="28" fontStyle=";8;#000000;;;"
+                <topic position="558,-34" order="0" shape="rounded rectangle" id="28" fontStyle=";8;#000000;;;"
                        bgColor="#ead1dc" brColor="#4c1130">
                     <text><![CDATA[ Ratón, Teclado, Joystick,
 Cámara digital, Micrófono, Escáner.]]></text>
                 </topic>
             </topic>
-            <topic position="383,0" order="1" text="Salida de datos" shape="rounded rectagle" id="29"
+            <topic position="383,0" order="1" text="Salida de datos" shape="rounded rectangle" id="29"
                    fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130">
-                <topic position="554,0" order="0" shape="rounded rectagle" id="30" fontStyle=";8;#000000;;;"
+                <topic position="554,0" order="0" shape="rounded rectangle" id="30" fontStyle=";8;#000000;;;"
                        bgColor="#ead1dc" brColor="#4c1130">
                     <text><![CDATA[Monitor, Impresora, Bocinas, Plóter.
 ]]></text>
                 </topic>
             </topic>
-            <topic position="387,40" order="2" text="Almacenamiento" shape="rounded rectagle" id="31"
+            <topic position="387,40" order="2" text="Almacenamiento" shape="rounded rectangle" id="31"
                    fontStyle=";8;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130">
-                <topic position="553,35" order="0" shape="rounded rectagle" id="32" fontStyle=";8;#000000;;;"
+                <topic position="553,35" order="0" shape="rounded rectangle" id="32" fontStyle=";8;#000000;;;"
                        bgColor="#ead1dc" brColor="#4c1130">
                     <text><![CDATA[Disquete, Disco compacto, DVD,
 BD, Disco duro, Memoria flash.]]></text>
                 </topic>
             </topic>
         </topic>
-        <topic position="-314,-72" order="1" shape="rectagle" id="59" fontStyle=";8;#000000;bold;;" bgColor="#bf9000"
+        <topic position="-314,-72" order="1" shape="rectangle" id="59" fontStyle=";8;#000000;bold;;" bgColor="#bf9000"
                brColor="#7f6000">
             <text><![CDATA[Software
 (Programas y datos con los que funciona la computadora)
 ]]></text>
-            <topic position="-664,-145" order="0" shape="rectagle" id="92" fontStyle=";8;#000000;normal;;"
+            <topic position="-664,-145" order="0" shape="rectangle" id="92" fontStyle=";8;#000000;normal;;"
                    bgColor="#f1c232" brColor="#7f6000">
                 <text><![CDATA[Software de Sistema:Permite el entendimiento
 entre el usuario y la maquina.]]></text>
-                <topic position="-883,-174" order="0" text="Microsoft Windows" shape="rectagle" id="101"
+                <topic position="-883,-174" order="0" text="Microsoft Windows" shape="rectangle" id="101"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-864,-145" order="1" text="GNU/LINUX" shape="rectagle" id="106"
+                <topic position="-864,-145" order="1" text="GNU/LINUX" shape="rectangle" id="106"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-846,-116" order="2" text="MAC " shape="rectagle" id="107" fontStyle=";8;#000000;;;"
+                <topic position="-846,-116" order="2" text="MAC " shape="rectangle" id="107" fontStyle=";8;#000000;;;"
                        bgColor="#ffd966" brColor="#7f6000"/>
             </topic>
-            <topic position="-667,-43" order="1" shape="rectagle" id="93" fontStyle=";8;#000000;;;" bgColor="#f1c232"
+            <topic position="-667,-43" order="1" shape="rectangle" id="93" fontStyle=";8;#000000;;;" bgColor="#f1c232"
                    brColor="#7f6000">
                 <text><![CDATA[Software de Aplicación: Permite hacer hojas de
 calculo navegar en internet, base de datos, etc.]]></text>
-                <topic position="-855,-87" order="0" text="Office" shape="rectagle" id="108" fontStyle=";8;#000000;;;"
+                <topic position="-855,-87" order="0" text="Office" shape="rectangle" id="108" fontStyle=";8;#000000;;;"
                        bgColor="#ffd966" brColor="#783f04"/>
-                <topic position="-869,-58" order="1" text="Libre Office" shape="rectagle" id="109"
+                <topic position="-869,-58" order="1" text="Libre Office" shape="rectangle" id="109"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-873,-29" order="2" text="Navegadores" shape="rectagle" id="110"
+                <topic position="-873,-29" order="2" text="Navegadores" shape="rectangle" id="110"
                        fontStyle=";8;#000000;;;" bgColor="#ffd966" brColor="#7f6000"/>
-                <topic position="-851,0" order="3" text="Msn" shape="rectagle" id="111" fontStyle=";8;#000000;;;"
+                <topic position="-851,0" order="3" text="Msn" shape="rectangle" id="111" fontStyle=";8;#000000;;;"
                        bgColor="#ffd966" brColor="#783f04"/>
             </topic>
-            <topic position="-590,29" order="2" shape="rectagle" id="94" fontStyle=";8;#000000;;;" bgColor="#f1c232"
+            <topic position="-590,29" order="2" shape="rectangle" id="94" fontStyle=";8;#000000;;;" bgColor="#f1c232"
                    brColor="#7f6000">
                 <text><![CDATA[Software de Desarrollo
 ]]></text>
@@ -79,37 +79,37 @@ calculo navegar en internet, base de datos, etc.]]></text>
             <topic position="-368,174" order="4" text="Tablet PC" shape="elipse" id="13" fontStyle=";8;;bold;;"/>
         </topic>
     </topic>
-    <topic position="283,192" text="CPU y sus partes internas" shape="rounded rectagle" id="35"
+    <topic position="283,192" text="CPU y sus partes internas" shape="rounded rectangle" id="35"
            fontStyle=";10;#feffff;;;" bgColor="#c27ba0" brColor="#4c1130">
-        <topic position="493,120" order="0" text="Ranuras de expansión o PCI" shape="rounded rectagle" id="36"
+        <topic position="493,120" order="0" text="Ranuras de expansión o PCI" shape="rounded rectangle" id="36"
                fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"/>
-        <topic position="458,149" order="1" shape="rounded rectagle" id="38" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="458,149" order="1" shape="rounded rectangle" id="38" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Memoria RAM
 ]]></text>
         </topic>
-        <topic position="466,178" order="2" shape="rounded rectagle" id="40" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="466,178" order="2" shape="rounded rectangle" id="40" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Unidades ópticas
 ]]></text>
         </topic>
-        <topic position="457,207" order="3" shape="rounded rectagle" id="41" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="457,207" order="3" shape="rounded rectangle" id="41" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Tarjeta Madre
 ]]></text>
         </topic>
-        <topic position="465,236" order="4" shape="rounded rectagle" id="42" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="465,236" order="4" shape="rounded rectangle" id="42" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Microprocesador
 ]]></text>
         </topic>
-        <topic position="450,265" order="5" shape="rounded rectagle" id="43" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
+        <topic position="450,265" order="5" shape="rounded rectangle" id="43" fontStyle=";8;#000000;;;" bgColor="#ead1dc"
                brColor="#4c1130">
             <text><![CDATA[Disco Duro
 ]]></text>
         </topic>
     </topic>
-    <topic position="80,-215" shape="rounded rectagle" id="118" fontStyle=";10;#feffff;;;" bgColor="#cc0000"
+    <topic position="80,-215" shape="rounded rectangle" id="118" fontStyle=";10;#feffff;;;" bgColor="#cc0000"
            brColor="#660000">
         <text><![CDATA[Máquina electrónica que sirve para:  escribir,  dibujar,  pintar,
 escuchar música, ver videos, calcular, comunicarnos con otras personas, etc-]]></text>
diff --git a/packages/mindplot/test/unit/export/input/npe.wxml b/packages/mindplot/test/unit/export/input/npe.wxml
index 359233bb..9995bd1f 100644
--- a/packages/mindplot/test/unit/export/input/npe.wxml
+++ b/packages/mindplot/test/unit/export/input/npe.wxml
@@ -1,40 +1,40 @@
 <map name="72597" version="tango">
-    <topic central="-1" text="NIF (NORMAS DE INFORMACIÓN FINANCIERA)" shape="rounded rectagle" id="1"
+    <topic central="-1" text="NIF (NORMAS DE INFORMACIÓN FINANCIERA)" shape="rounded rectangle" id="1"
            fontStyle=";10;#741b47;bold;;" bgColor="#d5a6bd" brColor="#e69138">
         <icon id="object_pencil"/>
     </topic>
-    <topic position="6,-284" text="NIF D" shape="rectagle" id="3" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
+    <topic position="6,-284" text="NIF D" shape="rectangle" id="3" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
         <note>
             <![CDATA[Beneficios a los empleados,impuestos a la utilidad, arrendamientos y capitalización de resultado integral .]]></note>
         <icon id="funy_glasses"/>
         <topic position="211,-280" order="0" text=" Normas aplicables a problemas de determinación de resultados "
                id="19"/>
     </topic>
-    <topic position="46,221" text=" CIRCULANTES" shape="rounded rectagle" id="7" fontStyle="Arial;10;;bold;;"
+    <topic position="46,221" text=" CIRCULANTES" shape="rounded rectangle" id="7" fontStyle="Arial;10;;bold;;"
            bgColor="#509dc0">
         <note>
             <![CDATA[Tratamiento contable de los gastos de registro, colocación, unidades de inversión, aplicación supletoria etc.]]></note>
         <icon id="object_phone"/>
         <topic position="236,225" order="0" text="Adquisición temporal de acciones propias" id="22"/>
     </topic>
-    <topic position="-143,148" text=" NIF A" shape="rectagle" id="6" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
+    <topic position="-143,148" text=" NIF A" shape="rectangle" id="6" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
         <link url="http://www.youtube.com/watch?v=7YN-sOlkQp0" urlType="url"/>
         <icon id="time_hourglass"/>
         <topic position="-254,152" order="0" text=" Marco conceptual" id="20"/>
     </topic>
-    <topic position="-150,-129" text=" NIF C" shape="rectagle" id="4" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
+    <topic position="-150,-129" text=" NIF C" shape="rectangle" id="4" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
         <link url="https://sites.google.com/site/contabilidadimcpnif/estructura-de-las-nif" urlType="url"/>
         <icon id="funy_monkey"/>
         <topic position="-366,-125" order="0"
                text="Normas aplicables a conceptos específicos de los estados financieros " shape="line" id="13"/>
     </topic>
-    <topic position="183,-153" text="NIF E" shape="rectagle" id="2" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
+    <topic position="183,-153" text="NIF E" shape="rectangle" id="2" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
         <note><![CDATA[Agricultura y donativos recibidos u otorgados con propósitos no lucrativos.]]></note>
         <icon id="soft_penguin"/>
         <topic position="402,-149" order="0"
                text=" Normas aplicables alas actividades especializadas de distintos sectores" id="18"/>
     </topic>
-    <topic position="326,127" text=" NIF B" shape="rectagle" id="5" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
+    <topic position="326,127" text=" NIF B" shape="rectangle" id="5" fontStyle="Arial;10;;bold;;" bgColor="#509dc0">
         <link url="http://www.contaduria.uady.mx/files/cuerpo-acad/caef/aief/resumen_NIF_marco_conceptual.pdf"
               urlType="url"/>
         <icon id="object_house"/>
diff --git a/packages/mindplot/test/unit/export/input/process.wxml b/packages/mindplot/test/unit/export/input/process.wxml
index b423097e..f9473846 100644
--- a/packages/mindplot/test/unit/export/input/process.wxml
+++ b/packages/mindplot/test/unit/export/input/process.wxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map name="basic" version="tango">
-    <topic central="true" id="0" position="0,0" shape="rounded rectagle">
+    <topic central="true" id="0" position="0,0" shape="rounded rectangle">
         <text><![CDATA[California]]></text>
         <topic id="1" order="7" position="-200,-200" shape="line">
             <text><![CDATA[Northern California]]></text>
@@ -85,27 +85,27 @@
                     <text><![CDATA[Orange County Eye and Transplant Bank]]></text>
                 </topic>
                 <topic bgColor="#00ffd5" id="29" order="1"
-                    position="380,-225" shape="rounded rectagle">
+                    position="380,-225" shape="rounded rectangle">
                     <text><![CDATA[Northern California Transplant Bank]]></text>
                     <topic id="30" order="0" position="470,-225" shape="line">
                         <text><![CDATA[In 2010, 2,500 referrals forwarded to OneLegacy]]></text>
                     </topic>
                 </topic>
                 <topic bgColor="#00ffd5" id="31" order="2"
-                    position="380,-200" shape="rounded rectagle">
+                    position="380,-200" shape="rounded rectangle">
                     <text><![CDATA[Doheny Eye and Tissue Transplant Bank]]></text>
                     <link url="http://www.dohenyeyebank.org/"/>
                 </topic>
             </topic>
             <topic bgColor="#00ffd5" id="32" order="1"
-                position="290,-175" shape="rounded rectagle">
+                position="290,-175" shape="rounded rectangle">
                 <text><![CDATA[OneLegacy]]></text>
                 <topic id="33" order="0" position="380,-200" shape="line">
                     <text><![CDATA[In 2010, 11,828 referrals]]></text>
                 </topic>
             </topic>
             <topic bgColor="#00ffd5" id="34" order="2"
-                position="290,-150" shape="rounded rectagle">
+                position="290,-150" shape="rounded rectangle">
                 <text><![CDATA[San Diego Eye Bank]]></text>
                 <topic id="35" order="0" position="380,-150" shape="line">
                     <text><![CDATA[In 2010, 2,555 referrals]]></text>
@@ -126,7 +126,7 @@
             <topic id="40" order="6" position="290,-50" shape="line">
                 <text><![CDATA[DCI Donor Services]]></text>
                 <topic bgColor="#00ffd5" id="41" order="0"
-                    position="380,-50" shape="rounded rectagle">
+                    position="380,-50" shape="rounded rectangle">
                     <text><![CDATA[Sierra Eye and Tissue Donor Services]]></text>
                     <topic id="42" order="0" position="470,-75" shape="line">
                         <text><![CDATA[In 2010, 2.023 referrals]]></text>
@@ -134,7 +134,7 @@
                 </topic>
             </topic>
             <topic bgColor="#00ffd5" id="43" order="7"
-                position="290,-25" shape="rounded rectagle">
+                position="290,-25" shape="rounded rectangle">
                 <text><![CDATA[SightLife]]></text>
             </topic>
         </topic>
diff --git a/packages/mindplot/test/unit/import/expected/SQLServer.wxml b/packages/mindplot/test/unit/import/expected/SQLServer.wxml
index d5411c31..c93be2c5 100644
--- a/packages/mindplot/test/unit/import/expected/SQLServer.wxml
+++ b/packages/mindplot/test/unit/import/expected/SQLServer.wxml
@@ -1,59 +1,59 @@
 <map name="SQLServer" version="tango">
     <topic central="true" text="SQL Server 2000 Programming" id="1997664902" fontStyle=";;;;;;#000000;;;" bgColor="#ffff66">
-        <topic position="-200,-400" order="1" text="Source" shape="rounded rectagle" id="1594566921" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="200,0" order="0" text="Microsoft Official Course 2073A Workbook" shape="rectagle" id="376713119" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="200,0" order="0" text="Sep 2000" shape="rectagle" id="762876198" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+        <topic position="-200,-400" order="1" text="Source" shape="rounded rectangle" id="1594566921" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="200,0" order="0" text="Microsoft Official Course 2073A Workbook" shape="rectangle" id="376713119" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="200,0" order="0" text="Sep 2000" shape="rectangle" id="762876198" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
             </topic>
         </topic>
-        <topic position="-290,-112" order="0" text="1. SQL Server Overview" shape="rounded rectagle" id="340496299" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-290,-112" order="0" text="1. SQL Server Overview" shape="rounded rectangle" id="340496299" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/a/a5/SQLServer2000_ServerOverview.mm&amp;mm_title=Overview%20of%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-380,-87" order="1" text="2. SQL Server Programming Overview" shape="rounded rectagle" id="1498687089" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-380,-87" order="1" text="2. SQL Server Programming Overview" shape="rounded rectangle" id="1498687089" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/5/55/SQLServer2000_ProgrammingOverview.mm&amp;mm_title=Overview%20of%20T-SQL%20for%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-470,-62" order="2" text="3. Databases" shape="rounded rectagle" id="1853206071" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-470,-62" order="2" text="3. Databases" shape="rounded rectangle" id="1853206071" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/3/36/SQLServer2000_Databases.mm&amp;mm_title=Creating%20and%20Managing%20SQL%20Server%202000%20Databases" urlType="url"/>
         </topic>
-        <topic position="-560,-37" order="3" text="4. Data Types &amp; Tables" shape="rounded rectagle" id="242712646" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-560,-37" order="3" text="4. Data Types &amp; Tables" shape="rounded rectangle" id="242712646" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/1/1f/SQLServer2000_DataTypesTables.mm&amp;mm_title=Data%20Types%20and%20Managing%20Tables%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-650,-12" order="4" text="5. Data Integrity" shape="rounded rectagle" id="720230444" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-650,-12" order="4" text="5. Data Integrity" shape="rounded rectangle" id="720230444" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/9/97/SQLServer2000_DataIntegrity.mm&amp;mm_title=Data%20Integrity%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-740,13" order="5" text="6. Indexes - Planning" shape="rounded rectagle" id="727690975" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-740,13" order="5" text="6. Indexes - Planning" shape="rounded rectangle" id="727690975" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/5/5c/SQLServer2000_IndexPlanning.mm&amp;mm_title=Overview%20of%20Indexes%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-830,38" order="6" text="7. Indexes - Creating / Maintaining" shape="rounded rectagle" id="1377138658" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-830,38" order="6" text="7. Indexes - Creating / Maintaining" shape="rounded rectangle" id="1377138658" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/0/04/SQLServer2000_IndexCreateMaintain.mm&amp;mm_title=Creating%20and%20Maintaining%20Indexes%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-920,63" order="7" text="8. Views" shape="rounded rectagle" id="1121244967" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-920,63" order="7" text="8. Views" shape="rounded rectangle" id="1121244967" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/4/4d/SQLServer2000_Views.mm&amp;mm_title=Views%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1010,88" order="8" text="9. Stored Procedures" shape="rounded rectagle" id="1174228446" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1010,88" order="8" text="9. Stored Procedures" shape="rounded rectangle" id="1174228446" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/c/c5/SQLServer2000_StoredProcs.mm&amp;mm_title=Stored%20Procedures%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1100,113" order="9" text="9.5 Error Handling" shape="rounded rectagle" id="1" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1100,113" order="9" text="9.5 Error Handling" shape="rounded rectangle" id="1" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/3/3a/SQLServer2000_ErrorHandling.mm&amp;mm_title=Error%20Handling%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1190,138" order="10" text="10. User-defined Functions" shape="rounded rectagle" id="307963497" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1190,138" order="10" text="10. User-defined Functions" shape="rounded rectangle" id="307963497" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/f/fb/SQLServer2000_UDFs.mm&amp;mm_title=User-defined%20Functions%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1280,163" order="11" text="11. Triggers" shape="rounded rectagle" id="1540213298" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1280,163" order="11" text="11. Triggers" shape="rounded rectangle" id="1540213298" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/c/cf/SQLServer2000_Triggers.mm&amp;mm_title=Triggers%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1370,188" order="12" text="12. Multiple Servers" shape="rounded rectagle" id="698724146" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1370,188" order="12" text="12. Multiple Servers" shape="rounded rectangle" id="698724146" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/7/77/SQLServer2000_MultipleServers.mm&amp;mm_title=Dealing%20with%20Multiple%20Servers%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1460,213" order="13" text="13. Optimizing Queries" shape="rounded rectagle" id="490181612" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1460,213" order="13" text="13. Optimizing Queries" shape="rounded rectangle" id="490181612" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/0/06/SQLServer2000_Optimising.mm&amp;mm_title=Optimizing%20Queries%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1550,238" order="14" text="14. Analyzing Queries" shape="rounded rectagle" id="205448863" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1550,238" order="14" text="14. Analyzing Queries" shape="rounded rectangle" id="205448863" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/c/c8/SQLServer2000_Analysing.mm&amp;mm_title=Analyzing%20Queries%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1640,263" order="15" text="15. Transactions and Locks" shape="rounded rectagle" id="547751796" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1640,263" order="15" text="15. Transactions and Locks" shape="rounded rectangle" id="547751796" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/6/60/SQLServer2000_TransLocks.mm&amp;mm_title=Transactions%20and%20Locking%20in%20SQL%20Server%202000" urlType="url"/>
         </topic>
-        <topic position="-1730,288" order="16" text="16. Topics in Exam 70-229 Not Covered in MOC2073" shape="rounded rectagle" id="1101701568" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1730,288" order="16" text="16. Topics in Exam 70-229 Not Covered in MOC2073" shape="rounded rectangle" id="1101701568" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/c/c5/SQLServer2000_OtherTopics.mm&amp;mm_title=SQL%20Server%202000%20-%20Topics%20in%20Exam%2070-229%20Not%20Covered%20in%20MOC%202073" urlType="url"/>
         </topic>
     </topic>
diff --git a/packages/mindplot/test/unit/import/expected/bug2.wxml b/packages/mindplot/test/unit/import/expected/bug2.wxml
index 9e9dc0eb..0389812a 100644
--- a/packages/mindplot/test/unit/import/expected/bug2.wxml
+++ b/packages/mindplot/test/unit/import/expected/bug2.wxml
@@ -27,7 +27,7 @@
         <topic position="-1100,150" order="9" text="Máximo 10/1 por taller" shape="line" id="19"/>
         <topic position="-1190,150" order="10" text="Actividades centradas en el contexto cercano" shape="line" id="37"/>
         <topic position="-1280,175" order="11" text="Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)" shape="line" id="22"/>
-        <topic position="-1370,200" order="12" text="Complementamos el trabajo de la escuela" shape="rounded rectagle" id="27">
+        <topic position="-1370,200" order="12" text="Complementamos el trabajo de la escuela" shape="rounded rectangle" id="27">
             <note><![CDATA[Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.
                         A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,
                         ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.
diff --git a/packages/mindplot/test/unit/import/expected/bug3.wxml b/packages/mindplot/test/unit/import/expected/bug3.wxml
index 4a6b9512..5be0b78c 100644
--- a/packages/mindplot/test/unit/import/expected/bug3.wxml
+++ b/packages/mindplot/test/unit/import/expected/bug3.wxml
@@ -1,23 +1,23 @@
 <map name="bug3" version="tango">
     <topic central="true" text="Indicator needs" id="1">
-        <topic position="200,-100" order="0" text="Which new measures" shape="rounded rectagle" id="5" fontStyle=";;;;;8;;;;">
+        <topic position="200,-100" order="0" text="Which new measures" shape="rounded rectangle" id="5" fontStyle=";;;;;8;;;;">
             <note><![CDATA[Identifying new measures or investments that should be implemented.]]></note>
-            <topic position="200,-50" order="0" text="Landscape of measures" shape="rounded rectagle" id="56" bgColor="#feffff">
+            <topic position="200,-50" order="0" text="Landscape of measures" shape="rounded rectangle" id="56" bgColor="#feffff">
                 <topic position="200,-50" order="0" text="Diversity index of innovation support instruments in the region" shape="line" id="45">
                     <note><![CDATA[Number of different innovations policy instruments existing  in the region as a share of a total number representing a full typology of instruments]]></note>
                 </topic>
                 <topic position="-290,-75" order="0" text="Existing investments in measures" shape="line" id="57"/>
             </topic>
-            <topic position="-290,-125" order="0" text="What other regions do differently" shape="rounded rectagle" id="38" bgColor="#feffff">
+            <topic position="-290,-125" order="0" text="What other regions do differently" shape="rounded rectangle" id="38" bgColor="#feffff">
                 <topic position="290,-162" order="0" text="Balance of measure index" shape="line" id="46"/>
                 <topic position="380,-137" order="1" text="Profile comparison with other regions" shape="line" id="77"/>
                 <topic position="470,-112" order="2" text="Number of specific types of measures per capita" shape="line" id="112"/>
             </topic>
         </topic>
-        <topic position="-290,-37" order="0" text="How to design &amp; implement measures" shape="rounded rectagle" id="6" fontStyle=";;;;;8;;;;">
+        <topic position="-290,-37" order="0" text="How to design &amp; implement measures" shape="rounded rectangle" id="6" fontStyle=";;;;;8;;;;">
             <note><![CDATA[Understanding how to design the details of a particular measure and how to implement them.]]></note>
-            <topic position="290,-62" order="0" text="Good practices" shape="rounded rectagle" id="41" bgColor="#feffff"/>
-            <topic position="380,-37" order="1" text="Diagnostics" shape="rounded rectagle" id="80" bgColor="#feffff">
+            <topic position="290,-62" order="0" text="Good practices" shape="rounded rectangle" id="41" bgColor="#feffff"/>
+            <topic position="380,-37" order="1" text="Diagnostics" shape="rounded rectangle" id="80" bgColor="#feffff">
                 <topic position="-380,-62" order="0" text="Internal business innovation factors" shape="line" id="81"/>
                 <topic position="-470,-37" order="1" text="Return on investment to innovation" shape="line" id="359">
                     <topic position="470,-212" order="0" shape="line" id="360">
@@ -58,9 +58,9 @@
                 </topic>
             </topic>
         </topic>
-        <topic position="-380,-12" order="1" text="How much effort: where &amp; how" shape="rounded rectagle" id="2" fontStyle=";;;;;8;;;;">
+        <topic position="-380,-12" order="1" text="How much effort: where &amp; how" shape="rounded rectangle" id="2" fontStyle=";;;;;8;;;;">
             <note><![CDATA[Understanding the level of effort the region needs to take to compete on innovation and where to put this effort]]></note>
-            <topic position="380,-37" order="0" text="The bottom-line" shape="rounded rectagle" id="3" bgColor="#feffff">
+            <topic position="380,-37" order="0" text="The bottom-line" shape="rounded rectangle" id="3" bgColor="#feffff">
                 <note><![CDATA[This is what policy makers care about in the end]]></note>
                 <topic position="-380,-87" order="0" text="Wages" shape="line" id="15">
                     <topic position="380,-112" order="0" text="Dynamics of real wages" shape="line" id="12"/>
@@ -79,7 +79,7 @@
                     <topic position="650,-24" order="0" text="GRP per capita and its growth rate" shape="line" id="11"/>
                 </topic>
             </topic>
-            <topic position="470,-12" order="1" text="Influencing  factors" shape="rounded rectagle" id="8" bgColor="#feffff">
+            <topic position="470,-12" order="1" text="Influencing  factors" shape="rounded rectangle" id="8" bgColor="#feffff">
                 <topic position="-470,-62" order="0" text="Economy" shape="line" id="55">
                     <topic position="470,-99" order="0" text="Economic structure" shape="line" id="166"/>
                     <topic position="560,-74" order="1" text="Volume of manufacturing production per capita " shape="line" id="395"/>
@@ -358,9 +358,9 @@
                 </topic>
             </topic>
         </topic>
-        <topic position="-470,13" order="2" text="What to do about existing measures" shape="rounded rectagle" id="4" fontStyle=";;;;;8;;;;">
+        <topic position="-470,13" order="2" text="What to do about existing measures" shape="rounded rectangle" id="4" fontStyle=";;;;;8;;;;">
             <note><![CDATA[Understanding which measures should be strengthened, dropped or improved, and how.]]></note>
-            <topic position="470,-37" order="0" text="Demand for measure" shape="rounded rectagle" id="42" bgColor="#feffff">
+            <topic position="470,-37" order="0" text="Demand for measure" shape="rounded rectangle" id="42" bgColor="#feffff">
                 <topic position="-470,-87" order="0" text="Quality of beneficiaries" shape="line" id="50">
                     <topic position="470,-162" order="0" text="Growth rates of employment in supported innovative firms" shape="line" id="292"/>
                     <topic position="560,-137" order="1" text="Growth rates of employment in supported innovative firms" shape="line" id="293"/>
@@ -414,13 +414,13 @@ international)
                     <topic position="1010,13" order="3" text="Increase in the number of start-ups applying for a place in the incubators" shape="line" id="180"/>
                 </topic>
             </topic>
-            <topic position="560,-12" order="1" text="Inputs of measures" shape="rounded rectagle" id="109" bgColor="#feffff">
+            <topic position="560,-12" order="1" text="Inputs of measures" shape="rounded rectangle" id="109" bgColor="#feffff">
                 <topic position="-560,-37" order="0" text="Qualified staff" shape="line" id="110">
                     <note><![CDATA[JL: not sure how this would be measured]]></note>
                 </topic>
                 <topic position="-650,-12" order="1" text="Budget per beneficiary" shape="line" id="111"/>
             </topic>
-            <topic position="650,13" order="2" text="Performance of measure" shape="rounded rectagle" id="48" bgColor="#feffff">
+            <topic position="650,13" order="2" text="Performance of measure" shape="rounded rectangle" id="48" bgColor="#feffff">
                 <topic position="-650,-12" order="0" text="Implementation of measure" shape="line" id="47">
                     <topic position="650,-49" order="0" text="Target vs. actual KPIs" shape="line" id="106"/>
                     <topic position="740,-24" order="1" text="Intermediate outputs per budget" shape="line" id="287"/>
@@ -436,7 +436,7 @@ international)
                     </topic>
                 </topic>
             </topic>
-            <topic position="740,38" order="3" text="Impact of measure" shape="rounded rectagle" id="49" bgColor="#feffff">
+            <topic position="740,38" order="3" text="Impact of measure" shape="rounded rectangle" id="49" bgColor="#feffff">
                 <topic position="-740,-24" order="0" text="Opinion surveys" shape="line" id="79">
                     <topic position="740,-49" order="0" text="Perception of support impact (opinion polls)" shape="line" id="294"/>
                     <topic position="830,-24" order="1" text="Perception of the activity of regional government by the regional companies " shape="line" id="404"/>
@@ -459,9 +459,9 @@ international)
                 </topic>
             </topic>
         </topic>
-        <topic position="-560,38" order="3" text="What investments in innovative projects" shape="rounded rectagle" id="7" fontStyle=";;;;;8;;;;">
+        <topic position="-560,38" order="3" text="What investments in innovative projects" shape="rounded rectangle" id="7" fontStyle=";;;;;8;;;;">
             <note><![CDATA[Understanding what investments should be made in innovative projects.]]></note>
-            <topic position="560,13" order="0" text="Competitive niches" shape="rounded rectagle" id="61" bgColor="#feffff">
+            <topic position="560,13" order="0" text="Competitive niches" shape="rounded rectangle" id="61" bgColor="#feffff">
                 <topic position="-560,-37" order="0" text="Clusters behavior" shape="line" id="59">
                     <topic position="560,-149" order="0" text="Cluster EU star rating" shape="line" id="60"/>
                     <topic position="650,-124" order="1" text="Share of value added of cluster enterprises in GRP" shape="line" id="318"/>
@@ -503,16 +503,16 @@ international)
                     </topic>
                 </topic>
             </topic>
-            <topic position="650,38" order="1" text="Competitiveness support factors" shape="rounded rectagle" id="64" bgColor="#ffffff">
+            <topic position="650,38" order="1" text="Competitiveness support factors" shape="rounded rectangle" id="64" bgColor="#ffffff">
                 <topic position="-650,26" order="0" text="Private investment in innovation" shape="line" id="68"/>
             </topic>
         </topic>
-        <topic position="-650,63" order="4" text="How to improve image" shape="rounded rectagle" id="69" fontStyle=";;;;;8;;;;" bgColor="#e0e5ef">
-            <topic position="650,38" order="0" text="Rankings" shape="rounded rectagle" id="75" bgColor="#feffff">
+        <topic position="-650,63" order="4" text="How to improve image" shape="rounded rectangle" id="69" fontStyle=";;;;;8;;;;" bgColor="#e0e5ef">
+            <topic position="650,38" order="0" text="Rankings" shape="rounded rectangle" id="75" bgColor="#feffff">
                 <topic position="-650,13" order="0" text="macro indicators" shape="line" id="70"/>
                 <topic position="-740,38" order="1" text="meso-indicators" shape="line" id="71"/>
             </topic>
-            <topic position="740,63" order="1" text="Innovation investment climate" shape="rounded rectagle" id="76" bgColor="#feffff"/>
+            <topic position="740,63" order="1" text="Innovation investment climate" shape="rounded rectangle" id="76" bgColor="#feffff"/>
         </topic>
     </topic>
 </map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/import/expected/coderToDeveloper.wxml b/packages/mindplot/test/unit/import/expected/coderToDeveloper.wxml
index df0cd6a6..5ca946c7 100644
--- a/packages/mindplot/test/unit/import/expected/coderToDeveloper.wxml
+++ b/packages/mindplot/test/unit/import/expected/coderToDeveloper.wxml
@@ -1,86 +1,86 @@
 <map name="coderToDeveloper" version="tango">
     <topic central="true" text="CODER TO DEVELOPER" id="959288270" fontStyle=";;;;;;#000000;;;" bgColor="#ffff66">
-        <topic position="-200,-250" order="1" text="SOURCE" shape="rounded rectagle" id="1341324870" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="200,-400" order="0" shape="rectagle" id="1657607465" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+        <topic position="-200,-250" order="1" text="SOURCE" shape="rounded rectangle" id="1341324870" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="200,-400" order="0" shape="rectangle" id="1657607465" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <text><![CDATA[Coder To Developer: Tools and 
 Strategies for Delivering Your Software]]></text>
             </topic>
-            <topic position="290,-362" order="0" text="Mike Gunderloy" shape="rectagle" id="749024001" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
-            <topic position="380,-337" order="1" text="Sybex 2004" shape="rectagle" id="1525405344" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
-            <topic position="470,-312" order="2" text="ISBN: 0-7821-4327-X" shape="rectagle" id="1588889674" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
-            <topic position="560,-287" order="3" text="See" shape="rectagle" id="1232674158" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-560,-299" order="0" text="www.codertodeveloper.com" shape="rectagle" id="668549681" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+            <topic position="290,-362" order="0" text="Mike Gunderloy" shape="rectangle" id="749024001" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
+            <topic position="380,-337" order="1" text="Sybex 2004" shape="rectangle" id="1525405344" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
+            <topic position="470,-312" order="2" text="ISBN: 0-7821-4327-X" shape="rectangle" id="1588889674" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
+            <topic position="560,-287" order="3" text="See" shape="rectangle" id="1232674158" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-560,-299" order="0" text="www.codertodeveloper.com" shape="rectangle" id="668549681" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
                     <link url="http://www.codertodeveloper.com/" urlType="url"/>
                 </topic>
             </topic>
-            <topic position="650,-262" order="4" text="Purchasing" shape="rectagle" id="1091969083" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-650,-274" order="0" text="www.sybex.com" shape="rectagle" id="1166338554" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+            <topic position="650,-262" order="4" text="Purchasing" shape="rectangle" id="1091969083" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-650,-274" order="0" text="www.sybex.com" shape="rectangle" id="1166338554" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
                     <link url="http://www.sybex.com/WileyCDA/SybexTitle/productCd-078214327X,navId-290545.html" urlType="url"/>
                 </topic>
             </topic>
-            <topic position="740,-237" order="5" text="Sample App" shape="rectagle" id="917174317" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-740,-249" order="0" text="Code" shape="rectagle" id="1435167239" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="740,-274" order="0" text="www.codertodeveloper.com" shape="rounded rectagle" id="215997653" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
-                    <topic position="830,-249" order="1" text="www.sybex.com" shape="rounded rectagle" id="1718130091" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+            <topic position="740,-237" order="5" text="Sample App" shape="rectangle" id="917174317" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-740,-249" order="0" text="Code" shape="rectangle" id="1435167239" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="740,-274" order="0" text="www.codertodeveloper.com" shape="rounded rectangle" id="215997653" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+                    <topic position="830,-249" order="1" text="www.sybex.com" shape="rounded rectangle" id="1718130091" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <link url="http://www.sybex.com/WileyCDA/SybexTitle/productCd-078214327X,navId-290545,pageCd-resources.html" urlType="url"/>
                     </topic>
                 </topic>
             </topic>
-            <topic position="830,-212" order="6" text="Links" shape="rectagle" id="597614255" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-830,-237" order="0" text="From Book" shape="rectagle" id="589116686" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-920,-212" order="1" text="www.codertodeveloper.com" shape="rectagle" id="1420184717" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+            <topic position="830,-212" order="6" text="Links" shape="rectangle" id="597614255" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-830,-237" order="0" text="From Book" shape="rectangle" id="589116686" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-920,-212" order="1" text="www.codertodeveloper.com" shape="rectangle" id="1420184717" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
                     <link url="http://www.codertodeveloper.com/resource_list.htm" urlType="url"/>
                 </topic>
             </topic>
-            <topic position="920,-187" order="7" text="Tools" shape="rectagle" id="1905535002" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-920,-199" order="0" text="www.larkware.com" shape="rectagle" id="1613874812" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+            <topic position="920,-187" order="7" text="Tools" shape="rectangle" id="1905535002" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-920,-199" order="0" text="www.larkware.com" shape="rectangle" id="1613874812" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
                     <link url="http://www.larkware.com/" urlType="url"/>
                 </topic>
             </topic>
         </topic>
-        <topic position="-290,-75" order="0" text="PLANNING" shape="rounded rectagle" id="1" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-290,-75" order="0" text="PLANNING" shape="rounded rectangle" id="1" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/9/92/CToD_Planning.mm&amp;mm_title=Coder%20To%20Developer%3A%20Planning" urlType="url"/>
         </topic>
-        <topic position="-380,-50" order="1" text="ORGANIZING" shape="rounded rectagle" id="1060251300" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-380,-50" order="1" text="ORGANIZING" shape="rounded rectangle" id="1060251300" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/4/48/CToD_Organizing.mm&amp;mm_title=Coder%20To%20Developer%3A%20Organizing" urlType="url"/>
         </topic>
-        <topic position="-470,-25" order="2" text="SOURCE CODE CONTROL" shape="rounded rectagle" id="1158389225" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-470,-25" order="2" text="SOURCE CODE CONTROL" shape="rounded rectangle" id="1158389225" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/a/a2/CToD_SourceCodeControl.mm&amp;mm_title=Coder%20To%20Developer%3A%20Source%20Code%20Control" urlType="url"/>
         </topic>
-        <topic position="-560,0" order="3" text="DEFENSIVE CODING" shape="rounded rectagle" id="1155248709" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-560,0" order="3" text="DEFENSIVE CODING" shape="rounded rectangle" id="1155248709" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/7/71/CToD_DefensiveCoding.mm&amp;mm_title=Coder%20To%20Developer%3A%20Defensive%20Coding" urlType="url"/>
         </topic>
-        <topic position="-650,25" order="4" text="UNIT TESTING" shape="rounded rectagle" id="1933919293" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-650,25" order="4" text="UNIT TESTING" shape="rounded rectangle" id="1933919293" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/4/4b/CToD_UnitTest.mm&amp;mm_title=Coder%20To%20Developer%3A%20Unit%20Testing" urlType="url"/>
         </topic>
-        <topic position="-740,0" order="5" text="CUSTOMIZING VISUAL STUDIO" shape="rounded rectagle" id="541948911" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-740,0" order="5" text="CUSTOMIZING VISUAL STUDIO" shape="rounded rectangle" id="541948911" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/5/54/CToD_CustomVisStudio.mm&amp;mm_title=Coder%20To%20Developer%3A%20Customising%20Visual%20Studio" urlType="url"/>
         </topic>
-        <topic position="-830,25" order="6" text="SOURCE CODE" shape="rounded rectagle" id="1350092286" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-830,25" order="6" text="SOURCE CODE" shape="rounded rectangle" id="1350092286" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/d/d6/CToD_SourceCode.mm&amp;mm_title=Coder%20To%20Developer%3A%20Source%20Code" urlType="url"/>
         </topic>
-        <topic position="-920,50" order="7" text="CODE GENERATION" shape="rounded rectagle" id="1754489817" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-920,50" order="7" text="CODE GENERATION" shape="rounded rectangle" id="1754489817" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/0/0c/CToD_CodeGeneration.mm&amp;mm_title=Coder%20To%20Developer%3A%20Code%20Generation" urlType="url"/>
         </topic>
-        <topic position="-1010,75" order="8" text="BUG TRACKING AND FIXING" shape="rounded rectagle" id="755597485" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1010,75" order="8" text="BUG TRACKING AND FIXING" shape="rounded rectangle" id="755597485" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/3/39/CToD_Bugs.mm&amp;mm_title=Coder%20To%20Developer%3A%20Bug%20Tracking%20and%20Fixing" urlType="url"/>
         </topic>
-        <topic position="-1100,100" order="9" text="LOGGING" shape="rounded rectagle" id="53404299" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1100,100" order="9" text="LOGGING" shape="rounded rectangle" id="53404299" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/f/ff/CToD_Logging.mm&amp;mm_title=Coder%20To%20Developer%3A%20Logging" urlType="url"/>
         </topic>
-        <topic position="-1190,125" order="10" text="WORKING IN SMALL TEAMS" shape="rounded rectagle" id="1441208135" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1190,125" order="10" text="WORKING IN SMALL TEAMS" shape="rounded rectangle" id="1441208135" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/7/78/CToD_SmallTeams.mm&amp;mm_title=Coder%20To%20Developer%3A%20Working%20in%20Small%20Teams" urlType="url"/>
         </topic>
-        <topic position="-1280,150" order="11" text="DOCUMENTATION" shape="rounded rectagle" id="1087671931" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1280,150" order="11" text="DOCUMENTATION" shape="rounded rectangle" id="1087671931" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/c/ca/CToD_Docs.mm&amp;mm_title=Coder%20To%20Developer%3A%20Documentation" urlType="url"/>
         </topic>
-        <topic position="-1370,175" order="12" text="BUILDING PROJECTS" shape="rounded rectagle" id="1197890915" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1370,175" order="12" text="BUILDING PROJECTS" shape="rounded rectangle" id="1197890915" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/0/05/CToD_Building.mm&amp;mm_title=Coder%20To%20Developer%3A%20Building%20Projects" urlType="url"/>
         </topic>
-        <topic position="-1460,200" order="13" text="INTELLECTUAL PROPERTY" shape="rounded rectagle" id="1185268713" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1460,200" order="13" text="INTELLECTUAL PROPERTY" shape="rounded rectangle" id="1185268713" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/0/01/CToD_IP.mm&amp;mm_title=Coder%20To%20Developer%3A%20Intellectual%20Property" urlType="url"/>
         </topic>
-        <topic position="-1550,225" order="14" text="DEPLOYING PROJECTS" shape="rounded rectagle" id="54793383" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1550,225" order="14" text="DEPLOYING PROJECTS" shape="rounded rectangle" id="54793383" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/a/a1/CToD_Deploying.mm&amp;mm_title=Coder%20To%20Developer%3A%20Deploying%20Projects" urlType="url"/>
         </topic>
     </topic>
diff --git a/packages/mindplot/test/unit/import/expected/emptyNodes.wxml b/packages/mindplot/test/unit/import/expected/emptyNodes.wxml
index 50803a15..488524ab 100644
--- a/packages/mindplot/test/unit/import/expected/emptyNodes.wxml
+++ b/packages/mindplot/test/unit/import/expected/emptyNodes.wxml
@@ -1,12 +1,12 @@
 <map name="emptyNodes" version="tango">
     <topic central="true" id="0" fontStyle=";;;;;;#0000cc;;;" bgColor="#ffcc33">
-        <topic position="200,-50" order="0" text="objectifs journée" shape="rounded rectagle" id="1" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
-            <topic position="200,-100" order="0" text="&quot;business plan&quot; associatif ?" shape="rounded rectagle" id="2" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
-            <topic position="-290,-87" order="0" text="modèle / activités responsabilités" shape="rounded rectagle" id="3" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
-            <topic position="-380,-62" order="1" text="articulations / LOG" shape="rounded rectagle" id="4" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
+        <topic position="200,-50" order="0" text="objectifs journée" shape="rounded rectangle" id="1" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
+            <topic position="200,-100" order="0" text="&quot;business plan&quot; associatif ?" shape="rounded rectangle" id="2" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
+            <topic position="-290,-87" order="0" text="modèle / activités responsabilités" shape="rounded rectangle" id="3" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
+            <topic position="-380,-62" order="1" text="articulations / LOG" shape="rounded rectangle" id="4" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080"/>
         </topic>
-        <topic position="-290,-25" order="0" text="SWOT" shape="rounded rectagle" id="5" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
-            <topic position="290,-50" order="0" shape="rounded rectagle" id="6" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
+        <topic position="-290,-25" order="0" text="SWOT" shape="rounded rectangle" id="5" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
+            <topic position="290,-50" order="0" shape="rounded rectangle" id="6" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
                 <topic position="-290,-437" order="0" text="l'entreprise a aujourd'hui un potentiel important" shape="line" id="7">
                     <topic position="290,-474" order="0" text="compétences professionnel" shape="line" id="8"/>
                     <topic position="380,-449" order="1" text="citoyen" shape="line" id="9"/>
@@ -50,7 +50,7 @@
                 <topic position="-2900,288" order="29" text="attirer de nouveaux membres locomotives" shape="line" id="44"/>
                 <topic position="-2990,313" order="30" text="pratiquons en interne et externe une gouvernance explaire etune citoyennté de rêve" shape="line" id="45"/>
             </topic>
-            <topic position="380,-25" order="1" text="Risques : cauchemars, dangers" shape="rounded rectagle" id="46" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
+            <topic position="380,-25" order="1" text="Risques : cauchemars, dangers" shape="rounded rectangle" id="46" fontStyle=";;;;Arial;8;#0000cc;;;" bgColor="#808080">
                 <topic position="-380,-312" order="0" text="disparition des forces vives, départ de membres actuels" shape="line" id="47"/>
                 <topic position="-470,-287" order="1" text="opportunités atteignables mais difficile" shape="line" id="48"/>
                 <topic position="-560,-262" order="2" text="difficultés de travailler ensemble dans la durée" shape="line" id="49"/>
diff --git a/packages/mindplot/test/unit/import/expected/enc.wxml b/packages/mindplot/test/unit/import/expected/enc.wxml
index d3e663f6..f7abf944 100644
--- a/packages/mindplot/test/unit/import/expected/enc.wxml
+++ b/packages/mindplot/test/unit/import/expected/enc.wxml
@@ -1,6 +1,6 @@
 <map name="enc" version="tango">
     <topic central="true" text="Artigos GF comentários interessantes" id="1">
-        <topic position="-200,-50" order="1" shape="rectagle" id="5" bgColor="#cccccc">
+        <topic position="-200,-50" order="1" shape="rectangle" id="5" bgColor="#cccccc">
             <text><![CDATA[Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant
 communities]]></text>
             <topic position="-200,-350" order="1" text="undefined" shape="line" id="6"/>
@@ -55,7 +55,7 @@ tb.]]></text>
                 <note><![CDATA[Falar que isso corrobora nossa sugestão de utilizar poucas medidas, mas que elas sejam confiáveis.]]></note>
             </topic>
         </topic>
-        <topic position="-290,-12" order="0" text="Chazdon 2010. Biotropica. 42(1): 31–40" shape="rectagle" id="17" fontStyle=";;;;;;#000000;;;" bgColor="#cccccc">
+        <topic position="-290,-12" order="0" text="Chazdon 2010. Biotropica. 42(1): 31–40" shape="rectangle" id="17" fontStyle=";;;;;;#000000;;;" bgColor="#cccccc">
             <topic position="290,-137" order="0" shape="line" id="22">
                 <text><![CDATA[Here, we develop a new approach that links functional attributes
                             of tree species with studies of forest recovery and regional
@@ -134,7 +134,7 @@ construir classificações mais detalhadas e com mais dados confiáveis.
                             J. Integr. Plant Biol. 50: 547–558.]]></text>
             </topic>
         </topic>
-        <topic position="-380,0" order="1" text="Poorter 1999. Functional Ecology. 13:396-410" shape="rectagle" id="2" fontStyle=";;;;;;#000000;;;" bgColor="#cccccc">
+        <topic position="-380,0" order="1" text="Poorter 1999. Functional Ecology. 13:396-410" shape="rectangle" id="2" fontStyle=";;;;;;#000000;;;" bgColor="#cccccc">
             <topic position="380,-12" order="0" text="Espécies pioneiras crescem mais rápido do que as não pioneiras" shape="line" id="3">
                 <topic position="-380,-24" order="0" text="Tolerância a sombra está relacionada com persistência e não com crescimento" shape="line" id="4"/>
             </topic>
diff --git a/packages/mindplot/test/unit/import/expected/freeMind_resources.wxml b/packages/mindplot/test/unit/import/expected/freeMind_resources.wxml
index 2f024a6c..7a390247 100644
--- a/packages/mindplot/test/unit/import/expected/freeMind_resources.wxml
+++ b/packages/mindplot/test/unit/import/expected/freeMind_resources.wxml
@@ -65,7 +65,7 @@ Ctrl + F in your browser?]]></note>
             </topic>
         </topic>
         <topic position="-290,-37" order="0" text="Applet Browser" shape="line" id="1647062097" fontStyle=";;;;SansSerif;8;#0033ff;;;" bgColor="undefined">
-            <topic position="290,-62" order="0" text="What is it?" shape="rounded rectagle" id="287577997" fontStyle=";;;;SansSerif;8;#00b439;italic;;" bgColor="undefined">
+            <topic position="290,-62" order="0" text="What is it?" shape="rounded rectangle" id="287577997" fontStyle=";;;;SansSerif;8;#00b439;italic;;" bgColor="undefined">
                 <topic position="-290,-87" order="0" text="A Java applet based browser " shape="line" id="1855944960" fontStyle=";;;;SansSerif;8;#990000;;;"/>
                 <topic position="-380,-62" order="1" text="Expects Java 1.4 or above on client machine" shape="line" id="300344325" fontStyle=";;;;SansSerif;8;#990000;;;"/>
             </topic>
diff --git a/packages/mindplot/test/unit/import/expected/issue.wxml b/packages/mindplot/test/unit/import/expected/issue.wxml
index b7fe5309..660159ff 100644
--- a/packages/mindplot/test/unit/import/expected/issue.wxml
+++ b/packages/mindplot/test/unit/import/expected/issue.wxml
@@ -1,50 +1,50 @@
 <map name="issue" version="tango">
     <topic central="true" text="La computadora" id="1" fontStyle=";;;;;;#feffff;;;" bgColor="#cc0000">
-        <topic position="200,0" order="0" shape="rounded rectagle" id="21" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
+        <topic position="200,0" order="0" shape="rounded rectangle" id="21" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
             <text><![CDATA[Hardware
                         (componentes físicos)]]></text>
-            <topic position="200,-100" order="0" text="Entrada de datos" shape="rounded rectagle" id="25" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
-                <topic position="200,0" order="0" shape="rounded rectagle" id="28" fontStyle=";;;;;8;#000000;;;" bgColor="#4c1130">
+            <topic position="200,-100" order="0" text="Entrada de datos" shape="rounded rectangle" id="25" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
+                <topic position="200,0" order="0" shape="rounded rectangle" id="28" fontStyle=";;;;;8;#000000;;;" bgColor="#4c1130">
                     <text><![CDATA[Ratón, Teclado, Joystick,
                                 Cámara digital, Micrófono, Escáner.]]></text>
                 </topic>
             </topic>
-            <topic position="-290,-37" order="0" text="Salida de datos" shape="rounded rectagle" id="29" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
-                <topic position="290,-49" order="0" text="Monitor, Impresora, Bocinas, Plóter." shape="rounded rectagle" id="30" fontStyle=";;;;;8;#000000;;;" bgColor="#4c1130"/>
+            <topic position="-290,-37" order="0" text="Salida de datos" shape="rounded rectangle" id="29" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
+                <topic position="290,-49" order="0" text="Monitor, Impresora, Bocinas, Plóter." shape="rounded rectangle" id="30" fontStyle=";;;;;8;#000000;;;" bgColor="#4c1130"/>
             </topic>
-            <topic position="-380,-12" order="1" text="Almacenamiento" shape="rounded rectagle" id="31" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
-                <topic position="380,-24" order="0" shape="rounded rectagle" id="32" fontStyle=";;;;;8;#000000;;;" bgColor="#4c1130">
+            <topic position="-380,-12" order="1" text="Almacenamiento" shape="rounded rectangle" id="31" fontStyle=";;;;;8;#feffff;;;" bgColor="#4c1130">
+                <topic position="380,-24" order="0" shape="rounded rectangle" id="32" fontStyle=";;;;;8;#000000;;;" bgColor="#4c1130">
                     <text><![CDATA[Disquete, Disco compacto, DVD,
                                 BD, Disco duro, Memoria flash.]]></text>
                 </topic>
             </topic>
         </topic>
-        <topic position="-290,-25" order="0" shape="rectagle" id="59" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000">
+        <topic position="-290,-25" order="0" shape="rectangle" id="59" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000">
             <text><![CDATA[Software
                         (Programas y datos con los que funciona la computadora)]]></text>
-            <topic position="290,-62" order="0" shape="rectagle" id="92" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000">
+            <topic position="290,-62" order="0" shape="rectangle" id="92" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000">
                 <text><![CDATA[Software de Sistema:Permite el entendimiento
                             entre el usuario y la maquina.]]></text>
-                <topic position="-290,-99" order="0" text="Microsoft Windows" shape="rectagle" id="101" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
-                <topic position="-380,-74" order="1" text="GNU/LINUX" shape="rectagle" id="106" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
-                <topic position="-470,-49" order="2" text="MAC " shape="rectagle" id="107" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
+                <topic position="-290,-99" order="0" text="Microsoft Windows" shape="rectangle" id="101" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
+                <topic position="-380,-74" order="1" text="GNU/LINUX" shape="rectangle" id="106" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
+                <topic position="-470,-49" order="2" text="MAC " shape="rectangle" id="107" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
             </topic>
-            <topic position="380,-37" order="1" shape="rectagle" id="93" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000">
+            <topic position="380,-37" order="1" shape="rectangle" id="93" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000">
                 <text><![CDATA[Software de Aplicación: Permite hacer hojas de
                             calculo navegar en internet, base de datos, etc.]]></text>
-                <topic position="-380,-87" order="0" text="Office" shape="rectagle" id="108" fontStyle=";;;;;8;#000000;;;" bgColor="#783f04"/>
-                <topic position="-470,-62" order="1" text="Libre Office" shape="rectagle" id="109" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
-                <topic position="-560,-37" order="2" text="Navegadores" shape="rectagle" id="110" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
-                <topic position="-650,-12" order="3" text="Msn" shape="rectagle" id="111" fontStyle=";;;;;8;#000000;;;" bgColor="#783f04"/>
+                <topic position="-380,-87" order="0" text="Office" shape="rectangle" id="108" fontStyle=";;;;;8;#000000;;;" bgColor="#783f04"/>
+                <topic position="-470,-62" order="1" text="Libre Office" shape="rectangle" id="109" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
+                <topic position="-560,-37" order="2" text="Navegadores" shape="rectangle" id="110" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
+                <topic position="-650,-12" order="3" text="Msn" shape="rectangle" id="111" fontStyle=";;;;;8;#000000;;;" bgColor="#783f04"/>
             </topic>
-            <topic position="470,-12" order="2" text="Software de Desarrollo" shape="rectagle" id="94" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
+            <topic position="470,-12" order="2" text="Software de Desarrollo" shape="rectangle" id="94" fontStyle=";;;;;8;#000000;;;" bgColor="#7f6000"/>
         </topic>
-        <topic position="-380,0" order="1" text="Tipos de computadora" shape="rounded rectagle" id="3" fontStyle=";;;;;8;;;;">
-            <topic position="380,-62" order="0" text="Computadora personal de escritorio o Desktop" shape="rounded rectagle" id="8" fontStyle=";;;;;8;;;;"/>
-            <topic position="470,-37" order="1" text="PDA" shape="rounded rectagle" id="10" fontStyle=";;;;;8;;;;"/>
-            <topic position="560,-12" order="2" text="Laptop" shape="rounded rectagle" id="11" fontStyle=";;;;;8;;;;"/>
-            <topic position="650,13" order="3" text="Servidor" shape="rounded rectagle" id="12" fontStyle=";;;;;8;;;;"/>
-            <topic position="740,38" order="4" text="Tablet PC" shape="rounded rectagle" id="13" fontStyle=";;;;;8;;;;"/>
+        <topic position="-380,0" order="1" text="Tipos de computadora" shape="rounded rectangle" id="3" fontStyle=";;;;;8;;;;">
+            <topic position="380,-62" order="0" text="Computadora personal de escritorio o Desktop" shape="rounded rectangle" id="8" fontStyle=";;;;;8;;;;"/>
+            <topic position="470,-37" order="1" text="PDA" shape="rounded rectangle" id="10" fontStyle=";;;;;8;;;;"/>
+            <topic position="560,-12" order="2" text="Laptop" shape="rounded rectangle" id="11" fontStyle=";;;;;8;;;;"/>
+            <topic position="650,13" order="3" text="Servidor" shape="rounded rectangle" id="12" fontStyle=";;;;;8;;;;"/>
+            <topic position="740,38" order="4" text="Tablet PC" shape="rounded rectangle" id="13" fontStyle=";;;;;8;;;;"/>
         </topic>
     </topic>
 </map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/import/expected/process.wxml b/packages/mindplot/test/unit/import/expected/process.wxml
index 21972ee1..083fce0f 100644
--- a/packages/mindplot/test/unit/import/expected/process.wxml
+++ b/packages/mindplot/test/unit/import/expected/process.wxml
@@ -33,17 +33,17 @@
         <topic position="-560,25" order="3" text="Corneal Tissue OPS" shape="line" id="26">
             <topic position="560,-75" order="0" text="Transplant Bank International" shape="line" id="27">
                 <topic position="-560,-112" order="0" text="Orange County Eye and Transplant Bank" shape="line" id="28"/>
-                <topic position="-650,-87" order="1" text="Northern California Transplant Bank" shape="rounded rectagle" id="29" bgColor="#00ffd5">
+                <topic position="-650,-87" order="1" text="Northern California Transplant Bank" shape="rounded rectangle" id="29" bgColor="#00ffd5">
                     <topic position="650,-99" order="0" text="In 2010, 2,500 referrals forwarded to OneLegacy" shape="line" id="30"/>
                 </topic>
-                <topic position="-740,-62" order="2" text="Doheny Eye and Tissue Transplant Bank" shape="rounded rectagle" id="31" bgColor="#00ffd5">
+                <topic position="-740,-62" order="2" text="Doheny Eye and Tissue Transplant Bank" shape="rounded rectangle" id="31" bgColor="#00ffd5">
                     <link url="http://www.dohenyeyebank.org/" urlType="url"/>
                 </topic>
             </topic>
-            <topic position="650,-50" order="1" text="OneLegacy" shape="rounded rectagle" id="32" bgColor="#00ffd5">
+            <topic position="650,-50" order="1" text="OneLegacy" shape="rounded rectangle" id="32" bgColor="#00ffd5">
                 <topic position="-650,-62" order="0" text="In 2010, 11,828 referrals" shape="line" id="33"/>
             </topic>
-            <topic position="740,-25" order="2" text="San Diego Eye Bank" shape="rounded rectagle" id="34" bgColor="#00ffd5">
+            <topic position="740,-25" order="2" text="San Diego Eye Bank" shape="rounded rectangle" id="34" bgColor="#00ffd5">
                 <topic position="-740,-37" order="0" text="In 2010, 2,555 referrals" shape="line" id="35"/>
             </topic>
             <topic position="830,0" order="3" text="California Transplant Donor Network" shape="line" id="36"/>
@@ -52,11 +52,11 @@
             </topic>
             <topic position="1010,50" order="5" text="Lifesharing" shape="line" id="39"/>
             <topic position="1100,75" order="6" text="DCI Donor Services" shape="line" id="40">
-                <topic position="-1100,63" order="0" text="Sierra Eye and Tissue Donor Services" shape="rounded rectagle" id="41" bgColor="#00ffd5">
+                <topic position="-1100,63" order="0" text="Sierra Eye and Tissue Donor Services" shape="rounded rectangle" id="41" bgColor="#00ffd5">
                     <topic position="1100,51" order="0" text="In 2010, 2.023 referrals" shape="line" id="42"/>
                 </topic>
             </topic>
-            <topic position="1190,100" order="7" text="SightLife" shape="rounded rectagle" id="43" bgColor="#00ffd5"/>
+            <topic position="1190,100" order="7" text="SightLife" shape="rounded rectangle" id="43" bgColor="#00ffd5"/>
         </topic>
         <topic position="-650,38" order="4" text="Tools" shape="line" id="44">
             <topic position="650,13" order="0" text="Darthmouth Atlas of Health" shape="line" id="45"/>
diff --git a/packages/mindplot/test/unit/import/expected/pub_sub.wxml b/packages/mindplot/test/unit/import/expected/pub_sub.wxml
index a8c567d7..c6fb262f 100644
--- a/packages/mindplot/test/unit/import/expected/pub_sub.wxml
+++ b/packages/mindplot/test/unit/import/expected/pub_sub.wxml
@@ -1,6 +1,6 @@
 <map name="pub_sub" version="tango">
     <topic central="true" text="Publish-Subscribe" id="1778785299">
-        <topic position="200,-100" order="0" text="Paradigm" shape="rounded rectagle" id="1019693507">
+        <topic position="200,-100" order="0" text="Paradigm" shape="rounded rectangle" id="1019693507">
             <topic position="200,-100" order="0" text="Publish-Subscribe Messaging" shape="line" id="175305277">
                 <topic position="200,-100" order="0" text="Supports Complex Interaction Models" shape="line" id="1"/>
                 <topic position="-290,-137" order="0" text="Application-to-Application" shape="line" id="2"/>
@@ -16,8 +16,8 @@
             </topic>
             <topic position="-380,-112" order="1" text="Net-Centric Architecture" shape="line" id="10"/>
         </topic>
-        <topic position="-290,-37" order="0" text="Environment" shape="rounded rectagle" id="886974979">
-            <topic position="290,-87" order="0" text="System Architceture" shape="rounded rectagle" id="1585705589">
+        <topic position="-290,-37" order="0" text="Environment" shape="rounded rectangle" id="886974979">
+            <topic position="290,-87" order="0" text="System Architceture" shape="rounded rectangle" id="1585705589">
                 <topic position="-290,-137" order="0" text="Enterprise Middleware" shape="line" id="11"/>
                 <topic position="-380,-112" order="1" text="Peer-to-Peer" shape="line" id="12"/>
                 <topic position="-470,-87" order="2" text="Web Services" shape="line" id="13"/>
@@ -56,8 +56,8 @@
                 <topic position="-650,-12" order="1" text="Security induces state" shape="line" id="35"/>
             </topic>
         </topic>
-        <topic position="-380,-12" order="1" text="Implementation" shape="rounded rectagle" id="244172068">
-            <topic position="380,-62" order="0" text="General" shape="rounded rectagle" id="1588169997">
+        <topic position="-380,-12" order="1" text="Implementation" shape="rounded rectangle" id="244172068">
+            <topic position="380,-62" order="0" text="General" shape="rounded rectangle" id="1588169997">
                 <topic position="-380,-137" order="0" text="Reliability, Availability" shape="line" id="36"/>
                 <topic position="-470,-112" order="1" text="Scalability" shape="line" id="37">
                     <topic position="470,-124" order="0" text="Hierarchical Dissemination" shape="line" id="38">
@@ -165,14 +165,14 @@
                 </topic>
             </topic>
         </topic>
-        <topic position="-470,13" order="2" text="Open Issues" shape="rounded rectagle" shrink="true" id="17419879">
+        <topic position="-470,13" order="2" text="Open Issues" shape="rounded rectangle" shrink="true" id="17419879">
             <topic position="470,-12" order="0" text="Deep technical problems vs. pragmatic issues" shape="line" id="106"/>
             <topic position="560,13" order="1" text="Mobility" shape="line" id="107">
                 <topic position="-560,-12" order="0" text="Freedom of movement" shape="line" id="108"/>
                 <topic position="-650,13" order="1" text="Reconfiguration of services" shape="line" id="109"/>
             </topic>
         </topic>
-        <topic position="-560,38" order="3" text="Data Model" shape="rounded rectagle" id="1570911201">
+        <topic position="-560,38" order="3" text="Data Model" shape="rounded rectangle" id="1570911201">
             <topic position="560,1" order="0" text="Taxonomy" shape="line" shrink="true" id="1041132637">
                 <topic position="-560,-49" order="0" text="Atomic" shape="line" id="110"/>
                 <topic position="-650,-24" order="1" text="Structured" shape="line" id="111"/>
@@ -196,7 +196,7 @@
                 <topic position="-920,64" order="2" text="Matching" shape="line" id="124"/>
             </topic>
         </topic>
-        <topic position="-650,63" order="4" text="Security Model" shape="rounded rectagle" id="227090963">
+        <topic position="-650,63" order="4" text="Security Model" shape="rounded rectangle" id="227090963">
             <topic position="650,-37" order="0" text="General" shape="line" id="1890338517">
                 <topic position="-650,-87" order="0" text="Require &quot;many-to-many &quot; semantic through many parties" shape="line" id="125"/>
                 <topic position="-740,-62" order="1" text="Security for pub-pub application" shape="line" id="126">
diff --git a/packages/mindplot/test/unit/import/expected/python.wxml b/packages/mindplot/test/unit/import/expected/python.wxml
index 51fc0e1b..9f9b41b0 100644
--- a/packages/mindplot/test/unit/import/expected/python.wxml
+++ b/packages/mindplot/test/unit/import/expected/python.wxml
@@ -1,96 +1,96 @@
 <map name="python" version="tango">
     <topic central="true" text="Python Language" id="839220195" fontStyle=";;;;;;#000000;;;" bgColor="#ffff66">
-        <topic position="200,-900" order="0" text="Operators" shape="rounded rectagle" id="1297750582" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="200,-900" order="0" text="Operators" shape="rounded rectangle" id="1297750582" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=1&amp;initLoadFile=/wiki/images/5/5a/Python_Operators.mm&amp;mm_title=Python%20Operators" urlType="url"/>
         </topic>
-        <topic position="-290,-237" order="0" text="Control Flow" shape="rounded rectagle" id="925623560" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-290,-237" order="0" text="Control Flow" shape="rounded rectangle" id="925623560" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/d/d3/Python_ControlFlow2.mm&amp;mm_title=Control%20Flow%20in%20Python" urlType="url"/>
         </topic>
-        <topic position="-380,-212" order="1" text="Functions" shape="rounded rectagle" id="43284047" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-380,-212" order="1" text="Functions" shape="rounded rectangle" id="43284047" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/3/36/Python_Functions2.mm&amp;mm_title=Python%20Functions" urlType="url"/>
         </topic>
-        <topic position="-470,-187" order="2" text="Modules" shape="rounded rectagle" id="941305946" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-470,-187" order="2" text="Modules" shape="rounded rectangle" id="941305946" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/9/9f/Python_Modules_WebLinks.mm&amp;mm_title=Python%20Modules" urlType="url"/>
-            <topic position="470,-199" order="0" text="Importing" shape="rectagle" id="33365258" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="470,-199" order="0" text="Importing" shape="rectangle" id="33365258" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/a/a7/Python_Modules_Importing.mm&amp;mm_title=Importing%20Python%20Modules" urlType="url"/>
             </topic>
         </topic>
-        <topic position="-560,-162" order="3" text="sys.path" shape="rounded rectagle" id="870573867" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-560,-162" order="3" text="sys.path" shape="rounded rectangle" id="870573867" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/e/e3/Python_Path2.mm&amp;mm_title=Python%20sys.path" urlType="url"/>
         </topic>
-        <topic position="-650,-137" order="4" text="Packages" shape="rounded rectagle" id="373733403" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-650,-137" order="4" text="Packages" shape="rounded rectangle" id="373733403" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/e/e9/Python_Packages2.mm&amp;mm_title=Python%20Packages" urlType="url"/>
         </topic>
-        <topic position="-740,-112" order="5" text="Classes" shape="rounded rectagle" id="42563653" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-740,-112" order="5" text="Classes" shape="rounded rectangle" id="42563653" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/6/67/Python_Classes_WebLinks.mm&amp;mm_title=Python%20Classes" urlType="url"/>
-            <topic position="740,-162" order="0" text="Methods" shape="rounded rectagle" id="248209168" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="740,-162" order="0" text="Methods" shape="rounded rectangle" id="248209168" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/8/89/Python_Classes_Methods.mm&amp;mm_title=Python%20Methods" urlType="url"/>
             </topic>
-            <topic position="830,-137" order="1" text="Inheritance" shape="rounded rectagle" id="162137343" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="830,-137" order="1" text="Inheritance" shape="rounded rectangle" id="162137343" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/4/46/Python_Classes_Inheritance.mm&amp;mm_title=Inheritance%20in%20Python" urlType="url"/>
             </topic>
-            <topic position="920,-112" order="2" text="Attribute Inheritance Search" shape="rounded rectagle" id="314760601" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="920,-112" order="2" text="Attribute Inheritance Search" shape="rounded rectangle" id="314760601" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/4/46/Python_Classes_Inheritance.mm&amp;mm_title=Inheritance%20in%20Python" urlType="url"/>
             </topic>
-            <topic position="1010,-87" order="3" text="New-style Classes" shape="rectagle" id="1014089682" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="1010,-87" order="3" text="New-style Classes" shape="rectangle" id="1014089682" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/e/ef/Python_Classes_Newstyle.mm&amp;mm_title=Python%20New-style%20Classes" urlType="url"/>
             </topic>
         </topic>
-        <topic position="-830,-87" order="6" text="Scoping, Namespaces" shape="rounded rectagle" id="137608830" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-830,-87" order="6" text="Scoping, Namespaces" shape="rounded rectangle" id="137608830" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/7/74/Python_Scoping_And_Namespaces2.mm&amp;mm_title=Python%20Scoping%20and%20Namespaces" urlType="url"/>
         </topic>
-        <topic position="-920,-62" order="7" text="Exceptions" shape="rounded rectagle" id="50696333" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-920,-62" order="7" text="Exceptions" shape="rounded rectangle" id="50696333" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=1&amp;initLoadFile=/wiki/images/1/1a/Python_Exceptions2.mm&amp;mm_title=Python%20Exceptions%20and%20Exception%20Handling" urlType="url"/>
         </topic>
-        <topic position="-1010,-37" order="8" text="Iterators and Generators" shape="rounded rectagle" id="1500711771" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1010,-37" order="8" text="Iterators and Generators" shape="rounded rectangle" id="1500711771" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/8/8f/Python_Iterators.mm&amp;mm_title=Python%20Iterators%2C%20Generators%20and%20Generator%20Expressions" urlType="url"/>
         </topic>
-        <topic position="-1100,-12" order="9" text="Special Method Attributes" shape="rounded rectagle" id="1259199925" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1100,-12" order="9" text="Special Method Attributes" shape="rounded rectangle" id="1259199925" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/5/5c/Python_SpecialAttributes_WebLinks.mm&amp;mm_title=Special%20Attributes%20in%20Python" urlType="url"/>
         </topic>
-        <topic position="-1190,13" order="10" text="File System Useful Functions" shape="rounded rectagle" id="1694945670" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1190,13" order="10" text="File System Useful Functions" shape="rounded rectangle" id="1694945670" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/a/a8/Python_FileSystem.mm&amp;mm_title=Useful%20Python%20Functions%20for%20Operating%20on%20the%20File%20System" urlType="url"/>
         </topic>
-        <topic position="-1280,38" order="11" text="File I/O" shape="rounded rectagle" id="1195661090" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1280,38" order="11" text="File I/O" shape="rounded rectangle" id="1195661090" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/2/24/Python_FileIO2.mm&amp;mm_title=Python%20File%20IO" urlType="url"/>
         </topic>
-        <topic position="-1370,63" order="12" text="Data Serialization" shape="rounded rectagle" id="602160149" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1370,63" order="12" text="Data Serialization" shape="rounded rectangle" id="602160149" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/1/17/Python_DataSerialization2.mm&amp;mm_title=Python%20Data%20Serialization" urlType="url"/>
         </topic>
-        <topic position="-1460,88" order="13" text="Delegation, Callbacks and Decorators" shape="rounded rectagle" id="1935675521" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1460,88" order="13" text="Delegation, Callbacks and Decorators" shape="rounded rectangle" id="1935675521" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/1/10/Python_Delegation.mm&amp;mm_title=Python%20Delegation%2C%20Callbacks%20and%20Decorators" urlType="url"/>
         </topic>
-        <topic position="-1550,113" order="14" text="Regular Expressions" shape="rounded rectagle" id="710876781" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1550,113" order="14" text="Regular Expressions" shape="rounded rectangle" id="710876781" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/7/7f/Python_RegularExpressions.mm&amp;mm_title=Python%20Regular%20Expressions" urlType="url"/>
         </topic>
-        <topic position="-1640,138" order="15" text="Windows, COM" shape="rounded rectagle" id="950644393" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="1640,113" order="0" text="Python COM Server" shape="rectagle" id="611860677" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+        <topic position="-1640,138" order="15" text="Windows, COM" shape="rounded rectangle" id="950644393" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="1640,113" order="0" text="Python COM Server" shape="rectangle" id="611860677" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/4/45/Python_COMServer.mm&amp;mm_title=Python%20COM%20Server%20%28Windows%20Only%29" urlType="url"/>
             </topic>
-            <topic position="1730,138" order="1" text="Python Client-side COM" shape="rectagle" id="1212768514" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="1730,138" order="1" text="Python Client-side COM" shape="rectangle" id="1212768514" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/f/f3/Python_COMClientSide.mm&amp;mm_title=Python%20Client-side%20COM%20%28Windows%20Only%29" urlType="url"/>
             </topic>
         </topic>
-        <topic position="-1730,163" order="16" text="Miscellaneous" shape="rounded rectagle" id="410804486" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="1730,113" order="0" text="Empty Placeholder" shape="rounded rectagle" shrink="true" id="216222883" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-1730,101" order="0" text="pass" shape="rectagle" shrink="true" id="960362756" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
-                    <topic position="1730,76" order="0" text="EG" shape="rectagle" shrink="true" id="1413300827" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+        <topic position="-1730,163" order="16" text="Miscellaneous" shape="rounded rectangle" id="410804486" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="1730,113" order="0" text="Empty Placeholder" shape="rounded rectangle" shrink="true" id="216222883" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-1730,101" order="0" text="pass" shape="rectangle" shrink="true" id="960362756" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
+                    <topic position="1730,76" order="0" text="EG" shape="rectangle" shrink="true" id="1413300827" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-1730,64" order="0" shape="line" id="343426327" fontStyle=";;;;;;#000000;;;">
                             <text><![CDATA[while x < a:
     pass]]></text>
                         </topic>
                     </topic>
-                    <topic position="1820,101" order="1" text="Useful" shape="rectagle" shrink="true" id="148179241" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+                    <topic position="1820,101" order="1" text="Useful" shape="rectangle" shrink="true" id="148179241" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-1820,89" order="0" text="Stub Code" shape="line" shrink="true" id="1655738492" fontStyle=";;;;;;#000000;;;">
                             <topic position="1820,77" order="0" text="To Fill In Later" shape="line" id="722854259" fontStyle=";;;;;;#000000;;;"/>
                         </topic>
                     </topic>
                 </topic>
             </topic>
-            <topic position="1820,138" order="1" text="Future Language Features" shape="rectagle" shrink="true" id="284656157" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-1820,101" order="0" text="__future__ Module" shape="rectagle" id="1074301759" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-1910,126" order="1" text="Will Become" shape="rectagle" shrink="true" id="1968353063" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="1910,114" order="0" text="Standard" shape="rectagle" shrink="true" id="103089226" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+            <topic position="1820,138" order="1" text="Future Language Features" shape="rectangle" shrink="true" id="284656157" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-1820,101" order="0" text="__future__ Module" shape="rectangle" id="1074301759" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-1910,126" order="1" text="Will Become" shape="rectangle" shrink="true" id="1968353063" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="1910,114" order="0" text="Standard" shape="rectangle" shrink="true" id="103089226" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-1910,102" order="0" text="In" shape="line" shrink="true" id="1232954476" fontStyle=";;;;;;#000000;;;">
                             <topic position="1910,90" order="0" text="Future Edition" shape="line" shrink="true" id="636908811">
                                 <topic position="-1910,78" order="0" text="Python" shape="line" id="1862127571"/>
@@ -98,91 +98,91 @@
                         </topic>
                     </topic>
                 </topic>
-                <topic position="-2000,151" order="2" text="from __future__ import &lt;feature name&gt;" shape="rectagle" id="1192405210" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2000,151" order="2" text="from __future__ import &lt;feature name&gt;" shape="rectangle" id="1192405210" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
             </topic>
-            <topic position="1910,163" order="2" text="Executing Code Strings" shape="rounded rectagle" shrink="true" id="171652609" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-1910,151" order="0" text="exec" shape="rectagle" id="493710140" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff"/>
+            <topic position="1910,163" order="2" text="Executing Code Strings" shape="rounded rectangle" shrink="true" id="171652609" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-1910,151" order="0" text="exec" shape="rectangle" id="493710140" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff"/>
             </topic>
-            <topic position="2000,188" order="3" text="Printing" shape="rectagle" id="1061642683" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="2000,188" order="3" text="Printing" shape="rectangle" id="1061642683" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/7/78/Python_Print.mm&amp;mm_title=Printing%20in%20Python" urlType="url"/>
             </topic>
         </topic>
-        <topic position="-1820,188" order="17" text="Tools" shape="rounded rectagle" id="339808348" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-1820,188" order="17" text="Tools" shape="rounded rectangle" id="339808348" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/5/58/Python_Tools.mm&amp;mm_title=Useful%20Tools%20for%20Python%20Developers" urlType="url"/>
         </topic>
-        <topic position="-1910,300" order="18" text="Sources" shape="rounded rectagle" id="1418013461" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="1910,263" order="0" text="The Quick Python Book" shape="rectagle" shrink="true" id="826312042" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-1910,188" order="0" text="Harms, Daryl D." shape="rounded rectagle" id="1996207289" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2000,213" order="1" text="McDonald, Kenneth" shape="rounded rectagle" id="383517101" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2090,238" order="2" text="Manning Publications Co." shape="rounded rectagle" id="1698437504" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2180,263" order="3" text="1999" shape="rounded rectagle" id="615897615" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2270,288" order="4" text="ISBN 1-884777-74-0" shape="rounded rectagle" id="723474810" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2360,313" order="5" text="Python Version" shape="rounded rectagle" shrink="true" id="1103530142" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2360,301" order="0" text="1.5.2" shape="rounded rectagle" id="180808477" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+        <topic position="-1910,300" order="18" text="Sources" shape="rounded rectangle" id="1418013461" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="1910,263" order="0" text="The Quick Python Book" shape="rectangle" shrink="true" id="826312042" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-1910,188" order="0" text="Harms, Daryl D." shape="rounded rectangle" id="1996207289" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2000,213" order="1" text="McDonald, Kenneth" shape="rounded rectangle" id="383517101" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2090,238" order="2" text="Manning Publications Co." shape="rounded rectangle" id="1698437504" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2180,263" order="3" text="1999" shape="rounded rectangle" id="615897615" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2270,288" order="4" text="ISBN 1-884777-74-0" shape="rounded rectangle" id="723474810" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2360,313" order="5" text="Python Version" shape="rounded rectangle" shrink="true" id="1103530142" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2360,301" order="0" text="1.5.2" shape="rounded rectangle" id="180808477" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
                 </topic>
             </topic>
-            <topic position="2000,288" order="1" text="Learning Python, 3rd Edition" shape="rectagle" shrink="true" id="589134829" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2000,226" order="0" text="Lutz, Mark" shape="rectagle" id="1822890051" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2090,251" order="1" text="O'Reilly Media" shape="rectagle" id="568361499" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2180,276" order="2" text="2008" shape="rectagle" id="1839765866" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2270,301" order="3" text="ISBN-10: 0-596-51398-4" shape="rectagle" id="844895767" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
-                <topic position="-2360,326" order="4" text="Python Version" shape="rectagle" shrink="true" id="619327232" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2360,314" order="0" text="2.5" shape="rectagle" id="803477492" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+            <topic position="2000,288" order="1" text="Learning Python, 3rd Edition" shape="rectangle" shrink="true" id="589134829" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2000,226" order="0" text="Lutz, Mark" shape="rectangle" id="1822890051" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2090,251" order="1" text="O'Reilly Media" shape="rectangle" id="568361499" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2180,276" order="2" text="2008" shape="rectangle" id="1839765866" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2270,301" order="3" text="ISBN-10: 0-596-51398-4" shape="rectangle" id="844895767" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+                <topic position="-2360,326" order="4" text="Python Version" shape="rectangle" shrink="true" id="619327232" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2360,314" order="0" text="2.5" shape="rectangle" id="803477492" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
                 </topic>
             </topic>
-            <topic position="2090,313" order="2" text="Python Library Reference" shape="rectagle" shrink="true" id="216007275" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2090,301" order="0" text="Python Version" shape="rounded rectagle" shrink="true" id="846688505" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2090,289" order="0" text="2.5" shape="rounded rectagle" id="1966201406" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+            <topic position="2090,313" order="2" text="Python Library Reference" shape="rectangle" shrink="true" id="216007275" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2090,301" order="0" text="Python Version" shape="rounded rectangle" shrink="true" id="846688505" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2090,289" order="0" text="2.5" shape="rounded rectangle" id="1966201406" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
                 </topic>
             </topic>
         </topic>
-        <topic position="-2000,325" order="19" text="Good References" shape="rounded rectagle" id="408691934" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="2000,288" order="0" text="Python 2.5 Quick Reference" shape="rectagle" id="1159506227" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+        <topic position="-2000,325" order="19" text="Good References" shape="rounded rectangle" id="408691934" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="2000,288" order="0" text="Python 2.5 Quick Reference" shape="rectangle" id="1159506227" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://rgruet.free.fr/PQR25/PQR2.5.html" urlType="url"/>
             </topic>
-            <topic position="2090,313" order="1" text="Python Library Reference" shape="rectagle" id="403604653" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="2090,313" order="1" text="Python Library Reference" shape="rectangle" id="403604653" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://www.python.org/doc/current/lib/" urlType="url"/>
             </topic>
-            <topic position="2180,338" order="2" text="Tutorial" shape="rectagle" shrink="true" id="1090520692" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2180,326" order="0" text="Dive Into Python" shape="rectagle" shrink="true" id="1535875895" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+            <topic position="2180,338" order="2" text="Tutorial" shape="rectangle" shrink="true" id="1090520692" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2180,326" order="0" text="Dive Into Python" shape="rectangle" shrink="true" id="1535875895" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
                     <link url="http://diveintopython.org/toc/index.html" urlType="url"/>
-                    <topic position="2180,314" order="0" text="eBook" shape="rectagle" id="530171131" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+                    <topic position="2180,314" order="0" text="eBook" shape="rectangle" id="530171131" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
                 </topic>
             </topic>
         </topic>
-        <topic position="-2090,350" order="20" text="Good For" shape="rounded rectagle" id="1119763140" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="2090,275" order="0" text="Internal Logic" shape="rounded rectagle" id="1033376248" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
-            <topic position="2180,300" order="1" text="Serialization" shape="rounded rectagle" shrink="true" id="690803073" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2180,275" order="0" text="Via" shape="rectagle" shrink="true" id="1922775420" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2180,263" order="0" text="cPickle" shape="rounded rectagle" id="840960577" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+        <topic position="-2090,350" order="20" text="Good For" shape="rounded rectangle" id="1119763140" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="2090,275" order="0" text="Internal Logic" shape="rounded rectangle" id="1033376248" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
+            <topic position="2180,300" order="1" text="Serialization" shape="rounded rectangle" shrink="true" id="690803073" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2180,275" order="0" text="Via" shape="rectangle" shrink="true" id="1922775420" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2180,263" order="0" text="cPickle" shape="rounded rectangle" id="840960577" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
                 </topic>
-                <topic position="-2270,300" order="1" text="For" shape="rectagle" shrink="true" id="1747246492" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2270,288" order="0" text="Object" shape="rounded rectagle" shrink="true" id="1134905437" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+                <topic position="-2270,300" order="1" text="For" shape="rectangle" shrink="true" id="1747246492" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2270,288" order="0" text="Object" shape="rounded rectangle" shrink="true" id="1134905437" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-2270,263" order="0" text="Storage" shape="line" id="1461256366" fontStyle=";;;;;;#000000;;;"/>
                         <topic position="-2360,288" order="1" text="Transmission" shape="line" id="319385397" fontStyle=";;;;;;#000000;;;"/>
                     </topic>
                 </topic>
             </topic>
-            <topic position="2270,325" order="2" text="Macros" shape="rounded rectagle" id="794590494" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
-            <topic position="2360,350" order="3" text="List Manipulation" shape="rounded rectagle" id="1361141366" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
-            <topic position="2450,375" order="4" text="Scripting Language" shape="rounded rectagle" shrink="true" id="1265703728" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2450,363" order="0" text="For" shape="rectagle" shrink="true" id="864746490" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2450,351" order="0" text="Applications" shape="rounded rectagle" id="834911546" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+            <topic position="2270,325" order="2" text="Macros" shape="rounded rectangle" id="794590494" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
+            <topic position="2360,350" order="3" text="List Manipulation" shape="rounded rectangle" id="1361141366" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
+            <topic position="2450,375" order="4" text="Scripting Language" shape="rounded rectangle" shrink="true" id="1265703728" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2450,363" order="0" text="For" shape="rectangle" shrink="true" id="864746490" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2450,351" order="0" text="Applications" shape="rounded rectangle" id="834911546" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
                 </topic>
             </topic>
-            <topic position="2540,400" order="5" text="NOT" shape="rounded rectagle" shrink="true" id="478941778" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2540,388" order="0" text="UI" shape="rectagle" id="1073082243" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
+            <topic position="2540,400" order="5" text="NOT" shape="rounded rectangle" shrink="true" id="478941778" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2540,388" order="0" text="UI" shape="rectangle" id="1073082243" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff"/>
             </topic>
         </topic>
-        <topic position="-2180,375" order="21" text="Definitions" shape="rounded rectagle" id="1122845804" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
-            <topic position="2180,350" order="0" text="Module" shape="rectagle" shrink="true" id="840405826" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2180,325" order="0" text="Text File" shape="rectagle" shrink="true" id="566688799" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2180,313" order="0" text="Containing" shape="rectagle" shrink="true" id="672124937" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+        <topic position="-2180,375" order="21" text="Definitions" shape="rounded rectangle" id="1122845804" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+            <topic position="2180,350" order="0" text="Module" shape="rectangle" shrink="true" id="840405826" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2180,325" order="0" text="Text File" shape="rectangle" shrink="true" id="566688799" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2180,313" order="0" text="Containing" shape="rectangle" shrink="true" id="672124937" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-2180,301" order="0" text="Python Statements" shape="line" id="1702192141" fontStyle=";;;;;;#000000;;;"/>
                     </topic>
                 </topic>
-                <topic position="-2270,350" order="1" text=".py Extension" shape="rectagle" shrink="true" id="390798590" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2270,338" order="0" text="Allows" shape="rectagle" shrink="true" id="335165396" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+                <topic position="-2270,350" order="1" text=".py Extension" shape="rectangle" shrink="true" id="390798590" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2270,338" order="0" text="Allows" shape="rectangle" shrink="true" id="335165396" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-2270,326" order="0" text="Importing" shape="line" shrink="true" id="1607129465" fontStyle=";;;;;;#000000;;;">
                             <topic position="2270,314" order="0" text="Into" shape="line" shrink="true" id="1403960256">
                                 <topic position="-2270,302" order="0" text="Other" shape="line" shrink="true" id="113989320">
@@ -195,15 +195,15 @@
                     </topic>
                 </topic>
             </topic>
-            <topic position="2270,375" order="1" text="Script" shape="rectagle" shrink="true" id="395160073" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2270,350" order="0" text="Module" shape="rectagle" shrink="true" id="1329016047" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2270,338" order="0" text="Top-level" shape="rectagle" shrink="true" id="1277010492" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+            <topic position="2270,375" order="1" text="Script" shape="rectangle" shrink="true" id="395160073" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2270,350" order="0" text="Module" shape="rectangle" shrink="true" id="1329016047" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2270,338" order="0" text="Top-level" shape="rectangle" shrink="true" id="1277010492" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-2270,313" order="0" text="With" shape="line" shrink="true" id="1711834777" fontStyle=";;;;;;#000000;;;">
-                            <topic position="2270,301" order="0" text="Entry Point" shape="rectagle" id="1909734320" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
+                            <topic position="2270,301" order="0" text="Entry Point" shape="rectangle" id="1909734320" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff"/>
                         </topic>
                         <topic position="-2360,338" order="1" text="Can Run" shape="line" shrink="true" id="954195369" fontStyle=";;;;;;#000000;;;">
                             <topic position="2360,313" order="0" text="Directly" shape="line" id="766218881"/>
-                            <topic position="2450,338" order="1" text="From" shape="rectagle" shrink="true" id="1311896276" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+                            <topic position="2450,338" order="1" text="From" shape="rectangle" shrink="true" id="1311896276" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                                 <topic position="-2450,301" order="0" text="Commandline" shape="line" id="732073344" fontStyle=";;;;;;#000000;;;"/>
                                 <topic position="-2540,326" order="1" text="Run Window" shape="line" shrink="true" id="1452833927" fontStyle=";;;;;;#000000;;;">
                                     <topic position="2540,314" order="0" text="In" shape="line" shrink="true" id="1357024336">
@@ -215,69 +215,69 @@
                         </topic>
                     </topic>
                 </topic>
-                <topic position="-2360,375" order="1" text="Extension" shape="rectagle" shrink="true" id="1767810300" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
-                    <topic position="2360,363" order="0" text="NOT Required" shape="rounded rectagle" shrink="true" id="375617029" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+                <topic position="-2360,375" order="1" text="Extension" shape="rectangle" shrink="true" id="1767810300" fontStyle=";;;;;;#000000;;;" bgColor="#bbffff">
+                    <topic position="2360,363" order="0" text="NOT Required" shape="rounded rectangle" shrink="true" id="375617029" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <topic position="-2360,351" order="0" text=".py" shape="line" id="1629169951" fontStyle=";;;;;;#000000;;;"/>
                     </topic>
                 </topic>
             </topic>
         </topic>
-        <topic position="-2270,400" order="22" text="Python Implemenations" shape="rounded rectagle" id="278508781" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2270,400" order="22" text="Python Implemenations" shape="rounded rectangle" id="278508781" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/e/ef/Python_Implementations.mm&amp;mm_title=Different%20Implementations%20of%20Python" urlType="url"/>
         </topic>
-        <topic position="-2360,425" order="23" text="Syntax" shape="rounded rectagle" id="1136447695" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2360,425" order="23" text="Syntax" shape="rounded rectangle" id="1136447695" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/4/4f/Python_Syntax.mm&amp;mm_title=Python%20Syntax" urlType="url"/>
         </topic>
-        <topic position="-2450,450" order="24" text="Executing Python" shape="rounded rectagle" id="332530597" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2450,450" order="24" text="Executing Python" shape="rounded rectangle" id="332530597" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/1/1b/Python_Execution.mm&amp;mm_title=Different%20Ways%20of%20Running%20Python%20Programs" urlType="url"/>
         </topic>
-        <topic position="-2540,475" order="25" text="Getting Informaton" shape="rounded rectagle" id="10" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2540,475" order="25" text="Getting Informaton" shape="rounded rectangle" id="10" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/4/4b/Python_Information.mm&amp;mm_title=How%20to%20Get%20Information%20in%20Python" urlType="url"/>
         </topic>
-        <topic position="-2630,500" order="26" text="Naming Conventions" shape="rounded rectagle" id="1594651750" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2630,500" order="26" text="Naming Conventions" shape="rounded rectangle" id="1594651750" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/2/2f/Python_NamingConventions2.mm&amp;mm_title=Python%20Naming%20Conventions" urlType="url"/>
         </topic>
-        <topic position="-2720,525" order="27" text="Type System" shape="rounded rectagle" id="1547162624" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2720,525" order="27" text="Type System" shape="rounded rectangle" id="1547162624" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/9/95/Python_TypeSystem.mm&amp;mm_title=The%20CPython%20Type%20System" urlType="url"/>
-            <topic position="2720,513" order="0" text="CPython" shape="rectagle" id="190569951" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
+            <topic position="2720,513" order="0" text="CPython" shape="rectangle" id="190569951" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99"/>
         </topic>
-        <topic position="-2810,550" order="28" text="Built-in Data Types" shape="rounded rectagle" id="559844936" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2810,550" order="28" text="Built-in Data Types" shape="rounded rectangle" id="559844936" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/b/b0/Python_DataTypes_WebLinks.mm&amp;mm_title=Python%20Data%20Types" urlType="url"/>
-            <topic position="2810,475" order="0" text="Numeric Types" shape="rounded rectagle" id="154102391" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="2810,475" order="0" text="Numeric Types" shape="rounded rectangle" id="154102391" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/f/fd/Python_DataTypes_Numeric2.mm&amp;mm_title=Python%20Numeric%20Data%20Types" urlType="url"/>
             </topic>
-            <topic position="2900,500" order="1" text="Sequence Types" shape="rounded rectagle" id="918145730" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="2900,500" order="1" text="Sequence Types" shape="rounded rectangle" id="918145730" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/f/f0/Python_DataTypes_Sequence_WebLinks.mm&amp;mm_title=Python%20Sequence%20Data%20Types" urlType="url"/>
-                <topic position="-2900,475" order="0" text="Mutable" shape="rectagle" id="1578736339" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
-                    <topic position="2900,463" order="0" text="Lists" shape="rounded rectagle" id="1776894225" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ddddff">
+                <topic position="-2900,475" order="0" text="Mutable" shape="rectangle" id="1578736339" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
+                    <topic position="2900,463" order="0" text="Lists" shape="rounded rectangle" id="1776894225" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ddddff">
                         <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/f/f1/Python_DataTypes_Sequence_Lists.mm&amp;mm_title=Python%20List%20Data%20Type" urlType="url"/>
                     </topic>
                 </topic>
-                <topic position="-2990,500" order="1" text="Immutable" shape="rectagle" id="1799786939" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
-                    <topic position="2990,475" order="0" text="Tuples" shape="rectagle" id="1329146055" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
+                <topic position="-2990,500" order="1" text="Immutable" shape="rectangle" id="1799786939" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
+                    <topic position="2990,475" order="0" text="Tuples" shape="rectangle" id="1329146055" fontStyle=";;;;;;#000000;;;" bgColor="#ddddff">
                         <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/1/14/Python_DataTypes_Sequence_Tuples.mm&amp;mm_title=Python%20Tuple%20Data%20Type" urlType="url"/>
                     </topic>
-                    <topic position="3080,500" order="1" text="Strings" shape="rounded rectagle" id="315458704" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ddddff">
+                    <topic position="3080,500" order="1" text="Strings" shape="rounded rectangle" id="315458704" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ddddff">
                         <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=4&amp;initLoadFile=/wiki/images/3/35/Python_DataTypes_Sequence_Strings.mm&amp;mm_title=Python%20String%20Data%20Type" urlType="url"/>
                     </topic>
                 </topic>
             </topic>
-            <topic position="2990,525" order="2" text="Mapping Types" shape="rounded rectagle" id="674126003" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
-                <topic position="-2990,513" order="0" text="Dictionary" shape="rounded rectagle" id="1822985067" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
+            <topic position="2990,525" order="2" text="Mapping Types" shape="rounded rectangle" id="674126003" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+                <topic position="-2990,513" order="0" text="Dictionary" shape="rounded rectangle" id="1822985067" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#bbffff">
                     <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/7/73/Python_DataTypes_Dictionary2.mm&amp;mm_title=Python%20Dictionary%20Data%20Type" urlType="url"/>
                 </topic>
             </topic>
-            <topic position="3080,550" order="3" text="Set" shape="rounded rectagle" id="617132681" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="3080,550" order="3" text="Set" shape="rounded rectangle" id="617132681" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/a/a9/Python_DataTypes_Sets.mm&amp;mm_title=Python%20Set%20Data%20Type" urlType="url"/>
             </topic>
-            <topic position="3170,575" order="4" text="Bool" shape="rounded rectagle" id="985221708" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="3170,575" order="4" text="Bool" shape="rounded rectangle" id="985221708" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/1/16/Python_DataTypes_Bool2.mm&amp;mm_title=Python%20Boolean%20Data%20Type" urlType="url"/>
             </topic>
-            <topic position="3260,600" order="5" text="Checking" shape="rounded rectagle" id="854059184" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
+            <topic position="3260,600" order="5" text="Checking" shape="rounded rectangle" id="854059184" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#99ff99">
                 <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=3&amp;initLoadFile=/wiki/images/5/5a/Python_DataTypes_Checking2.mm&amp;mm_title=Checking%20Python%20Data%20Types" urlType="url"/>
             </topic>
         </topic>
-        <topic position="-2900,575" order="29" text="Statements" shape="rounded rectagle" id="464774508" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
+        <topic position="-2900,575" order="29" text="Statements" shape="rounded rectangle" id="464774508" fontStyle=";;;;SansSerif;8;#000000;;;" bgColor="#ffff66">
             <link url="http://freemind.sourceforge.net/wiki/extensions/freemind/flashwindow.php?startCollapsedToLevel=2&amp;initLoadFile=/wiki/images/5/56/Python_Statements.mm&amp;mm_title=Python%20Statements" urlType="url"/>
         </topic>
     </topic>
diff --git a/packages/mindplot/test/unit/import/input/enc.mm b/packages/mindplot/test/unit/import/input/enc.mm
index 48f63d6a..0aa5e305 100644
--- a/packages/mindplot/test/unit/import/input/enc.mm
+++ b/packages/mindplot/test/unit/import/input/enc.mm
@@ -1,6 +1,6 @@
 <map version="1.0.1">
     <node ID="ID_1" TEXT="Artigos GF comentários interessantes">
-        <node ID="ID_5" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#cccccc" TEXT="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities">
+        <node ID="ID_5" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#cccccc" TEXT="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities">
             <edge COLOR="#cccccc"/>
             <node ID="ID_6" POSITION="left" STYLE="fork">
                 <richcontent TYPE="NODE">
@@ -84,7 +84,7 @@
                 </richcontent>
             </node>
         </node>
-        <node ID="ID_17" POSITION="right" STYLE="rectagle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Chazdon 2010. Biotropica. 42(1): 31–40">
+        <node ID="ID_17" POSITION="right" STYLE="rectangle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Chazdon 2010. Biotropica. 42(1): 31–40">
             <edge COLOR="#cccccc"/>
             <node ID="ID_22" POSITION="right" STYLE="fork">
                 <richcontent TYPE="NODE">
@@ -206,7 +206,7 @@
                 </richcontent>
             </node>
         </node>
-        <node ID="ID_2" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Poorter 1999. Functional Ecology. 13:396-410">
+        <node ID="ID_2" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#cccccc" COLOR="#000000" TEXT="Poorter 1999. Functional Ecology. 13:396-410">
             <edge COLOR="#cccccc"/>
             <node ID="ID_3" POSITION="left" STYLE="fork" TEXT="Espécies pioneiras crescem mais rápido do que as não pioneiras">
                 <node ID="ID_4" POSITION="left" STYLE="fork" TEXT="Tolerância a sombra está relacionada com persistência e não com crescimento"/>
diff --git a/packages/mindplot/test/unit/import/input/issue.mm b/packages/mindplot/test/unit/import/input/issue.mm
index 1586b623..2717e210 100644
--- a/packages/mindplot/test/unit/import/input/issue.mm
+++ b/packages/mindplot/test/unit/import/input/issue.mm
@@ -75,7 +75,7 @@
                 </node>
             </node>
         </node>
-        <node ID="ID_59" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#bf9000" COLOR="#000000">
+        <node ID="ID_59" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#bf9000" COLOR="#000000">
             <richcontent TYPE="NODE">
                 <html xmlns="http://www.w3.org/1999/xhtml">
                     <head></head>
@@ -88,7 +88,7 @@
             </richcontent>
             <font SIZE="12" BOLD="true"/>
             <edge COLOR="#7f6000"/>
-            <node ID="ID_92" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
+            <node ID="ID_92" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
                 <richcontent TYPE="NODE">
                     <html xmlns="http://www.w3.org/1999/xhtml">
                         <head></head>
@@ -100,20 +100,20 @@
                 </richcontent>
                 <font SIZE="12" BOLD="true"/>
                 <edge COLOR="#7f6000"/>
-                <node ID="ID_101" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Microsoft Windows">
+                <node ID="ID_101" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Microsoft Windows">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_106" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="GNU/LINUX">
+                <node ID="ID_106" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="GNU/LINUX">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_107" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="MAC ">
+                <node ID="ID_107" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="MAC ">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
             </node>
-            <node ID="ID_93" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
+            <node ID="ID_93" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
                 <richcontent TYPE="NODE">
                     <html xmlns="http://www.w3.org/1999/xhtml">
                         <head></head>
@@ -125,24 +125,24 @@
                 </richcontent>
                 <font SIZE="12"/>
                 <edge COLOR="#7f6000"/>
-                <node ID="ID_108" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Office">
+                <node ID="ID_108" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Office">
                     <font SIZE="12"/>
                     <edge COLOR="#783f04"/>
                 </node>
-                <node ID="ID_109" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Libre Office">
+                <node ID="ID_109" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Libre Office">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_110" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Navegadores">
+                <node ID="ID_110" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Navegadores">
                     <font SIZE="12"/>
                     <edge COLOR="#7f6000"/>
                 </node>
-                <node ID="ID_111" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Msn">
+                <node ID="ID_111" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#ffd966" COLOR="#000000" TEXT="Msn">
                     <font SIZE="12"/>
                     <edge COLOR="#783f04"/>
                 </node>
             </node>
-            <node ID="ID_94" POSITION="left" STYLE="rectagle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
+            <node ID="ID_94" POSITION="left" STYLE="rectangle" BACKGROUND_COLOR="#f1c232" COLOR="#000000">
                 <richcontent TYPE="NODE">
                     <html xmlns="http://www.w3.org/1999/xhtml">
                         <head></head>
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Font.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Font.snap.png
index c5fe6c76..324044e9 100644
Binary files a/packages/web2d/cypress/snapshots/playground.cy.js/Font.snap.png and b/packages/web2d/cypress/snapshots/playground.cy.js/Font.snap.png differ
diff --git a/packages/web2d/cypress/snapshots/playground.cy.js/Text.snap.png b/packages/web2d/cypress/snapshots/playground.cy.js/Text.snap.png
index 2b2d946d..7c066b13 100644
Binary files a/packages/web2d/cypress/snapshots/playground.cy.js/Text.snap.png and b/packages/web2d/cypress/snapshots/playground.cy.js/Text.snap.png differ
diff --git a/packages/web2d/src/components/peer/svg/FontPeer.js b/packages/web2d/src/components/peer/svg/FontPeer.js
index ba22d0c7..5d99da52 100644
--- a/packages/web2d/src/components/peer/svg/FontPeer.js
+++ b/packages/web2d/src/components/peer/svg/FontPeer.js
@@ -50,11 +50,11 @@ class FontPeer {
       result = (this._size * scale.height * 42) / 32;
     }
 
-    return result;
+    return result.toFixed(1);
   }
 
   getGraphSize() {
-    return (this._size * 43) / 32;
+    return ((this._size * 43) / 32).toFixed(1);
   }
 
   getSize() {
diff --git a/packages/web2d/src/components/peer/svg/RectPeer.js b/packages/web2d/src/components/peer/svg/RectPeer.js
index b5799188..8f59b05c 100644
--- a/packages/web2d/src/components/peer/svg/RectPeer.js
+++ b/packages/web2d/src/components/peer/svg/RectPeer.js
@@ -51,8 +51,8 @@ class RectPeer extends ElementPeer {
     if ($defined(this._arc)) {
       // Transform percentages to SVG format.
       const arc = (min / 2) * this._arc;
-      this._native.setAttribute('rx', arc);
-      this._native.setAttribute('ry', arc);
+      this._native.setAttribute('rx', arc.toFixed(1));
+      this._native.setAttribute('ry', arc.toFixed(1));
     }
   }
 }
diff --git a/packages/webapp/cypress/snapshots/maps.cy.ts/maps-create.snap.png b/packages/webapp/cypress/snapshots/maps.cy.ts/maps-create.snap.png
new file mode 100644
index 00000000..736d74d1
Binary files /dev/null and b/packages/webapp/cypress/snapshots/maps.cy.ts/maps-create.snap.png differ
diff --git a/packages/webapp/cypress/snapshots/maps.cy.ts/maps.snap.png b/packages/webapp/cypress/snapshots/maps.cy.ts/maps.snap.png
new file mode 100644
index 00000000..8f2d685a
Binary files /dev/null and b/packages/webapp/cypress/snapshots/maps.cy.ts/maps.snap.png differ